Changes in directory llvm/lib/Target/PowerPC:
PPCCodeEmitter.cpp updated: 1.63 -> 1.64 PPCJITInfo.cpp updated: 1.24 -> 1.25 PPCJITInfo.h updated: 1.9 -> 1.10 --- Log message: - Refactor the code that resolve basic block references to a TargetJITInfo method. - Added synchronizeICache() to TargetJITInfo. It is called after each block of code is emitted to flush the icache. This ensures correct execution on targets that have separate dcache and icache. - Added PPC / Mac OS X specific code to do icache flushing. --- Diffs of the changes: (+43 -27) PPCCodeEmitter.cpp | 32 +++++--------------------------- PPCJITInfo.cpp | 35 +++++++++++++++++++++++++++++++++++ PPCJITInfo.h | 3 +++ 3 files changed, 43 insertions(+), 27 deletions(-) Index: llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp diff -u llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.63 llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.64 --- llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp:1.63 Wed Jul 12 16:23:20 2006 +++ llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp Tue Jul 25 15:40:54 2006 @@ -32,9 +32,6 @@ TargetMachine &TM; MachineCodeEmitter &MCE; - // Tracks which instruction references which BasicBlock - std::vector<std::pair<MachineBasicBlock*, unsigned*> > BBRefs; - /// getMachineOpValue - evaluates the MachineOperand of a given MachineInstr /// int getMachineOpValue(MachineInstr &MI, MachineOperand &MO); @@ -80,39 +77,20 @@ return false; } +#ifdef __APPLE__ +extern "C" void sys_icache_invalidate(const void *Addr, size_t len); +#endif + bool PPCCodeEmitter::runOnMachineFunction(MachineFunction &MF) { assert((MF.getTarget().getRelocationModel() != Reloc::Default || MF.getTarget().getRelocationModel() != Reloc::Static) && "JIT relocation model must be set to static or default!"); do { - BBRefs.clear(); - MCE.startFunction(MF); for (MachineFunction::iterator BB = MF.begin(), E = MF.end(); BB != E; ++BB) emitBasicBlock(*BB); } while (MCE.finishFunction(MF)); - // Resolve branches to BasicBlocks for the entire function - for (unsigned i = 0, e = BBRefs.size(); i != e; ++i) { - intptr_t Location = MCE.getMachineBasicBlockAddress(BBRefs[i].first); - unsigned *Ref = BBRefs[i].second; - DEBUG(std::cerr << "Fixup @ " << (void*)Ref << " to " << (void*)Location - << "\n"); - unsigned Instr = *Ref; - intptr_t BranchTargetDisp = (Location - (intptr_t)Ref) >> 2; - - switch (Instr >> 26) { - default: assert(0 && "Unknown branch user!"); - case 18: // This is B or BL - *Ref |= (BranchTargetDisp & ((1 << 24)-1)) << 2; - break; - case 16: // This is BLT,BLE,BEQ,BGE,BGT,BNE, or other bcx instruction - *Ref |= (BranchTargetDisp & ((1 << 14)-1)) << 2; - break; - } - } - BBRefs.clear(); - return false; } @@ -203,7 +181,7 @@ Reloc, MO.getSymbolName(), 0)); } else if (MO.isMachineBasicBlock()) { unsigned* CurrPC = (unsigned*)(intptr_t)MCE.getCurrentPCValue(); - BBRefs.push_back(std::make_pair(MO.getMachineBasicBlock(), CurrPC)); + TM.getJITInfo()->addBBRef(MO.getMachineBasicBlock(), (intptr_t)CurrPC); } else if (MO.isConstantPoolIndex() || MO.isJumpTableIndex()) { if (MO.isConstantPoolIndex()) rv = MCE.getConstantPoolEntryAddress(MO.getConstantPoolIndex()); Index: llvm/lib/Target/PowerPC/PPCJITInfo.cpp diff -u llvm/lib/Target/PowerPC/PPCJITInfo.cpp:1.24 llvm/lib/Target/PowerPC/PPCJITInfo.cpp:1.25 --- llvm/lib/Target/PowerPC/PPCJITInfo.cpp:1.24 Wed Jul 12 16:23:20 2006 +++ llvm/lib/Target/PowerPC/PPCJITInfo.cpp Tue Jul 25 15:40:54 2006 @@ -16,7 +16,9 @@ #include "PPCRelocations.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/Config/alloca.h" +#include "llvm/Support/Debug.h" #include <set> +#include <iostream> using namespace llvm; static TargetJITInfo::JITCompilerFn JITCompilerFunction; @@ -243,3 +245,36 @@ void PPCJITInfo::replaceMachineCodeForFunction(void *Old, void *New) { EmitBranchToAt(Old, New, false); } + +void PPCJITInfo::resolveBBRefs(MachineCodeEmitter &MCE) { + // Resolve branches to BasicBlocks for the entire function + for (unsigned i = 0, e = BBRefs.size(); i != e; ++i) { + intptr_t Location = MCE.getMachineBasicBlockAddress(BBRefs[i].first); + unsigned *Ref = (unsigned *)BBRefs[i].second; + DEBUG(std::cerr << "Fixup @ " << (void*)Ref << " to " << (void*)Location + << "\n"); + unsigned Instr = *Ref; + intptr_t BranchTargetDisp = (Location - (intptr_t)Ref) >> 2; + + switch (Instr >> 26) { + default: assert(0 && "Unknown branch user!"); + case 18: // This is B or BL + *Ref |= (BranchTargetDisp & ((1 << 24)-1)) << 2; + break; + case 16: // This is BLT,BLE,BEQ,BGE,BGT,BNE, or other bcx instruction + *Ref |= (BranchTargetDisp & ((1 << 14)-1)) << 2; + break; + } + } + BBRefs.clear(); +} + +#ifdef __APPLE__ +extern "C" void sys_icache_invalidate(const void *Addr, size_t len); +#endif + +void PPCJITInfo::synchronizeICache(const void *Addr, size_t Len) { +#ifdef __APPLE__ + sys_icache_invalidate(Addr, Len); +#endif +} Index: llvm/lib/Target/PowerPC/PPCJITInfo.h diff -u llvm/lib/Target/PowerPC/PPCJITInfo.h:1.9 llvm/lib/Target/PowerPC/PPCJITInfo.h:1.10 --- llvm/lib/Target/PowerPC/PPCJITInfo.h:1.9 Mon Mar 13 17:20:37 2006 +++ llvm/lib/Target/PowerPC/PPCJITInfo.h Tue Jul 25 15:40:54 2006 @@ -42,6 +42,9 @@ /// code. /// virtual void replaceMachineCodeForFunction(void *Old, void *New); + + virtual void resolveBBRefs(MachineCodeEmitter &MCE); + virtual void synchronizeICache(const void *Addr, size_t Len); }; } _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits