mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-04-09 03:01:17 +00:00
Revise ARM inline assembly memory operands to require the memory address to
be in a register. The previous use of ARM address mode 2 was completely arbitrary and inappropriate for Thumb. Radar 7137468. llvm-svn: 84022
This commit is contained in:
parent
7db511a23e
commit
d66a3fd73b
@ -2156,14 +2156,10 @@ bool ARMDAGToDAGISel::
|
||||
SelectInlineAsmMemoryOperand(const SDValue &Op, char ConstraintCode,
|
||||
std::vector<SDValue> &OutOps) {
|
||||
assert(ConstraintCode == 'm' && "unexpected asm memory constraint");
|
||||
|
||||
SDValue Base, Offset, Opc;
|
||||
if (!SelectAddrMode2(Op, Op, Base, Offset, Opc))
|
||||
return true;
|
||||
|
||||
OutOps.push_back(Base);
|
||||
OutOps.push_back(Offset);
|
||||
OutOps.push_back(Opc);
|
||||
// Require the address to be in a register. That is safe for all ARM
|
||||
// variants and it is hard to do anything much smarter without knowing
|
||||
// how the operand is used.
|
||||
OutOps.push_back(Op);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1017,7 +1017,10 @@ bool ARMAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
|
||||
const char *ExtraCode) {
|
||||
if (ExtraCode && ExtraCode[0])
|
||||
return true; // Unknown modifier.
|
||||
printAddrMode2Operand(MI, OpNum);
|
||||
|
||||
const MachineOperand &MO = MI->getOperand(OpNum);
|
||||
assert(MO.isReg() && "unexpected inline asm memory operand");
|
||||
O << "[" << getRegisterName(MO.getReg()) << "]";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
; RUN: llc < %s -march=arm | grep swp
|
||||
; RUN: llc < %s -march=arm | FileCheck %s
|
||||
; RUN: llc < %s -march=thumb | FileCheck %s
|
||||
; PR4091
|
||||
|
||||
define void @foo(i32 %i, i32* %p) nounwind {
|
||||
;CHECK: swp r2, r0, [r1]
|
||||
%asmtmp = call i32 asm sideeffect "swp $0, $2, $3", "=&r,=*m,r,*m,~{memory}"(i32* %p, i32 %i, i32* %p) nounwind
|
||||
ret void
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user