X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fallocator%2Flsra.c;h=84eca5251681a764f157b5c62217fc906bd2fd52;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=92152d76babf327c93ae0194bb9467590d223c57;hpb=6e15be8daacc628f1c085ce1b168cd662fd87063;p=cacao.git

diff --git a/src/vm/jit/allocator/lsra.c b/src/vm/jit/allocator/lsra.c
index 92152d76b..84eca5251 100644
--- a/src/vm/jit/allocator/lsra.c
+++ b/src/vm/jit/allocator/lsra.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/allocator/lsra.c - linear scan register allocator
 
-   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
@@ -25,12 +25,9 @@
    Contact: cacao@cacaojvm.org
 
    Authors: Christian Ullrich
-
-   Changes: Christian Thalinger
+            Christian Thalinger
             Edwin Steiner
 
-   $Id: lsra.c 5785 2006-10-15 22:25:54Z edwin $
-
 */
 
 
@@ -927,7 +924,7 @@ void lsra_setup(jitdata *jd) {
 
 	liveness_init(jd);
 
-	ls->lifetimecount = ls->maxlifetimes + cd->maxlocals * (TYPE_ADR+1);
+	ls->lifetimecount = ls->maxlifetimes + jd->maxlocals * (TYPE_ADR+1);
 	ls->lifetime = DMNEW(struct lifetime, ls->lifetimecount);
 	ls->lt_used  = DMNEW(int, ls->lifetimecount);
 	ls->lt_int   = DMNEW(int, ls->lifetimecount);
@@ -2747,9 +2744,8 @@ Check this - ? For every incoming Stack Slot a lifetime has to be created ?
 			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 */
 	}