* src/vm/builtin.c: Moved to .cpp.

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

diff --git a/src/vm/jit/reg.h b/src/vm/jit/reg.h
index 3c5d51976525c6be2bb7e61a00bcdc4e6beaa290..3efd2b1ef115ea4f5824ec39ca6bbb95eefd0be6 100644 (file)
--- a/src/vm/jit/reg.h
+++ b/src/vm/jit/reg.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/reg.h - register allocator header
 
-   Copyright (C) 1996-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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: reg.h 7713 2007-04-15 21:49:48Z twisti $
-
 */
 
 
@@ -41,7 +37,7 @@ typedef struct registerdata registerdata;
 
 #include "arch.h"
 
-#include "vm/jit/jit.h"
+#include "vm/jit/jit.hpp"
 #include "vm/jit/verify/typeinfo.h"
 
 
@@ -57,9 +53,10 @@ struct varinfo {
                float f;
                double d;
                basicblock *retaddr;
+               s4 ii[2];
        } vv;
 #if defined(ENABLE_VERIFIER)
-       typeinfo typeinfo;         /* type info for reference types              */
+       typeinfo_t typeinfo;       /* type info for reference types              */
 #endif
 };
 
@@ -136,8 +133,16 @@ struct registerdata {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void reg_setup(jitdata *jd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _REG_H */