Merged trunk and subtype.

[cacao.git] / src / vm / jit / optimizing / lifetimes.h

diff --git a/src/vm/jit/optimizing/lifetimes.h b/src/vm/jit/optimizing/lifetimes.h
index e6776ea4907cac4ea2e92fc0903a329e0ece7107..94655cf97ae2a35e1548a27a13687f9262bcf459 100644 (file)
--- a/src/vm/jit/optimizing/lifetimes.h
+++ b/src/vm/jit/optimizing/lifetimes.h
@@ -1,9 +1,7 @@
-/* src/vm/jit/lsra/graph.h - lifetimes header
+/* src/vm/jit/optimizing/lifetimes.h - lifetimes header
 
-   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,19 +20,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Christian Ullrich
-
-   $Id: lifetime.h$
-
 */
 
 
 #ifndef _LIFETIMES_H
 #define _LIFETIMES_H
 
-#include "vm/jit/optimizing/dominators.h"
+#include "config.h"
+
+#include "vm/jit/optimizing/dominators.hpp"
 
 #if !defined(NDEBUG)
 # include <assert.h>
@@ -57,7 +51,7 @@
 
 typedef struct site *lt_iterator;
 void lt_scanlifetimes(jitdata *, graphdata *, dominatordata *);
-void lt_add_ss(struct lifetime *, stackptr );
+void lt_add_ss(struct lifetime *, stackelement_t *);
 void lt_remove_use_site(struct lifetime *lt, int block, int iindex);
 void lt_move_use_sites(struct lifetime *from, struct lifetime *to);
 void lt_lifeness_analysis(jitdata *, graphdata *);