mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-21 03:32:21 +00:00
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18223 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
5efb75daed
commit
b752a97ca4
@ -33,9 +33,9 @@ namespace {
|
||||
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 @@ bool PPC32CodeEmitter::runOnMachineFunction(MachineFunction &MF) {
|
||||
}
|
||||
|
||||
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 @@ int PPC32CodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) {
|
||||
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?");
|
||||
|
Loading…
x
Reference in New Issue
Block a user