From f52c68f0ca9bf21972a488b3d0c05db82b68d5a1 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 21 Sep 2011 23:44:46 +0000 Subject: Print out immediate offset versions of PC-relative load/store instructions as [pc, #123] rather than simply #123. llvm-svn: 140283 --- llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp | 23 ++++++++++++++++++++++ llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h | 2 ++ 2 files changed, 25 insertions(+) (limited to 'llvm/lib/Target/ARM/InstPrinter') diff --git a/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp b/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp index 16bb25ab292..251b447886c 100644 --- a/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp +++ b/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp @@ -211,6 +211,29 @@ void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, } } +void ARMInstPrinter::printT2LdrLabelOperand(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?"); +} + +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 diff --git a/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h b/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h index 4f18958e5c6..bc1394e3f92 100644 --- a/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h +++ b/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h @@ -127,6 +127,8 @@ public: void printRotImmOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O); 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 -- cgit v1.2.3