[vmkit-commits] [vmkit] r60183 - in /vmkit/trunk/lib/JnJVM: LLVMRuntime/runtime-default.ll LLVMRuntime/runtime-isolate.ll VMCore/JavaClass.cpp VMCore/JavaClass.h

[Nicolas Geoffray]

Author: geoffray
Date: Thu Nov 27 14:22:35 2008
New Revision: 60183

URL: http://llvm.org/viewvc/llvm-project?rev=60183&view=rev
Log:
Fix compilation for ISOLATE mode.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-isolate.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll?rev=60183&r1=60182&r2=60183&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Thu Nov 27 14:22:35 2008
@@ -11,7 +11,7 @@
 ;;; Field 1: The class state
 ;;; Field 2: The class delegatee (java/lang/Class)
 ;;; Field 3: The static instance
-%TaskClassMirror = type { i32, %JavaObject*, %JavaObject* }
+%TaskClassMirror = type { i32, %JavaObject*, i8* }
 
 ;;; The type of internal classes. This is not complete, but we only need
 ;;; the first fields for now. 

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-isolate.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-isolate.ll?rev=60183&r1=60182&r2=60183&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-isolate.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-isolate.ll Thu Nov 27 14:22:35 2008
@@ -15,15 +15,15 @@
 
 ;;; specialCtpLookup - Find the user constant pool at the given offset in the
 ;;; constant pool.
-declare %ConstantPool* @specialCtpLookup(%ConstantPool*, i32, %ConstantPool**)
+declare i8** @specialCtpLookup(i8**, i32, i8**)
 
 ;;; getCtpCacheNode - Get the constant pool cache of a cache node. This is a
 ;;; constant call because the cache node never changes.
-declare %ConstantPool* @getCtpCacheNode(%CacheNode*) readnone
+declare i8** @getCtpCacheNode(%CacheNode*) readnone
 
 ;;; getCtpCacheNode - Get the constant pool cache of a class. This is a
 ;;; constant call because the constant pool never changes.
-declare %ConstantPool* @getCtpClass(%JavaClass*) readnone
+declare i8** @getCtpClass(%JavaClass*) readnone
 
 ;;; getJnjvmExceptionClass - Get the exception user class for the given
 ;;; isolate.

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Thu Nov 27 14:22:35 2008
@@ -139,7 +139,9 @@
     classLoader->allocator.Deallocate(ctpInfo);
   }
 
+#ifndef ISOLATE
   classLoader->allocator.Deallocate(_staticInstance);
+#endif
   // Currently, only regular classes have a heap allocated virtualVT.
   // Array classes have a C++ allocated virtualVT and primitive classes
   // do not have a virtualVT.

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Thu Nov 27 14:22:35 2008
@@ -124,7 +124,7 @@
 public:
   JavaState status;
   JavaObject* delegatee;
-  mvm::Object* staticInstance;
+  void* staticInstance;
 };
 #endif