[vmkit-commits] [vmkit] r91568 - in /vmkit/trunk: include/j3/ include/mvm/ lib/J3/Classpath/ lib/J3/Compiler/ lib/J3/LLVMRuntime/ lib/J3/VMCore/ tools/j3/ tools/vmjc/ tools/vmkit/
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Dec 16 13:30:45 PST 2009
Author: geoffray
Date: Wed Dec 16 15:30:44 2009
New Revision: 91568
URL: http://llvm.org/viewvc/llvm-project?rev=91568&view=rev
Log:
Change namespace jnjvm to j3.
Modified:
vmkit/trunk/include/j3/JavaCompiler.h
vmkit/trunk/include/j3/JnjvmModule.h
vmkit/trunk/include/j3/JnjvmModuleProvider.h
vmkit/trunk/include/j3/OpcodeNames.def
vmkit/trunk/include/mvm/VirtualMachine.h
vmkit/trunk/lib/J3/Classpath/Classpath.h.in
vmkit/trunk/lib/J3/Classpath/Classpath.inc
vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc
vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc
vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc
vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc
vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
vmkit/trunk/lib/J3/Compiler/JavaJIT.h
vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll
vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll
vmkit/trunk/lib/J3/VMCore/JNIReferences.h
vmkit/trunk/lib/J3/VMCore/JavaAccess.h
vmkit/trunk/lib/J3/VMCore/JavaArray.cpp
vmkit/trunk/lib/J3/VMCore/JavaArray.h
vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
vmkit/trunk/lib/J3/VMCore/JavaClass.h
vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h
vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp
vmkit/trunk/lib/J3/VMCore/JavaLocks.h
vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.h
vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
vmkit/trunk/lib/J3/VMCore/JavaString.cpp
vmkit/trunk/lib/J3/VMCore/JavaString.h
vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
vmkit/trunk/lib/J3/VMCore/JavaThread.h
vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
vmkit/trunk/lib/J3/VMCore/JavaTypes.h
vmkit/trunk/lib/J3/VMCore/Jni.cpp
vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/J3/VMCore/Jnjvm.h
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h
vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h
vmkit/trunk/lib/J3/VMCore/LockedMap.cpp
vmkit/trunk/lib/J3/VMCore/LockedMap.h
vmkit/trunk/lib/J3/VMCore/Reader.cpp
vmkit/trunk/lib/J3/VMCore/Reader.h
vmkit/trunk/lib/J3/VMCore/UTF8.h
vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
vmkit/trunk/lib/J3/VMCore/Zip.cpp
vmkit/trunk/lib/J3/VMCore/Zip.h
vmkit/trunk/tools/j3/Main.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
vmkit/trunk/tools/vmkit/CommandLine.cpp
vmkit/trunk/tools/vmkit/CommandLine.h
vmkit/trunk/tools/vmkit/Launcher.cpp
Modified: vmkit/trunk/include/j3/JavaCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaCompiler.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaCompiler.h Wed Dec 16 15:30:44 2009
@@ -1,4 +1,4 @@
-//===------- JavaCompiler.h - Jnjvm interface for the compiler ------------===//
+//===---------- JavaCompiler.h - J3 interface for the compiler ------------===//
//
// The VMKit project
//
@@ -21,7 +21,7 @@
class UTF8;
}
-namespace jnjvm {
+namespace j3 {
class Class;
class CommonClass;
Modified: vmkit/trunk/include/j3/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JnjvmModule.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JnjvmModule.h (original)
+++ vmkit/trunk/include/j3/JnjvmModule.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===------- JnjvmModule.h - Definition of a Jnjvm module -----------------===//
+//===---------- JnjvmModule.h - Definition of a J3 module -----------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -33,7 +33,7 @@
class Value;
}
-namespace jnjvm {
+namespace j3 {
class ArrayObject;
class Attribut;
Modified: vmkit/trunk/include/j3/JnjvmModuleProvider.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JnjvmModuleProvider.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JnjvmModuleProvider.h (original)
+++ vmkit/trunk/include/j3/JnjvmModuleProvider.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===----- JnjvmModuleProvider.h - LLVM Module Provider for Jnjvm ---------===//
+//===-------- JnjvmModuleProvider.h - LLVM Module Provider for J3 ---------===//
//
-// Jnjvm
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -12,7 +12,7 @@
#include <llvm/ModuleProvider.h>
-namespace jnjvm {
+namespace j3 {
class JavaJITCompiler;
@@ -31,6 +31,6 @@
}
};
-} // End jnjvm namespace
+} // End j3 namespace
#endif
Modified: vmkit/trunk/include/j3/OpcodeNames.def
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/OpcodeNames.def?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/include/j3/OpcodeNames.def (original)
+++ vmkit/trunk/include/j3/OpcodeNames.def Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------------- OpcodeNames.def - Name of opcodes ---------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Wed Dec 16 15:30:44 2009
@@ -25,7 +25,7 @@
#include <cassert>
#include <map>
-namespace jnjvm {
+namespace j3 {
class JavaCompiler;
class JnjvmClassLoader;
}
@@ -269,9 +269,9 @@
/// waitForExit - Wait until the virtual machine stops its execution.
virtual void waitForExit() = 0;
- static jnjvm::JnjvmClassLoader* initialiseJVM(jnjvm::JavaCompiler* C,
+ static j3::JnjvmClassLoader* initialiseJVM(j3::JavaCompiler* C,
bool dlLoad = true);
- static VirtualMachine* createJVM(jnjvm::JnjvmClassLoader* C = 0);
+ static VirtualMachine* createJVM(j3::JnjvmClassLoader* C = 0);
static CompilationUnit* initialiseCLIVM();
static VirtualMachine* createCLIVM(CompilationUnit* C = 0);
Modified: vmkit/trunk/lib/J3/Classpath/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/Classpath.h.in?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/Classpath.h.in (original)
+++ vmkit/trunk/lib/J3/Classpath/Classpath.h.in Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- Classpath.h - Configuration for classpath -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
Modified: vmkit/trunk/lib/J3/Classpath/Classpath.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/Classpath.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/Classpath.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/Classpath.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- Classpath.cpp - Configuration for classpath -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===- ClasspathConstructor.cpp -------------------------------------------===//
//===----------- GNU classpath java/lang/reflect/Constructor --------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "Jnjvm.h"
#include "JnjvmClassLoader.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathField.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathField.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathField.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===- ClasspathVMField.cpp - GNU classpath java/lang/reflect/Field -------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===- ClasspathMethod.cpp ------------------------------------------------===//
//===------------- GNU classpath java/lang/reflect/Method -----------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "Jnjvm.h"
#include "JnjvmClassLoader.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h Wed Dec 16 15:30:44 2009
@@ -2,7 +2,7 @@
// java/lang/Class, java/lang/reflect/Field, java/lang/reflect/Method and ----//
// java/lang/reflect/Constructor as compiled by JnJVM. -----------------------//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -17,9 +17,9 @@
#include <JavaClass.h>
#include <JavaObject.h>
-extern "C" jnjvm::JavaObject* internalFillInStackTrace(jnjvm::JavaObject*);
+extern "C" j3::JavaObject* internalFillInStackTrace(j3::JavaObject*);
-namespace jnjvm {
+namespace j3 {
class JavaObjectClass : public JavaObject {
public:
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---- ClasspathVMClass.cpp - GNU classpath java/lang/VMClass ----------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===- ClasspathVMClassLoader.cpp - GNU classpath java/lang/VMClassLoader -===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
#include "Jnjvm.h"
#include "Reader.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------ ClasspathVMObject.cpp - GNU classpath java/lang/VMObject ------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------ ClasspathVMRuntime.cpp - GNU classpath java/lang/VMRuntime ----===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -25,7 +25,7 @@
#include <cstring>
#include <unistd.h>
-using namespace jnjvm;
+using namespace j3;
extern "C" {
@@ -81,8 +81,8 @@
#endif
typedef int (*onLoad_t)(const void**, void*);
-extern "C" void jnjvmEndJNI(uint32** old, void** oldBuf);
-extern "C" void jnjvmStartJNI(uint32* num, uint32** old, void* newBuf,
+extern "C" void j3EndJNI(uint32** old, void** oldBuf);
+extern "C" void j3StartJNI(uint32* num, uint32** old, void* newBuf,
void** oldBuf, mvm::KnownFrame* Frame);
extern "C" void callOnLoad(void* res, JnjvmClassLoader* loader, Jnjvm* vm)
@@ -103,11 +103,11 @@
if (setjmp(buf) == 0) {
// Push an unmeaningful value in the addresses field to let the
// stack consistent with Java frames/native frames.
- jnjvmStartJNI(&num, &old, (void*)&buf, &oldBuf, &Frame);
+ j3StartJNI(&num, &old, (void*)&buf, &oldBuf, &Frame);
onLoad(&vm->javavmEnv, res);
}
- jnjvmEndJNI(&old, &oldBuf);
+ j3EndJNI(&old, &oldBuf);
}
}
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===- ClasspathVMStackWalker.cpp -----------------------------------------===//
//===------------ GNU classpath gnu/classpath/VMStackWalker ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-- ClasspathVMSystem.cpp - GNU classpath java/lang/VMSystem ----------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
@@ -38,7 +38,7 @@
BEGIN_NATIVE_EXCEPTION(0)
- jnjvm::Jnjvm *vm = JavaThread::get()->getJVM();
+ j3::Jnjvm *vm = JavaThread::get()->getJVM();
verifyNull(src);
verifyNull(dst);
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===- ClasspathVMSystem/Properties.cpp -----------------------------------===//
//===--------------------- GNU classpath gnu/classpath/VMSystemProperties -===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===- ClasspathVMThread.cpp - GNU classpath java/lang/VMThread -----------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
@@ -43,9 +43,9 @@
// which is the JavaThread object.
JavaField* field = vm->upcalls->vmdataVMThread;
vmThread = thread->vmThread;
- assert(vmThread && "Didn't fix the vmThread of a jnjvm thread");
+ assert(vmThread && "Didn't fix the vmThread of a j3 thread");
JavaObject* javaThread = thread->javaThread;
- assert(javaThread && "Didn't fix the javaThread of a jnjvm thread");
+ assert(javaThread && "Didn't fix the javaThread of a j3 thread");
field->setObjectField(vmThread, (JavaObject*)(void*)thread);
UserClass* vmthClass = (UserClass*)vmThread->getClass();
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===- ClasspathVMClassLoader.cpp - GNU classpath java/lang/VMClassLoader -===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "Jnjvm.h"
#include "Reader.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" {
Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- JavaUpcalls.cpp - Upcalls to Java entities ------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -28,7 +28,7 @@
}
-using namespace jnjvm;
+using namespace j3;
#ifndef ISOLATE_SHARING
Class* Classpath::newThread;
Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---------- JavaUpcalls.h - Upcalls to Java entities ------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -51,7 +51,7 @@
loader->asciizConstructUTF8("(Ljava/lang/Throwable;)V"), \
false, false, 0);
-namespace jnjvm {
+namespace j3 {
class Jnjvm;
class JavaField;
@@ -270,6 +270,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JITInfo.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JITInfo.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------- JnjvmModule.cpp - Definition of a Jnjvm module -------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -33,7 +33,7 @@
#include <cstdio>
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
const Type* LLVMClassInfo::getVirtualType() {
@@ -148,13 +148,13 @@
char* buf = (char*)alloca(3 + JNI_NAME_PRE_LEN + 1 +
((mnlen + clen + mtlen) << 3));
- bool jnjvm = false;
+ bool j3 = false;
if (isNative(methodDef->access)) {
// Verify if it's defined by JnJVM
- JCL->nativeLookup(methodDef, jnjvm, buf);
+ JCL->nativeLookup(methodDef, j3, buf);
}
- if (!jnjvm) {
+ if (!j3) {
methodDef->jniConsFromMethOverloaded(buf + 1);
memcpy(buf, "JnJVM", 5);
}
Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----- JavaAOTCompiler.cpp - Support for Ahead of Time Compiler --------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -32,7 +32,7 @@
#include <cstdio>
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
bool JavaAOTCompiler::isCompiling(const CommonClass* cl) const {
@@ -1578,7 +1578,7 @@
llvm::FunctionPass* createEscapeAnalysisPass(llvm::Function*);
}
-namespace jnjvm {
+namespace j3 {
llvm::FunctionPass* createLowerConstantCallsPass();
}
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaJIT.cpp - Java just in time compiler -----------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -40,7 +40,7 @@
#include "j3/JnjvmModule.h"
#include "j3/JnjvmModuleProvider.h"
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
static bool needsInitialisationCheck(Class* cl, Class* compilingClass) {
@@ -230,7 +230,7 @@
return threadId;
}
-extern "C" void jnjvmThrowExceptionFromJIT();
+extern "C" void j3ThrowExceptionFromJIT();
llvm::Function* JavaJIT::nativeCompile(intptr_t natPtr) {
@@ -243,7 +243,7 @@
const FunctionType *funcType = llvmFunction->getFunctionType();
const llvm::Type* returnType = funcType->getReturnType();
- bool jnjvm = false;
+ bool j3 = false;
const UTF8* jniConsClName = compilingClass->name;
const UTF8* jniConsName = compilingMethod->name;
@@ -256,7 +256,7 @@
((mnlen + clen + mtlen) << 3));
if (!natPtr)
- natPtr = compilingClass->classLoader->nativeLookup(compilingMethod, jnjvm,
+ natPtr = compilingClass->classLoader->nativeLookup(compilingMethod, j3,
functionName);
if (!natPtr && !TheCompiler->isStaticCompiling()) {
@@ -276,7 +276,7 @@
Function* func = llvmFunction;
- if (jnjvm) {
+ if (j3) {
compilingMethod->setCompiledPtr((void*)natPtr, functionName);
llvmFunction->clearGC();
return llvmFunction;
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaJIT.h - Java just in time compiler -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
#include "JavaUpcalls.h"
#include "j3/JnjvmModule.h"
-namespace jnjvm {
+namespace j3 {
class Class;
class JavaMethod;
@@ -694,6 +694,6 @@
IMPDEP2 = 0xFF
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------- JavaJITCompiler.cpp - Support for JIT compiling -------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -31,7 +31,7 @@
#include "j3/JnjvmModule.h"
#include "j3/JnjvmModuleProvider.h"
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
class JavaJITListener : public llvm::JITEventListener {
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---- JavaJITOpcodes.cpp - Reads and compiles opcodes -----------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -39,7 +39,7 @@
#include "j3/OpcodeNames.def"
#endif
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
uint8 arrayType(JavaMethod* meth, unsigned int t) {
Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------- JnjvmModule.cpp - Definition of a Jnjvm module -------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
#include "j3/JnjvmModule.h"
#include "j3/JnjvmModuleProvider.h"
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
const llvm::Type* JnjvmModule::JavaObjectType = 0;
@@ -90,7 +90,7 @@
}
-namespace jnjvm {
+namespace j3 {
namespace llvm_runtime {
#include "LLVMRuntime.inc"
}
@@ -100,7 +100,7 @@
Module* module = globalModule;
if (!module->getTypeByName("JavaThread"))
- jnjvm::llvm_runtime::makeLLVMModuleContents(module);
+ j3::llvm_runtime::makeLLVMModuleContents(module);
VTType = PointerType::getUnqual(module->getTypeByName("VT"));
@@ -247,20 +247,20 @@
module->addTypeName("ArrayDouble", JavaArrayDoubleType->getContainedType(0));
module->addTypeName("ArrayObject", JavaArrayObjectType->getContainedType(0));
- InterfaceLookupFunction = module->getFunction("jnjvmInterfaceLookup");
- MultiCallNewFunction = module->getFunction("jnjvmMultiCallNew");
+ InterfaceLookupFunction = module->getFunction("j3InterfaceLookup");
+ MultiCallNewFunction = module->getFunction("j3MultiCallNew");
ForceLoadedCheckFunction = module->getFunction("forceLoadedCheck");
InitialisationCheckFunction = module->getFunction("initialisationCheck");
ForceInitialisationCheckFunction =
module->getFunction("forceInitialisationCheck");
- InitialiseClassFunction = module->getFunction("jnjvmRuntimeInitialiseClass");
+ InitialiseClassFunction = module->getFunction("j3RuntimeInitialiseClass");
GetConstantPoolAtFunction = module->getFunction("getConstantPoolAt");
ArrayLengthFunction = module->getFunction("arrayLength");
GetVTFunction = module->getFunction("getVT");
GetIMTFunction = module->getFunction("getIMT");
GetClassFunction = module->getFunction("getClass");
- ClassLookupFunction = module->getFunction("jnjvmClassLookup");
+ ClassLookupFunction = module->getFunction("j3ClassLookup");
GetVTFromClassFunction = module->getFunction("getVTFromClass");
GetVTFromClassArrayFunction = module->getFunction("getVTFromClassArray");
GetVTFromCommonClassFunction = module->getFunction("getVTFromCommonClass");
@@ -269,42 +269,42 @@
module->getFunction("getObjectSizeFromClass");
GetClassDelegateeFunction = module->getFunction("getClassDelegatee");
- RuntimeDelegateeFunction = module->getFunction("jnjvmRuntimeDelegatee");
+ RuntimeDelegateeFunction = module->getFunction("j3RuntimeDelegatee");
IsAssignableFromFunction = module->getFunction("isAssignableFrom");
IsSecondaryClassFunction = module->getFunction("isSecondaryClass");
GetDepthFunction = module->getFunction("getDepth");
GetStaticInstanceFunction = module->getFunction("getStaticInstance");
GetDisplayFunction = module->getFunction("getDisplay");
GetVTInDisplayFunction = module->getFunction("getVTInDisplay");
- AquireObjectFunction = module->getFunction("jnjvmJavaObjectAquire");
- ReleaseObjectFunction = module->getFunction("jnjvmJavaObjectRelease");
- OverflowThinLockFunction = module->getFunction("jnjvmOverflowThinLock");
-
- VirtualFieldLookupFunction = module->getFunction("jnjvmVirtualFieldLookup");
- StaticFieldLookupFunction = module->getFunction("jnjvmStaticFieldLookup");
- StringLookupFunction = module->getFunction("jnjvmStringLookup");
- StartJNIFunction = module->getFunction("jnjvmStartJNI");
- EndJNIFunction = module->getFunction("jnjvmEndJNI");
+ AquireObjectFunction = module->getFunction("j3JavaObjectAquire");
+ ReleaseObjectFunction = module->getFunction("j3JavaObjectRelease");
+ OverflowThinLockFunction = module->getFunction("j3OverflowThinLock");
+
+ VirtualFieldLookupFunction = module->getFunction("j3VirtualFieldLookup");
+ StaticFieldLookupFunction = module->getFunction("j3StaticFieldLookup");
+ StringLookupFunction = module->getFunction("j3StringLookup");
+ StartJNIFunction = module->getFunction("j3StartJNI");
+ EndJNIFunction = module->getFunction("j3EndJNI");
NullPointerExceptionFunction =
- module->getFunction("jnjvmNullPointerException");
- ClassCastExceptionFunction = module->getFunction("jnjvmClassCastException");
+ module->getFunction("j3NullPointerException");
+ ClassCastExceptionFunction = module->getFunction("j3ClassCastException");
IndexOutOfBoundsExceptionFunction =
- module->getFunction("jnjvmIndexOutOfBoundsException");
+ module->getFunction("j3IndexOutOfBoundsException");
NegativeArraySizeExceptionFunction =
- module->getFunction("jnjvmNegativeArraySizeException");
- OutOfMemoryErrorFunction = module->getFunction("jnjvmOutOfMemoryError");
- StackOverflowErrorFunction = module->getFunction("jnjvmStackOverflowError");
- ArrayStoreExceptionFunction = module->getFunction("jnjvmArrayStoreException");
- ArithmeticExceptionFunction = module->getFunction("jnjvmArithmeticException");
-
- PrintExecutionFunction = module->getFunction("jnjvmPrintExecution");
- PrintMethodStartFunction = module->getFunction("jnjvmPrintMethodStart");
- PrintMethodEndFunction = module->getFunction("jnjvmPrintMethodEnd");
+ module->getFunction("j3NegativeArraySizeException");
+ OutOfMemoryErrorFunction = module->getFunction("j3OutOfMemoryError");
+ StackOverflowErrorFunction = module->getFunction("j3StackOverflowError");
+ ArrayStoreExceptionFunction = module->getFunction("j3ArrayStoreException");
+ ArithmeticExceptionFunction = module->getFunction("j3ArithmeticException");
+
+ PrintExecutionFunction = module->getFunction("j3PrintExecution");
+ PrintMethodStartFunction = module->getFunction("j3PrintMethodStart");
+ PrintMethodEndFunction = module->getFunction("j3PrintMethodEnd");
- ThrowExceptionFunction = module->getFunction("jnjvmThrowException");
+ ThrowExceptionFunction = module->getFunction("j3ThrowException");
- GetArrayClassFunction = module->getFunction("jnjvmGetArrayClass");
+ GetArrayClassFunction = module->getFunction("j3GetArrayClass");
GetFinalInt8FieldFunction = module->getFunction("getFinalInt8Field");
GetFinalInt16FieldFunction = module->getFunction("getFinalInt16Field");
@@ -319,13 +319,13 @@
GetJnjvmExceptionClassFunction =
module->getFunction("getJnjvmExceptionClass");
GetJnjvmArrayClassFunction = module->getFunction("getJnjvmArrayClass");
- StaticCtpLookupFunction = module->getFunction("jnjvmStaticCtpLookup");
- SpecialCtpLookupFunction = module->getFunction("jnjvmSpecialCtpLookup");
+ StaticCtpLookupFunction = module->getFunction("j3StaticCtpLookup");
+ SpecialCtpLookupFunction = module->getFunction("j3SpecialCtpLookup");
#endif
#ifdef SERVICE
- ServiceCallStartFunction = module->getFunction("jnjvmServiceCallStart");
- ServiceCallStopFunction = module->getFunction("jnjvmServiceCallStop");
+ ServiceCallStartFunction = module->getFunction("j3ServiceCallStart");
+ ServiceCallStopFunction = module->getFunction("j3ServiceCallStop");
#endif
JavaObjectTracerFunction = module->getFunction("JavaObjectTracer");
@@ -335,12 +335,12 @@
RegularObjectTracerFunction = module->getFunction("RegularObjectTracer");
#ifndef WITHOUT_VTABLE
- VirtualLookupFunction = module->getFunction("jnjvmVirtualTableLookup");
+ VirtualLookupFunction = module->getFunction("j3VirtualTableLookup");
#endif
GetLockFunction = module->getFunction("getLock");
ThrowExceptionFromJITFunction =
- module->getFunction("jnjvmThrowExceptionFromJIT");
+ module->getFunction("j3ThrowExceptionFromJIT");
}
@@ -385,7 +385,7 @@
llvm::LoopPass* createLoopSafePointsPass();
}
-namespace jnjvm {
+namespace j3 {
llvm::FunctionPass* createLowerConstantCallsPass(JnjvmModule* M);
}
Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--- JnjvmModuleProvider.cpp - LLVM Module Provider for Jnjvm ---------===//
//
-// Jnjvm
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -24,7 +24,7 @@
#include "j3/JnjvmModuleProvider.h"
using namespace llvm;
-using namespace jnjvm;
+using namespace j3;
static JavaMethod* staticLookup(CallbackInfo& F) {
Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----- LowerConstantCalls.cpp - Changes arrayLength calls --------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
using namespace llvm;
-namespace jnjvm {
+namespace j3 {
class VISIBILITY_HIDDEN LowerConstantCalls : public FunctionPass {
public:
Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll Wed Dec 16 15:30:44 2009
@@ -48,8 +48,8 @@
;;;;; Constant calls for Jnjvm runtime internal objects field accesses ;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; jnjvmRuntimeInitialiseClass - Initialises the class.
-declare %JavaClass* @jnjvmRuntimeInitialiseClass(%JavaClass*)
+;;; j3RuntimeInitialiseClass - Initialises the class.
+declare %JavaClass* @j3RuntimeInitialiseClass(%JavaClass*)
;;; arrayLength - Get the length of an array.
declare i32 @arrayLength(%JavaObject*) readnone
@@ -102,12 +102,12 @@
;;;;;;;;;;;;;;;;;;;;;;;; Generic Runtime methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; jnjvmInterfaceLookup - Used for interface calls.
-declare i8* @jnjvmInterfaceLookup(%JavaClass*, i32, ...)
+;;; j3InterfaceLookup - Used for interface calls.
+declare i8* @j3InterfaceLookup(%JavaClass*, i32, ...)
-;;; jnjvmMultiCallNew - Allocate multi-dimensional arrays. This will go to
+;;; j3MultiCallNew - Allocate multi-dimensional arrays. This will go to
;;; allocation specific methods.
-declare %JavaObject* @jnjvmMultiCallNew(%JavaCommonClass*, i32, ...)
+declare %JavaObject* @j3MultiCallNew(%JavaCommonClass*, i32, ...)
;;; initialisationCheck - Checks if the class has been initialized and
;;; initializes if not. This is used for initialization barriers in an isolate
@@ -133,37 +133,37 @@
declare i8* @getConstantPoolAt(i8* (%JavaClass*, i32, ...)*, i8**,
%JavaClass*, i32, ...) readnone
-;;; jnjvmVirtualTableLookup - Look up the offset in a virtual table of a
+;;; j3VirtualTableLookup - Look up the offset in a virtual table of a
;;; specific function. This function takes a class and an index to lookup in the
;;; constant pool and returns and stores it in the constant pool cache.
-declare i8* @jnjvmVirtualTableLookup(%JavaClass*, i32, ...)
+declare i8* @j3VirtualTableLookup(%JavaClass*, i32, ...)
-;;; jnjvmClassLookup - Look up a specific class. The function takes a class and
+;;; j3ClassLookup - Look up a specific class. The function takes a class and
;;; an index to lookup in the constant pool and returns and stores it in the
;;; constant pool cache.
-declare i8* @jnjvmClassLookup(%JavaClass*, i32, ...)
+declare i8* @j3ClassLookup(%JavaClass*, i32, ...)
-;;; jnjvmVirtualFieldLookup - Look up a specific virtual field.
-declare i8* @jnjvmVirtualFieldLookup(%JavaClass*, i32, ...)
+;;; j3VirtualFieldLookup - Look up a specific virtual field.
+declare i8* @j3VirtualFieldLookup(%JavaClass*, i32, ...)
-;;; jnjvmStaticFieldLookup - Look up a specific static field.
-declare i8* @jnjvmStaticFieldLookup(%JavaClass*, i32, ...)
+;;; j3StaticFieldLookup - Look up a specific static field.
+declare i8* @j3StaticFieldLookup(%JavaClass*, i32, ...)
-;;; jnjvmStringLookup - Find the isolate-specific string at the given offset in
+;;; j3StringLookup - Find the isolate-specific string at the given offset in
;;; the constant pool.
-declare i8* @jnjvmStringLookup(%JavaClass*, i32, ...) readnone
+declare i8* @j3StringLookup(%JavaClass*, i32, ...) readnone
-;;; jnjvmJavaObjectAquire - This function is called when starting a synchronized
+;;; j3JavaObjectAquire - This function is called when starting a synchronized
;;; block or method.
-declare void @jnjvmJavaObjectAquire(%JavaObject*)
+declare void @j3JavaObjectAquire(%JavaObject*)
-;;; jnjvmJavaObjectRelease - This function is called when leaving a synchronized
+;;; j3JavaObjectRelease - This function is called when leaving a synchronized
;;; block or method.
-declare void @jnjvmJavaObjectRelease(%JavaObject*)
+declare void @j3JavaObjectRelease(%JavaObject*)
-;;; jnjvmOverflowThinLock - Change a thin lock to a fat lock when the thin lock
+;;; j3OverflowThinLock - Change a thin lock to a fat lock when the thin lock
;;; overflows
-declare void @jnjvmOverflowThinLock(%JavaObject*)
+declare void @j3OverflowThinLock(%JavaObject*)
;;; isAssignableFrom - Returns if a type is a subtype of another type.
declare i1 @isAssignableFrom(%VT*, %VT*) readnone
@@ -177,13 +177,13 @@
;;; the common class.
declare %JavaObject* @getClassDelegatee(%JavaCommonClass*) readnone
-;;; jnjvmRuntimeDelegatee - Returns the java/lang/Class representation of the
+;;; j3RuntimeDelegatee - Returns the java/lang/Class representation of the
;;; class. This method is called if the class delegatee has not been created
;;; yet.
-declare %JavaObject* @jnjvmRuntimeDelegatee(%JavaCommonClass*) readnone
+declare %JavaObject* @j3RuntimeDelegatee(%JavaCommonClass*) readnone
-;;; jnjvmGetArrayClass - Get the array user class of the user class.
-declare %JavaClassArray* @jnjvmGetArrayClass(%JavaCommonClass*,
+;;; j3GetArrayClass - Get the array user class of the user class.
+declare %JavaClassArray* @j3GetArrayClass(%JavaCommonClass*,
%JavaClassArray**) readnone
declare i8 @getFinalInt8Field(i8*) readnone
@@ -198,25 +198,25 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Exception methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-declare %JavaObject* @jnjvmNullPointerException()
-declare %JavaObject* @jnjvmClassCastException(%JavaObject*, %JavaCommonClass*)
-declare %JavaObject* @jnjvmIndexOutOfBoundsException(%JavaObject*, i32)
-declare %JavaObject* @jnjvmNegativeArraySizeException(i32)
-declare %JavaObject* @jnjvmOutOfMemoryError(i32)
-declare %JavaObject* @jnjvmStackOverflowError()
-declare %JavaObject* @jnjvmArrayStoreException(%VT*)
-declare %JavaObject* @jnjvmArithmeticException()
-declare void @jnjvmThrowException(%JavaObject*)
-declare void @jnjvmThrowExceptionFromJIT()
+declare %JavaObject* @j3NullPointerException()
+declare %JavaObject* @j3ClassCastException(%JavaObject*, %JavaCommonClass*)
+declare %JavaObject* @j3IndexOutOfBoundsException(%JavaObject*, i32)
+declare %JavaObject* @j3NegativeArraySizeException(i32)
+declare %JavaObject* @j3OutOfMemoryError(i32)
+declare %JavaObject* @j3StackOverflowError()
+declare %JavaObject* @j3ArrayStoreException(%VT*)
+declare %JavaObject* @j3ArithmeticException()
+declare void @j3ThrowException(%JavaObject*)
+declare void @j3ThrowExceptionFromJIT()
-declare void @jnjvmEndJNI(i32**, i8**)
-declare void @jnjvmStartJNI(i32*, i32**, i8*, i8**, i8*)
+declare void @j3EndJNI(i32**, i8**)
+declare void @j3StartJNI(i32*, i32**, i8*, i8**, i8*)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Debugging methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-declare void @jnjvmPrintExecution(i32, i32, %JavaMethod*)
-declare void @jnjvmPrintMethodStart(%JavaMethod*)
-declare void @jnjvmPrintMethodEnd(%JavaMethod*)
+declare void @j3PrintExecution(i32, i32, %JavaMethod*)
+declare void @j3PrintMethodStart(%JavaMethod*)
+declare void @j3PrintMethodEnd(%JavaMethod*)
Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-isolate.ll Wed Dec 16 15:30:44 2009
@@ -19,16 +19,16 @@
;;;;;;;;;;;;;;;;;;;;;;;; Isolate specific methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; jnjvmEnveloppeLookup - Find the enveloppe for the current user class.
-declare i8* @jnjvmEnveloppeLookup(%JavaClass*, i32, ...) readnone
+;;; j3EnveloppeLookup - Find the enveloppe for the current user class.
+declare i8* @j3EnveloppeLookup(%JavaClass*, i32, ...) readnone
-;;; jnjvmStaticCtpLookup - Find the user constant pool at the given offset in
+;;; j3StaticCtpLookup - Find the user constant pool at the given offset in
;;; the constant pool.
-declare i8* @jnjvmStaticCtpLookup(%JavaClass*, i32, ...) readnone
+declare i8* @j3StaticCtpLookup(%JavaClass*, i32, ...) readnone
-;;; jnjvmSpecialCtpLookup - Find the user constant pool at the given offset in
+;;; j3SpecialCtpLookup - Find the user constant pool at the given offset in
;;; the constant pool.
-declare i8** @jnjvmSpecialCtpLookup(i8**, i32, i8**) readnone
+declare i8** @j3SpecialCtpLookup(i8**, i32, i8**) readnone
;;; getCtpCacheNode - Get the constant pool cache of a cache node. This is a
;;; constant call because the cache node never changes.
Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-service.ll Wed Dec 16 15:30:44 2009
@@ -2,8 +2,8 @@
;;;;;;;;;;;;;;;;;;;;;;;; Service specific methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; jnjvmServiceCallStart - Mark the switching between services.
-declare void @jnjvmServiceCallStart(i8*, i8*)
+;;; j3ServiceCallStart - Mark the switching between services.
+declare void @j3ServiceCallStart(i8*, i8*)
-;;; jnjvmServiceCallStop - Mark the switching between services.
-declare void @jnjvmServiceCallStop(i8*, i8*)
+;;; j3ServiceCallStop - Mark the switching between services.
+declare void @j3ServiceCallStop(i8*, i8*)
Modified: vmkit/trunk/lib/J3/VMCore/JNIReferences.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JNIReferences.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JNIReferences.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JNIReferences.h Wed Dec 16 15:30:44 2009
@@ -12,7 +12,7 @@
#include "mvm/Allocator.h"
-namespace jnjvm {
+namespace j3 {
class JavaObject;
class JavaThread;
Modified: vmkit/trunk/lib/J3/VMCore/JavaAccess.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaAccess.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaAccess.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaAccess.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaAccess.h - Java access description -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#ifndef JNJVM_JAVA_ACCESS_H
#define JNJVM_JAVA_ACCESS_H
-namespace jnjvm {
+namespace j3 {
#define ACC_PUBLIC 0x0001
#define ACC_PRIVATE 0x0002
@@ -66,6 +66,6 @@
#undef MK_VERIFIER
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaArray.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaArray.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaArray.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------------- JavaArray.cpp - Java arrays ------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
#include "LockedMap.h"
-using namespace jnjvm;
+using namespace j3;
/// This value is the same value than IBM's JVM.
const sint32 JavaArray::MaxArraySize = 268435455;
Modified: vmkit/trunk/lib/J3/VMCore/JavaArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaArray.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaArray.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------------- JavaArray.h - Java arrays --------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -22,7 +22,7 @@
#include "UTF8.h"
-namespace jnjvm {
+namespace j3 {
class ClassArray;
class CommonClass;
@@ -86,6 +86,6 @@
#undef ARRAYCLASS
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- JavaClass.cpp - Java class representation -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
#include <cstring>
-using namespace jnjvm;
+using namespace j3;
const UTF8* Attribut::annotationsAttribut = 0;
const UTF8* Attribut::codeAttribut = 0;
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- JavaClass.h - Java class representation -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -27,7 +27,7 @@
#include <cassert>
#include <set>
-namespace jnjvm {
+namespace j3 {
class ArrayObject;
class ArrayUInt8;
@@ -220,25 +220,25 @@
/// isArray - Is the class an array class?
///
bool isArray() const {
- return jnjvm::isArray(access);
+ return j3::isArray(access);
}
/// isPrimitive - Is the class a primitive class?
///
bool isPrimitive() const {
- return jnjvm::isPrimitive(access);
+ return j3::isPrimitive(access);
}
/// isInterface - Is the class an interface?
///
bool isInterface() const {
- return jnjvm::isInterface(access);
+ return j3::isInterface(access);
}
/// isClass - Is the class a real, instantiable class?
///
bool isClass() const {
- return jnjvm::isClass(access);
+ return j3::isClass(access);
}
/// asClass - Returns the class as a user-defined class
@@ -1385,7 +1385,7 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#ifdef ISOLATE_SHARING
Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--- JavaConstantPool.cpp - Java constant pool definition ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -26,7 +26,7 @@
#include "LockedMap.h"
#include "Reader.h"
-using namespace jnjvm;
+using namespace j3;
const uint32 JavaConstantPool::ConstantUTF8 = 1;
const uint32 JavaConstantPool::ConstantInteger = 3;
Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--- JavaConstantPool.h - Java constant pool definition ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#include "UTF8.h"
-namespace jnjvm {
+namespace j3 {
class Class;
class CommonClass;
@@ -259,6 +259,6 @@
~JavaConstantPool() {}
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-------- JavaInitialise.cpp - Initialization of JnJVM ----------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "IsolateSharedLoader.h"
#endif
-using namespace jnjvm;
+using namespace j3;
#ifdef ISOLATE_SHARING
Modified: vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaLocks.cpp Wed Dec 16 15:30:44 2009
@@ -11,7 +11,7 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
JavaLock* JavaLock::allocate(JavaObject* obj) {
Jnjvm* vm = JavaThread::get()->getJVM();
Modified: vmkit/trunk/lib/J3/VMCore/JavaLocks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaLocks.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaLocks.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaLocks.h Wed Dec 16 15:30:44 2009
@@ -17,7 +17,7 @@
class Thread;
}
-namespace jnjvm {
+namespace j3 {
class JavaObject;
class JavaThread;
Modified: vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---- JavaMetaJIT.cpp - Functions for Java internal objects -----------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
#define readArgs(buf, signature, ap, jni) \
Typedef* const* arguments = signature->getArgumentsType(); \
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaObject.cpp - Java object definition ------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
#include "JavaUpcalls.h"
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
void JavaObject::waitIntern(struct timeval* info, bool timed) {
JavaLock* l = 0;
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaObject.h - Java object definition -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -21,7 +21,7 @@
#include "JavaLocks.h"
#include "JnjvmConfig.h"
-namespace jnjvm {
+namespace j3 {
class JavaObject;
class JavaThread;
@@ -285,6 +285,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===-------------------- JavaRuntimeJIT.cpp ------------------------------===//
//=== ---- Runtime functions called by code compiled by the JIT -----------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -22,9 +22,9 @@
#include <cstdarg>
-using namespace jnjvm;
+using namespace j3;
-extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3InterfaceLookup(UserClass* caller, uint32 index) {
void* res = 0;
@@ -58,7 +58,7 @@
}
// Throws if the field is not found.
-extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3VirtualFieldLookup(UserClass* caller, uint32 index) {
void* res = 0;
@@ -94,7 +94,7 @@
}
// Throws if the field or its class is not found.
-extern "C" void* jnjvmStaticFieldLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3StaticFieldLookup(UserClass* caller, uint32 index) {
void* res = 0;
@@ -140,7 +140,7 @@
#ifndef WITHOUT_VTABLE
// Throws if the method is not found.
-extern "C" void* jnjvmVirtualTableLookup(UserClass* caller, uint32 index, ...) {
+extern "C" void* j3VirtualTableLookup(UserClass* caller, uint32 index, ...) {
void* res = 0;
@@ -190,7 +190,7 @@
#endif
// Throws if the class is not found.
-extern "C" void* jnjvmClassLookup(UserClass* caller, uint32 index) {
+extern "C" void* j3ClassLookup(UserClass* caller, uint32 index) {
void* res = 0;
@@ -217,7 +217,7 @@
// Calls Java code.
// Throws if initializing the class throws an exception.
-extern "C" UserCommonClass* jnjvmRuntimeInitialiseClass(UserClass* cl) {
+extern "C" UserCommonClass* j3RuntimeInitialiseClass(UserClass* cl) {
BEGIN_NATIVE_EXCEPTION(1)
cl->resolveClass();
@@ -234,7 +234,7 @@
}
// Calls Java code.
-extern "C" JavaObject* jnjvmRuntimeDelegatee(UserCommonClass* cl) {
+extern "C" JavaObject* j3RuntimeDelegatee(UserCommonClass* cl) {
JavaObject* res = 0;
llvm_gcroot(res, 0);
@@ -282,7 +282,7 @@
}
// Throws if one of the dimension is negative.
-extern "C" JavaArray* jnjvmMultiCallNew(UserClassArray* cl, uint32 len, ...) {
+extern "C" JavaArray* j3MultiCallNew(UserClassArray* cl, uint32 len, ...) {
JavaArray* res = 0;
llvm_gcroot(res, 0);
@@ -303,7 +303,7 @@
}
// Throws if the class can not be resolved.
-extern "C" UserClassArray* jnjvmGetArrayClass(UserCommonClass* cl,
+extern "C" UserClassArray* j3GetArrayClass(UserCommonClass* cl,
UserClassArray** dcl) {
UserClassArray* res = 0;
@@ -327,7 +327,7 @@
}
// Does not call Java code. Can not yield a GC.
-extern "C" void jnjvmEndJNI(uint32** oldLRN, void** oldBuffer) {
+extern "C" void j3EndJNI(uint32** oldLRN, void** oldBuffer) {
JavaThread* th = JavaThread::get();
// We're going back to Java
@@ -342,14 +342,14 @@
}
-extern "C" void* jnjvmStartJNI(uint32* localReferencesNumber,
+extern "C" void* j3StartJNI(uint32* localReferencesNumber,
uint32** oldLocalReferencesNumber,
void* newBuffer, void** oldBuffer,
mvm::KnownFrame* Frame)
__attribute__((noinline));
// Never throws. Does not call Java code. Can not yied a GC.
-extern "C" void* jnjvmStartJNI(uint32* localReferencesNumber,
+extern "C" void* j3StartJNI(uint32* localReferencesNumber,
uint32** oldLocalReferencesNumber,
void* newBuffer, void** oldBuffer,
mvm::KnownFrame* Frame) {
@@ -369,7 +369,7 @@
}
// Never throws.
-extern "C" void jnjvmJavaObjectAquire(JavaObject* obj) {
+extern "C" void j3JavaObjectAquire(JavaObject* obj) {
BEGIN_NATIVE_EXCEPTION(1)
llvm_gcroot(obj, 0);
@@ -379,7 +379,7 @@
}
// Never throws.
-extern "C" void jnjvmJavaObjectRelease(JavaObject* obj) {
+extern "C" void j3JavaObjectRelease(JavaObject* obj) {
BEGIN_NATIVE_EXCEPTION(1)
llvm_gcroot(obj, 0);
@@ -389,17 +389,17 @@
}
// Does not call any Java code. Can not yield a GC.
-extern "C" void jnjvmThrowException(JavaObject* obj) {
+extern "C" void j3ThrowException(JavaObject* obj) {
return JavaThread::get()->throwException(obj);
}
// Never throws.
-extern "C" void jnjvmOverflowThinLock(JavaObject* obj) {
+extern "C" void j3OverflowThinLock(JavaObject* obj) {
obj->overflowThinLock();
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmNullPointerException() {
+extern "C" JavaObject* j3NullPointerException() {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -420,7 +420,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmNegativeArraySizeException(sint32 val) {
+extern "C" JavaObject* j3NegativeArraySizeException(sint32 val) {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -440,7 +440,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmOutOfMemoryError(sint32 val) {
+extern "C" JavaObject* j3OutOfMemoryError(sint32 val) {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -460,7 +460,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmStackOverflowError() {
+extern "C" JavaObject* j3StackOverflowError() {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -480,7 +480,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmArithmeticException() {
+extern "C" JavaObject* j3ArithmeticException() {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -500,7 +500,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmClassCastException(JavaObject* obj,
+extern "C" JavaObject* j3ClassCastException(JavaObject* obj,
UserCommonClass* cl) {
JavaObject *exc = 0;
llvm_gcroot(obj, 0);
@@ -524,7 +524,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmIndexOutOfBoundsException(JavaObject* obj,
+extern "C" JavaObject* j3IndexOutOfBoundsException(JavaObject* obj,
sint32 index) {
JavaObject *exc = 0;
llvm_gcroot(obj, 0);
@@ -548,7 +548,7 @@
}
// Creates a Java object and then throws it.
-extern "C" JavaObject* jnjvmArrayStoreException(JavaVirtualTable* VT) {
+extern "C" JavaObject* j3ArrayStoreException(JavaVirtualTable* VT) {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -568,7 +568,7 @@
}
// Create an exception then throws it.
-extern "C" void jnjvmThrowExceptionFromJIT() {
+extern "C" void j3ThrowExceptionFromJIT() {
JavaObject *exc = 0;
JavaThread *th = JavaThread::get();
@@ -587,7 +587,7 @@
}
-extern "C" void* jnjvmStringLookup(UserClass* cl, uint32 index) {
+extern "C" void* j3StringLookup(UserClass* cl, uint32 index) {
JavaString** str = 0;
@@ -605,19 +605,19 @@
return (void*)str;
}
-extern "C" void jnjvmPrintMethodStart(JavaMethod* meth) {
+extern "C" void j3PrintMethodStart(JavaMethod* meth) {
fprintf(stderr, "[%p] executing %s.%s\n", (void*)mvm::Thread::get(),
UTF8Buffer(meth->classDef->name).cString(),
UTF8Buffer(meth->name).cString());
}
-extern "C" void jnjvmPrintMethodEnd(JavaMethod* meth) {
+extern "C" void j3PrintMethodEnd(JavaMethod* meth) {
fprintf(stderr, "[%p] return from %s.%s\n", (void*)mvm::Thread::get(),
UTF8Buffer(meth->classDef->name).cString(),
UTF8Buffer(meth->name).cString());
}
-extern "C" void jnjvmPrintExecution(uint32 opcode, uint32 index,
+extern "C" void j3PrintExecution(uint32 opcode, uint32 index,
JavaMethod* meth) {
fprintf(stderr, "[%p] executing %s.%s %s at %d\n", (void*)mvm::Thread::get(),
UTF8Buffer(meth->classDef->name).cString(),
@@ -627,7 +627,7 @@
#ifdef SERVICE
-extern "C" void jnjvmServiceCallStart(Jnjvm* OldService,
+extern "C" void j3ServiceCallStart(Jnjvm* OldService,
Jnjvm* NewService) {
fprintf(stderr, "I have switched from %d to %d\n", OldService->IsolateID,
NewService->IsolateID);
@@ -635,7 +635,7 @@
fprintf(stderr, "Now the thread id is %d\n", mvm::Thread::get()->IsolateID);
}
-extern "C" void jnjvmServiceCallStop(Jnjvm* OldService,
+extern "C" void j3ServiceCallStop(Jnjvm* OldService,
Jnjvm* NewService) {
fprintf(stderr, "End service call\n");
}
@@ -644,7 +644,7 @@
#ifdef ISOLATE_SHARING
-extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index) {
+extern "C" void* j3StaticCtpLookup(UserClass* cl, uint32 index) {
UserConstantPool* ctpInfo = cl->getConstantPool();
JavaConstantPool* shared = ctpInfo->getSharedPool();
uint32 clIndex = shared->getClassIndexFromMethod(index);
@@ -663,7 +663,7 @@
return (void*)methodCl->getConstantPool();
}
-extern "C" UserConstantPool* jnjvmSpecialCtpLookup(UserConstantPool* ctpInfo,
+extern "C" UserConstantPool* j3SpecialCtpLookup(UserConstantPool* ctpInfo,
uint32 index,
UserConstantPool** res) {
JavaConstantPool* shared = ctpInfo->getSharedPool();
Modified: vmkit/trunk/lib/J3/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-- JavaString.cpp - Internal correspondance with Java Strings --------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#include "Jnjvm.h"
#include "LockedMap.h"
-using namespace jnjvm;
+using namespace j3;
JavaVirtualTable* JavaString::internStringVT = 0;
Modified: vmkit/trunk/lib/J3/VMCore/JavaString.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--- JavaString.h - Internal correspondance with Java Strings ---------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#include "JavaObject.h"
#include "UTF8.h"
-namespace jnjvm {
+namespace j3 {
class ArrayUInt16;
class Jnjvm;
@@ -48,6 +48,6 @@
static JavaVirtualTable* internStringVT;
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------- JavaThread.cpp - Java thread description -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
const unsigned int JavaThread::StateRunning = 0;
const unsigned int JavaThread::StateWaiting = 1;
Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------- JavaThread.h - Java thread description -------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -22,7 +22,7 @@
#include "JavaObject.h"
#include "JNIReferences.h"
-namespace jnjvm {
+namespace j3 {
class Class;
class JavaMethod;
@@ -294,6 +294,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------------- JavaTypes.cpp - Java primitives ------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -14,7 +14,7 @@
#include "JavaCompiler.h"
#include "JavaTypes.h"
-using namespace jnjvm;
+using namespace j3;
UserCommonClass* ArrayTypedef::assocClass(JnjvmClassLoader* loader) const {
return loader->constructArray(keyName);
Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------------- JavaTypes.h - Java primitives ------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -16,7 +16,7 @@
#include "JnjvmClassLoader.h"
-namespace jnjvm {
+namespace j3 {
class UserCommonClass;
class JnjvmClassLoader;
@@ -413,6 +413,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jni.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jni.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
-//===------------- Jni.cpp - Jni interface for JnJVM ----------------------===//
+//===---------------- Jni.cpp - Jni interface for J3 ----------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -20,7 +20,7 @@
#include "Jnjvm.h"
-using namespace jnjvm;
+using namespace j3;
static Jnjvm* myVM(JNIEnv* env) {
return JavaThread::get()->getJVM();
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---------- Jnjvm.cpp - Java virtual machine description --------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -36,7 +36,7 @@
#include "Reader.h"
#include "Zip.h"
-using namespace jnjvm;
+using namespace j3;
const char* Jnjvm::dirSeparator = "/";
const char* Jnjvm::envSeparator = ":";
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---------- Jnjvm.h - Java virtual machine description ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -25,7 +25,7 @@
#include "JNIReferences.h"
#include "LockedMap.h"
-namespace jnjvm {
+namespace j3 {
class ArrayObject;
class Classpath;
@@ -375,6 +375,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-- JnjvmClassLoader.cpp - Jnjvm representation of a class loader ------===//
//
-// Jnjvm
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -51,7 +51,7 @@
#include "Zip.h"
-using namespace jnjvm;
+using namespace j3;
typedef void (*static_init_t)(JnjvmClassLoader*);
@@ -1036,7 +1036,7 @@
return readerConstructUTF8(buf, n);
}
-intptr_t JnjvmClassLoader::loadInLib(const char* buf, bool& jnjvm) {
+intptr_t JnjvmClassLoader::loadInLib(const char* buf, bool& j3) {
uintptr_t res = (uintptr_t)TheCompiler->loadMethod(SELF_HANDLE, buf);
if (!res) {
@@ -1046,11 +1046,11 @@
if (res) break;
}
} else {
- jnjvm = true;
+ j3 = true;
}
if (!res && this != bootstrapLoader)
- res = bootstrapLoader->loadInLib(buf, jnjvm);
+ res = bootstrapLoader->loadInLib(buf, j3);
return (intptr_t)res;
}
@@ -1065,14 +1065,14 @@
return (intptr_t)TheCompiler->loadMethod(handle, name);
}
-intptr_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& jnjvm,
+intptr_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& j3,
char* buf) {
meth->jniConsFromMeth(buf);
- intptr_t res = loadInLib(buf, jnjvm);
+ intptr_t res = loadInLib(buf, j3);
if (!res) {
meth->jniConsFromMethOverloaded(buf);
- res = loadInLib(buf, jnjvm);
+ res = loadInLib(buf, j3);
}
return res;
}
@@ -1213,7 +1213,7 @@
}
extern "C" intptr_t vmjcNativeLoader(JavaMethod* meth) {
- bool jnjvm = false;
+ bool j3 = false;
const UTF8* jniConsClName = meth->classDef->name;
const UTF8* jniConsName = meth->name;
const UTF8* jniConsType = meth->type;
@@ -1223,7 +1223,7 @@
char* buf = (char*)alloca(3 + JNI_NAME_PRE_LEN + 1 +
((mnlen + clen + mtlen) << 3));
- intptr_t res = meth->classDef->classLoader->nativeLookup(meth, jnjvm, buf);
+ intptr_t res = meth->classDef->classLoader->nativeLookup(meth, j3, buf);
assert(res && "Could not find required native method");
return res;
}
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===-- JnjvmClassLoader.h - Jnjvm representation of a class loader -------===//
//
-// Jnjvm
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -24,7 +24,7 @@
#include "JnjvmConfig.h"
#include "UTF8.h"
-namespace jnjvm {
+namespace j3 {
class ArrayUInt8;
class UserClass;
@@ -257,9 +257,9 @@
/// loadInLib - Loads a native function out of the native libraries loaded
/// by this class loader. The last argument tells if the returned method
- /// is defined in jnjvm.
+ /// is defined in j3.
///
- intptr_t loadInLib(const char* buf, bool& jnjvm);
+ intptr_t loadInLib(const char* buf, bool& j3);
/// loadInLib - Loads a native function out of the given native library.
///
@@ -270,10 +270,10 @@
void* loadLib(const char* buf);
/// nativeLookup - Lookup in the class loader a function pointer for the
- /// method. Also set in the jnjvm parameter is the function is defined in
+ /// method. Also set in the j3 parameter is the function is defined in
/// JnJVM.
///
- intptr_t nativeLookup(JavaMethod* meth, bool& jnjvm, char* buf);
+ intptr_t nativeLookup(JavaMethod* meth, bool& j3, char* buf);
/// insertAllMethodsInVM - Insert all methods defined by this class loader
/// in the VM.
@@ -502,6 +502,6 @@
}
};
-} // end namespace jnjvm
+} // end namespace j3
#endif // JNJVM_CLASSLOADER_H
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmConfig.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===---------- JnjvmConfig.h - Jnjvm configuration file ------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#define ISOLATE_STATIC
#else
-namespace jnjvm {
+namespace j3 {
class ClassArray;
class ClassPrimitive;
Modified: vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LinkJavaRuntime.h Wed Dec 16 15:30:44 2009
@@ -1,7 +1,7 @@
//===--------------------- LinkJavaRuntime.h ------------------------------===//
//=== ------------- Reference all runtime functions -----------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -12,7 +12,7 @@
#define JNJVM_LINK_JAVA_RUNTIME_H
-namespace jnjvm {
+namespace j3 {
class JavaObject;
class UserClass;
class UserClassArray;
@@ -23,46 +23,46 @@
class Jnjvm;
}
-using namespace jnjvm;
+using namespace j3;
-extern "C" void* jnjvmInterfaceLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmVirtualFieldLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmStaticFieldLookup(UserClass* caller, uint32 index);
-extern "C" void* jnjvmVirtualTableLookup(UserClass* caller, uint32 index, ...);
-extern "C" void* jnjvmStringLookup(UserClass* cl, uint32 index);
-extern "C" void* jnjvmClassLookup(UserClass* caller, uint32 index);
-extern "C" UserCommonClass* jnjvmRuntimeInitialiseClass(UserClass* cl);
-extern "C" JavaObject* jnjvmRuntimeDelegatee(UserCommonClass* cl);
-extern "C" JavaArray* jnjvmMultiCallNew(UserClassArray* cl, uint32 len, ...);
-extern "C" UserClassArray* jnjvmGetArrayClass(UserCommonClass*,
+extern "C" void* j3InterfaceLookup(UserClass* caller, uint32 index);
+extern "C" void* j3VirtualFieldLookup(UserClass* caller, uint32 index);
+extern "C" void* j3StaticFieldLookup(UserClass* caller, uint32 index);
+extern "C" void* j3VirtualTableLookup(UserClass* caller, uint32 index, ...);
+extern "C" void* j3StringLookup(UserClass* cl, uint32 index);
+extern "C" void* j3ClassLookup(UserClass* caller, uint32 index);
+extern "C" UserCommonClass* j3RuntimeInitialiseClass(UserClass* cl);
+extern "C" JavaObject* j3RuntimeDelegatee(UserCommonClass* cl);
+extern "C" JavaArray* j3MultiCallNew(UserClassArray* cl, uint32 len, ...);
+extern "C" UserClassArray* j3GetArrayClass(UserCommonClass*,
UserClassArray**);
-extern "C" void jnjvmEndJNI();
-extern "C" void* jnjvmStartJNI();
-extern "C" void jnjvmJavaObjectAquire(JavaObject* obj);
-extern "C" void jnjvmJavaObjectRelease(JavaObject* obj);
-extern "C" void jnjvmThrowException(JavaObject* obj);
-extern "C" void jnjvmOverflowThinLock(JavaObject* obj);
-extern "C" JavaObject* jnjvmNullPointerException();
-extern "C" JavaObject* jnjvmNegativeArraySizeException(sint32 val);
-extern "C" JavaObject* jnjvmOutOfMemoryError(sint32 val);
-extern "C" JavaObject* jnjvmStackOverflowError();
-extern "C" JavaObject* jnjvmArithmeticException();
-extern "C" JavaObject* jnjvmClassCastException(JavaObject* obj,
+extern "C" void j3EndJNI();
+extern "C" void* j3StartJNI();
+extern "C" void j3JavaObjectAquire(JavaObject* obj);
+extern "C" void j3JavaObjectRelease(JavaObject* obj);
+extern "C" void j3ThrowException(JavaObject* obj);
+extern "C" void j3OverflowThinLock(JavaObject* obj);
+extern "C" JavaObject* j3NullPointerException();
+extern "C" JavaObject* j3NegativeArraySizeException(sint32 val);
+extern "C" JavaObject* j3OutOfMemoryError(sint32 val);
+extern "C" JavaObject* j3StackOverflowError();
+extern "C" JavaObject* j3ArithmeticException();
+extern "C" JavaObject* j3ClassCastException(JavaObject* obj,
UserCommonClass* cl);
-extern "C" JavaObject* jnjvmIndexOutOfBoundsException(JavaObject* obj,
+extern "C" JavaObject* j3IndexOutOfBoundsException(JavaObject* obj,
sint32 index);
-extern "C" JavaObject* jnjvmArrayStoreException(JavaVirtualTable* VT);
-extern "C" void jnjvmThrowExceptionFromJIT();
-extern "C" void jnjvmPrintMethodStart(JavaMethod* meth);
-extern "C" void jnjvmPrintMethodEnd(JavaMethod* meth);
-extern "C" void jnjvmPrintExecution(uint32 opcode, uint32 index,
+extern "C" JavaObject* j3ArrayStoreException(JavaVirtualTable* VT);
+extern "C" void j3ThrowExceptionFromJIT();
+extern "C" void j3PrintMethodStart(JavaMethod* meth);
+extern "C" void j3PrintMethodEnd(JavaMethod* meth);
+extern "C" void j3PrintExecution(uint32 opcode, uint32 index,
JavaMethod* meth);
#ifdef SERVICE
-extern "C" void jnjvmServiceCallStart(Jnjvm* OldService,
+extern "C" void j3ServiceCallStart(Jnjvm* OldService,
Jnjvm* NewService);
-extern "C" void jnjvmServiceCallStop(Jnjvm* OldService,
+extern "C" void j3ServiceCallStop(Jnjvm* OldService,
Jnjvm* NewService);
#endif
@@ -70,8 +70,8 @@
#ifdef ISOLATE_SHARING
-extern "C" void* jnjvmStaticCtpLookup(UserClass* cl, uint32 index);
-extern "C" UserConstantPool* jnjvmSpecialCtpLookup(UserConstantPool* ctpInfo,
+extern "C" void* j3StaticCtpLookup(UserClass* cl, uint32 index);
+extern "C" UserConstantPool* j3SpecialCtpLookup(UserConstantPool* ctpInfo,
uint32 index,
UserConstantPool** res);
#endif
@@ -87,42 +87,42 @@
if (std::getenv("bar") != (char*) -1)
return;
- (void) jnjvmInterfaceLookup(0, 0);
- (void) jnjvmVirtualFieldLookup(0, 0);
- (void) jnjvmStaticFieldLookup(0, 0);
- (void) jnjvmVirtualTableLookup(0, 0);
- (void) jnjvmClassLookup(0, 0);
- (void) jnjvmRuntimeInitialiseClass(0);
- (void) jnjvmRuntimeDelegatee(0);
- (void) jnjvmMultiCallNew(0, 0);
- (void) jnjvmGetArrayClass(0, 0);
- (void) jnjvmEndJNI();
- (void) jnjvmStartJNI();
- (void) jnjvmJavaObjectAquire(0);
- (void) jnjvmJavaObjectRelease(0);
- (void) jnjvmThrowException(0);
- (void) jnjvmOverflowThinLock(0);
- (void) jnjvmNullPointerException();
- (void) jnjvmNegativeArraySizeException(0);
- (void) jnjvmOutOfMemoryError(0);
- (void) jnjvmStackOverflowError();
- (void) jnjvmArithmeticException();
- (void) jnjvmClassCastException(0, 0);
- (void) jnjvmIndexOutOfBoundsException(0, 0);
- (void) jnjvmArrayStoreException(0);
- (void) jnjvmThrowExceptionFromJIT();
- (void) jnjvmPrintMethodStart(0);
- (void) jnjvmPrintMethodEnd(0);
- (void) jnjvmPrintExecution(0, 0, 0);
- (void) jnjvmStringLookup(0, 0);
+ (void) j3InterfaceLookup(0, 0);
+ (void) j3VirtualFieldLookup(0, 0);
+ (void) j3StaticFieldLookup(0, 0);
+ (void) j3VirtualTableLookup(0, 0);
+ (void) j3ClassLookup(0, 0);
+ (void) j3RuntimeInitialiseClass(0);
+ (void) j3RuntimeDelegatee(0);
+ (void) j3MultiCallNew(0, 0);
+ (void) j3GetArrayClass(0, 0);
+ (void) j3EndJNI();
+ (void) j3StartJNI();
+ (void) j3JavaObjectAquire(0);
+ (void) j3JavaObjectRelease(0);
+ (void) j3ThrowException(0);
+ (void) j3OverflowThinLock(0);
+ (void) j3NullPointerException();
+ (void) j3NegativeArraySizeException(0);
+ (void) j3OutOfMemoryError(0);
+ (void) j3StackOverflowError();
+ (void) j3ArithmeticException();
+ (void) j3ClassCastException(0, 0);
+ (void) j3IndexOutOfBoundsException(0, 0);
+ (void) j3ArrayStoreException(0);
+ (void) j3ThrowExceptionFromJIT();
+ (void) j3PrintMethodStart(0);
+ (void) j3PrintMethodEnd(0);
+ (void) j3PrintExecution(0, 0, 0);
+ (void) j3StringLookup(0, 0);
#ifdef SERVICE
- (void) jnjvmServiceCallStart(0, 0);
- (void) jnjvmServiceCallStop(0, 0);
+ (void) j3ServiceCallStart(0, 0);
+ (void) j3ServiceCallStop(0, 0);
#endif
#ifdef ISOLATE_SHARING
- (void) jnjvmStaticCtpLookup(0, 0);
- (void) jnjvmSpecialCtpLookup(0, 0, 0);
+ (void) j3StaticCtpLookup(0, 0);
+ (void) j3SpecialCtpLookup(0, 0, 0);
#endif
}
Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------- LockedMap.cpp - Implementation of the UTF8 map ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -18,7 +18,7 @@
#include <cstring>
-using namespace jnjvm;
+using namespace j3;
void StringMap::insert(JavaString* str) {
llvm_gcroot(str, 0);
Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------- LockedMap.h - A thread-safe map implementation ---------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -28,7 +28,7 @@
#include "JavaArray.h" // for comparing UTF8s
-namespace jnjvm {
+namespace j3 {
class JavaString;
class Signdef;
@@ -198,6 +198,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Reader.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Reader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Reader.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------------- Reader.cpp - Open and read files ---------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -19,7 +19,7 @@
#include "Reader.h"
#include "Zip.h"
-using namespace jnjvm;
+using namespace j3;
const int Reader::SeekSet = SEEK_SET;
const int Reader::SeekCur = SEEK_CUR;
Modified: vmkit/trunk/lib/J3/VMCore/Reader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Reader.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Reader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Reader.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------------- Reader.h - Open and read files ---------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -17,7 +17,7 @@
#include "JavaArray.h"
#include "JavaClass.h"
-namespace jnjvm {
+namespace j3 {
class JnjvmBootstrapLoader;
class ZipArchive;
@@ -138,6 +138,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/lib/J3/VMCore/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/UTF8.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/UTF8.h (original)
+++ vmkit/trunk/lib/J3/VMCore/UTF8.h Wed Dec 16 15:30:44 2009
@@ -1,3 +1,12 @@
+//===------------------- UTF8.h - Utilities for UTF8 ----------------------===//
+//
+// The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
#ifndef _JNJVM_UTF8_H_
#define _JNJVM_UTF8_H_
@@ -6,7 +15,7 @@
#include "mvm/UTF8.h"
#include "mvm/PrintBuffer.h"
-namespace jnjvm {
+namespace j3 {
using mvm::UTF8;
using mvm::UTF8Map;
Modified: vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp Wed Dec 16 15:30:44 2009
@@ -1,4 +1,4 @@
-//===--- VirtualTables.cpp - Virtual methods for JnJVM objects ------------===//
+//===------ VirtualTables.cpp - Virtual methods for J3 objects ------------===//
//
// The VMKit project
//
@@ -30,7 +30,7 @@
#include "JnjvmClassLoader.h"
#include "LockedMap.h"
-using namespace jnjvm;
+using namespace j3;
//===----------------------------------------------------------------------===//
// List of classes that will be GC-allocated. One should try to keep this
Modified: vmkit/trunk/lib/J3/VMCore/Zip.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Zip.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Zip.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Zip.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------------- Zip.cpp - Interface with zlib ----------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -15,7 +15,7 @@
#include "Reader.h"
#include "Zip.h"
-using namespace jnjvm;
+using namespace j3;
ZipArchive::ZipArchive(ArrayUInt8* bytes, mvm::BumpPtrAllocator& A) : allocator(A) {
this->bytes = bytes;
Modified: vmkit/trunk/lib/J3/VMCore/Zip.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Zip.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Zip.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Zip.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===----------------- Zip.h - Interface with zlib ------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
@@ -14,7 +14,7 @@
#include "mvm/Allocator.h"
-namespace jnjvm {
+namespace j3 {
class ArrayUInt8;
class JnjvmBootstrapLoader;
@@ -76,6 +76,6 @@
};
-} // end namespace jnjvm
+} // end namespace j3
#endif
Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Wed Dec 16 15:30:44 2009
@@ -19,7 +19,7 @@
#include "llvm/Support/ManagedStatic.h"
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
using namespace mvm;
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Wed Dec 16 15:30:44 2009
@@ -54,7 +54,7 @@
#include <memory>
#include <string>
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
static cl::opt<std::string>
Modified: vmkit/trunk/tools/vmkit/CommandLine.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/CommandLine.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/CommandLine.cpp (original)
+++ vmkit/trunk/tools/vmkit/CommandLine.cpp Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===------- CommandLine.cpp - Parses the command line --------------------===//
//
-// The Micro Virtual Machine
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
Modified: vmkit/trunk/tools/vmkit/CommandLine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/CommandLine.h?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/CommandLine.h (original)
+++ vmkit/trunk/tools/vmkit/CommandLine.h Wed Dec 16 15:30:44 2009
@@ -1,6 +1,6 @@
//===--------- CommandLine.h - Parses the command line --------------------===//
//
-// The Micro Virtual Machine
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=91568&r1=91567&r2=91568&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Dec 16 15:30:44 2009
@@ -30,7 +30,7 @@
#include "CommandLine.h"
-using namespace jnjvm;
+using namespace j3;
using namespace llvm;
enum VMType {
More information about the vmkit-commits
mailing list