Changes: Christian Thalinger
Edwin Steiner
- $Id: jit.h 4997 2006-05-31 19:25:46Z edwin $
+ $Id: jit.h 5210 2006-08-07 11:10:01Z twisti $
*/
/* jitdata ********************************************************************/
-#define JITDATA_FLAG_IFCONV 0x00000001
-
struct jitdata {
- methodinfo *m; /* methodinfo of the method compiled */
- codeinfo *code;
- codegendata *cd;
- registerdata *rd;
+ methodinfo *m; /* methodinfo of the method compiled */
+ codeinfo *code;
+ codegendata *cd;
+ registerdata *rd;
#if defined(ENABLE_LOOP)
- loopdata *ld;
+ loopdata *ld;
#endif
- u4 flags; /* contains JIT compiler flags */
- s4 new_instructioncount;
- new_instruction * new_instructions;
+ u4 flags; /* contains JIT compiler flags */
+ bool isleafmethod; /* does method call subroutines */
+
+ 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;
+ registerdata *new_rd;
};
-/************************** stack element structure ***************************/
+#define JITDATA_FLAG_PARSE 0x00000001
+#define JITDATA_FLAG_VERIFY 0x00000002
-/* slot types */
+#define JITDATA_FLAG_INSTRUMENT 0x00000004
-/* Unified these with longer names. Maybe someday use only
- * one set of names? -Edwin
- */
-/*#define TYPE_INT 0*/ /* the stack slot types must numbered in the */
-#define TYPE_LNG TYPE_LONG /*1*/ /* same order as the ICMD_Ixxx to ICMD_Axxx */
-#define TYPE_FLT TYPE_FLOAT /*2*/ /* instructions (LOAD and STORE) */
-#define TYPE_DBL TYPE_DOUBLE /*3*/ /* integer, long, float, double, address */
-#define TYPE_ADR TYPE_ADDRESS /*4*/
+#define JITDATA_FLAG_IFCONV 0x00000008
+#define JITDATA_FLAG_REORDER 0x00000010
+
+#define JITDATA_FLAG_SHOWINTERMEDIATE 0x20000000
+#define JITDATA_FLAG_SHOWDISASSEMBLE 0x40000000
+#define JITDATA_FLAG_VERBOSECALL 0x80000000
+
+
+#define JITDATA_HAS_FLAG_PARSE(jd) \
+ ((jd)->flags & JITDATA_FLAG_PARSE)
+
+#define JITDATA_HAS_FLAG_VERIFY(jd) \
+ ((jd)->flags & JITDATA_FLAG_VERIFY)
+
+#define JITDATA_HAS_FLAG_INSTRUMENT(jd) \
+ ((jd)->flags & JITDATA_FLAG_INSTRUMENT)
+
+#define JITDATA_HAS_FLAG_IFCONV(jd) \
+ ((jd)->flags & JITDATA_FLAG_IFCONV)
+
+#define JITDATA_HAS_FLAG_REORDER(jd) \
+ ((jd)->flags & JITDATA_FLAG_REORDER)
-#define IS_INT_LNG_TYPE(a) (!((a) & TYPE_FLT))
-#define IS_FLT_DBL_TYPE(a) ((a) & TYPE_FLT)
-#define IS_2_WORD_TYPE(a) ((a) & TYPE_LNG)
+#define JITDATA_HAS_FLAG_SHOWINTERMEDIATE(jd) \
+ ((jd)->flags & JITDATA_FLAG_SHOWINTERMEDIATE)
-#define IS_INT_TYPE(a) ((a) == TYPE_INT)
-#define IS_LNG_TYPE(a) ((a) == TYPE_LNG)
-#define IS_ADR_TYPE(a) ((a) == TYPE_ADR)
+#define JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd) \
+ ((jd)->flags & JITDATA_FLAG_SHOWDISASSEMBLE)
+#define JITDATA_HAS_FLAG_VERBOSECALL(jd) \
+ ((jd)->flags & JITDATA_FLAG_VERBOSECALL)
+
+
+/************************** stack element structure ***************************/
/* flags */
/**************************** instruction structure ***************************/
+/* branch_target_t: used in TABLESWITCH tables */
+
+typedef union {
+ s4 insindex; /* used between parse and stack */
+ basicblock *block; /* used from stack analysis onwards */
+} branch_target_t;
+
+/* lookup_target_t: used in LOOKUPSWITCH tables */
+
+typedef struct {
+ s4 value; /* case value */
+ branch_target_t target; /* branch target, see above */
+} lookup_target_t;
+
/*** s1 operand ***/
typedef union {
- stackptr var;
- s4 localindex;
- s4 argcount;
+ stackptr var;
+ s4 localindex;
+ s4 argcount;
} s1_operand_t;
/*** s2 operand ***/
typedef union {
- stackptr var;
- stackptr *args;
- ptrint constval;
- classref_or_classinfo c;
- unresolved_class *uc;
- s4 tablelow;
- u4 lookupcount;
+ stackptr var;
+ stackptr *args;
+ classref_or_classinfo c;
+ unresolved_class *uc;
+ ptrint constval; /* for PUT*CONST */
+ s4 tablelow; /* for TABLESWITCH */
+ u4 lookupcount; /* for LOOKUPSWITCH */
} s2_operand_t;
/*** s3 operand ***/
constant_FMIref *fmiref;
unresolved_method *um;
unresolved_field *uf;
- insinfo_inline *inlineinfo;
- s4 tablehigh;
- basicblock *lookupdefault;
+ insinfo_inline *inlineinfo; /* for INLINE_START/END */
+ s4 tablehigh; /* for TABLESWITCH */
+ branch_target_t lookupdefault; /* for LOOKUPSWITCH */
+ branch_target_t jsrtarget; /* for JSR */
struct builtintable_entry *bte;
} s3_operand_t;
/*** val operand ***/
typedef union {
- s4 i;
- s8 l;
- float f;
- double d;
- void *anyptr;
- java_objectheader *stringconst;
- classref_or_classinfo c;
+ s4 i;
+ s8 l;
+ float f;
+ double d;
+ void *anyptr;
+ java_objectheader *stringconst; /* for ACONST with string */
+ classref_or_classinfo c; /* for ACONST with class */
} val_operand_t;
/*** dst operand ***/
typedef union {
- stackptr var;
- s4 localindex;
- basicblock *target;
- basicblock **targettable;
- void **lookuptable;
- s4 insindex; /* used between parse and stack */
+ stackptr var;
+ s4 localindex;
+ basicblock *block; /* valid after stack analysis */
+ branch_target_t *table; /* for TABLESWITCH */
+ lookup_target_t *lookup; /* for LOOKUPSWITCH */
+ s4 insindex; /* used between parse and stack */
+ stackptr *dupslots; /* for SWAP, DUP* except DUP */
} dst_operand_t;
/*** flags (32 bits) ***/
-#define INS_FLAG_UNRESOLVED 0x01
-#define INS_FLAG_CLASS 0x02
-#define INS_FLAG_ARRAY 0x04
+#define INS_FLAG_UNRESOLVED 0x01 /* contains unresolved field/meth/class*/
+#define INS_FLAG_CLASS 0x02 /* for ACONST with class */
+#define INS_FLAG_ARRAY 0x04 /* for CHECKCAST/INSTANCEOF with array */
#define INS_FLAG_NOCHECK 0x08
typedef union {
- u4 bits;
- struct { /* fields: */
-
- union {
- u1 type; /* TYPE_* constant for fields */
- u1 argcount; /* XXX does u1 suffice? */
- /* for MULTIANEWARRAY and */
- /* INVOKE* */
- } f; /* XXX these could be made smaller */
- /* only MULTIANEWARRAY needs the argcount */
-
- bool predicated:1;
- int condition :3;
- bool unresolved:1; /* field/method is unresolved */
- bool nocheck :1; /* don't check array access */
- bool branch :1; /* branch to dst.target */
-
- int tmpreg1 :5;
- int tmpreg2 :5;
- int tmpreg3 :5;
-
- int unused :2;
-
- } fields;
+ u4 bits;
+ struct { /* fields: */
+
+ union {
+ u1 type; /* TYPE_* constant for fields */
+ u1 argcount; /* XXX does u1 suffice? */
+ /* for MULTIANEWARRAY and */
+ /* INVOKE* */
+ } f; /* XXX these could be made smaller */
+ /* only MULTIANEWARRAY needs the argcount */
+
+ bool predicated:1;
+ int condition :3;
+ bool unresolved:1; /* field/method is unresolved */
+ bool nocheck :1; /* don't check array access */
+ bool branch :1; /* branch to dst.target */
+
+ int tmpreg1 :5;
+ int tmpreg2 :5;
+ int tmpreg3 :5;
+
+ int unused :2;
+
+ } fields;
} flags_operand_t;
/*** instruction ***/
/* The new instruction format for the intermediate representation: */
struct new_instruction {
- u2 opc; /* opcode */
- u2 line; /* line number */
+ u2 opc; /* opcode */
+ u2 line; /* line number */
#if SIZEOF_VOID_P == 8
- flags_operand_t flags; /* 4 bytes */
+ flags_operand_t flags; /* 4 bytes */
#endif
- s1_operand_t s1; /* pointer-size */
- union {
- struct {
- s2_operand_t s2; /* pointer-size */
- s3_operand_t s3; /* pointer-size */
- } s23; /* XOR */
- val_operand_t val; /* long-size */
- } sx;
- dst_operand_t dst; /* pointer-size */
+ s1_operand_t s1; /* pointer-size */
+ union {
+ struct {
+ s2_operand_t s2; /* pointer-size */
+ s3_operand_t s3; /* pointer-size */
+ } s23; /* XOR */
+ val_operand_t val; /* long-size */
+ } sx;
+ dst_operand_t dst; /* pointer-size */
#if SIZEOF_VOID_P == 4
- flags_operand_t flags; /* 4 bytes */
+ flags_operand_t flags; /* 4 bytes */
#endif
};
#define INSTRUCTION_IS_UNRESOLVED(iptr) \
((ptrint)(iptr)->target & 0x01) /* XXX target used temporarily as flag */
+#define NEW_INSTRUCTION_GET_FIELDREF(iptr,fref) \
+ do { \
+ if (iptr->flags.bits & INS_FLAG_UNRESOLVED) \
+ fref = iptr->sx.s23.s3.uf->fieldref; \
+ else \
+ fref = iptr->sx.s23.s3.fmiref; \
+ } while (0)
+
#define INSTRUCTION_GET_FIELDREF(iptr,fref) \
do { \
if (INSTRUCTION_IS_UNRESOLVED(iptr)) \
fref = ((constant_FMIref *)(iptr)->val.a); \
} while (0)
+#define NEW_INSTRUCTION_GET_METHODREF(iptr,mref) \
+ do { \
+ if (iptr->flags.bits & INS_FLAG_UNRESOLVED) \
+ mref = iptr->sx.s23.s3.um->methodref; \
+ else \
+ mref = iptr->sx.s23.s3.fmiref; \
+ } while (0)
+
#define INSTRUCTION_GET_METHODREF(iptr,mref) \
do { \
if (INSTRUCTION_IS_UNRESOLVED(iptr)) \
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)) \
md = ((constant_FMIref *)(iptr)->val.a)->parseddesc.md; \
} while (0)
+#define INSTRUCTION_UNRESOLVED_CLASS(iptr) \
+ ((unresolved_class *) (iptr)->val.a)
+
#define INSTRUCTION_UNRESOLVED_METHOD(iptr) \
((unresolved_method *) (iptr)->val.a)
/* the others by using bitfields. */
struct basicblock {
- s4 debug_nr; /* basic block number */
- s4 flags; /* used during stack analysis, init with -1 */
- s4 bitflags; /* OR of BBFLAG_... constants, init with 0 */
- s4 type; /* basic block type (std, xhandler, subroutine*/
- instruction *iinstr; /* pointer to intermediate code instructions */
- s4 icount; /* number of intermediate code instructions */
- s4 mpc; /* machine code pc at start of block */
- stackptr instack; /* stack at begin of basic block */
- stackptr outstack; /* stack at end of basic block */
- s4 indepth; /* stack depth at begin of basic block */
- s4 outdepth; /* stack depth end of basic block */
- s4 pre_count; /* count of predecessor basic blocks */
- branchref *branchrefs; /* list of branches to be patched */
-
- basicblock *next; /* used to build a BB list (instead of array) */
- s4 lflags; /* used during loop copying, init with 0 */
- basicblock *copied_to; /* points to the copy of this basic block */
+ s4 debug_nr; /* basic block number */
+ s4 flags; /* used during stack analysis, init with -1 */
+ s4 bitflags; /* OR of BBFLAG_... constants, init with 0 */
+ s4 type; /* basic block type (std, xhandler, subroutine*/
+ instruction *iinstr; /* pointer to intermediate code instructions */
+ s4 icount; /* number of intermediate code instructions */
+ s4 mpc; /* machine code pc at start of block */
+ stackptr instack; /* stack at begin of basic block */
+ stackptr outstack; /* stack at end of basic block */
+ s4 indepth; /* stack depth at begin of basic block */
+ s4 outdepth; /* stack depth end of basic block */
+
+ s4 predecessorcount;
+ s4 successorcount;
+ basicblock **predecessors; /* array of predecessor basic blocks */
+ basicblock **successors; /* array of successor basic blocks */
+
+ branchref *branchrefs; /* list of branches to be patched */
+
+ basicblock *next; /* used to build a BB list (instead of array) */
+ s4 lflags; /* used during loop copying, init with 0 */
+ basicblock *copied_to; /* points to the copy of this basic block */
/* when loop nodes are copied */
- stackptr stack; /* start of stack array for this block */
+ stackptr stack; /* start of stack array for this block */
/* (see doc/stack.txt) */
- methodinfo *method; /* method this block belongs to */
+ methodinfo *method; /* method this block belongs to */
};
-/* macro for initializing newly allocated basicblock:s */
+
+/* Macro for initializing newly allocated basic block's. It does not
+ need to zero fields, as we zero out the whole basic block array. */
#define BASICBLOCK_INIT(bptr,m) \
- do { \
- bptr->mpc = -1; \
- bptr->flags = -1; \
- bptr->bitflags = 0; \
- bptr->lflags = 0; \
- bptr->type = BBTYPE_STD; \
- bptr->branchrefs = NULL; \
- bptr->pre_count = 0; \
- bptr->method = (m); \
- bptr->debug_nr = (m)->c_debug_nr++; \
- } while (0)
+ do { \
+ bptr->mpc = -1; \
+ bptr->flags = -1; \
+ bptr->type = BBTYPE_STD; \
+ bptr->method = (m); \
+ bptr->debug_nr = (m)->c_debug_nr++; \
+ } while (0)
/* branchref *****************************************************************/
#define ICMD_ICONST 3 /* val.i = constant */
#define JAVA_ICONST_1 4
+#define ICMD_CHECKNULL_POP 4
#define JAVA_ICONST_2 5
#define ICMD_IDIVPOW2 5 /* val.i = constant */
#define JAVA_FCONST_1 12
#define JAVA_FCONST_2 13
-#define ICMD_ELSE_ICONST 13
#define JAVA_DCONST_0 14
#define ICMD_DCONST 14 /* val.d = constant */
#define JAVA_DCONST_1 15
-#define ICMD_IFEQ_ICONST 15
#define JAVA_BIPUSH 16
-#define ICMD_IFNE_ICONST 16
#define JAVA_SIPUSH 17
-#define ICMD_IFLT_ICONST 17
#define JAVA_LDC1 18
-#define ICMD_IFGE_ICONST 18
#define JAVA_LDC2 19
-#define ICMD_IFGT_ICONST 19
#define JAVA_LDC2W 20
-#define ICMD_IFLE_ICONST 20
/* order of LOAD instructions must be */
/* equal to order of TYPE_* defines */
#define ICMD_BUILTIN 255 /* internal opcode */
-/* define some ICMD masks *****************************************************/
-
-#define ICMD_OPCODE_MASK 0x00ff /* mask to get the opcode */
-#define ICMD_CONDITION_MASK 0xff00 /* mask to get the condition */
-
/******************* description of JavaVM instructions ***********************/
/* compile a method with jit compiler */
u1 *jit_compile(methodinfo *m);
+u1 *jit_recompile(methodinfo *m);
/* patch the method entrypoint */
u1 *jit_asm_compile(methodinfo *m, u1 *mptr, u1 *sp, u1 *ra);
+s4 jit_complement_condition(s4 opcode);
+
/* machine dependent functions */
#if defined(ENABLE_JIT)
void md_init(void);
projects / cacao.git / blobdiff