* src/vm/jit/trace.cpp: Method tracer can now trace builtin functions as well.

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

diff --git a/src/mm/cacao-gc/final.c b/src/mm/cacao-gc/final.c
index 95d2d3f6f2fe97c6db7ce63bf974266f19fbc3aa..fadad86875ec0f5d9129784c1f42ca35c9f3f3ad 100644 (file)
--- a/src/mm/cacao-gc/final.c
+++ b/src/mm/cacao-gc/final.c
@@ -1,9 +1,7 @@
 /* mm/cacao-gc/final.c - GC module for finalization and weak references
 
-   Copyright (C) 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
@@ -33,8 +29,8 @@
 #include "gc.h"
 #include "final.h"
 #include "heap.h"
-#include "mm/memory.h"
-#include "vm/finalizer.h"
+#include "mm/memory.hpp"
+#include "vm/finalizer.hpp"
 
 
 /* Global Variables ***********************************************************/
@@ -45,14 +41,14 @@ list_t *final_list;
 
 void final_init()
 {
-       final_list = list_create(OFFSET(final_entry, linkage));
+       final_list = list_create(OFFSET(list_final_entry_t, linkage));
 }
 
-void final_register(java_objectheader *o, methodinfo *finalizer)
+void final_register(java_object_t *o, methodinfo *finalizer)
 {
-       final_entry *fe;
+       list_final_entry_t *fe;
 
-       fe = NEW(final_entry);
+       fe = NEW(list_final_entry_t);
        fe->type      = FINAL_REACHABLE;
        fe->o         = o;
        fe->finalizer = finalizer;
@@ -64,8 +60,8 @@ void final_register(java_objectheader *o, methodinfo *finalizer)
 
 void final_invoke()
 {
-       final_entry *fe;
-       final_entry *fe_next;
+       list_final_entry_t *fe;
+       list_final_entry_t *fe_next;
 
        fe = list_first(final_list);
        fe_next = NULL;
@@ -86,7 +82,7 @@ void final_invoke()
                        fe->type = FINAL_FINALIZED;
 
                        list_remove(final_list, fe);
-                       FREE(fe, final_entry);
+                       FREE(fe, list_final_entry_t);
                }
 
                fe = fe_next;
@@ -95,7 +91,7 @@ void final_invoke()
 
 void final_set_all_reclaimable()
 {
-       final_entry *fe;
+       list_final_entry_t *fe;
 
        fe = list_first(final_list);
        while (fe) {