From 7751ad92daeea5a3502fbc266ae814baec5c03e6 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Sat, 22 Nov 2008 16:15:34 +0000 Subject: Make a convenient helper for printing offsets. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59872 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/AsmPrinter.h | 3 +++ lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 +++++++ lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp | 11 ++++------- lib/Target/ARM/AsmPrinter/Makefile | 4 ++-- lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp | 5 +---- lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp | 12 ++---------- lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp | 12 ++---------- 7 files changed, 21 insertions(+), 33 deletions(-) diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index d3850a5fb3..3b79b11f9d 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -362,6 +362,9 @@ namespace llvm { /// this is suported by the target. void printVisibility(const std::string& Name, unsigned Visibility) const; + /// printOffset - This is just convenient handler for printing offsets. + void printOffset(int64_t Offset) const; + private: const GlobalValue *findGlobalValue(const Constant* CV); void EmitLLVMUsedList(Constant *List); diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index a641d0bf9e..bfc2e35cf3 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1526,6 +1526,13 @@ void AsmPrinter::printVisibility(const std::string& Name, } } +void AsmPrinter::printOffset(int64_t Offset) const { + if (Offset > 0) + O << '+' << Offset; + else if (Offset < 0) + O << Offset; +} + GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(GCStrategy *S) { if (!S->usesMetadata()) return 0; diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index 36cd98eb92..ae6c3544bb 100644 --- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -300,12 +300,9 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int opNum, FnStubs.insert(Name); } else O << Name; - - if (MO.getOffset() > 0) - O << '+' << MO.getOffset(); - else if (MO.getOffset() < 0) - O << MO.getOffset(); - + + printOffset(MO.getOffset()); + if (isCallOp && Subtarget->isTargetELF() && TM.getRelocationModel() == Reloc::PIC_) O << "(PLT)"; @@ -345,7 +342,7 @@ static void printSOImm(raw_ostream &O, int64_t V, const TargetAsmInfo *TAI) { assert(V < (1 << 12) && "Not a valid so_imm value!"); unsigned Imm = ARM_AM::getSOImmValImm(V); unsigned Rot = ARM_AM::getSOImmValRot(V); - + // Print low-level immediate formation info, per // A5.1.3: "Data-processing operands - Immediate". if (Rot) { diff --git a/lib/Target/ARM/AsmPrinter/Makefile b/lib/Target/ARM/AsmPrinter/Makefile index a896681594..4063036f54 100644 --- a/lib/Target/ARM/AsmPrinter/Makefile +++ b/lib/Target/ARM/AsmPrinter/Makefile @@ -1,4 +1,4 @@ -##===- lib/Target/X86/Makefile -----------------------------*- Makefile -*-===## +##===- lib/Target/ARM/Makefile -----------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -9,7 +9,7 @@ LEVEL = ../../../.. LIBRARYNAME = LLVMARMAsmPrinter -# Hack: we need to include 'main' x86 target directory to grab private headers +# Hack: we need to include 'main' arm target directory to grab private headers CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. include $(LEVEL)/Makefile.common diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp index 3043b0098b..07797438b5 100644 --- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp @@ -398,10 +398,7 @@ void PPCAsmPrinter::printOp(const MachineOperand &MO) { } O << Name; - if (MO.getOffset() > 0) - O << "+" << MO.getOffset(); - else if (MO.getOffset() < 0) - O << MO.getOffset(); + printOffset(MO.getOffset()); if (GV->hasExternalWeakLinkage()) ExtWeakSymbols.insert(GV); diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index 556757aaab..66319c3981 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -344,11 +344,7 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo, O << "@GOTOFF"; } - int Offset = MO.getOffset(); - if (Offset > 0) - O << '+' << Offset; - else if (Offset < 0) - O << Offset; + printOffset(MO.getOffset()); if (isMemOp && Subtarget->isPICStyleRIPRel() && !NotRIPRel) O << "(%rip)"; @@ -429,11 +425,7 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo, if (GV->hasExternalWeakLinkage()) ExtWeakSymbols.insert(GV); - int Offset = MO.getOffset(); - if (Offset > 0) - O << '+' << Offset; - else if (Offset < 0) - O << Offset; + printOffset(MO.getOffset()); if (isThreadLocal) { if (TM.getRelocationModel() == Reloc::PIC_ || Subtarget->is64Bit()) diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp index 4868906a04..1d4a695bfc 100644 --- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp @@ -235,11 +235,7 @@ void X86IntelAsmPrinter::printOp(const MachineOperand &MO, if (!isMemOp) O << "OFFSET "; O << "[" << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << "_" << MO.getIndex(); - int Offset = MO.getOffset(); - if (Offset > 0) - O << " + " << Offset; - else if (Offset < 0) - O << Offset; + printOffset(MO.getOffset()); O << "]"; return; } @@ -258,11 +254,7 @@ void X86IntelAsmPrinter::printOp(const MachineOperand &MO, O << "__imp_"; } O << Name; - int Offset = MO.getOffset(); - if (Offset > 0) - O << " + " << Offset; - else if (Offset < 0) - O << Offset; + printOffset(MO.getOffset()); return; } case MachineOperand::MO_ExternalSymbol: { -- cgit v1.2.3