moved INSTRUCTION_PUTCONST_* macros to vm/jit/jit.h

diff --git a/src/vm/jit/jit.h b/src/vm/jit/jit.h
index 5c4d77a285ab9c28e59e38f7f365c6d1985e6c22..2cb27f0df645d18191b6b9083a7a76dc10f986d7 100644 (file)
--- a/src/vm/jit/jit.h
+++ b/src/vm/jit/jit.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: jit.h 2038 2005-03-20 11:22:40Z twisti $
+   $Id: jit.h 2081 2005-03-25 13:45:26Z edwin $
 
 */
 
@@ -119,6 +119,18 @@ struct instruction {
                                    /* a new block                                */
 };
 
+#define INSTRUCTION_PUTCONST_TYPE(iptr) \
+       ((iptr)[0].op1)
+
+#define INSTRUCTION_PUTCONST_VALUE_ADR(iptr) \
+       ((iptr)[0].val.a)
+
+#define INSTRUCTION_PUTCONST_FIELDINFO(iptr) \
+       ((fieldinfo *)((iptr)[1].val.a))
+
+#define INSTRUCTION_PUTCONST_FIELDREF(iptr) \
+       ((constant_FMIref *)((iptr)[1].val.a))
+
 
 /**************************** basic block structure ***************************/
  

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index d8049cde0b43742c3f9ed035e91ab0da2cc9c356..548b71ae0b77de516556c8cf985546d65a2fd8cc 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -26,7 +26,7 @@
 
    Authors: Edwin Steiner
 
-   $Id: typecheck.c 2046 2005-03-20 14:43:04Z edwin $
+   $Id: typecheck.c 2081 2005-03-25 13:45:26Z edwin $
 
 */
 
@@ -762,15 +762,6 @@ is_accessible(int flags,classinfo *definingclass,classinfo *implementingclass, c
 /* MISC MACROS                                                              */
 /****************************************************************************/
 
-#define INSTRUCTION_PUTCONST_TYPE(iptr) \
-       ((iptr)[0].op1)
-
-#define INSTRUCTION_PUTCONST_VALUE_ADR(iptr) \
-       ((iptr)[0].val.a)
-
-#define INSTRUCTION_PUTCONST_FIELDINFO(iptr) \
-       ((fieldinfo *)((iptr)[1].val.a))
-
 #define COPYTYPE(source,dest)   \
        {if ((source)->type == TYPE_ADR)                                                                \
                        TYPEINFO_COPY((source)->typeinfo,(dest)->typeinfo);}