summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Korobeynikov <anton@korobeynikov.info>2019-01-15 20:10:46 +0000
committerAnton Korobeynikov <anton@korobeynikov.info>2019-01-15 20:10:46 +0000
commitca8a80927a29c636260584b6d1a4612c54d8350d (patch)
treee019a67d9d2d650603adeed849172f14bdf0ccff
parentb668c249a3e5ddcf0324e6bc7d1947720949778a (diff)
[MSP430] Recognize '{' as a line separator
msp430-as supports multiple assembly statements on the same line separated by a '{' character.
-rw-r--r--llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp1
-rw-r--r--llvm/test/MC/MSP430/msp430-separator.s15
2 files changed, 16 insertions, 0 deletions
diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
index 82e6731ecd7..36e9a9c3107 100644
--- a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
+++ b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
@@ -20,6 +20,7 @@ MSP430MCAsmInfo::MSP430MCAsmInfo(const Triple &TT) {
CodePointerSize = CalleeSaveStackSlotSize = 2;
CommentString = ";";
+ SeparatorString = "{";
AlignmentIsInBytes = false;
UsesELFSectionDirectiveForBSS = true;
diff --git a/llvm/test/MC/MSP430/msp430-separator.s b/llvm/test/MC/MSP430/msp430-separator.s
new file mode 100644
index 00000000000..498e86e1df3
--- /dev/null
+++ b/llvm/test/MC/MSP430/msp430-separator.s
@@ -0,0 +1,15 @@
+; RUN: llvm-mc -triple msp430 < %s | FileCheck %s
+
+; MSP430 supports multiple assembly statements on the same line
+; separated by a '{' character.
+
+; Check that the '{' is recognized as a line separator and
+; multiple statements correctly parsed.
+
+_foo:
+; CHECK: foo
+; CHECK: add r10, r11
+; CHECK-NEXT: call r11
+; CHECK-NEXT: mov r11, 2(r1)
+add r10, r11 { call r11 { mov r11, 2(r1)
+ret