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

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPC32CodeEmitter.cpp updated: 1.25 -> 1.26
---
Log message:

There is not a 1-1 mappign between llvm blocks and PPC blocks, do not use
LLVM blocks as the keys for the branch rewriter.  This fixes treeadd and
many other programs with the JIT.


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

Index: llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.25 llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.26
--- llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.25	Wed Nov 24 16:30:08 2004
+++ llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp	Wed Nov 24 18:33:57 2004
@@ -33,9 +33,9 @@
     void *MovePCtoLROffset;
 
     // Tracks which instruction references which BasicBlock
-    std::vector<std::pair<const BasicBlock*, unsigned*> > BBRefs;
+    std::vector<std::pair<MachineBasicBlock*, unsigned*> > BBRefs;
     // Tracks where each BasicBlock starts
-    std::map<const BasicBlock*, long> BBLocations;
+    std::map<MachineBasicBlock*, long> BBLocations;
 
     /// getMachineOpValue - evaluates the MachineOperand of a given MachineInstr
     ///
@@ -120,7 +120,7 @@
 }
 
 void PPC32CodeEmitter::emitBasicBlock(MachineBasicBlock &MBB) {
-  BBLocations[MBB.getBasicBlock()] = MCE.getCurrentPCValue();
+  BBLocations[&MBB] = MCE.getCurrentPCValue();
   for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end(); I != E; ++I){
     MachineInstr &MI = *I;
     unsigned Opcode = MI.getOpcode();
@@ -223,9 +223,8 @@
     MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(),
                                         Reloc, MO.getGlobal(), Offset));
   } else if (MO.isMachineBasicBlock()) {
-    const BasicBlock *BB = MO.getMachineBasicBlock()->getBasicBlock();
     unsigned* CurrPC = (unsigned*)(intptr_t)MCE.getCurrentPCValue();
-    BBRefs.push_back(std::make_pair(BB, CurrPC));
+    BBRefs.push_back(std::make_pair(MO.getMachineBasicBlock(), CurrPC));
   } else if (MO.isConstantPoolIndex()) {
     unsigned index = MO.getConstantPoolIndex();
     assert(MovePCtoLROffset && "MovePCtoLR not seen yet?");