6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-26 23:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Make sure Thumb2 uses the right call instructions.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77507 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng 2009-07-29 21:26:42 +00:00
parent 409914b773
commit 20a2a0aff3
3 changed files with 80 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Target/ARM/ARMInstrInfo.td
View File

@ -614,16 +614,19 @@ let isCall = 1, Itinerary = IIC_Br,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def BL : ABXI<0b1011, (outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMcall tglobaladdr:$func)]>, Requires<[IsNotDarwin]>;
[(ARMcall tglobaladdr:$func)]>,
Requires<[IsARM, IsNotDarwin]>;
def BL_pred : ABI<0b1011, (outs), (ins i32imm:$func, variable_ops),
"bl", " ${func:call}",
[(ARMcall_pred tglobaladdr:$func)]>, Requires<[IsNotDarwin]>;
[(ARMcall_pred tglobaladdr:$func)]>,
Requires<[IsARM, IsNotDarwin]>;
// ARMv5T and above
def BLX : AXI<(outs), (ins GPR:$func, variable_ops), BrMiscFrm,
"blx $func",
[(ARMcall GPR:$func)]>, Requires<[IsARM, HasV5T, IsNotDarwin]> {
[(ARMcall GPR:$func)]>,
Requires<[IsARM, HasV5T, IsNotDarwin]> {
let Inst{7-4} = 0b0011;
let Inst{19-8} = 0b111111111111;
let Inst{27-20} = 0b00010010;
@ -632,7 +635,8 @@ let isCall = 1, Itinerary = IIC_Br,
// ARMv4T
def BX : ABXIx2<(outs), (ins GPR:$func, variable_ops),
"mov lr, pc\n\tbx $func",
[(ARMcall_nolink GPR:$func)]>, Requires<[IsNotDarwin]> {
[(ARMcall_nolink GPR:$func)]>,
Requires<[IsARM, IsNotDarwin]> {
let Inst{7-4} = 0b0001;
let Inst{19-8} = 0b111111111111;
let Inst{27-20} = 0b00010010;
@ -647,11 +651,12 @@ let isCall = 1, Itinerary = IIC_Br,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def BLr9 : ABXI<0b1011, (outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMcall tglobaladdr:$func)]>, Requires<[IsDarwin]>;
[(ARMcall tglobaladdr:$func)]>, Requires<[IsARM, IsDarwin]>;
def BLr9_pred : ABI<0b1011, (outs), (ins i32imm:$func, variable_ops),
"bl", " ${func:call}",
[(ARMcall_pred tglobaladdr:$func)]>, Requires<[IsDarwin]>;
[(ARMcall_pred tglobaladdr:$func)]>,
Requires<[IsARM, IsDarwin]>;
// ARMv5T and above
def BLXr9 : AXI<(outs), (ins GPR:$func, variable_ops), BrMiscFrm,
@ -1441,9 +1446,9 @@ def : ARMPat<(xor GPR:$LHS, so_imm2part:$RHS),
// Direct calls
def : ARMPat<(ARMcall texternalsym:$func), (BL texternalsym:$func)>,
Requires<[IsNotDarwin]>;
Requires<[IsARM, IsNotDarwin]>;
def : ARMPat<(ARMcall texternalsym:$func), (BLr9 texternalsym:$func)>,
Requires<[IsDarwin]>;
Requires<[IsARM, IsDarwin]>;
// zextload i1 -> zextload i8
def : ARMPat<(zextloadi1 addrmode2:$addr), (LDRB addrmode2:$addr)>;

60
lib/Target/ARM/ARMInstrThumb.td
View File

@ -172,18 +172,54 @@ let isCall = 1,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def tBL : T1Ix2<(outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMtcall tglobaladdr:$func)]>;
[(ARMtcall tglobaladdr:$func)]>,
Requires<[IsThumb1Only, IsNotDarwin]>;
// ARMv5T and above
def tBLXi : T1Ix2<(outs), (ins i32imm:$func, variable_ops),
"blx ${func:call}",
[(ARMcall tglobaladdr:$func)]>, Requires<[HasV5T]>;
[(ARMcall tglobaladdr:$func)]>,
Requires<[IsThumb1Only, HasV5T, IsNotDarwin]>;
def tBLXr : T1I<(outs), (ins tGPR:$func, variable_ops),
"blx $func",
[(ARMtcall tGPR:$func)]>, Requires<[HasV5T]>;
[(ARMtcall tGPR:$func)]>,
Requires<[IsThumb1Only, HasV5T, IsNotDarwin]>;
// ARMv4T
def tBX : T1Ix2<(outs), (ins tGPR:$func, variable_ops),
"mov lr, pc\n\tbx $func",
[(ARMcall_nolink tGPR:$func)]>;
[(ARMcall_nolink tGPR:$func)]>,
Requires<[IsThumb1Only, IsNotDarwin]>;
}
// On Darwin R9 is call-clobbered.
let isCall = 1,
Defs = [R0, R1, R2, R3, R9, R12, LR,
D0, D1, D2, D3, D4, D5, D6, D7,
D16, D17, D18, D19, D20, D21, D22, D23,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def tBLr9 : T1Ix2<(outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMtcall tglobaladdr:$func)]>,
Requires<[IsThumb1Only, IsDarwin]>;
// ARMv5T and above
def tBLXi_r9 : T1Ix2<(outs), (ins i32imm:$func, variable_ops),
"blx ${func:call}",
[(ARMcall tglobaladdr:$func)]>,
Requires<[IsThumb1Only, HasV5T, IsDarwin]>;
def tBLXr_r9 : T1I<(outs), (ins tGPR:$func, variable_ops),
"blx $func",
[(ARMtcall tGPR:$func)]>,
Requires<[IsThumb1Only, HasV5T, IsDarwin]>;
// ARMv4T
def tBXr9 : T1Ix2<(outs), (ins tGPR:$func, variable_ops),
"mov lr, pc\n\tbx $func",
[(ARMcall_nolink tGPR:$func)]>,
Requires<[IsThumb1Only, IsDarwin]>;
}
let isBranch = 1, isTerminator = 1 in {
@ -599,11 +635,21 @@ def : T1Pat<(ARMWrapperJT tjumptable:$dst, imm:$id),
(tLEApcrelJT tjumptable:$dst, imm:$id)>;
// Direct calls
def : T1Pat<(ARMtcall texternalsym:$func), (tBL texternalsym:$func)>;
def : Tv5Pat<(ARMcall texternalsym:$func), (tBLXi texternalsym:$func)>;
def : T1Pat<(ARMtcall texternalsym:$func), (tBL texternalsym:$func)>,
Requires<[IsThumb1Only, IsNotDarwin]>;
def : T1Pat<(ARMtcall texternalsym:$func), (tBLr9 texternalsym:$func)>,
Requires<[IsThumb1Only, IsDarwin]>;
def : Tv5Pat<(ARMcall texternalsym:$func), (tBLXi texternalsym:$func)>,
Requires<[IsThumb1Only, HasV5T, IsNotDarwin]>;
def : Tv5Pat<(ARMcall texternalsym:$func), (tBLXi_r9 texternalsym:$func)>,
Requires<[IsThumb1Only, HasV5T, IsDarwin]>;
// Indirect calls to ARM routines
def : Tv5Pat<(ARMcall tGPR:$dst), (tBLXr tGPR:$dst)>;
def : Tv5Pat<(ARMcall tGPR:$dst), (tBLXr tGPR:$dst)>,
Requires<[IsThumb1Only, HasV5T, IsNotDarwin]>;
def : Tv5Pat<(ARMcall tGPR:$dst), (tBLXr_r9 tGPR:$dst)>,
Requires<[IsThumb1Only, HasV5T, IsDarwin]>;
// zextload i1 -> zextload i8
def : T1Pat<(zextloadi1 t_addrmode_s1:$addr),

18
lib/Target/ARM/ARMInstrThumb2.td
View File

@ -1027,11 +1027,13 @@ let isCall = 1,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def t2BL : T2XI<(outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMcall tglobaladdr:$func)]>, Requires<[IsNotDarwin]>;
[(ARMcall tglobaladdr:$func)]>,
Requires<[IsThumb2, IsNotDarwin]>;
def t2BLX : T2XI<(outs), (ins GPR:$func, variable_ops),
"blx $func",
[(ARMcall GPR:$func)]>, Requires<[IsNotDarwin]>;
[(ARMcall GPR:$func)]>,
Requires<[IsThumb2, IsNotDarwin]>;
}
// On Darwin R9 is call-clobbered.
@ -1041,11 +1043,13 @@ let isCall = 1,
D24, D25, D26, D27, D28, D29, D30, D31, CPSR] in {
def t2BLr9 : T2XI<(outs), (ins i32imm:$func, variable_ops),
"bl ${func:call}",
[(ARMcall tglobaladdr:$func)]>, Requires<[IsDarwin]>;
[(ARMcall tglobaladdr:$func)]>,
Requires<[IsThumb2, IsDarwin]>;
def t2BLXr9 : T2XI<(outs), (ins GPR:$func, variable_ops),
"blx $func",
[(ARMcall GPR:$func)]>, Requires<[IsDarwin]>;
[(ARMcall GPR:$func)]>,
Requires<[IsThumb2, IsDarwin]>;
}
let isBranch = 1, isTerminator = 1, isBarrier = 1 in {
@ -1101,3 +1105,9 @@ def : T2Pat<(ARMWrapperJT tjumptable:$dst, imm:$id),
def : T2Pat<(i32 imm:$src),
(t2MOVTi16 (t2MOVi16 (t2_lo16 imm:$src)), (t2_hi16 imm:$src))>;
// Direct calls
def : T2Pat<(ARMcall texternalsym:$func), (t2BL texternalsym:$func)>,
Requires<[IsThumb2, IsNotDarwin]>;
def : T2Pat<(ARMcall texternalsym:$func), (t2BLr9 texternalsym:$func)>,
Requires<[IsThumb2, IsDarwin]>;