Changes in directory llvm/lib/ExecutionEngine/JIT:
JITEmitter.cpp updated: 1.95 -> 1.96
---
Log message:
minor cleanups, no functionality change
---
Diffs of the changes: (+7 -7)
JITEmitter.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
Index: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.95
llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.96
--- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.95 Wed May 3 12:10:41 2006
+++ llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp Wed May 3 13:55:56 2006
@@ -487,20 +487,20 @@
// If the target REALLY wants a stub for this function, emit it now.
if (!MR.doesntNeedFunctionStub())
ResultPtr = getJITResolver(this).getExternalFunctionStub(ResultPtr);
- } else if (MR.isGlobalValue())
+ } else if (MR.isGlobalValue()) {
ResultPtr = getPointerToGlobal(MR.getGlobalValue(),
BufferBegin+MR.getMachineCodeOffset(),
MR.doesntNeedFunctionStub());
- else //ConstantPoolIndex
- ResultPtr =
- (void*)(intptr_t)getConstantPoolEntryAddress(MR.getConstantPoolIndex());
+ } else {
+ assert(MR.isConstantPoolIndex());
+
ResultPtr=(void*)getConstantPoolEntryAddress(MR.getConstantPoolIndex());
+ }
MR.setResultPointer(ResultPtr);
// if we are managing the GOT and the relocation wants an index,
// give it one
- if (MemMgr.isManagingGOT() && !MR.isConstantPoolIndex() &&
- MR.isGOTRelative()) {
+ if (MemMgr.isManagingGOT() && MR.isGOTRelative()) {
unsigned idx = getJITResolver(this).getGOTIndexForAddr(ResultPtr);
MR.setGOTIndex(idx);
if (((void**)MemMgr.getGOTBase())[idx] != ResultPtr) {
@@ -516,7 +516,7 @@
Relocations.size(), MemMgr.getGOTBase());
}
- //Update the GOT entry for F to point to the new code.
+ // Update the GOT entry for F to point to the new code.
if(MemMgr.isManagingGOT()) {
unsigned idx = getJITResolver(this).getGOTIndexForAddr((void*)BufferBegin);
if (((void**)MemMgr.getGOTBase())[idx] != (void*)BufferBegin) {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
