[vmkit-commits] [vmkit] r108817 - in /vmkit/trunk/lib/J3: Classpath/JavaUpcalls.cpp Classpath/JavaUpcalls.h Compiler/JavaAOTCompiler.cpp VMCore/JavaClass.cpp VMCore/JavaConstantPool.cpp VMCore/JavaTypes.cpp VMCore/Jnjvm.cpp VMCore/JnjvmClassLoader.cpp VMCore/JnjvmClassLoader.h
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Jul 20 01:17:44 PDT 2010
Author: geoffray
Date: Tue Jul 20 03:17:44 2010
New Revision: 108817
URL: http://llvm.org/viewvc/llvm-project?rev=108817&view=rev
Log:
Remove some default parameter values (we never know what the compiler might do with it).
Modified:
vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp Tue Jul 20 03:17:44 2010
@@ -939,10 +939,10 @@
"Ljava/lang/Class;", ACC_VIRTUAL);
loader->loadName(loader->asciizConstructUTF8("java/lang/String"),
- true, false);
+ true, false, NULL);
loader->loadName(loader->asciizConstructUTF8("java/lang/Object"),
- true, false);
+ true, false, NULL);
// Don't compile methods here, we still don't know where to allocate Java
// strings.
Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h Tue Jul 20 03:17:44 2010
@@ -15,7 +15,7 @@
#include "JnjvmConfig.h"
#define UPCALL_CLASS(vm, name) \
- vm->loadName(vm->asciizConstructUTF8(name), true, false)
+ vm->loadName(vm->asciizConstructUTF8(name), true, false, NULL)
#define UPCALL_PRIMITIVE_CLASS(loader, name, nb) \
new(loader->allocator, "Primitive class") \
Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Tue Jul 20 03:17:44 2010
@@ -2044,7 +2044,7 @@
}
const UTF8* utf8 = bootstrapLoader->asciizConstructUTF8(realName);
- UserClass* cl = bootstrapLoader->loadName(utf8, true, true);
+ UserClass* cl = bootstrapLoader->loadName(utf8, true, true, NULL);
if (!M->clinits->empty()) {
vm->loadBootstrap();
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Tue Jul 20 03:17:44 2010
@@ -686,7 +686,7 @@
uint16 superEntry = reader.readU2();
if (superEntry) {
const UTF8* superUTF8 = ctpInfo->resolveClassName(superEntry);
- super = classLoader->loadName(superUTF8, false, true);
+ super = classLoader->loadName(superUTF8, false, true, NULL);
}
uint16 nbI = reader.readU2();
@@ -698,7 +698,7 @@
// in anon-cooperative environment.
for (int i = 0; i < nbI; i++) {
const UTF8* name = ctpInfo->resolveClassName(reader.readU2());
- interfaces[i] = classLoader->loadName(name, false, true);
+ interfaces[i] = classLoader->loadName(name, false, true, NULL);
}
nbInterfaces = nbI;
@@ -1431,11 +1431,11 @@
// so that the secondary type list of array VTs can reference them.
ClassArray::InterfacesArray[0] =
JCL->loadName(JCL->asciizConstructUTF8("java/lang/Cloneable"),
- true, false);
+ true, false, NULL);
ClassArray::InterfacesArray[1] =
JCL->loadName(JCL->asciizConstructUTF8("java/io/Serializable"),
- true, false);
+ true, false, NULL);
// Load base array classes that JnJVM internally uses. Now that the interfaces
// have been loaded, the secondary type can be safely created.
Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp Tue Jul 20 03:17:44 2010
@@ -289,7 +289,7 @@
if (name->elements[0] == I_TAB) {
temp = loader->constructArray(name);
} else {
- temp = loader->loadName(name, resolve, false);
+ temp = loader->loadName(name, resolve, false, NULL);
}
ctpRes[index] = temp;
}
Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp Tue Jul 20 03:17:44 2010
@@ -21,7 +21,7 @@
}
UserCommonClass* ObjectTypedef::assocClass(JnjvmClassLoader* loader) const {
- return loader->loadName(pseudoAssocClassName, false, true);
+ return loader->loadName(pseudoAssocClassName, false, true, NULL);
}
UserCommonClass* ObjectTypedef::findAssocClass(JnjvmClassLoader* loader) const {
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Tue Jul 20 03:17:44 2010
@@ -1195,8 +1195,8 @@
obj, &javaLoader);
// load and initialise math since it is responsible for dlopen'ing
// libjavalang.so and we are optimizing some math operations
- UserCommonClass* math =
- loader->loadName(loader->asciizConstructUTF8("java/lang/Math"), true, true);
+ UserCommonClass* math = loader->loadName(
+ loader->asciizConstructUTF8("java/lang/Math"), true, true, NULL);
math->asClass()->initialiseClass(this);
}
@@ -1217,7 +1217,7 @@
// If not, load the class.
if (cl == NULL) {
const UTF8* name = appClassLoader->asciizConstructUTF8(className);
- cl = (UserClass*)appClassLoader->loadName(name, true, true);
+ cl = (UserClass*)appClassLoader->loadName(name, true, true, NULL);
}
cl->initialiseClass(this);
@@ -1256,7 +1256,8 @@
llvm_gcroot(instrumenter, 0);
TRY {
const UTF8* name = appClassLoader->asciizConstructUTF8(className);
- UserClass* cl = (UserClass*)appClassLoader->loadName(name, true, true);
+ UserClass* cl = (UserClass*)
+ appClassLoader->loadName(name, true, true, NULL);
cl->initialiseClass(this);
const UTF8* funcSign = appClassLoader->asciizConstructUTF8(
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Tue Jul 20 03:17:44 2010
@@ -521,7 +521,7 @@
const UTF8* componentName = lookupComponentName(name, holder, prim);
if (prim) return constructArray(name);
if (componentName) {
- UserCommonClass* temp = loadName(componentName, doResolve, doThrow);
+ UserCommonClass* temp = loadName(componentName, doResolve, doThrow, NULL);
if (temp) return constructArray(name);
}
} else {
@@ -558,7 +558,7 @@
if (temp) return temp;
}
- return loadClassFromUserUTF8(name, doResolve, doThrow);
+ return loadClassFromUserUTF8(name, doResolve, doThrow, NULL);
}
@@ -631,7 +631,7 @@
} else if (name->elements[start] == I_REF) {
const UTF8* componentName = name->extract(hashUTF8,
start + 1, start + len - 1);
- UserCommonClass* cl = loadName(componentName, false, true);
+ UserCommonClass* cl = loadName(componentName, false, true, NULL);
return cl;
} else {
Classpath* upcalls = bootstrapLoader->upcalls;
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=108817&r1=108816&r2=108817&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Tue Jul 20 03:17:44 2010
@@ -66,7 +66,7 @@
/// internalLoad - Load the class with the given name.
///
virtual UserClass* internalLoad(const UTF8* utf8, bool doResolve,
- JavaString* strName = 0);
+ JavaString* strName);
/// internalConstructType - Hashes a Typedef, an internal representation of
/// a class still not loaded.
@@ -157,13 +157,13 @@
/// loadName - Loads the class of the given name.
///
UserClass* loadName(const UTF8* name, bool doResolve, bool doThrow,
- JavaString* strName = 0);
+ JavaString* strName);
/// loadClassFromUTF8 - Lookup a class from an UTF8 name and load it.
///
UserCommonClass* loadClassFromUserUTF8(const UTF8* utf8,
bool doResolve, bool doThrow,
- JavaString* strName = 0);
+ JavaString* strName);
/// loadClassFromAsciiz - Lookup a class from an asciiz name and load it.
///
@@ -308,7 +308,7 @@
/// internalLoad - Load the class with the given name.
///
virtual UserClass* internalLoad(const UTF8* utf8, bool doResolve,
- JavaString* strName = 0);
+ JavaString* strName);
/// bootClasspath - List of paths for the base classes.
///
@@ -347,7 +347,7 @@
/// if dlLoad is not false.
///
JnjvmBootstrapLoader(mvm::BumpPtrAllocator& Alloc, JavaCompiler* Comp,
- bool dlLoad = true);
+ bool dlLoad);
virtual JavaString** UTF8ToStr(const UTF8* utf8);
More information about the vmkit-commits
mailing list