Authors: Andreas Krall
- $Id: stack.c 557 2003-11-02 22:51:59Z twisti $
+ Changes: Edwin Steiner
+
+ $Id: stack.c 814 2003-12-31 01:41:15Z edwin $
*/
#include <stdio.h>
+#include <string.h>
#include "stack.h"
+#include "global.h"
#include "jit.h"
#include "builtin.h"
#include "disass.h"
#include "reg.h"
+#include "tables.h"
+#include "types.h"
#include "toolbox/loging.h"
#include "toolbox/memory.h"
/* from codegen.inc */
extern int dseglen;
+/**********************************************************************/
+/* Macros used internally by analyse_stack */
+/**********************************************************************/
#ifdef STATISTICS
#define COUNT(cnt) cnt++
#define COUNT(cnt)
#endif
-#define STACKRESET {curstack=0;stackdepth=0;}
-
-#define TYPEPANIC {show_icmd_method();panic("Stack type mismatch");}
+/* convenient abbreviations */
#define CURKIND curstack->varkind
#define CURTYPE curstack->type
-#define NEWSTACK(s,v,n) {new->prev=curstack;new->type=s;new->flags=0;\
+/*--------------------------------------------------*/
+/* SIGNALING ERRORS */
+/*--------------------------------------------------*/
+
+#define TYPEPANIC {show_icmd_method();panic("Stack type mismatch");}
+#define UNDERFLOW {show_icmd_method();panic("Operand stack underflow");}
+#define OVERFLOW {show_icmd_method();panic("Operand stack overflow");}
+
+/*--------------------------------------------------*/
+/* STACK UNDERFLOW/OVERFLOW CHECKS */
+/*--------------------------------------------------*/
+
+/* underflow checks */
+#define REQUIRE(num) do { if (stackdepth<(num)) {UNDERFLOW;} } while(0)
+#define REQUIRE_1 REQUIRE(1)
+#define REQUIRE_2 REQUIRE(2)
+#define REQUIRE_3 REQUIRE(3)
+#define REQUIRE_4 REQUIRE(4)
+
+/* overflow check */
+/* XXX we allow ACONST to exceed the maximum stack depth because it is
+ * generated for builtin calls. Maybe we should check against maximum
+ * stack depth only at block boundaries?
+ */
+#define CHECKOVERFLOW \
+ do { \
+ if (stackdepth > maxstack) { \
+ if (iptr[0].opc != ICMD_ACONST) \
+ {OVERFLOW;} \
+ } \
+ } while(0)
+
+/*--------------------------------------------------*/
+/* ALLOCATING STACK SLOTS */
+/*--------------------------------------------------*/
+
+#define NEWSTACK(s,v,n) {new->prev=curstack;new->type=s;new->flags=0; \
new->varkind=v;new->varnum=n;curstack=new;new++;}
#define NEWSTACKn(s,n) NEWSTACK(s,UNDEFVAR,n)
#define NEWSTACK0(s) NEWSTACK(s,UNDEFVAR,0)
+
+/* allocate the input stack for an exception handler */
#define NEWXSTACK {NEWSTACK(TYPE_ADR,STACKVAR,0);curstack=0;}
+/*--------------------------------------------------*/
+/* STACK MANIPULATION */
+/*--------------------------------------------------*/
+
+/* resetting to an empty operand stack */
+#define STACKRESET {curstack=0;stackdepth=0;}
+
+/* set the output stack of the current instruction */
#define SETDST {iptr->dst=curstack;}
-#define POP(s) {if(s!=curstack->type){TYPEPANIC;}\
+
+/* The following macros do NOT check stackdepth, set stackdepth or iptr->dst */
+#define POP(s) {if(s!=curstack->type){TYPEPANIC;} \
if(curstack->varkind==UNDEFVAR)curstack->varkind=TEMPVAR;\
curstack=curstack->prev;}
-#define POPANY {if(curstack->varkind==UNDEFVAR)curstack->varkind=TEMPVAR;\
+#define POPANY {if(curstack->varkind==UNDEFVAR)curstack->varkind=TEMPVAR; \
curstack=curstack->prev;}
#define COPY(s,d) {(d)->flags=0;(d)->type=(s)->type;\
(d)->varkind=(s)->varkind;(d)->varnum=(s)->varnum;}
+/*--------------------------------------------------*/
+/* STACK OPERATIONS MODELING */
+/*--------------------------------------------------*/
+
+/* The following macros are used to model the stack manipulations of
+ * different kinds of instructions.
+ *
+ * These macros check the input stackdepth and they set the output
+ * stackdepth and the output stack of the instruction (iptr->dst).
+ *
+ * These macros do *not* check for stack overflows!
+ */
+
#define PUSHCONST(s){NEWSTACKn(s,stackdepth);SETDST;stackdepth++;}
#define LOAD(s,v,n) {NEWSTACK(s,v,n);SETDST;stackdepth++;}
-#define STORE(s) {POP(s);SETDST;stackdepth--;}
-#define OP1_0(s) {POP(s);SETDST;stackdepth--;}
-#define OP1_0ANY {POPANY;SETDST;stackdepth--;}
+#define STORE(s) {REQUIRE_1;POP(s);SETDST;stackdepth--;}
+#define OP1_0(s) {REQUIRE_1;POP(s);SETDST;stackdepth--;}
+#define OP1_0ANY {REQUIRE_1;POPANY;SETDST;stackdepth--;}
#define OP0_1(s) {NEWSTACKn(s,stackdepth);SETDST;stackdepth++;}
-#define OP1_1(s,d) {POP(s);NEWSTACKn(d,stackdepth-1);SETDST;}
-#define OP2_0(s) {POP(s);POP(s);SETDST;stackdepth-=2;}
-#define OPTT2_0(t,b){POP(t);POP(b);SETDST;stackdepth-=2;}
-#define OP2_1(s) {POP(s);POP(s);NEWSTACKn(s,stackdepth-2);SETDST;stackdepth--;}
-#define OP2IAT_1(s) {POP(TYPE_INT);POP(TYPE_ADR);NEWSTACKn(s,stackdepth-2);\
+#define OP1_1(s,d) {REQUIRE_1;POP(s);NEWSTACKn(d,stackdepth-1);SETDST;}
+#define OP2_0(s) {REQUIRE_2;POP(s);POP(s);SETDST;stackdepth-=2;}
+#define OPTT2_0(t,b){REQUIRE_2;POP(t);POP(b);SETDST;stackdepth-=2;}
+#define OP2_1(s) {REQUIRE_2;POP(s);POP(s);NEWSTACKn(s,stackdepth-2);SETDST;stackdepth--;}
+#define OP2IAT_1(s) {REQUIRE_2;POP(TYPE_INT);POP(TYPE_ADR);NEWSTACKn(s,stackdepth-2);\
SETDST;stackdepth--;}
-#define OP2IT_1(s) {POP(TYPE_INT);POP(s);NEWSTACKn(s,stackdepth-2);\
+#define OP2IT_1(s) {REQUIRE_2;POP(TYPE_INT);POP(s);NEWSTACKn(s,stackdepth-2);\
SETDST;stackdepth--;}
-#define OPTT2_1(s,d){POP(s);POP(s);NEWSTACKn(d,stackdepth-2);SETDST;stackdepth--;}
-#define OP2_2(s) {POP(s);POP(s);NEWSTACKn(s,stackdepth-2);\
+#define OPTT2_1(s,d){REQUIRE_2;POP(s);POP(s);NEWSTACKn(d,stackdepth-2);SETDST;stackdepth--;}
+#define OP2_2(s) {REQUIRE_2;POP(s);POP(s);NEWSTACKn(s,stackdepth-2);\
NEWSTACKn(s,stackdepth-1);SETDST;}
-#define OP3TIA_0(s) {POP(s);POP(TYPE_INT);POP(TYPE_ADR);SETDST;stackdepth-=3;}
-#define OP3_0(s) {POP(s);POP(s);POP(s);SETDST;stackdepth-=3;}
-#define POPMANY(i) {stackdepth-=i;while(--i>=0){POPANY;}SETDST;}
-#define DUP {NEWSTACK(CURTYPE,CURKIND,curstack->varnum);SETDST;\
+#define OP3TIA_0(s) {REQUIRE_3;POP(s);POP(TYPE_INT);POP(TYPE_ADR);SETDST;stackdepth-=3;}
+#define OP3_0(s) {REQUIRE_3;POP(s);POP(s);POP(s);SETDST;stackdepth-=3;}
+#define POPMANY(i) {REQUIRE(i);stackdepth-=i;while(--i>=0){POPANY;}SETDST;}
+#define DUP {REQUIRE_1;NEWSTACK(CURTYPE,CURKIND,curstack->varnum);SETDST; \
stackdepth++;}
-#define SWAP {COPY(curstack,new);POPANY;COPY(curstack,new+1);POPANY;\
+#define SWAP {REQUIRE_2;COPY(curstack,new);POPANY;COPY(curstack,new+1);POPANY;\
new[0].prev=curstack;new[1].prev=new;\
curstack=new+1;new+=2;SETDST;}
-#define DUP_X1 {COPY(curstack,new);COPY(curstack,new+2);POPANY;\
+#define DUP_X1 {REQUIRE_2;COPY(curstack,new);COPY(curstack,new+2);POPANY;\
COPY(curstack,new+1);POPANY;new[0].prev=curstack;\
new[1].prev=new;new[2].prev=new+1;\
curstack=new+2;new+=3;SETDST;stackdepth++;}
-#define DUP2_X1 {COPY(curstack,new+1);COPY(curstack,new+4);POPANY;\
+#define DUP2_X1 {REQUIRE_3;COPY(curstack,new+1);COPY(curstack,new+4);POPANY;\
COPY(curstack,new);COPY(curstack,new+3);POPANY;\
COPY(curstack,new+2);POPANY;new[0].prev=curstack;\
new[1].prev=new;new[2].prev=new+1;\
new[3].prev=new+2;new[4].prev=new+3;\
curstack=new+4;new+=5;SETDST;stackdepth+=2;}
-#define DUP_X2 {COPY(curstack,new);COPY(curstack,new+3);POPANY;\
+#define DUP_X2 {REQUIRE_3;COPY(curstack,new);COPY(curstack,new+3);POPANY;\
COPY(curstack,new+2);POPANY;COPY(curstack,new+1);POPANY;\
new[0].prev=curstack;new[1].prev=new;\
new[2].prev=new+1;new[3].prev=new+2;\
curstack=new+3;new+=4;SETDST;stackdepth++;}
-#define DUP2_X2 {COPY(curstack,new+1);COPY(curstack,new+5);POPANY;\
+#define DUP2_X2 {REQUIRE_4;COPY(curstack,new+1);COPY(curstack,new+5);POPANY;\
COPY(curstack,new);COPY(curstack,new+4);POPANY;\
COPY(curstack,new+3);POPANY;COPY(curstack,new+2);POPANY;\
new[0].prev=curstack;new[1].prev=new;\
new[4].prev=new+3;new[5].prev=new+4;\
curstack=new+5;new+=6;SETDST;stackdepth+=2;}
+/*--------------------------------------------------*/
+/* MACROS FOR HANDLING BASIC BLOCKS */
+/*--------------------------------------------------*/
+
+/* COPYCURSTACK makes a copy of the current operand stack (curstack)
+ * and returns it in the variable copy.
+ *
+ * This macro is used to propagate the operand stack from one basic
+ * block to another. The destination block receives the copy as its
+ * input stack.
+ */
#define COPYCURSTACK(copy) {\
int d;\
stackptr s;\
copy=NULL;\
}
+/* BBEND is called at the end of each basic block (after the last
+ * instruction of the block has been processed).
+ */
#define BBEND(s,i){\
i=stackdepth-1;\
}\
}
-
-#define MARKREACHED(b,c) {\
- if(b->flags<0)\
- {COPYCURSTACK(c);b->flags=0;b->instack=c;b->indepth=stackdepth;}\
- else {stackptr s=curstack;stackptr t=b->instack;\
- if(b->indepth!=stackdepth)\
- {show_icmd_method();panic("Stack depth mismatch");}\
- while(s){if (s->type!=t->type)\
- TYPEPANIC\
- s=s->prev;t=t->prev;\
- }\
- }\
-}
-#ifdef USEBUILTINTABLE
-static stdopdescriptor *find_builtin(stdopdescriptor *first, stdopdescriptor *last,
- int icmd)
-{
- int len = last - first;
- int half;
- stdopdescriptor *middle;
-
- while (len > 0) {
- half = len/2;
- middle = first + half;
- if (middle->opcode < icmd) {
- first = middle + 1;
- len -= half + 1;
- } else
- len = half;
- }
- return first;
+/* MARKREACHED marks the destination block <b> as reached. If this
+ * block has been reached before we check if stack depth and types
+ * match. Otherwise the destination block receives a copy of the
+ * current stack as its input stack.
+ *
+ * b...destination block
+ * c...current stack
+ */
+#define MARKREACHED(b,c) { \
+ if(b->flags<0) \
+ {COPYCURSTACK(c);b->flags=0;b->instack=c;b->indepth=stackdepth;} \
+ else {stackptr s=curstack;stackptr t=b->instack; \
+ if(b->indepth!=stackdepth) \
+ {show_icmd_method();panic("Stack depth mismatch");} \
+ while(s){if (s->type!=t->type) \
+ TYPEPANIC \
+ s=s->prev;t=t->prev; \
+ } \
+ } \
}
-#endif
+/**********************************************************************/
+/* analyse_stack */
+/**********************************************************************/
+
+/* analyse_stack uses the intermediate code created by parse.c to
+ * build a model of the JVM operand stack for the current method.
+ *
+ * The following checks are performed:
+ * - check for operand stack underflow (before each instruction)
+ * - check for operand stack overflow (after[1] each instruction)
+ * - check for matching stack depth at merging points
+ * - check for matching basic types[2] at merging points
+ * - check basic types for instruction input (except for BUILTIN*
+ * opcodes and MULTIANEWARRAY)
+ *
+ * [1]) XXX Checking this after the instruction should be ok. parse.c
+ * counts the number of required stack slots in such a way that it is
+ * only vital that we don't exceed `maxstack` at basic block
+ * boundaries.
+ *
+ * [2]) 'basic types' means the distinction between INT, LONG, FLOAT,
+ * DOUBLE and ADDRESS types. Subtypes of INT and different ADDRESS
+ * types are not discerned.
+ */
+
void analyse_stack()
{
int b_count;
basicblock *tbptr;
s4 *s4ptr;
void* *tptr;
+ int *argren;
+
+ if (compileverbose) {
+ char logtext[MAXLOGTEXT];
+ sprintf(logtext, "Analysing: ");
+ utf_sprint(logtext+strlen(logtext), method->class->name);
+ strcpy(logtext+strlen(logtext), ".");
+ utf_sprint(logtext+strlen(logtext), method->name);
+ utf_sprint(logtext+strlen(logtext), method->descriptor);
+ log_text(logtext);
+ }
- // int *argren = DMNEW(int, maxlocals);
- int *argren = (int *)alloca(maxlocals * sizeof(int)); /* table for argument renaming */
+ argren = DMNEW(int, maxlocals);
+ /*int *argren = (int *)alloca(maxlocals * sizeof(int));*/ /* table for argument renaming */
for (i = 0; i < maxlocals; i++)
argren[i] = i;
opcode = iptr->opc;
iptr->target = NULL;
+ /* DEBUG XXX */ /* dolog("p:%04d op: %s",iptr-instr,icmd_names[opcode]); */
+
#ifdef USEBUILTINTABLE
{
- stdopdescriptor *blast = builtintable + sizeof(builtintable)/sizeof(stdopdescriptor);
+#if 0
stdopdescriptor *breplace;
- breplace = find_builtin(builtintable, blast, opcode);
- if (breplace != blast && opcode == breplace->opcode && !breplace->supported) {
+ breplace = find_builtin(opcode);
+
+ if (breplace && opcode == breplace->opcode) {
+ iptr[0].opc = breplace->icmd;
+ iptr[0].op1 = breplace->type_d;
+ iptr[0].val.a = breplace->builtin;
+ isleafmethod = false;
+ switch (breplace->icmd) {
+ case ICMD_BUILTIN1:
+ goto builtin1;
+ case ICMD_BUILTIN2:
+ goto builtin2;
+ }
+ }
+#endif
+ builtin_descriptor *breplace;
+ breplace = find_builtin(opcode);
+
+ if (breplace && opcode == breplace->opcode) {
iptr[0].opc = breplace->icmd;
iptr[0].op1 = breplace->type_d;
iptr[0].val.a = breplace->builtin;
iptr[0].opc = ICMD_LSUBCONST;
goto icmd_lconst_tail;
#endif
-#if SUPPORT_LONG_MULDIV
+#if SUPPORT_LONG_MUL
case ICMD_LMUL:
iptr[0].opc = ICMD_LMULCONST;
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
goto icmd_lconst_tail;
+#endif
+#if SUPPORT_LONG_DIV
case ICMD_LDIV:
if (iptr[0].val.l == 0x00000002)
iptr[0].val.i = 1;
iptr[0].opc = ICMD_LXORCONST;
goto icmd_lconst_tail;
#endif
-#if defined(NOLONG_CONDITIONAL)
+#if !defined(NOLONG_CONDITIONAL)
case ICMD_LCMP:
if ((len > 1) && (iptr[2].val.i == 0)) {
switch (iptr[2].opc) {
/* pop 2 push 1 */
- case ICMD_IALOAD:
case ICMD_LALOAD:
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
+ case ICMD_IALOAD:
case ICMD_FALOAD:
case ICMD_DALOAD:
case ICMD_AALOAD:
case ICMD_DSTORE:
case ICMD_ASTORE:
icmd_store:
+ REQUIRE_1;
- i = opcode-ICMD_ISTORE;
+ i = opcode - ICMD_ISTORE;
locals[iptr->op1][i].type = i;
#ifdef STATISTICS
count_pcmd_store++;
/* pop 3 push 0 */
case ICMD_IASTORE:
+ case ICMD_AASTORE:
case ICMD_LASTORE:
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
case ICMD_FASTORE:
case ICMD_DASTORE:
- case ICMD_AASTORE:
COUNT(count_check_null);
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
OP3TIA_0(opcode-ICMD_IASTORE);
break;
+
case ICMD_BASTORE:
case ICMD_CASTORE:
case ICMD_SASTORE:
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
OP3TIA_0(TYPE_INT);
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
break;
/* pop 1 push 0 */
case ICMD_POP:
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_1;
+ if (IS_2_WORD_TYPE(curstack->type))
+ panic("Illegal instruction: POP on category 2 type");
+ }
+#endif
OP1_0ANY;
break;
break;
case ICMD_POP2:
+ REQUIRE_1;
if (! IS_2_WORD_TYPE(curstack->type)) {
+ /* ..., cat1 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_2;
+ if (IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: POP2 on cat2, cat1 types");
+ }
+#endif
OP1_0ANY; /* second pop */
}
else
/* pop 0 push 1 dup */
case ICMD_DUP:
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_1;
+ if (IS_2_WORD_TYPE(curstack->type))
+ panic("Illegal instruction: DUP on category 2 type");
+ }
+#endif
COUNT(count_dup_instruction);
DUP;
break;
case ICMD_DUP2:
+ REQUIRE_1;
if (IS_2_WORD_TYPE(curstack->type)) {
+ /* ..., cat2 */
iptr->opc = ICMD_DUP;
DUP;
}
else {
+ REQUIRE_2;
+ /* ..., ????, cat1 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ if (IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: DUP2 on cat2, cat1 types");
+ }
+#endif
copy = curstack;
NEWSTACK(copy->prev->type, copy->prev->varkind,
copy->prev->varnum);
/* pop 2 push 3 dup */
case ICMD_DUP_X1:
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_2;
+ if (IS_2_WORD_TYPE(curstack->type) ||
+ IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: DUP_X1 on cat 2 type");
+ }
+#endif
DUP_X1;
break;
case ICMD_DUP2_X1:
+ REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->type)) {
+ /* ..., ????, cat2 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ if (IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: DUP2_X1 on cat2, cat2 types");
+ }
+#endif
iptr->opc = ICMD_DUP_X1;
DUP_X1;
}
else {
+ /* ..., ????, cat1 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_3;
+ if (IS_2_WORD_TYPE(curstack->prev->type)
+ || IS_2_WORD_TYPE(curstack->prev->prev->type))
+ panic("Illegal instruction: DUP2_X1 on invalid types");
+ }
+#endif
DUP2_X1;
}
break;
/* pop 3 push 4 dup */
case ICMD_DUP_X2:
+ REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->prev->type)) {
+ /* ..., cat2, ???? */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ if (IS_2_WORD_TYPE(curstack->type))
+ panic("Illegal instruction: DUP_X2 on cat2, cat2 types");
+ }
+#endif
iptr->opc = ICMD_DUP_X1;
DUP_X1;
}
else {
+ /* ..., cat1, ???? */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_3;
+ if (IS_2_WORD_TYPE(curstack->type)
+ || IS_2_WORD_TYPE(curstack->prev->prev->type))
+ panic("Illegal instruction: DUP_X2 on invalid types");
+ }
+#endif
DUP_X2;
}
break;
case ICMD_DUP2_X2:
+ REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->type)) {
+ /* ..., ????, cat2 */
if (IS_2_WORD_TYPE(curstack->prev->type)) {
+ /* ..., cat2, cat2 */
iptr->opc = ICMD_DUP_X1;
DUP_X1;
}
else {
+ /* ..., cat1, cat2 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_3;
+ if (IS_2_WORD_TYPE(curstack->prev->prev->type))
+ panic("Illegal instruction: DUP2_X2 on invalid types");
+ }
+#endif
iptr->opc = ICMD_DUP_X2;
DUP_X2;
}
}
- else
+ else {
+ REQUIRE_3;
+ /* ..., ????, ????, cat1 */
if (IS_2_WORD_TYPE(curstack->prev->prev->type)) {
+ /* ..., cat2, ????, cat1 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ if (IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: DUP2_X2 on invalid types");
+ }
+#endif
iptr->opc = ICMD_DUP2_X1;
DUP2_X1;
}
else {
+ /* ..., cat1, ????, cat1 */
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_4;
+ if (IS_2_WORD_TYPE(curstack->prev->type)
+ || IS_2_WORD_TYPE(curstack->prev->prev->prev->type))
+ panic("Illegal instruction: DUP2_X2 on invalid types");
+ }
+#endif
DUP2_X2;
}
+ }
break;
/* pop 2 push 2 swap */
case ICMD_SWAP:
+#ifdef TYPECHECK_STACK_COMPCAT
+ if (opt_verify) {
+ REQUIRE_2;
+ if (IS_2_WORD_TYPE(curstack->type)
+ || IS_2_WORD_TYPE(curstack->prev->type))
+ panic("Illegal instruction: SWAP on category 2 type");
+ }
+#endif
SWAP;
break;
#if !SUPPORT_DIVISION
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = (functionptr) asm_builtin_idiv;
+ iptr[0].val.a = BUILTIN_idiv;
isleafmethod = false;
goto builtin2;
#endif
#if !SUPPORT_DIVISION
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = (functionptr) asm_builtin_irem;
+ iptr[0].val.a = BUILTIN_irem;
isleafmethod = false;
goto builtin2;
#endif
-
- case ICMD_IADD:
- case ICMD_ISUB:
- case ICMD_IMUL:
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
case ICMD_ISHL:
case ICMD_ISHR:
case ICMD_IUSHR:
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
+ case ICMD_IADD:
+ case ICMD_ISUB:
+ case ICMD_IMUL:
case ICMD_IAND:
case ICMD_IOR:
case ICMD_IXOR:
break;
case ICMD_LDIV:
-#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_MULDIV)
+#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_LNG;
- iptr[0].val.a = (functionptr) asm_builtin_ldiv;
+ iptr[0].val.a = BUILTIN_ldiv;
isleafmethod = false;
goto builtin2;
#endif
case ICMD_LREM:
-#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_MULDIV)
+#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_LNG;
- iptr[0].val.a = (functionptr) asm_builtin_lrem;
+ iptr[0].val.a = BUILTIN_lrem;
isleafmethod = false;
goto builtin2;
#endif
+ case ICMD_LMUL:
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
case ICMD_LADD:
case ICMD_LSUB:
- case ICMD_LMUL:
-
case ICMD_LOR:
case ICMD_LAND:
case ICMD_LXOR:
+ /* XXX DEBUG */ /*dolog("OP2_1(TYPE_LNG)"); */
COUNT(count_pcmd_op);
OP2_1(TYPE_LNG);
break;
case ICMD_LUSHR:
COUNT(count_pcmd_op);
OP2IT_1(TYPE_LNG);
+#if defined(__I386__)
+ method_uses_ecx = true;
+ method_uses_edx = true;
+#endif
break;
case ICMD_FADD:
case ICMD_LCMP:
COUNT(count_pcmd_op);
-#ifndef NOLONG_CONDITIONAL
+#if !defined(NOLONG_CONDITIONAL)
if ((len > 0) && (iptr[1].val.i == 0)) {
switch (iptr[1].opc) {
case ICMD_IFEQ:
case ICMD_I2L:
COUNT(count_pcmd_op);
OP1_1(TYPE_INT, TYPE_LNG);
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
break;
case ICMD_I2F:
COUNT(count_pcmd_op);
case ICMD_F2L:
COUNT(count_pcmd_op);
OP1_1(TYPE_FLT, TYPE_LNG);
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
break;
case ICMD_F2D:
COUNT(count_pcmd_op);
case ICMD_D2L:
COUNT(count_pcmd_op);
OP1_1(TYPE_DBL, TYPE_LNG);
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
break;
case ICMD_D2F:
COUNT(count_pcmd_op);
case ICMD_CHECKCAST:
OP1_1(TYPE_ADR, TYPE_ADR);
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
break;
- case ICMD_ARRAYLENGTH:
case ICMD_INSTANCEOF:
+#if defined(__I386__)
+ method_uses_edx = true;
+#endif
+ case ICMD_ARRAYLENGTH:
OP1_1(TYPE_ADR, TYPE_INT);
break;
iptr[0].target = (void *) tbptr;
+ /* XXX This is a dirty hack. The typechecker
+ * needs it because the OP1_0ANY below
+ * overwrites iptr->dst.
+ */
+ iptr->val.a = (void*) iptr->dst;
+
tbptr->type=BBTYPE_SBR;
+ CHECKOVERFLOW;
MARKREACHED(tbptr, copy);
OP1_0ANY;
break;
i = iptr->op1;
if (i > arguments_num)
arguments_num = i;
+ REQUIRE(i);
#if defined(__X86_64__)
{
int iarg = 0;
}
case ICMD_BUILTIN3:
+ /* XXX DEBUG */ /*dolog("builtin3");*/
+ REQUIRE_3;
if (! (curstack->flags & SAVEDVAR)) {
curstack->varkind = ARGVAR;
curstack->varnum = 2;
case ICMD_BUILTIN2:
builtin2:
- if (! (curstack->flags & SAVEDVAR)) {
+ REQUIRE_2;
+ /* XXX DEBUG */ /*dolog("builtin2");*/
+ if (!(curstack->flags & SAVEDVAR)) {
curstack->varkind = ARGVAR;
curstack->varnum = 1;
}
OP1_0ANY;
case ICMD_BUILTIN1:
- if (! (curstack->flags & SAVEDVAR)) {
- curstack->varkind = ARGVAR;
- curstack->varnum = 0;
- }
- if (1 > arguments_num) {
- arguments_num = 1;
- }
- OP1_0ANY;
- copy = curstack;
- while (copy) {
- copy->flags |= SAVEDVAR;
- copy = copy->prev;
- }
- if (iptr->op1 != TYPE_VOID)
- OP0_1(iptr->op1);
- break;
+ builtin1:
+ REQUIRE_1;
+ /* XXX DEBUG */ /*dolog("builtin1");*/
+ if (!(curstack->flags & SAVEDVAR)) {
+ curstack->varkind = ARGVAR;
+ curstack->varnum = 0;
+ }
+ if (1 > arguments_num) {
+ arguments_num = 1;
+ }
+ OP1_0ANY;
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
+ if (iptr->op1 != TYPE_VOID)
+ OP0_1(iptr->op1);
+ break;
case ICMD_MULTIANEWARRAY:
i = iptr->op1;
+ REQUIRE(i);
if ((i + intreg_argnum) > arguments_num)
arguments_num = i + intreg_argnum;
copy = curstack;
while (--i >= 0) {
+ /* XXX check INT type here? Currently typecheck does this. */
if (! (copy->flags & SAVEDVAR)) {
copy->varkind = ARGVAR;
copy->varnum = i + intreg_argnum;
case ICMD_READONLY_ARG+3:
case ICMD_READONLY_ARG+4:
+ REQUIRE_1;
if (curstack->varkind == LOCALVAR) {
i = curstack->varnum;
argren[iptr->op1] = i;
printf("ICMD %d at %d\n", iptr->opc, (int)(iptr-instr));
panic("Missing ICMD code during stack analysis");
} /* switch */
+
+ CHECKOVERFLOW;
+
+ /* XXX DEBUG */ /*dolog("iptr++");*/
iptr++;
} /* while instructions */
bptr->outstack = curstack;
}
-static void print_stack(stackptr s)
+/**********************************************************************/
+/* DEBUGGING HELPERS */
+/**********************************************************************/
+
+void icmd_print_stack(stackptr s)
{
int i, j;
stackptr t;
printf(" ");
while (s) {
j--;
+ /* XXX remove */ /* printf("(%d)",s->flags); fflush(stdout); */
if (s->flags & SAVEDVAR)
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf(" M%02d", s->regoff);
+ printf((regs_ok) ? " M%02d" : " M??", s->regoff);
else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf(" F%02d", s->regoff);
- else
- printf(" %3s", regs[s->regoff]);
+ printf((regs_ok) ? " F%02d" : " F??", s->regoff);
+ else {
+ if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+ }
break;
case STACKVAR:
printf(" I%02d", s->varnum);
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf(" m%02d", s->regoff);
+ printf((regs_ok) ? " m%02d" : " m??", s->regoff);
else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf(" f%02d", s->regoff);
- else
- printf(" %3s", regs[s->regoff]);
+ printf((regs_ok) ? " f%02d" : " f??", s->regoff);
+ else {
+ if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+ }
break;
case STACKVAR:
printf(" i%02d", s->varnum);
#endif
-static char *builtin_name(functionptr bptr)
+char *icmd_builtin_name(functionptr bptr)
{
builtin_descriptor *bdesc = builtin_desc;
- while ((bdesc->bptr != NULL) && (bdesc->bptr != bptr))
+ while ((bdesc->opcode != 0) && (bdesc->builtin != bptr))
bdesc++;
- return bdesc->name;
+ return (bdesc->opcode) ? bdesc->name : "<NOT IN TABLE>";
}
void show_icmd_method()
{
int i, j;
- int deadcode;
- s4 *s4ptr;
- instruction *iptr;
+ s4 *s4ptr; /* used */
basicblock *bptr;
- void **tptr;
xtable *ex;
printf("\n");
if (locals[i][j].type >= 0) {
printf(" (%s) ", jit_type[j]);
if (locals[i][j].flags & INMEMORY)
- printf("m%2d", locals[i][j].regoff);
+ printf((regs_ok) ? "m%2d" : "m??", locals[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf("f%02d", locals[i][j].regoff);
- else
- printf("%3s", regs[locals[i][j].regoff]);
+ printf((regs_ok) ? "f%02d" : "f??", locals[i][j].regoff);
+ else {
+ if (regs_ok) printf("%3s",regs[locals[i][j].regoff]); else printf("???");
+ }
}
printf("\n");
}
printf(" (%s) ", jit_type[j]);
if (interfaces[i][j].flags & SAVEDVAR) {
if (interfaces[i][j].flags & INMEMORY)
- printf("M%2d", interfaces[i][j].regoff);
+ printf((regs_ok) ? "M%2d" : "M??", interfaces[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf("F%02d", interfaces[i][j].regoff);
- else
- printf("%3s", regs[interfaces[i][j].regoff]);
+ printf((regs_ok) ? "F%02d" : "F??", interfaces[i][j].regoff);
+ else {
+ if (regs_ok) printf("%3s",regs[interfaces[i][j].regoff]); else printf("???");
+ }
}
else {
if (interfaces[i][j].flags & INMEMORY)
- printf("m%2d", interfaces[i][j].regoff);
+ printf((regs_ok) ? "m%2d" : "m??", interfaces[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf("f%02d", interfaces[i][j].regoff);
- else
- printf("%3s", regs[interfaces[i][j].regoff]);
+ printf((regs_ok) ? "f%02d" : "f??", interfaces[i][j].regoff);
+ else {
+ if (regs_ok) printf("%3s",regs[interfaces[i][j].regoff]); else printf("???");
+ }
}
}
printf("\n");
for (bptr = block; bptr != NULL; bptr = bptr->next) {
- if (bptr->flags != BBDELETED) {
- deadcode = bptr->flags <= BBREACHED;
+ show_icmd_block(bptr);
+ }
+}
+
+
+void show_icmd_block(basicblock *bptr)
+{
+ int i, j;
+ int deadcode;
+ s4 *s4ptr; /* used */
+ instruction *iptr;
+
+ if (bptr->flags != BBDELETED) {
+ deadcode = bptr->flags <= BBREACHED;
+ printf("[");
+ if (deadcode)
+ for (j = method->maxstack; j > 0; j--)
+ printf(" ? ");
+ else
+ icmd_print_stack(bptr->instack);
+ printf("] L%03d(%d - %d) flags=%d:\n", bptr->debug_nr, bptr->icount, bptr->pre_count,bptr->flags);
+ iptr = bptr->iinstr;
+
+ for (i=0; i < bptr->icount; i++, iptr++) {
printf("[");
- if (deadcode)
- for (j = maxstack; j > 0; j--)
+ if (deadcode) {
+ for (j = method->maxstack; j > 0; j--)
printf(" ? ");
+ }
else
- print_stack(bptr->instack);
- printf("] L%03d(%d - %d):\n", bptr->debug_nr, bptr->icount, bptr->pre_count);
- iptr = bptr->iinstr;
-
- for (i=0; i < bptr->icount; i++, iptr++) {
- printf("[");
- if (deadcode) {
- for (j = maxstack; j > 0; j--)
- printf(" ? ");
+ icmd_print_stack(iptr->dst);
+ printf("] %4d ", i);
+ /* XXX remove */ /*fflush(stdout);*/
+ show_icmd(iptr,deadcode);
+ printf("\n");
+ }
+
+ if (showdisassemble && (!deadcode)) {
+#if defined(__I386__) || defined(__X86_64__)
+ u1 *u1ptr;
+ int a;
+
+ printf("\n");
+ i = bptr->mpc;
+ u1ptr = method->mcode + dseglen + i;
+
+ if (bptr->next != NULL) {
+ for (; i < bptr->next->mpc; i++, u1ptr++) {
+ a = disassinstr(u1ptr, i);
+ i += a;
+ u1ptr += a;
}
- else
- print_stack(iptr->dst);
- printf("] %4d %s", i, icmd_names[iptr->opc]);
- switch ((int) iptr->opc) {
- case ICMD_IADDCONST:
- case ICMD_ISUBCONST:
- case ICMD_IMULCONST:
- case ICMD_IDIVPOW2:
- case ICMD_IREMPOW2:
- case ICMD_IREM0X10001:
- case ICMD_IANDCONST:
- case ICMD_IORCONST:
- case ICMD_IXORCONST:
- case ICMD_ISHLCONST:
- case ICMD_ISHRCONST:
- case ICMD_IUSHRCONST:
- case ICMD_LSHLCONST:
- case ICMD_LSHRCONST:
- case ICMD_LUSHRCONST:
- case ICMD_ICONST:
- case ICMD_ELSE_ICONST:
- case ICMD_IFEQ_ICONST:
- case ICMD_IFNE_ICONST:
- case ICMD_IFLT_ICONST:
- case ICMD_IFGE_ICONST:
- case ICMD_IFGT_ICONST:
- case ICMD_IFLE_ICONST:
- printf(" %d", iptr->val.i);
- break;
- case ICMD_LADDCONST:
- case ICMD_LSUBCONST:
- case ICMD_LMULCONST:
- case ICMD_LDIVPOW2:
- case ICMD_LREMPOW2:
- case ICMD_LANDCONST:
- case ICMD_LORCONST:
- case ICMD_LXORCONST:
- case ICMD_LCONST:
-#if defined(__I386__)
- printf(" %lld", iptr->val.l);
+ printf("\n");
+
+ } else {
+ for (; u1ptr < (u1 *) (method->mcode + method->mcodelength); i++, u1ptr++) {
+ a = disassinstr(u1ptr, i);
+ i += a;
+ u1ptr += a;
+ }
+ printf("\n");
+ }
#else
- printf(" %ld", iptr->val.l);
-#endif
- break;
- case ICMD_FCONST:
- printf(" %f", iptr->val.f);
- break;
- case ICMD_DCONST:
- printf(" %f", iptr->val.d);
- break;
- case ICMD_ACONST:
- printf(" %p", iptr->val.a);
- break;
- case ICMD_GETFIELD:
- case ICMD_PUTFIELD:
- printf(" %d,", ((fieldinfo *) iptr->val.a)->offset);
- case ICMD_PUTSTATIC:
- case ICMD_GETSTATIC:
- printf(" ");
- utf_fprint(stdout,
- ((fieldinfo *) iptr->val.a)->name);
- break;
- case ICMD_IINC:
- printf(" %d + %d", iptr->op1, iptr->val.i);
- break;
+ printf("\n");
+ i = bptr->mpc;
+ s4ptr = (s4 *) (method->mcode + dseglen + i);
- case ICMD_IASTORE:
- case ICMD_SASTORE:
- case ICMD_BASTORE:
- case ICMD_CASTORE:
- case ICMD_LASTORE:
- case ICMD_DASTORE:
- case ICMD_FASTORE:
- case ICMD_AASTORE:
-
- case ICMD_IALOAD:
- case ICMD_SALOAD:
- case ICMD_BALOAD:
- case ICMD_CALOAD:
- case ICMD_LALOAD:
- case ICMD_DALOAD:
- case ICMD_FALOAD:
- case ICMD_AALOAD:
- if (iptr->op1 != 0)
- printf("(opt.)");
- break;
+ if (bptr->next != NULL) {
+ for (; i < bptr->next->mpc; i += 4, s4ptr++) {
+ disassinstr(*s4ptr, i);
+ }
+ printf("\n");
- case ICMD_RET:
- case ICMD_ILOAD:
- case ICMD_LLOAD:
- case ICMD_FLOAD:
- case ICMD_DLOAD:
- case ICMD_ALOAD:
- case ICMD_ISTORE:
- case ICMD_LSTORE:
- case ICMD_FSTORE:
- case ICMD_DSTORE:
- case ICMD_ASTORE:
- printf(" %d", iptr->op1);
- break;
- case ICMD_NEW:
- printf(" ");
- utf_fprint(stdout,
- ((classinfo *) iptr->val.a)->name);
- break;
- case ICMD_NEWARRAY:
- switch (iptr->op1) {
- case 4:
- printf(" boolean");
- break;
- case 5:
- printf(" char");
- break;
- case 6:
- printf(" float");
- break;
- case 7:
- printf(" double");
- break;
- case 8:
- printf(" byte");
- break;
- case 9:
- printf(" short");
- break;
- case 10:
- printf(" int");
- break;
- case 11:
- printf(" long");
- break;
- }
- break;
- case ICMD_ANEWARRAY:
- if (iptr->op1) {
- printf(" ");
- utf_fprint(stdout,
- ((classinfo *) iptr->val.a)->name);
- }
- break;
- case ICMD_CHECKCAST:
- case ICMD_INSTANCEOF:
- if (iptr->op1) {
- classinfo *c = iptr->val.a;
- if (c->flags & ACC_INTERFACE)
- printf(" (INTERFACE) ");
- else
- printf(" (CLASS,%3d) ", c->vftbl->diffval);
- utf_fprint(stdout, c->name);
- }
- break;
- case ICMD_BUILTIN3:
- case ICMD_BUILTIN2:
- case ICMD_BUILTIN1:
- printf(" %s", builtin_name((functionptr) iptr->val.a));
- break;
- case ICMD_INVOKEVIRTUAL:
- case ICMD_INVOKESPECIAL:
- case ICMD_INVOKESTATIC:
- case ICMD_INVOKEINTERFACE:
- printf(" ");
- utf_fprint(stdout,
- ((methodinfo *) iptr->val.a)->class->name);
- printf(".");
- utf_fprint(stdout,
- ((methodinfo *) iptr->val.a)->name);
- break;
- case ICMD_IFEQ:
- case ICMD_IFNE:
- case ICMD_IFLT:
- case ICMD_IFGE:
- case ICMD_IFGT:
- case ICMD_IFLE:
- printf("(%d) L%03d", iptr->val.i, ((basicblock *) iptr->target)->debug_nr);
- break;
- case ICMD_IF_LEQ:
- case ICMD_IF_LNE:
- case ICMD_IF_LLT:
- case ICMD_IF_LGE:
- case ICMD_IF_LGT:
- case ICMD_IF_LLE:
- printf("(%lld) L%03d", iptr->val.l, ((basicblock *) iptr->target)->debug_nr);
- break;
- case ICMD_JSR:
- case ICMD_GOTO:
- case ICMD_IFNULL:
- case ICMD_IFNONNULL:
- case ICMD_IF_ICMPEQ:
- case ICMD_IF_ICMPNE:
- case ICMD_IF_ICMPLT:
- case ICMD_IF_ICMPGE:
- case ICMD_IF_ICMPGT:
- case ICMD_IF_ICMPLE:
- case ICMD_IF_LCMPEQ:
- case ICMD_IF_LCMPNE:
- case ICMD_IF_LCMPLT:
- case ICMD_IF_LCMPGE:
- case ICMD_IF_LCMPGT:
- case ICMD_IF_LCMPLE:
- case ICMD_IF_ACMPEQ:
- case ICMD_IF_ACMPNE:
- printf(" L%03d", ((basicblock *) iptr->target)->debug_nr);
- break;
- case ICMD_TABLESWITCH:
+ } else {
+ for (; s4ptr < (s4 *) (method->mcode + method->mcodelength); i += 4, s4ptr++) {
+ disassinstr(*s4ptr, i);
+ }
+ printf("\n");
+ }
+#endif
+ }
+ }
+}
- s4ptr = iptr->val.a;
- tptr = (void **) iptr->target;
- printf(" L%03d;", ((basicblock *) *tptr)->debug_nr);
- /* default */
+void show_icmd(instruction *iptr,bool deadcode)
+{
+ int j;
+ s4 *s4ptr;
+ void **tptr;
+
+ printf("%s", icmd_names[iptr->opc]);
+
+ switch ((int) iptr->opc) {
+ case ICMD_IADDCONST:
+ case ICMD_ISUBCONST:
+ case ICMD_IMULCONST:
+ case ICMD_IDIVPOW2:
+ case ICMD_IREMPOW2:
+ case ICMD_IREM0X10001:
+ case ICMD_IANDCONST:
+ case ICMD_IORCONST:
+ case ICMD_IXORCONST:
+ case ICMD_ISHLCONST:
+ case ICMD_ISHRCONST:
+ case ICMD_IUSHRCONST:
+ case ICMD_LSHLCONST:
+ case ICMD_LSHRCONST:
+ case ICMD_LUSHRCONST:
+ case ICMD_ICONST:
+ case ICMD_ELSE_ICONST:
+ case ICMD_IFEQ_ICONST:
+ case ICMD_IFNE_ICONST:
+ case ICMD_IFLT_ICONST:
+ case ICMD_IFGE_ICONST:
+ case ICMD_IFGT_ICONST:
+ case ICMD_IFLE_ICONST:
+ printf(" %d", iptr->val.i);
+ break;
+
+ case ICMD_LADDCONST:
+ case ICMD_LSUBCONST:
+ case ICMD_LMULCONST:
+ case ICMD_LDIVPOW2:
+ case ICMD_LREMPOW2:
+ case ICMD_LANDCONST:
+ case ICMD_LORCONST:
+ case ICMD_LXORCONST:
+ case ICMD_LCONST:
+#if defined(__I386__)
+ printf(" %lld", iptr->val.l);
+#else
+ printf(" %ld", iptr->val.l);
+#endif
+ break;
+
+ case ICMD_FCONST:
+ printf(" %f", iptr->val.f);
+ break;
+
+ case ICMD_DCONST:
+ printf(" %f", iptr->val.d);
+ break;
+
+ case ICMD_ACONST:
+ printf(" %p", iptr->val.a);
+ break;
+
+ case ICMD_GETFIELD:
+ case ICMD_PUTFIELD:
+ printf(" %d,", ((fieldinfo *) iptr->val.a)->offset);
+ case ICMD_PUTSTATIC:
+ case ICMD_GETSTATIC:
+ printf(" ");
+ utf_fprint(stdout,
+ ((fieldinfo *) iptr->val.a)->class->name);
+ printf(".");
+ utf_fprint(stdout,
+ ((fieldinfo *) iptr->val.a)->name);
+ printf(" (type ");
+ utf_fprint(stdout,
+ ((fieldinfo *) iptr->val.a)->descriptor);
+ printf(")");
+ break;
+
+ case ICMD_IINC:
+ printf(" %d + %d", iptr->op1, iptr->val.i);
+ break;
+
+ case ICMD_IASTORE:
+ case ICMD_SASTORE:
+ case ICMD_BASTORE:
+ case ICMD_CASTORE:
+ case ICMD_LASTORE:
+ case ICMD_DASTORE:
+ case ICMD_FASTORE:
+ case ICMD_AASTORE:
+
+ case ICMD_IALOAD:
+ case ICMD_SALOAD:
+ case ICMD_BALOAD:
+ case ICMD_CALOAD:
+ case ICMD_LALOAD:
+ case ICMD_DALOAD:
+ case ICMD_FALOAD:
+ case ICMD_AALOAD:
+ if (iptr->op1 != 0)
+ printf("(opt.)");
+ break;
+
+ case ICMD_RET:
+ case ICMD_ILOAD:
+ case ICMD_LLOAD:
+ case ICMD_FLOAD:
+ case ICMD_DLOAD:
+ case ICMD_ALOAD:
+ case ICMD_ISTORE:
+ case ICMD_LSTORE:
+ case ICMD_FSTORE:
+ case ICMD_DSTORE:
+ case ICMD_ASTORE:
+ printf(" %d", iptr->op1);
+ break;
+
+ case ICMD_NEW:
+ printf(" ");
+ utf_fprint(stdout,
+ ((classinfo *) iptr->val.a)->name);
+ break;
+
+ case ICMD_NEWARRAY:
+ switch (iptr->op1) {
+ case 4:
+ printf(" boolean");
+ break;
+ case 5:
+ printf(" char");
+ break;
+ case 6:
+ printf(" float");
+ break;
+ case 7:
+ printf(" double");
+ break;
+ case 8:
+ printf(" byte");
+ break;
+ case 9:
+ printf(" short");
+ break;
+ case 10:
+ printf(" int");
+ break;
+ case 11:
+ printf(" long");
+ break;
+ }
+ break;
- s4ptr++;
- tptr++;
+ case ICMD_ANEWARRAY:
+ if (iptr->op1) {
+ printf(" ");
+ utf_fprint(stdout,
+ ((classinfo *) iptr->val.a)->name);
+ }
+ break;
+
+ case ICMD_MULTIANEWARRAY:
+ {
+ vftbl *vft;
+ printf(" %d ",iptr->op1);
+ vft = (vftbl *)iptr->val.a;
+ if (vft)
+ utf_fprint(stdout,vft->class->name);
+ else
+ printf("<null>");
+ }
+ break;
+
+ case ICMD_CHECKCAST:
+ case ICMD_INSTANCEOF:
+ if (iptr->op1) {
+ classinfo *c = iptr->val.a;
+ if (c->flags & ACC_INTERFACE)
+ printf(" (INTERFACE) ");
+ else
+ printf(" (CLASS,%3d) ", c->vftbl->diffval);
+ utf_fprint(stdout, c->name);
+ }
+ break;
+
+ case ICMD_BUILTIN3:
+ case ICMD_BUILTIN2:
+ case ICMD_BUILTIN1:
+ printf(" %s", icmd_builtin_name((functionptr) iptr->val.a));
+ break;
+
+ case ICMD_INVOKEVIRTUAL:
+ case ICMD_INVOKESPECIAL:
+ case ICMD_INVOKESTATIC:
+ case ICMD_INVOKEINTERFACE:
+ printf(" ");
+ utf_fprint(stdout,
+ ((methodinfo *) iptr->val.a)->class->name);
+ printf(".");
+ utf_fprint(stdout,
+ ((methodinfo *) iptr->val.a)->name);
+ break;
+
+ case ICMD_IFEQ:
+ case ICMD_IFNE:
+ case ICMD_IFLT:
+ case ICMD_IFGE:
+ case ICMD_IFGT:
+ case ICMD_IFLE:
+ if (deadcode || !iptr->target)
+ printf("(%d) op1=%d", iptr->val.i, iptr->op1);
+ else
+ printf("(%d) L%03d", iptr->val.i, ((basicblock *) iptr->target)->debug_nr);
+ break;
+
+ case ICMD_IF_LEQ:
+ case ICMD_IF_LNE:
+ case ICMD_IF_LLT:
+ case ICMD_IF_LGE:
+ case ICMD_IF_LGT:
+ case ICMD_IF_LLE:
+ if (deadcode || !iptr->target)
+ printf("(%lld) op1=%d", iptr->val.l, iptr->op1);
+ else
+ printf("(%lld) L%03d", iptr->val.l, ((basicblock *) iptr->target)->debug_nr);
+ break;
+
+ case ICMD_JSR:
+ case ICMD_GOTO:
+ case ICMD_IFNULL:
+ case ICMD_IFNONNULL:
+ case ICMD_IF_ICMPEQ:
+ case ICMD_IF_ICMPNE:
+ case ICMD_IF_ICMPLT:
+ case ICMD_IF_ICMPGE:
+ case ICMD_IF_ICMPGT:
+ case ICMD_IF_ICMPLE:
+ case ICMD_IF_LCMPEQ:
+ case ICMD_IF_LCMPNE:
+ case ICMD_IF_LCMPLT:
+ case ICMD_IF_LCMPGE:
+ case ICMD_IF_LCMPGT:
+ case ICMD_IF_LCMPLE:
+ case ICMD_IF_ACMPEQ:
+ case ICMD_IF_ACMPNE:
+ if (deadcode || !iptr->target)
+ printf(" op1=%d", iptr->op1);
+ else
+ printf(" L%03d", ((basicblock *) iptr->target)->debug_nr);
+ break;
- j = *s4ptr++; /* low */
- j = *s4ptr++ - j; /* high */
- while (j >= 0) {
- printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
- tptr++;
- j--;
- }
- break;
- case ICMD_LOOKUPSWITCH:
- s4ptr = iptr->val.a;
- tptr = (void **) iptr->target;
+ case ICMD_TABLESWITCH:
+ s4ptr = (s4*)iptr->val.a;
- printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
- s4ptr++; /* default */
- j = *s4ptr; /* count */
- tptr++;
+ if (deadcode || !iptr->target) {
+ printf(" %d;", *s4ptr);
+ }
+ else {
+ tptr = (void **) iptr->target;
+ printf(" L%03d;", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
+ }
- while (--j >= 0) {
- printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
- tptr++;
- }
- break;
- }
- printf("\n");
+ s4ptr++; /* skip default */
+ j = *s4ptr++; /* low */
+ j = *s4ptr++ - j; /* high */
+ while (j >= 0) {
+ if (deadcode || !*tptr)
+ printf(" %d", *s4ptr++);
+ else {
+ printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
}
+ j--;
+ }
+ break;
- if (showdisassemble && (!deadcode)) {
-#if defined(__I386__) || defined(__X86_64__)
- u1 *u1ptr;
- int a;
+ case ICMD_LOOKUPSWITCH:
+ s4ptr = (s4*)iptr->val.a;
- printf("\n");
- i = bptr->mpc;
- u1ptr = method->mcode + dseglen + i;
-
- if (bptr->next != NULL) {
- for (; i < bptr->next->mpc; i++, u1ptr++) {
- a = disassinstr(u1ptr, i);
- i += a;
- u1ptr += a;
- }
- printf("\n");
+ if (deadcode || !iptr->target) {
+ printf(" %d;", *s4ptr);
+ }
+ else {
+ tptr = (void **) iptr->target;
+ printf(" L%03d;", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
+ }
+ s4ptr++; /* default */
+ j = *s4ptr++; /* count */
- } else {
- for (; u1ptr < (u1 *) (method->mcode + method->mcodelength); i++, u1ptr++) {
- a = disassinstr(u1ptr, i);
- i += a;
- u1ptr += a;
- }
- printf("\n");
- }
-#else
- printf("\n");
- i = bptr->mpc;
- s4ptr = (s4 *) (method->mcode + dseglen + i);
-
- if (bptr->next != NULL) {
- for (; i < bptr->next->mpc; i += 4, s4ptr++) {
- disassinstr(*s4ptr, i);
- }
- printf("\n");
- }
- else {
- for (; s4ptr < (s4 *) (method->mcode + method->mcodelength); i += 4, s4ptr++) {
- disassinstr(*s4ptr, i);
- }
- printf("\n");
- }
-#endif
- }
+ while (--j >= 0) {
+ if (deadcode || !*tptr) {
+ s4ptr++; /* skip value */
+ printf(" %d",*s4ptr++);
+ }
+ else {
+ printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
+ }
}
+ break;
}
}
projects / cacao.git / blobdiff