6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-28 06:32:09 +00:00
Code Issues Projects Releases Wiki Activity

[mips] Add definition of JALR instruction which has two register operands. Change the

Browse Source 
original JALR instruction with one register operand to be a pseudo-instruction.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174657 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka 2013-02-07 19:48:00 +00:00
parent 184f5c1545
commit 0c66403efd
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Target/Mips/Mips64InstrInfo.td
View File

@ -170,6 +170,7 @@ def BLTZ64 : CBranchZero<"bltz", setlt, CPU64Regs>, BGEZ_FM<1, 0>;
} }
let DecoderNamespace = "Mips64" in let DecoderNamespace = "Mips64" in
def JALR64 : JumpLinkReg<"jalr", CPU64Regs>, JALR_FM; def JALR64 : JumpLinkReg<"jalr", CPU64Regs>, JALR_FM;
def JALR64Pseudo : JumpLinkRegPseudo<CPU64Regs, JALR64, RA_64>;
def TAILCALL64_R : JumpFR<CPU64Regs, MipsTailCall>, MTLO_FM<8>, IsTailCall; def TAILCALL64_R : JumpFR<CPU64Regs, MipsTailCall>, MTLO_FM<8>, IsTailCall;
let DecoderNamespace = "Mips64" in { let DecoderNamespace = "Mips64" in {
@ -329,6 +330,8 @@ def : InstAlias<"not $rt, $rs",
(NOR64 CPU64RegsOpnd:$rt, CPU64RegsOpnd:$rs, ZERO_64), 1>, (NOR64 CPU64RegsOpnd:$rt, CPU64RegsOpnd:$rs, ZERO_64), 1>,
Requires<[HasMips64]>; Requires<[HasMips64]>;
def : InstAlias<"j $rs", (JR64 CPU64Regs:$rs), 0>, Requires<[HasMips64]>; def : InstAlias<"j $rs", (JR64 CPU64Regs:$rs), 0>, Requires<[HasMips64]>;
def : InstAlias<"jalr $rs", (JALR64 RA_64, CPU64Regs:$rs)>,
Requires<[HasMips64]>;
def : InstAlias<"daddu $rs, $rt, $imm", def : InstAlias<"daddu $rs, $rt, $imm",
(DADDiu CPU64RegsOpnd:$rs, CPU64RegsOpnd:$rt, simm16_64:$imm), (DADDiu CPU64RegsOpnd:$rs, CPU64RegsOpnd:$rt, simm16_64:$imm),
1>; 1>;

3
lib/Target/Mips/MipsInstrFormats.td
View File

@ -367,6 +367,7 @@ class LUI_FM {
} }
class JALR_FM { class JALR_FM {
bits<5> rd;
bits<5> rs; bits<5> rs;
bits<32> Inst; bits<32> Inst;
@ -374,7 +375,7 @@ class JALR_FM {
let Inst{31-26} = 0; let Inst{31-26} = 0;
let Inst{25-21} = rs; let Inst{25-21} = rs;
let Inst{20-16} = 0; let Inst{20-16} = 0;
let Inst{15-11} = 31; let Inst{15-11} = rd;
let Inst{10-6} = 0; let Inst{10-6} = 0;
let Inst{5-0} = 9; let Inst{5-0} = 9;
} }

11
lib/Target/Mips/MipsInstrInfo.td
View File

@ -565,9 +565,14 @@ let isCall=1, hasDelaySlot=1, Defs = [RA] in {
let DecoderMethod = "DecodeJumpTarget"; let DecoderMethod = "DecodeJumpTarget";
} }
class JumpLinkRegPseudo<RegisterClass RC, Instruction JALRInst,
Register RetReg>:
PseudoSE<(outs), (ins RC:$rs), [(MipsJmpLink RC:$rs)], IIBranch>,
PseudoInstExpansion<(JALRInst RetReg, RC:$rs)>;
class JumpLinkReg<string opstr, RegisterClass RC>: class JumpLinkReg<string opstr, RegisterClass RC>:
InstSE<(outs), (ins RC:$rs), !strconcat(opstr, "\t$rs"), InstSE<(outs RC:$rd), (ins RC:$rs), !strconcat(opstr, "\t$rd, $rs"),
[(MipsJmpLink RC:$rs)], IIBranch, FrmR>; [], IIBranch, FrmR>;
class BGEZAL_FT<string opstr, RegisterOperand RO> : class BGEZAL_FT<string opstr, RegisterOperand RO> :
InstSE<(outs), (ins RO:$rs, brtarget:$offset), InstSE<(outs), (ins RO:$rs, brtarget:$offset),
@ -865,6 +870,7 @@ def BAL_BR: BAL_FT, BAL_FM;
def JAL : JumpLink<"jal">, FJ<3>; def JAL : JumpLink<"jal">, FJ<3>;
def JALR : JumpLinkReg<"jalr", CPURegs>, JALR_FM; def JALR : JumpLinkReg<"jalr", CPURegs>, JALR_FM;
def JALRPseudo : JumpLinkRegPseudo<CPURegs, JALR, RA>;
def BGEZAL : BGEZAL_FT<"bgezal", CPURegsOpnd>, BGEZAL_FM<0x11>; def BGEZAL : BGEZAL_FT<"bgezal", CPURegsOpnd>, BGEZAL_FM<0x11>;
def BLTZAL : BGEZAL_FT<"bltzal", CPURegsOpnd>, BGEZAL_FM<0x10>; def BLTZAL : BGEZAL_FT<"bltzal", CPURegsOpnd>, BGEZAL_FM<0x10>;
def TAILCALL : JumpFJ<calltarget, "j", MipsTailCall, imm>, FJ<2>, IsTailCall; def TAILCALL : JumpFJ<calltarget, "j", MipsTailCall, imm>, FJ<2>, IsTailCall;
@ -972,6 +978,7 @@ def : InstAlias<"and $rs, $rt, $imm",
(ANDi CPURegsOpnd:$rs, CPURegsOpnd:$rt, simm16:$imm), 0>; (ANDi CPURegsOpnd:$rs, CPURegsOpnd:$rt, simm16:$imm), 0>;
def : InstAlias<"j $rs", (JR CPURegs:$rs), 0>, def : InstAlias<"j $rs", (JR CPURegs:$rs), 0>,
Requires<[NotMips64]>; Requires<[NotMips64]>;
def : InstAlias<"jalr $rs", (JALR RA, CPURegs:$rs)>, Requires<[NotMips64]>;
def : InstAlias<"not $rt, $rs", def : InstAlias<"not $rt, $rs",
(NOR CPURegsOpnd:$rt, CPURegsOpnd:$rs, ZERO), 1>; (NOR CPURegsOpnd:$rt, CPURegsOpnd:$rs, ZERO), 1>;
def : InstAlias<"neg $rt, $rs", def : InstAlias<"neg $rt, $rs",

8
test/MC/Mips/mips-jump-instructions.s
View File

@ -56,6 +56,10 @@ end_of_code:
# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK: jalr $6 # encoding: [0x09,0xf8,0xc0,0x00] # CHECK: jalr $6 # encoding: [0x09,0xf8,0xc0,0x00]
# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK: jalr $25 # encoding: [0x09,0xf8,0x20,0x03]
# CHECK: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK: jalr $10, $11 # encoding: [0x09,0x50,0x60,0x01]
# CHECK: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK: jr $7 # encoding: [0x08,0x00,0xe0,0x00]
# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK: jr $7 # encoding: [0x08,0x00,0xe0,0x00] # CHECK: jr $7 # encoding: [0x08,0x00,0xe0,0x00]
@ -67,6 +71,10 @@ end_of_code:
nop nop
jalr $6 jalr $6
nop nop
jalr $31, $25
nop
jalr $10, $11
nop
jr $7 jr $7
nop nop
j $7 j $7