[llvm-commits] [llvm] r80605 - in /llvm/trunk/lib/Target/X86/AsmPrinter: X86ATTAsmPrinter.cpp X86ATTAsmPrinter.h

[Daniel Dunbar]

Author: ddunbar
Date: Mon Aug 31 14:14:05 2009
New Revision: 80605

URL: http://llvm.org/viewvc/llvm-project?rev=80605&view=rev
Log:
X86/exp-asm-printer: Lower MachineOperand::MO_JumpTableIndex to MCOperand.
 - Down to 7 failures on 403.gcc.

Modified:
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=80605&r1=80604&r2=80605&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Mon Aug 31 14:14:05 2009
@@ -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::
-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 @@
   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 @@
       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;

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h?rev=80605&r1=80604&r2=80605&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h Mon Aug 31 14:14:05 2009
@@ -69,6 +69,7 @@
   // 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);