RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Turns out that Thumb2 ADR doesn't need special printing like LDR does. Fix other test failures I caused.

Browse Source 
llvm-svn: 140284
This commit is contained in:
Owen Anderson 2011-09-21 23:53:44 +00:00
parent 7b134fe54c
commit 22ab29756b
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,6 @@ def t2ldrlabel : Operand<i32> {
// ADR instruction labels.
def t2adrlabel : Operand<i32> {
let EncoderMethod = "getT2AdrLabelOpValue";
let PrintMethod = "printT2AdrLabelOperand";
}

12
lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
View File

@ -222,18 +222,6 @@ void ARMInstPrinter::printT2LdrLabelOperand(const MCInst *MI, unsigned OpNum,
llvm_unreachable("Unknown LDR label operand?");
}
void ARMInstPrinter::printT2AdrLabelOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O) {
const MCOperand &MO1 = MI->getOperand(OpNum);
if (MO1.isExpr())
O << *MO1.getExpr();
else if (MO1.isImm())
O << "[pc, #" << MO1.getImm() << "]";
else
llvm_unreachable("Unknown LDR label operand?");
}
// so_reg is a 4-operand unit corresponding to register forms of the A5.1
// "Addressing Mode 1 - Data-processing operands" forms. This includes:
// REG 0 0 - e.g. R5

1
lib/Target/ARM/InstPrinter/ARMInstPrinter.h
View File

@ -128,7 +128,6 @@ public:
void printPCLabel(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printT2LdrLabelOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printT2AdrLabelOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
};
} // end namespace llvm

6
test/MC/ARM/basic-thumb2-instructions.s
View File

@ -890,11 +890,13 @@ _func:
@ LDRSH(literal)
@------------------------------------------------------------------------------
ldrsh r5, _bar
ldrsh.w r4, #1435
@ CHECK: ldrsh.w r5, _bar @ encoding: [0xbf'A',0xf9'A',A,0x50'A']
@ CHECK: @ fixup A - offset: 0, value: _bar, kind: fixup_t2_ldst_pcrel_12
@ CHECK: ldrsh.w r4, #1435 @ encoding: [0x3f,0xf9,0x9b,0x45]
@ TEMPORARILY DISABLED:
@ ldrsh.w r4, [pc, #1435]
@ : ldrsh.w r4, [pc, #1435] @ encoding: [0x3f,0xf9,0x9b,0x45]
@------------------------------------------------------------------------------
@ LDRSHT