/* src/vm/jit/stack.c - stack analysis
- 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
+ Copyright (C) 1996-2005, 2006 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.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Andreas Krall
Changes: Edwin Steiner
Christian Thalinger
- Christian Ullrich
+ Christian Ullrich
- $Id: stack.c 3218 2005-09-19 13:25:47Z twisti $
+ $Id: stack.c 4524 2006-02-16 19:39:36Z christian $
*/
+#include "config.h"
+
#include <assert.h>
#include <stdio.h>
#include <string.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/codegen-common.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"
+#include "vm/jit/allocator/lsra.h"
/* global variables ***********************************************************/
#if defined(USE_THREADS)
-static java_objectheader show_icmd_lock;
+static java_objectheader *lock_show_icmd;
#endif
#if defined(USE_THREADS)
/* initialize the show lock */
- show_icmd_lock.monitorPtr = get_dummyLR();
+ lock_show_icmd = NEW(java_objectheader);
+
+# if defined(NATIVE_THREADS)
+ initObjectLock(lock_show_icmd);
+# endif
#endif
/* everything's ok */
stackptr curstack;
stackptr new;
stackptr copy;
- int opcode, i, len, loops;
+ int opcode, i, j, len, loops;
int superblockend, repeat, deadcode;
instruction *iptr;
basicblock *bptr;
s4 *s4ptr;
void **tptr;
s4 *argren;
+ s4 *last_store;/* instruction index of last XSTORE */
+ /* [ local_index * 5 + type ] */
+ s4 last_pei; /* instruction index of last possible exception */
+ /* used for conflict resolution for copy */
+ /* elimination (XLOAD, IINC, XSTORE) */
+ s4 last_dupx;
builtintable_entry *bte;
unresolved_method *um;
methoddesc *md;
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
m->maxlifetimes = 0;
#endif
argren = DMNEW(s4, cd->maxlocals); /* table for argument renaming */
for (i = 0; i < cd->maxlocals; i++)
argren[i] = i;
+
+ last_store = DMNEW(s4 , cd->maxlocals * 5);
new = m->stack;
loops = 0;
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);
- log_text("Stack depth mismatch");
- assert(0);
+ /*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;
}
curstack = bptr->instack;
iptr = bptr->iinstr;
b_index = bptr - m->basicblocks;
+ last_pei = -1;
+ last_dupx = -1;
+ for( i = 0; i < cd->maxlocals; i++)
+ for( j = 0; j < 5; j++)
+ last_store[5 * i + j] = -1;
+
+ bptr->stack = new;
+
while (--len >= 0) {
opcode = iptr->opc;
- /* XXX TWISTI: why is this set to NULL here? */
- /* iptr->target = NULL; */
#if defined(USEBUILTINTABLE)
# if defined(ENABLE_INTRP)
if (bte && bte->opcode == opcode) {
iptr->opc = ICMD_BUILTIN;
- iptr->op1 = bte->md->paramcount;
+ iptr->op1 = false; /* don't check for exception */
iptr->val.a = bte;
m->isleafmethod = false;
goto builtin;
case ICMD_CHECKNULL:
COUNT(count_check_null);
case ICMD_NOP:
- case ICMD_CHECKASIZE:
- case ICMD_CHECKEXCEPTION:
case ICMD_IFEQ_ICONST:
case ICMD_IFNE_ICONST:
# if defined(ENABLE_INTRP)
if (!opt_intrp) {
# endif
-#if SUPPORT_CONST_STORE_ZERO_ONLY
+# if SUPPORT_CONST_STORE_ZERO_ONLY
if (iptr[0].val.i == 0) {
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
switch (iptr[1].opc) {
case ICMD_IASTORE:
iptr[0].opc = ICMD_IASTORECONST;
iptr[1].opc = ICMD_NOP;
OPTT2_0(TYPE_INT, TYPE_ADR);
COUNT(count_pcmd_op);
-#if SUPPORT_CONST_STORE_ZERO_ONLY
+# if SUPPORT_CONST_STORE_ZERO_ONLY
} else
PUSHCONST(TYPE_INT);
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
# if defined(ENABLE_INTRP)
} else
PUSHCONST(TYPE_INT);
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;
- }
+# 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_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
+ 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 */
+# if defined(ENABLE_INTRP)
} else
PUSHCONST(TYPE_INT);
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# endif
break;
#endif /* SUPPORT_CONST_STORE */
default:
iptr[0].opc = ICMD_LXORCONST;
goto icmd_lconst_tail;
#endif /* SUPPORT_LONG_LOGICAL && SUPPORT_CONST_LOGICAL */
-#if !defined(NOLONG_CONDITIONAL)
+
+#if SUPPORT_LONG_CMP_CONST
case ICMD_LCMP:
if ((len > 1) && (iptr[2].val.i == 0)) {
switch (iptr[2].opc) {
else
PUSHCONST(TYPE_LNG);
break;
-#endif /* !defined(NOLONG_CONDITIONAL) */
+#endif /* SUPPORT_LONG_CMP_CONST */
#if SUPPORT_CONST_STORE
case ICMD_LASTORE:
# if defined(ENABLE_INTRP)
if (!opt_intrp) {
# endif
-#if SUPPORT_CONST_STORE_ZERO_ONLY
+# if SUPPORT_CONST_STORE_ZERO_ONLY
if (iptr[0].val.l == 0) {
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# 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
+# if SUPPORT_CONST_STORE_ZERO_ONLY
} else
PUSHCONST(TYPE_LNG);
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
# if defined(ENABLE_INTRP)
} else
PUSHCONST(TYPE_LNG);
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;
- }
+# 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 */
+ 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
+ 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 */
+# if defined(ENABLE_INTRP)
} else
PUSHCONST(TYPE_LNG);
-#endif /* SUPPORT_CONST_STORE_ZERO_ONLY */
+# endif
break;
#endif /* SUPPORT_CONST_STORE */
default:
case ICMD_ACONST:
COUNT(count_pcmd_load);
#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:
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+ if ((len > 0) && (iptr->val.a == 0)) {
switch (iptr[1].opc) {
- case ICMD_BUILTIN:
- iptr[0].opc = ICMD_AASTORECONST;
- OPTT2_0(TYPE_INT, TYPE_ADR);
- break;
+ case ICMD_AASTORE:
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);
+ switch (iptr[1].opc) {
+ case ICMD_AASTORE:
+ 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;
- }
- iptr[1].opc = ICMD_NOP;
- COUNT(count_pcmd_op);
- break;
+ default:
+ PUSHCONST(TYPE_ADR);
+ }
- default:
+ } else
PUSHCONST(TYPE_ADR);
- }
+# if defined(ENABLE_INTRP)
} else
-#endif /* SUPPORT_CONST_STORE */
PUSHCONST(TYPE_ADR);
+# endif
+#else /* SUPPORT_CONST_STORE */
+ PUSHCONST(TYPE_ADR);
+#endif /* SUPPORT_CONST_STORE */
break;
/* pop 0 push 1 load */
/* pop 0 push 0 iinc */
case ICMD_IINC:
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
if (opt_stat) {
i = stackdepth;
if (i >= 10)
count_store_depth[i]++;
}
#endif
+ last_store[5 * iptr->op1 + TYPE_INT] = bptr->icount - len - 1;
+
copy = curstack;
i = stackdepth - 1;
while (copy) {
i--;
copy = copy->prev;
}
+
SETDST;
break;
if (!opt_intrp)
#endif
rd->locals[iptr->op1][i].type = i;
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
if (opt_stat) {
count_pcmd_store++;
i = new - curstack;
count_store_depth[i]++;
}
#endif
+ /* check for conflicts as described in Figure 5.2 */
copy = curstack->prev;
i = stackdepth - 2;
while (copy) {
i--;
copy = copy->prev;
}
- if ((new - curstack) == 1) {
- curstack->varkind = LOCALVAR;
- curstack->varnum = iptr->op1;
- };
+
+ /* do not change instack Stackslots */
+ /* it won't improve performance if we copy the interface */
+ /* at the BB begin or here, and lsra relies that no */
+ /* instack stackslot is marked LOCALVAR */
+ if (curstack->varkind == STACKVAR)
+ goto _possible_conflict;
+
+ /* check for a DUPX,SWAP while the lifetime of curstack */
+ /* and as creator curstack */
+ if (last_dupx != -1) {
+ /* we have to look at the dst stack of DUPX */
+ /* == src Stack of PEI */
+ copy = bptr->iinstr[last_dupx].dst;
+ /*
+ if (last_pei == 0)
+ copy = bptr->instack;
+ else
+ copy = bptr->iinstr[last_pei-1].dst;
+ */
+ if ((copy != NULL) && (curstack <= copy)) {
+ /* curstack alive at or created by DUPX */
+
+ /* TODO:.... */
+ /* now look, if there is a LOCALVAR at anyone of */
+ /* the src stacklots used by DUPX */
+
+ goto _possible_conflict;
+ }
+ }
+
+ /* check for a PEI while the lifetime of curstack */
+ if (last_pei != -1) {
+ /* && there are exception handler in this method */
+ /* when this is checked prevent ARGVAR from */
+ /* overwriting LOCALVAR!!! */
+
+ /* we have to look at the stack _before_ the PEI! */
+ /* == src Stack of PEI */
+ if (last_pei == 0)
+ copy = bptr->instack;
+ else
+ copy = bptr->iinstr[last_pei-1].dst;
+ if ((copy != NULL) && (curstack <= copy)) {
+ /* curstack alive at PEI */
+ goto _possible_conflict;
+ }
+ }
+
+ /* check if there is a possible conflicting XSTORE */
+ if (last_store[5 * iptr->op1 + opcode - ICMD_ISTORE] != -1) {
+ /* we have to look at the stack _before_ the XSTORE! */
+ /* == src Stack of XSTORE */
+ if (last_store[5 * iptr->op1 + opcode - ICMD_ISTORE] == 0)
+ copy = bptr->instack;
+ else
+ copy = bptr->iinstr[last_store[5 * iptr->op1 + opcode - ICMD_ISTORE] - 1].dst;
+ if ((copy != NULL) && (curstack <= copy)) {
+ /* curstack alive at Last Store */
+ goto _possible_conflict;
+ }
+ }
+
+ /* check if there is a conflict with a XLOAD */
+ /* this is done indirectly by looking if a Stackslot is */
+ /* marked LOCALVAR and is live while curstack is live */
+ /* see figure 5.3 */
+
+ /* First check "above" stackslots of the instack */
+ copy = curstack + 1;
+ for(;(copy <= bptr->instack); copy++)
+ if ((copy->varkind == LOCALVAR) && (copy->varnum == iptr->op1)) {
+ goto _possible_conflict;
+ }
+
+ /* "intra" Basic Block Stackslots are allocated above */
+ /* bptr->stack (see doc/stack.txt), so if curstack + 1 */
+ /* is an instack, copy could point now to the stackslots */
+ /* of an inbetween analysed Basic Block */
+ if (copy < bptr->stack)
+ copy = bptr->stack;
+ while (copy < new) {
+ if ((copy->varkind == LOCALVAR) && (copy->varnum == iptr->op1)) {
+ goto _possible_conflict;
+ }
+ copy++;
+ }
+ /* no conflict - mark the Stackslot as LOCALVAR */
+ curstack->varkind = LOCALVAR;
+ curstack->varnum = iptr->op1;
+
+ goto _local_join;
+ _possible_conflict:
+ if ((curstack->varkind == LOCALVAR)
+ && (curstack->varnum == iptr->op1)) {
+ curstack->varkind = TEMPVAR;
+ curstack->varnum = stackdepth-1;
+ }
+ _local_join:
+ last_store[5 * iptr->op1 + opcode - ICMD_ISTORE] = bptr->icount - len - 1;
+
STORE(opcode - ICMD_ISTORE);
break;
COUNT(count_check_bound);
COUNT(count_pcmd_mem);
- bte = (builtintable_entry *) iptr->val.a;
+ bte = builtintable_get_internal(BUILTIN_canstore);
md = bte->md;
- i = iptr->op1;
if (md->memuse > rd->memuse)
rd->memuse = md->memuse;
case ICMD_FRETURN:
case ICMD_DRETURN:
case ICMD_ARETURN:
- md_return_alloc(m, rd, opcode - ICMD_IRETURN, curstack);
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp)
+# endif
+ md_return_alloc(m, rd, opcode - ICMD_IRETURN,
+ curstack);
+#endif
COUNT(count_pcmd_return);
OP1_0(opcode - ICMD_IRETURN);
superblockend = true;
}
}
#endif
+ last_dupx = bptr->icount - len - 1;
COUNT(count_dup_instruction);
DUP;
break;
case ICMD_DUP2:
+ last_dupx = bptr->icount - len - 1;
REQUIRE_1;
if (IS_2_WORD_TYPE(curstack->type)) {
/* ..., cat2 */
}
}
#endif
+ last_dupx = bptr->icount - len - 1;
DUP_X1;
break;
case ICMD_DUP2_X1:
+ last_dupx = bptr->icount - len - 1;
REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->type)) {
/* ..., ????, cat2 */
/* pop 3 push 4 dup */
case ICMD_DUP_X2:
+ last_dupx = bptr->icount - len - 1;
REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->prev->type)) {
/* ..., cat2, ???? */
break;
case ICMD_DUP2_X2:
+ last_dupx = bptr->icount - len - 1;
REQUIRE_2;
if (IS_2_WORD_TYPE(curstack->type)) {
/* ..., ????, cat2 */
/* pop 2 push 2 swap */
case ICMD_SWAP:
+ last_dupx = bptr->icount - len - 1;
#ifdef TYPECHECK_STACK_COMPCAT
if (opt_verify) {
REQUIRE_2;
copy->flags |= SAVEDVAR;
copy = copy->prev;
}
+
+ /* fall through */
#endif /* !SUPPORT_DIVISION */
case ICMD_ISHL:
copy->flags |= SAVEDVAR;
copy = copy->prev;
}
+
+ /* fall through */
#endif /* !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV) */
case ICMD_LMUL:
case ICMD_LCMP:
COUNT(count_pcmd_op);
-#if !defined(NOLONG_CONDITIONAL)
+#if SUPPORT_LONG_CMP_CONST
if ((len > 0) && (iptr[1].val.i == 0)) {
switch (iptr[1].opc) {
case ICMD_IFEQ:
}
}
else
-#endif
+#endif /* SUPPORT_LONG_CMP_CONST */
OPTT2_1(TYPE_LNG, TYPE_INT);
break;
case ICMD_FCMPL:
break;
case ICMD_CHECKCAST:
- OP1_1(TYPE_ADR, TYPE_ADR);
- break;
+ if (iptr->op1 == 0) {
+ /* array type cast-check */
- case ICMD_ARRAYCHECKCAST:
- bte = (builtintable_entry *) iptr->val.a;
- md = bte->md;
+ bte = builtintable_get_internal(BUILTIN_arraycheckcast);
+ md = bte->md;
- if (md->memuse > rd->memuse)
- rd->memuse = md->memuse;
- if (md->argintreguse > rd->argintreguse)
- rd->argintreguse = md->argintreguse;
+ if (md->memuse > rd->memuse)
+ rd->memuse = md->memuse;
+ if (md->argintreguse > rd->argintreguse)
+ rd->argintreguse = md->argintreguse;
- /* make all stack variables saved */
+ /* make all stack variables saved */
- copy = curstack;
- while (copy) {
- copy->flags |= SAVEDVAR;
- copy = copy->prev;
+ copy = curstack;
+ while (copy) {
+ copy->flags |= SAVEDVAR;
+ copy = copy->prev;
+ }
}
-
OP1_1(TYPE_ADR, TYPE_ADR);
break;
md = um->methodref->parseddesc.md;
/* if (lm->flags & ACC_STATIC) */
/* {COUNT(count_check_null);} */
+
_callhandling:
- i = iptr->op1;
+
+ last_pei = bptr->icount - len - 1;
+
+ i = md->paramcount;
if (md->memuse > rd->memuse)
rd->memuse = md->memuse;
copy->flags = 0;
if (IS_FLT_DBL_TYPE(copy->type))
#if defined(SUPPORT_PASS_FLOATARGS_IN_INTREGS)
- assert(0);
+ assert(0); /* XXX is this assert ok? */
#else
copy->regoff =
rd->argfltregs[md->params[i].regoff];
copy = copy->prev;
}
- i = iptr->op1;
+ i = md->paramcount;
POPMANY(i);
if (md->returntype.type != TYPE_VOID)
OP0_1(md->returntype.type);
break;
case ICMD_MULTIANEWARRAY:
- if (rd->argintreguse < 3)
- rd->argintreguse = 3;
+ if (rd->argintreguse < 3)
+ rd->argintreguse = 3;
i = iptr->op1;
# 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 */
#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__) */
default:
*exceptionptr =
- new_exception_message(string_java_lang_InternalError,
- "Unknown ICMD");
+ new_internalerror("Unknown ICMD %d", opcode);
return NULL;
} /* switch */
} /* while blocks */
} while (repeat && !deadcode);
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
if (opt_stat) {
if (m->basicblockcount > count_max_basic_blocks)
count_max_basic_blocks = m->basicblockcount;
else
count_method_bb_distribution[8]++;
}
-#endif
+#endif /* defined(ENABLE_STATISTICS) */
/* just return methodinfo* to signal everything was ok */
}
-/**********************************************************************/
-/* DEBUGGING HELPERS */
-/**********************************************************************/
+/* debugging helpers **********************************************************/
void icmd_print_stack(codegendata *cd, stackptr s)
{
printf(" F%02d", s->regoff);
else {
#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);
+ if (IS_2_WORD_TYPE(s->type)) {
+# if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (opt_intrp)
+ printf(" %3d/%3d", GET_LOW_REG(s->regoff),
+ GET_HIGH_REG(s->regoff));
+ else
+# endif
+ printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
+ regs[GET_HIGH_REG(s->regoff)]);
+# else
+ printf(" %3d/%3d", GET_LOW_REG(s->regoff),
+ GET_HIGH_REG(s->regoff));
+# endif
+ } else
+#endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
+ {
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (opt_intrp)
+ printf(" %3d", s->regoff);
+ else
+# endif
+ printf(" %3s", regs[s->regoff]);
#else
- printf(" %3s", regs[s->regoff]);
+ printf(" %3d", s->regoff);
#endif
+ }
}
break;
case STACKVAR:
if (s->varnum == -1) {
/* Return Value */
/* varkind ARGVAR "misused for this special case */
- printf(" RA");
+ 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);
printf(" f%02d", s->regoff);
else {
#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);
+ if (IS_2_WORD_TYPE(s->type)) {
+# if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (opt_intrp)
+ printf(" %3d/%3d", GET_LOW_REG(s->regoff),
+ GET_HIGH_REG(s->regoff));
+ else
+# endif
+ printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
+ regs[GET_HIGH_REG(s->regoff)]);
+# else
+ printf(" %3d/%3d", GET_LOW_REG(s->regoff),
+ GET_HIGH_REG(s->regoff));
+# endif
+ } else
+#endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
+ {
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (opt_intrp)
+ printf(" %3d", s->regoff);
+ else
+# endif
+ printf(" %3s", regs[s->regoff]);
#else
- printf(" %3s", regs[s->regoff]);
+ printf(" %3d", s->regoff);
#endif
+ }
}
break;
case STACKVAR:
if (s->varnum == -1) {
/* Return Value */
/* varkind ARGVAR "misused for this special case */
- printf(" ra");
+ 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);
*******************************************************************************/
+#if !defined(NDEBUG)
void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd)
{
basicblock *bptr;
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. */
+ /* 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);
+ builtin_monitorenter(lock_show_icmd);
#endif
printf("\n");
- utf_fprint_classname(stdout, m->class->name);
- printf(".");
- 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);
+
+ method_println(m);
+
+ printf("\nBasic blocks: %d\n", m->basicblockcount);
+ printf("Max locals: %d\n", cd->maxlocals);
+ printf("Max stack: %d\n", cd->maxstack);
printf("Line number table length: %d\n", m->linenumbercount);
printf("Exceptions (Number: %d):\n", cd->exceptiontablelength);
printf("Local Table:\n");
for (i = 0; i < cd->maxlocals; i++) {
printf(" %3d: ", i);
+
+#if defined(ENABLE_JIT)
for (j = TYPE_INT; j <= TYPE_ADR; j++) {
-#if defined(ENABLE_INTRP)
+# if defined(ENABLE_INTRP)
if (!opt_intrp) {
-#endif
+# 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
+# ifdef HAS_ADDRESS_REGISTER_FILE
else if (j == TYPE_ADR)
printf("r%02d", rd->locals[i][j].regoff);
-#endif
+# 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 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
+# endif
printf("%3s", regs[rd->locals[i][j].regoff]);
}
}
-#if defined(ENABLE_INTRP)
+# if defined(ENABLE_INTRP)
}
-#endif
+# endif
}
+#endif /* defined(ENABLE_JIT) */
+
printf("\n");
}
printf("\n");
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
if (!opt_lsra) {
#endif
#if defined(ENABLE_INTRP)
(rd->interfaces[i][3].type >= 0) ||
(rd->interfaces[i][4].type >= 0)) {
printf(" %3d: ", i);
- for (j = TYPE_INT; j <= TYPE_ADR; j++)
- if (rd->interfaces[i][j].type >= 0) {
- printf(" (%s) ", jit_type[j]);
- if (rd->interfaces[i][j].flags & SAVEDVAR) {
- if (rd->interfaces[i][j].flags & INMEMORY)
- printf("M%2d", rd->interfaces[i][j].regoff);
+
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+ if (!opt_intrp) {
+# endif
+ for (j = TYPE_INT; j <= TYPE_ADR; j++) {
+ if (rd->interfaces[i][j].type >= 0) {
+ printf(" (%s) ", jit_type[j]);
+ 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);
+ else if (j == TYPE_ADR)
+ printf("R%02d", rd->interfaces[i][j].regoff);
#endif
- else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf("F%02d", rd->interfaces[i][j].regoff);
- else {
+ else if ((j == TYPE_FLT) || (j == TYPE_DBL))
+ printf("F%02d", rd->interfaces[i][j].regoff);
+ else {
#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
+ 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("%3s",regs[rd->interfaces[i][j].regoff]);
+ }
}
- }
- else {
- if (rd->interfaces[i][j].flags & INMEMORY)
- printf("m%2d", rd->interfaces[i][j].regoff);
+ else {
+ 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);
+ else if (j == TYPE_ADR)
+ printf("r%02d", rd->interfaces[i][j].regoff);
#endif
- else if ((j == TYPE_FLT) || (j == TYPE_DBL))
- printf("f%02d", rd->interfaces[i][j].regoff);
- else {
+ else if ((j == TYPE_FLT) || (j == TYPE_DBL))
+ printf("f%02d", rd->interfaces[i][j].regoff);
+ else {
#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
+ 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("%3s",regs[rd->interfaces[i][j].regoff]);
+ }
}
}
}
- printf("\n");
+ printf("\n");
+# if defined(ENABLE_INTRP)
+ }
+# endif
+#endif /* defined(ENABLE_JIT) */
+
}
}
printf("\n");
#if defined(ENABLE_INTRP)
}
#endif
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
}
#endif
u1ptr = (u1 *) ((ptrint) m->mcode + cd->dseglen);
for (; u1ptr < (u1 *) ((ptrint) m->mcode + cd->dseglen + m->basicblocks[0].mpc);)
- u1ptr = disassinstr(u1ptr);
+ DISASSINSTR(u1ptr);
printf("\n");
}
m->basicblocks[m->basicblockcount].mpc);
for (; (ptrint) u1ptr < ((ptrint) m->mcode + m->mcodelength);)
- u1ptr = disassinstr(u1ptr);
+ DISASSINSTR(u1ptr);
printf("\n");
}
#if defined(USE_THREADS)
- builtin_monitorexit(&show_icmd_lock);
+ builtin_monitorexit(lock_show_icmd);
#endif
}
+#endif /* !defined(NDEBUG) */
+/* show_icmd_block *************************************************************
+
+ XXX
+
+*******************************************************************************/
+
+#if !defined(NDEBUG)
void show_icmd_block(methodinfo *m, codegendata *cd, basicblock *bptr)
{
s4 i, j;
if (bptr->flags != BBDELETED) {
deadcode = bptr->flags <= BBREACHED;
+
printf("[");
+
if (deadcode)
for (j = cd->maxstack; j > 0; j--)
printf(" ? ");
else
icmd_print_stack(cd, bptr->instack);
- printf("] L%03d(%d - %d) flags=%d:\n", bptr->debug_nr, bptr->icount, bptr->pre_count,bptr->flags);
+
+ printf("] L%03d(flags: %d, next: %d, type: ",
+ bptr->debug_nr, bptr->flags, (bptr->next) ? (bptr->next->debug_nr) : -1);
+
+ switch (bptr->type) {
+ case BBTYPE_STD:
+ printf("STD");
+ break;
+ case BBTYPE_EXH:
+ printf("EXH");
+ break;
+ case BBTYPE_SBR:
+ printf("SBR");
+ break;
+ }
+
+ printf(", instruction count: %d, predecessors: %d):\n",
+ bptr->icount, bptr->pre_count);
+
iptr = bptr->iinstr;
for (i = 0; i < bptr->icount; i++, iptr++) {
printf("[");
- if (deadcode) {
+
+ if (deadcode)
for (j = cd->maxstack; j > 0; j--)
printf(" ? ");
- }
else
icmd_print_stack(cd, iptr->dst);
- printf("] %5d (line: %5d) ", i, iptr->line);
-#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
+ printf("] %5d (line: %5d) ", i, iptr->line);
show_icmd(iptr, deadcode);
printf("\n");
if (bptr->next != NULL) {
for (; u1ptr < (u1 *) ((ptrint) m->mcode + cd->dseglen + bptr->next->mpc);)
- u1ptr = disassinstr(u1ptr);
+ DISASSINSTR(u1ptr);
} else {
for (; u1ptr < (u1 *) ((ptrint) m->mcode + m->mcodelength);)
- u1ptr = disassinstr(u1ptr);
+ DISASSINSTR(u1ptr);
}
printf("\n");
}
}
}
+#endif /* !defined(NDEBUG) */
+
+
+/* show_icmd *******************************************************************
+
+ XXX
+*******************************************************************************/
+#if !defined(NDEBUG)
void show_icmd(instruction *iptr, bool deadcode)
{
int j;
case ICMD_LSHRCONST:
case ICMD_LUSHRCONST:
case ICMD_ICONST:
- case ICMD_ELSE_ICONST:
case ICMD_IASTORECONST:
case ICMD_BASTORECONST:
case ICMD_CASTORECONST:
case ICMD_IFGE_ICONST:
case ICMD_IFGT_ICONST:
case ICMD_IFLE_ICONST:
- printf("(%d) %d", iptr[1].op1, iptr->val.i);
+ printf(" %d, %d (0x%08x)", iptr[1].op1, iptr->val.i, iptr->val.i);
+ break;
+
+ case ICMD_ELSE_ICONST:
+ printf(" %d (0x%08x)", iptr->val.i, iptr->val.i);
break;
case ICMD_LADDCONST:
case ICMD_ACONST:
case ICMD_AASTORECONST:
- printf(" %p", iptr->val.a);
+ /* check if this is a constant string or a class reference */
+
+ if (iptr->target) {
+ if (iptr->val.a)
+ printf(" %p", iptr->val.a);
+ else
+ printf(" (NOT RESOLVED)");
+
+ printf(", Class = \"");
+ utf_display(((constant_classref *) iptr->target)->name);
+ printf("\"");
+
+ } else {
+ printf(" %p", iptr->val.a);
+ if (iptr->val.a) {
+ printf(", String = \"");
+ utf_display(javastring_toutf(iptr->val.a, false));
+ printf("\"");
+ }
+ }
break;
case ICMD_GETFIELD:
case ICMD_PUTSTATIC:
case ICMD_GETSTATIC:
if (iptr->val.a) {
- if (!((fieldinfo *) iptr->val.a)->class->initialized)
+ if (!CLASS_IS_OR_ALMOST_INITIALIZED(((fieldinfo *) iptr->val.a)->class))
printf(" (NOT INITIALIZED) ");
else
printf(" ");
case ICMD_PUTFIELDCONST:
switch (iptr[1].op1) {
case TYPE_INT:
- printf(" %d,", iptr->val.i);
+ printf(" %d (0x%08x),", iptr->val.i, iptr->val.i);
break;
case TYPE_LNG:
#if SIZEOF_VOID_P == 4
- printf(" %lld,", iptr->val.l);
+ 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 TYPE_ADR:
printf(" %p,", iptr->val.a);
break;
case TYPE_FLT:
- printf(" %g,", iptr->val.f);
+ printf(" %g (0x%08x),", iptr->val.f, iptr->val.i);
break;
case TYPE_DBL:
- printf(" %g,", 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;
}
- if (iptr->opc == ICMD_PUTFIELDCONST)
- printf(" NOT RESOLVED,");
+ 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(".");
break;
case ICMD_MULTIANEWARRAY:
- if (iptr->target) {
- printf(" (NOT RESOLVED) %d ",iptr->op1);
- utf_display(((constant_classref *) iptr->val.a)->name);
+ if (iptr->val.a == NULL) {
+ printf(" (NOT RESOLVED) %d ", iptr->op1);
+ utf_display(((constant_classref *) iptr->target)->name);
} else {
printf(" %d ",iptr->op1);
- utf_display_classname(((vftbl_t *) iptr->val.a)->class->name);
+ utf_display_classname(((classinfo *) iptr->val.a)->name);
}
break;
}
break;
- case ICMD_ARRAYCHECKCAST:
- if (iptr->op1) {
- classinfo *c = ((vftbl_t *) iptr->target)->class;
- if (c->flags & ACC_INTERFACE)
- printf(" (INTERFACE) ");
- else
- printf(" (CLASS,%3d) ", c->vftbl->diffval);
- utf_display_classname(c->name);
- } else {
- printf(" (NOT RESOLVED) ");
- utf_display_classname(((constant_classref *) iptr->target)->name);
- }
- break;
-
case ICMD_INLINE_START:
+ case ICMD_INLINE_END:
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:
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 (%p)", iptr->val.i, iptr->val.i, ((basicblock *) iptr->target)->debug_nr,iptr->target);
break;
case ICMD_IF_LEQ:
case ICMD_IF_LCMPLE:
case ICMD_IF_ACMPEQ:
case ICMD_IF_ACMPNE:
+ case ICMD_INLINE_GOTO:
if (deadcode || !iptr->target)
printf(" op1=%d", iptr->op1);
else
- printf(" L%03d", ((basicblock *) iptr->target)->debug_nr);
+ printf(" L%03d (%p)", ((basicblock *) iptr->target)->debug_nr,iptr->target);
break;
case ICMD_TABLESWITCH:
}
}
break;
+
+ case ICMD_ARETURN:
+ if (iptr->val.a) {
+ printf(" (NOT RESOLVED), Class = \"");
+ utf_display(((unresolved_class *) iptr->val.a)->classref->name);
+ printf("\"");
+ }
}
}
+#endif /* !defined(NDEBUG) */
/*
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/
projects / cacao.git / blobdiff