6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-20 14:29:27 +00:00
Code Issues Projects Releases Wiki Activity

rename JIT::state -> JIT::jitstate to avoid shadowing ExecutionEngine::state

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36286 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-04-20 22:40:05 +00:00
parent a5f5a9c8e2
commit 2c639add5f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ExecutionEngine/JIT/JIT.cpp
View File

@ -50,7 +50,7 @@ namespace llvm {
} }
JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji) JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji)
: ExecutionEngine(MP), TM(tm), TJI(tji), state(MP) { : ExecutionEngine(MP), TM(tm), TJI(tji), jitstate(MP) {
setTargetData(TM.getTargetData()); setTargetData(TM.getTargetData());
// Initialize MCE // Initialize MCE
@ -58,7 +58,7 @@ JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji)
// Add target data // Add target data
MutexGuard locked(lock); MutexGuard locked(lock);
FunctionPassManager &PM = state.getPM(locked); FunctionPassManager &PM = jitstate.getPM(locked);
PM.add(new TargetData(*TM.getTargetData())); PM.add(new TargetData(*TM.getTargetData()));
// Turn the machine code intermediate representation into bytes in memory that // Turn the machine code intermediate representation into bytes in memory that
@ -235,15 +235,15 @@ void JIT::runJITOnFunction(Function *F) {
// JIT the function // JIT the function
isAlreadyCodeGenerating = true; isAlreadyCodeGenerating = true;
state.getPM(locked).run(*F); jitstate.getPM(locked).run(*F);
isAlreadyCodeGenerating = false; isAlreadyCodeGenerating = false;
// If the function referred to a global variable that had not yet been // If the function referred to a global variable that had not yet been
// emitted, it allocates memory for the global, but doesn't emit it yet. Emit // emitted, it allocates memory for the global, but doesn't emit it yet. Emit
// all of these globals now. // all of these globals now.
while (!state.getPendingGlobals(locked).empty()) { while (!jitstate.getPendingGlobals(locked).empty()) {
const GlobalVariable *GV = state.getPendingGlobals(locked).back(); const GlobalVariable *GV = jitstate.getPendingGlobals(locked).back();
state.getPendingGlobals(locked).pop_back(); jitstate.getPendingGlobals(locked).pop_back();
EmitGlobalVariable(GV); EmitGlobalVariable(GV);
} }
} }
@ -335,7 +335,7 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
unsigned MisAligned = ((intptr_t)Ptr & (A-1)); unsigned MisAligned = ((intptr_t)Ptr & (A-1));
Ptr = (char*)Ptr + (MisAligned ? (A-MisAligned) : 0); Ptr = (char*)Ptr + (MisAligned ? (A-MisAligned) : 0);
} }
state.getPendingGlobals(locked).push_back(GV); jitstate.getPendingGlobals(locked).push_back(GV);
} }
addGlobalMapping(GV, Ptr); addGlobalMapping(GV, Ptr);
return Ptr; return Ptr;

2
lib/ExecutionEngine/JIT/JIT.h
View File

@ -54,7 +54,7 @@ class JIT : public ExecutionEngine {
TargetJITInfo &TJI; // The JITInfo for the target we are compiling to TargetJITInfo &TJI; // The JITInfo for the target we are compiling to
MachineCodeEmitter *MCE; // MCE object MachineCodeEmitter *MCE; // MCE object
JITState state; JITState jitstate;
JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji); JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji);
public: public: