[vmkit-commits] [vmkit] r61499 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaClass.cpp JavaClass.h JavaConstantPool.cpp JavaConstantPool.h JavaMetaJIT.cpp JavaObject.cpp JavaRuntimeJIT.cpp JavaThread.cpp JavaTypes.cpp JavaUpcalls.cpp Jni.cpp Jnjvm.cpp JnjvmClassLoader.h LowerConstantCalls.cpp

Nicolas Geoffray nicolas.geoffray at lip6.fr
Tue Dec 30 07:47:25 PST 2008


Author: geoffray
Date: Tue Dec 30 09:47:17 2008
New Revision: 61499

URL: http://llvm.org/viewvc/llvm-project?rev=61499&view=rev
Log:
Cleanup includes.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaMetaJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
    vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Dec 30 09:47:17 2008
@@ -13,7 +13,6 @@
 
 #include <cstring>
 
-#include "mvm/JIT.h"
 #include "debug.h"
 #include "types.h"
 
@@ -22,12 +21,12 @@
 #include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
-#include "JavaJIT.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
+#include "JnjvmModule.h"
 #include "JnjvmModuleProvider.h"
 #include "LockedMap.h"
 #include "Reader.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Tue Dec 30 09:47:17 2008
@@ -10,12 +10,10 @@
 #ifndef JNJVM_JAVA_CLASS_H
 #define JNJVM_JAVA_CLASS_H
 
-#include <vector>
 
 #include "types.h"
 
 #include "mvm/Allocator.h"
-#include "mvm/JIT.h"
 #include "mvm/Object.h"
 #include "mvm/PrintBuffer.h"
 #include "mvm/Threads/Cond.h"
@@ -23,9 +21,11 @@
 
 #include "JavaAccess.h"
 #include "JnjvmClassLoader.h"
-
 #include "JnjvmConfig.h"
 
+#include <cassert>
+#include <vector>
+
 namespace jnjvm {
 
 class ArrayObject;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp Tue Dec 30 09:47:17 2008
@@ -19,8 +19,8 @@
 #include "JavaArray.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
-#include "JavaJIT.h"
 #include "Jnjvm.h"
+#include "JnjvmModule.h"
 #include "JnjvmModuleProvider.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h Tue Dec 30 09:47:17 2008
@@ -10,7 +10,6 @@
 #ifndef JNJVM_JAVA_CONSTANT_POOL_H
 #define JNJVM_JAVA_CONSTANT_POOL_H
 
-#include "mvm/JIT.h"
 #include "mvm/Object.h"
 
 #include "types.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaMetaJIT.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaMetaJIT.cpp Tue Dec 30 09:47:17 2008
@@ -10,17 +10,12 @@
 #include <cstdarg>
 #include <cstring>
 
-#include "mvm/JIT.h"
-
 #include "debug.h"
-#include "JavaArray.h"
 #include "JavaClass.h"
-#include "JavaJIT.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
 #include "Jnjvm.h"
-#include "JnjvmModule.h"
 
 using namespace jnjvm;
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Tue Dec 30 09:47:17 2008
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "mvm/JIT.h"
 #include "mvm/Threads/Locks.h"
 
 #include "JavaClass.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue Dec 30 09:47:17 2008
@@ -10,14 +10,12 @@
 
 #include <cstdarg>
 
-#include "mvm/JIT.h"
 #include "mvm/Threads/Thread.h"
 
 #include "JavaArray.h"
 #include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
-#include "JavaJIT.h"
 #include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp Tue Dec 30 09:47:17 2008
@@ -7,13 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mvm/JIT.h"
 #include "mvm/PrintBuffer.h"
 #include "mvm/Threads/Locks.h"
 #include "mvm/Threads/Thread.h"
 
 #include "JavaClass.h"
-#include "JavaJIT.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
 #include "JavaUpcalls.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp Tue Dec 30 09:47:17 2008
@@ -9,17 +9,10 @@
 
 #include <vector>
 
-#include "mvm/JIT.h"
-
-#include "JavaAccess.h"
 #include "JavaArray.h"
 #include "JavaClass.h"
-#include "JavaConstantPool.h"
-#include "JavaJIT.h"
-#include "JavaThread.h"
 #include "JavaTypes.h"
-#include "JavaUpcalls.h"
-#include "Jnjvm.h"
+#include "JnjvmModule.h"
 
 using namespace jnjvm;
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp Tue Dec 30 09:47:17 2008
@@ -9,12 +9,9 @@
 
 #include <vector>
 
-#include "mvm/JIT.h"
-
 #include "ClasspathReflect.h"
 #include "JavaAccess.h"
 #include "JavaClass.h"
-#include "JavaJIT.h"
 #include "JavaObject.h"
 #include "JavaString.h"
 #include "JavaThread.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp Tue Dec 30 09:47:17 2008
@@ -11,7 +11,6 @@
 
 #include "JavaArray.h"
 #include "JavaClass.h"
-#include "JavaJIT.h"
 #include "JavaObject.h"
 #include "JavaString.h"
 #include "JavaThread.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Tue Dec 30 09:47:17 2008
@@ -17,19 +17,18 @@
 #include <cstring>
 #include "debug.h"
 
-#include "mvm/JIT.h"
 #include "mvm/Threads/Thread.h"
 
 #include "ClasspathReflect.h"
 #include "JavaArray.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
-#include "JavaJIT.h"
 #include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
+#include "JnjvmModule.h"
 #include "JnjvmModuleProvider.h"
 #include "LockedMap.h"
 #include "Reader.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Tue Dec 30 09:47:17 2008
@@ -11,6 +11,7 @@
 #ifndef JNJVM_CLASSLOADER_H
 #define JNJVM_CLASSLOADER_H
 
+#include <map>
 #include <vector>
 
 #include "types.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp?rev=61499&r1=61498&r2=61499&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp Tue Dec 30 09:47:17 2008
@@ -15,8 +15,6 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 
-#include "mvm/JIT.h"
-
 #include "JnjvmModule.h"
 
 using namespace llvm;





More information about the vmkit-commits mailing list