* src/vm/jit/jit.h (jitdata): Added temporary fields for development

of new instruction format.
(NEW_INSTRUCTION_GET_METHODDESC): New macro.

diff --git a/src/vm/jit/jit.h b/src/vm/jit/jit.h
index 6d0696e518d065d54cd7b30d4736dbc307d16ed3..fd1c0dc16be293b669d2e53e664c083891474591 100644 (file)
--- a/src/vm/jit/jit.h
+++ b/src/vm/jit/jit.h
@@ -30,7 +30,7 @@
    Changes: Christian Thalinger
                        Edwin Steiner
 
-   $Id: jit.h 5008 2006-06-01 16:00:18Z edwin $
+   $Id: jit.h 5009 2006-06-01 22:46:54Z edwin $
 
 */
 
@@ -99,8 +99,14 @@ struct jitdata {
 #endif
        u4            flags;                /* contains JIT compiler flags        */
 
-       s4                new_instructioncount;
-       new_instruction * new_instructions;
+       new_instruction *new_instructions;
+       basicblock      *new_basicblocks;
+       s4              *new_basicblockindex;
+       stackelement    *new_stack;
+       s4               new_instructioncount;
+       s4               new_basicblockcount;
+       s4               new_stackcount;
+       s4               new_c_debug_nr;
 };
 
 
@@ -350,6 +356,14 @@ struct instruction {
                        fd = ((constant_FMIref *)(iptr)->val.a)->parseddesc.fd; \
        } while (0)
 
+#define NEW_INSTRUCTION_GET_METHODDESC(iptr, md) \
+       do { \
+               if (iptr->flags.bits & INS_FLAG_UNRESOLVED) \
+                       md = iptr->sx.s23.s3.um->methodref->parseddesc.md; \
+               else \
+                       md = iptr->sx.s23.s3.fmiref->parseddesc.md; \
+       } while (0)
+
 #define INSTRUCTION_GET_METHODDESC(iptr,md) \
        do { \
                if (INSTRUCTION_IS_UNRESOLVED(iptr)) \