diff options
| -rw-r--r-- | llvm/lib/Target/Mips/MipsInstrInfo.td | 1 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/Mips/mips32.txt | 3 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/Mips/mips32_le.txt | 3 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/Mips/mips32r2.txt | 3 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/Mips/mips32r2_le.txt | 3 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips-jump-instructions.s | 12 |
6 files changed, 24 insertions, 1 deletions
diff --git a/llvm/lib/Target/Mips/MipsInstrInfo.td b/llvm/lib/Target/Mips/MipsInstrInfo.td index e39fd690fb9..faf185131f7 100644 --- a/llvm/lib/Target/Mips/MipsInstrInfo.td +++ b/llvm/lib/Target/Mips/MipsInstrInfo.td @@ -1038,6 +1038,7 @@ def B : UncondBranch<BEQ>; def JAL : MMRel, JumpLink<"jal", calltarget>, FJ<3>; def JALR : MMRel, JumpLinkReg<"jalr", GPR32Opnd>, JALR_FM; +def JALX : MMRel, JumpLink<"jalx", calltarget>, FJ<0x1D>; def JALRPseudo : JumpLinkRegPseudo<GPR32Opnd, JALR, RA>; def BGEZAL : MMRel, BGEZAL_FT<"bgezal", brtarget, GPR32Opnd>, BGEZAL_FM<0x11>; def BLTZAL : MMRel, BGEZAL_FT<"bltzal", brtarget, GPR32Opnd>, BGEZAL_FM<0x10>; diff --git a/llvm/test/MC/Disassembler/Mips/mips32.txt b/llvm/test/MC/Disassembler/Mips/mips32.txt index 6d02925ff7b..bfb145e3959 100644 --- a/llvm/test/MC/Disassembler/Mips/mips32.txt +++ b/llvm/test/MC/Disassembler/Mips/mips32.txt @@ -206,6 +206,9 @@ # CHECK: jal 1328 0x0c 0x00 0x01 0x4c +# CHECK: jalx 1328 +0x74 0x00 0x01 0x4c + # CHECK: jalr $7 0x00 0xe0 0xf8 0x09 diff --git a/llvm/test/MC/Disassembler/Mips/mips32_le.txt b/llvm/test/MC/Disassembler/Mips/mips32_le.txt index 61e6fc868d0..533fc69598c 100644 --- a/llvm/test/MC/Disassembler/Mips/mips32_le.txt +++ b/llvm/test/MC/Disassembler/Mips/mips32_le.txt @@ -206,6 +206,9 @@ # CHECK: jal 1328 0x4c 0x01 0x00 0x0c +# CHECK: jalx 1328 +0x4c 0x01 0x00 0x74 + # CHECK: jalr $7 0x09 0xf8 0xe0 0x00 diff --git a/llvm/test/MC/Disassembler/Mips/mips32r2.txt b/llvm/test/MC/Disassembler/Mips/mips32r2.txt index 11d9058221c..299f6f0c8a3 100644 --- a/llvm/test/MC/Disassembler/Mips/mips32r2.txt +++ b/llvm/test/MC/Disassembler/Mips/mips32r2.txt @@ -215,6 +215,9 @@ # CHECK: jal 1328 0x0c 0x00 0x01 0x4c +# CHECK: jalx 1328 +0x74 0x00 0x01 0x4c + # CHECK: jalr $7 0x00 0xe0 0xf8 0x09 diff --git a/llvm/test/MC/Disassembler/Mips/mips32r2_le.txt b/llvm/test/MC/Disassembler/Mips/mips32r2_le.txt index adafcf1258c..0362ca6d8d6 100644 --- a/llvm/test/MC/Disassembler/Mips/mips32r2_le.txt +++ b/llvm/test/MC/Disassembler/Mips/mips32r2_le.txt @@ -215,6 +215,9 @@ # CHECK: jal 1328 0x4c 0x01 0x00 0x0c +# CHECK: jalx 1328 +0x4c 0x01 0x00 0x74 + # CHECK: jalr $7 0x09 0xf8 0xe0 0x00 diff --git a/llvm/test/MC/Mips/mips-jump-instructions.s b/llvm/test/MC/Mips/mips-jump-instructions.s index 989826a1a2b..596c8a2f763 100644 --- a/llvm/test/MC/Mips/mips-jump-instructions.s +++ b/llvm/test/MC/Mips/mips-jump-instructions.s @@ -101,12 +101,16 @@ end_of_code: # CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK32: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK32:lab: # CHECK32: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK32: jalr $25 # encoding: [0x09,0xf8,0x20,0x03] # CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK32: jalr $4, $25 # encoding: [0x09,0x20,0x20,0x03] # CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK32: jalx lab # encoding: [A,A,A,0b011101AA] +# CHECK32: # fixup A - offset: 0, value: lab, kind: fixup_Mips_26 +# CHECK32: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK64: j 1328 # encoding: [0x4c,0x01,0x00,0x08] # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] @@ -120,13 +124,16 @@ end_of_code: # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK64: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK64:lab: # CHECK64: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK64: jalr $25 # encoding: [0x09,0xf8,0x20,0x03] # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK64: jalr $4, $25 # encoding: [0x09,0x20,0x20,0x03] # CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] - +# CHECK64: jalx lab # encoding: [A,A,A,0b011101AA] +# CHECK64: # fixup A - offset: 0, value: lab, kind: fixup_Mips_26 +# CHECK64: nop # encoding: [0x00,0x00,0x00,0x00] j 1328 nop @@ -140,9 +147,12 @@ end_of_code: nop jr $7 nop +lab: j $7 nop jal $25 nop jal $4,$25 nop + jalx lab + nop |
