maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Parameterize ARMPseudoInst size property. 

llvm-svn: 120353
This commit is contained in:
Jim Grosbach 2010-11-29 23:48:41 +00:00
parent 11d2bae187
commit 0c51bb4b25
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Target/ARM/ARMInstrFormats.td
View File

@ -246,12 +246,10 @@ class PseudoInst<dag oops, dag iops, InstrItinClass itin, list<dag> pattern>
} }
// PseudoInst that's ARM-mode only. // PseudoInst that's ARM-mode only.
class ARMPseudoInst<dag oops, dag iops, InstrItinClass itin, class ARMPseudoInst<dag oops, dag iops, SizeFlagVal sz, InstrItinClass itin,
list<dag> pattern> list<dag> pattern>
: PseudoInst<oops, iops, itin, pattern> { : PseudoInst<oops, iops, itin, pattern> {
// Default these to 4byte size, as they're almost always expanded to a let SZ = sz;
// single instruction. Any exceptions can override the SZ field value.
let SZ = Size4Bytes;
list<Predicate> Predicates = [IsARM]; list<Predicate> Predicates = [IsARM];
} }

40
llvm/lib/Target/ARM/ARMInstrInfo.td
View File

@ -1128,40 +1128,40 @@ def TRAP : AXI<(outs), (ins), MiscFrm, NoItinerary,
// Address computation and loads and stores in PIC mode. // Address computation and loads and stores in PIC mode.
let isNotDuplicable = 1 in { let isNotDuplicable = 1 in {
def PICADD : ARMPseudoInst<(outs GPR:$dst), (ins GPR:$a, pclabel:$cp, pred:$p), def PICADD : ARMPseudoInst<(outs GPR:$dst), (ins GPR:$a, pclabel:$cp, pred:$p),
IIC_iALUr, Size4Bytes, IIC_iALUr,
[(set GPR:$dst, (ARMpic_add GPR:$a, imm:$cp))]>; [(set GPR:$dst, (ARMpic_add GPR:$a, imm:$cp))]>;
let AddedComplexity = 10 in { let AddedComplexity = 10 in {
def PICLDR : ARMPseudoInst<(outs GPR:$dst), (ins addrmodepc:$addr, pred:$p), def PICLDR : ARMPseudoInst<(outs GPR:$dst), (ins addrmodepc:$addr, pred:$p),
IIC_iLoad_r, Size4Bytes, IIC_iLoad_r,
[(set GPR:$dst, (load addrmodepc:$addr))]>; [(set GPR:$dst, (load addrmodepc:$addr))]>;
def PICLDRH : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p), def PICLDRH : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p),
IIC_iLoad_bh_r, Size4Bytes, IIC_iLoad_bh_r,
[(set GPR:$Rt, (zextloadi16 addrmodepc:$addr))]>; [(set GPR:$Rt, (zextloadi16 addrmodepc:$addr))]>;
def PICLDRB : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p), def PICLDRB : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p),
IIC_iLoad_bh_r, Size4Bytes, IIC_iLoad_bh_r,
[(set GPR:$Rt, (zextloadi8 addrmodepc:$addr))]>; [(set GPR:$Rt, (zextloadi8 addrmodepc:$addr))]>;
def PICLDRSH : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p), def PICLDRSH : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p),
IIC_iLoad_bh_r, Size4Bytes, IIC_iLoad_bh_r,
[(set GPR:$Rt, (sextloadi16 addrmodepc:$addr))]>; [(set GPR:$Rt, (sextloadi16 addrmodepc:$addr))]>;
def PICLDRSB : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p), def PICLDRSB : ARMPseudoInst<(outs GPR:$Rt), (ins addrmodepc:$addr, pred:$p),
IIC_iLoad_bh_r, Size4Bytes, IIC_iLoad_bh_r,
[(set GPR:$Rt, (sextloadi8 addrmodepc:$addr))]>; [(set GPR:$Rt, (sextloadi8 addrmodepc:$addr))]>;
} }
let AddedComplexity = 10 in { let AddedComplexity = 10 in {
def PICSTR : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p), def PICSTR : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p),
IIC_iStore_r, [(store GPR:$src, addrmodepc:$addr)]>; Size4Bytes, IIC_iStore_r, [(store GPR:$src, addrmodepc:$addr)]>;
def PICSTRH : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p), def PICSTRH : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p),
IIC_iStore_bh_r, [(truncstorei16 GPR:$src, addrmodepc:$addr)]>; Size4Bytes, IIC_iStore_bh_r, [(truncstorei16 GPR:$src, addrmodepc:$addr)]>;
def PICSTRB : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p), def PICSTRB : ARMPseudoInst<(outs), (ins GPR:$src, addrmodepc:$addr, pred:$p),
IIC_iStore_bh_r, [(truncstorei8 GPR:$src, addrmodepc:$addr)]>; Size4Bytes, IIC_iStore_bh_r, [(truncstorei8 GPR:$src, addrmodepc:$addr)]>;
} }
} // isNotDuplicable = 1 } // isNotDuplicable = 1
@ -1430,26 +1430,20 @@ let isBranch = 1, isTerminator = 1 in {
let isNotDuplicable = 1, isIndirectBranch = 1 in { let isNotDuplicable = 1, isIndirectBranch = 1 in {
def BR_JTr : ARMPseudoInst<(outs), def BR_JTr : ARMPseudoInst<(outs),
(ins GPR:$target, i32imm:$jt, i32imm:$id), (ins GPR:$target, i32imm:$jt, i32imm:$id),
IIC_Br, SizeSpecial, IIC_Br,
[(ARMbrjt GPR:$target, tjumptable:$jt, imm:$id)]> { [(ARMbrjt GPR:$target, tjumptable:$jt, imm:$id)]>;
let SZ = SizeSpecial;
}
// FIXME: This shouldn't use the generic "addrmode2," but rather be split // FIXME: This shouldn't use the generic "addrmode2," but rather be split
// into i12 and rs suffixed versions. // into i12 and rs suffixed versions.
def BR_JTm : ARMPseudoInst<(outs), def BR_JTm : ARMPseudoInst<(outs),
(ins addrmode2:$target, i32imm:$jt, i32imm:$id), (ins addrmode2:$target, i32imm:$jt, i32imm:$id),
IIC_Br, SizeSpecial, IIC_Br,
[(ARMbrjt (i32 (load addrmode2:$target)), tjumptable:$jt, [(ARMbrjt (i32 (load addrmode2:$target)), tjumptable:$jt,
imm:$id)]> { imm:$id)]>;
let SZ = SizeSpecial;
}
def BR_JTadd : ARMPseudoInst<(outs), def BR_JTadd : ARMPseudoInst<(outs),
(ins GPR:$target, GPR:$idx, i32imm:$jt, i32imm:$id), (ins GPR:$target, GPR:$idx, i32imm:$jt, i32imm:$id),
IIC_Br, SizeSpecial, IIC_Br,
[(ARMbrjt (add GPR:$target, GPR:$idx), tjumptable:$jt, [(ARMbrjt (add GPR:$target, GPR:$idx), tjumptable:$jt,
imm:$id)]> { imm:$id)]>;
let SZ = SizeSpecial;
}
} // isNotDuplicable = 1, isIndirectBranch = 1 } // isNotDuplicable = 1, isIndirectBranch = 1
} // isBarrier = 1 } // isBarrier = 1