2 files changed, 5 insertions, 1 deletions
diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h
index 74e1490..d5fce86 100644
--- a/libjava/java/lang/Thread.h
+++ b/libjava/java/lang/Thread.h
@@ -144,7 +144,8 @@ public: // actually package-private
   static const jbyte THREAD_PARK_DEAD = 3;
   ::java::lang::Object * accessControlState;
   ::gnu::gcj::RawData * interp_frame;
-  jint volatile state;
+  ::gnu::gcj::RawData * frame;
+  volatile jint state;
   ::gnu::gcj::RawDataManaged * data;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java
index 9666482..7216512 100644
--- a/libjava/java/lang/Thread.java
+++ b/libjava/java/lang/Thread.java
@@ -182,6 +182,9 @@ public class Thread implements Runnable
   
   // This describes the top-most interpreter frame for this thread.
   RawData interp_frame;
+  
+  // This describes the top most frame in the composite (interp + JNI) stack
+  RawData frame;
 
   // Current state.
   volatile int state;