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

Thumb2 32-bit ldm / stm needs .w suffix if submode is ia. 

llvm-svn: 78410
This commit is contained in:
Evan Cheng 2009-08-07 21:19:10 +00:00
parent 0e8e1fde25
commit 6e130db3b7
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,12 +651,12 @@ def t2STRB_POST : T2Iidxldst<(outs GPR:$base_wb),
let mayLoad = 1 in let mayLoad = 1 in
def t2LDM : T2XI<(outs), def t2LDM : T2XI<(outs),
(ins addrmode4:$addr, pred:$p, reglist:$dst1, variable_ops), (ins addrmode4:$addr, pred:$p, reglist:$dst1, variable_ops),
IIC_iLoad, "ldm${addr:submode}${p} $addr, $dst1", []>; IIC_iLoad, "ldm${addr:submode}${p}${addr:wide} $addr, $dst1", []>;
let mayStore = 1 in let mayStore = 1 in
def t2STM : T2XI<(outs), def t2STM : T2XI<(outs),
(ins addrmode4:$addr, pred:$p, reglist:$src1, variable_ops), (ins addrmode4:$addr, pred:$p, reglist:$src1, variable_ops),
IIC_iStore, "stm${addr:submode}${p} $addr, $src1", []>; IIC_iStore, "stm${addr:submode}${p}${addr:wide} $addr, $src1", []>;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Move Instructions. // Move Instructions.
@ -1072,7 +1072,7 @@ let isCall = 1,
let isReturn = 1, isTerminator = 1, mayLoad = 1 in let isReturn = 1, isTerminator = 1, mayLoad = 1 in
def t2LDM_RET : T2XI<(outs), def t2LDM_RET : T2XI<(outs),
(ins addrmode4:$addr, pred:$p, reglist:$dst1, variable_ops), (ins addrmode4:$addr, pred:$p, reglist:$dst1, variable_ops),
IIC_iLoad, "ldm${addr:submode}${p} $addr, $dst1", IIC_iLoad, "ldm${addr:submode}${p}${addr:wide} $addr, $dst1",
[]>; []>;
let isBranch = 1, isTerminator = 1, isBarrier = 1 in { let isBranch = 1, isTerminator = 1, isBarrier = 1 in {

4
llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
View File

@ -599,6 +599,10 @@ void ARMAsmPrinter::printAddrMode4Operand(const MachineInstr *MI, int Op,
O << ARM_AM::getAMSubModeAltStr(Mode, isLDM); O << ARM_AM::getAMSubModeAltStr(Mode, isLDM);
} else } else
O << ARM_AM::getAMSubModeStr(Mode); O << ARM_AM::getAMSubModeStr(Mode);
} else if (Modifier && strcmp(Modifier, "wide") == 0) {
ARM_AM::AMSubMode Mode = ARM_AM::getAM4SubMode(MO2.getImm());
if (Mode == ARM_AM::ia)
O << ".w";
} else { } else {
printOperand(MI, Op); printOperand(MI, Op);
if (ARM_AM::getAM4WBFlag(MO2.getImm())) if (ARM_AM::getAM4WBFlag(MO2.getImm()))

8
llvm/test/CodeGen/Thumb2/thumb2-ldm.ll
View File

@ -5,7 +5,7 @@
define i32 @t1() { define i32 @t1() {
; CHECK: t1: ; CHECK: t1:
; CHECK: stmfd sp!, {r7, lr} ; CHECK: stmfd sp!, {r7, lr}
; CHECK: ldmfd sp!, {r7, pc} ; CHECK: ldmfd.w sp!, {r7, pc}
%tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 0) ; <i32> [#uses=1] %tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 0) ; <i32> [#uses=1]
%tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 1) ; <i32> [#uses=1] %tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 1) ; <i32> [#uses=1]
%tmp4 = tail call i32 @f1( i32 %tmp, i32 %tmp3 ) ; <i32> [#uses=1] %tmp4 = tail call i32 @f1( i32 %tmp, i32 %tmp3 ) ; <i32> [#uses=1]
@ -15,8 +15,8 @@ define i32 @t1() {
define i32 @t2() { define i32 @t2() {
; CHECK: t2: ; CHECK: t2:
; CHECK: stmfd sp!, {r7, lr} ; CHECK: stmfd sp!, {r7, lr}
; CHECK: ldmia ; CHECK: ldmia.w
; CHECK: ldmfd sp!, {r7, pc} ; CHECK: ldmfd.w sp!, {r7, pc}
%tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 2) ; <i32> [#uses=1] %tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 2) ; <i32> [#uses=1]
%tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 3) ; <i32> [#uses=1] %tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 3) ; <i32> [#uses=1]
%tmp5 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 4) ; <i32> [#uses=1] %tmp5 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 4) ; <i32> [#uses=1]
@ -27,7 +27,7 @@ define i32 @t2() {
define i32 @t3() { define i32 @t3() {
; CHECK: t3: ; CHECK: t3:
; CHECK: stmfd sp!, {r7, lr} ; CHECK: stmfd sp!, {r7, lr}
; CHECK: ldmfd sp!, {r7, pc} ; CHECK: ldmfd.w sp!, {r7, pc}
%tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 1) ; <i32> [#uses=1] %tmp = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 1) ; <i32> [#uses=1]
%tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 2) ; <i32> [#uses=1] %tmp3 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 2) ; <i32> [#uses=1]
%tmp5 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 3) ; <i32> [#uses=1] %tmp5 = load i32* getelementptr ([0 x i32]* @X, i32 0, i32 3) ; <i32> [#uses=1]