[vmkit-commits] [vmkit] r58251 - in /vmkit/trunk: include/mvm/CompilationUnit.h lib/JnJVM/VMCore/JavaClass.cpp lib/JnJVM/VMCore/JavaConstantPool.cpp lib/JnJVM/VMCore/JavaJIT.h lib/JnJVM/VMCore/JavaTypes.cpp lib/JnJVM/VMCore/JavaUpcalls.cpp lib/JnJVM/VMCore/JnjvmClassLoader.cpp lib/JnJVM/VMCore/JnjvmClassLoader.h lib/JnJVM/VMCore/JnjvmModule.cpp lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Mon Oct 27 09:13:20 PDT 2008
Author: geoffray
Date: Mon Oct 27 11:13:20 2008
New Revision: 58251
URL: http://llvm.org/viewvc/llvm-project?rev=58251&view=rev
Log:
The llvm::Module is in the compilation unit.
Modified:
vmkit/trunk/include/mvm/CompilationUnit.h
vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h
vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
Modified: vmkit/trunk/include/mvm/CompilationUnit.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/CompilationUnit.h?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/CompilationUnit.h (original)
+++ vmkit/trunk/include/mvm/CompilationUnit.h Mon Oct 27 11:13:20 2008
@@ -27,7 +27,6 @@
class CompilationUnit : public mvm::Object {
public:
llvm::Module* TheModule;
- llvm::ModuleProvider* TheModuleProvider;
};
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Mon Oct 27 11:13:20 2008
@@ -878,7 +878,7 @@
cl->loadParents();
cl->acquire();
cl->status = prepared;
- classLoader->TheModule->resolveVirtualClass(cl);
+ classLoader->getModule()->resolveVirtualClass(cl);
cl->status = resolved;
}
release();
@@ -981,5 +981,5 @@
}
void Class::resolveStaticClass() {
- classLoader->TheModule->resolveStaticClass((Class*)this);
+ classLoader->getModule()->resolveStaticClass((Class*)this);
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp Mon Oct 27 11:13:20 2008
@@ -413,7 +413,7 @@
false, 0);
if (meth) {
// don't throw if no meth, the exception will be thrown just in time
- JnjvmModule* M = classDef->classLoader->TheModule;
+ JnjvmModule* M = classDef->classLoader->getModule();
void* F = M->getMethod(meth);
return F;
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h Mon Oct 27 11:13:20 2008
@@ -68,7 +68,7 @@
nbEnveloppes = 0;
compilingMethod = meth;
compilingClass = meth->classDef;
- module = compilingClass->classLoader->TheModule;
+ module = compilingClass->classLoader->getModule();
llvmFunction = func;
inlining = false;
callsStackWalker = false;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp Mon Oct 27 11:13:20 2008
@@ -196,7 +196,7 @@
intptr_t Signdef::staticCallBuf() {
if (!_staticCallBuf) {
- LLVMSignatureInfo* LSI = initialLoader->TheModule->getSignatureInfo(this);
+ LLVMSignatureInfo* LSI = initialLoader->getModule()->getSignatureInfo(this);
LSI->getStaticBuf();
}
return _staticCallBuf;
@@ -204,7 +204,7 @@
intptr_t Signdef::virtualCallBuf() {
if (!_virtualCallBuf) {
- LLVMSignatureInfo* LSI = initialLoader->TheModule->getSignatureInfo(this);
+ LLVMSignatureInfo* LSI = initialLoader->getModule()->getSignatureInfo(this);
LSI->getVirtualBuf();
}
return _virtualCallBuf;
@@ -212,7 +212,7 @@
intptr_t Signdef::staticCallAP() {
if (!_staticCallAP) {
- LLVMSignatureInfo* LSI = initialLoader->TheModule->getSignatureInfo(this);
+ LLVMSignatureInfo* LSI = initialLoader->getModule()->getSignatureInfo(this);
LSI->getStaticAP();
}
return _staticCallAP;
@@ -220,7 +220,7 @@
intptr_t Signdef::virtualCallAP() {
if (!_virtualCallAP) {
- LLVMSignatureInfo* LSI = initialLoader->TheModule->getSignatureInfo(this);
+ LLVMSignatureInfo* LSI = initialLoader->getModule()->getSignatureInfo(this);
LSI->getVirtualAP();
}
return _virtualCallAP;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp Mon Oct 27 11:13:20 2008
@@ -430,11 +430,11 @@
JavaMethod* internString =
UPCALL_METHOD(loader, "java/lang/VMString", "intern",
"(Ljava/lang/String;)Ljava/lang/String;", ACC_STATIC);
- loader->TheModule->setMethod(internString, "internString");
+ loader->getModule()->setMethod(internString, "internString");
JavaMethod* isArray =
UPCALL_METHOD(loader, "java/lang/Class", "isArray", "()Z", ACC_VIRTUAL);
- loader->TheModule->setMethod(isArray, "isArray");
+ loader->getModule()->setMethod(isArray, "isArray");
UPCALL_REFLECT_CLASS_EXCEPTION(loader, InvocationTargetException);
@@ -594,17 +594,17 @@
JavaMethod* getCallingClass =
UPCALL_METHOD(loader, "gnu/classpath/VMStackWalker", "getCallingClass",
"()Ljava/lang/Class;", ACC_STATIC);
- loader->TheModule->setMethod(getCallingClass, "getCallingClass");
+ loader->getModule()->setMethod(getCallingClass, "getCallingClass");
JavaMethod* getCallingClassLoader =
UPCALL_METHOD(loader, "gnu/classpath/VMStackWalker", "getCallingClassLoader",
"()Ljava/lang/ClassLoader;", ACC_STATIC);
- loader->TheModule->setMethod(getCallingClassLoader, "getCallingClassLoader");
+ loader->getModule()->setMethod(getCallingClassLoader, "getCallingClassLoader");
JavaMethod* postProperties =
UPCALL_METHOD(loader, "gnu/classpath/VMSystemProperties", "postInit",
"(Ljava/util/Properties;)V", ACC_STATIC);
- loader->TheModule->setMethod(postProperties, "propertiesPostInit");
+ loader->getModule()->setMethod(postProperties, "propertiesPostInit");
}
extern "C" JavaString* internString(JavaString* obj) {
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Mon Oct 27 11:13:20 2008
@@ -44,7 +44,7 @@
JnjvmModule::initialise();
TheModule = new JnjvmModule("Bootstrap JnJVM");
- TheModuleProvider = new JnjvmModuleProvider(TheModule);
+ TheModuleProvider = new JnjvmModuleProvider(getModule());
hashUTF8 = new(allocator) UTF8Map(allocator, 0);
classes = new(allocator) ClassMap();
@@ -224,7 +224,7 @@
JnjvmClassLoader::JnjvmClassLoader(JnjvmClassLoader& JCL, JavaObject* loader,
Jnjvm* I) {
TheModule = new JnjvmModule("Applicative loader");
- TheModuleProvider = new JnjvmModuleProvider(TheModule);
+ TheModuleProvider = new JnjvmModuleProvider(getModule());
bootstrapLoader = JCL.bootstrapLoader;
hashUTF8 = new(allocator) UTF8Map(allocator,
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Mon Oct 27 11:13:20 2008
@@ -112,7 +112,9 @@
/// TheModule - JIT module for compiling methods.
///
- JnjvmModule* TheModule;
+ JnjvmModule* getModule() {
+ return (JnjvmModule*)TheModule;
+ }
/// TheModuleProvider - JIT module provider for dynamic class loading and
/// lazy compilation.
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Mon Oct 27 11:13:20 2008
@@ -444,7 +444,7 @@
field.ptrOffset = sl->getElementOffset(i + 1);
}
- JnjvmModule* Mod = classDef->classLoader->TheModule;
+ JnjvmModule* Mod = classDef->classLoader->getModule();
VirtualTable* VT = Mod->makeVT((Class*)classDef, false);
uint64 size = mvm::MvmModule::getTypeSize(structType);
@@ -484,7 +484,7 @@
}
- JnjvmModule* Mod = cl->classLoader->TheModule;
+ JnjvmModule* Mod = cl->classLoader->getModule();
VirtualTable* VT = Mod->makeVT((Class*)classDef, true);
uint64 size = mvm::MvmModule::getTypeSize(structType);
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp?rev=58251&r1=58250&r2=58251&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Mon Oct 27 11:13:20 2008
@@ -151,7 +151,7 @@
}
const llvm::FunctionType* type = 0;
- JnjvmModule* M = cl->classLoader->TheModule;
+ JnjvmModule* M = cl->classLoader->getModule();
LLVMSignatureInfo* LSI = M->getSignatureInfo(sign);
if (stat) {
More information about the vmkit-commits
mailing list