diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2012-12-21 23:13:59 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2012-12-21 23:13:59 +0000 |
| commit | d6b694f0367887c3c1bb0de09cdc5803fd7969e2 (patch) | |
| tree | 8b58f476379a9820973244f252dd4f360fbd41fe /llvm | |
| parent | a158042a56415d52f4c7f27f02b62f983b265d8b (diff) | |
| download | bcm5719-llvm-d6b694f0367887c3c1bb0de09cdc5803fd7969e2.tar.gz bcm5719-llvm-d6b694f0367887c3c1bb0de09cdc5803fd7969e2.zip | |
[mips] Fix encoding of BAL instruction. Also, fix assembler test case which
was not catching the error.
llvm-svn: 170953
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/Mips/MipsInstrInfo.td | 2 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips-jump-instructions.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/Mips/MipsInstrInfo.td b/llvm/lib/Target/Mips/MipsInstrInfo.td index cfbcf831415..6603dff05de 100644 --- a/llvm/lib/Target/Mips/MipsInstrInfo.td +++ b/llvm/lib/Target/Mips/MipsInstrInfo.td @@ -859,7 +859,7 @@ def BGTZ : CBranchZero<"bgtz", setgt, CPURegs>, BGEZ_FM<7, 0>; def BLEZ : CBranchZero<"blez", setle, CPURegs>, BGEZ_FM<6, 0>; def BLTZ : CBranchZero<"bltz", setlt, CPURegs>, BGEZ_FM<1, 0>; -let rt = 0, rs = 0, isBranch = 1, isTerminator = 1, isBarrier = 1, +let rt = 0x11, rs = 0, isBranch = 1, isTerminator = 1, isBarrier = 1, hasDelaySlot = 1, Defs = [RA] in def BAL_BR: FI<0x1, (outs), (ins brtarget:$imm16), "bal\t$imm16", [], IIBranch>; diff --git a/llvm/test/MC/Mips/mips-jump-instructions.s b/llvm/test/MC/Mips/mips-jump-instructions.s index 998be418d20..58250f306e8 100644 --- a/llvm/test/MC/Mips/mips-jump-instructions.s +++ b/llvm/test/MC/Mips/mips-jump-instructions.s @@ -23,7 +23,7 @@ # CHECK: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK: bne $9, $6, 1332 # encoding: [0x34,0x05,0x26,0x15] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK: bal 1332 # encoding: [0x34,0x05,0x00,0x04] +# CHECK: bal 1332 # encoding: [0x34,0x05,0x11,0x04] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00] b 1332 nop |
