* Removed all Id tags.

[cacao.git] / src / threads / native / threads.h

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 199261ca2837e08a6ae4c01b464d3822004ab878..417b273d1849ff2236f6a5fe6b4dc10d7cfc5d9c 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads.h 8222 2007-07-22 20:07:55Z twisti $
-
 */
 
 
@@ -44,6 +42,7 @@ typedef struct threadobject threadobject;
 
 #include "mm/memory.h"
 #include "native/jni.h"
+#include "native/localref.h"
 #include "native/include/java_lang_Thread.h"
 
 #include "threads/native/lock.h"
@@ -126,7 +125,7 @@ struct threadobject {
 
        u1                   *pc;           /* current PC (used for profiling)    */
 
-       java_objectheader    *_exceptionptr;     /* current exception             */
+       java_object_t        *_exceptionptr;     /* current exception             */
        stackframeinfo       *_stackframeinfo;   /* current native stackframeinfo */
        localref_table       *_localref_table;   /* JNI local references          */
 
@@ -140,6 +139,11 @@ struct threadobject {
        u2                    filterverbosecallctr[2]; /* counters for verbose call filter */
 #endif
 
+#if !defined(NDEBUG)
+       s4                    tracejavacallindent;
+       u4                    tracejavacallcount;
+#endif
+
        listnode_t            linkage;      /* threads-list                       */
 };
 
@@ -159,6 +163,13 @@ struct threadobject {
 #      define FILTERVERBOSECALLCTR (THREADOBJECT->filterverbosecallctr)
 #endif
 
+/* state for trace java call **************************************************/
+
+#if !defined(NDEBUG)
+#      define TRACEJAVACALLINDENT (THREADOBJECT->tracejavacallindent)
+#      define TRACEJAVACALLCOUNT (THREADOBJECT->tracejavacallcount)
+#endif
+
 /* functions ******************************************************************/
 
 void threads_sem_init(sem_t *sem, bool shared, int value);