X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fstack.c;h=231d4ff1b96e967153f6d88b6ede760dfdf3905f;hb=e40eb14db560593ecc53c4b522f130ca1044d6fb;hp=a1e0fcb77e9500abfe2689e0de3d519a50db19c1;hpb=a28515c5607ff06487ad59a0b5209e33d3fb9051;p=cacao.git diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c index a1e0fcb77..231d4ff1b 100644 --- a/src/vm/jit/stack.c +++ b/src/vm/jit/stack.c @@ -1,9 +1,9 @@ -/* 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. @@ -27,255 +27,33 @@ Authors: Andreas Krall Changes: Edwin Steiner + Christian Thalinger - $Id: stack.c 971 2004-03-24 22:44:29Z edwin $ + $Id: stack.c 2333 2005-04-22 13:26:36Z twisti $ */ #include #include -#include "stack.h" -#include "global.h" -#include "main.h" -#include "jit.h" -#include "builtin.h" + #include "disass.h" -#include "reg.h" -#include "tables.h" #include "types.h" -#include "toolbox/loging.h" -#include "toolbox/memory.h" - - -/* from codegen.inc */ -extern int dseglen; - -/**********************************************************************/ -/* Macros used internally by analyse_stack */ -/**********************************************************************/ - -#ifdef STATISTICS -#define COUNT(cnt) cnt++ -#else -#define COUNT(cnt) -#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 */ -/* We allow ACONST instructions inserted as arguments to builtin - * functions to exceed the maximum stack depth. Maybe we should check - * against maximum stack depth only at block boundaries? - */ -#define CHECKOVERFLOW \ - do { \ - if (stackdepth > maxstack) { \ - if (iptr[0].opc != ICMD_ACONST \ - || iptr[0].op1 == 0) \ - {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). - * - * These macros do *not* check for stack overflows! - */ - -#define PUSHCONST(s){NEWSTACKn(s,stackdepth);SETDST;stackdepth++;} -#define LOAD(s,v,n) {NEWSTACK(s,v,n);SETDST;stackdepth++;} -#define STORE(s) {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;} - -/*--------------------------------------------------*/ -/* MACROS FOR HANDLING BASIC BLOCKS */ -/*--------------------------------------------------*/ - -/* COPYCURSTACK makes a copy of the current operand stack (curstack) - * and returns it in the variable copy. - * - * This macro is used to propagate the operand stack from one basic - * block to another. The destination block receives the copy as its - * input stack. - */ -#define COPYCURSTACK(copy) {\ - int d;\ - stackptr s;\ - 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;\ -} - -/* BBEND is called at the end of each basic block (after the last - * instruction of the block has been processed). - */ - -#define BBEND(s,i){\ - i=stackdepth-1;\ - 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;\ - }\ -} - - -/* MARKREACHED marks the destination block as reached. If this - * block has been reached before we check if stack depth and types - * match. Otherwise the destination block receives a copy of the - * current stack as its input stack. - * - * b...destination block - * c...current stack - */ -#define MARKREACHED(b,c) { \ - if(b->flags<0) \ - {COPYCURSTACK(c);b->flags=0;b->instack=c;b->indepth=stackdepth;} \ - else {stackptr s=curstack;stackptr t=b->instack; \ - if(b->indepth!=stackdepth) \ - {show_icmd_method();panic("Stack depth mismatch");} \ - while(s){if (s->type!=t->type) \ - TYPEPANIC \ - s=s->prev;t=t->prev; \ - } \ - } \ -} +#include "codegen.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/tables.h" +#include "vm/jit/codegen.inc.h" +#include "vm/jit/jit.h" +#include "vm/jit/reg.h" +#include "vm/jit/stack.h" +#include "vm/jit/lsra.h" /**********************************************************************/ @@ -303,7 +81,7 @@ extern int dseglen; * types are not discerned. */ -void analyse_stack() +methodinfo *analyse_stack(methodinfo *m, codegendata *cd, registerdata *rd) { int b_count; int b_index; @@ -318,32 +96,28 @@ void analyse_stack() 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; + + s4 call_argcount; + s4 call_returntype; + +#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; + 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; @@ -353,9 +127,9 @@ void analyse_stack() 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; @@ -391,25 +165,25 @@ void analyse_stack() 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; @@ -420,13 +194,13 @@ void analyse_stack() } 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; @@ -446,7 +220,8 @@ void analyse_stack() 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"); } @@ -456,14 +231,15 @@ void analyse_stack() 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; + /* XXX TWISTI: why is this set to NULL here? */ + /* iptr->target = NULL; */ - /* DEBUG */ /* 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 defined(USEBUILTINTABLE) { #if 0 stdopdescriptor *breplace; @@ -472,8 +248,8 @@ void analyse_stack() 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; @@ -488,8 +264,8 @@ void analyse_stack() 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; @@ -498,7 +274,7 @@ void analyse_stack() } } } -#endif +#endif /* defined(USEBUILTINTABLE) */ switch (opcode) { @@ -506,6 +282,7 @@ void analyse_stack() case ICMD_NOP: case ICMD_CHECKASIZE: + case ICMD_CHECKEXCEPTION: case ICMD_IFEQ_ICONST: case ICMD_IFNE_ICONST: @@ -518,7 +295,7 @@ void analyse_stack() 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; @@ -535,15 +312,87 @@ void analyse_stack() 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; @@ -614,12 +463,6 @@ void analyse_stack() 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) || @@ -657,6 +500,7 @@ void analyse_stack() } PUSHCONST(TYPE_INT); break; +#if SUPPORT_CONST_LOGICAL case ICMD_IAND: iptr[0].opc = ICMD_IANDCONST; goto icmd_iconst_tail; @@ -666,6 +510,7 @@ void analyse_stack() 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; @@ -685,21 +530,25 @@ void analyse_stack() 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; bptr->icount--; len--; +#if 1 /* 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; MARKREACHED(tbptr, copy); COUNT(count_pcmd_bra); +#else + goto icmd_if; +#endif break; case ICMD_IF_ICMPLT: iptr[0].opc = ICMD_IFLT; @@ -716,6 +565,64 @@ void analyse_stack() 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 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 */ + 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); } @@ -723,6 +630,7 @@ void analyse_stack() else PUSHCONST(TYPE_INT); break; + case ICMD_LCONST: COUNT(count_pcmd_load); if (len > 0) { @@ -738,15 +646,84 @@ void analyse_stack() 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) @@ -818,12 +795,6 @@ void analyse_stack() 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) || @@ -861,8 +832,9 @@ void analyse_stack() } 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; @@ -872,7 +844,7 @@ void analyse_stack() 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)) { @@ -886,7 +858,7 @@ void analyse_stack() /* 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; @@ -916,7 +888,48 @@ void analyse_stack() else PUSHCONST(TYPE_LNG); break; -#endif +#endif /* !defined(NOLONG_CONDITIONAL) */ + +#if SUPPORT_CONST_STORE + case ICMD_LASTORE: +#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 */ + 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); } @@ -924,17 +937,57 @@ void analyse_stack() 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) { + case ICMD_BUILTIN3: + if (iptr[1].val.fp != BUILTIN_aastore) { + PUSHCONST(TYPE_ADR); + break; + } + /* fall through */ + case ICMD_PUTSTATIC: + case ICMD_PUTFIELD: + switch (iptr[1].opc) { + case ICMD_BUILTIN3: + 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 */ @@ -947,16 +1000,13 @@ void analyse_stack() 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_LALOAD: -#if defined(__I386__) - method_uses_edx = true; -#endif case ICMD_IALOAD: case ICMD_FALOAD: case ICMD_DALOAD: @@ -979,12 +1029,14 @@ void analyse_stack() /* 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; @@ -1011,19 +1063,21 @@ void analyse_stack() 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]++; + 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; @@ -1048,9 +1102,6 @@ void analyse_stack() case ICMD_IASTORE: case ICMD_AASTORE: case ICMD_LASTORE: -#if defined(__I386__) - method_uses_edx = true; -#endif case ICMD_FASTORE: case ICMD_DASTORE: COUNT(count_check_null); @@ -1066,9 +1117,6 @@ void analyse_stack() 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 */ @@ -1077,8 +1125,10 @@ void analyse_stack() #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { REQUIRE_1; - if (IS_2_WORD_TYPE(curstack->type)) - panic("Illegal instruction: POP on category 2 type"); + 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; @@ -1113,7 +1163,7 @@ void analyse_stack() 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; @@ -1126,66 +1176,79 @@ void analyse_stack() case ICMD_IFGE: case ICMD_IFGT: case ICMD_IFLE: +#if 0 + icmd_if: +#endif COUNT(count_pcmd_bra); -#ifdef CONDITIONAL_LOADCONST - { - tbptr = block + 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)) { - OP1_1(TYPE_INT, TYPE_INT); - switch (iptr[0].opc) { - case ICMD_IFEQ: - iptr[0].opc = ICMD_IFNE_ICONST; - break; - case ICMD_IFNE: - iptr[0].opc = ICMD_IFEQ_ICONST; - break; - case ICMD_IFLT: - iptr[0].opc = ICMD_IFGE_ICONST; - break; - case ICMD_IFGE: - iptr[0].opc = ICMD_IFLT_ICONST; - break; - case ICMD_IFGT: - iptr[0].opc = ICMD_IFLE_ICONST; - break; - case ICMD_IFLE: - iptr[0].opc = ICMD_IFGT_ICONST; - break; - } - 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; - tbptr[1].flags = BBDELETED; - tbptr[2].flags = BBDELETED; - tbptr[1].icount = 0; - tbptr[2].icount = 0; - if (tbptr[3].pre_count == 2) { - len += tbptr[3].icount + 3; - bptr->icount += tbptr[3].icount + 3; - tbptr[3].flags = BBDELETED; - tbptr[3].icount = 0; - b_index++; - } - else { - bptr->icount++; - len ++; - } - b_index += 2; +#if CONDITIONAL_LOADCONST + tbptr = m->basicblocks + b_index; + if ((b_count >= 3) && + ((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)) { + OP1_1(TYPE_INT, TYPE_INT); + switch (iptr[0].opc) { + case ICMD_IFEQ: + iptr[0].opc = ICMD_IFNE_ICONST; + break; + case ICMD_IFNE: + iptr[0].opc = ICMD_IFEQ_ICONST; + break; + case ICMD_IFLT: + iptr[0].opc = ICMD_IFGE_ICONST; + break; + case ICMD_IFGE: + iptr[0].opc = ICMD_IFLT_ICONST; + break; + case ICMD_IFGT: + iptr[0].opc = ICMD_IFLE_ICONST; + break; + case ICMD_IFLE: + 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; + tbptr[2].icount = 0; + if (tbptr[3].pre_count == 2) { + len += tbptr[3].icount + 3; + bptr->icount += tbptr[3].icount + 3; + tbptr[3].flags = BBDELETED; + tbptr[3].icount = 0; + b_index++; + } + else { + bptr->icount++; + len ++; + } + b_index += 2; + break; + } +#endif /* CONDITIONAL_LOADCONST */ + OP1_0(TYPE_INT); - tbptr = block + block_index[iptr->op1]; + tbptr = m->basicblocks + m->basicblockindex[iptr->op1]; iptr[0].target = (void *) tbptr; @@ -1196,7 +1259,7 @@ void analyse_stack() 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; @@ -1211,7 +1274,7 @@ void analyse_stack() 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 */ @@ -1223,7 +1286,7 @@ void analyse_stack() tptr++; while (--i >= 0) { - tbptr = block + block_index[*s4ptr++]; + tbptr = m->basicblocks + m->basicblockindex[*s4ptr++]; tptr[0] = (void *) tbptr; tptr++; @@ -1240,7 +1303,7 @@ void analyse_stack() 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 */ @@ -1251,7 +1314,7 @@ void analyse_stack() tptr++; while (--i >= 0) { - tbptr = block + block_index[s4ptr[1]]; + tbptr = m->basicblocks + m->basicblockindex[s4ptr[1]]; tptr[0] = (void *) tbptr; tptr++; @@ -1280,7 +1343,7 @@ void analyse_stack() 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; @@ -1291,7 +1354,7 @@ void analyse_stack() 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; @@ -1308,13 +1371,15 @@ void analyse_stack() 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)) - panic("Illegal instruction: POP2 on cat2, cat1 types"); + 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 */ @@ -1330,8 +1395,10 @@ void analyse_stack() #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { REQUIRE_1; - if (IS_2_WORD_TYPE(curstack->type)) - panic("Illegal instruction: DUP on category 2 type"); + 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); @@ -1350,8 +1417,10 @@ void analyse_stack() /* ..., ????, cat1 */ #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { - if (IS_2_WORD_TYPE(curstack->prev->type)) - panic("Illegal instruction: DUP2 on cat2, cat1 types"); + 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; @@ -1360,7 +1429,7 @@ void analyse_stack() NEWSTACK(copy->type, copy->varkind, copy->varnum); SETDST; - stackdepth+=2; + stackdepth += 2; } break; @@ -1371,8 +1440,10 @@ void analyse_stack() if (opt_verify) { REQUIRE_2; if (IS_2_WORD_TYPE(curstack->type) || - IS_2_WORD_TYPE(curstack->prev->type)) - panic("Illegal instruction: DUP_X1 on cat 2 type"); + 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; @@ -1384,8 +1455,10 @@ void analyse_stack() /* ..., ????, cat2 */ #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { - if (IS_2_WORD_TYPE(curstack->prev->type)) - panic("Illegal instruction: DUP2_X1 on cat2, cat2 types"); + 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; @@ -1397,8 +1470,10 @@ void analyse_stack() if (opt_verify) { REQUIRE_3; if (IS_2_WORD_TYPE(curstack->prev->type) - || IS_2_WORD_TYPE(curstack->prev->prev->type)) - panic("Illegal instruction: DUP2_X1 on invalid types"); + || 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; @@ -1413,8 +1488,10 @@ void analyse_stack() /* ..., cat2, ???? */ #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { - if (IS_2_WORD_TYPE(curstack->type)) - panic("Illegal instruction: DUP_X2 on cat2, cat2 types"); + 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; @@ -1426,8 +1503,10 @@ void analyse_stack() if (opt_verify) { REQUIRE_3; if (IS_2_WORD_TYPE(curstack->type) - || IS_2_WORD_TYPE(curstack->prev->prev->type)) - panic("Illegal instruction: DUP_X2 on invalid types"); + || 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; @@ -1448,8 +1527,10 @@ void analyse_stack() #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { REQUIRE_3; - if (IS_2_WORD_TYPE(curstack->prev->prev->type)) - panic("Illegal instruction: DUP2_X2 on invalid types"); + 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; @@ -1463,8 +1544,10 @@ void analyse_stack() /* ..., cat2, ????, cat1 */ #ifdef TYPECHECK_STACK_COMPCAT if (opt_verify) { - if (IS_2_WORD_TYPE(curstack->prev->type)) - panic("Illegal instruction: DUP2_X2 on invalid types"); + 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; @@ -1476,8 +1559,10 @@ void analyse_stack() if (opt_verify) { REQUIRE_4; if (IS_2_WORD_TYPE(curstack->prev->type) - || IS_2_WORD_TYPE(curstack->prev->prev->prev->type)) - panic("Illegal instruction: DUP2_X2 on invalid types"); + || 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; @@ -1492,8 +1577,10 @@ void analyse_stack() if (opt_verify) { REQUIRE_2; if (IS_2_WORD_TYPE(curstack->type) - || IS_2_WORD_TYPE(curstack->prev->type)) - panic("Illegal instruction: SWAP on category 2 type"); + || IS_2_WORD_TYPE(curstack->prev->type)) { + *exceptionptr = new_verifyerror(m, "Attempt to split long or double on the stack"); + return NULL; + } } #endif SWAP; @@ -1505,8 +1592,8 @@ void analyse_stack() #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 @@ -1514,20 +1601,14 @@ void analyse_stack() #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 -#if defined(__I386__) - method_uses_edx = true; -#endif case ICMD_ISHL: case ICMD_ISHR: case ICMD_IUSHR: -#if defined(__I386__) - method_uses_ecx = true; -#endif case ICMD_IADD: case ICMD_ISUB: case ICMD_IMUL: @@ -1542,8 +1623,8 @@ void analyse_stack() #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 @@ -1551,21 +1632,19 @@ void analyse_stack() #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_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: - /* DEBUG */ /*dolog("OP2_1(TYPE_LNG)"); */ +#endif /* SUPPORT_LONG_LOGICAL */ COUNT(count_pcmd_op); OP2_1(TYPE_LNG); break; @@ -1575,10 +1654,6 @@ void analyse_stack() 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: @@ -1612,7 +1687,7 @@ void analyse_stack() 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; @@ -1678,9 +1753,6 @@ void analyse_stack() 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); @@ -1709,9 +1781,6 @@ void analyse_stack() 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); @@ -1724,9 +1793,6 @@ void analyse_stack() 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); @@ -1735,15 +1801,9 @@ void analyse_stack() case ICMD_CHECKCAST: OP1_1(TYPE_ADR, TYPE_ADR); -#if defined(__I386__) - method_uses_edx = true; -#endif break; case ICMD_INSTANCEOF: -#if defined(__I386__) - method_uses_edx = true; -#endif case ICMD_ARRAYLENGTH: OP1_1(TYPE_ADR, TYPE_INT); break; @@ -1772,7 +1832,7 @@ void analyse_stack() 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; @@ -1792,138 +1852,101 @@ void analyse_stack() break; /* pop many push any */ - + case ICMD_BUILTIN3: + call_argcount = 3; + call_returntype = iptr->op1; + goto _callhandling; + case ICMD_BUILTIN2: +#if defined(USEBUILTINTABLE) || !SUPPORT_DIVISION + /* Just prevent a compiler warning... */ + builtin2: +#endif + call_argcount = 2; + call_returntype = iptr->op1; + goto _callhandling; + case ICMD_BUILTIN1: +#if defined(USEBUILTINTABLE) + /* Just prevent a compiler warning... */ + builtin1: +#endif + call_argcount = 1; + call_returntype = iptr->op1; + goto _callhandling; + case ICMD_INVOKEVIRTUAL: case ICMD_INVOKESPECIAL: case ICMD_INVOKEINTERFACE: case ICMD_INVOKESTATIC: COUNT(count_pcmd_met); { - methodinfo *m = iptr->val.a; - if (m->flags & ACC_STATIC) +#if defined(__X86_64__) || defined(__I386__) + unresolved_method *um = iptr->target; +/* if (lm->flags & ACC_STATIC) */ +/* {COUNT(count_check_null);} */ + call_argcount = iptr->op1; + call_returntype = um->methodref->parseddesc.md->returntype.type; +#else + methodinfo *lm = iptr->val.a; + if (lm->flags & ACC_STATIC) {COUNT(count_check_null);} - i = iptr->op1; - if (i > arguments_num) - arguments_num = i; + call_argcount = iptr->op1; + call_returntype = lm->returntype; +#endif + + _callhandling: + i = call_argcount; + + if (i > rd->arguments_num) + rd->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; - } - 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; - } - } - } else { - (IS_FLT_DBL_TYPE(copy->type)) ? --farg : --iarg; - } - copy = copy->prev; - } - } -#else - copy = curstack; - while (--i >= 0) { - if (! (copy->flags & SAVEDVAR)) { - copy->varkind = ARGVAR; - copy->varnum = i; - } - copy = copy->prev; - } -#endif + /* Macro in codegen.h */ + SET_ARG_STACKSLOTS; + while (copy) { copy->flags |= SAVEDVAR; copy = copy->prev; } - i = iptr->op1; + i = call_argcount; + POPMANY(i); - if (m->returntype != TYPE_VOID) { - OP0_1(m->returntype); - } + if (call_returntype != TYPE_VOID) + OP0_1(call_returntype); break; } - case ICMD_BUILTIN3: - /* DEBUG */ /*dolog("builtin3");*/ - REQUIRE_3; - if (! (curstack->flags & SAVEDVAR)) { - curstack->varkind = ARGVAR; - curstack->varnum = 2; - } - if (3 > arguments_num) { - arguments_num = 3; - } - OP1_0ANY; - - case ICMD_BUILTIN2: - builtin2: - REQUIRE_2; - /* DEBUG */ /*dolog("builtin2");*/ - if (!(curstack->flags & SAVEDVAR)) { - curstack->varkind = ARGVAR; - curstack->varnum = 1; - } - if (2 > arguments_num) { - arguments_num = 2; - } - OP1_0ANY; - - case ICMD_BUILTIN1: - builtin1: - REQUIRE_1; - /* 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; +#ifdef SPECIALMEMUSE + if (rd->ifmemuse < (i + rd->intreg_argnum + 6)) + rd->ifmemuse = i + rd->intreg_argnum + 6; +#else + if (rd->ifmemuse < i) + rd->ifmemuse = i; /* n integer args spilled on stack */ +#endif + if ((i + INT_ARG_CNT) > rd->arguments_num) + rd->arguments_num = i + INT_ARG_CNT; copy = curstack; while (--i >= 0) { /* check INT type here? Currently typecheck does this. */ - if (! (copy->flags & SAVEDVAR)) { + if (!(copy->flags & SAVEDVAR)) { copy->varkind = ARGVAR; - copy->varnum = i + intreg_argnum; + copy->varnum = i + INT_ARG_CNT; + copy->flags|=INMEMORY; +#ifdef SPECIALMEMUSE + copy->regoff = i + rd->intreg_argnum + 6; +#else + copy->regoff = i; +#endif } copy = copy->prev; } @@ -1937,7 +1960,7 @@ void analyse_stack() break; case ICMD_CLEAR_ARGREN: - for (i = iptr->op1; iop1; i < cd->maxlocals; i++) argren[i] = i; iptr->opc = opcode = ICMD_NOP; SETDST; @@ -1961,15 +1984,16 @@ void analyse_stack() 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 */ CHECKOVERFLOW; - - /* DEBUG */ /*dolog("iptr++");*/ iptr++; } /* while instructions */ + bptr->outstack = curstack; bptr->outdepth = stackdepth; BBEND(curstack, i); @@ -1980,79 +2004,84 @@ void analyse_stack() } /* 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; } @@ -2060,19 +2089,19 @@ void analyse_stack() /* DEBUGGING HELPERS */ /**********************************************************************/ -void icmd_print_stack(stackptr s) +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) { @@ -2082,11 +2111,15 @@ void icmd_print_stack(stackptr s) 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(" ???"); + printf(" %3s", regs[s->regoff]); } break; case STACKVAR: @@ -2097,6 +2130,12 @@ void icmd_print_stack(stackptr s) break; case 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); @@ -2105,11 +2144,15 @@ void icmd_print_stack(stackptr s) 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(" ???"); + printf(" %3s", regs[s->regoff]); } break; case STACKVAR: @@ -2120,6 +2163,12 @@ void icmd_print_stack(stackptr s) break; case 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); @@ -2198,74 +2247,88 @@ static char *jit_type[] = { }; -void show_icmd_method() +void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd) { int i, j; - s4 *s4ptr; /* used */ basicblock *bptr; - 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); + 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 lengt: %d\n",method->linenumbercount); + printf("Line number table length: %d\n", m->linenumbercount); - printf ("Exceptions (Number: %d):\n", exceptiontablelength); - for (ex = extable; ex != NULL; ex = ex->down) { + 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); +#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((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); +#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("???"); + 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("???"); + printf("%3s", regs[rd->interfaces[i][j].regoff]); } } } @@ -2273,130 +2336,184 @@ void show_icmd_method() } } 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++) { - a = disassinstr(u1ptr, i); + u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen); + for (i = 0; i < m->basicblocks[0].mpc;) { + a = disassinstr(u1ptr); i += a; u1ptr += a; } printf("\n"); +#elif defined(__XDSPCORE__) + s4 *s4ptr; + s4 a; + + s4ptr = (s4 *) ((ptrint) m->mcode + cd->dseglen); + for (i = 0; i < m->basicblocks[0].mpc;) { + a = disassinstr(stdout, s4ptr); + printf("\n"); + i += a * 4; + s4ptr += 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); } 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; /* used */ instruction *iptr; 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); + icmd_print_stack(cd, iptr->dst); printf("] %4d ", i); - /* DEBUG */ /*fflush(stdout);*/ - show_icmd(iptr,deadcode); + +#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"); } if (showdisassemble && (!deadcode)) { #if defined(__I386__) || defined(__X86_64__) u1 *u1ptr; - int a; + s4 a; printf("\n"); i = bptr->mpc; - u1ptr = method->mcode + dseglen + i; + u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen + i); if (bptr->next != NULL) { - for (; i < bptr->next->mpc; i++, u1ptr++) { - a = disassinstr(u1ptr, i); + for (; i < bptr->next->mpc; ) { + a = disassinstr(u1ptr); i += a; u1ptr += a; } printf("\n"); } else { - for (; u1ptr < (u1 *) (method->mcode + method->mcodelength); i++, u1ptr++) { - a = disassinstr(u1ptr, i); + for (; u1ptr < (u1 *) ((ptrint) m->mcode + m->mcodelength); ) { + a = disassinstr(u1ptr); i += a; u1ptr += a; } printf("\n"); } -#else +#elif defined(__XDSPCORE__) + s4 *s4ptr; + s4 a; + printf("\n"); i = bptr->mpc; - s4ptr = (s4 *) (method->mcode + dseglen + i); + s4ptr = (s4 *) ((ptrint) m->mcode + cd->dseglen + i); if (bptr->next != NULL) { - for (; i < bptr->next->mpc; i += 4, s4ptr++) { - disassinstr(*s4ptr, i); + for (; i < bptr->next->mpc;) { + a = disassinstr(stdout, s4ptr); + printf("\n"); + i += a * 4; + s4ptr += a; } printf("\n"); } else { - for (; s4ptr < (s4 *) (method->mcode + method->mcodelength); i += 4, s4ptr++) { - disassinstr(*s4ptr, i); + for (; s4ptr < (s4 *) ((ptrint) m->mcode + m->mcodelength); ) { + a = disassinstr(stdout, s4ptr); + i += a * 4; + s4ptr += a; } printf("\n"); } +#else + s4 *s4ptr; + + 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); + printf("\n"); + + } else { + for (; s4ptr < (s4 *) ((ptrint) m->mcode + m->mcodelength); i += 4, s4ptr++) + disassinstr(s4ptr); + 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) { + 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: @@ -2408,28 +2525,37 @@ void show_icmd(instruction *iptr,bool deadcode) 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 defined(__I386__) || defined(__POWERPC__) + 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; @@ -2442,21 +2568,93 @@ void show_icmd(instruction *iptr,bool deadcode) 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: +#if defined(__X86_64__) || defined(__I386__) + if (iptr->val.a) + printf(" %d,", ((fieldinfo *) iptr->val.a)->offset); + else + printf(" NOT RESOLVED,"); +#else + printf(" %d,", ((fieldinfo *) iptr->val.a)->offset); + printf(" "); + utf_display_classname(((fieldinfo *) iptr->val.a)->class->name); + printf("."); + utf_display(((fieldinfo *) iptr->val.a)->name); + printf(" (type "); + utf_display(((fieldinfo *) iptr->val.a)->descriptor); + printf(")"); + break; +#endif + case ICMD_PUTSTATIC: case ICMD_GETSTATIC: +#if defined(__X86_64__) || defined(__I386__) + printf(" "); + 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(")"); +#else printf(" "); - utf_fprint(stdout, ((fieldinfo *) iptr->val.a)->class->name); + utf_display_classname(((fieldinfo *) iptr->val.a)->class->name); printf("."); - utf_fprint(stdout, ((fieldinfo *) iptr->val.a)->name); + utf_display(((fieldinfo *) iptr->val.a)->name); printf(" (type "); - utf_fprint(stdout, ((fieldinfo *) iptr->val.a)->descriptor); + utf_display(((fieldinfo *) iptr->val.a)->descriptor); printf(")"); +#endif + break; + + case ICMD_PUTSTATICCONST: + case ICMD_PUTFIELDCONST: + switch (iptr[1].op1) { + case TYPE_INT: + printf(" %d,", iptr->val.i); + break; + case TYPE_LNG: +#if defined(__I386__) || defined(__POWERPC__) + printf(" %lld,", iptr->val.l); +#else + printf(" %ld,", iptr->val.l); +#endif + break; + case TYPE_ADR: + printf(" %p,", iptr->val.a); + break; + case TYPE_FLT: + printf(" %g,", iptr->val.f); + break; + case TYPE_DBL: + printf(" %g,", iptr->val.d); + break; + } +#if defined(__X86_64__) + if (iptr->opc == ICMD_PUTFIELDCONST) + 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(")"); +#else + if (iptr->opc == ICMD_PUTFIELDCONST) + printf(" %d,", ((fieldinfo *) iptr[1].val.a)->offset); + printf(" "); + utf_display_classname(((fieldinfo *) iptr[1].val.a)->class->name); + printf("."); + utf_display(((fieldinfo *) iptr[1].val.a)->name); + printf(" (type "); + utf_display(((fieldinfo *) iptr[1].val.a)->descriptor); + printf(")"); +#endif break; case ICMD_IINC: @@ -2500,8 +2698,7 @@ void show_icmd(instruction *iptr,bool deadcode) case ICMD_NEW: printf(" "); - utf_fprint(stdout, - ((classinfo *) iptr->val.a)->name); + utf_display_classname(((classinfo *) iptr->val.a)->name); break; case ICMD_NEWARRAY: @@ -2536,18 +2733,17 @@ void show_icmd(instruction *iptr,bool deadcode) 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; + vftbl_t *vft; printf(" %d ",iptr->op1); - vft = (vftbl *)iptr->val.a; + vft = (vftbl_t *)iptr->val.a; if (vft) - utf_fprint(stdout,vft->class->name); + utf_display_classname(vft->class->name); else printf(""); } @@ -2555,32 +2751,60 @@ void show_icmd(instruction *iptr,bool deadcode) case ICMD_CHECKCAST: case ICMD_INSTANCEOF: +#if defined(__X86_64__) || defined(__I386__) + 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; +#endif 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); + utf_display_classname(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.a)); + printf(" %s", icmd_builtin_name((functionptr) iptr->val.fp)); break; case ICMD_INVOKEVIRTUAL: case ICMD_INVOKESPECIAL: case ICMD_INVOKESTATIC: case ICMD_INVOKEINTERFACE: +#if defined(__X86_64__) || defined(__I386__) printf(" "); - utf_fprint(stdout, - ((methodinfo *) iptr->val.a)->class->name); + 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); +#else + printf(" "); + utf_display_classname(((methodinfo *) iptr->val.a)->class->name); + printf("."); + utf_display(((methodinfo *) iptr->val.a)->name); + utf_display(((methodinfo *) iptr->val.a)->descriptor); +#endif break; case ICMD_IFEQ: @@ -2602,9 +2826,17 @@ void show_icmd(instruction *iptr,bool deadcode) 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: @@ -2683,7 +2915,11 @@ void show_icmd(instruction *iptr,bool deadcode) } break; } - printf(" Line number: %d",iptr->line); + printf(" Line number: %d, method:",iptr->line); +/* printf("\t\t"); + utf_display(iptr->method->class->name); + printf("."); + utf_display(iptr->method->name); */ }