Removed return value from descriptor_params_from_paramtypes.

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

diff --git a/src/vm/jit/reg.h b/src/vm/jit/reg.h
index 66e989f006371a76bb23070191d9531136cbc7cf..5235e1b119ea9356d388263f47c88e6b0e84dcc9 100644 (file)
--- a/src/vm/jit/reg.h
+++ b/src/vm/jit/reg.h
@@ -37,8 +37,8 @@ typedef struct registerdata registerdata;
 
 #include "arch.h"
 
-#include "vm/jit/jit.h"
-#include "vm/jit/verify/typeinfo.h"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/verify/typeinfo.hpp"
 
 
 /************************* pseudo variable structure **************************/
@@ -53,6 +53,7 @@ struct varinfo {
                float f;
                double d;
                basicblock *retaddr;
+               s4 ii[2];
        } vv;
 #if defined(ENABLE_VERIFIER)
        typeinfo_t typeinfo;       /* type info for reference types              */
@@ -98,10 +99,6 @@ struct registerdata {
        int freeargadrtop;              /* free argument address register count   */
 #endif
 
-#if defined(HAS_4BYTE_STACKSLOT)
-       int *freemem_2;
-       int freememtop_2;
-#endif
        int *freemem;                   /* free scratch memory                    */
        int freememtop;                 /* free memory count                      */
 
@@ -132,8 +129,16 @@ struct registerdata {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void reg_setup(jitdata *jd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _REG_H */