-/* jit/stack.c - stack analysis
+/* src/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.
Authors: Andreas Krall
Changes: Edwin Steiner
+ Christian Thalinger
+ Christian Ullrich
- $Id: stack.c 803 2003-12-17 14:11:00Z edwin $
+ $Id: stack.c 3580 2005-11-05 17:57:09Z twisti $
*/
+#include <assert.h>
#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"
+#include "vm/types.h"
+
+#include "arch.h"
+#include "md-abi.h"
+
+#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/resolve.h"
+#include "vm/statistics.h"
+#include "vm/stringlocal.h"
+#include "vm/tables.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/disass.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/stack.h"
+#include "vm/jit/lsra.h"
+
+
+/* global variables ***********************************************************/
+
+#if defined(USE_THREADS)
+static java_objectheader show_icmd_lock;
+#endif
-/* from codegen.inc */
-extern int dseglen;
-/**********************************************************************/
-/* Macros used internally by analyse_stack */
-/**********************************************************************/
+/* stack_init ******************************************************************
-#ifdef STATISTICS
-#define COUNT(cnt) cnt++
-#else
-#define COUNT(cnt)
+ Initialized the stack analysis subsystem (called by jit_init).
+
+*******************************************************************************/
+
+bool stack_init(void)
+{
+#if defined(USE_THREADS)
+ /* initialize the show lock */
+
+ show_icmd_lock.monitorPtr = get_dummyLR();
#endif
-
-/* convenient abbreviations */
-#define CURKIND curstack->varkind
-#define CURTYPE curstack->type
-
-/*--------------------------------------------------*/
-/* 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;}
-
-/* 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; \
- 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).
- */
-
-#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;}
-/******************************/
-
-/* 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;\
- 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;\
-}
+ /* everything's ok */
-#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;\
- }\
+ return true;
}
-/* 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.
+/**********************************************************************/
+/* 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)
*
- * b...destination block
- * c...current stack
+ * [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.
*/
-#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; \
- } \
- } \
-}
-
-void analyse_stack()
+methodinfo *analyse_stack(methodinfo *m, codegendata *cd, registerdata *rd)
{
- int b_count;
- int b_index;
- int stackdepth;
- stackptr curstack;
- stackptr new;
- stackptr copy;
- int opcode, i, len, loops;
- int superblockend, repeat, deadcode;
- instruction *iptr;
- basicblock *bptr;
- 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 b_count;
+ int b_index;
+ int stackdepth;
+ stackptr curstack;
+ stackptr new;
+ stackptr copy;
+ int opcode, i, len, loops;
+ int superblockend, repeat, deadcode;
+ instruction *iptr;
+ basicblock *bptr;
+ basicblock *tbptr;
+ s4 *s4ptr;
+ void **tptr;
+ s4 *argren;
+
+ builtintable_entry *bte;
+ unresolved_method *um;
+ methoddesc *md;
+
+#ifdef LSRA
+ m->maxlifetimes = 0;
+#endif
- 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;
+ 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;
NEWXSTACK;
}
-#ifdef CONDITIONAL_LOADCONST
- b_count = block_count;
- bptr = block;
+#if CONDITIONAL_LOADCONST
+ 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;
}
bptr++;
}
-#endif
+#endif /* CONDITIONAL_LOADCONST */
do {
loops++;
- b_count = block_count;
- bptr = block;
+ b_count = m->basicblockcount;
+ bptr = m->basicblocks;
superblockend = true;
repeat = false;
STACKRESET;
deadcode = true;
+
while (--b_count >= 0) {
if (bptr->flags == BBDELETED) {
/* do nothing */
- }
- else if (superblockend && (bptr->flags < BBREACHED))
+
+ } else if (superblockend && (bptr->flags < BBREACHED)) {
repeat = true;
- else if (bptr->flags <= BBREACHED) {
- if (superblockend)
+
+ } else if (bptr->flags <= BBREACHED) {
+ if (superblockend) {
stackdepth = bptr->indepth;
- else if (bptr->flags < BBREACHED) {
+
+ } else if (bptr->flags < BBREACHED) {
COPYCURSTACK(copy);
bptr->instack = copy;
bptr->indepth = stackdepth;
+
+ } else if (bptr->indepth != stackdepth) {
+ /*show_icmd_method(m, cd, rd);
+ printf("Block: %d, required depth: %d, current depth: %d\n",
+ bptr->debug_nr, bptr->indepth, stackdepth);*/
+ *exceptionptr = new_verifyerror(m,"Stack depth mismatch");
+ return NULL;
}
- else if (bptr->indepth != stackdepth) {
- show_icmd_method();
- panic("Stack depth mismatch");
-
- }
+
curstack = bptr->instack;
deadcode = false;
superblockend = false;
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]); */
-#ifdef USEBUILTINTABLE
- {
-#if 0
- stdopdescriptor *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;
- 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;
- isleafmethod = false;
- switch (breplace->icmd) {
- case ICMD_BUILTIN1:
- goto builtin1;
- case ICMD_BUILTIN2:
- goto builtin2;
- }
+#if defined(USEBUILTINTABLE)
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+ bte = builtintable_get_automatic(opcode);
+
+ if (bte && bte->opcode == opcode) {
+ iptr->opc = ICMD_BUILTIN;
+ iptr->op1 = false; /* don't check for exception */
+ iptr->val.a = bte;
+ m->isleafmethod = false;
+ goto builtin;
}
+# if defined(ENABLE_INTRP)
}
-#endif
+# endif
+#endif /* defined(USEBUILTINTABLE) */
switch (opcode) {
/* pop 0 push 0 */
+ case ICMD_CHECKNULL:
+ COUNT(count_check_null);
case ICMD_NOP:
- case ICMD_CHECKASIZE:
case ICMD_IFEQ_ICONST:
case ICMD_IFNE_ICONST:
break;
case ICMD_RET:
- locals[iptr->op1][TYPE_ADR].type = TYPE_ADR;
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp)
+#endif
+ rd->locals[iptr->op1][TYPE_ADR].type = TYPE_ADR;
case ICMD_RETURN:
COUNT(count_pcmd_return);
SETDST;
iptr[0].opc = ICMD_IADDCONST;
icmd_iconst_tail:
iptr[1].opc = ICMD_NOP;
- OP1_1(TYPE_INT,TYPE_INT);
+ OP1_1(TYPE_INT, TYPE_INT);
COUNT(count_pcmd_op);
break;
case ICMD_ISUB:
iptr[0].opc = ICMD_ISUBCONST;
goto icmd_iconst_tail;
+#if SUPPORT_CONST_MUL
case ICMD_IMUL:
iptr[0].opc = ICMD_IMULCONST;
goto icmd_iconst_tail;
+#else /* SUPPORT_CONST_MUL */
+ case ICMD_IMUL:
+ if (iptr[0].val.i == 0x00000002)
+ iptr[0].val.i = 1;
+ else if (iptr[0].val.i == 0x00000004)
+ iptr[0].val.i = 2;
+ else if (iptr[0].val.i == 0x00000008)
+ iptr[0].val.i = 3;
+ else if (iptr[0].val.i == 0x00000010)
+ iptr[0].val.i = 4;
+ else if (iptr[0].val.i == 0x00000020)
+ iptr[0].val.i = 5;
+ else if (iptr[0].val.i == 0x00000040)
+ iptr[0].val.i = 6;
+ else if (iptr[0].val.i == 0x00000080)
+ iptr[0].val.i = 7;
+ else if (iptr[0].val.i == 0x00000100)
+ iptr[0].val.i = 8;
+ else if (iptr[0].val.i == 0x00000200)
+ iptr[0].val.i = 9;
+ else if (iptr[0].val.i == 0x00000400)
+ iptr[0].val.i = 10;
+ else if (iptr[0].val.i == 0x00000800)
+ iptr[0].val.i = 11;
+ else if (iptr[0].val.i == 0x00001000)
+ iptr[0].val.i = 12;
+ else if (iptr[0].val.i == 0x00002000)
+ iptr[0].val.i = 13;
+ else if (iptr[0].val.i == 0x00004000)
+ iptr[0].val.i = 14;
+ else if (iptr[0].val.i == 0x00008000)
+ iptr[0].val.i = 15;
+ else if (iptr[0].val.i == 0x00010000)
+ iptr[0].val.i = 16;
+ else if (iptr[0].val.i == 0x00020000)
+ iptr[0].val.i = 17;
+ else if (iptr[0].val.i == 0x00040000)
+ iptr[0].val.i = 18;
+ else if (iptr[0].val.i == 0x00080000)
+ iptr[0].val.i = 19;
+ else if (iptr[0].val.i == 0x00100000)
+ iptr[0].val.i = 20;
+ else if (iptr[0].val.i == 0x00200000)
+ iptr[0].val.i = 21;
+ else if (iptr[0].val.i == 0x00400000)
+ iptr[0].val.i = 22;
+ else if (iptr[0].val.i == 0x00800000)
+ iptr[0].val.i = 23;
+ else if (iptr[0].val.i == 0x01000000)
+ iptr[0].val.i = 24;
+ else if (iptr[0].val.i == 0x02000000)
+ iptr[0].val.i = 25;
+ else if (iptr[0].val.i == 0x04000000)
+ iptr[0].val.i = 26;
+ else if (iptr[0].val.i == 0x08000000)
+ iptr[0].val.i = 27;
+ else if (iptr[0].val.i == 0x10000000)
+ iptr[0].val.i = 28;
+ else if (iptr[0].val.i == 0x20000000)
+ iptr[0].val.i = 29;
+ else if (iptr[0].val.i == 0x40000000)
+ iptr[0].val.i = 30;
+ else if (iptr[0].val.i == 0x80000000)
+ iptr[0].val.i = 31;
+ else {
+ PUSHCONST(TYPE_INT);
+ break;
+ }
+ iptr[0].opc = ICMD_IMULPOW2;
+ goto icmd_iconst_tail;
+#endif /* SUPPORT_CONST_MUL */
case ICMD_IDIV:
if (iptr[0].val.i == 0x00000002)
iptr[0].val.i = 1;
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
+ /*log_text("stack.c: ICMD_ICONST/ICMD_IREM");*/
if ((iptr[0].val.i == 0x00000002) ||
(iptr[0].val.i == 0x00000004) ||
(iptr[0].val.i == 0x00000008) ||
}
PUSHCONST(TYPE_INT);
break;
+#if SUPPORT_CONST_LOGICAL
case ICMD_IAND:
iptr[0].opc = ICMD_IANDCONST;
goto icmd_iconst_tail;
case ICMD_IXOR:
iptr[0].opc = ICMD_IXORCONST;
goto icmd_iconst_tail;
+#endif /* SUPPORT_CONST_LOGICAL */
case ICMD_ISHL:
iptr[0].opc = ICMD_ISHLCONST;
goto icmd_iconst_tail;
case ICMD_LUSHR:
iptr[0].opc = ICMD_LUSHRCONST;
goto icmd_lconst_tail;
-#endif
+#endif /* SUPPORT_LONG_SHIFT */
case ICMD_IF_ICMPEQ:
iptr[0].opc = ICMD_IFEQ;
icmd_if_icmp_tail:
iptr[0].op1 = iptr[1].op1;
+ /* IF_ICMPxx is the last instruction in the */
+ /* basic block, just remove it */
+ /* iptr[1].opc = ICMD_NOP; */
bptr->icount--;
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_STORE
+ case ICMD_IASTORE:
+ case ICMD_BASTORE:
+ case ICMD_CASTORE:
+ case ICMD_SASTORE:
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ if (iptr[0].val.i == 0) {
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ 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_CONST_STORE_ZERO_ONLY
+ } else
+ PUSHCONST(TYPE_INT);
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# if defined(ENABLE_INTRP)
+ } else
+ PUSHCONST(TYPE_INT);
+# endif
+ break;
+
+ case ICMD_PUTSTATIC:
+ case ICMD_PUTFIELD:
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ if (iptr[0].val.i == 0) {
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ switch (iptr[1].opc) {
+ case ICMD_PUTSTATIC:
+ iptr[0].opc = ICMD_PUTSTATICCONST;
+ SETDST;
+ break;
+ case ICMD_PUTFIELD:
+ iptr[0].opc = ICMD_PUTFIELDCONST;
+ OP1_0(TYPE_ADR);
+ break;
+ }
+
+ iptr[1].opc = ICMD_NOP;
+ iptr[0].op1 = TYPE_INT;
+ COUNT(count_pcmd_op);
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ } else
+ PUSHCONST(TYPE_INT);
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ break;
+#endif /* SUPPORT_CONST_STORE */
default:
PUSHCONST(TYPE_INT);
}
else
PUSHCONST(TYPE_INT);
break;
+
case ICMD_LCONST:
COUNT(count_pcmd_load);
if (len > 0) {
case ICMD_LSUB:
iptr[0].opc = ICMD_LSUBCONST;
goto icmd_lconst_tail;
-#endif
-#if SUPPORT_LONG_MUL
+#endif /* SUPPORT_LONG_ADD */
+#if SUPPORT_LONG_MUL && SUPPORT_CONST_MUL
case ICMD_LMUL:
iptr[0].opc = ICMD_LMULCONST;
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
goto icmd_lconst_tail;
-#endif
+#else /* SUPPORT_LONG_MUL && SUPPORT_CONST_MUL */
+# if SUPPORT_LONG_SHIFT
+ case ICMD_LMUL:
+ if (iptr[0].val.l == 0x00000002)
+ iptr[0].val.i = 1;
+ else if (iptr[0].val.l == 0x00000004)
+ iptr[0].val.i = 2;
+ else if (iptr[0].val.l == 0x00000008)
+ iptr[0].val.i = 3;
+ else if (iptr[0].val.l == 0x00000010)
+ iptr[0].val.i = 4;
+ else if (iptr[0].val.l == 0x00000020)
+ iptr[0].val.i = 5;
+ else if (iptr[0].val.l == 0x00000040)
+ iptr[0].val.i = 6;
+ else if (iptr[0].val.l == 0x00000080)
+ iptr[0].val.i = 7;
+ else if (iptr[0].val.l == 0x00000100)
+ iptr[0].val.i = 8;
+ else if (iptr[0].val.l == 0x00000200)
+ iptr[0].val.i = 9;
+ else if (iptr[0].val.l == 0x00000400)
+ iptr[0].val.i = 10;
+ else if (iptr[0].val.l == 0x00000800)
+ iptr[0].val.i = 11;
+ else if (iptr[0].val.l == 0x00001000)
+ iptr[0].val.i = 12;
+ else if (iptr[0].val.l == 0x00002000)
+ iptr[0].val.i = 13;
+ else if (iptr[0].val.l == 0x00004000)
+ iptr[0].val.i = 14;
+ else if (iptr[0].val.l == 0x00008000)
+ iptr[0].val.i = 15;
+ else if (iptr[0].val.l == 0x00010000)
+ iptr[0].val.i = 16;
+ else if (iptr[0].val.l == 0x00020000)
+ iptr[0].val.i = 17;
+ else if (iptr[0].val.l == 0x00040000)
+ iptr[0].val.i = 18;
+ else if (iptr[0].val.l == 0x00080000)
+ iptr[0].val.i = 19;
+ else if (iptr[0].val.l == 0x00100000)
+ iptr[0].val.i = 20;
+ else if (iptr[0].val.l == 0x00200000)
+ iptr[0].val.i = 21;
+ else if (iptr[0].val.l == 0x00400000)
+ iptr[0].val.i = 22;
+ else if (iptr[0].val.l == 0x00800000)
+ iptr[0].val.i = 23;
+ else if (iptr[0].val.l == 0x01000000)
+ iptr[0].val.i = 24;
+ else if (iptr[0].val.l == 0x02000000)
+ iptr[0].val.i = 25;
+ else if (iptr[0].val.l == 0x04000000)
+ iptr[0].val.i = 26;
+ else if (iptr[0].val.l == 0x08000000)
+ iptr[0].val.i = 27;
+ else if (iptr[0].val.l == 0x10000000)
+ iptr[0].val.i = 28;
+ else if (iptr[0].val.l == 0x20000000)
+ iptr[0].val.i = 29;
+ else if (iptr[0].val.l == 0x40000000)
+ iptr[0].val.i = 30;
+ else if (iptr[0].val.l == 0x80000000)
+ iptr[0].val.i = 31;
+ else {
+ PUSHCONST(TYPE_LNG);
+ break;
+ }
+ iptr[0].opc = ICMD_LMULPOW2;
+ goto icmd_lconst_tail;
+# endif /* SUPPORT_LONG_SHIFT */
+#endif /* SUPPORT_LONG_MUL && SUPPORT_CONST_MUL */
#if SUPPORT_LONG_DIV
case ICMD_LDIV:
if (iptr[0].val.l == 0x00000002)
iptr[0].opc = ICMD_LDIVPOW2;
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) ||
}
PUSHCONST(TYPE_LNG);
break;
-#endif
-#if SUPPORT_LONG_LOG
+#endif /* SUPPORT_LONG_DIV */
+#if SUPPORT_LONG_LOGICAL && SUPPORT_CONST_LOGICAL
+
case ICMD_LAND:
iptr[0].opc = ICMD_LANDCONST;
goto icmd_lconst_tail;
case ICMD_LXOR:
iptr[0].opc = ICMD_LXORCONST;
goto icmd_lconst_tail;
-#endif
+#endif /* SUPPORT_LONG_LOGICAL && SUPPORT_CONST_LOGICAL */
#if !defined(NOLONG_CONDITIONAL)
case ICMD_LCMP:
if ((len > 1) && (iptr[2].val.i == 0)) {
/* 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;
else
PUSHCONST(TYPE_LNG);
break;
-#endif
+#endif /* !defined(NOLONG_CONDITIONAL) */
+
+#if SUPPORT_CONST_STORE
+ case ICMD_LASTORE:
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ if (iptr[0].val.l == 0) {
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ iptr[0].opc = ICMD_LASTORECONST;
+ iptr[1].opc = ICMD_NOP;
+ OPTT2_0(TYPE_INT, TYPE_ADR);
+ COUNT(count_pcmd_op);
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ } else
+ PUSHCONST(TYPE_LNG);
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# if defined(ENABLE_INTRP)
+ } else
+ PUSHCONST(TYPE_LNG);
+# endif
+ break;
+
+ case ICMD_PUTSTATIC:
+ case ICMD_PUTFIELD:
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ if (iptr[0].val.l == 0) {
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ switch (iptr[1].opc) {
+ case ICMD_PUTSTATIC:
+ iptr[0].opc = ICMD_PUTSTATICCONST;
+ SETDST;
+ break;
+ case ICMD_PUTFIELD:
+ iptr[0].opc = ICMD_PUTFIELDCONST;
+ OP1_0(TYPE_ADR);
+ break;
+ }
+
+ iptr[1].opc = ICMD_NOP;
+ iptr[0].op1 = TYPE_LNG;
+ COUNT(count_pcmd_op);
+#if SUPPORT_CONST_STORE_ZERO_ONLY
+ } else
+ PUSHCONST(TYPE_LNG);
+#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+ break;
+#endif /* SUPPORT_CONST_STORE */
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_STORE
+ if (len > 0 && iptr->val.a == 0) {
+ switch (iptr[1].opc) {
+#if !defined(__POWERPC__) && !defined(__X86_64__) && !defined(__I386__) && !defined(__ALPHA__) && !defined(__MIPS__)
+ case ICMD_BUILTIN:
+ if (iptr[1].val.fp != BUILTIN_aastore) {
+ PUSHCONST(TYPE_ADR);
+ break;
+ }
+ /* fall through */
+#endif
+ case ICMD_PUTSTATIC:
+ case ICMD_PUTFIELD:
+ switch (iptr[1].opc) {
+ case ICMD_BUILTIN:
+ iptr[0].opc = ICMD_AASTORECONST;
+ OPTT2_0(TYPE_INT, TYPE_ADR);
+ break;
+ case ICMD_PUTSTATIC:
+ iptr[0].opc = ICMD_PUTSTATICCONST;
+ iptr[0].op1 = TYPE_ADR;
+ SETDST;
+ break;
+ case ICMD_PUTFIELD:
+ iptr[0].opc = ICMD_PUTFIELDCONST;
+ iptr[0].op1 = TYPE_ADR;
+ OP1_0(TYPE_ADR);
+ break;
+ }
+
+ iptr[1].opc = ICMD_NOP;
+ COUNT(count_pcmd_op);
+ break;
+
+ default:
+ PUSHCONST(TYPE_ADR);
+ }
+ } else
+#endif /* SUPPORT_CONST_STORE */
+ PUSHCONST(TYPE_ADR);
break;
/* pop 0 push 1 load */
case ICMD_DLOAD:
case ICMD_ALOAD:
COUNT(count_load_instruction);
- i = opcode-ICMD_ILOAD;
+ i = opcode - ICMD_ILOAD;
iptr->op1 = argren[iptr->op1];
- locals[iptr->op1][i].type = i;
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp)
+#endif
+ rd->locals[iptr->op1][i].type = i;
LOAD(i, LOCALVAR, iptr->op1);
break;
/* pop 2 push 1 */
case ICMD_LALOAD:
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
case ICMD_IALOAD:
case ICMD_FALOAD:
case ICMD_DALOAD:
COUNT(count_check_null);
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
- OP2IAT_1(opcode-ICMD_IALOAD);
+ OP2IAT_1(opcode - ICMD_IALOAD);
break;
case ICMD_BALOAD:
/* pop 0 push 0 iinc */
case ICMD_IINC:
-#ifdef STATISTICS
- i = stackdepth;
- if (i >= 10)
- count_store_depth[10]++;
- else
- count_store_depth[i]++;
+#if defined(STATISTICS)
+ if (opt_stat) {
+ i = stackdepth;
+ if (i >= 10)
+ count_store_depth[10]++;
+ else
+ count_store_depth[i]++;
+ }
#endif
copy = curstack;
i = stackdepth - 1;
REQUIRE_1;
i = opcode - ICMD_ISTORE;
- locals[iptr->op1][i].type = i;
-#ifdef STATISTICS
- count_pcmd_store++;
- i = new - curstack;
- if (i >= 20)
- count_store_length[20]++;
- else
- count_store_length[i]++;
- i = stackdepth - 1;
- if (i >= 10)
- count_store_depth[10]++;
- else
- count_store_depth[i]++;
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp)
+#endif
+ rd->locals[iptr->op1][i].type = i;
+#if defined(STATISTICS)
+ if (opt_stat) {
+ count_pcmd_store++;
+ i = new - curstack;
+ if (i >= 20)
+ count_store_length[20]++;
+ else
+ count_store_length[i]++;
+ i = stackdepth - 1;
+ if (i >= 10)
+ count_store_depth[10]++;
+ else
+ count_store_depth[i]++;
+ }
#endif
copy = curstack->prev;
i = stackdepth - 2;
curstack->varkind = LOCALVAR;
curstack->varnum = iptr->op1;
};
- STORE(opcode-ICMD_ISTORE);
+ STORE(opcode - ICMD_ISTORE);
break;
/* pop 3 push 0 */
- case ICMD_IASTORE:
case ICMD_AASTORE:
+ COUNT(count_check_null);
+ COUNT(count_check_bound);
+ COUNT(count_pcmd_mem);
+
+ bte = (builtintable_entry *) iptr->val.a;
+ md = bte->md;
+ i = iptr->op1;
+
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
+
+ /* make all stack variables saved */
+
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
+
+ OP3TIA_0(TYPE_ADR);
+ break;
+
+ case ICMD_IASTORE:
case ICMD_LASTORE:
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
case ICMD_FASTORE:
case ICMD_DASTORE:
COUNT(count_check_null);
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
- OP3TIA_0(opcode-ICMD_IASTORE);
+ OP3TIA_0(opcode - ICMD_IASTORE);
break;
case ICMD_BASTORE:
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)) {
+ *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack");
+ return NULL;
+ }
+ }
+#endif
OP1_0ANY;
break;
case ICMD_FRETURN:
case ICMD_DRETURN:
case ICMD_ARETURN:
+ md_return_alloc(m, rd, opcode - ICMD_IRETURN, curstack);
COUNT(count_pcmd_return);
- OP1_0(opcode-ICMD_IRETURN);
+ OP1_0(opcode - ICMD_IRETURN);
superblockend = true;
break;
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;
case ICMD_IFGT:
case ICMD_IFLE:
COUNT(count_pcmd_bra);
-#ifdef CONDITIONAL_LOADCONST
- {
- tbptr = block + b_index;
+#if CONDITIONAL_LOADCONST
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+ tbptr = m->basicblocks + b_index;
if ((b_count >= 3) &&
- ((b_index + 2) == block_index[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]) &&
- (tbptr[2].pre_count == 1) &&
- (iptr[3].opc == ICMD_ICONST)) {
+ ((b_index + 2) == m->basicblockindex[iptr[0].op1]) &&
+ (tbptr[1].pre_count == 1) &&
+ (tbptr[1].iinstr[0].opc == ICMD_ICONST) &&
+ (tbptr[1].iinstr[1].opc == ICMD_GOTO) &&
+ ((b_index + 3) == m->basicblockindex[tbptr[1].iinstr[1].op1]) &&
+ (tbptr[2].pre_count == 1) &&
+ (tbptr[2].iinstr[0].opc == ICMD_ICONST) &&
+ (tbptr[2].icount==1)) {
+ /*printf("tbptr[2].icount=%d\n",tbptr[2].icount);*/
OP1_1(TYPE_INT, TYPE_INT);
switch (iptr[0].opc) {
case ICMD_IFEQ:
iptr[0].opc = ICMD_IFGT_ICONST;
break;
}
+#if 1
iptr[0].val.i = iptr[1].val.i;
iptr[1].opc = ICMD_ELSE_ICONST;
iptr[1].val.i = iptr[3].val.i;
iptr[2].opc = ICMD_NOP;
iptr[3].opc = ICMD_NOP;
+#else
+ /* HACK: save compare value in iptr[1].op1 */
+ iptr[1].op1 = iptr[0].val.i;
+ iptr[0].val.i = tbptr[1].iinstr[0].val.i;
+ iptr[1].opc = ICMD_ELSE_ICONST;
+ iptr[1].val.i = tbptr[2].iinstr[0].val.i;
+ tbptr[1].iinstr[0].opc = ICMD_NOP;
+ tbptr[1].iinstr[1].opc = ICMD_NOP;
+ tbptr[2].iinstr[0].opc = ICMD_NOP;
+#endif
tbptr[1].flags = BBDELETED;
tbptr[2].flags = BBDELETED;
tbptr[1].icount = 0;
b_index += 2;
break;
}
+# if defined(ENABLE_INTRP)
}
-#endif
+# endif
+
+#endif /* CONDITIONAL_LOADCONST */
+
OP1_0(TYPE_INT);
- tbptr = block + block_index[iptr->op1];
+ iptr->val.i = 0;
+ 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++;
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++;
superblockend = true;
break;
- case ICMD_NULLCHECKPOP:
case ICMD_MONITORENTER:
COUNT(count_check_null);
case ICMD_MONITOREXIT:
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;
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 {
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;
}
}
/* 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;
/* pop 2 push 1 */
-
- case ICMD_IDIV:
-#if !SUPPORT_DIVISION
- iptr[0].opc = ICMD_BUILTIN2;
- iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = BUILTIN_idiv;
- isleafmethod = false;
- goto builtin2;
-#endif
+ case ICMD_IDIV:
case ICMD_IREM:
#if !SUPPORT_DIVISION
- iptr[0].opc = ICMD_BUILTIN2;
- iptr[0].op1 = TYPE_INT;
- iptr[0].val.a = BUILTIN_irem;
- isleafmethod = false;
- goto builtin2;
-#endif
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
+ bte = (builtintable_entry *) iptr->val.a;
+ md = bte->md;
+ i = iptr->op1;
+
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
+
+ /* make all stack variables saved */
+
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
+
+ /* fall through */
+#endif /* !SUPPORT_DIVISION */
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:
break;
case ICMD_LDIV:
-#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;
- goto builtin2;
-#endif
-
case ICMD_LREM:
#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;
- goto builtin2;
-#endif
+ bte = (builtintable_entry *) iptr->val.a;
+ md = bte->md;
+ i = iptr->op1;
+
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
+
+ /* make all stack variables saved */
+
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
+
+ /* fall through */
+#endif /* !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV) */
case ICMD_LMUL:
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
case ICMD_LADD:
case ICMD_LSUB:
- case ICMD_LOR:
+#if SUPPORT_LONG_LOGICAL
case ICMD_LAND:
+ case ICMD_LOR:
case ICMD_LXOR:
- /* XXX DEBUG */ /*dolog("OP2_1(TYPE_LNG)"); */
+#endif /* SUPPORT_LONG_LOGICAL */
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:
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;
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_ARRAYCHECKCAST:
+ bte = (builtintable_entry *) iptr->val.a;
+ md = bte->md;
+
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
+
+ /* make all stack variables saved */
+
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
+
+ OP1_1(TYPE_ADR, TYPE_ADR);
break;
case ICMD_INSTANCEOF:
-#if defined(__I386__)
- method_uses_edx = true;
-#endif
case ICMD_ARRAYLENGTH:
OP1_1(TYPE_ADR, TYPE_INT);
break;
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;
- /* pop many push any */
-
- case ICMD_INVOKEVIRTUAL:
+ /* pop many push any */
+
+ case ICMD_BUILTIN:
+#if defined(USEBUILTINTABLE)
+ builtin:
+#endif
+ bte = (builtintable_entry *) iptr->val.a;
+ md = bte->md;
+ goto _callhandling;
+
+ case ICMD_INVOKESTATIC:
case ICMD_INVOKESPECIAL:
+ case ICMD_INVOKEVIRTUAL:
case ICMD_INVOKEINTERFACE:
- case ICMD_INVOKESTATIC:
COUNT(count_pcmd_met);
- {
- methodinfo *m = iptr->val.a;
- if (m->flags & ACC_STATIC)
- {COUNT(count_check_null);}
- i = iptr->op1;
- if (i > arguments_num)
- arguments_num = i;
- REQUIRE(i);
-#if defined(__X86_64__)
- {
- int iarg = 0;
- int farg = 0;
- int stackargs = 0;
-
- copy = curstack;
- while (--i >= 0) {
- (IS_FLT_DBL_TYPE(copy->type)) ? farg++ : iarg++;
- copy = copy->prev;
- }
+ um = iptr->target;
+ md = um->methodref->parseddesc.md;
+/* if (lm->flags & ACC_STATIC) */
+/* {COUNT(count_check_null);} */
- stackargs += (iarg < intreg_argnum) ? 0 : (iarg - intreg_argnum);
- stackargs += (farg < fltreg_argnum) ? 0 : (farg - fltreg_argnum);
-
- i = iptr->op1;
- copy = curstack;
- while (--i >= 0) {
- if (!(copy->flags & SAVEDVAR)) {
- copy->varkind = ARGVAR;
- if (IS_FLT_DBL_TYPE(copy->type)) {
- if (--farg < fltreg_argnum) {
- copy->varnum = farg;
- } else {
- copy->varnum = --stackargs + intreg_argnum;
- }
- } else {
- if (--iarg < intreg_argnum) {
- copy->varnum = iarg;
- } else {
- copy->varnum = --stackargs + intreg_argnum;
- }
- }
+ _callhandling:
+ i = md->paramcount;
+
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
+ if (md->argfltreguse > rd->argfltreguse)
+ rd->argfltreguse = md->argfltreguse;
+
+ REQUIRE(i);
+
+ copy = curstack;
+ for (i-- ; i >= 0; i--) {
+#if defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
+ /* If we pass float arguments in integer argument registers, we
+ * are not allowed to precolor them here. Floats have to be moved
+ * to this regs explicitly in codegen().
+ * Only arguments that are passed by stack anyway can be precolored
+ * (michi 2005/07/24) */
+ if (!(copy->flags & SAVEDVAR) &&
+ (!IS_FLT_DBL_TYPE(copy->type) || md->params[i].inmemory)) {
+#else
+ if (!(copy->flags & SAVEDVAR)) {
+#endif
+ copy->varkind = ARGVAR;
+ copy->varnum = i;
+
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+#endif
+ if (md->params[i].inmemory) {
+ copy->flags = INMEMORY;
+ copy->regoff = md->params[i].regoff;
} else {
- (IS_FLT_DBL_TYPE(copy->type)) ? --farg : --iarg;
- }
- copy = copy->prev;
- }
- }
+ copy->flags = 0;
+ if (IS_FLT_DBL_TYPE(copy->type))
+#if defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
+ assert(0); /* XXX is this assert ok? */
#else
- copy = curstack;
- while (--i >= 0) {
- if (! (copy->flags & SAVEDVAR)) {
- copy->varkind = ARGVAR;
- copy->varnum = i;
+ copy->regoff =
+ rd->argfltregs[md->params[i].regoff];
+#endif
+ else {
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(copy->type))
+ copy->regoff = PACK_REGS(
+ rd->argintregs[GET_LOW_REG(md->params[i].regoff)],
+ rd->argintregs[GET_HIGH_REG(md->params[i].regoff)]);
+ else
+#endif
+ copy->regoff =
+ rd->argintregs[md->params[i].regoff];
+ }
+ }
+#if defined(ENABLE_INTRP)
}
- copy = copy->prev;
- }
#endif
- while (copy) {
- copy->flags |= SAVEDVAR;
- copy = copy->prev;
}
- i = iptr->op1;
- POPMANY(i);
- if (m->returntype != TYPE_VOID) {
- OP0_1(m->returntype);
- }
- break;
+ copy = copy->prev;
}
- case ICMD_BUILTIN3:
- /* XXX DEBUG */ /*dolog("builtin3");*/
- REQUIRE_3;
- if (! (curstack->flags & SAVEDVAR)) {
- curstack->varkind = ARGVAR;
- curstack->varnum = 2;
- }
- if (3 > arguments_num) {
- arguments_num = 3;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
}
- OP1_0ANY;
- case ICMD_BUILTIN2:
- builtin2:
- REQUIRE_2;
- /* XXX DEBUG */ /*dolog("builtin2");*/
- if (!(curstack->flags & SAVEDVAR)) {
- curstack->varkind = ARGVAR;
- curstack->varnum = 1;
- }
- if (2 > arguments_num) {
- arguments_num = 2;
- }
- OP1_0ANY;
+ i = md->paramcount;
+ POPMANY(i);
+ if (md->returntype.type != TYPE_VOID)
+ OP0_1(md->returntype.type);
+ break;
- case ICMD_BUILTIN1:
- 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_INLINE_START:
+ case ICMD_INLINE_END:
+ SETDST;
+ break;
case ICMD_MULTIANEWARRAY:
+ if (rd->argintreguse < 3)
+ rd->argintreguse = 3;
+
i = iptr->op1;
+
REQUIRE(i);
- if ((i + intreg_argnum) > arguments_num)
- arguments_num = i + intreg_argnum;
+#if defined(SPECIALMEMUSE)
+# if defined(__DARWIN__)
+ if (rd->memuse < (i + INT_ARG_CNT + LA_WORD_SIZE))
+ rd->memuse = i + LA_WORD_SIZE + INT_ARG_CNT;
+# else
+ if (rd->memuse < (i + LA_WORD_SIZE + 3))
+ rd->memuse = i + LA_WORD_SIZE + 3;
+# endif
+#else
+# if defined(__I386__)
+ if (rd->memuse < i + 3)
+ rd->memuse = i + 3; /* n integer args spilled on stack */
+# elif defined(__MIPS__) && SIZEOF_VOID_P == 4
+ if (rd->memuse < i + 2)
+ rd->memuse = i + 2; /* 4*4 bytes callee save space */
+# else
+ if (rd->memuse < i)
+ rd->memuse = i; /* n integer args spilled on stack */
+# endif /* defined(__I386__) */
+#endif
copy = curstack;
while (--i >= 0) {
- if (! (copy->flags & SAVEDVAR)) {
+ /* check INT type here? Currently typecheck does this. */
+ if (!(copy->flags & SAVEDVAR)) {
copy->varkind = ARGVAR;
- copy->varnum = i + intreg_argnum;
+ copy->varnum = i + INT_ARG_CNT;
+ copy->flags |= INMEMORY;
+#if defined(SPECIALMEMUSE)
+# if defined(__DARWIN__)
+ copy->regoff = i + LA_WORD_SIZE + INT_ARG_CNT;
+# else
+ copy->regoff = i + LA_WORD_SIZE + 3;
+# endif
+#else
+# if defined(__I386__)
+ copy->regoff = i + 3;
+# elif defined(__MIPS__) && SIZEOF_VOID_P == 4
+ copy->regoff = i + 2;
+# else
+ copy->regoff = i;
+# endif /* defined(__I386__) */
+#endif /* defined(SPECIALMEMUSE) */
}
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_internalerror("Unknown ICMD");
+ return NULL;
} /* switch */
CHECKOVERFLOW;
-
- /* XXX DEBUG */ /*dolog("iptr++");*/
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); */
if (s->flags & SAVEDVAR)
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf((regs_ok) ? " M%02d" : " M??", s->regoff);
- else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf((regs_ok) ? " F%02d" : " F??", s->regoff);
+ printf(" M%02d", s->regoff);
+#ifdef HAS_ADDRESS_REGISTER_FILE
+ else if (s->type == TYPE_ADR)
+ printf(" R%02d", s->regoff);
+#endif
+ else if (IS_FLT_DBL_TYPE(s->type))
+ printf(" F%02d", s->regoff);
else {
- if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(s->type))
+ printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
+ regs[GET_HIGH_REG(s->regoff)]);
+ else
+#endif
+#if defined(ENABLE_INTRP)
+ printf(" %3d", s->regoff);
+#else
+ printf(" %3s", regs[s->regoff]);
+#endif
}
break;
case STACKVAR:
printf(" L%02d", s->varnum);
break;
case ARGVAR:
- printf(" A%02d", s->varnum);
+ if (s->varnum == -1) {
+ /* Return Value */
+ /* varkind ARGVAR "misused for this special case */
+ printf(" V0");
+ } else /* "normal" Argvar */
+ printf(" A%02d", s->varnum);
+#ifdef INVOKE_NEW_DEBUG
+ if (s->flags & INMEMORY)
+ printf("(M%i)", s->regoff);
+ else
+ printf("(R%i)", s->regoff);
+#endif
break;
default:
printf(" !%02d", j);
switch (s->varkind) {
case TEMPVAR:
if (s->flags & INMEMORY)
- printf((regs_ok) ? " m%02d" : " m??", s->regoff);
- else if ((s->type == TYPE_FLT) || (s->type == TYPE_DBL))
- printf((regs_ok) ? " f%02d" : " f??", s->regoff);
+ printf(" m%02d", s->regoff);
+#ifdef HAS_ADDRESS_REGISTER_FILE
+ else if (s->type == TYPE_ADR)
+ printf(" r%02d", s->regoff);
+#endif
+ else if (IS_FLT_DBL_TYPE(s->type))
+ printf(" f%02d", s->regoff);
else {
- if (regs_ok) printf(" %3s",regs[s->regoff]); else printf(" ???");
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(s->type))
+ printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
+ regs[GET_HIGH_REG(s->regoff)]);
+ else
+#endif
+#if defined(ENABLE_INTRP)
+ printf(" %3d", s->regoff);
+#else
+ printf(" %3s", regs[s->regoff]);
+#endif
}
break;
case STACKVAR:
printf(" l%02d", s->varnum);
break;
case ARGVAR:
+ if (s->varnum == -1) {
+ /* Return Value */
+ /* varkind ARGVAR "misused for this special case */
+ printf(" v0");
+ } else /* "normal" Argvar */
printf(" a%02d", s->varnum);
+#ifdef INVOKE_NEW_DEBUG
+ if (s->flags & INMEMORY)
+ printf("(M%i)", s->regoff);
+ else
+ printf("(R%i)", s->regoff);
+#endif
break;
default:
printf(" ?%02d", j);
#endif
-char *icmd_builtin_name(functionptr bptr)
-{
- builtin_descriptor *bdesc = builtin_desc;
- while ((bdesc->opcode != 0) && (bdesc->builtin != bptr))
- bdesc++;
- return (bdesc->opcode) ? bdesc->name : "<NOT IN TABLE>";
-}
-
-
static char *jit_type[] = {
"int",
"lng",
};
-void show_icmd_method()
+/* show_icmd_method ************************************************************
+
+ XXX
+
+*******************************************************************************/
+
+void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd)
{
- int i, j;
- s4 *s4ptr; /* used */
- basicblock *bptr;
- xtable *ex;
+ basicblock *bptr;
+ exceptiontable *ex;
+ s4 i, j;
+ u1 *u1ptr;
+
+#if defined(USE_THREADS)
+ /* We need to enter a lock here, since the binutils disassembler is not */
+ /* reentrant-able and we could not read functions printed at the same */
+ /* time. */
+
+ builtin_monitorenter(&show_icmd_lock);
+#endif
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(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("L%03d", ex->handler->debug_nr);
+ printf(" (catchtype: ");
+ if (ex->catchtype.any)
+ if (IS_CLASSREF(ex->catchtype))
+ utf_display_classname(ex->catchtype.ref->name);
+ else
+ utf_display_classname(ex->catchtype.cls->name);
+ else
+ printf("ANY");
+ printf(")\n");
}
- 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) {
- printf(" (%s) ", jit_type[j]);
- if (locals[i][j].flags & INMEMORY)
- printf((regs_ok) ? "m%2d" : "m??", locals[i][j].regoff);
- else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf((regs_ok) ? "f%02d" : "f??", locals[i][j].regoff);
- else {
- if (regs_ok) printf("%3s",regs[locals[i][j].regoff]); else printf("???");
+ for (j = TYPE_INT; j <= TYPE_ADR; j++) {
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+#endif
+ if (rd->locals[i][j].type >= 0) {
+ printf(" (%s) ", jit_type[j]);
+ if (rd->locals[i][j].flags & INMEMORY)
+ printf("m%2d", rd->locals[i][j].regoff);
+#ifdef HAS_ADDRESS_REGISTER_FILE
+ else if (j == TYPE_ADR)
+ printf("r%02d", rd->locals[i][j].regoff);
+#endif
+ else if ((j == TYPE_FLT) || (j == TYPE_DBL))
+ printf("f%02d", rd->locals[i][j].regoff);
+ else {
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(j))
+ printf(" %3s/%3s",
+ regs[GET_LOW_REG(rd->locals[i][j].regoff)],
+ regs[GET_HIGH_REG(rd->locals[i][j].regoff)]);
+ else
+#endif
+ printf("%3s", regs[rd->locals[i][j].regoff]);
+ }
}
+#if defined(ENABLE_INTRP)
}
+#endif
+ }
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
+#if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+#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);
+#ifdef HAS_ADDRESS_REGISTER_FILE
+ else if (j == TYPE_ADR)
+ printf("R%02d", rd->interfaces[i][j].regoff);
+#endif
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("???");
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(j))
+ printf(" %3s/%3s",
+ regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
+ regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
+ else
+#endif
+ 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);
+#ifdef HAS_ADDRESS_REGISTER_FILE
+ else if (j == TYPE_ADR)
+ printf("r%02d", rd->interfaces[i][j].regoff);
+#endif
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("???");
+#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
+ if (IS_2_WORD_TYPE(j))
+ printf(" %3s/%3s",
+ regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
+ regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
+ else
+#endif
+ printf("%3s",regs[rd->interfaces[i][j].regoff]);
}
}
}
}
printf("\n");
- if (showdisassemble) {
-#if defined(__I386__) || defined(__X86_64__)
- u1 *u1ptr;
- int a;
-
- u1ptr = method->mcode + dseglen;
- for (i = 0; i < block[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);
+#if defined(ENABLE_INTRP)
}
- printf("\n");
#endif
+#ifdef LSRA
+ }
+#endif
+
+ /* show code before first basic block */
+
+ if (opt_showdisassemble) {
+ u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen);
+
+ for (; u1ptr < (u1 *) ((ptrint) m->mcode + cd->dseglen + m->basicblocks[0].mpc);)
+ u1ptr = disassinstr(u1ptr);
+
+ printf("\n");
}
-
- for (bptr = block; bptr != NULL; bptr = bptr->next) {
- show_icmd_block(bptr);
+ /* show code of all basic blocks */
+
+ for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
+ show_icmd_block(m, cd, bptr);
+ }
+
+ /* show stubs code */
+
+ if (opt_showdisassemble && opt_showexceptionstubs) {
+ printf("\nException stubs code:\n");
+ printf("Length: %d\n\n", (s4) (m->mcodelength -
+ ((ptrint) cd->dseglen +
+ m->basicblocks[m->basicblockcount].mpc)));
+
+ u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen +
+ m->basicblocks[m->basicblockcount].mpc);
+
+ for (; (ptrint) u1ptr < ((ptrint) m->mcode + m->mcodelength);)
+ u1ptr = disassinstr(u1ptr);
+
+ printf("\n");
}
+
+#if defined(USE_THREADS)
+ builtin_monitorexit(&show_icmd_lock);
+#endif
}
-void show_icmd_block(basicblock *bptr)
+void show_icmd_block(methodinfo *m, codegendata *cd, basicblock *bptr)
{
- int i, j;
- int deadcode;
- s4 *s4ptr; /* used */
+ s4 i, j;
+ bool deadcode;
instruction *iptr;
+ u1 *u1ptr;
if (bptr->flags != BBDELETED) {
deadcode = bptr->flags <= BBREACHED;
printf("[");
if (deadcode)
- for (j = method->maxstack; j > 0; j--)
+ for (j = cd->maxstack; j > 0; j--)
printf(" ? ");
else
- icmd_print_stack(bptr->instack);
+ 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++) {
+ for (i = 0; i < bptr->icount; i++, iptr++) {
printf("[");
if (deadcode) {
- for (j = method->maxstack; j > 0; j--)
+ for (j = cd->maxstack; j > 0; j--)
printf(" ? ");
}
else
- icmd_print_stack(iptr->dst);
- printf("] %4d ", i);
- /* XXX remove */ /*fflush(stdout);*/
- show_icmd(iptr,deadcode);
- printf("\n");
- }
+ icmd_print_stack(cd, iptr->dst);
+ printf("] %5d (line: %5d) ", i, iptr->line);
- if (showdisassemble && (!deadcode)) {
-#if defined(__I386__) || defined(__X86_64__)
- u1 *u1ptr;
- int a;
+#ifdef LSRA_EDX
+ if (icmd_uses_tmp[iptr->opc][0])
+ printf(" ---");
+ else
+ printf(" EAX");
+ if (icmd_uses_tmp[iptr->opc][1])
+ printf(" ---");
+ else
+ printf(" ECX");
+ if (icmd_uses_tmp[iptr->opc][2])
+ printf(" --- ");
+ else
+ printf(" EDX ");
+#endif
+ show_icmd(iptr, deadcode);
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
+ if (opt_showdisassemble && (!deadcode)) {
printf("\n");
- i = bptr->mpc;
- s4ptr = (s4 *) (method->mcode + dseglen + i);
+ u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen + bptr->mpc);
if (bptr->next != NULL) {
- for (; i < bptr->next->mpc; i += 4, s4ptr++) {
- disassinstr(*s4ptr, i);
- }
- printf("\n");
+ for (; u1ptr < (u1 *) ((ptrint) m->mcode + cd->dseglen + bptr->next->mpc);)
+ u1ptr = disassinstr(u1ptr);
} else {
- for (; s4ptr < (s4 *) (method->mcode + method->mcodelength); i += 4, s4ptr++) {
- disassinstr(*s4ptr, i);
- }
- printf("\n");
+ for (; u1ptr < (u1 *) ((ptrint) m->mcode + m->mcodelength);)
+ u1ptr = disassinstr(u1ptr);
}
-#endif
+ printf("\n");
}
}
}
-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) {
+ switch (iptr->opc) {
case ICMD_IADDCONST:
case ICMD_ISUBCONST:
case ICMD_IMULCONST:
+ case ICMD_IMULPOW2:
case ICMD_IDIVPOW2:
case ICMD_IREMPOW2:
- case ICMD_IREM0X10001:
case ICMD_IANDCONST:
case ICMD_IORCONST:
case ICMD_IXORCONST:
case ICMD_LUSHRCONST:
case ICMD_ICONST:
case ICMD_ELSE_ICONST:
+ case ICMD_IASTORECONST:
+ case ICMD_BASTORECONST:
+ case ICMD_CASTORECONST:
+ case ICMD_SASTORECONST:
+ printf(" %d (0x%08x)", iptr->val.i, iptr->val.i);
+ break;
+
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);
+ printf("(%d) %d", iptr[1].op1, iptr->val.i);
break;
case ICMD_LADDCONST:
case ICMD_LSUBCONST:
case ICMD_LMULCONST:
+ case ICMD_LMULPOW2:
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);
+ case ICMD_LASTORECONST:
+#if SIZEOF_VOID_P == 4
+ printf(" %lld (0x%016llx)", iptr->val.l, iptr->val.l);
#else
- printf(" %ld", iptr->val.l);
+ printf(" %ld (0x%016lx)", iptr->val.l, iptr->val.l);
#endif
break;
case ICMD_FCONST:
- printf(" %f", iptr->val.f);
+ printf(" %f (0x%08x)", iptr->val.f, iptr->val.i);
break;
case ICMD_DCONST:
- printf(" %f", iptr->val.d);
+#if SIZEOF_VOID_P == 4
+ printf(" %g (0x%016llx)", iptr->val.d, iptr->val.l);
+#else
+ printf(" %g (0x%016lx)", iptr->val.d, iptr->val.l);
+#endif
break;
case ICMD_ACONST:
+ case ICMD_AASTORECONST:
printf(" %p", iptr->val.a);
+
+ if (iptr->val.a) {
+ /* check if this is a constant string */
+
+ if (iptr->op1 == 0) {
+ printf(", String = \"");
+ utf_display(javastring_toutf(iptr->val.a, false));
+ printf("\"");
+
+ } else {
+ /* it is a BUILTIN argument */
+
+ printf(", Class = \"");
+
+ /* is it resolved? */
+
+ if (iptr[1].target == NULL) {
+ builtintable_entry *bte = iptr[1].val.a;
+
+ /* NEW gets a classinfo* as argument */
+
+ if (bte->fp == BUILTIN_new) {
+ utf_display(((classinfo *) iptr->val.a)->name);
+
+ } else {
+ utf_display(((vftbl_t *) iptr->val.a)->class->name);
+ }
+
+ } else {
+ /* iptr->target is a constant_classref */
+
+ utf_display(((constant_classref *) iptr->val.a)->name);
+ }
+ printf("\"");
+ }
+ }
break;
case ICMD_GETFIELD:
case ICMD_PUTFIELD:
- printf(" %d,", ((fieldinfo *) iptr->val.a)->offset);
- case ICMD_PUTSTATIC:
+ if (iptr->val.a)
+ printf(" %d, ", ((fieldinfo *) iptr->val.a)->offset);
+ else
+ printf(" (NOT RESOLVED), ");
+ utf_display_classname(((unresolved_field *) iptr->target)->fieldref->classref->name);
+ printf(".");
+ utf_display(((unresolved_field *) iptr->target)->fieldref->name);
+ printf(" (type ");
+ utf_display(((unresolved_field *) iptr->target)->fieldref->descriptor);
+ printf(")");
+ break;
+
+ case ICMD_PUTSTATIC:
case ICMD_GETSTATIC:
- printf(" ");
- utf_fprint(stdout,
- ((fieldinfo *) iptr->val.a)->class->name);
+ if (iptr->val.a) {
+ if (!((fieldinfo *) iptr->val.a)->class->initialized)
+ printf(" (NOT INITIALIZED) ");
+ else
+ printf(" ");
+ } else
+ printf(" (NOT RESOLVED) ");
+ utf_display_classname(((unresolved_field *) iptr->target)->fieldref->classref->name);
printf(".");
- utf_fprint(stdout,
- ((fieldinfo *) iptr->val.a)->name);
+ utf_display(((unresolved_field *) iptr->target)->fieldref->name);
printf(" (type ");
- utf_fprint(stdout,
- ((fieldinfo *) iptr->val.a)->descriptor);
+ utf_display(((unresolved_field *) iptr->target)->fieldref->descriptor);
printf(")");
break;
+ case ICMD_PUTSTATICCONST:
+ case ICMD_PUTFIELDCONST:
+ switch (iptr[1].op1) {
+ case TYPE_INT:
+ printf(" %d (0x%08x),", iptr->val.i, iptr->val.i);
+ break;
+ case TYPE_LNG:
+#if SIZEOF_VOID_P == 4
+ printf(" %lld (0x%016llx),", iptr->val.l, iptr->val.l);
+#else
+ printf(" %ld (0x%016lx),", iptr->val.l, iptr->val.l);
+#endif
+ break;
+ case TYPE_ADR:
+ printf(" %p,", iptr->val.a);
+ break;
+ case TYPE_FLT:
+ printf(" %g (0x%08x),", iptr->val.f, iptr->val.i);
+ break;
+ case TYPE_DBL:
+#if SIZEOF_VOID_P == 4
+ printf(" %g (0x%016llx),", iptr->val.d, iptr->val.l);
+#else
+ printf(" %g (0x%016lx),", iptr->val.d, iptr->val.l);
+#endif
+ break;
+ }
+ if (iptr->opc == ICMD_PUTFIELDCONST) {
+ if (iptr[1].val.a)
+ printf(" %d,", ((fieldinfo *) iptr[1].val.a)->offset);
+ else
+ printf(" (NOT RESOLVED),");
+ }
+ printf(" ");
+ utf_display_classname(((unresolved_field *) iptr[1].target)->fieldref->classref->name);
+ printf(".");
+ utf_display(((unresolved_field *) iptr[1].target)->fieldref->name);
+ printf(" (type ");
+ utf_display(((unresolved_field *) iptr[1].target)->fieldref->descriptor);
+ printf(")");
+ break;
+
case ICMD_IINC:
printf(" %d + %d", iptr->op1, iptr->val.i);
break;
case ICMD_NEW:
printf(" ");
- utf_fprint(stdout,
- ((classinfo *) iptr->val.a)->name);
+ utf_display_classname(((classinfo *) iptr->val.a)->name);
break;
case ICMD_NEWARRAY:
case ICMD_ANEWARRAY:
if (iptr->op1) {
printf(" ");
- utf_fprint(stdout,
- ((classinfo *) iptr->val.a)->name);
+ utf_display_classname(((classinfo *) iptr->val.a)->name);
}
break;
case ICMD_MULTIANEWARRAY:
- {
- vftbl *vft;
+ if (iptr->target) {
+ printf(" (NOT RESOLVED) %d ",iptr->op1);
+ utf_display(((constant_classref *) iptr->val.a)->name);
+ } else {
printf(" %d ",iptr->op1);
- vft = (vftbl *)iptr->val.a;
- if (vft)
- utf_fprint(stdout,vft->class->name);
- else
- printf("<null>");
+ utf_display_classname(((vftbl_t *) iptr->val.a)->class->name);
}
break;
case ICMD_CHECKCAST:
case ICMD_INSTANCEOF:
- if (iptr->op1) {
+ {
classinfo *c = iptr->val.a;
+ if (c) {
+ if (c->flags & ACC_INTERFACE)
+ printf(" (INTERFACE) ");
+ else
+ printf(" (CLASS,%3d) ", c->vftbl->diffval);
+ } else {
+ printf(" (NOT RESOLVED) ");
+ }
+ utf_display_classname(((constant_classref *) iptr->target)->name);
+ }
+ break;
+
+ case ICMD_ARRAYCHECKCAST:
+ if (iptr->op1) {
+ classinfo *c = iptr->target;
if (c->flags & ACC_INTERFACE)
printf(" (INTERFACE) ");
else
printf(" (CLASS,%3d) ", c->vftbl->diffval);
- utf_fprint(stdout, c->name);
+ utf_display_classname(c->name);
+ } else {
+ printf(" (NOT RESOLVED) ");
+ utf_display_classname(((constant_classref *) iptr->target)->name);
}
break;
- case ICMD_BUILTIN3:
- case ICMD_BUILTIN2:
- case ICMD_BUILTIN1:
- printf(" %s", icmd_builtin_name((functionptr) iptr->val.a));
+ case ICMD_INLINE_START:
+ printf(" ");
+ utf_display_classname(iptr->method->class->name);
+ printf(".");
+ utf_display_classname(iptr->method->name);
+ utf_display_classname(iptr->method->descriptor);
+ printf(", depth=%i", iptr->op1);
+ break;
+ case ICMD_INLINE_END:
+ break;
+
+ case ICMD_BUILTIN:
+ printf(" %s", ((builtintable_entry *) iptr->val.a)->name);
break;
case ICMD_INVOKEVIRTUAL:
case ICMD_INVOKESPECIAL:
case ICMD_INVOKESTATIC:
case ICMD_INVOKEINTERFACE:
- printf(" ");
- utf_fprint(stdout,
- ((methodinfo *) iptr->val.a)->class->name);
+ if (!iptr->val.a)
+ printf(" (NOT RESOLVED) ");
+ else
+ printf(" ");
+ utf_display_classname(((unresolved_method *) iptr->target)->methodref->classref->name);
printf(".");
- utf_fprint(stdout,
- ((methodinfo *) iptr->val.a)->name);
+ utf_display(((unresolved_method *) iptr->target)->methodref->name);
+ utf_display(((unresolved_method *) iptr->target)->methodref->descriptor);
break;
case ICMD_IFEQ:
case ICMD_IFGT:
case ICMD_IFLE:
if (deadcode || !iptr->target)
- printf("(%d) op1=%d", iptr->val.i, iptr->op1);
+ printf(" %d (0x%08x) op1=%d", iptr->val.i, iptr->val.i, iptr->op1);
else
- printf("(%d) L%03d", iptr->val.i, ((basicblock *) iptr->target)->debug_nr);
+ printf(" %d (0x%08x) L%03d", iptr->val.i, iptr->val.i, ((basicblock *) iptr->target)->debug_nr);
break;
case ICMD_IF_LEQ:
case ICMD_IF_LGT:
case ICMD_IF_LLE:
if (deadcode || !iptr->target)
+#if SIZEOF_VOID_P == 4
printf("(%lld) op1=%d", iptr->val.l, iptr->op1);
+#else
+ printf("(%ld) op1=%d", iptr->val.l, iptr->op1);
+#endif
else
+#if SIZEOF_VOID_P == 4
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:
}
}
break;
+
+ case ICMD_ARETURN:
+ if (iptr->val.a) {
+ printf(" (NOT RESOLVED), Class = \"");
+ utf_display(((unresolved_class *) iptr->val.a)->classref->name);
+ printf("\"");
+ }
}
}
projects / cacao.git / blobdiff