* Merged executionstate branch.

[cacao.git] / src / mm / cacao-gc / gc.c

diff --git a/src/mm/cacao-gc/gc.c b/src/mm/cacao-gc/gc.c
index 0c5a4c75425aa3fcd82e7cf5776548a49931cb5c..1f8f5db417ab966ca231be28a922a910a92e961e 100644 (file)
--- a/src/mm/cacao-gc/gc.c
+++ b/src/mm/cacao-gc/gc.c
@@ -31,7 +31,7 @@
 #include "vm/types.h"
 
 #include "threads/lock-common.h"
-#include "threads/threads-common.h"
+#include "threads/thread.h"
 
 #include "compact.h"
 #include "copy.h"
@@ -139,7 +139,7 @@ static void gc_reference_register_intern(list_t *list, java_object_t **ref, int3
 
 #if !defined(NDEBUG)
        /* check if this reference is already registered */
-       for (re = list_first_unsynced(list); re != NULL; re = list_next_unsynced(list, re)) {
+       for (re = list_first(list); re != NULL; re = list_next(list, re)) {
                if (re->ref == ref)
                        vm_abort("gc_reference_register_intern: reference already registered");
        }
@@ -154,7 +154,7 @@ static void gc_reference_register_intern(list_t *list, java_object_t **ref, int3
 #endif
 
        /* add the entry to the given list */
-       list_add_last_unsynced(list, re);
+       list_add_last(list, re);
 
        /* the global GC lock also guards the reference lists */
        GC_MUTEX_UNLOCK;
@@ -187,10 +187,10 @@ static void gc_reference_unregister_intern(list_t *list, java_object_t **ref)
        GC_LOG2( printf("Un-Registering Reference at %p\n", (void *) ref); );
 
        /* search for the appropriate reference entry */
-       for (re = list_first_unsynced(list); re != NULL; re = list_next_unsynced(list, re)) {
+       for (re = list_first(list); re != NULL; re = list_next(list, re)) {
                if (re->ref == ref) {
                        /* remove the entry from the given list */
-                       list_remove_unsynced(list, re);
+                       list_remove(list, re);
 
                        /* free the reference entry */
                        FREE(re, list_gcref_entry_t);
@@ -269,7 +269,7 @@ void gc_collect(s4 level)
 #if !defined(NDEBUG)
        /* get the stacktrace of the current thread and make sure it is non-empty */
        GC_LOG( printf("Stacktrace of current thread:\n"); );
-       st = stacktrace_get();
+       st = stacktrace_get_current();
        if (st == NULL)
                vm_abort("gc_collect: no stacktrace available for current thread!");
        GC_LOG( stacktrace_print(st); );