* src/threads/native/threads.h: Added THREAD_FLAG_IN_NATIVE and gc_critical.

* src/threads/native/threads.c: Init and dump the above flags.

* src/vm/vm.c: Change the THREAD_IN_NATIVE_FLAG accordingly.
* src/vm/jit/codegen-common.c: Same as above.

--HG--
branch : exact-gc

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index f84f2b2fbd07021037f745b45099e1f5157e33c0..9b2869093ca327da745daedf726551cbf69de7fa 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: headers.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: headers.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/native/vm/gnu/java_lang_reflect_Field.c b/src/native/vm/gnu/java_lang_reflect_Field.c
index 037fdf180529f2e340a6340b49ddfd7e9533c2ff..3d2942508f7c9c1dd783766ad7e88fcb0d27f06d 100644 (file)
--- a/src/native/vm/gnu/java_lang_reflect_Field.c
+++ b/src/native/vm/gnu/java_lang_reflect_Field.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: java_lang_reflect_Field.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: java_lang_reflect_Field.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index 21e3657cf3dcf38fcf47210e81f4c0b9a6ef6046..17d99b933d9111f6d2b5ed90088cfe4893ca2740 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: threads.c 7489 2007-03-08 17:12:56Z michi $
 
 */
 
@@ -623,6 +623,11 @@ static void threads_init_threadobject(threadobject *thread)
 
        thread->index = 0;
 
+#if defined(ENABLE_GC_CACAO)
+       thread->flags       |= THREAD_FLAG_IN_NATIVE;
+       thread->gc_critical  = false;
+#endif
+
        /* TODO destroy all those things */
        pthread_mutex_init(&(thread->joinmutex), NULL);
        pthread_cond_init(&(thread->joincond), NULL);
@@ -776,9 +781,7 @@ bool threads_init(void)
        FREE(tempthread, threadobject);
 
        threads_init_threadobject(mainthreadobj);
-
        threads_set_current_threadobject(mainthreadobj);
-
        lock_init_execution_env(mainthreadobj);
 
        mainthreadobj->next = mainthreadobj;
@@ -1070,6 +1073,8 @@ static void *threads_startup_thread(void *t)
 #if defined(__DARWIN__)
        thread->mach_thread = mach_thread_self();
 #endif
+
+       threads_init_threadobject(thread);
        threads_set_current_threadobject(thread);
 
        /* insert the thread into the threadlist and the threads table */
@@ -1922,9 +1927,23 @@ void threads_dump(void)
                        utf_display_printable_ascii(name);
                        printf("\" ");
 
+                       if (thread->flags & THREAD_FLAG_JAVA)
+                               printf("java ");
+
+                       if (thread->flags & THREAD_FLAG_INTERNAL)
+                               printf("internal ");
+
                        if (thread->flags & THREAD_FLAG_DAEMON)
                                printf("daemon ");
 
+#if defined(ENABLE_GC_CACAO)
+                       if (thread->flags & THREAD_FLAG_IN_NATIVE)
+                               printf("in-native ");
+
+                       if (thread->gc_critical)
+                               printf("GC-CRITICAL");
+#endif
+
 #if SIZEOF_VOID_P == 8
                        printf("prio=%d tid=0x%016lx\n", t->priority, (ptrint) thread->tid);
 #else

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 7c23471e8340bd1d8c03137b3f6d35512604c5d8..e5d9f2f95c1cf388ea9388dd4ee0a1e6edc14ca9 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: threads.h 7489 2007-03-08 17:12:56Z michi $
 
 */
 
@@ -127,6 +127,7 @@ struct threads_table_t {
 #define THREAD_FLAG_JAVA        0x01    /* a normal Java thread               */
 #define THREAD_FLAG_INTERNAL    0x02    /* CACAO internal thread              */
 #define THREAD_FLAG_DAEMON      0x04    /* daemon thread                      */
+#define THREAD_FLAG_IN_NATIVE   0x08    /* currently executing native code    */
 
 
 struct threadobject {
@@ -169,6 +170,10 @@ struct threadobject {
        Cell                 *_global_sp;        /* stack pointer for interpreter */
 #endif
 
+#if defined(ENABLE_GC_CACAO)
+       bool                  gc_critical;
+#endif
+
        dumpinfo_t            dumpinfo;     /* dump memory info structure         */
 };
 

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 0161a9c70a0ea7964674379082cbe68cbd7d97d7..0e84aa1c7492f971dbd0c24b095843692db4f788 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -22,7 +22,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 ##
-## $Id: Makefile.am 7483 2007-03-08 13:17:40Z michi $
+## $Id: Makefile.am 7486 2007-03-08 13:50:07Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index a66fe2d5dc2fb1056420df43b67194ab59e833ef..3b4b60476abcae93812cd45023477e79883852b9 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: builtin.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: builtin.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/allocator/simplereg.c b/src/vm/jit/allocator/simplereg.c
index d049cfd420a0ff8dbf19a9b45afd5c4cf7c28f6d..f535438ae9e630da367e4cff2d1846e04547a819 100644 (file)
--- a/src/vm/jit/allocator/simplereg.c
+++ b/src/vm/jit/allocator/simplereg.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 
-   $Id: simplereg.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: simplereg.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/arm/patcher.c b/src/vm/jit/arm/patcher.c
index ec0f725131350d452f80aecbaef4f826ae6a9cbc..946f467948093419adf071f3144aa48929fa3ced 100644 (file)
--- a/src/vm/jit/arm/patcher.c
+++ b/src/vm/jit/arm/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 7496334bfe433a2e565c69c267835dc137db518b..47999c1aa33f584b3678ea477e89072e117bdbc5 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -39,7 +39,7 @@
    memory. All functions writing values into the data area return the offset
    relative the begin of the code area (start of procedure).   
 
-   $Id: codegen-common.c 7407 2007-02-26 19:12:03Z michi $
+   $Id: codegen-common.c 7489 2007-03-08 17:12:56Z michi $
 
 */
 
@@ -1087,6 +1087,12 @@ void codegen_start_native_call(u1 *datasp, u1 *pv, u1 *sp, u1 *ra)
 
        LOCALREFTABLE = lrt;
 #endif
+
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       /* set the native world flag */
+
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
 }
 
 
@@ -1113,6 +1119,12 @@ java_objectheader *codegen_finish_native_call(u1 *datasp)
        lrt = (localref_table *) (datasp - sizeof(stackframeinfo) - 
                                                          sizeof(localref_table));
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       /* clear the native world flag */
+
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
        /* remove current stackframeinfo from chain */
 
        psfi = STACKFRAMEINFO;

diff --git a/src/vm/jit/i386/emit.c b/src/vm/jit/i386/emit.c
index 5ff1011f43ee2efa5a95aaef3cb38eb77c54574e..935ca3a6edd167cefddffcd51344655232451b31 100644 (file)
--- a/src/vm/jit/i386/emit.c
+++ b/src/vm/jit/i386/emit.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emit.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: emit.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c
index 297a9902b847d94398b603d63e27bf696e542a08..59332b6b1d1aaa34c188e7dc7a9bb6e25b6b7631 100644 (file)
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c
index 0d138c8876d56c9d10c18ecfbd635175212bbd41..40cb9d49372c24ac50201ff7ecb40c8166b2638a 100644 (file)
--- a/src/vm/jit/inline/inline.c
+++ b/src/vm/jit/inline/inline.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: inline.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: inline.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/intrp/intrp.h b/src/vm/jit/intrp/intrp.h
index 6fd632569b8a24ab724830bf168a98b43cbf982f..ab30b840355fe5aad85e4a83cb504641a3ccb937 100644 (file)
--- a/src/vm/jit/intrp/intrp.h
+++ b/src/vm/jit/intrp/intrp.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: intrp.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: intrp.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/intrp/patcher.c b/src/vm/jit/intrp/patcher.c
index 838b531976b6ba5b1204e592874ffacd8747798d..bb2bf155098e93a584c860b7a8c13901a428350b 100644 (file)
--- a/src/vm/jit/intrp/patcher.c
+++ b/src/vm/jit/intrp/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c
index 949c12e90c2a203357187111bf5c65e45762dbf4..0f3a8c25ad414127bcc06b7b6ce00199e01a62cb 100644 (file)
--- a/src/vm/jit/s390/codegen.c
+++ b/src/vm/jit/s390/codegen.c
@@ -29,7 +29,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: codegen.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/codegen.h b/src/vm/jit/s390/codegen.h
index 841a590ddb7bc7843a1aead8f16b69a38ccd03b8..1861fdffa0aa88f42cdf1c4a6995f33221381283 100644 (file)
--- a/src/vm/jit/s390/codegen.h
+++ b/src/vm/jit/s390/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: codegen.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/emit.c b/src/vm/jit/s390/emit.c
index 1fd742a8f878105e7ff4a6c835754cd9b1e6cdd8..4d0fb163993f5393f9ab8eea04777ae29018e46b 100644 (file)
--- a/src/vm/jit/s390/emit.c
+++ b/src/vm/jit/s390/emit.c
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: emit.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: emit.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/emit.h b/src/vm/jit/s390/emit.h
index 478fbfbabc54361a80b66ad309fc1777b5c41af3..d7feabd11f4aa49afb339ac064d1d09dcbd59033 100644 (file)
--- a/src/vm/jit/s390/emit.h
+++ b/src/vm/jit/s390/emit.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: emit.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: emit.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/md-abi.h b/src/vm/jit/s390/md-abi.h
index 9d1fdfc0259e33d75a5cbbe046b937156fe5ec11..ff0bcba699e25a07abc1cbeaf55108386ea2e4db 100644 (file)
--- a/src/vm/jit/s390/md-abi.h
+++ b/src/vm/jit/s390/md-abi.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: md-abi.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: md-abi.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/md-asm.h b/src/vm/jit/s390/md-asm.h
index aeba9d33b38ef999957cc07bc20b2414c6e19229..271c0f7c316e3486f5428949841b0563733470c1 100644 (file)
--- a/src/vm/jit/s390/md-asm.h
+++ b/src/vm/jit/s390/md-asm.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: md-asm.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: md-asm.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/s390/patcher.c b/src/vm/jit/s390/patcher.c
index ba568c2c2cc462116bc89fb3885500b01615ffcb..decaea9b2e1690f71f2e145f0be76e2173355fc4 100644 (file)
--- a/src/vm/jit/s390/patcher.c
+++ b/src/vm/jit/s390/patcher.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: patcher.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index bf20f3887697f62f47f1d8f46ab713d302e1e214..e5b9825d66c0dacddb2e916c8fe76da0e7602872 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: stack.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: stack.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index 1f45f2da8eb6cd65678ae8ff46df80e44bc9adf9..3e4f99027f5a8f366de414ed6d4cfba6f1559eab 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: typecheck.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: typecheck.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/verify/typeinfo.c b/src/vm/jit/verify/typeinfo.c
index 109f3fe2c05c532a2fd4338d7a2474cc57b81bae..fa3189584f0c91752707a5d2b377c51508cd70cd 100644 (file)
--- a/src/vm/jit/verify/typeinfo.c
+++ b/src/vm/jit/verify/typeinfo.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: typeinfo.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: typeinfo.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c
index 6c6be8218abe0a59eff60eae3e1619a02c869f2a..448d30dadb65e1bd98a3463be3d6bef0fb23c9ff 100644 (file)
--- a/src/vm/jit/x86_64/emit.c
+++ b/src/vm/jit/x86_64/emit.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emit.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: emit.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/x86_64/md-abi.c b/src/vm/jit/x86_64/md-abi.c
index 642e40f059ec0f1e1f2d9a6933cb25a8feb7d334..111ee462320bd5a1a72ad8759312e428828e39c5 100644 (file)
--- a/src/vm/jit/x86_64/md-abi.c
+++ b/src/vm/jit/x86_64/md-abi.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: md-abi.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/x86_64/md.c b/src/vm/jit/x86_64/md.c
index e59e81f58bf2d2f874f4a2ebc5b3c9d3a461e4d2..816a5c8bc24e8469f3220ce858f2efb45b36ece1 100644 (file)
--- a/src/vm/jit/x86_64/md.c
+++ b/src/vm/jit/x86_64/md.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: md.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c
index c0623969bc5ba39efd6ed29118a5d0004a08cde1..a4c54135a146e9800be37bb9efa5f95a763c3865 100644 (file)
--- a/src/vm/jit/x86_64/patcher.c
+++ b/src/vm/jit/x86_64/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: patcher.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/jit_interface.h b/src/vm/jit_interface.h
index f947b929c3914e1265579ab3c550e70e900f32dd..bc5cca4e1e3a9ab95bb3ba96c152b69a2a0e9e5b 100644 (file)
--- a/src/vm/jit_interface.h
+++ b/src/vm/jit_interface.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: jit_interface.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: jit_interface.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/resolve.c b/src/vm/resolve.c
index 3041cdd4f2fea2124012882cf5464c56222406c6..259ff7c104bb976ff28074e98fe6c04a26fbdc4c 100644 (file)
--- a/src/vm/resolve.c
+++ b/src/vm/resolve.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: resolve.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: resolve.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/resolve.h b/src/vm/resolve.h
index 89a9d2af1c751ec7f5c6c99333c9ce9da54e604b..f828d3ac0c0a5a07dbbbb3cae4d8e2e8a76f1b46 100644 (file)
--- a/src/vm/resolve.h
+++ b/src/vm/resolve.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: resolve.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: resolve.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 3418a14f0e047b2c1b48d24e1dfffdb1c6a22369..541fbb8dde5f5eacd1aeb6ce841474f0df73df11 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -2462,6 +2462,10 @@ java_objectheader *vm_call_method_vmarg(methodinfo *m, s4 vmargscount,
 {
        java_objectheader *o;
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp)
@@ -2473,6 +2477,10 @@ java_objectheader *vm_call_method_vmarg(methodinfo *m, s4 vmargscount,
        o = intrp_asm_vm_call_method(m, vmargscount, vmargs);
 #endif
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
+
        return o;
 }
 
@@ -2592,6 +2600,10 @@ s4 vm_call_method_int_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
 {
        s4 i;
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp)
@@ -2603,6 +2615,10 @@ s4 vm_call_method_int_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
        i = intrp_asm_vm_call_method_int(m, vmargscount, vmargs);
 #endif
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
+
        return i;
 }
 
@@ -2722,6 +2738,10 @@ s8 vm_call_method_long_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
 {
        s8 l;
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp)
@@ -2733,6 +2753,10 @@ s8 vm_call_method_long_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
        l = intrp_asm_vm_call_method_long(m, vmargscount, vmargs);
 #endif
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
+
        return l;
 }
 
@@ -2854,6 +2878,10 @@ float vm_call_method_float_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
 {
        float f;
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp)
@@ -2865,6 +2893,10 @@ float vm_call_method_float_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
        f = intrp_asm_vm_call_method_float(m, vmargscount, vmargs);
 #endif
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
+
        return f;
 }
 
@@ -2987,6 +3019,10 @@ double vm_call_method_double_vmarg(methodinfo *m, s4 vmargscount,
 {
        double d;
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags &= ~THREAD_FLAG_IN_NATIVE;
+#endif
+
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp)
@@ -2998,6 +3034,10 @@ double vm_call_method_double_vmarg(methodinfo *m, s4 vmargscount,
        d = intrp_asm_vm_call_method_double(m, vmargscount, vmargs);
 #endif
 
+#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
+       THREADOBJECT->flags |= THREAD_FLAG_IN_NATIVE;
+#endif
+
        return d;
 }
 

diff --git a/src/vmcore/classcache.c b/src/vmcore/classcache.c
index 11a6669078b793583b96bea78ce96426e4fb214e..bcbe5c1d2156909a9438741ef88e094f262a4a68 100644 (file)
--- a/src/vmcore/classcache.c
+++ b/src/vmcore/classcache.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: classcache.c 7441 2007-03-02 23:13:10Z michi $
+   $Id: classcache.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/descriptor.c b/src/vmcore/descriptor.c
index 6bdf6da4262a68acc9cad1ca33f9c2de110f1e99..40e12fc922bc4d20964aa0b8bb36b6f0fe059186 100644 (file)
--- a/src/vmcore/descriptor.c
+++ b/src/vmcore/descriptor.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: descriptor.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: descriptor.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/linker.c b/src/vmcore/linker.c
index e9c3c249d2bb4f242f6152bf2cd0f49cf03e3018..c3fcd57db13b81ba7fb82cb04f67876f5b354375 100644 (file)
--- a/src/vmcore/linker.c
+++ b/src/vmcore/linker.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: linker.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: linker.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/method.c b/src/vmcore/method.c
index 274008a3750a63eac62b1547ed2494141d70e54a..28557edcb76d5345c48d7405f6794f0e23009298 100644 (file)
--- a/src/vmcore/method.c
+++ b/src/vmcore/method.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: method.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: method.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/method.h b/src/vmcore/method.h
index 208f8a57a3201180e80877eb1425144ba90a8545..81f6e8afc0c8eb368e811877e2049691114a5fd2 100644 (file)
--- a/src/vmcore/method.h
+++ b/src/vmcore/method.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: method.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: method.h 7486 2007-03-08 13:50:07Z twisti $
 */
 
 

diff --git a/src/vmcore/options.c b/src/vmcore/options.c
index 51f9c8b32d9aab7193a3de5d3b4245e1b209bfc6..e422fedcdceac8cd96100a7f4f1b987564562237 100644 (file)
--- a/src/vmcore/options.c
+++ b/src/vmcore/options.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: options.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: options.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/options.h b/src/vmcore/options.h
index ee06449b4d8d925cf146c746dd214578cda34034..c291daa07f9675b542c502674e98bfe6b0b100de 100644 (file)
--- a/src/vmcore/options.h
+++ b/src/vmcore/options.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: options.h 7483 2007-03-08 13:17:40Z michi $
+   $Id: options.h 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/src/vmcore/statistics.c b/src/vmcore/statistics.c
index 8cf56b9f8ea13752c3d4a11a5f48427b0b27de7e..fc0b5afe0ada788d731dd92e66575a418e7ce961 100644 (file)
--- a/src/vmcore/statistics.c
+++ b/src/vmcore/statistics.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: statistics.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: statistics.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 6a32c19c729b5aecb32c238a3df6d7dff52d5ce3..879b3cdab4ae219aac7ec3d7c5b0168313ba5be9 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -26,7 +26,7 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## $Id: Makefile.am 7441 2007-03-02 23:13:10Z michi $
+## $Id: Makefile.am 7486 2007-03-08 13:50:07Z twisti $
 
 ## Process this file with automake to produce Makefile.in