[PATCH] [mips] [IAS] Add support for expanding LASym with a source register operand.

Toma Tabacu toma.tabacu at imgtec.com
Thu Jun 11 08:45:37 PDT 2015


Rebased (for Sean Bruno's convenience).


http://reviews.llvm.org/D9348

Files:
  lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  test/MC/Mips/mips-expansions.s

Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -1909,15 +1909,20 @@
   const MCOperand &DstRegOp = Inst.getOperand(0);
   assert(DstRegOp.isReg() && "expected register operand kind");
 
+  const MCOperand &SrcRegOp = Inst.getOperand(1);
+  assert(SrcRegOp.isReg() && "expected register operand kind");
+
   const MCOperand &ImmOp = Inst.getOperand(2);
   assert((ImmOp.isImm() || ImmOp.isExpr()) &&
          "expected immediate operand kind");
   if (!ImmOp.isImm()) {
     expandLoadAddressSym(DstRegOp, ImmOp, Is32BitImm, IDLoc, Instructions);
+
+    unsigned DstReg = DstRegOp.getReg();
+    createAddu(DstReg, DstReg, SrcRegOp.getReg(), Instructions);
+
     return false;
   }
-  const MCOperand &SrcRegOp = Inst.getOperand(1);
-  assert(SrcRegOp.isReg() && "expected register operand kind");
 
   if (loadImmediate(ImmOp.getImm(), DstRegOp.getReg(), SrcRegOp.getReg(),
                     Is32BitImm, IDLoc, Instructions))
Index: test/MC/Mips/mips-expansions.s
===================================================================
--- test/MC/Mips/mips-expansions.s
+++ test/MC/Mips/mips-expansions.s
@@ -78,6 +78,60 @@
 # CHECK:                               #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
 # CHECK: ori $8, $8, %lo(symbol-4369)  # encoding: [0xef'A',0xee'A',0x08,0x35]
 # CHECK:                               #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+  la $8, symbol($9)
+# CHECK: lui  $8, %hi(symbol)           # encoding: [A,A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol)       # encoding: [A,A,0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol+1($9)
+# CHECK: lui  $8, %hi(symbol)           # encoding: [A,A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol+1)     # encoding: [0x01'A',A,0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol+32770($9)
+# CHECK: lui  $8, %hi(symbol+1)         # encoding: [0x01'A',A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol-32766) # encoding: [0x02'A',0x80'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol+65538($9)
+# CHECK: lui  $8, %hi(symbol+1)         # encoding: [0x01'A',A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol+2)     # encoding: [0x02'A',A,0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol+0x11111($9)
+# CHECK: lui  $8, %hi(symbol+1)         # encoding: [0x01'A',A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol+4369)  # encoding: [0x11'A',0x11'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol-1($9)
+# CHECK: lui  $8, %hi(symbol)           # encoding: [A,A,0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol-1)     # encoding: [0xff'A',0xff'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol-32770($9)
+# CHECK: lui  $8, %hi(symbol-1)         # encoding: [0xff'A',0xff'A',0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol+32766) # encoding: [0xfe'A',0x7f'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol-65538($9)
+# CHECK: lui  $8, %hi(symbol-1)         # encoding: [0xff'A',0xff'A',0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol-2)     # encoding: [0xfe'A',0xff'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
+  la $8, symbol-0x11111($9)
+# CHECK: lui  $8, %hi(symbol-1)         # encoding: [0xff'A',0xff'A',0x08,0x3c]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_HI, kind: fixup_Mips_HI16
+# CHECK: ori  $8, $8, %lo(symbol-4369)  # encoding: [0xef'A',0xee'A',0x08,0x35]
+# CHECK:                                #   fixup A - offset: 0, value: symbol at ABS_LO, kind: fixup_Mips_LO16
+# CHECK: addu $8, $8, $9                # encoding: [0x21,0x40,0x09,0x01]
 
 # LW/SW and LDC1/SDC1 of symbol address, done by MipsAsmParser::expandMemInst():
   .set noat

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D9348.27513.patch
Type: text/x-patch
Size: 5960 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150611/91d6eeb4/attachment.bin>


More information about the llvm-commits mailing list