[mips] Make symbols an acceptable branch target when expanding compare-to-immediate-and-branch macros.

[seanbruno]

I'm assuming this should *just* be committed at this point right?

[vkalintiris]

LGTM.

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

2516

Instead of removing the assertion, it would be nice to keep it and OR it with isExpr().

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

bool MipsAsmParser::expandBranchImm(MCInst &Inst, SMLoc IDLoc,
                                     SmallVectorImpl<MCInst> &Instructions) {
   const MCOperand &DstRegOp = Inst.getOperand(0);
   assert(DstRegOp.isReg() && "expected register operand kind");
 
   const MCOperand &ImmOp = Inst.getOperand(1);
   assert(ImmOp.isImm() && "expected immediate operand kind");
 
   const MCOperand &MemOffsetOp = Inst.getOperand(2);
-  assert(MemOffsetOp.isImm() && "expected immediate operand kind");
 
   unsigned OpCode = 0;
   switch(Inst.getOpcode()) {
     case Mips::BneImm:
       OpCode = Mips::BNE;
       break;
     case Mips::BeqImm:
       OpCode = Mips::BEQ;

test/MC/Mips/mips-expansions.s

 # CHECK-LE: beq   $2, $1, 1332      # encoding: [0x4d,0x01,0x41,0x10]
 # CHECK-LE: nop                     # encoding: [0x00,0x00,0x00,0x00]
 
   beq $2, 0x10000, 1332
 # CHECK-LE: lui   $1, 1             # encoding: [0x01,0x00,0x01,0x3c]
 # CHECK-LE: beq   $2, $1, 1332      # encoding: [0x4d,0x01,0x41,0x10]
 # CHECK-LE: nop                     # encoding: [0x00,0x00,0x00,0x00]
 
+  beq $2, 65538, foo
+# CHECK-LE: lui   $1, 1             # encoding: [0x01,0x00,0x01,0x3c]
+# CHECK-LE: ori   $1, $1, 2         # encoding: [0x02,0x00,0x21,0x34]
+# CHECK-LE: beq   $2, $1, foo       # encoding: [A,A,0x41,0x10]
+# CHECK-LE: nop                     # encoding: [0x00,0x00,0x00,0x00]
+
 # Test ULH with immediate operand.
 ulh_imm: # CHECK-LABEL: ulh_imm:
   ulh $8, 0
 # CHECK-BE: lb   $1, 0($zero)      # encoding: [0x80,0x01,0x00,0x00]
 # CHECK-BE: lbu  $8, 1($zero)      # encoding: [0x90,0x08,0x00,0x01]
 # CHECK-BE: sll  $1, $1, 8         # encoding: [0x00,0x01,0x0a,0x00]
 # CHECK-BE: or   $8, $8, $1        # encoding: [0x01,0x01,0x40,0x25]
 # CHECK-LE: lb   $1, 1($zero)      # encoding: [0x01,0x00,0x01,0x80]

test/MC/Mips/mips64-expansions.s

 # CHECK: ori  $1, $1, 65534         # encoding: [0xfe,0xff,0x21,0x34]
 # CHECK: dsll $1, $1, 16            # encoding: [0x38,0x0c,0x01,0x00]
 # CHECK: ori  $1, $1, 65534         # encoding: [0xfe,0xff,0x21,0x34]
 # CHECK: dsll $1, $1, 16            # encoding: [0x38,0x0c,0x01,0x00]
 # CHECK: ori  $1, $1, 65535         # encoding: [0xff,0xff,0x21,0x34]
 # CHECK: beq  $2, $1, 1332          # encoding: [0x4d,0x01,0x41,0x10]
 # CHECK: nop                        # encoding: [0x00,0x00,0x00,0x00]
 
+# Test one with a symbol in the third operand.
+sym:
+  bne $2, 0x100010001, sym
+# CHECK: addiu $1, $zero, 1         # encoding: [0x01,0x00,0x01,0x24]
+# CHECK: dsll $1, $1, 16            # encoding: [0x38,0x0c,0x01,0x00]
+# CHECK: ori  $1, $1, 1             # encoding: [0x01,0x00,0x21,0x34]
+# CHECK: dsll $1, $1, 16            # encoding: [0x38,0x0c,0x01,0x00]
+# CHECK: ori  $1, $1, 1             # encoding: [0x01,0x00,0x21,0x34]
+# CHECK: bne  $2, $1, sym           # encoding: [A,A,0x41,0x14]
+# CHECK: nop                        # encoding: [0x00,0x00,0x00,0x00]
+
 # Test ulhu with 64-bit immediate addresses.
   ulhu $8, 0x100010001
 # CHECK: addiu $1, $zero, 1    # encoding: [0x01,0x00,0x01,0x24]
 # CHECK: ori  $1, $1, 1        # encoding: [0x01,0x00,0x21,0x34]
 # CHECK: dsll $1, $1, 16       # encoding: [0x38,0x0c,0x01,0x00]
 # CHECK: ori  $1, $1, 1        # encoding: [0x01,0x00,0x21,0x34]
 # CHECK: lbu  $8, 1($1)        # encoding: [0x01,0x00,0x28,0x90]
 # CHECK: lbu  $1, 0($1)        # encoding: [0x00,0x00,0x21,0x90]