[vmkit-commits] [vmkit] r63515 - in /vmkit/trunk/lib/JnJVM: LLVMRuntime/runtime-default.ll VMCore/JavaThread.h

[Nicolas Geoffray]

Author: geoffray
Date: Mon Feb  2 08:48:12 2009
New Revision: 63515

URL: http://llvm.org/viewvc/llvm-project?rev=63515&view=rev
Log:
Add the exception objects into the LLVM representation of a thread.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaThread.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=63515&r1=63514&r2=63515&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Mon Feb  2 08:48:12 2009
@@ -42,8 +42,10 @@
 ;;; Field 6: internalThreadID
 ;;; field 7: routine
 ;;; field 8: jnienv
+;;; field 9: Java pendingException
+;;; field 10: CXX pendingException
 %JavaThread = type { %VT*, %JavaThread*, %JavaThread*, i8*, i8*, i8*, i8*, i8*,
-                     i8* }
+                     i8*, %JavaObject*, i8* }
 
 
 %Attribut = type { %UTF8*, i32, i32 }

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h Mon Feb  2 08:48:12 2009
@@ -64,6 +64,14 @@
   /// jniEnv - The JNI environment of the thread.
   ///
   void* jniEnv;
+  
+  /// pendingException - The Java exception currently pending.
+  ///
+  JavaObject* pendingException;
+
+  /// internalPendingException - The C++ exception currencty pending.
+  ///
+  void* internalPendingException;
 
   /// javaThread - The Java representation of this thread.
   ///
@@ -82,14 +90,6 @@
   ///
   mvm::Cond varcond;
 
-  /// pendingException - The Java exception currently pending.
-  ///
-  JavaObject* pendingException;
-
-  /// internalPendingException - The C++ exception currencty pending.
-  ///
-  void* internalPendingException;
-
   /// interruptFlag - Has this thread been interrupted?
   ///
   uint32 interruptFlag;