From f141cc46faf6f0525f0baa10b6a6c976301874a5 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Thu, 27 Jul 2006 18:21:10 +0000 Subject: [PATCH] Resolve BB references with relocation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29351 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetJITInfo.h | 14 ------------ lib/ExecutionEngine/JIT/JITEmitter.cpp | 7 ++---- lib/Target/Alpha/AlphaCodeEmitter.cpp | 5 +++-- lib/Target/Alpha/AlphaJITInfo.cpp | 16 ------------- lib/Target/Alpha/AlphaJITInfo.h | 2 -- lib/Target/PowerPC/PPCCodeEmitter.cpp | 12 ++++++++-- lib/Target/PowerPC/PPCJITInfo.cpp | 31 +++++++------------------- lib/Target/PowerPC/PPCJITInfo.h | 2 -- lib/Target/PowerPC/PPCRelocations.h | 4 ++++ lib/Target/X86/X86CodeEmitter.cpp | 3 ++- lib/Target/X86/X86JITInfo.cpp | 10 --------- lib/Target/X86/X86JITInfo.h | 2 -- 12 files changed, 29 insertions(+), 79 deletions(-) diff --git a/include/llvm/Target/TargetJITInfo.h b/include/llvm/Target/TargetJITInfo.h index 26c7d38333f..b7fd2d4c39a 100644 --- a/include/llvm/Target/TargetJITInfo.h +++ b/include/llvm/Target/TargetJITInfo.h @@ -83,26 +83,12 @@ namespace llvm { assert(NumRelocs == 0 && "This target does not have relocations!"); } - /// resolveBBRefs - Resolve branches to BasicBlocks for the JIT emitted - /// function. - virtual void resolveBBRefs(MachineCodeEmitter &MCE) {} - - /// addBBRef - Add a BasicBlock reference to be resolved after the function - /// is emitted. - void addBBRef(MachineBasicBlock *BB, intptr_t PC) { - BBRefs.push_back(std::make_pair(BB, PC)); - } - /// needsGOT - Allows a target to specify that it would like the // JIT to manage a GOT for it. bool needsGOT() const { return useGOT; } protected: bool useGOT; - - // Tracks which instruction references which BasicBlock - std::vector > BBRefs; - }; } // End llvm namespace diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index e048189fc2e..dc9ba28371e 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -807,13 +807,13 @@ bool JITEmitter::finishFunction(MachineFunction &F) { ResultPtr = getPointerToGlobal(MR.getGlobalValue(), BufferBegin+MR.getMachineCodeOffset(), MR.doesntNeedFunctionStub()); + } else if (MR.isBasicBlock()) { + ResultPtr = (void*)getMachineBasicBlockAddress(MR.getBasicBlock()); } else if (MR.isConstantPoolIndex()){ - assert(MR.isConstantPoolIndex()); ResultPtr=(void*)getConstantPoolEntryAddress(MR.getConstantPoolIndex()); } else { assert(MR.isJumpTableIndex()); ResultPtr=(void*)getJumpTableEntryAddress(MR.getJumpTableIndex()); - } MR.setResultPointer(ResultPtr); @@ -846,9 +846,6 @@ bool JITEmitter::finishFunction(MachineFunction &F) { } } - // Resolve BasicaBlock references. - TheJIT->getJITInfo().resolveBBRefs(*this); - // Invalidate the icache if necessary. synchronizeICache(FnStart, FnEnd-FnStart); diff --git a/lib/Target/Alpha/AlphaCodeEmitter.cpp b/lib/Target/Alpha/AlphaCodeEmitter.cpp index 7a3c550d83d..82f31da0078 100644 --- a/lib/Target/Alpha/AlphaCodeEmitter.cpp +++ b/lib/Target/Alpha/AlphaCodeEmitter.cpp @@ -215,8 +215,9 @@ int AlphaCodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) { Reloc, MO.getConstantPoolIndex(), Offset)); } else if (MO.isMachineBasicBlock()) { - TM.getJITInfo()->addBBRef(MO.getMachineBasicBlock(), - MCE.getCurrentPCValue()); + MCE.addRelocation(MachineRelocation::getBB(MCE.getCurrentPCOffset(), + Alpha::reloc_bsr, + MO.getMachineBasicBlock())); }else { std::cerr << "ERROR: Unknown type of MachineOperand: " << MO << "\n"; abort(); diff --git a/lib/Target/Alpha/AlphaJITInfo.cpp b/lib/Target/Alpha/AlphaJITInfo.cpp index 8dc5a479603..81f5e743aa2 100644 --- a/lib/Target/Alpha/AlphaJITInfo.cpp +++ b/lib/Target/Alpha/AlphaJITInfo.cpp @@ -304,19 +304,3 @@ void AlphaJITInfo::relocate(void *Function, MachineRelocation *MR, } } } - -void AlphaJITInfo::resolveBBRefs(MachineCodeEmitter &MCE) { - // Resolve all forward branches now... - for (unsigned i = 0, e = BBRefs.size(); i != e; ++i) { - unsigned* Location = - (unsigned*)MCE.getMachineBasicBlockAddress(BBRefs[i].first); - unsigned* Ref = (unsigned*)BBRefs[i].second; - intptr_t BranchTargetDisp = - (((unsigned char*)Location - (unsigned char*)Ref) >> 2) - 1; - DEBUG(std::cerr << "Fixup @ " << (void*)Ref << " to " << (void*)Location - << " Disp " << BranchTargetDisp - << " using " << (BranchTargetDisp & ((1 << 22)-1)) << "\n"); - *Ref |= (BranchTargetDisp & ((1 << 21)-1)); - } - BBRefs.clear(); -} diff --git a/lib/Target/Alpha/AlphaJITInfo.h b/lib/Target/Alpha/AlphaJITInfo.h index 68663f2cd1d..7d1416ecf6d 100644 --- a/lib/Target/Alpha/AlphaJITInfo.h +++ b/lib/Target/Alpha/AlphaJITInfo.h @@ -46,8 +46,6 @@ namespace llvm { /// code. /// virtual void replaceMachineCodeForFunction(void *Old, void *New); - - virtual void resolveBBRefs(MachineCodeEmitter &MCE); private: static const unsigned GOToffset = 4096; diff --git a/lib/Target/PowerPC/PPCCodeEmitter.cpp b/lib/Target/PowerPC/PPCCodeEmitter.cpp index 73b0436fd18..49d3f25f8c2 100644 --- a/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -180,8 +180,16 @@ int PPCCodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) { MCE.addRelocation(MachineRelocation::getExtSym(MCE.getCurrentPCOffset(), Reloc, MO.getSymbolName(), 0)); } else if (MO.isMachineBasicBlock()) { - unsigned* CurrPC = (unsigned*)(intptr_t)MCE.getCurrentPCValue(); - TM.getJITInfo()->addBBRef(MO.getMachineBasicBlock(), (intptr_t)CurrPC); + unsigned Reloc = 0; + unsigned Opcode = MI.getOpcode(); + if (Opcode == PPC::B || Opcode == PPC::BL || Opcode == PPC::BLA) + Reloc = PPC::reloc_pcrel_bx; + else + // BLT,BLE,BEQ,BGE,BGT,BNE, or other bcx instruction + Reloc = PPC::reloc_pcrel_bcx; + MCE.addRelocation(MachineRelocation::getBB(MCE.getCurrentPCOffset(), + Reloc, + MO.getMachineBasicBlock())); } else if (MO.isConstantPoolIndex() || MO.isJumpTableIndex()) { if (MO.isConstantPoolIndex()) rv = MCE.getConstantPoolEntryAddress(MO.getConstantPoolIndex()); diff --git a/lib/Target/PowerPC/PPCJITInfo.cpp b/lib/Target/PowerPC/PPCJITInfo.cpp index 27e2659a65c..11942b283c2 100644 --- a/lib/Target/PowerPC/PPCJITInfo.cpp +++ b/lib/Target/PowerPC/PPCJITInfo.cpp @@ -206,6 +206,14 @@ void PPCJITInfo::relocate(void *Function, MachineRelocation *MR, "Relocation out of range!"); *RelocPos |= (ResultPtr & ((1 << 24)-1)) << 2; break; + case PPC::reloc_pcrel_bcx: + // PC-relative relocation for BLT,BLE,BEQ,BGE,BGT,BNE, or other + // bcx instructions. + ResultPtr = (ResultPtr-(intptr_t)RelocPos) >> 2; + assert(ResultPtr >= -(1 << 13) && ResultPtr < (1 << 13) && + "Relocation out of range!"); + *RelocPos |= (ResultPtr & ((1 << 14)-1)) << 2; + break; case PPC::reloc_absolute_ptr_high: // Pointer relocations. case PPC::reloc_absolute_ptr_low: case PPC::reloc_absolute_high: // high bits of ref -> low 16 of instr @@ -245,26 +253,3 @@ void PPCJITInfo::relocate(void *Function, MachineRelocation *MR, 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(); -} diff --git a/lib/Target/PowerPC/PPCJITInfo.h b/lib/Target/PowerPC/PPCJITInfo.h index a97fc2e9171..245cf9ad902 100644 --- a/lib/Target/PowerPC/PPCJITInfo.h +++ b/lib/Target/PowerPC/PPCJITInfo.h @@ -42,8 +42,6 @@ namespace llvm { /// code. /// virtual void replaceMachineCodeForFunction(void *Old, void *New); - - virtual void resolveBBRefs(MachineCodeEmitter &MCE); }; } diff --git a/lib/Target/PowerPC/PPCRelocations.h b/lib/Target/PowerPC/PPCRelocations.h index 09115e3ebc1..8cb2859d1f7 100644 --- a/lib/Target/PowerPC/PPCRelocations.h +++ b/lib/Target/PowerPC/PPCRelocations.h @@ -28,6 +28,10 @@ namespace llvm { // reloc_pcrel_bx - PC relative relocation, for the b or bl instructions. reloc_pcrel_bx, + // reloc_pcrel_bcx - PC relative relocation, for BLT,BLE,BEQ,BGE,BGT,BNE, + // and other bcx instructions. + reloc_pcrel_bcx, + // reloc_absolute_high - Absolute relocation, for the loadhi instruction // (which is really addis). Add the high 16-bits of the specified global // address into the low 16-bits of the instruction. diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index 31b4bdf1852..dee58cf4342 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -111,7 +111,8 @@ void Emitter::emitPCRelativeValue(unsigned Address) { void Emitter::emitPCRelativeBlockAddress(MachineBasicBlock *MBB) { // Remember where this reference was and where it is to so we can // deal with it later. - TM.getJITInfo()->addBBRef(MBB, MCE.getCurrentPCValue()); + MCE.addRelocation(MachineRelocation::getBB(MCE.getCurrentPCOffset(), + X86::reloc_pcrel_word, MBB)); MCE.emitWordLE(0); } diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp index 9fd8029962d..9bb2a725233 100644 --- a/lib/Target/X86/X86JITInfo.cpp +++ b/lib/Target/X86/X86JITInfo.cpp @@ -203,13 +203,3 @@ void X86JITInfo::relocate(void *Function, MachineRelocation *MR, } } } - -void X86JITInfo::resolveBBRefs(MachineCodeEmitter &MCE) { - // Resolve all forward branches now. - for (unsigned i = 0, e = BBRefs.size(); i != e; ++i) { - unsigned Location = MCE.getMachineBasicBlockAddress(BBRefs[i].first); - intptr_t Ref = BBRefs[i].second; - *((unsigned*)Ref) = Location-Ref-4; - } - BBRefs.clear(); -} diff --git a/lib/Target/X86/X86JITInfo.h b/lib/Target/X86/X86JITInfo.h index f9e437e41b1..02e54af11af 100644 --- a/lib/Target/X86/X86JITInfo.h +++ b/lib/Target/X86/X86JITInfo.h @@ -51,8 +51,6 @@ namespace llvm { /// referenced global symbols. virtual void relocate(void *Function, MachineRelocation *MR, unsigned NumRelocs, unsigned char* GOTBase); - - virtual void resolveBBRefs(MachineCodeEmitter &MCE); }; } -- 2.34.1