* src/vm/jit/codegen-common.hpp (exceptionref): Removed.

[cacao.git] / src / vm / jit / schedule / schedule.c

diff --git a/src/vm/jit/schedule/schedule.c b/src/vm/jit/schedule/schedule.c
index 74219eebec5dab02086887f49a89ffbaa540b08d..894821011cf8f1a252cdc7d3172dbcd8cd881df6 100644 (file)
--- a/src/vm/jit/schedule/schedule.c
+++ b/src/vm/jit/schedule/schedule.c
@@ -1,10 +1,10 @@
 /* src/vm/jit/schedule/schedule.c - architecture independent instruction
                                     scheduler
 
-   Copyright (C) 1996-2005 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) 1996-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
 
    This file is part of CACAO.
 
@@ -20,23 +20,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: schedule.c 2056 2005-03-22 11:21:32Z twisti $
-
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include "config.h"
+#include "vm/types.h"
+
 #include "disass.h"
 
 #include "mm/memory.h"
@@ -58,7 +59,7 @@ scheduledata *schedule_init(methodinfo *m, registerdata *rd)
                (rd->savintregcnt - rd->maxsavintreguse) +
                (rd->savfltregcnt - rd->maxsavfltreguse) +
                rd->maxmemuse +
-               m->paramcount +
+               m->parseddesc->paramcount +
                1;                           /* index 0 are all other memory accesses */
 
        /* XXX quick hack: just use a fixed number of instructions */
@@ -710,7 +711,7 @@ void schedule_do_schedule(scheduledata *sd)
                }
                printf("schedule end ---\n\n");
 
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
                if (opt_stat) {
                        count_schedule_basic_blocks++;
                        count_schedule_nodes += sd->micount;