[llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp

[Jim Laskey]

Changes in directory llvm/lib/ExecutionEngine/JIT:

JITEmitter.cpp updated: 1.122 -> 1.123
---
Log message:

Simplify the fetching of relocation  mode.

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

 JITEmitter.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.122 llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.123
--- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.122	Thu Dec 14 13:17:33 2006
+++ llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp	Thu Dec 14 16:53:42 2006
@@ -701,7 +701,7 @@
     
     void emitConstantPool(MachineConstantPool *MCP);
     void initJumpTableInfo(MachineJumpTableInfo *MJTI);
-    void emitJumpTableInfo(MachineJumpTableInfo *MJTI, Reloc::Model RM);
+    void emitJumpTableInfo(MachineJumpTableInfo *MJTI);
     
     virtual void startFunctionStub(unsigned StubSize, unsigned Alignment = 1);
     virtual void* finishFunctionStub(const Function *F);
@@ -792,7 +792,7 @@
     abort();
   }
   
-  emitJumpTableInfo(F.getJumpTableInfo(), F.getTarget().getRelocationModel());
+  emitJumpTableInfo(F.getJumpTableInfo());
   
   // FnStart is the start of the text, not the start of the constant pool and
   // other per-function data.
@@ -915,11 +915,11 @@
   JumpTableBase = allocateSpace(NumEntries * EntrySize, MJTI->getAlignment());
 }
 
-void JITEmitter::emitJumpTableInfo(MachineJumpTableInfo *MJTI, Reloc::Model RM){
+void JITEmitter::emitJumpTableInfo(MachineJumpTableInfo *MJTI) {
   const std::vector<MachineJumpTableEntry> &JT = MJTI->getJumpTables();
   if (JT.empty() || JumpTableBase == 0) return;
   
-  if (RM == Reloc::PIC_) {
+  if (TargetMachine::getRelocationModel() == Reloc::PIC_) {
     assert(MJTI->getEntrySize() == 4 && "Cross JIT'ing?");
     // For each jump table, place the offset from the beginning of the table
     // to the target address.