From ec2e4679fd06c1a31f04f2f312f87d924ce43957 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 31 Aug 2009 19:14:05 +0000 Subject: [PATCH] X86/exp-asm-printer: Lower MachineOperand::MO_JumpTableIndex to MCOperand. - Down to 7 failures on 403.gcc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80605 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../X86/AsmPrinter/X86ATTAsmPrinter.cpp | 35 ++++++++++++++++++- lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h | 1 + 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index 60d8238dfac..078750c1304 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -24,6 +24,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Type.h" +#include "llvm/ADT/SmallString.h" #include "llvm/ADT/Statistic.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Assembly/Writer.h" @@ -810,7 +811,7 @@ MCOperand X86ATTAsmPrinter::LowerGlobalAddressOperand(const MachineOperand &MO){ } MCOperand X86ATTAsmPrinter:: -LowerExternalSymbolOperand(const MachineOperand &MO){ +LowerExternalSymbolOperand(const MachineOperand &MO) { std::string Name = Mang->makeNameProper(MO.getSymbolName()); if (MO.getTargetFlags() == X86II::MO_DARWIN_STUB) { FnStubs[Name+"$stub"] = Name; @@ -829,6 +830,35 @@ LowerExternalSymbolOperand(const MachineOperand &MO){ return MCOperand::CreateExpr(Expr); } +MCOperand X86ATTAsmPrinter::LowerJumpTableOperand(const MachineOperand &MO) { + SmallString<256> Name; + raw_svector_ostream(Name) << MAI->getPrivateGlobalPrefix() << "JTI" + << getFunctionNumber() << '_' << MO.getIndex(); + + MCSymbol *NegatedSymbol = 0; + switch (MO.getTargetFlags()) { + default: + llvm_unreachable("Unknown target flag on GV operand"); + case X86II::MO_PIC_BASE_OFFSET: + case X86II::MO_DARWIN_NONLAZY_PIC_BASE: + case X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE: + // Subtract the pic base. + NegatedSymbol = GetPICBaseSymbol(); + break; + } + + // Create a symbol for the name. + MCSymbol *Sym = OutContext.GetOrCreateSymbol(Name.str()); + // FIXME: We would like an efficient form for this, so we don't have to do a + // lot of extra uniquing. + const MCExpr *Expr = MCSymbolRefExpr::Create(Sym, OutContext); + if (NegatedSymbol) + Expr = MCBinaryExpr::CreateSub(Expr, MCSymbolRefExpr::Create(NegatedSymbol, + OutContext), + OutContext); + return MCOperand::CreateExpr(Expr); +} + /// printMachineInstruction -- Print out a single X86 LLVM instruction MI in /// AT&T syntax to the current output stream. @@ -895,6 +925,9 @@ void X86ATTAsmPrinter::printMachineInstruction(const MachineInstr *MI) { O.flush(); errs() << "Cannot lower operand #" << i << " of :" << *MI; llvm_unreachable("Unimp"); + case MachineOperand::MO_JumpTableIndex: + MCOp = LowerJumpTableOperand(MO); + break; case MachineOperand::MO_Register: MCOp = MCOperand::CreateReg(MO.getReg()); break; diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h index ef8ba6c14d4..56cf255a9a2 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h @@ -69,6 +69,7 @@ class VISIBILITY_HIDDEN X86ATTAsmPrinter : public AsmPrinter { // New MCInst printing stuff. void printInstruction(const MCInst *MI); MCSymbol *GetPICBaseSymbol(); + MCOperand LowerJumpTableOperand(const MachineOperand &MO); MCOperand LowerGlobalAddressOperand(const MachineOperand &MO); MCOperand LowerExternalSymbolOperand(const MachineOperand &MO);