-/* jit/stack.c - stack analysis
+/* vm/jit/stack.c - stack analysis
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
- M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
- P. Tomsich, J. Wenninger
+ Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+ R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+ C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+ Institut f. Computersprachen - TU Wien
This file is part of CACAO.
Changes: Edwin Steiner
- $Id: stack.c 733 2003-12-12 17:29:40Z stefan $
+ $Id: stack.c 1735 2004-12-07 14:33:27Z twisti $
*/
#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;
-
-
-#ifdef STATISTICS
-#define COUNT(cnt) cnt++
-#else
-#define COUNT(cnt)
-#endif
-
-#define STACKRESET {curstack=0;stackdepth=0;}
-
-#define TYPEPANIC {show_icmd_method();panic("Stack type mismatch");}
-#define UNDERFLOW {show_icmd_method();panic("Stack underflow");} /* XXX why isn't this caught in parse.c? */
-#define CURKIND curstack->varkind
-#define CURTYPE curstack->type
-
-#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)
-
-#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)
-#define NEWXSTACK {NEWSTACK(TYPE_ADR,STACKVAR,0);curstack=0;}
-
-#define SETDST {iptr->dst=curstack;}
-
-/* The following macros do NOT check stackdepth, set stackdepth and 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; \
- curstack=curstack->prev;}
-#define COPY(s,d) {(d)->flags=0;(d)->type=(s)->type;\
- (d)->varkind=(s)->varkind;(d)->varnum=(s)->varnum;}
-/******************************/
-
-/* The following macros check stackdepth, set stackdepth and itpr->dst */
-#define PUSHCONST(s){NEWSTACKn(s,stackdepth);SETDST;stackdepth++;}
-#define LOAD(s,v,n) {NEWSTACK(s,v,n);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) {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) {REQUIRE_2;POP(TYPE_INT);POP(s);NEWSTACKn(s,stackdepth-2);\
- SETDST;stackdepth--;}
-#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) {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 {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 {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 {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 {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 {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[2].prev=new+1;new[3].prev=new+2;\
- new[4].prev=new+3;new[5].prev=new+4;\
- curstack=new+5;new+=6;SETDST;stackdepth+=2;}
-/******************************/
-
-#define COPYCURSTACK(copy) {\
- int d;\
- stackptr s;\
- if(curstack){\
- s=curstack;\
- new+=stackdepth;\
- d=stackdepth;\
- copy=new;\
- while(s){\
- copy--;d--;\
- copy->prev=copy-1;\
- copy->type=s->type;\
- copy->flags=0;\
- copy->varkind=STACKVAR;\
- copy->varnum=d;\
- s=s->prev;\
- }\
- copy->prev=NULL;\
- copy=new-1;\
- }\
- else\
- copy=NULL;\
-}
-
-
-#define BBEND(s,i){\
- i=stackdepth-1;\
- copy=s;\
- while(copy){\
- if((copy->varkind==STACKVAR)&&(copy->varnum>i))\
- copy->varkind=TEMPVAR;\
- else {\
- copy->varkind=STACKVAR;\
- copy->varnum=i;\
- }\
- interfaces[i][copy->type].type = copy->type;\
- interfaces[i][copy->type].flags |= copy->flags;\
- i--;copy=copy->prev;\
- }\
- i=bptr->indepth-1;\
- copy=bptr->instack;\
- while(copy){\
- interfaces[i][copy->type].type = copy->type;\
- if(copy->varkind==STACKVAR){\
- if (copy->flags & SAVEDVAR)\
- interfaces[i][copy->type].flags |= SAVEDVAR;\
- }\
- i--;copy=copy->prev;\
- }\
-}
-
-
-#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;\
- }\
- }\
-}
-
+#include "mm/memory.h"
+#include "native/native.h"
+#include "toolbox/logging.h"
+#include "vm/global.h"
+#include "vm/builtin.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
+#include "vm/tables.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/stack.h"
+
+
+/**********************************************************************/
+/* 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, INVOKE* opcodes and MULTIANEWARRAY)
+ *
+ * [1]) 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()
+methodinfo *analyse_stack(methodinfo *m, codegendata *cd, registerdata *rd)
{
int b_count;
int b_index;
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);
- }
+ s4 *argren;
- argren = DMNEW(int, maxlocals);
- //int *argren = (int *)alloca(maxlocals * sizeof(int)); /* table for argument renaming */
- for (i = 0; i < maxlocals; i++)
+ argren = DMNEW(s4, cd->maxlocals); /* table for argument renaming */
+ for (i = 0; i < cd->maxlocals; i++)
argren[i] = i;
- arguments_num = 0;
- new = stack;
+ rd->arguments_num = 0;
+ new = m->stack;
loops = 0;
- block[0].flags = BBREACHED;
- block[0].instack = 0;
- block[0].indepth = 0;
+ m->basicblocks[0].flags = BBREACHED;
+ m->basicblocks[0].instack = 0;
+ m->basicblocks[0].indepth = 0;
- for (i = 0; i < exceptiontablelength; i++) {
- bptr = &block[block_index[extable[i].handlerpc]];
+ for (i = 0; i < cd->exceptiontablelength; i++) {
+ bptr = &m->basicblocks[m->basicblockindex[cd->exceptiontable[i].handlerpc]];
bptr->flags = BBREACHED;
bptr->type = BBTYPE_EXH;
bptr->instack = new;
}
#ifdef CONDITIONAL_LOADCONST
- b_count = block_count;
- bptr = block;
+ b_count = m->basicblockcount;
+ bptr = m->basicblocks;
while (--b_count >= 0) {
if (bptr->icount != 0) {
iptr = bptr->iinstr + bptr->icount - 1;
case ICMD_IF_ACMPNE:
bptr[1].pre_count++;
case ICMD_GOTO:
- block[block_index[iptr->op1]].pre_count++;
+ m->basicblocks[m->basicblockindex[iptr->op1]].pre_count++;
break;
case ICMD_TABLESWITCH:
s4ptr = iptr->val.a;
- block[block_index[*s4ptr++]].pre_count++; /* default */
+ m->basicblocks[m->basicblockindex[*s4ptr++]].pre_count++;
i = *s4ptr++; /* low */
i = *s4ptr++ - i + 1; /* high */
while (--i >= 0) {
- block[block_index[*s4ptr++]].pre_count++;
+ m->basicblocks[m->basicblockindex[*s4ptr++]].pre_count++;
}
break;
case ICMD_LOOKUPSWITCH:
s4ptr = iptr->val.a;
- block[block_index[*s4ptr++]].pre_count++; /* default */
+ m->basicblocks[m->basicblockindex[*s4ptr++]].pre_count++;
i = *s4ptr++; /* count */
while (--i >= 0) {
- block[block_index[s4ptr[1]]].pre_count++;
+ m->basicblocks[m->basicblockindex[s4ptr[1]]].pre_count++;
s4ptr += 2;
}
break;
do {
loops++;
- b_count = block_count;
- bptr = block;
+ b_count = m->basicblockcount;
+ bptr = m->basicblocks;
superblockend = true;
repeat = false;
STACKRESET;
bptr->indepth = stackdepth;
}
else if (bptr->indepth != stackdepth) {
- show_icmd_method();
+ show_icmd_method(m, cd, rd);
+ printf("Block: %d, required depth: %d, current depth: %d\n", bptr->debug_nr, bptr->indepth, stackdepth);
panic("Stack depth mismatch");
}
bptr->flags = BBFINISHED;
len = bptr->icount;
iptr = bptr->iinstr;
- b_index = bptr - block;
+ b_index = bptr - m->basicblocks;
while (--len >= 0) {
opcode = iptr->opc;
iptr->target = NULL;
- /* DEBUG XXX */ /* dolog("p:%04d op: %s",iptr-instr,icmd_names[opcode]); */
+/* dolog("p: %04d op: %s stack: %p", iptr - instr, icmd_names[opcode], curstack); */
#ifdef USEBUILTINTABLE
{
if (breplace && opcode == breplace->opcode) {
iptr[0].opc = breplace->icmd;
iptr[0].op1 = breplace->type_d;
- iptr[0].val.a = breplace->builtin;
- isleafmethod = false;
+ iptr[0].val.fp = breplace->builtin;
+ m->isleafmethod = false;
switch (breplace->icmd) {
case ICMD_BUILTIN1:
goto builtin1;
if (breplace && opcode == breplace->opcode) {
iptr[0].opc = breplace->icmd;
iptr[0].op1 = breplace->type_d;
- iptr[0].val.a = breplace->builtin;
- isleafmethod = false;
+ iptr[0].val.fp = breplace->builtin;
+ m->isleafmethod = false;
switch (breplace->icmd) {
case ICMD_BUILTIN1:
goto builtin1;
case ICMD_NOP:
case ICMD_CHECKASIZE:
+ case ICMD_CHECKEXCEPTION:
case ICMD_IFEQ_ICONST:
case ICMD_IFNE_ICONST:
break;
case ICMD_RET:
- locals[iptr->op1][TYPE_ADR].type = TYPE_ADR;
+ rd->locals[iptr->op1][TYPE_ADR].type = TYPE_ADR;
case ICMD_RETURN:
COUNT(count_pcmd_return);
SETDST;
iptr[0].opc = ICMD_IDIVPOW2;
goto icmd_iconst_tail;
case ICMD_IREM:
-#if !defined(NO_DIV_OPT)
- if (iptr[0].val.i == 0x10001) {
- iptr[0].opc = ICMD_IREM0X10001;
- goto icmd_iconst_tail;
- }
-#endif
if ((iptr[0].val.i == 0x00000002) ||
(iptr[0].val.i == 0x00000004) ||
(iptr[0].val.i == 0x00000008) ||
(iptr[0].val.i == 0x80000000)) {
iptr[0].opc = ICMD_IREMPOW2;
iptr[0].val.i -= 1;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_iconst_tail;
}
PUSHCONST(TYPE_INT);
#if SUPPORT_LONG_SHIFT
case ICMD_LSHL:
iptr[0].opc = ICMD_LSHLCONST;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_tail;
case ICMD_LSHR:
iptr[0].opc = ICMD_LSHRCONST;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_tail;
case ICMD_LUSHR:
iptr[0].opc = ICMD_LUSHRCONST;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_tail;
#endif
case ICMD_IF_ICMPEQ:
len--;
/* iptr[1].opc = ICMD_NOP; */
OP1_0(TYPE_INT);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
case ICMD_IF_ICMPGE:
iptr[0].opc = ICMD_IFGE;
goto icmd_if_icmp_tail;
+
+#if SUPPORT_CONST_ASTORE
+ case ICMD_IASTORE:
+ case ICMD_BASTORE:
+ case ICMD_CASTORE:
+ case ICMD_SASTORE:
+#if SUPPORT_ONLY_ZERO_ASTORE
+ if (iptr[0].val.i == 0) {
+#endif /* SUPPORT_ONLY_ZERO_ASTORE */
+ switch (iptr[1].opc) {
+ case ICMD_IASTORE:
+ iptr[0].opc = ICMD_IASTORECONST;
+ break;
+ case ICMD_BASTORE:
+ iptr[0].opc = ICMD_BASTORECONST;
+ break;
+ case ICMD_CASTORE:
+ iptr[0].opc = ICMD_CASTORECONST;
+ break;
+ case ICMD_SASTORE:
+ iptr[0].opc = ICMD_SASTORECONST;
+ break;
+ }
+
+ iptr[1].opc = ICMD_NOP;
+ OPTT2_0(TYPE_INT, TYPE_ADR);
+ COUNT(count_pcmd_op);
+#if SUPPORT_ONLY_ZERO_ASTORE
+ } else
+ PUSHCONST(TYPE_INT);
+#endif /* SUPPORT_ONLY_ZERO_ASTORE */
+ break;
+#endif /* SUPPORT_CONST_ASTORE */
+
default:
PUSHCONST(TYPE_INT);
}
else
PUSHCONST(TYPE_INT);
break;
+
case ICMD_LCONST:
COUNT(count_pcmd_load);
if (len > 0) {
#if SUPPORT_LONG_MUL
case ICMD_LMUL:
iptr[0].opc = ICMD_LMULCONST;
+#if defined(__I386__)
+ method_uses_ecx = true;
+ method_uses_edx = true;
+#endif
goto icmd_lconst_tail;
#endif
#if SUPPORT_LONG_DIV
break;
}
iptr[0].opc = ICMD_LDIVPOW2;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_tail;
case ICMD_LREM:
-#if !defined(NO_DIV_OPT)
- if (iptr[0].val.l == 0x10001) {
- iptr[0].opc = ICMD_LREM0X10001;
- goto icmd_lconst_tail;
- }
-#endif
if ((iptr[0].val.l == 0x00000002) ||
(iptr[0].val.l == 0x00000004) ||
(iptr[0].val.l == 0x00000008) ||
(iptr[0].val.l == 0x80000000)) {
iptr[0].opc = ICMD_LREMPOW2;
iptr[0].val.l -= 1;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_tail;
}
PUSHCONST(TYPE_LNG);
switch (iptr[2].opc) {
case ICMD_IFEQ:
iptr[0].opc = ICMD_IF_LEQ;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
icmd_lconst_lcmp_tail:
iptr[0].op1 = iptr[2].op1;
bptr->icount -= 2;
/* iptr[1].opc = ICMD_NOP;
iptr[2].opc = ICMD_NOP; */
OP1_0(TYPE_LNG);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
break;
case ICMD_IFNE:
iptr[0].opc = ICMD_IF_LNE;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lconst_lcmp_tail;
case ICMD_IFLT:
iptr[0].opc = ICMD_IF_LLT;
PUSHCONST(TYPE_LNG);
break;
#endif
+
+#if SUPPORT_CONST_ASTORE
+ case ICMD_LASTORE:
+#if SUPPORT_ONLY_ZERO_ASTORE
+ if (iptr[0].val.l == 0) {
+#endif /* SUPPORT_ONLY_ZERO_ASTORE */
+ iptr[0].opc = ICMD_LASTORECONST;
+ iptr[1].opc = ICMD_NOP;
+ OPTT2_0(TYPE_INT, TYPE_ADR);
+ COUNT(count_pcmd_op);
+#if SUPPORT_ONLY_ZERO_ASTORE
+ } else
+ PUSHCONST(TYPE_LNG);
+#endif /* SUPPORT_ONLY_ZERO_ASTORE */
+ break;
+#endif /* SUPPORT_CONST_ASTORE */
+
default:
PUSHCONST(TYPE_LNG);
}
else
PUSHCONST(TYPE_LNG);
break;
+
case ICMD_FCONST:
COUNT(count_pcmd_load);
PUSHCONST(TYPE_FLT);
break;
+
case ICMD_DCONST:
COUNT(count_pcmd_load);
PUSHCONST(TYPE_DBL);
break;
+
case ICMD_ACONST:
COUNT(count_pcmd_load);
- PUSHCONST(TYPE_ADR);
+#if SUPPORT_CONST_ASTORE
+ if (len > 0 && iptr->val.a == 0) {
+ if (iptr[1].opc == ICMD_BUILTIN3 &&
+ iptr[1].val.fp == BUILTIN_aastore) {
+ iptr[0].opc = ICMD_AASTORECONST;
+ iptr[1].opc = ICMD_NOP;
+ OPTT2_0(TYPE_INT, TYPE_ADR);
+ COUNT(count_pcmd_op);
+
+ } else {
+ PUSHCONST(TYPE_ADR);
+ }
+
+ } else
+#endif /* SUPPORT_CONST_ASTORE */
+ PUSHCONST(TYPE_ADR);
break;
/* pop 0 push 1 load */
COUNT(count_load_instruction);
i = opcode-ICMD_ILOAD;
iptr->op1 = argren[iptr->op1];
- locals[iptr->op1][i].type = i;
+ rd->locals[iptr->op1][i].type = i;
LOAD(i, LOCALVAR, iptr->op1);
break;
/* pop 2 push 1 */
- case ICMD_IALOAD:
case ICMD_LALOAD:
+#if defined(__I386__)
+ method_uses_ecx = true;
+ method_uses_edx = true;
+#endif
+ case ICMD_IALOAD:
case ICMD_FALOAD:
case ICMD_DALOAD:
case ICMD_AALOAD:
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
OP2IAT_1(opcode-ICMD_IALOAD);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
case ICMD_BALOAD:
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
OP2IAT_1(TYPE_INT);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
/* pop 0 push 0 iinc */
REQUIRE_1;
i = opcode - ICMD_ISTORE;
- locals[iptr->op1][i].type = i;
+ rd->locals[iptr->op1][i].type = i;
#ifdef STATISTICS
count_pcmd_store++;
i = new - curstack;
/* pop 3 push 0 */
case ICMD_IASTORE:
+ case ICMD_AASTORE:
case ICMD_LASTORE:
+#if defined(__I386__)
+ method_uses_ecx = true;
+ 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_ecx = true;
+ 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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#endif
OP1_0ANY;
break;
case ICMD_PUTSTATIC:
COUNT(count_pcmd_mem);
OP1_0(iptr->op1);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
/* pop 1 push 0 branch */
case ICMD_IFNONNULL:
COUNT(count_pcmd_bra);
OP1_0(TYPE_ADR);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
COUNT(count_pcmd_bra);
#ifdef CONDITIONAL_LOADCONST
{
- tbptr = block + b_index;
+ tbptr = m->basicblocks + b_index;
if ((b_count >= 3) &&
- ((b_index + 2) == block_index[iptr[0].op1]) &&
+ ((b_index + 2) == m->basicblockindex[iptr[0].op1]) &&
(tbptr[1].pre_count == 1) &&
(iptr[1].opc == ICMD_ICONST) &&
(iptr[2].opc == ICMD_GOTO) &&
- ((b_index + 3) == block_index[iptr[2].op1]) &&
+ ((b_index + 3) == m->basicblockindex[iptr[2].op1]) &&
(tbptr[2].pre_count == 1) &&
(iptr[3].opc == ICMD_ICONST)) {
OP1_1(TYPE_INT, TYPE_INT);
}
#endif
OP1_0(TYPE_INT);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
case ICMD_GOTO:
COUNT(count_pcmd_bra);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
COUNT(count_pcmd_table);
OP1_0(TYPE_INT);
s4ptr = iptr->val.a;
- tbptr = block + block_index[*s4ptr++]; /* default */
+ tbptr = m->basicblocks + m->basicblockindex[*s4ptr++];
MARKREACHED(tbptr, copy);
i = *s4ptr++; /* low */
i = *s4ptr++ - i + 1; /* high */
tptr++;
while (--i >= 0) {
- tbptr = block + block_index[*s4ptr++];
+ tbptr = m->basicblocks + m->basicblockindex[*s4ptr++];
tptr[0] = (void *) tbptr;
tptr++;
}
SETDST;
superblockend = true;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
/* pop 1 push 0 table branch */
COUNT(count_pcmd_table);
OP1_0(TYPE_INT);
s4ptr = iptr->val.a;
- tbptr = block + block_index[*s4ptr++]; /* default */
+ tbptr = m->basicblocks + m->basicblockindex[*s4ptr++];
MARKREACHED(tbptr, copy);
i = *s4ptr++; /* count */
tptr++;
while (--i >= 0) {
- tbptr = block + block_index[s4ptr[1]];
+ tbptr = m->basicblocks + m->basicblockindex[s4ptr[1]];
tptr[0] = (void *) tbptr;
tptr++;
case ICMD_IF_ICMPLE:
COUNT(count_pcmd_bra);
OP2_0(TYPE_INT);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
case ICMD_IF_ACMPNE:
COUNT(count_pcmd_bra);
OP2_0(TYPE_ADR);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
COUNT(count_check_null);
COUNT(count_pcmd_mem);
OPTT2_0(iptr->op1,TYPE_ADR);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
case ICMD_POP2:
REQUIRE_1;
- if (! IS_2_WORD_TYPE(curstack->type)) {
+ 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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#endif
copy = curstack;
NEWSTACK(copy->prev->type, copy->prev->varkind,
copy->prev->varnum);
NEWSTACK(copy->type, copy->varkind,
copy->varnum);
SETDST;
- stackdepth+=2;
+ stackdepth += 2;
}
break;
/* 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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#endif
DUP2_X1;
}
break;
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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#endif
SWAP;
break;
#if !SUPPORT_DIVISION
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = BUILTIN_idiv;
- isleafmethod = false;
+ iptr[0].val.fp = BUILTIN_idiv;
+ m->isleafmethod = false;
goto builtin2;
#endif
#if !SUPPORT_DIVISION
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = BUILTIN_irem;
- isleafmethod = false;
+ iptr[0].val.fp = BUILTIN_irem;
+ m->isleafmethod = false;
goto builtin2;
#endif
-
- case ICMD_IADD:
- case ICMD_ISUB:
- case ICMD_IMUL:
+#if defined(__I386__)
+ method_uses_ecx = true;
+ 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:
#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_LNG;
- iptr[0].val.a = BUILTIN_ldiv;
- isleafmethod = false;
+ iptr[0].val.fp = BUILTIN_ldiv;
+ m->isleafmethod = false;
goto builtin2;
#endif
#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
iptr[0].opc = ICMD_BUILTIN2;
iptr[0].op1 = TYPE_LNG;
- iptr[0].val.a = BUILTIN_lrem;
- isleafmethod = false;
+ iptr[0].val.fp = BUILTIN_lrem;
+ m->isleafmethod = false;
goto builtin2;
#endif
+ case ICMD_LMUL:
+#if defined(__I386__)
+ method_uses_ecx = true;
+ 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)"); */
+ /* 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:
switch (iptr[1].opc) {
case ICMD_IFEQ:
iptr[0].opc = ICMD_IF_LCMPEQ;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
icmd_lcmp_if_tail:
iptr[0].op1 = iptr[1].op1;
len--;
bptr->icount--;
/* iptr[1].opc = ICMD_NOP; */
OP2_0(TYPE_LNG);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
break;
case ICMD_IFNE:
iptr[0].opc = ICMD_IF_LCMPNE;
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
goto icmd_lcmp_if_tail;
case ICMD_IFLT:
iptr[0].opc = ICMD_IF_LCMPLT;
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_ecx = true;
+ method_uses_edx = true;
+#endif
break;
- case ICMD_ARRAYLENGTH:
case ICMD_INSTANCEOF:
+#if defined(__I386__)
+ method_uses_ecx = true;
+ method_uses_edx = true;
+#endif
+ case ICMD_ARRAYLENGTH:
OP1_1(TYPE_ADR, TYPE_INT);
break;
COUNT(count_check_null);
COUNT(count_pcmd_mem);
OP1_1(TYPE_ADR, iptr->op1);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
/* pop 0 push 1 */
case ICMD_GETSTATIC:
COUNT(count_pcmd_mem);
OP0_1(iptr->op1);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
break;
case ICMD_NEW:
case ICMD_JSR:
OP0_1(TYPE_ADR);
- tbptr = block + block_index[iptr->op1];
+ tbptr = m->basicblocks + m->basicblockindex[iptr->op1];
iptr[0].target = (void *) tbptr;
- /* XXX This is a dirty hack. The typechecker
+ /* This is a dirty hack. The typechecker
* needs it because the OP1_0ANY below
* overwrites iptr->dst.
*/
- iptr->val.a = (void*) iptr->dst;
+ iptr->val.a = (void *) iptr->dst;
+
+ tbptr->type = BBTYPE_SBR;
- tbptr->type=BBTYPE_SBR;
+ /* We need to check for overflow right here because
+ * the pushed value is poped after MARKREACHED. */
+ CHECKOVERFLOW;
MARKREACHED(tbptr, copy);
OP1_0ANY;
break;
case ICMD_INVOKEINTERFACE:
case ICMD_INVOKESTATIC:
COUNT(count_pcmd_met);
+#if defined(__I386__)
+ method_uses_ecx = true;
+#endif
{
- methodinfo *m = iptr->val.a;
- if (m->flags & ACC_STATIC)
+ methodinfo *lm = iptr->val.a;
+ if (lm->flags & ACC_STATIC)
{COUNT(count_check_null);}
i = iptr->op1;
- if (i > arguments_num)
- arguments_num = i;
+ if (i > rd->arguments_num)
+ rd->arguments_num = i;
REQUIRE(i);
#if defined(__X86_64__)
{
- int iarg = 0;
- int farg = 0;
- int stackargs = 0;
+ s4 iarg = 0;
+ s4 farg = 0;
+ s4 stackargs = 0;
copy = curstack;
while (--i >= 0) {
copy = copy->prev;
}
- stackargs += (iarg < intreg_argnum) ? 0 : (iarg - intreg_argnum);
- stackargs += (farg < fltreg_argnum) ? 0 : (farg - fltreg_argnum);
+ stackargs += (iarg < rd->intreg_argnum) ?
+ 0 : (iarg - rd->intreg_argnum);
+ stackargs += (farg < rd->fltreg_argnum) ?
+ 0 : (farg - rd->fltreg_argnum);
i = iptr->op1;
copy = curstack;
if (!(copy->flags & SAVEDVAR)) {
copy->varkind = ARGVAR;
if (IS_FLT_DBL_TYPE(copy->type)) {
- if (--farg < fltreg_argnum) {
+ if (--farg < rd->fltreg_argnum) {
copy->varnum = farg;
} else {
- copy->varnum = --stackargs + intreg_argnum;
+ copy->varnum = --stackargs + rd->intreg_argnum;
}
} else {
- if (--iarg < intreg_argnum) {
+ if (--iarg < rd->intreg_argnum) {
copy->varnum = iarg;
} else {
- copy->varnum = --stackargs + intreg_argnum;
+ copy->varnum = --stackargs + rd->intreg_argnum;
}
}
} else {
}
i = iptr->op1;
POPMANY(i);
- if (m->returntype != TYPE_VOID) {
- OP0_1(m->returntype);
+ if (lm->returntype != TYPE_VOID) {
+ OP0_1(lm->returntype);
}
break;
}
+ case ICMD_INLINE_START:
+ case ICMD_INLINE_END:
+ SETDST;
+ break;
case ICMD_BUILTIN3:
- /* XXX DEBUG */ /*dolog("builtin3");*/
+ /* DEBUG */ /*dolog("builtin3");*/
REQUIRE_3;
if (! (curstack->flags & SAVEDVAR)) {
curstack->varkind = ARGVAR;
curstack->varnum = 2;
}
- if (3 > arguments_num) {
- arguments_num = 3;
+ if (3 > rd->arguments_num) {
+ rd->arguments_num = 3;
}
OP1_0ANY;
case ICMD_BUILTIN2:
builtin2:
REQUIRE_2;
- /* XXX DEBUG */ /*dolog("builtin2");*/
+ /* DEBUG */ /*dolog("builtin2");*/
if (!(curstack->flags & SAVEDVAR)) {
curstack->varkind = ARGVAR;
curstack->varnum = 1;
}
- if (2 > arguments_num) {
- arguments_num = 2;
+ if (2 > rd->arguments_num) {
+ rd->arguments_num = 2;
}
OP1_0ANY;
case ICMD_BUILTIN1:
builtin1:
REQUIRE_1;
- /* XXX DEBUG */ /*dolog("builtin1");*/
+ /* DEBUG */ /*dolog("builtin1");*/
if (!(curstack->flags & SAVEDVAR)) {
curstack->varkind = ARGVAR;
curstack->varnum = 0;
}
- if (1 > arguments_num) {
- arguments_num = 1;
+ if (1 > rd->arguments_num) {
+ rd->arguments_num = 1;
}
OP1_0ANY;
copy = curstack;
case ICMD_MULTIANEWARRAY:
i = iptr->op1;
REQUIRE(i);
- if ((i + intreg_argnum) > arguments_num)
- arguments_num = i + intreg_argnum;
+ if ((i + rd->intreg_argnum) > rd->arguments_num)
+ rd->arguments_num = i + rd->intreg_argnum;
copy = curstack;
while (--i >= 0) {
+ /* check INT type here? Currently typecheck does this. */
if (! (copy->flags & SAVEDVAR)) {
copy->varkind = ARGVAR;
- copy->varnum = i + intreg_argnum;
+ copy->varnum = i + rd->intreg_argnum;
}
copy = copy->prev;
}
break;
case ICMD_CLEAR_ARGREN:
- for (i = iptr->op1; i<maxlocals; i++)
+ for (i = iptr->op1; i < cd->maxlocals; i++)
argren[i] = i;
iptr->opc = opcode = ICMD_NOP;
SETDST;
break;
default:
- printf("ICMD %d at %d\n", iptr->opc, (int)(iptr-instr));
- panic("Missing ICMD code during stack analysis");
+ *exceptionptr =
+ new_exception_message(string_java_lang_InternalError,
+ "Unknown ICMD");
+ return NULL;
} /* switch */
- /* XXX DEBUG */ /*dolog("iptr++");*/
+
+ CHECKOVERFLOW;
iptr++;
} /* while instructions */
+
bptr->outstack = curstack;
bptr->outdepth = stackdepth;
BBEND(curstack, i);
} /* while blocks */
} while (repeat && !deadcode);
-#ifdef STATISTICS
- if (block_count > count_max_basic_blocks)
- count_max_basic_blocks = block_count;
- count_basic_blocks += block_count;
- if (instr_count > count_max_javainstr)
- count_max_javainstr = instr_count;
- count_javainstr += instr_count;
- if (stack_count > count_upper_bound_new_stack)
- count_upper_bound_new_stack = stack_count;
- if ((new - stack) > count_max_new_stack)
- count_max_new_stack = (new - stack);
-
- b_count = block_count;
- bptr = block;
- while (--b_count >= 0) {
- if (bptr->flags > BBREACHED) {
- if (bptr->indepth >= 10)
- count_block_stack[10]++;
- else
- count_block_stack[bptr->indepth]++;
- len = bptr->icount;
- if (len < 10)
- count_block_size_distribution[len]++;
- else if (len <= 12)
- count_block_size_distribution[10]++;
- else if (len <= 14)
- count_block_size_distribution[11]++;
- else if (len <= 16)
- count_block_size_distribution[12]++;
- else if (len <= 18)
- count_block_size_distribution[13]++;
- else if (len <= 20)
- count_block_size_distribution[14]++;
- else if (len <= 25)
- count_block_size_distribution[15]++;
- else if (len <= 30)
- count_block_size_distribution[16]++;
- else
- count_block_size_distribution[17]++;
+#if defined(STATISTICS)
+ if (opt_stat) {
+ if (m->basicblockcount > count_max_basic_blocks)
+ count_max_basic_blocks = m->basicblockcount;
+ count_basic_blocks += m->basicblockcount;
+ if (m->instructioncount > count_max_javainstr) count_max_javainstr = m->instructioncount;
+ count_javainstr += m->instructioncount;
+ if (m->stackcount > count_upper_bound_new_stack)
+ count_upper_bound_new_stack = m->stackcount;
+ if ((new - m->stack) > count_max_new_stack)
+ count_max_new_stack = (new - m->stack);
+
+ b_count = m->basicblockcount;
+ bptr = m->basicblocks;
+ while (--b_count >= 0) {
+ if (bptr->flags > BBREACHED) {
+ if (bptr->indepth >= 10)
+ count_block_stack[10]++;
+ else
+ count_block_stack[bptr->indepth]++;
+ len = bptr->icount;
+ if (len < 10)
+ count_block_size_distribution[len]++;
+ else if (len <= 12)
+ count_block_size_distribution[10]++;
+ else if (len <= 14)
+ count_block_size_distribution[11]++;
+ else if (len <= 16)
+ count_block_size_distribution[12]++;
+ else if (len <= 18)
+ count_block_size_distribution[13]++;
+ else if (len <= 20)
+ count_block_size_distribution[14]++;
+ else if (len <= 25)
+ count_block_size_distribution[15]++;
+ else if (len <= 30)
+ count_block_size_distribution[16]++;
+ else
+ count_block_size_distribution[17]++;
+ }
+ bptr++;
}
- bptr++;
- }
- if (loops == 1)
- count_analyse_iterations[0]++;
- else if (loops == 2)
- count_analyse_iterations[1]++;
- else if (loops == 3)
- count_analyse_iterations[2]++;
- else if (loops == 4)
- count_analyse_iterations[3]++;
- else
- count_analyse_iterations[4]++;
-
- if (block_count <= 5)
- count_method_bb_distribution[0]++;
- else if (block_count <= 10)
- count_method_bb_distribution[1]++;
- else if (block_count <= 15)
- count_method_bb_distribution[2]++;
- else if (block_count <= 20)
- count_method_bb_distribution[3]++;
- else if (block_count <= 30)
- count_method_bb_distribution[4]++;
- else if (block_count <= 40)
- count_method_bb_distribution[5]++;
- else if (block_count <= 50)
- count_method_bb_distribution[6]++;
- else if (block_count <= 75)
- count_method_bb_distribution[7]++;
- else
- count_method_bb_distribution[8]++;
+ if (loops == 1)
+ count_analyse_iterations[0]++;
+ else if (loops == 2)
+ count_analyse_iterations[1]++;
+ else if (loops == 3)
+ count_analyse_iterations[2]++;
+ else if (loops == 4)
+ count_analyse_iterations[3]++;
+ else
+ count_analyse_iterations[4]++;
+
+ if (m->basicblockcount <= 5)
+ count_method_bb_distribution[0]++;
+ else if (m->basicblockcount <= 10)
+ count_method_bb_distribution[1]++;
+ else if (m->basicblockcount <= 15)
+ count_method_bb_distribution[2]++;
+ else if (m->basicblockcount <= 20)
+ count_method_bb_distribution[3]++;
+ else if (m->basicblockcount <= 30)
+ count_method_bb_distribution[4]++;
+ else if (m->basicblockcount <= 40)
+ count_method_bb_distribution[5]++;
+ else if (m->basicblockcount <= 50)
+ count_method_bb_distribution[6]++;
+ else if (m->basicblockcount <= 75)
+ count_method_bb_distribution[7]++;
+ else
+ count_method_bb_distribution[8]++;
+ }
#endif
+
+ /* just return methodinfo* to signal everything was ok */
+
+ return m;
}
-void icmd_print_stack(stackptr s)
+/**********************************************************************/
+/* DEBUGGING HELPERS */
+/**********************************************************************/
+
+void icmd_print_stack(codegendata *cd, stackptr s)
{
int i, j;
stackptr t;
- i = maxstack;
+ i = cd->maxstack;
t = s;
while (t) {
i--;
t = t->prev;
}
- j = maxstack - i;
+ j = cd->maxstack - i;
while (--i >= 0)
printf(" ");
while (s) {
j--;
- /* XXX remove */ /* printf("(%d)",s->flags); fflush(stdout); */
+ /* DEBUG */ /*printf("(%d,%d,%d,%d)",s->varkind,s->flags,s->regoff,s->varnum); fflush(stdout);*/
if (s->flags & SAVEDVAR)
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf((regs_ok) ? " M%02d" : " M??", s->regoff);
+ printf(" M%02d", s->regoff);
else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf((regs_ok) ? " F%02d" : " F??", s->regoff);
+ printf(" F%02d", s->regoff);
else {
- if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+ printf(" %3s", regs[s->regoff]);
}
break;
case STACKVAR:
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf((regs_ok) ? " m%02d" : " m??", s->regoff);
+ printf(" m%02d", s->regoff);
else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf((regs_ok) ? " f%02d" : " f??", s->regoff);
+ printf(" f%02d", s->regoff);
else {
- if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+ printf(" %3s", regs[s->regoff]);
}
break;
case STACKVAR:
};
-void show_icmd_method()
+void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd)
{
int i, j;
- int deadcode;
- s4 *s4ptr;
- instruction *iptr;
basicblock *bptr;
- void **tptr;
- xtable *ex;
+ exceptiontable *ex;
printf("\n");
- utf_fprint(stdout, class->name);
+ utf_fprint_classname(stdout, m->class->name);
printf(".");
- utf_fprint(stdout, method->name);
- printf(" ");
- utf_fprint(stdout, method->descriptor);
- printf ("\n\nMax locals: %d\n", (int) maxlocals);
- printf ("Max stack: %d\n", (int) maxstack);
-
- printf ("Exceptions (Number: %d):\n", exceptiontablelength);
- for (ex = extable; ex != NULL; ex = ex->down) {
+ utf_fprint(stdout, m->name);
+ utf_fprint_classname(stdout, m->descriptor);
+ printf("\n\nMax locals: %d\n", (int) cd->maxlocals);
+ printf("Max stack: %d\n", (int) cd->maxstack);
+
+ printf("Line number table length: %d\n", m->linenumbercount);
+
+ printf("Exceptions (Number: %d):\n", cd->exceptiontablelength);
+ for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
printf(" L%03d ... ", ex->start->debug_nr );
printf("L%03d = ", ex->end->debug_nr);
printf("L%03d\n", ex->handler->debug_nr);
}
- printf ("Local Table:\n");
- for (i = 0; i < maxlocals; i++) {
+ printf("Local Table:\n");
+ for (i = 0; i < cd->maxlocals; i++) {
printf(" %3d: ", i);
for (j = TYPE_INT; j <= TYPE_ADR; j++)
- if (locals[i][j].type >= 0) {
+ if (rd->locals[i][j].type >= 0) {
printf(" (%s) ", jit_type[j]);
- if (locals[i][j].flags & INMEMORY)
- printf((regs_ok) ? "m%2d" : "m??", locals[i][j].regoff);
+ if (rd->locals[i][j].flags & INMEMORY)
+ printf("m%2d", rd->locals[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf((regs_ok) ? "f%02d" : "f??", locals[i][j].regoff);
+ printf("f%02d", rd->locals[i][j].regoff);
else {
- if (regs_ok) printf("%3s",regs[locals[i][j].regoff]); else printf("???");
+ printf("%3s", regs[rd->locals[i][j].regoff]);
}
}
printf("\n");
}
printf("\n");
-
- printf ("Interface Table:\n");
- for (i = 0; i < maxstack; i++) {
- if ((interfaces[i][0].type >= 0) || (interfaces[i][1].type >= 0) ||
- (interfaces[i][2].type >= 0) || (interfaces[i][3].type >= 0) ||
- (interfaces[i][4].type >= 0)) {
+#ifdef LSRA
+ if (!opt_lsra) {
+#endif
+ printf("Interface Table:\n");
+ for (i = 0; i < cd->maxstack; i++) {
+ if ((rd->interfaces[i][0].type >= 0) ||
+ (rd->interfaces[i][1].type >= 0) ||
+ (rd->interfaces[i][2].type >= 0) ||
+ (rd->interfaces[i][3].type >= 0) ||
+ (rd->interfaces[i][4].type >= 0)) {
printf(" %3d: ", i);
for (j = TYPE_INT; j <= TYPE_ADR; j++)
- if (interfaces[i][j].type >= 0) {
+ if (rd->interfaces[i][j].type >= 0) {
printf(" (%s) ", jit_type[j]);
- if (interfaces[i][j].flags & SAVEDVAR) {
- if (interfaces[i][j].flags & INMEMORY)
- printf((regs_ok) ? "M%2d" : "M??", interfaces[i][j].regoff);
+ if (rd->interfaces[i][j].flags & SAVEDVAR) {
+ if (rd->interfaces[i][j].flags & INMEMORY)
+ printf("M%2d", rd->interfaces[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf((regs_ok) ? "F%02d" : "F??", interfaces[i][j].regoff);
+ printf("F%02d", rd->interfaces[i][j].regoff);
else {
- if (regs_ok) printf("%3s",regs[interfaces[i][j].regoff]); else printf("???");
+ printf("%3s", regs[rd->interfaces[i][j].regoff]);
}
}
else {
- if (interfaces[i][j].flags & INMEMORY)
- printf((regs_ok) ? "m%2d" : "m??", interfaces[i][j].regoff);
+ if (rd->interfaces[i][j].flags & INMEMORY)
+ printf("m%2d", rd->interfaces[i][j].regoff);
else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf((regs_ok) ? "f%02d" : "f??", interfaces[i][j].regoff);
+ printf("f%02d", rd->interfaces[i][j].regoff);
else {
- if (regs_ok) printf("%3s",regs[interfaces[i][j].regoff]); else printf("???");
+ printf("%3s", regs[rd->interfaces[i][j].regoff]);
}
}
}
}
}
printf("\n");
-
+#ifdef LSRA
+ }
+#endif
if (showdisassemble) {
#if defined(__I386__) || defined(__X86_64__)
u1 *u1ptr;
- int a;
+ s4 a;
- u1ptr = method->mcode + dseglen;
- for (i = 0; i < block[0].mpc; i++, u1ptr++) {
+ u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen);
+ for (i = 0; i < m->basicblocks[0].mpc; i++, u1ptr++) {
a = disassinstr(u1ptr, i);
i += a;
u1ptr += a;
}
printf("\n");
#else
- s4ptr = (s4 *) (method->mcode + dseglen);
- for (i = 0; i < block[0].mpc; i += 4, s4ptr++) {
- disassinstr(*s4ptr, i);
+ s4 *s4ptr;
+
+ s4ptr = (s4 *) ((ptrint) m->mcode + cd->dseglen);
+ for (i = 0; i < m->basicblocks[0].mpc; i += 4, s4ptr++) {
+ disassinstr(s4ptr, i);
}
printf("\n");
#endif
}
-
- for (bptr = block; bptr != NULL; bptr = bptr->next) {
- show_icmd_block(bptr);
+ for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
+ show_icmd_block(m, cd, bptr);
}
}
-void
-show_icmd_block(basicblock *bptr)
+
+void show_icmd_block(methodinfo *m, codegendata *cd, basicblock *bptr)
{
int i, j;
int deadcode;
- s4 *s4ptr;
instruction *iptr;
- if (bptr->flags != BBDELETED) {
- deadcode = bptr->flags <= BBREACHED;
+ if (bptr->flags != BBDELETED) {
+ deadcode = bptr->flags <= BBREACHED;
+ printf("[");
+ if (deadcode)
+ for (j = cd->maxstack; j > 0; j--)
+ printf(" ? ");
+ else
+ icmd_print_stack(cd, 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 = method->maxstack; j > 0; j--)
+ if (deadcode) {
+ for (j = cd->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 = method->maxstack; j > 0; j--)
- printf(" ? ");
+ icmd_print_stack(cd, iptr->dst);
+ printf("] %4d ", i);
+ show_icmd(iptr, deadcode);
+ printf("\n");
+ }
+
+ if (showdisassemble && (!deadcode)) {
+#if defined(__I386__) || defined(__X86_64__)
+ u1 *u1ptr;
+ s4 a;
+
+ printf("\n");
+ i = bptr->mpc;
+ u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen + i);
+
+ if (bptr->next != NULL) {
+ for (; i < bptr->next->mpc; i++, u1ptr++) {
+ a = disassinstr(u1ptr, i);
+ i += a;
+ u1ptr += a;
+ }
+ printf("\n");
+
+ } else {
+ for (; u1ptr < (u1 *) ((ptrint) m->mcode + m->mcodelength); i++, u1ptr++) {
+ a = disassinstr(u1ptr, i);
+ i += a;
+ u1ptr += a;
}
- else
- icmd_print_stack(iptr->dst);
- printf("] %4d ", i);
- /* XXX remove */ /*fflush(stdout);*/
- show_icmd(iptr,deadcode);
printf("\n");
}
+#else
+ s4 *s4ptr;
- if (showdisassemble && (!deadcode)) {
-#if defined(__I386__) || defined(__X86_64__)
- u1 *u1ptr;
- int a;
+ printf("\n");
+ i = bptr->mpc;
+ s4ptr = (s4 *) ((ptrint) m->mcode + cd->dseglen + i);
+ if (bptr->next != NULL) {
+ for (; i < bptr->next->mpc; i += 4, s4ptr++) {
+ disassinstr(s4ptr, i);
+ }
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");
- } else {
- for (; u1ptr < (u1 *) (method->mcode + method->mcodelength); i++, u1ptr++) {
- a = disassinstr(u1ptr, i);
- i += a;
- u1ptr += a;
- }
- printf("\n");
+ } else {
+ for (; s4ptr < (s4 *) ((ptrint) m->mcode + m->mcodelength); i += 4, s4ptr++) {
+ disassinstr(s4ptr, i);
}
-#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
- }
}
+ }
}
-void
-show_icmd(instruction *iptr,bool deadcode)
+
+void show_icmd(instruction *iptr, bool deadcode)
{
int j;
s4 *s4ptr;
- void **tptr;
+ void **tptr = NULL;
- 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:
+ printf("%s", icmd_names[iptr->opc]);
+
+ switch (iptr->opc) {
+ case ICMD_IADDCONST:
+ case ICMD_ISUBCONST:
+ case ICMD_IMULCONST:
+ case ICMD_IDIVPOW2:
+ case ICMD_IREMPOW2:
+ 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:
+ case ICMD_IASTORECONST:
+ case ICMD_BASTORECONST:
+ case ICMD_CASTORECONST:
+ case ICMD_SASTORECONST:
+ 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:
+ case ICMD_LASTORECONST:
#if defined(__I386__)
- printf(" %lld", iptr->val.l);
+ printf(" %lld", iptr->val.l);
#else
- printf(" %ld", iptr->val.l);
+ 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;
+ break;
+
+ case ICMD_FCONST:
+ printf(" %f", iptr->val.f);
+ break;
+
+ case ICMD_DCONST:
+ printf(" %f", iptr->val.d);
+ break;
+
+ case ICMD_ACONST:
+ case ICMD_AASTORECONST:
+ 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;
- 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_ANEWARRAY:
+ if (iptr->op1) {
+ printf(" ");
+ utf_fprint(stdout,
+ ((classinfo *) iptr->val.a)->name);
+ }
+ break;
+
+ case ICMD_MULTIANEWARRAY:
+ {
+ vftbl_t *vft;
+ printf(" %d ",iptr->op1);
+ vft = (vftbl_t *)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_INLINE_START:
+ printf("\t\t\t%s.%s%s depth=%i",iptr->method->class->name->text,iptr->method->name->text,iptr->method->descriptor->text, iptr->op1);
+ break;
+ case ICMD_INLINE_END:
+ break;
+
+ case ICMD_BUILTIN3:
+ case ICMD_BUILTIN2:
+ case ICMD_BUILTIN1:
+ printf(" %s", icmd_builtin_name((functionptr) iptr->val.fp));
+ 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)
+#if defined(__I386__) || defined(__POWERPC__)
+ printf("(%lld) op1=%d", iptr->val.l, iptr->op1);
+#else
+ printf("(%ld) op1=%d", iptr->val.l, iptr->op1);
+#endif
+ else
+#if defined(__I386__) || defined(__POWERPC__)
+ printf("(%lld) L%03d", iptr->val.l, ((basicblock *) iptr->target)->debug_nr);
+#else
+ printf("(%ld) L%03d", iptr->val.l, ((basicblock *) iptr->target)->debug_nr);
+#endif
+ 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;
- 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_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;
- case ICMD_TABLESWITCH:
+ case ICMD_TABLESWITCH:
+ s4ptr = (s4*)iptr->val.a;
- s4ptr = iptr->val.a;
+ if (deadcode || !iptr->target) {
+ printf(" %d;", *s4ptr);
+ }
+ else {
+ tptr = (void **) iptr->target;
+ printf(" L%03d;", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
+ }
- if (deadcode || !iptr->target) {
- printf(" %d;", *s4ptr);
- }
- else {
- tptr = (void **) iptr->target;
- printf(" L%03d;", ((basicblock *) *tptr)->debug_nr);
- tptr++;
- }
+ 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;
- 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;
- case ICMD_LOOKUPSWITCH:
- s4ptr = iptr->val.a;
+ case ICMD_LOOKUPSWITCH:
+ s4ptr = (s4*)iptr->val.a;
- 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 */
+ 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 */
- while (--j >= 0) {
- if (deadcode || !*tptr) {
- s4ptr++; /* skip value */
- printf(" %d",*s4ptr++);
- }
- else {
- printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
- tptr++;
- }
- }
- break;
+ while (--j >= 0) {
+ if (deadcode || !*tptr) {
+ s4ptr++; /* skip value */
+ printf(" %d",*s4ptr++);
+ }
+ else {
+ printf(" L%03d", ((basicblock *) *tptr)->debug_nr);
+ tptr++;
+ }
+ }
+ break;
}
+ printf(" Line number: %d, method:",iptr->line);
+/* printf("\t\t");
+ utf_display(iptr->method->class->name);
+ printf(".");
+ utf_display(iptr->method->name); */
}
+
/*
* These are local overrides for various environment variables in Emacs.
* Please do not remove this and leave it at the end of the file, where
projects / cacao.git / blobdiff