[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86IntelAsmPrinter.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.66 -> 1.67
X86IntelAsmPrinter.cpp updated: 1.59 -> 1.60
---
Log message:

Pass the MachineFunction into EmitJumpTableInfo.


---
Diffs of the changes:  (+8 -4)

 X86ATTAsmPrinter.cpp   |    9 +++++----
 X86IntelAsmPrinter.cpp |    3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.66 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.67
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.66	Wed Oct  4 21:43:52 2006
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Wed Oct  4 22:01:21 2006
@@ -126,10 +126,11 @@
     }
   }
 
-  // Print out jump tables referenced by the function
-  // Mac OS X requires at least one non-local (e.g. L1) labels before local
-  // lables that are used in jump table expressions (e.g. LBB1_1-LJT1_0).
-  EmitJumpTableInfo(MF.getJumpTableInfo());
+  // Print out jump tables referenced by the function.
+  
+  // Mac OS X requires that the jump table follow the function, so that the jump
+  // table is part of the same atom that the function is in.
+  EmitJumpTableInfo(MF.getJumpTableInfo(), MF);
   
   if (TAI->hasDotTypeDotSizeDirective())
     O << "\t.size " << CurrentFnName << ", .-" << CurrentFnName << "\n";


Index: llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.59 llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.60
--- llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.59	Wed Oct  4 21:43:52 2006
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.cpp	Wed Oct  4 22:01:21 2006
@@ -85,6 +85,9 @@
     }
   }
 
+  // Print out jump tables referenced by the function.
+  EmitJumpTableInfo(MF.getJumpTableInfo(), MF);
+
   O << CurrentFnName << "\tendp\n";
 
   // We didn't modify anything.