[vmkit-commits] [vmkit] r71951 - in /vmkit/trunk/lib/JnJVM: Compiler/JavaJITCompiler.cpp VMCore/JavaArray.h VMCore/JavaObject.cpp VMCore/JavaObject.h VMCore/JavaString.h VMCore/JavaTypes.h VMCore/Jnjvm.h

[Nicolas Geoffray]

Author: geoffray
Date: Sat May 16 11:37:14 2009
New Revision: 71951

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



Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaString.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=71951&r1=71950&r2=71951&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Sat May 16 11:37:14 2009
@@ -18,6 +18,7 @@
 #include "MvmGC.h"
 #include "mvm/VirtualMachine.h"
 
+#include "JavaClass.h"
 #include "JavaConstantPool.h"
 #include "JavaThread.h"
 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Sat May 16 11:37:14 2009
@@ -27,6 +27,7 @@
 class CommonClass;
 class JavaObject;
 class Jnjvm;
+class UTF8Map;
 
 /// TJavaArray - Template class to be instantiated by real arrays. All arrays
 ///  have a constant size and an array of element. When JnJVM allocates an

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Sat May 16 11:37:14 2009
@@ -295,3 +295,12 @@
   // can not be here
   return;
 }
+
+bool JavaObject::instanceOf(UserCommonClass* cl) {
+  if (!this) return false;
+  else return this->getClass()->isAssignableFrom(cl);
+}
+
+UserCommonClass* JavaObject::getClass() const {
+  return ((JavaVirtualTable*)getVirtualTable())->cl;
+}

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h Sat May 16 11:37:14 2009
@@ -18,12 +18,14 @@
 
 #include "types.h"
 
-#include "JavaClass.h"
+#include "JnjvmConfig.h"
 
 namespace jnjvm {
 
 class JavaObject;
 class JavaThread;
+class Jnjvm;
+class Typedef;
 
 /// JavaCond - This class maintains a list of threads blocked on a wait. 
 /// notify and notifyAll will change the state of one or more of these threads.
@@ -127,9 +129,7 @@
 
   /// getClass - Returns the class of this object.
   ///
-  UserCommonClass* getClass() const {
-    return ((JavaVirtualTable*)getVirtualTable())->cl;
-  }
+  UserCommonClass* getClass() const;
 
   /// lock - The monitor of this object. Most of the time null.
   ///
@@ -167,10 +167,7 @@
 
   /// instanceOf - Is this object's class of type the given class?
   ///
-  bool instanceOf(UserCommonClass* cl) {
-    if (!this) return false;
-    else return this->getClass()->isAssignableFrom(cl);
-  }
+  bool instanceOf(UserCommonClass* cl);
 
   /// acquire - Acquire the lock on this object.
   void acquire() {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.h Sat May 16 11:37:14 2009
@@ -18,6 +18,8 @@
 
 class ArrayUInt16;
 class Jnjvm;
+class UTF8;
+class UTF8Map;
 
 class JavaString : public JavaObject {
 public:

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h Sat May 16 11:37:14 2009
@@ -14,6 +14,8 @@
 
 #include "mvm/Allocator.h"
 
+#include "JnjvmClassLoader.h"
+
 namespace jnjvm {
 
 class UserCommonClass;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h Sat May 16 11:37:14 2009
@@ -34,6 +34,7 @@
 class JavaObject;
 class JavaString;
 class JavaThread;
+class JavaVirtualTable;
 class JnjvmBootstrapLoader;
 class JnjvmClassLoader;
 class UserClass;