* src/vm/signal.c (signal_init): Use signal_register_signal to register SIGUSR1.

* src/vm/builtin.c: Adapted to changes on trunk.
* src/vm/builtin.h: Likewise.
* src/mm/cacao-gc/heap.h: Likewise.
* src/threads/threads-common.c: Likewise.
* src/threads/native/threads.c: Likewise.
* src/cacaoh/dummy.c: Likewise.

--HG--
branch : exact-gc

diff --git a/src/cacaoh/dummy.c b/src/cacaoh/dummy.c
index de58bf9493b1a2401fd3a8c3ea6e34b93977ffa3..4c9e6975fef527c6b236c138dae8b1c067ed597b 100644 (file)
--- a/src/cacaoh/dummy.c
+++ b/src/cacaoh/dummy.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: dummy.c 8321 2007-08-16 11:37:25Z michi $
+   $Id: dummy.c 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -365,8 +365,9 @@ void finalizer_run(void *o, void *p)
 
 /* gc *************************************************************************/
 
-void gc_reference_register(java_objectheader **ref)
+void gc_reference_register(java_object_t **ref)
 {
+       vm_abort("gc_reference_register");
 }
 
 int64_t gc_get_heap_size(void)
@@ -397,7 +398,7 @@ void *heap_alloc_uncollectable(uint32_t bytelength)
        return calloc(bytelength, 1);
 }
 
-s4 heap_get_hashcode(java_objectheader *o)
+s4 heap_get_hashcode(java_object_t *o)
 {
        return 0;
 }

diff --git a/src/mm/cacao-gc/heap.h b/src/mm/cacao-gc/heap.h
index 1797ce407410a249182611fdfb298a1540d84ac0..11874c95cb8f5433399d1eb9e43693d0d5ee9fcb 100644 (file)
--- a/src/mm/cacao-gc/heap.h
+++ b/src/mm/cacao-gc/heap.h
@@ -34,7 +34,7 @@
 
 #include "gc.h"
 #include "region.h"
-#include "vm/primitive.h" /* needed for ARRAYTYPE_OBJECT */
+#include "vm/array.h" /* needed for ARRAYTYPE_OBJECT */
 
 
 #define GC_SIZE_DUMMY 0xff

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index 09985a6cfa7cdb90dcb39ba19070da5758e785b8..043b0ff479ee1927574bee3f4202e2a725d3fef4 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 8321 2007-08-16 11:37:25Z michi $
+   $Id: threads.c 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -908,7 +908,7 @@ bool threads_init(void)
 #if defined(ENABLE_GC_CACAO)
        /* register reference to java.lang.Thread with the GC */
 
-       gc_reference_register((java_objectheader **) &(mainthread->object));
+       gc_reference_register((java_object_t **) &(mainthread->object));
 #endif
 
        /* create a java.lang.Thread for the main thread */

diff --git a/src/threads/threads-common.c b/src/threads/threads-common.c
index 42f55ee72664985f457197de6244a5b833201e70..e02540716c6c21fb4819bda9852bdfd7fe802c36 100644 (file)
--- a/src/threads/threads-common.c
+++ b/src/threads/threads-common.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads-common.c 8299 2007-08-13 08:41:18Z michi $
+   $Id: threads-common.c 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -286,7 +286,7 @@ threadobject *threads_thread_new(void)
 #if defined(ENABLE_GC_CACAO)
                /* register reference to java.lang.Thread with the GC */
 
-               gc_reference_register((java_objectheader **) &(t->object));
+               gc_reference_register((java_object_t **) &(t->object));
 #endif
        }
 

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index ddacb738189c62d49fa526ae7340b7a8f4bae55c..55504d46052b04d0a5fdd3a78ce9d743d00efb86 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -28,7 +28,7 @@
    calls instead of machine instructions, using the C calling
    convention.
 
-   $Id: builtin.c 8358 2007-08-20 14:25:59Z michi $
+   $Id: builtin.c 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -858,9 +858,9 @@ java_handle_t *builtin_new(classinfo *c)
 
 *******************************************************************************/
 
-java_objectheader *builtin_fast_new(classinfo *c)
+java_object_t *builtin_fast_new(classinfo *c)
 {
-       java_objectheader *o;
+       java_object_t *o;
 #if defined(ENABLE_RT_TIMING)
        struct timespec time_start, time_end;
 #endif

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index 64ade7a298c48782ff396fd46c5fbbd6672ce6af..3df7a1b10f8716330bb535ee4a53b7a053811089 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 8321 2007-08-16 11:37:25Z michi $
+   $Id: builtin.h 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -141,7 +141,7 @@ java_handle_t *builtin_trace_exception(java_handle_t *xptr,
 
 java_handle_t *builtin_new(classinfo *c);
 #define BUILTIN_new (functionptr) builtin_new
-java_objectheader *builtin_fast_new(classinfo *c);
+java_object_t *builtin_fast_new(classinfo *c);
 #define BUILTIN_FAST_new (functionptr) builtin_fast_new
 
 java_handle_t *builtin_newarray(s4 size, classinfo *arrayclass);

diff --git a/src/vm/signal.c b/src/vm/signal.c
index 7f0230980f21deed6f900436da43f6273a02b943..8ec93b19fa087019b3b867963e2bb42aa9a74481 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: signal.c 8321 2007-08-16 11:37:25Z michi $
+   $Id: signal.c 8360 2007-08-20 18:02:50Z michi $
 
 */
 
@@ -172,9 +172,8 @@ bool signal_init(void)
 #if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
        /* SIGUSR1 handler for the exact GC to suspend threads */
 
-       act.sa_sigaction = md_signal_handler_sigusr1;
-       act.sa_flags     = SA_SIGINFO;
-       sigaction(SIGUSR1, &act, NULL);
+       signal_register_signal(SIGUSR1, (functionptr) md_signal_handler_sigusr1,
+                                                  SA_SIGINFO);
 #endif
 
 #if defined(ENABLE_THREADS) && defined(ENABLE_PROFILING)