* Removed all Id tags.

[cacao.git] / src / vm / jit / allocator / liveness.c

diff --git a/src/vm/jit/allocator/liveness.c b/src/vm/jit/allocator/liveness.c
index 0c6a704d89d5cffaac5f02a14e089a983daeb25c..32ebf4dda5883b489a8c79d2a580a03a243d331c 100644 (file)
--- a/src/vm/jit/allocator/liveness.c
+++ b/src/vm/jit/allocator/liveness.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/allocator/liveness.c - liveness analysis for lsra
 
-   Copyright (C) 2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 2005, 2006, 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
@@ -26,15 +26,17 @@
 
    Authors: Christian Ullrich
 
-   Changes: 
-
-   $Id: liveness.c $
 
 */
 
+
+#include "config.h"
+
 #include <limits.h>
 #include <stdlib.h>
 
+#include "vm/types.h"
+
 #include "mm/memory.h"
 
 #include "toolbox/logging.h"
@@ -50,6 +52,7 @@
 #include "vm/jit/allocator/lsra.h"
 #include "vm/jit/allocator/liveness.h"
 
+
 /* function prototypes */
 void liveness_scan_registers_canditates(jitdata *jd, int b_index, int iindex, 
                                                                                stackptr src, lv_sets *sets);
@@ -321,7 +324,7 @@ void liveness_init(jitdata *jd) {
                }
        }
        ls->maxlifetimes = lifetimes;
-       ls->lifetimecount = lifetimes + jd->cd->maxlocals * (TYPE_ADR+1);
+       ls->lifetimecount = lifetimes + jd->maxlocals * (TYPE_ADR+1);
 }
 
 void liveness_scan_basicblock(jitdata *jd, int b_index,
@@ -1132,9 +1135,8 @@ void liveness_scan_registers_canditates(jitdata *jd, int b_index, int iindex,
                break;
 
        default:
-               *exceptionptr =
-                       new_internalerror("Unknown ICMD %d during register allocation",
-                                                         iptr->opc);
+               exceptions_throw_internalerror("Unknown ICMD %d during register allocation",
+                                                                          iptr->opc);
                return;
        } /* switch */
 }