Merged branch subtype-trunk into default.

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

diff --git a/src/vm/jit/optimizing/ssa_rename.c b/src/vm/jit/optimizing/ssa_rename.c
index ae293bbe0eaed6d969c88a9e7e8a707129702700..98ae0d4c09c943b263db58f3d750449414a65dce 100644 (file)
--- a/src/vm/jit/optimizing/ssa_rename.c
+++ b/src/vm/jit/optimizing/ssa_rename.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/optimizing/ssa.c - static single-assignment form
 
-   Copyright (C) 2005 - 2007 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, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,26 +20,24 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+*/
 
-   Authors: Christian Ullrich
 
-   $Id: $
+#include "config.h"
 
-*/
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/worklist.h"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 
-#include "vm/jit/jit.h" /* icmd_table */
+#include "vm/jit/jit.hpp" /* icmd_table */
 
-#include "vm/jit/optimizing/dominators.h"
+#include "vm/jit/optimizing/dominators.hpp"
 #include "vm/jit/optimizing/graph.h"
 #include "vm/jit/optimizing/lifetimes.h"
 #include "vm/jit/optimizing/lsra.h"
@@ -49,7 +45,7 @@
 #include "vm/jit/optimizing/ssa_rename.h"
 
 #if defined(SSA_DEBUG_VERBOSE)
-#include "vmcore/options.h"   /* compileverbose */
+#include "vm/options.h"   /* compileverbose */
 #endif
 
 /* function prototypes */
@@ -154,13 +150,13 @@ void ssa_rename(jitdata *jd, graphdata *gd, dominatordata *dd)
 #if defined(SSA_DEBUG_CHECK) || defined(SSA_DEBUG_VERBOSE)
 # if defined(SSA_DEBUG_VERBOSE)
        if (compileverbose) {
-               printf("%s %s ",jd->m->class->name->text, jd->m->name->text);
+               printf("%s %s ",jd->m->clazz->name->text, jd->m->name->text);
                if (code_is_leafmethod(jd->code))
                        printf("**Leafmethod**");
                printf("\n");
        }
 # endif
-       if (strcmp(jd->m->class->name->text,"fp")==0)
+       if (strcmp(jd->m->clazz->name->text,"fp")==0)
                if (strcmp(jd->m->name->text,"testfloat")==0)
 # if defined(SSA_DEBUG_VERBOSE)
                        if (compileverbose) 
@@ -474,7 +470,7 @@ void ssa_rename_print(instruction *iptr, char *op, int from,  int to) {
        if (compileverbose) {
                printf("ssa_rename_: ");
                if (iptr != NULL)
-                       printf("%s ", opcode_names[iptr->opc]);
+                       printf("%s ", bytecode[iptr->opc].mnemonic);
                else
                        printf("       ");