* src/vmcore/linker.c (build_display): Removed superfluous recursion; return

[cacao.git] / src / vm / jit / optimizing / dominators.c

diff --git a/src/vm/jit/optimizing/dominators.c b/src/vm/jit/optimizing/dominators.c
index 71352b76251bccd65f854ff5cb51bb3960932bbe..3fcf46f6b86fdf09fba5b2b2827b6d038c6e450e 100644 (file)
--- a/src/vm/jit/optimizing/dominators.c
+++ b/src/vm/jit/optimizing/dominators.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/optimizing/dominators.c - dominators and dominance frontier
 
-   Copyright (C) 2005, 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) 2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,12 +20,9 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Christian Ullrich
+*/
 
 
-*/
 #include "mm/memory.h"
 
 #include "toolbox/bitvector.h"
@@ -448,7 +443,7 @@ void dominator_tree_link_children(jitdata *jd) {
 
        /* Allocate memory for per basic block counter of successors */
 
-       ds = dump_size();
+       ds = dumpmemory_marker();
        numsuccessors = DMNEW(unsigned, jd->basicblockcount);
        MZERO(numsuccessors, unsigned, jd->basicblockcount);
 
@@ -463,15 +458,15 @@ void dominator_tree_link_children(jitdata *jd) {
 
        /* Free memory */
 
-       dump_release(ds);
+       dumpmemory_release(ds);
 }
 
 bool dominator_tree_build(jitdata *jd) {
        int32_t ds;
        
-       ds = dump_size();
+       ds = dumpmemory_marker();
        dominator_tree_build_intern(jd);
-       dump_release(ds);
+       dumpmemory_release(ds);
 
        dominator_tree_link_children(jd);
 
@@ -580,7 +575,7 @@ void dominance_frontier_store(dominance_frontier_info *dfi) {
 }
 
 bool dominance_frontier_build(jitdata *jd) {
-       int32_t ds = dump_size();
+       int32_t ds = dumpmemory_marker();
 
        dominance_frontier_info *dfi = dominance_frontier_init(jd);
        dominance_frontier_for_block(dfi, jd->basicblocks);
@@ -593,7 +588,7 @@ bool dominance_frontier_build(jitdata *jd) {
 extern void graph_add_edge( graphdata *gd, int from, int to );
 
 void dominator_tree_validate(jitdata *jd, dominatordata *_dd) {
-       int32_t ds = dump_size();
+       int32_t ds = dumpmemory_marker();
        graphdata *gd;
        int i, j;
        basicblock *bptr, **it;
@@ -601,7 +596,7 @@ void dominator_tree_validate(jitdata *jd, dominatordata *_dd) {
        int *itnr;
        bool found;
 
-       fprintf(stderr, "%s/%s: \n", jd->m->class->name->text, jd->m->name->text);
+       fprintf(stderr, "%s/%s: \n", jd->m->clazz->name->text, jd->m->name->text);
        gd = graph_init(jd->basicblockcount);
 
        for (bptr = jd->basicblocks; bptr; bptr = bptr->next) {
@@ -642,7 +637,7 @@ void dominator_tree_validate(jitdata *jd, dominatordata *_dd) {
                }
        }
 
-       dump_release(ds);
+       dumpmemory_release(ds);
 }
 
 /*