GNU header update.

[cacao.git] / src / vm / jit / reg.h

diff --git a/src/vm/jit/reg.h b/src/vm/jit/reg.h
index d5780f759a0149b8f0e69b5405a353afd96b524c..25c4f922e6c08800bef2dfab23a85c5f7a8f5cb3 100644 (file)
--- a/src/vm/jit/reg.h
+++ b/src/vm/jit/reg.h
@@ -1,10 +1,9 @@
 /* jit/reg.h - register allocator header
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -27,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: reg.h 1456 2004-11-05 14:33:14Z twisti $
+   $Id: reg.h 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -35,16 +34,28 @@
 #ifndef _REG_H
 #define _REG_H
 
+/* We typedef these structures before #includes to resolve circular           */
+/* dependencies.                                                              */
+
+typedef struct varinfo varinfo;
+typedef struct registerdata registerdata;
+
+
 #include "types.h"
-#include "jit/codegen.inc.h"
-#include "jit/jit.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/inline/inline.h"
 
 
-typedef struct registerdata registerdata;
-typedef struct varinfo varinfo;
-typedef struct varinfo varinfo5[5];
+/************************* pseudo variable structure **************************/
 
-//struct t_inlining_globals;
+struct varinfo {
+       int type;                   /* basic type of variable                     */
+       int flags;                  /* flags (SAVED, INMEMORY)                    */
+       int regoff;                 /* register number or memory offset           */
+};
+
+typedef struct varinfo varinfo5[5];
 
 
 struct registerdata {
@@ -117,15 +128,6 @@ struct registerdata {
 };
 
 
-/************************* pseudo variable structure **************************/
-
-struct varinfo {
-       int type;                   /* basic type of variable                     */
-       int flags;                  /* flags (SAVED, INMEMORY)                    */
-       int regoff;                 /* register number or memory offset           */
-};
-
-
 /* function prototypes */
 
 void reg_init();