[vmkit-commits] [vmkit] r81717 - in /vmkit/trunk/lib/JnJVM: Compiler/JnjvmModule.cpp LLVMRuntime/runtime-default.ll

[Nicolas Geoffray]

Author: geoffray
Date: Sun Sep 13 16:26:58 2009
New Revision: 81717

URL: http://llvm.org/viewvc/llvm-project?rev=81717&view=rev
Log:
Fix offsets in mvm::Thread fields.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Sun Sep 13 16:26:58 2009
@@ -204,11 +204,11 @@
   OffsetDoYieldInThreadConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 6);
   OffsetJNIInThreadConstant =
-    ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 12);
-  OffsetJavaExceptionInThreadConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 13);
-  OffsetCXXExceptionInThreadConstant =
+  OffsetJavaExceptionInThreadConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 14);
+  OffsetCXXExceptionInThreadConstant =
+    ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 15);
   
   ClassReadyConstant =
     ConstantInt::get(Type::getInt8Ty(getGlobalContext()), ready);

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=81717&r1=81716&r2=81717&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Sun Sep 13 16:26:58 2009
@@ -34,6 +34,8 @@
 ;;; Field 3: The static instance
 %TaskClassMirror = type { i8, i1, i8* }
 
+%Vector = type {i32, i8*, i8*}
+
 ;;; Field 0: the VT of threads
 ;;; Field 1: next
 ;;; Field 2: prev
@@ -46,11 +48,12 @@
 ;;; Field 9: lastSP
 ;;; Field 10: internalThreadID
 ;;; field 11: routine
-;;; field 12: jnienv
-;;; field 13: Java pendingException
-;;; field 14: CXX pendingException
+;;; field 12: addresses
+;;; field 13: jnienv
+;;; field 14: Java pendingException
+;;; field 15: CXX pendingException
 %JavaThread = type { %VT*, %JavaThread*, %JavaThread*, i8*, i8*, i8*, i1, i1,
-                     i1, i8*, i8*, i8*, i8*, %JavaObject*, i8* }
+                     i1, i8*, i8*, i8*, %Vector, i8*, %JavaObject*, i8* }
 
 
 %Attribut = type { %UTF8*, i32, i32 }