[vmkit-commits] [vmkit] r83971 - in /vmkit/trunk/lib/N3: Mono/Mono.cpp Mono/MonoMSCorlib.cpp PNetLib/PNetLib.cpp PNetLib/PNetMSCorlib.cpp VMCore/N3Initialise.cpp VMCore/VMThread.cpp VMCore/VMThread.h VMCore/VirtualTables.cpp
Gael Thomas
gael.thomas at lip6.fr
Tue Oct 13 07:51:54 PDT 2009
Author: gthomas
Date: Tue Oct 13 09:51:54 2009
New Revision: 83971
URL: http://llvm.org/viewvc/llvm-project?rev=83971&view=rev
Log:
Rename vmThread to ooo_appThread. All N3 references in C++ fields will be called ooo_*.
Modified:
vmkit/trunk/lib/N3/Mono/Mono.cpp
vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp
vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
vmkit/trunk/lib/N3/VMCore/VMThread.cpp
vmkit/trunk/lib/N3/VMCore/VMThread.h
vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp
Modified: vmkit/trunk/lib/N3/Mono/Mono.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Mono.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/Mono.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/Mono.cpp Tue Oct 13 09:51:54 2009
@@ -244,8 +244,8 @@
}
extern "C" VMObject* System_Threading_Thread_CurrentThread_internal() {
- declare_gcroot(VMObject*, res) = VMThread::get()->vmThread;
- return res;
+ declare_gcroot(VMObject*, appThread) = VMThread::get()->ooo_appThread;
+ return appThread;
}
extern "C" VMObject*
Modified: vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp Tue Oct 13 09:51:54 2009
@@ -167,8 +167,6 @@
vm->asciizToUTF8("Thread"),
vm->asciizToUTF8("System.Threading"),
true, true, true, true);
- VMObject* th = (*cl)();
- declare_gcroot(VMThread*, myth) = VMThread::get();
- myth->vmThread = th;
-
+ declare_gcroot(VMObject*, appThread) = (*cl)();
+ VMThread::get()->ooo_appThread = appThread;
}
Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Tue Oct 13 09:51:54 2009
@@ -1061,6 +1061,6 @@
}
extern "C" VMObject* System_Threading_Thread_InternalCurrentThread() {
- declare_gcroot(VMObject*, res) = VMThread::get()->vmThread;
- return res;
+ declare_gcroot(VMObject*, appThread) = VMThread::get()->ooo_appThread;
+ return appThread;
}
Modified: vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp Tue Oct 13 09:51:54 2009
@@ -172,16 +172,16 @@
vm->asciizToUTF8("Thread"),
vm->asciizToUTF8("System.Threading"),
true, true, true, true);
- VMObject* th = (*cl)();
+ declare_gcroot(VMObject*, appThread) = (*cl)();
std::vector<VMCommonClass*> args;
args.push_back(MSCorlib::pVoid);
args.push_back(cl);
args.push_back(MSCorlib::pIntPtr);
VMMethod* meth = cl->lookupMethod(vm->asciizToUTF8(".ctor"), args,
false, false);
- declare_gcroot(VMThread*, myth) = VMThread::get();
- (*meth)(th, myth);
- myth->vmThread = th;
+ VMThread* myth = VMThread::get();
+ (*meth)(appThread, myth);
+ myth->ooo_appThread = appThread;
}
void MSCorlib::loadBootstrap(N3* vm) {
Modified: vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp Tue Oct 13 09:51:54 2009
@@ -190,7 +190,6 @@
N3* vm = N3::bootstrapVM = N3::allocateBootstrap();
VMThread::TheThread = new VMThread(0, vm);
-
vm->assemblyPath.push_back("");
vm->assemblyPath.push_back(MSCorlib::libsPath);
Modified: vmkit/trunk/lib/N3/VMCore/VMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMThread.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMThread.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMThread.cpp Tue Oct 13 09:51:54 2009
@@ -29,9 +29,9 @@
const unsigned int VMThread::StateInterrupted = 2;
void VMThread::print(mvm::PrintBuffer* buf) const {
- buf->write("Thread:");
- declare_gcroot(VMObject *, th) = vmThread;
- th->print(buf);
+ buf->write("Thread<>");
+ declare_gcroot(VMObject *, appThread) = ooo_appThread;
+ appThread->print(buf);
}
extern void AddStandardCompilePasses(llvm::FunctionPassManager*);
@@ -40,10 +40,10 @@
delete perFunctionPasses;
}
-VMThread::VMThread(VMObject* thread, N3* vm) {
- llvm_gcroot(thread, 0);
+VMThread::VMThread(VMObject* appThread, N3* vm) {
+ llvm_gcroot(appThread, 0);
this->perFunctionPasses = 0;
- this->vmThread = thread;
+ this->ooo_appThread = appThread;
this->MyVM = vm;
this->lock = new mvm::LockNormal();
this->varcond = new mvm::Cond();
@@ -58,8 +58,8 @@
VMObject* VMThread::currentThread() {
VMThread* result = get();
if (result != 0) {
- declare_gcroot(VMObject *, res) = result->vmThread;
- return res;
+ declare_gcroot(VMObject *, appThread) = result->ooo_appThread;
+ return appThread;
} else
return 0;
}
Modified: vmkit/trunk/lib/N3/VMCore/VMThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMThread.h?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMThread.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMThread.h Tue Oct 13 09:51:54 2009
@@ -29,7 +29,7 @@
class VMThread : public mvm::MutatorThread {
public:
- VMObject* vmThread;
+ VMObject* ooo_appThread;
N3* getVM() {
return (N3*)MyVM;
Modified: vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp?rev=83971&r1=83970&r2=83971&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp Tue Oct 13 09:51:54 2009
@@ -67,8 +67,8 @@
// internal objects
void VMThread::TRACER {
- declare_gcroot(VMObject*, th) = vmThread;
- th->MARK_AND_TRACE;
+ declare_gcroot(VMObject*, appThread) = ooo_appThread;
+ appThread->MARK_AND_TRACE;
pendingException->MARK_AND_TRACE;
// I suppose that the vm is already traced by the gc
// vm->CALL_TRACER;
More information about the vmkit-commits
mailing list