From: Akira Hatanaka Date: Fri, 21 Dec 2012 23:13:59 +0000 (+0000) Subject: [mips] Fix encoding of BAL instruction. Also, fix assembler test case which X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=189225369446136f82e080dbdcab3a0fa63c71ac;p=oota-llvm.git [mips] Fix encoding of BAL instruction. Also, fix assembler test case which was not catching the error. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170953 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/Mips/MipsInstrInfo.td b/lib/Target/Mips/MipsInstrInfo.td index cfbcf831415..6603dff05de 100644 --- a/lib/Target/Mips/MipsInstrInfo.td +++ b/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/test/MC/Mips/mips-jump-instructions.s b/test/MC/Mips/mips-jump-instructions.s index 998be418d20..58250f306e8 100644 --- a/test/MC/Mips/mips-jump-instructions.s +++ b/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