[llvm-commits] [llvm] r52418 - in /llvm/trunk: include/llvm/Target/TargetJITInfo.h lib/ExecutionEngine/JIT/JITEmitter.cpp lib/Target/PowerPC/PPCCodeEmitter.cpp lib/Target/PowerPC/PPCJITInfo.cpp lib/Target/PowerPC/PPCJITInfo.h

[Chris Lattner]

On Jun 17, 2008, at 10:30 AM, Anton Korobeynikov wrote:
> URL: http://llvm.org/viewvc/llvm-project?rev=52418&view=rev
> Log:
> Provide generic hooks for icache invalidation. Add PPC implementation.
> Patch by Gary Benson!

Shouldn't this be a function in libsystem?

-Chris

>
>
> Modified:
>    llvm/trunk/include/llvm/Target/TargetJITInfo.h
>    llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp
>    llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp
>    llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp
>    llvm/trunk/lib/Target/PowerPC/PPCJITInfo.h
>
> Modified: llvm/trunk/include/llvm/Target/TargetJITInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetJITInfo.h?rev=52418&r1=52417&r2=52418&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/include/llvm/Target/TargetJITInfo.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetJITInfo.h Tue Jun 17  
> 12:30:05 2008
> @@ -94,6 +94,11 @@
>       assert(NumRelocs == 0 && "This target does not have  
> relocations!");
>     }
>
> +    /// InvalidateInstructionCache - Before the JIT can run a block  
> of code
> +    // that has been emitted it must invalidate the instruction  
> cache on some
> +    // platforms.
> +    virtual void InvalidateInstructionCache(const void *Addr,  
> unsigned len) {}
> +
>     /// needsGOT - Allows a target to specify that it would like the
>     // JIT to manage a GOT for it.
>     bool needsGOT() const { return useGOT; }
>
> Modified: llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp?rev=52418&r1=52417&r2=52418&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp (original)
> +++ llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp Tue Jun 17  
> 12:30:05 2008
> @@ -145,20 +145,6 @@
>
> JITResolver *JITResolver::TheJITResolver = 0;
>
> -#if (defined(__POWERPC__) || defined (__ppc__) || defined(_POWER))  
> && \
> -    defined(__APPLE__)
> -extern "C" void sys_icache_invalidate(const void *Addr, size_t len);
> -#endif
> -
> -/// synchronizeICache - On some targets, the JIT emitted code must be
> -/// explicitly refetched to ensure correct execution.
> -static void synchronizeICache(const void *Addr, size_t len) {
> -#if (defined(__POWERPC__) || defined (__ppc__) || defined(_POWER))  
> && \
> -    defined(__APPLE__)
> -  sys_icache_invalidate(Addr, len);
> -#endif
> -}
> -
> /// getFunctionStub - This returns a pointer to a function stub,  
> creating
> /// one on demand as needed.
> void *JITResolver::getFunctionStub(Function *F) {
> @@ -756,7 +742,7 @@
>   }
>
>   // Invalidate the icache if necessary.
> -  synchronizeICache(FnStart, FnEnd-FnStart);
> +  TheJIT->getJITInfo().InvalidateInstructionCache(FnStart, FnEnd- 
> FnStart);
>
>   // Add it to the JIT symbol table if the host wants it.
>   AddFunctionToSymbolTable(F.getFunction()->getNameStart(),
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp?rev=52418&r1=52417&r2=52418&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCCodeEmitter.cpp Tue Jun 17  
> 12:30:05 2008
> @@ -80,10 +80,6 @@
>   return new PPCCodeEmitter(TM, MCE);
> }
>
> -#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) &&
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp?rev=52418&r1=52417&r2=52418&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp Tue Jun 17 12:30:05  
> 2008
> @@ -330,12 +330,9 @@
> extern "C" void sys_icache_invalidate(const void *Addr, size_t len);
> #endif
>
> -/// SyncICache - On PPC, the JIT emitted code must be explicitly  
> refetched to
> -/// ensure correct execution.
> -static void SyncICache(const void *Addr, size_t len) {
> -#if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER)
> -
> -#ifdef __APPLE__
> +void PPCJITInfo::InvalidateInstructionCache(const void *Addr,  
> unsigned len) {
> +#if (defined(__POWERPC__) || defined (__ppc__) || defined(_POWER))  
> && \
> +defined(__APPLE__)
>   sys_icache_invalidate(Addr, len);
> #elif defined(__GNUC__)
>   const size_t LineSize = 32;
> @@ -352,8 +349,6 @@
>       asm volatile("icbi 0, %0" : : "r"(Line));
>   asm volatile("isync");
> #endif
> -
> -#endif
> }
>
> void *PPCJITInfo::emitFunctionStub(const Function* F, void *Fn,
> @@ -372,7 +367,7 @@
>     MCE.emitWordBE(0);
>     MCE.emitWordBE(0);
>     EmitBranchToAt(Addr, (intptr_t)Fn, false, is64Bit);
> -    SyncICache((void*)Addr, 7*4);
> +    InvalidateInstructionCache((void*)Addr, 7*4);
>     return MCE.finishFunctionStub(F);
>   }
>
> @@ -400,7 +395,7 @@
>   MCE.emitWordBE(0);
>   MCE.emitWordBE(0);
>   EmitBranchToAt(BranchAddr, (intptr_t)Fn, true, is64Bit);
> -  SyncICache((void*)Addr, 10*4);
> +  InvalidateInstructionCache((void*)Addr, 10*4);
>   return MCE.finishFunctionStub(F);
> }
>
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCJITInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCJITInfo.h?rev=52418&r1=52417&r2=52418&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.h (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.h Tue Jun 17 12:30:05  
> 2008
> @@ -41,6 +41,11 @@
>     /// code.
>     ///
>     virtual void replaceMachineCodeForFunction(void *Old, void *New);
> +
> +    /// InvalidateInstructionCache - Before the JIT can run a block  
> of code
> +    // that has been emitted it must invalidate the instruction  
> cache on some
> +    // platforms.
> +    virtual void InvalidateInstructionCache(const void *Addr,  
> unsigned len);
>   };
> }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits