[vmkit-commits] [vmkit] r91561 - in /vmkit/trunk: ./ autoconf/ include/j3/ include/jnjvm/ lib/ lib/J3/ lib/J3/Classpath/ lib/J3/Compiler/ lib/J3/IJvm/ lib/J3/Isolate/ lib/J3/LLVMRuntime/ lib/J3/VMCore/ lib/JnJVM/ tools/ tools/j3/ tools/jnjvm/ tools/llcj/ tools/vmjc/ tools/vmkit/ www/
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Dec 16 12:10:15 PST 2009
Author: geoffray
Date: Wed Dec 16 14:10:15 2009
New Revision: 91561
URL: http://llvm.org/viewvc/llvm-project?rev=91561&view=rev
Log:
Start renaming JnJVM to J3. Next step is the actual use of jnjvm in
c++ code.
Added:
vmkit/trunk/include/j3/
- copied from r91445, vmkit/trunk/include/jnjvm/
vmkit/trunk/include/j3/JavaCompiler.h
- copied unchanged from r91558, vmkit/trunk/include/jnjvm/JavaCompiler.h
vmkit/trunk/include/j3/JnjvmModule.h
- copied unchanged from r91558, vmkit/trunk/include/jnjvm/JnjvmModule.h
vmkit/trunk/include/j3/JnjvmModuleProvider.h
- copied unchanged from r91558, vmkit/trunk/include/jnjvm/JnjvmModuleProvider.h
vmkit/trunk/include/j3/OpcodeNames.def
- copied unchanged from r91558, vmkit/trunk/include/jnjvm/OpcodeNames.def
vmkit/trunk/lib/J3/
- copied from r91445, vmkit/trunk/lib/JnJVM/
vmkit/trunk/lib/J3/Classpath/
- copied from r91558, vmkit/trunk/lib/JnJVM/Classpath/
vmkit/trunk/lib/J3/Compiler/
- copied from r91558, vmkit/trunk/lib/JnJVM/Compiler/
vmkit/trunk/lib/J3/IJvm/
- copied from r91558, vmkit/trunk/lib/JnJVM/IJvm/
vmkit/trunk/lib/J3/Isolate/
- copied from r91558, vmkit/trunk/lib/JnJVM/Isolate/
vmkit/trunk/lib/J3/LLVMRuntime/
- copied from r91558, vmkit/trunk/lib/JnJVM/LLVMRuntime/
vmkit/trunk/lib/J3/Makefile
- copied unchanged from r91558, vmkit/trunk/lib/JnJVM/Makefile
vmkit/trunk/lib/J3/README.txt
- copied unchanged from r91558, vmkit/trunk/lib/JnJVM/README.txt
vmkit/trunk/lib/J3/VMCore/
- copied from r91558, vmkit/trunk/lib/JnJVM/VMCore/
vmkit/trunk/tools/j3/
- copied from r91445, vmkit/trunk/tools/jnjvm/
vmkit/trunk/tools/j3/Main.cpp
- copied, changed from r91558, vmkit/trunk/tools/jnjvm/Main.cpp
vmkit/trunk/tools/j3/Makefile
- copied, changed from r91558, vmkit/trunk/tools/jnjvm/Makefile
Removed:
vmkit/trunk/include/jnjvm/
vmkit/trunk/lib/JnJVM/
vmkit/trunk/tools/jnjvm/
Modified:
vmkit/trunk/CREDITS.TXT
vmkit/trunk/Makefile
vmkit/trunk/Makefile.config.in
vmkit/trunk/README.txt
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
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/Compiler/Makefile
vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
vmkit/trunk/lib/J3/VMCore/Makefile
vmkit/trunk/lib/Makefile
vmkit/trunk/tools/Makefile
vmkit/trunk/tools/llcj/llcj.cpp
vmkit/trunk/tools/vmjc/Makefile
vmkit/trunk/tools/vmjc/vmjc.cpp
vmkit/trunk/tools/vmkit/Launcher.cpp
vmkit/trunk/tools/vmkit/Makefile
vmkit/trunk/www/get_started.html
vmkit/trunk/www/use_mmtk.html
Modified: vmkit/trunk/CREDITS.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/CREDITS.TXT?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/CREDITS.TXT (original)
+++ vmkit/trunk/CREDITS.TXT Wed Dec 16 14:10:15 2009
@@ -16,7 +16,7 @@
N: Nicolas Geoffray
E: nicolas.geoffray at lip6.fr
W: http://www-src.lip6.fr/homepages/Nicolas.Geoffray/
-D: Port of JnJVM to LLVM
+D: Architect of J3, originally a port of JnJVM to LLVM
D: Architect of N3
N: Sylvain Marechal
Modified: vmkit/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/Makefile (original)
+++ vmkit/trunk/Makefile Wed Dec 16 14:10:15 2009
@@ -29,5 +29,5 @@
#------------------------------------------------------------------------
FilesToConfig := \
include/llvm/Config/config.h \
- lib/JnJVM/Classpath/Classpath.h \
+ lib/J3/Classpath/Classpath.h \
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Wed Dec 16 14:10:15 2009
@@ -2,7 +2,7 @@
WITH_N3 = @WITH_N3@
WITH_N3_PNETLIB = @WITH_N3_PNETLIB@
WITH_N3_MONO = @WITH_N3_MONO@
-WITH_JNJVM = @WITH_JNJVM@
+WITH_J3 = @WITH_J3@
N3_LIB = @N3_LIB@
GC_MULTI_MMAP = @GC_MULTI_MMAP@
GC_SINGLE_MMAP = @GC_SINGLE_MMAP@
Modified: vmkit/trunk/README.txt
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/README.txt?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/README.txt (original)
+++ vmkit/trunk/README.txt Wed Dec 16 14:10:15 2009
@@ -4,10 +4,10 @@
VMKit is the composition of three libraries:
1) MVM: mostly a garbage collector
-2) JnJVM: a Java Virtual Machine implemented with MVM and LLVM
+2) J3: a Java Virtual Machine implemented with MVM and LLVM
3) N3: a CLI implementation with MVM and LLVM
-JnJVM and N3 use GCC's unwinding library (libgcc_s.so).
+J3 and N3 use GCC's unwinding library (libgcc_s.so).
These are the options you should pass to the ./configure script
--with-llvmsrc: the source directory of LLVM
@@ -22,9 +22,9 @@
--with-mono: Mono's mscorlib.dll
Running make on the root tree will produce the following "tools":
-1) Debug|Release/bin/jnjvm: running the JnJVM like any other JVM.
+1) Debug|Release/bin/j3: running the J3 like any other JVM.
2) Debug|Release/bin/n3-pnetlib: running N3 like CLR.
2) Debug|Release/bin/vmkit: shell-like vm launcher.
2) Debug|Release/bin/vmjc: ahead of time compiler for .class files.
-JnJVM and N3 have their own README notes.
+J3 and N3 have their own README notes.
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Wed Dec 16 14:10:15 2009
@@ -331,32 +331,32 @@
AC_ARG_WITH(gnu-classpath-glibj,
[AS_HELP_STRING(--with-gnu-classpath-glibj,
- [Build JnJVM with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
+ [Build J3 with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
[[classpathglibj=$withval]],
[[classpathglibj=/usr/share/classpath/glibj.zip]]
)
-AC_ARG_WITH(jnjvm,
- [AS_HELP_STRING(--with-jnjvm=yes|no,
- [Build JnJVM (default is yes)])],
- [[WITH_JNJVM=$withval]],
- [[WITH_JNJVM=yes]]
+AC_ARG_WITH(j3,
+ [AS_HELP_STRING(--with-j3=yes|no,
+ [Build J3 (default is yes)])],
+ [[WITH_J3=$withval]],
+ [[WITH_J3=yes]]
)
classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
-if test "x${WITH_JNJVM}" = "xyes"; then
- WITH_JNJVM=1;
- AC_DEFINE([WITH_JNJVM], [1], [With JNJVM])
+if test "x${WITH_J3}" = "xyes"; then
+ WITH_J3=1;
+ AC_DEFINE([WITH_J3], [1], [With J3])
else
- WITH_JNJVM=0;
+ WITH_J3=0;
fi
AC_SUBST([classpathglibj])
AC_SUBST([classpathlibs])
AC_SUBST([classpathinclude])
AC_SUBST([classpathversion])
-AC_SUBST([WITH_JNJVM])
+AC_SUBST([WITH_J3])
dnl **************************************************************************
dnl Local PNet directory
@@ -591,7 +591,7 @@
dnl Configure a common Makefile
AC_CONFIG_FILES(Makefile.common)
AC_CONFIG_FILES(Makefile.config)
-AC_CONFIG_FILES([lib/JnJVM/Classpath/Classpath.h])
+AC_CONFIG_FILES([lib/J3/Classpath/Classpath.h])
AC_CONFIG_FILES([lib/N3/PNetLib/PNetPath.inc])
AC_CONFIG_FILES([lib/N3/Mono/MonoPath.inc])
AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Dec 16 14:10:15 2009
@@ -700,7 +700,7 @@
classpathlibs
classpathinclude
classpathversion
-WITH_JNJVM
+WITH_J3
pnetlocalprefix
WITH_N3_PNETLIB
N3_LIB
@@ -1338,9 +1338,9 @@
GNU CLASSPATH libraries (default is
/usr/lib/classpath)
--with-gnu-classpath-glibj
- Build JnJVM with GNU Classpath install (default is
+ Build J3 with GNU Classpath install (default is
'/usr/share/classpath/glibj.zip')
- --with-jnjvm=yes|no Build JnJVM (default is yes)
+ --with-j3=yes|no Build J3 (default is yes)
--with-pnet-local-prefix=something
PNET local prefix (no default)
--with-pnetlib=something
@@ -4091,26 +4091,26 @@
-# Check whether --with-jnjvm was given.
-if test "${with_jnjvm+set}" = set; then
- withval=$with_jnjvm; WITH_JNJVM=$withval
+# Check whether --with-j3 was given.
+if test "${with_j3+set}" = set; then
+ withval=$with_j3; WITH_J3=$withval
else
- WITH_JNJVM=yes
+ WITH_J3=yes
fi
classpathinclude="-I${classpathlibs}/../include -I/usr/include/classpath";
-if test "x${WITH_JNJVM}" = "xyes"; then
- WITH_JNJVM=1;
+if test "x${WITH_J3}" = "xyes"; then
+ WITH_J3=1;
cat >>confdefs.h <<\_ACEOF
-#define WITH_JNJVM 1
+#define WITH_J3 1
_ACEOF
else
- WITH_JNJVM=0;
+ WITH_J3=0;
fi
@@ -7228,7 +7228,7 @@
ac_config_files="$ac_config_files Makefile.config"
-ac_config_files="$ac_config_files lib/JnJVM/Classpath/Classpath.h"
+ac_config_files="$ac_config_files lib/J3/Classpath/Classpath.h"
ac_config_files="$ac_config_files lib/N3/PNetLib/PNetPath.inc"
@@ -7811,7 +7811,7 @@
"include/mvm/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/mvm/Config/config.h" ;;
"Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
"Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
- "lib/JnJVM/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/JnJVM/Classpath/Classpath.h" ;;
+ "lib/J3/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/J3/Classpath/Classpath.h" ;;
"lib/N3/PNetLib/PNetPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/PNetLib/PNetPath.inc" ;;
"lib/N3/Mono/MonoPath.inc") CONFIG_FILES="$CONFIG_FILES lib/N3/Mono/MonoPath.inc" ;;
"tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
@@ -7961,7 +7961,7 @@
classpathlibs!$classpathlibs$ac_delim
classpathinclude!$classpathinclude$ac_delim
classpathversion!$classpathversion$ac_delim
-WITH_JNJVM!$WITH_JNJVM$ac_delim
+WITH_J3!$WITH_J3$ac_delim
pnetlocalprefix!$pnetlocalprefix$ac_delim
WITH_N3_PNETLIB!$WITH_N3_PNETLIB$ac_delim
N3_LIB!$N3_LIB$ac_delim
Modified: vmkit/trunk/lib/J3/Compiler/JITInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JITInfo.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JITInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JITInfo.cpp Wed Dec 16 14:10:15 2009
@@ -28,8 +28,8 @@
#include "Jnjvm.h"
#include "Reader.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
#include <cstdio>
Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Wed Dec 16 14:10:15 2009
@@ -18,7 +18,7 @@
#include "mvm/Threads/Thread.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
#include "JavaArray.h"
#include "JavaConstantPool.h"
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Wed Dec 16 14:10:15 2009
@@ -37,8 +37,8 @@
#include "Jnjvm.h"
#include "Reader.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
using namespace jnjvm;
using namespace llvm;
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Wed Dec 16 14:10:15 2009
@@ -25,7 +25,7 @@
#include "JavaClass.h"
#include "JavaUpcalls.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
namespace jnjvm {
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Wed Dec 16 14:10:15 2009
@@ -28,8 +28,8 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
using namespace jnjvm;
using namespace llvm;
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Wed Dec 16 14:10:15 2009
@@ -33,10 +33,10 @@
#include "JavaTypes.h"
#include "Jnjvm.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
#if DEBUG > 0 && (JNJVM_COMPILE > 0 || JNJVM_EXECUTE > 0)
-#include "jnjvm/OpcodeNames.def"
+#include "j3/OpcodeNames.def"
#endif
using namespace jnjvm;
Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModule.cpp Wed Dec 16 14:10:15 2009
@@ -24,8 +24,8 @@
#include "JavaJIT.h"
#include "JavaTypes.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
using namespace jnjvm;
using namespace llvm;
Modified: vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JnjvmModuleProvider.cpp Wed Dec 16 14:10:15 2009
@@ -20,8 +20,8 @@
#include "JavaTypes.h"
#include "Jnjvm.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
using namespace llvm;
using namespace jnjvm;
Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Wed Dec 16 14:10:15 2009
@@ -17,7 +17,7 @@
#include "llvm/Support/Debug.h"
#include "JavaClass.h"
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
using namespace llvm;
Modified: vmkit/trunk/lib/J3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/Makefile?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/J3/Compiler/Makefile Wed Dec 16 14:10:15 2009
@@ -11,9 +11,9 @@
include $(LEVEL)/Makefile.config
ifeq ($(WITH_LLVM_GCC), 1)
- MODULE_NAME = JnjvmCompiler
+ MODULE_NAME = J3Compiler
else
- LIBRARYNAME = JnjvmCompiler
+ LIBRARYNAME = J3Compiler
endif
EXTRA_DIST = ExceptionsCheck.inc ExceptionsDwarf.inc
Modified: vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp Wed Dec 16 14:10:15 2009
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "mvm/VirtualMachine.h"
-#include "jnjvm/JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaArray.h"
#include "JavaClass.h"
Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Wed Dec 16 14:10:15 2009
@@ -18,7 +18,7 @@
#include "JavaTypes.h"
#include "Jnjvm.h"
-#include "jnjvm/OpcodeNames.def"
+#include "j3/OpcodeNames.def"
#include <cstdarg>
Modified: vmkit/trunk/lib/J3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Makefile?rev=91561&r1=91558&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/J3/VMCore/Makefile Wed Dec 16 14:10:15 2009
@@ -11,15 +11,15 @@
include $(LEVEL)/Makefile.config
ifeq ($(WITH_LLVM_GCC), 1)
- MODULE_NAME = JnJVM
+ MODULE_NAME = J3
else
- LIBRARYNAME = JnJVM
+ LIBRARYNAME = J3
endif
include $(LEVEL)/Makefile.common
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath $(CLASSPATH_FLAGS) -I$(PROJ_SRC_DIR)/../../../include/jnjvm
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath $(CLASSPATH_FLAGS) -I$(PROJ_SRC_DIR)/../../../include/j3
ifeq ($(ISOLATE_BUILD), 1)
CXX.Flags += -I$(PROJ_SRC_DIR)/../Isolate
Modified: vmkit/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Makefile?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Wed Dec 16 14:10:15 2009
@@ -12,8 +12,8 @@
include $(LEVEL)/Makefile.config
-ifeq ($(WITH_JNJVM), 1)
-PARALLEL_DIRS += JnJVM
+ifeq ($(WITH_J3), 1)
+PARALLEL_DIRS += J3
endif
ifeq ($(WITH_N3), 1)
Modified: vmkit/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/Makefile?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/Makefile (original)
+++ vmkit/trunk/tools/Makefile Wed Dec 16 14:10:15 2009
@@ -12,8 +12,8 @@
include $(LEVEL)/Makefile.config
-ifeq ($(WITH_JNJVM), 1)
- PARALLEL_DIRS += jnjvm
+ifeq ($(WITH_J3), 1)
+ PARALLEL_DIRS += j3
PARALLEL_DIRS += vmjc
PARALLEL_DIRS += llcj
endif
Copied: vmkit/trunk/tools/j3/Main.cpp (from r91558, vmkit/trunk/tools/jnjvm/Main.cpp)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?p2=vmkit/trunk/tools/j3/Main.cpp&p1=vmkit/trunk/tools/jnjvm/Main.cpp&r1=91558&r2=91561&rev=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/jnjvm/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Wed Dec 16 14:10:15 2009
@@ -13,8 +13,8 @@
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
#include "llvm/Support/ManagedStatic.h"
Copied: vmkit/trunk/tools/j3/Makefile (from r91558, vmkit/trunk/tools/jnjvm/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Makefile?p2=vmkit/trunk/tools/j3/Makefile&p1=vmkit/trunk/tools/jnjvm/Makefile&r1=91558&r2=91561&rev=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/jnjvm/Makefile (original)
+++ vmkit/trunk/tools/j3/Makefile Wed Dec 16 14:10:15 2009
@@ -10,24 +10,24 @@
include $(LEVEL)/Makefile.config
-TOOLNAME = jnjvm
+TOOLNAME = j3
ifeq ($(WITH_LLVM_GCC), 1)
- MODULESNAME = jnjvm
- USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc CommonThread.bc \
+ MODULESNAME = j3
+ USEDMODULES = J3.bc Classpath.bc J3Compiler.bc Allocator.bc CommonThread.bc \
Mvm.bc MvmCompiler.bc $(GCLIB).bc
ifeq ($(ISOLATE_SHARING_BUILD), 1)
USEDMODULES += Isolate.bc
endif
- BUILT_SOURCES = jnjvm.s
- SOURCES = jnjvm.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+ BUILT_SOURCES = j3.s
+ SOURCES = j3.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
else
-USEDLIBS = JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a Allocator.a \
+USEDLIBS = J3.a Classpath.a J3.a J3Compiler.a Allocator.a \
Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
ifeq ($(ISOLATE_SHARING_BUILD), 1)
Modified: vmkit/trunk/tools/llcj/llcj.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/llcj/llcj.cpp?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/llcj/llcj.cpp (original)
+++ vmkit/trunk/tools/llcj/llcj.cpp Wed Dec 16 14:10:15 2009
@@ -221,12 +221,12 @@
gccArgv[gccArgc++] = "-lm";
gccArgv[gccArgc++] = "-ldl";
gccArgv[gccArgc++] = "-lz";
- gccArgv[gccArgc++] = "-lJnJVM";
+ gccArgv[gccArgc++] = "-lJ3";
gccArgv[gccArgc++] = "-lClasspath";
- gccArgv[gccArgc++] = "-lJnJVM";
+ gccArgv[gccArgc++] = "-lJ3";
gccArgv[gccArgc++] = "-lClasspath";
if (withJIT) {
- gccArgv[gccArgc++] = "-lJnJVMCompiler";
+ gccArgv[gccArgc++] = "-lJ3Compiler";
}
gccArgv[gccArgc++] = "-lAllocator";
gccArgv[gccArgc++] = "-lCommonThread";
Modified: vmkit/trunk/tools/vmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/Makefile?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/Makefile Wed Dec 16 14:10:15 2009
@@ -17,7 +17,7 @@
ifeq ($(WITH_LLVM_GCC), 1)
MODULESNAME = vmkit
- USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc \
+ USEDMODULES = J3.bc Classpath.bc J3Compiler.bc Allocator.bc \
CommonThread.bc Mvm.bc MvmCompiler.bc $(GCLIB).bc
BUILT_SOURCES = vmkit.s
@@ -25,7 +25,7 @@
else
- USEDLIBS = JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a Allocator.a \
+ USEDLIBS = J3.a Classpath.a J3.a J3Compiler.a Allocator.a \
Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
endif
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Wed Dec 16 14:10:15 2009
@@ -43,11 +43,11 @@
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
-#include "../../lib/JnJVM/VMCore/JnjvmClassLoader.h"
-#include "../../lib/JnJVM/VMCore/Jnjvm.h"
+#include "../../lib/J3/VMCore/JnjvmClassLoader.h"
+#include "../../lib/J3/VMCore/Jnjvm.h"
#include <iostream>
#include <fstream>
Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Dec 16 14:10:15 2009
@@ -1,6 +1,6 @@
//===--------- Launcher.cpp - Launch command line -------------------------===//
//
-// JnJVM
+// The VMKit project
//
// This file is distributed under the University of Pierre et Marie Curie
// License. See LICENSE.TXT for details.
@@ -25,8 +25,8 @@
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
-#include "jnjvm/JnjvmModule.h"
-#include "jnjvm/JnjvmModuleProvider.h"
+#include "j3/JnjvmModule.h"
+#include "j3/JnjvmModuleProvider.h"
#include "CommandLine.h"
Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Wed Dec 16 14:10:15 2009
@@ -1,6 +1,6 @@
-##===- tools/jnjvm/Makefile --------------------------------*- Makefile -*-===##
+##===- tools/vmkit/Makefile --------------------------------*- Makefile -*-===##
#
-# The vmkit project
+# The VMKit project
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
@@ -17,8 +17,8 @@
MODULESNAME = vmkit
- ifeq ($(WITH_JNJVM), 1)
- USEDMODULES += JnJVM.bc Classpath.bc JnjvmCompiler.bc
+ ifeq ($(WITH_J3), 1)
+ USEDMODULES += J3.bc Classpath.bc JnjvmCompiler.bc
endif
ifeq ($(ISOLATE_SHARING_BUILD), 1)
@@ -36,9 +36,11 @@
else
+
+ USEDLIBS += Allocator.a Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
- ifeq ($(WITH_JNJVM), 1)
- USEDLIBS += JnJVM.a Classpath.a JnJVM.a JnjvmCompiler.a
+ ifeq ($(WITH_J3), 1)
+ USEDLIBS += J3.a Classpath.a J3.a J3Compiler.a
endif
ifeq ($(ISOLATE_SHARING_BUILD), 1)
@@ -48,7 +50,7 @@
ifeq ($(WITH_N3_PNETLIB), 1)
USEDLIBS += N3.a PNetLib.a
endif
-
+
USEDLIBS += Allocator.a Mvm.a MvmCompiler.a $(GCLIB).a CommonThread.a
endif
Modified: vmkit/trunk/www/get_started.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/get_started.html?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/www/get_started.html (original)
+++ vmkit/trunk/www/get_started.html Wed Dec 16 14:10:15 2009
@@ -124,8 +124,8 @@
<li>Try it out: (assuming vmkit/Debug/bin is in your path)</li>
<ul>
- <li><tt>jnjvm --help</tt></li>
- <li><tt>jnjvm HelloWorld</tt></li>
+ <li><tt>j3 --help</tt></li>
+ <li><tt>j3 HelloWorld</tt></li>
<li><tt>n3-pnetlib --help</tt></li>
<li><tt>n3-pnetlib HelloWorld.exe</tt></li>
</ul>
Modified: vmkit/trunk/www/use_mmtk.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/use_mmtk.html?rev=91561&r1=91560&r2=91561&view=diff
==============================================================================
--- vmkit/trunk/www/use_mmtk.html (original)
+++ vmkit/trunk/www/use_mmtk.html Wed Dec 16 14:10:15 2009
@@ -37,7 +37,7 @@
<li>Run VMKit with MMTk:</li>
<ul>
<li><tt>Release/bin/vmkit -std-compile-opts --load-bc=Release/lib/FinalMMTk.bc
- -load-bc=lib/JnJVM/LLVMRuntime/LLVMRuntime.gen.ll -java Foo </tt></li>
+ -load-bc=lib/J3/LLVMRuntime/LLVMRuntime.gen.ll -java Foo </tt></li>
</ul>
</ol>
More information about the vmkit-commits
mailing list