[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPC32CodeEmitter.cpp updated: 1.22 -> 1.23
---
Log message:

Calls do not need a MovPCtoLR instruction


---
Diffs of the changes:  (+6 -3)

Index: llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.22 llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.23
--- llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.22	Tue Nov 23 19:56:12 2004
+++ llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp	Tue Nov 23 20:00:06 2004
@@ -190,19 +190,22 @@
     rv = MO.getImmedValue();
   } else if (MO.isGlobalAddress()) {
     unsigned Reloc = 0;
+    int Offset = 0;
     if (MI.getOpcode() == PPC::CALLpcrel)
       Reloc = PPC::reloc_pcrel_bx;
     else if (MI.getOpcode() == PPC::LOADHiAddr) {
+      assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");
       Reloc = PPC::reloc_absolute_loadhi;
+      Offset = -((intptr_t)MovePCtoLROffset+4);
     } else if (MI.getOpcode() == PPC::LA) {
+      assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");
       Reloc = PPC::reloc_absolute_la;
+      Offset = -((intptr_t)MovePCtoLROffset+4);
     } else {
       assert(0 && "Unknown instruction for relocation!");
     }
-    assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");
     MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(),
-                                        Reloc, MO.getGlobal(),
-                                        -((intptr_t)MovePCtoLROffset+4)));
+                                        Reloc, MO.getGlobal(), Offset));
   } else if (MO.isMachineBasicBlock()) {
     const BasicBlock *BB = MO.getMachineBasicBlock()->getBasicBlock();
     unsigned* CurrPC = (unsigned*)(intptr_t)MCE.getCurrentPCValue();