/* src/vm/jit/parse.c - parser for JavaVM to intermediate code translation
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Author: Andreas Krall
-
- Changes: Carolyn Oates
- Edwin Steiner
- Joseph Wenninger
- Christian Thalinger
-
- $Id: parse.c 4687 2006-03-23 12:48:43Z edwin $
-
*/
#include "config.h"
-#include "vm/types.h"
-#include "vm/global.h"
-
#include <assert.h>
#include <string.h>
+#include "vm/types.h"
+
#include "mm/memory.h"
+
#include "native/native.h"
+
+#include "threads/lock-common.h"
+
#include "toolbox/logging.h"
+
#include "vm/builtin.h"
#include "vm/exceptions.h"
#include "vm/global.h"
-#include "vm/linker.h"
-#include "vm/loader.h"
-#include "vm/resolve.h"
-#include "vm/options.h"
-#include "vm/statistics.h"
#include "vm/stringlocal.h"
+
#include "vm/jit/asmpart.h"
#include "vm/jit/jit.h"
#include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
#include "vm/jit/loop/loop.h"
-/*******************************************************************************
+#include "vmcore/linker.h"
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+#include "vm/resolve.h"
- function 'parse' scans the JavaVM code and generates intermediate code
+#if defined(ENABLE_STATISTICS)
+# include "vmcore/statistics.h"
+#endif
+
+#include "vmcore/suck.h"
+
+#define INSTRUCTIONS_INCREMENT 5 /* number of additional instructions to */
+ /* allocate if space runs out */
+
+
+/* local macros ***************************************************************/
+
+#define BYTECODEINDEX_TO_BASICBLOCK(dst) \
+ do { \
+ (dst).block = \
+ parse_bytecodeindex_to_basicblock(jd, &pd, (dst).insindex); \
+ } while (0)
- During parsing the block index table is used to store at bit pos 0
- a flag which marks basic block starts and at position 1 to 31 the
- intermediate instruction index. After parsing the block index table
- is scanned, for marked positions a block is generated and the block
- number is stored in the block index table.
+
+/* parserdata_t ***************************************************************/
+
+typedef struct parsedata_t parsedata_t;
+
+struct parsedata_t {
+ u1 *bytecodestart; /* start of bytecode instructions */
+ u1 *basicblockstart; /* start of bytecode basic-blocks */
+
+ s4 *bytecodemap; /* bytecode to IR mapping */
+
+ instruction *instructions; /* instruction array */
+ s4 instructionslength; /* length of the instruction array */
+
+ s4 *instructionmap; /* IR to basic-block mapping */
+};
+
+
+/* parse_setup *****************************************************************
+
+ Fills the passed parsedata_t structure.
*******************************************************************************/
-static exceptiontable * fillextable(methodinfo *m,
- exceptiontable *extable,
- exceptiontable *raw_extable,
- int exceptiontablelength,
- int *block_count)
+static void parse_setup(jitdata *jd, parsedata_t *pd)
{
- int b_count, p, src;
+ methodinfo *m;
+
+ /* get required compiler data */
+
+ m = jd->m;
+
+ /* bytecode start array */
+
+ pd->bytecodestart = DMNEW(u1, m->jcodelength + 1);
+ MZERO(pd->bytecodestart, u1, m->jcodelength + 1);
+
+ /* bytecode basic-block start array */
+
+ pd->basicblockstart = DMNEW(u1, m->jcodelength + 1);
+ MZERO(pd->basicblockstart, u1, m->jcodelength + 1);
+
+ /* bytecode instruction index to IR instruction mapping */
+
+ pd->bytecodemap = DMNEW(s4, m->jcodelength + 1);
+ MSET(pd->bytecodemap, -1, s4, m->jcodelength + 1);
+
+ /* allocate the instruction array */
+
+ pd->instructionslength = m->jcodelength + 1;
+ pd->instructions = DMNEW(instruction, pd->instructionslength);
+
+ /* Zero the intermediate instructions array so we don't have any
+ invalid pointers in it if we cannot finish stack_analyse(). */
+
+ MZERO(pd->instructions, instruction, pd->instructionslength);
+
+ /* The instructionmap is allocated later when we know the count of
+ instructions. */
+
+ pd->instructionmap = NULL;
+}
+
+
+/* parse_realloc_instructions **************************************************
+
+ Reallocate the instructions array so there is room for at least N
+ additional instructions.
+
+ RETURN VALUE:
+ the new value for iptr
+
+*******************************************************************************/
+
+static instruction *parse_realloc_instructions(parsedata_t *pd, s4 icount, s4 n)
+{
+ /* increase the size of the instruction array */
+
+ pd->instructionslength += (n + INSTRUCTIONS_INCREMENT);
+
+ /* reallocate the array */
+
+ pd->instructions = DMREALLOC(pd->instructions, instruction, icount,
+ pd->instructionslength);
+ MZERO(pd->instructions + icount, instruction,
+ (pd->instructionslength - icount));
+
+ /* return the iptr */
+
+ return pd->instructions + icount;
+}
+
+
+/* parse_bytecodeindex_to_basicblock *******************************************
+
+ Resolves a bytecode index to the corresponding basic block.
+
+*******************************************************************************/
+
+static basicblock *parse_bytecodeindex_to_basicblock(jitdata *jd,
+ parsedata_t *pd,
+ s4 bcindex)
+{
+ s4 irindex;
+ basicblock *bb;
+
+ irindex = pd->bytecodemap[bcindex];
+ bb = jd->basicblocks + pd->instructionmap[irindex];
+
+ return bb;
+}
+
+
+/* parse_mark_exception_boundaries *********************************************
+
+ Mark exception handlers and the boundaries of the handled regions as
+ basic block boundaries.
+
+ IN:
+ jd...............current jitdata
+
+ RETURN VALUE:
+ true.............everything ok
+ false............an exception has been thrown
+
+*******************************************************************************/
+
+static bool parse_mark_exception_boundaries(jitdata *jd, parsedata_t *pd)
+{
+ s4 bcindex;
+ s4 i;
+ s4 len;
+ raw_exception_entry *rex;
+ methodinfo *m;
+
+ m = jd->m;
- if (exceptiontablelength == 0)
- return extable;
+ len = m->rawexceptiontablelength;
+
+ if (len == 0)
+ return true;
- b_count = *block_count;
+ rex = m->rawexceptiontable;
+
+ for (i = 0; i < len; ++i, ++rex) {
- for (src = exceptiontablelength-1; src >=0; src--) {
/* the start of the handled region becomes a basic block start */
- p = raw_extable[src].startpc;
- CHECK_BYTECODE_INDEX(p);
- extable->startpc = p;
- block_insert(p);
+
+ bcindex = rex->startpc;
+ CHECK_BYTECODE_INDEX(bcindex);
+ MARK_BASICBLOCK(pd, bcindex);
- p = raw_extable[src].endpc; /* see JVM Spec 4.7.3 */
- CHECK_BYTECODE_INDEX_EXCLUSIVE(p);
+ bcindex = rex->endpc; /* see JVM Spec 4.7.3 */
+ CHECK_BYTECODE_INDEX_EXCLUSIVE(bcindex);
+
+ /* check that the range is valid */
#if defined(ENABLE_VERIFIER)
- if (p <= raw_extable[src].startpc) {
- *exceptionptr = new_verifyerror(m,
- "Invalid exception handler range");
- return NULL;
+ if (bcindex <= rex->startpc) {
+ exceptions_throw_verifyerror(m, "Invalid exception handler range");
+ return false;
}
#endif
- extable->endpc = p;
- /* end of handled region becomes a basic block boundary */
- /* (If it is the bytecode end, we'll use the special */
- /* end block that is created anyway.) */
- if (p < m->jcodelength)
- block_insert(p);
+ /* End of handled region becomes a basic block boundary (if it
+ is the bytecode end, we'll use the special end block that
+ is created anyway). */
+
+ if (bcindex < m->jcodelength)
+ MARK_BASICBLOCK(pd, bcindex);
+ else
+ jd->branchtoend = true;
/* the start of the handler becomes a basic block start */
- p = raw_extable[src].handlerpc;
- CHECK_BYTECODE_INDEX(p);
- extable->handlerpc = p;
- block_insert(p);
-
- extable->catchtype = raw_extable[src].catchtype;
- extable->next = NULL;
- extable->down = &extable[1];
- extable--;
+
+ bcindex = rex->handlerpc;
+ CHECK_BYTECODE_INDEX(bcindex);
+ MARK_BASICBLOCK(pd, bcindex);
}
- *block_count = b_count;
-
/* everything ok */
- return extable;
+
+ return true;
#if defined(ENABLE_VERIFIER)
throw_invalid_bytecode_index:
- *exceptionptr =
- new_verifyerror(m, "Illegal bytecode index in exception table");
- return NULL;
+ exceptions_throw_verifyerror(m,
+ "Illegal bytecode index in exception table");
+ return false;
#endif
}
+
+/* parse_resolve_exception_table ***********************************************
+
+ Enter the exception handlers and their ranges, resolved to basicblock *s,
+ in the jitdata.
+
+ IN:
+ jd...............current jitdata
+
+ RETURN VALUE:
+ true.............everything ok
+ false............an exception has been thrown
+
+*******************************************************************************/
+
+static bool parse_resolve_exception_table(jitdata *jd, parsedata_t *pd)
+{
+ methodinfo *m;
+ raw_exception_entry *rex;
+ exception_entry *ex;
+ s4 i;
+ s4 len;
+ classinfo *exclass;
+
+ m = jd->m;
+
+ len = m->rawexceptiontablelength;
+
+ /* common case: no handler entries */
+
+ if (len == 0)
+ return true;
+
+ /* allocate the exception table */
+
+ jd->exceptiontablelength = len;
+ jd->exceptiontable = DMNEW(exception_entry, len + 1); /* XXX why +1? */
+
+ /* copy and resolve the entries */
+
+ ex = jd->exceptiontable;
+ rex = m->rawexceptiontable;
+
+ for (i = 0; i < len; ++i, ++rex, ++ex) {
+ /* resolve instruction indices to basic blocks */
+
+ ex->start = parse_bytecodeindex_to_basicblock(jd, pd, rex->startpc);
+ ex->end = parse_bytecodeindex_to_basicblock(jd, pd, rex->endpc);
+ ex->handler = parse_bytecodeindex_to_basicblock(jd, pd, rex->handlerpc);
+
+ /* lazily resolve the catchtype */
+
+ if (rex->catchtype.any != NULL) {
+ if (!resolve_classref_or_classinfo(m,
+ rex->catchtype,
+ resolveLazy, true, false,
+ &exclass))
+ return false;
+
+ /* if resolved, enter the result of resolution in the table */
+
+ if (exclass != NULL)
+ rex->catchtype.cls = exclass;
+ }
+
+ ex->catchtype = rex->catchtype;
+ ex->next = NULL; /* set by loop analysis */
+ ex->down = ex + 1; /* link to next exception entry */
+ }
+
+ /* terminate the ->down linked list */
+
+ assert(ex != jd->exceptiontable);
+ ex[-1].down = NULL;
+
+ return true;
+}
+
+
+/*******************************************************************************
+
+ function 'parse' scans the JavaVM code and generates intermediate code
+
+ During parsing the block index table is used to store at bit pos 0
+ a flag which marks basic block starts and at position 1 to 31 the
+ intermediate instruction index. After parsing the block index table
+ is scanned, for marked positions a block is generated and the block
+ number is stored in the block index table.
+
+*******************************************************************************/
+
/*** macro for checking the length of the bytecode ***/
#if defined(ENABLE_VERIFIER)
#define CHECK_END_OF_BYTECODE(neededlength)
#endif /* ENABLE_VERIFIER */
-methodinfo *parse(methodinfo *m, codegendata *cd)
+bool parse(jitdata *jd)
{
- int p; /* java instruction counter */
- int nextp; /* start of next java instruction */
- int opcode; /* java opcode */
- int i; /* temporary for different uses (ctrs)*/
- int ipc = 0; /* intermediate instruction counter */
- int b_count = 0; /* basic block counter */
- int s_count = 0; /* stack element counter */
- bool blockend = false; /* true if basic block end has been reached */
- bool iswide = false; /* true if last instruction was a wide*/
- instruction *iptr; /* current ptr into instruction array */
- int gp; /* global java instruction counter */
-
- int firstlocal = 0; /* first local variable of method */
- u1 *instructionstart; /* 1 for pcs which are valid instr. starts */
+ methodinfo *m; /* method being parsed */
+ parsedata_t pd;
+ instruction *iptr; /* current ptr into instruction array */
- constant_classref *cr;
- constant_classref *compr;
- classinfo *c;
- builtintable_entry *bte;
+ s4 bcindex; /* bytecode instruction index */
+ s4 nextbc; /* start of next bytecode instruction */
+ s4 opcode; /* bytecode instruction opcode */
- u2 lineindex = 0;
- u2 currentline = 0;
- u2 linepcchange = 0;
+ s4 irindex; /* IR instruction index */
+ s4 ircount; /* IR instruction count */
- u2 skipBasicBlockChange;
+ s4 bbcount; /* basic block count */
- /* allocate instruction array and block index table */
-
- /* 1 additional for end ipc */
- m->basicblockindex = DMNEW(s4, m->jcodelength + 1);
- memset(m->basicblockindex, 0, sizeof(s4) * (m->jcodelength + 1));
+ int s_count = 0; /* stack element counter */
+ bool blockend; /* true if basic block end has been reached */
+ bool iswide; /* true if last instruction was a wide */
- instructionstart = DMNEW(u1, m->jcodelength + 1);
- memset(instructionstart, 0, sizeof(u1) * (m->jcodelength + 1));
+ constant_classref *cr;
+ constant_classref *compr;
+ classinfo *c;
+ builtintable_entry *bte;
+ constant_FMIref *fmi;
+ methoddesc *md;
+ unresolved_method *um;
+ unresolved_field *uf;
+
+ resolve_result_t result;
+ u2 lineindex = 0;
+ u2 currentline = 0;
+ u2 linepcchange = 0;
+ u4 flags;
+ basicblock *bptr;
+
+ int *local_map; /* local pointer to renaming map */
+ /* is assigned to rd->local_map at the end */
+ branch_target_t *table;
+ lookup_target_t *lookup;
+ s4 i;
+ s4 j;
+
+ /* get required compiler data */
+
+ m = jd->m;
+
+ /* allocate buffers for local variable renaming */
+
+ local_map = DMNEW(int, m->maxlocals * 5);
+
+ for (i = 0; i < m->maxlocals; i++) {
+ local_map[i * 5 + 0] = 0;
+ local_map[i * 5 + 1] = 0;
+ local_map[i * 5 + 2] = 0;
+ local_map[i * 5 + 3] = 0;
+ local_map[i * 5 + 4] = 0;
+ }
- /* 1 additional for TRACEBUILTIN and 4 for MONITORENTER/EXIT */
- /* additional MONITOREXITS are reached by branches which are 3 bytes */
-
- iptr = m->instructions = DMNEW(instruction, m->jcodelength + 5);
+ /* initialize the parse data structures */
+
+ parse_setup(jd, &pd);
+
+ /* initialize local variables */
+
+ iptr = pd.instructions;
+ ircount = 0;
+ bbcount = 0;
+ blockend = false;
+ iswide = false;
- /* Zero the intermediate instructions array so we don't have any
- * invalid pointers in it if we cannot finish analyse_stack(). */
+ /* mark basic block boundaries for exception table */
- memset(iptr, 0, sizeof(instruction) * (m->jcodelength + 5));
-
- /* compute branch targets of exception table */
+ if (!parse_mark_exception_boundaries(jd, &pd))
+ return false;
- if (!fillextable(m,
- &(cd->exceptiontable[cd->exceptiontablelength-1]),
- m->exceptiontable,
- m->exceptiontablelength,
- &b_count))
- {
- return NULL;
- }
+ /* initialize stack element counter */
- s_count = 1 + m->exceptiontablelength; /* initialize stack element counter */
+ s_count = 1 + m->rawexceptiontablelength;
-#if defined(USE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- m->isleafmethod = false;
- }
-#endif
+ /* setup line number info */
- /* scan all java instructions */
currentline = 0;
linepcchange = 0;
if (m->linenumbercount == 0) {
lineindex = 0;
- }
+ }
else {
linepcchange = m->linenumbers[0].start_pc;
}
- skipBasicBlockChange=0;
- for (p = 0, gp = 0; p < m->jcodelength; gp += (nextp - p), p = nextp) {
-
- /* mark this position as a valid instruction start */
- if (!iswide) {
- instructionstart[gp] = 1;
- if (linepcchange==p) {
- if (m->linenumbercount > lineindex) {
- currentline = m->linenumbers[lineindex].line_number;
- lineindex++;
- if (lineindex < m->linenumbercount)
- linepcchange = m->linenumbers[lineindex].start_pc;
+ /*** LOOP OVER ALL BYTECODE INSTRUCTIONS **********************************/
+
+ for (bcindex = 0; bcindex < m->jcodelength; bcindex = nextbc) {
+
+ /* mark this position as a valid bytecode instruction start */
+
+ pd.bytecodestart[bcindex] = 1;
+
+ /* change the current line number, if necessary */
+
+ /* XXX rewrite this using pointer arithmetic */
+
+ if (linepcchange == bcindex) {
+ if (m->linenumbercount > lineindex) {
+next_linenumber:
+ currentline = m->linenumbers[lineindex].line_number;
+ lineindex++;
+ if (lineindex < m->linenumbercount) {
+ linepcchange = m->linenumbers[lineindex].start_pc;
+ if (linepcchange == bcindex)
+ goto next_linenumber;
}
}
}
- /* fetch next opcode */
-
- opcode = code_get_u1(p, m);
+fetch_opcode:
+ /* fetch next opcode */
- if (!skipBasicBlockChange) {
- m->basicblockindex[gp] |= (ipc << 1); /*store intermed cnt*/
- }
- else
- skipBasicBlockChange = 0;
+ opcode = SUCK_BE_U1(m->jcode + bcindex);
- /* some compilers put a JAVA_NOP after a blockend instruction */
+ /* If the previous instruction was a block-end instruction,
+ mark the current bytecode instruction as basic-block
+ starting instruction. */
- if ((opcode != JAVA_NOP) && (blockend == true)) {
- /* start new block */
+ /* NOTE: Some compilers put a JAVA_NOP after a blockend
+ instruction. */
- block_insert(gp);
+ if (blockend && (opcode != JAVA_NOP)) {
+ MARK_BASICBLOCK(&pd, bcindex);
blockend = false;
}
- nextp = p + jcommandsize[opcode]; /* compute next instruction start */
+ /* If the current bytecode instruction was marked as
+ basic-block starting instruction before (e.g. blockend,
+ forward-branch target), mark the current IR instruction
+ too. */
+
+ if (pd.basicblockstart[bcindex] != 0) {
+ /* We need a NOP as last instruction in each basic block
+ for basic block reordering (may be replaced with a GOTO
+ later). */
+
+ INSTRUCTIONS_CHECK(1);
+ OP(ICMD_NOP);
+ }
+
+ /* store intermediate instruction count (bit 0 mark block starts) */
+
+ pd.bytecodemap[bcindex] = ircount;
+
+ /* compute next instruction start */
+
+ nextbc = bcindex + jcommandsize[opcode];
- CHECK_END_OF_BYTECODE(nextp);
+ CHECK_END_OF_BYTECODE(nextbc);
- s_count += stackreq[opcode]; /* compute stack element count */
+ /* add stack elements produced by this instruction */
+
+ s_count += stackreq[opcode];
+
+ /* We check here for the space of 1 instruction in the
+ instruction array. If an opcode is converted to more than
+ 1 instruction, this is checked in the corresponding
+ case. */
+
+ INSTRUCTIONS_CHECK(1);
+
+ /* translate this bytecode instruction */
switch (opcode) {
+
case JAVA_NOP:
break;
- /* pushing constants onto the stack p */
+ /* pushing constants onto the stack ***********************************/
case JAVA_BIPUSH:
- LOADCONST_I(code_get_s1(p+1,m));
+ OP_LOADCONST_I(SUCK_BE_S1(m->jcode + bcindex + 1));
break;
case JAVA_SIPUSH:
- LOADCONST_I(code_get_s2(p+1,m));
+ OP_LOADCONST_I(SUCK_BE_S2(m->jcode + bcindex + 1));
break;
case JAVA_LDC1:
- i = code_get_u1(p + 1, m);
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
goto pushconstantitem;
case JAVA_LDC2:
case JAVA_LDC2W:
- i = code_get_u2(p + 1, m);
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
pushconstantitem:
+#if defined(ENABLE_VERIFIER)
if (i >= m->class->cpcount) {
- *exceptionptr = new_verifyerror(m,
+ exceptions_throw_verifyerror(m,
"Attempt to access constant outside range");
- return NULL;
+ return false;
}
+#endif
switch (m->class->cptags[i]) {
case CONSTANT_Integer:
- LOADCONST_I(((constant_integer *) (m->class->cpinfos[i]))->value);
+ OP_LOADCONST_I(((constant_integer *) (m->class->cpinfos[i]))->value);
break;
case CONSTANT_Long:
- LOADCONST_L(((constant_long *) (m->class->cpinfos[i]))->value);
+ OP_LOADCONST_L(((constant_long *) (m->class->cpinfos[i]))->value);
break;
case CONSTANT_Float:
- LOADCONST_F(((constant_float *) (m->class->cpinfos[i]))->value);
+ OP_LOADCONST_F(((constant_float *) (m->class->cpinfos[i]))->value);
break;
case CONSTANT_Double:
- LOADCONST_D(((constant_double *) (m->class->cpinfos[i]))->value);
+ OP_LOADCONST_D(((constant_double *) (m->class->cpinfos[i]))->value);
break;
case CONSTANT_String:
- LOADCONST_A(literalstring_new((utf *) (m->class->cpinfos[i])));
+ OP_LOADCONST_STRING(literalstring_new((utf *) (m->class->cpinfos[i])));
break;
case CONSTANT_Class:
cr = (constant_classref *) (m->class->cpinfos[i]);
- if (!resolve_classref(m, cr, resolveLazy, true,
- true, &c))
- return NULL;
+ if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
+ return false;
/* if not resolved, c == NULL */
- LOADCONST_A_CLASS(c, cr);
+ OP_LOADCONST_CLASSINFO_OR_CLASSREF_CHECK(c, cr);
+
break;
+
+#if defined(ENABLE_VERIFIER)
default:
- *exceptionptr = new_verifyerror(m,
+ exceptions_throw_verifyerror(m,
"Invalid constant type to push");
- return NULL;
+ return false;
+#endif
}
break;
case JAVA_ACONST_NULL:
- LOADCONST_A(NULL);
+ OP_LOADCONST_NULL();
break;
case JAVA_ICONST_M1:
case JAVA_ICONST_3:
case JAVA_ICONST_4:
case JAVA_ICONST_5:
- LOADCONST_I(opcode - JAVA_ICONST_0);
+ OP_LOADCONST_I(opcode - JAVA_ICONST_0);
break;
case JAVA_LCONST_0:
case JAVA_LCONST_1:
- LOADCONST_L(opcode - JAVA_LCONST_0);
+ OP_LOADCONST_L(opcode - JAVA_LCONST_0);
break;
case JAVA_FCONST_0:
case JAVA_FCONST_1:
case JAVA_FCONST_2:
- LOADCONST_F(opcode - JAVA_FCONST_0);
+ OP_LOADCONST_F(opcode - JAVA_FCONST_0);
break;
case JAVA_DCONST_0:
case JAVA_DCONST_1:
- LOADCONST_D(opcode - JAVA_DCONST_0);
+ OP_LOADCONST_D(opcode - JAVA_DCONST_0);
+ break;
+
+ /* stack operations ***************************************************/
+
+ /* We need space for additional ICMDs so we can translate these */
+ /* instructions to sequences of ICMD_COPY and ICMD_MOVE instructions. */
+
+ case JAVA_DUP_X1:
+ INSTRUCTIONS_CHECK(4);
+ OP(opcode);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ break;
+
+ case JAVA_DUP_X2:
+ INSTRUCTIONS_CHECK(6);
+ OP(opcode);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ break;
+
+ case JAVA_DUP2:
+ INSTRUCTIONS_CHECK(2);
+ OP(opcode);
+ OP(ICMD_NOP);
+ break;
+
+ case JAVA_DUP2_X1:
+ INSTRUCTIONS_CHECK(7);
+ OP(opcode);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ break;
+
+ case JAVA_DUP2_X2:
+ INSTRUCTIONS_CHECK(9);
+ OP(opcode);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ break;
+
+ case JAVA_SWAP:
+ INSTRUCTIONS_CHECK(3);
+ OP(opcode);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
break;
- /* loading variables onto the stack */
+ /* local variable access instructions *********************************/
case JAVA_ILOAD:
- case JAVA_LLOAD:
case JAVA_FLOAD:
- case JAVA_DLOAD:
case JAVA_ALOAD:
- if (!iswide) {
- i = code_get_u1(p + 1,m);
- }
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ }
+ else {
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ nextbc = bcindex + 3;
+ iswide = false;
+ }
+ OP_LOAD_ONEWORD(opcode, i, opcode - JAVA_ILOAD);
+ break;
+
+ case JAVA_LLOAD:
+ case JAVA_DLOAD:
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ }
else {
- i = code_get_u2(p + 1,m);
- nextp = p + 3;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ nextbc = bcindex + 3;
iswide = false;
}
- OP1LOAD(opcode, i + firstlocal);
+ OP_LOAD_TWOWORD(opcode, i, opcode - JAVA_ILOAD);
break;
case JAVA_ILOAD_0:
case JAVA_ILOAD_1:
case JAVA_ILOAD_2:
case JAVA_ILOAD_3:
- OP1LOAD(ICMD_ILOAD, opcode - JAVA_ILOAD_0 + firstlocal);
+ OP_LOAD_ONEWORD(ICMD_ILOAD, opcode - JAVA_ILOAD_0, TYPE_INT);
break;
case JAVA_LLOAD_0:
case JAVA_LLOAD_1:
case JAVA_LLOAD_2:
case JAVA_LLOAD_3:
- OP1LOAD(ICMD_LLOAD, opcode - JAVA_LLOAD_0 + firstlocal);
+ OP_LOAD_TWOWORD(ICMD_LLOAD, opcode - JAVA_LLOAD_0, TYPE_LNG);
break;
case JAVA_FLOAD_0:
case JAVA_FLOAD_1:
case JAVA_FLOAD_2:
case JAVA_FLOAD_3:
- OP1LOAD(ICMD_FLOAD, opcode - JAVA_FLOAD_0 + firstlocal);
+ OP_LOAD_ONEWORD(ICMD_FLOAD, opcode - JAVA_FLOAD_0, TYPE_FLT);
break;
case JAVA_DLOAD_0:
case JAVA_DLOAD_1:
case JAVA_DLOAD_2:
case JAVA_DLOAD_3:
- OP1LOAD(ICMD_DLOAD, opcode - JAVA_DLOAD_0 + firstlocal);
+ OP_LOAD_TWOWORD(ICMD_DLOAD, opcode - JAVA_DLOAD_0, TYPE_DBL);
break;
case JAVA_ALOAD_0:
case JAVA_ALOAD_1:
case JAVA_ALOAD_2:
case JAVA_ALOAD_3:
- OP1LOAD(ICMD_ALOAD, opcode - JAVA_ALOAD_0 + firstlocal);
+ OP_LOAD_ONEWORD(ICMD_ALOAD, opcode - JAVA_ALOAD_0, TYPE_ADR);
break;
- /* storing stack values into local variables */
-
case JAVA_ISTORE:
- case JAVA_LSTORE:
case JAVA_FSTORE:
- case JAVA_DSTORE:
case JAVA_ASTORE:
- if (!iswide) {
- i = code_get_u1(p + 1,m);
- }
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ }
+ else {
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ nextbc = bcindex + 3;
+ iswide = false;
+ }
+ OP_STORE_ONEWORD(opcode, i, opcode - JAVA_ISTORE);
+ break;
+
+ case JAVA_LSTORE:
+ case JAVA_DSTORE:
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ }
else {
- i = code_get_u2(p + 1,m);
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ nextbc = bcindex + 3;
iswide = false;
- nextp = p + 3;
}
- OP1STORE(opcode, i + firstlocal);
+ OP_STORE_TWOWORD(opcode, i, opcode - JAVA_ISTORE);
break;
case JAVA_ISTORE_0:
case JAVA_ISTORE_1:
case JAVA_ISTORE_2:
case JAVA_ISTORE_3:
- OP1STORE(ICMD_ISTORE, opcode - JAVA_ISTORE_0 + firstlocal);
+ OP_STORE_ONEWORD(ICMD_ISTORE, opcode - JAVA_ISTORE_0, TYPE_INT);
break;
case JAVA_LSTORE_0:
case JAVA_LSTORE_1:
case JAVA_LSTORE_2:
case JAVA_LSTORE_3:
- OP1STORE(ICMD_LSTORE, opcode - JAVA_LSTORE_0 + firstlocal);
+ OP_STORE_TWOWORD(ICMD_LSTORE, opcode - JAVA_LSTORE_0, TYPE_LNG);
break;
case JAVA_FSTORE_0:
case JAVA_FSTORE_1:
case JAVA_FSTORE_2:
case JAVA_FSTORE_3:
- OP1STORE(ICMD_FSTORE, opcode - JAVA_FSTORE_0 + firstlocal);
+ OP_STORE_ONEWORD(ICMD_FSTORE, opcode - JAVA_FSTORE_0, TYPE_FLT);
break;
case JAVA_DSTORE_0:
case JAVA_DSTORE_1:
case JAVA_DSTORE_2:
case JAVA_DSTORE_3:
- OP1STORE(ICMD_DSTORE, opcode - JAVA_DSTORE_0 + firstlocal);
+ OP_STORE_TWOWORD(ICMD_DSTORE, opcode - JAVA_DSTORE_0, TYPE_DBL);
break;
case JAVA_ASTORE_0:
case JAVA_ASTORE_1:
case JAVA_ASTORE_2:
case JAVA_ASTORE_3:
- OP1STORE(ICMD_ASTORE, opcode - JAVA_ASTORE_0 + firstlocal);
+ OP_STORE_ONEWORD(ICMD_ASTORE, opcode - JAVA_ASTORE_0, TYPE_ADR);
break;
case JAVA_IINC:
{
int v;
-
- if (!iswide) {
- i = code_get_u1(p + 1,m);
- v = code_get_s1(p + 2,m);
- }
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ v = SUCK_BE_S1(m->jcode + bcindex + 2);
+
+ }
else {
- i = code_get_u2(p + 1,m);
- v = code_get_s2(p + 3,m);
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ v = SUCK_BE_S2(m->jcode + bcindex + 3);
+ nextbc = bcindex + 5;
iswide = false;
- nextp = p + 5;
}
- INDEX_ONEWORD(i + firstlocal);
- OP2I(opcode, i + firstlocal, v);
+ INDEX_ONEWORD(i);
+ LOCALTYPE_USED(i, TYPE_INT);
+ OP_LOCALINDEX_I(opcode, i, v);
}
break;
- /* wider index for loading, storing and incrementing */
+ /* wider index for loading, storing and incrementing ******************/
case JAVA_WIDE:
+ bcindex++;
iswide = true;
- nextp = p + 1;
- break;
+ goto fetch_opcode;
/* managing arrays ****************************************************/
case JAVA_NEWARRAY:
- switch (code_get_s1(p + 1, m)) {
+ switch (SUCK_BE_S1(m->jcode + bcindex + 1)) {
case 4:
bte = builtintable_get_internal(BUILTIN_newarray_boolean);
break;
case 11:
bte = builtintable_get_internal(BUILTIN_newarray_long);
break;
+#if defined(ENABLE_VERIFIER)
default:
- *exceptionptr = new_verifyerror(m,
- "Invalid array-type to create");
- return NULL;
+ exceptions_throw_verifyerror(m, "Invalid array-type to create");
+ return false;
+#endif
}
- BUILTIN(bte, true, NULL, currentline);
+ OP_BUILTIN_CHECK_EXCEPTION(bte);
break;
case JAVA_ANEWARRAY:
- i = code_get_u2(p + 1, m);
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
compr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
- if (!compr)
- return NULL;
+ if (compr == NULL)
+ return false;
if (!(cr = class_get_classref_multiarray_of(1, compr)))
- return NULL;
+ return false;
if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
- return NULL;
+ return false;
- LOADCONST_A_BUILTIN(c, cr);
+ INSTRUCTIONS_CHECK(2);
+ OP_LOADCONST_CLASSINFO_OR_CLASSREF_NOCHECK(c, cr);
bte = builtintable_get_internal(BUILTIN_newarray);
- BUILTIN(bte, true, NULL, currentline);
+ OP_BUILTIN_CHECK_EXCEPTION(bte);
s_count++;
break;
case JAVA_MULTIANEWARRAY:
- m->isleafmethod = false;
- i = code_get_u2(p + 1, m);
- {
- s4 v = code_get_u1(p + 3, m);
-
- cr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
- if (!cr)
- return NULL;
-
- if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
- return NULL;
-
- /* if unresolved, c == NULL */
- OP2AT(opcode, v, c, cr, currentline);
- }
+ jd->isleafmethod = false;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ j = SUCK_BE_U1(m->jcode + bcindex + 3);
+
+ cr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
+ if (cr == NULL)
+ return false;
+
+ if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
+ return false;
+
+ /* if unresolved, c == NULL */
+
+ iptr->s1.argcount = j;
+ OP_S3_CLASSINFO_OR_CLASSREF(opcode, c, cr, INS_FLAG_CHECK);
break;
+ /* control flow instructions ******************************************/
+
case JAVA_IFEQ:
case JAVA_IFLT:
case JAVA_IFLE:
case JAVA_IF_ACMPEQ:
case JAVA_IF_ACMPNE:
case JAVA_GOTO:
- case JAVA_JSR:
- i = p + code_get_s2(p + 1,m);
+ i = bcindex + SUCK_BE_S2(m->jcode + bcindex + 1);
CHECK_BYTECODE_INDEX(i);
- block_insert(i);
+ MARK_BASICBLOCK(&pd, i);
blockend = true;
- OP1(opcode, i);
+ OP_INSINDEX(opcode, i);
break;
case JAVA_GOTO_W:
- case JAVA_JSR_W:
- i = p + code_get_s4(p + 1,m);
+ i = bcindex + SUCK_BE_S4(m->jcode + bcindex + 1);
CHECK_BYTECODE_INDEX(i);
- block_insert(i);
+ MARK_BASICBLOCK(&pd, i);
blockend = true;
- OP1(opcode, i);
+ OP_INSINDEX(ICMD_GOTO, i);
break;
+ case JAVA_JSR:
+ i = bcindex + SUCK_BE_S2(m->jcode + bcindex + 1);
+jsr_tail:
+ CHECK_BYTECODE_INDEX(i);
+ MARK_BASICBLOCK(&pd, i);
+ blockend = true;
+ OP_PREPARE_ZEROFLAGS(JAVA_JSR);
+ iptr->sx.s23.s3.jsrtarget.insindex = i;
+ PINC;
+ break;
+
+ case JAVA_JSR_W:
+ i = bcindex + SUCK_BE_S4(m->jcode + bcindex + 1);
+ goto jsr_tail;
+
case JAVA_RET:
- if (!iswide) {
- i = code_get_u1(p + 1,m);
- }
+ if (iswide == false) {
+ i = SUCK_BE_U1(m->jcode + bcindex + 1);
+ }
else {
- i = code_get_u2(p + 1,m);
- nextp = p + 3;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ nextbc = bcindex + 3;
iswide = false;
}
blockend = true;
-
- OP1LOAD(opcode, i + firstlocal);
+
+ OP_LOAD_ONEWORD(opcode, i, TYPE_ADR);
break;
case JAVA_IRETURN:
case JAVA_ARETURN:
case JAVA_RETURN:
blockend = true;
- /* zero val.a so no patcher is inserted */
- /* the type checker may set this later */
- iptr->val.a = NULL;
+ /* XXX ARETURN will need a flag in the typechecker */
OP(opcode);
break;
case JAVA_ATHROW:
blockend = true;
- /* zero val.a so no patcher is inserted */
- /* the type checker may set this later */
- iptr->val.a = NULL;
+ /* XXX ATHROW will need a flag in the typechecker */
OP(opcode);
break;
-
+
/* table jumps ********************************************************/
case JAVA_LOOKUPSWITCH:
{
s4 num, j;
- s4 *tablep;
+ lookup_target_t *lookup;
#if defined(ENABLE_VERIFIER)
s4 prevvalue = 0;
#endif
-
blockend = true;
- nextp = ALIGN((p + 1), 4);
+ nextbc = MEMORY_ALIGN((bcindex + 1), 4);
- CHECK_END_OF_BYTECODE(nextp + 8);
+ CHECK_END_OF_BYTECODE(nextbc + 8);
- tablep = (s4 *) (m->jcode + nextp);
-
- OP2A(opcode, 0, tablep, currentline);
+ OP_PREPARE_ZEROFLAGS(opcode);
/* default target */
- j = p + code_get_s4(nextp, m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
+ j = bcindex + SUCK_BE_S4(m->jcode + nextbc);
+ iptr->sx.s23.s3.lookupdefault.insindex = j;
+ nextbc += 4;
CHECK_BYTECODE_INDEX(j);
- block_insert(j);
+ MARK_BASICBLOCK(&pd, j);
/* number of pairs */
- num = code_get_u4(nextp, m);
- *tablep = num;
- tablep++;
- nextp += 4;
+ num = SUCK_BE_U4(m->jcode + nextbc);
+ iptr->sx.s23.s2.lookupcount = num;
+ nextbc += 4;
+
+ /* allocate the intermediate code table */
- CHECK_END_OF_BYTECODE(nextp + 8 * num);
+ lookup = DMNEW(lookup_target_t, num);
+ iptr->dst.lookup = lookup;
+
+ /* iterate over the lookup table */
+
+ CHECK_END_OF_BYTECODE(nextbc + 8 * num);
for (i = 0; i < num; i++) {
/* value */
- j = code_get_s4(nextp, m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
+ j = SUCK_BE_S4(m->jcode + nextbc);
+ lookup->value = j;
+
+ nextbc += 4;
#if defined(ENABLE_VERIFIER)
/* check if the lookup table is sorted correctly */
-
+
if (i && (j <= prevvalue)) {
- *exceptionptr = new_verifyerror(m, "Unsorted lookup switch");
- return NULL;
+ exceptions_throw_verifyerror(m, "Unsorted lookup switch");
+ return false;
}
prevvalue = j;
#endif
-
/* target */
- j = p + code_get_s4(nextp,m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
+ j = bcindex + SUCK_BE_S4(m->jcode + nextbc);
+ lookup->target.insindex = j;
+ lookup++;
+ nextbc += 4;
CHECK_BYTECODE_INDEX(j);
- block_insert(j);
+ MARK_BASICBLOCK(&pd, j);
}
+ PINC;
break;
}
case JAVA_TABLESWITCH:
{
s4 num, j;
- s4 *tablep;
+ s4 deftarget;
+ branch_target_t *table;
blockend = true;
- nextp = ALIGN((p + 1), 4);
-
- CHECK_END_OF_BYTECODE(nextp + 12);
+ nextbc = MEMORY_ALIGN((bcindex + 1), 4);
- tablep = (s4 *) (m->jcode + nextp);
+ CHECK_END_OF_BYTECODE(nextbc + 12);
- OP2A(opcode, 0, tablep, currentline);
+ OP_PREPARE_ZEROFLAGS(opcode);
/* default target */
- j = p + code_get_s4(nextp, m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
- CHECK_BYTECODE_INDEX(j);
- block_insert(j);
+ deftarget = bcindex + SUCK_BE_S4(m->jcode + nextbc);
+ nextbc += 4;
+ CHECK_BYTECODE_INDEX(deftarget);
+ MARK_BASICBLOCK(&pd, deftarget);
/* lower bound */
- j = code_get_s4(nextp, m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
+ j = SUCK_BE_S4(m->jcode + nextbc);
+ iptr->sx.s23.s2.tablelow = j;
+ nextbc += 4;
/* upper bound */
- num = code_get_s4(nextp, m);
- *tablep = num; /* restore for little endian */
- tablep++;
- nextp += 4;
+ num = SUCK_BE_S4(m->jcode + nextbc);
+ iptr->sx.s23.s3.tablehigh = num;
+ nextbc += 4;
+
+ /* calculate the number of table entries */
- num -= j; /* difference of upper - lower */
+ num = num - j + 1;
#if defined(ENABLE_VERIFIER)
- if (num < 0) {
- *exceptionptr = new_verifyerror(m,
+ if (num < 1) {
+ exceptions_throw_verifyerror(m,
"invalid TABLESWITCH: upper bound < lower bound");
- return NULL;
+ return false;
}
#endif
+ /* create the intermediate code table */
+ /* the first entry is the default target */
+
+ table = DMNEW(branch_target_t, 1 + num);
+ iptr->dst.table = table;
+ (table++)->insindex = deftarget;
- CHECK_END_OF_BYTECODE(nextp + 4 * (num + 1));
+ /* iterate over the target table */
- for (i = 0; i <= num; i++) {
- j = p + code_get_s4(nextp,m);
- *tablep = j; /* restore for little endian */
- tablep++;
- nextp += 4;
+ CHECK_END_OF_BYTECODE(nextbc + 4 * num);
+
+ for (i = 0; i < num; i++) {
+ j = bcindex + SUCK_BE_S4(m->jcode + nextbc);
+ (table++)->insindex = j;
+ nextbc += 4;
CHECK_BYTECODE_INDEX(j);
- block_insert(j);
+ MARK_BASICBLOCK(&pd, j);
}
+ PINC;
break;
}
case JAVA_AASTORE:
OP(opcode);
- m->isleafmethod = false;
+ jd->isleafmethod = false;
break;
case JAVA_GETSTATIC:
case JAVA_PUTSTATIC:
case JAVA_GETFIELD:
case JAVA_PUTFIELD:
- {
- constant_FMIref *fr;
- unresolved_field *uf;
- fieldinfo *fi;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ fmi = class_getconstant(m->class, i, CONSTANT_Fieldref);
- i = code_get_u2(p + 1, m);
- fr = class_getconstant(m->class, i,
- CONSTANT_Fieldref);
- if (!fr)
- return NULL;
+ if (fmi == NULL)
+ return false;
- OP2A_NOINC(opcode, fr->parseddesc.fd->type, fr, currentline);
+ OP_PREPARE_ZEROFLAGS(opcode);
+ iptr->sx.s23.s3.fmiref = fmi;
- if (!(uf = create_unresolved_field(m->class,
- m,
- iptr)))
- return NULL;
+ /* only with -noverify, otherwise the typechecker does this */
- /* store unresolved_field pointer */
+#if defined(ENABLE_VERIFIER)
+ if (!JITDATA_HAS_FLAG_VERIFY(jd)) {
+#endif
+ result = resolve_field_lazy(m, fmi);
- iptr->target = uf;
+ if (result == resolveFailed)
+ return false;
- /* only with -noverify, otherwise the typechecker does this */
+ if (result != resolveSucceeded) {
+ uf = resolve_create_unresolved_field(m->class, m, iptr);
- if (!opt_verify) {
- if (!resolve_field(uf, resolveLazy, &fi))
- return NULL;
+ if (uf == NULL)
+ return false;
- iptr->val.a = fi;
+ /* store the unresolved_field pointer */
- }
- else {
- iptr->val.a = NULL;
+ iptr->sx.s23.s3.uf = uf;
+ iptr->flags.bits |= INS_FLAG_UNRESOLVED;
}
- PINC;
+#if defined(ENABLE_VERIFIER)
}
+#endif
+ PINC;
break;
/* method invocation **************************************************/
case JAVA_INVOKESTATIC:
- i = code_get_u2(p + 1, m);
- {
- constant_FMIref *mr;
- methoddesc *md;
- unresolved_method *um;
- methodinfo *mi;
-
- m->isleafmethod = false;
-
- mr = class_getconstant(m->class, i,
- CONSTANT_Methodref);
- if (!mr)
- return NULL;
-
- md = mr->parseddesc.md;
+ OP_PREPARE_ZEROFLAGS(opcode);
- if (!md->params)
- if (!descriptor_params_from_paramtypes(md, ACC_STATIC))
- return NULL;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ fmi = class_getconstant(m->class, i, CONSTANT_Methodref);
- OP2A_NOINC(opcode, 0, mr, currentline);
+ if (fmi == NULL)
+ return false;
- um = create_unresolved_method(m->class,
- m, iptr);
+ md = fmi->parseddesc.md;
- if (!um)
- return NULL;
+ if (md->params == NULL)
+ if (!descriptor_params_from_paramtypes(md, ACC_STATIC))
+ return false;
- /* store the unresolved_method pointer */
-
- iptr->target = um;
-
- /* only with -noverify, otherwise the typechecker does this */
-
- if (!opt_verify) {
- if (!resolve_method(um, resolveLazy, &mi))
- return NULL;
-
- iptr->val.a = mi;
- }
- else {
- iptr->val.a = NULL;
- }
- PINC;
- }
- break;
+ goto invoke_method;
case JAVA_INVOKESPECIAL:
- case JAVA_INVOKEVIRTUAL:
- {
- constant_FMIref *mr;
- methoddesc *md;
- unresolved_method *um;
- methodinfo *mi;
-
- m->isleafmethod = false;
+ OP_PREPARE_FLAGS(opcode, INS_FLAG_CHECK);
- i = code_get_u2(p + 1, m);
- mr = class_getconstant(m->class, i,
- CONSTANT_Methodref);
- if (!mr)
- return NULL;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ fmi = class_getconstant(m->class, i, CONSTANT_Methodref);
- md = mr->parseddesc.md;
+ goto invoke_nonstatic_method;
- if (!md->params)
- if (!descriptor_params_from_paramtypes(md, 0))
- return NULL;
-
- OP2A_NOINC(opcode, 0, mr, currentline);
+ case JAVA_INVOKEINTERFACE:
+ OP_PREPARE_ZEROFLAGS(opcode);
- um = create_unresolved_method(m->class,
- m, iptr);
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ fmi = class_getconstant(m->class, i, CONSTANT_InterfaceMethodref);
- if (!um)
- return NULL;
+ goto invoke_nonstatic_method;
- /* store the unresolved_method* */
+ case JAVA_INVOKEVIRTUAL:
+ OP_PREPARE_ZEROFLAGS(opcode);
- iptr->target = um;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ fmi = class_getconstant(m->class, i, CONSTANT_Methodref);
- /* only with -noverify, otherwise the typechecker does this */
+invoke_nonstatic_method:
+ if (fmi == NULL)
+ return false;
- if (!opt_verify) {
- if (!resolve_method(um, resolveLazy, &mi))
- return NULL;
+ md = fmi->parseddesc.md;
- iptr->val.a = mi;
- }
- else {
- iptr->val.a = NULL;
- }
- PINC;
- }
- break;
+ if (md->params == NULL)
+ if (!descriptor_params_from_paramtypes(md, 0))
+ return false;
- case JAVA_INVOKEINTERFACE:
- i = code_get_u2(p + 1, m);
- {
- constant_FMIref *mr;
- methoddesc *md;
- unresolved_method *um;
- methodinfo *mi;
-
- m->isleafmethod = false;
+invoke_method:
+ jd->isleafmethod = false;
- mr = class_getconstant(m->class, i,
- CONSTANT_InterfaceMethodref);
- if (!mr)
- return NULL;
+ iptr->sx.s23.s3.fmiref = fmi;
- md = mr->parseddesc.md;
+ /* only with -noverify, otherwise the typechecker does this */
- if (!md->params)
- if (!descriptor_params_from_paramtypes(md, 0))
- return NULL;
+#if defined(ENABLE_VERIFIER)
+ if (!JITDATA_HAS_FLAG_VERIFY(jd)) {
+#endif
+ result = resolve_method_lazy(m, fmi,
+ (opcode == JAVA_INVOKESPECIAL));
- OP2A_NOINC(opcode, 0, mr, currentline);
+ if (result == resolveFailed)
+ return false;
- um = create_unresolved_method(m->class,
- m, iptr);
+ if (result == resolveSucceeded) {
+ methodinfo *mi = iptr->sx.s23.s3.fmiref->p.method;
- if (!um)
- return NULL;
+ /* if this call is monomorphic, turn it into an
+ INVOKESPECIAL */
- /* store the unresolved_method* */
+ assert(IS_FMIREF_RESOLVED(iptr->sx.s23.s3.fmiref));
- iptr->target = um;
+ if ((iptr->opc == ICMD_INVOKEVIRTUAL)
+ && (mi->flags & (ACC_FINAL | ACC_PRIVATE)))
+ {
+ iptr->opc = ICMD_INVOKESPECIAL;
+ iptr->flags.bits |= INS_FLAG_CHECK;
+ }
+ }
+ else {
+ um = resolve_create_unresolved_method(m->class, m, fmi,
+ (opcode == JAVA_INVOKESTATIC),
+ (opcode == JAVA_INVOKESPECIAL));
- /* only with -noverify, otherwise the typechecker does this */
+ if (um == NULL)
+ return false;
- if (!opt_verify) {
- if (!resolve_method(um, resolveLazy, &mi))
- return NULL;
+ /* store the unresolved_method pointer */
- iptr->val.a = mi;
+ iptr->sx.s23.s3.um = um;
+ iptr->flags.bits |= INS_FLAG_UNRESOLVED;
}
- else {
- iptr->val.a = NULL;
- }
- PINC;
+#if defined(ENABLE_VERIFIER)
}
+#endif
+ PINC;
break;
- /* miscellaneous object operations ************************************/
+ /* instructions taking class arguments ********************************/
case JAVA_NEW:
- i = code_get_u2(p + 1, m);
- cr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
- if (!cr)
- return NULL;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ cr = class_getconstant(m->class, i, CONSTANT_Class);
+
+ if (cr == NULL)
+ return false;
- if (!resolve_classref(m, cr, resolveLazy, true, true,
- &c))
- return NULL;
+ if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
+ return false;
- LOADCONST_A_BUILTIN(c, cr);
+ INSTRUCTIONS_CHECK(2);
+ OP_LOADCONST_CLASSINFO_OR_CLASSREF_NOCHECK(c, cr);
bte = builtintable_get_internal(BUILTIN_new);
- BUILTIN(bte, true, NULL, currentline);
+ OP_BUILTIN_CHECK_EXCEPTION(bte);
s_count++;
break;
case JAVA_CHECKCAST:
- i = code_get_u2(p + 1, m);
- cr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
- if (!cr)
- return NULL;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ cr = class_getconstant(m->class, i, CONSTANT_Class);
- if (!resolve_classref(m, cr, resolveLazy, true,
- true, &c))
- return NULL;
+ if (cr == NULL)
+ return false;
+
+ if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
+ return false;
if (cr->name->text[0] == '[') {
/* array type cast-check */
- OP2AT(opcode, 0, c, cr, currentline);
- m->isleafmethod = false;
-
- }
+ flags = INS_FLAG_CHECK | INS_FLAG_ARRAY;
+ jd->isleafmethod = false;
+ }
else {
/* object type cast-check */
- OP2AT(opcode, 1, c, cr, currentline);
+ flags = INS_FLAG_CHECK;
}
+ OP_S3_CLASSINFO_OR_CLASSREF(opcode, c, cr, flags);
break;
case JAVA_INSTANCEOF:
- i = code_get_u2(p + 1,m);
- cr = (constant_classref *) class_getconstant(m->class, i, CONSTANT_Class);
- if (!cr)
- return NULL;
+ i = SUCK_BE_U2(m->jcode + bcindex + 1);
+ cr = class_getconstant(m->class, i, CONSTANT_Class);
+
+ if (cr == NULL)
+ return false;
if (!resolve_classref(m, cr, resolveLazy, true, true, &c))
- return NULL;
+ return false;
if (cr->name->text[0] == '[') {
/* array type cast-check */
- LOADCONST_A_BUILTIN(c, cr);
+ INSTRUCTIONS_CHECK(2);
+ OP_LOADCONST_CLASSINFO_OR_CLASSREF_NOCHECK(c, cr);
bte = builtintable_get_internal(BUILTIN_arrayinstanceof);
- BUILTIN(bte, false, NULL, currentline);
+ OP_BUILTIN_NO_EXCEPTION(bte);
s_count++;
-
- }
+ }
else {
/* object type cast-check */
- OP2AT(opcode, 1, c, cr, currentline);
+ OP_S3_CLASSINFO_OR_CLASSREF(opcode, c, cr, 0 /* flags*/);
}
break;
+ /* synchronization instructions ***************************************/
+
case JAVA_MONITORENTER:
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
if (checksync) {
- OP(ICMD_CHECKNULL);
- bte = builtintable_get_internal(BUILTIN_monitorenter);
- BUILTIN(bte, false, NULL, currentline);
- }
+ bte = builtintable_get_internal(LOCK_monitor_enter);
+ OP_BUILTIN_CHECK_EXCEPTION(bte);
+ }
else
#endif
- {
- OP(ICMD_CHECKNULL);
- OP(ICMD_POP);
- }
+ {
+ OP_CHECK_EXCEPTION(ICMD_CHECKNULL);
+ OP(ICMD_POP);
+ }
break;
case JAVA_MONITOREXIT:
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
if (checksync) {
- bte = builtintable_get_internal(BUILTIN_monitorexit);
- BUILTIN(bte, false, NULL, currentline);
- }
+ bte = builtintable_get_internal(LOCK_monitor_exit);
+ OP_BUILTIN_CHECK_EXCEPTION(bte);
+ }
else
#endif
- {
- OP(ICMD_POP);
- }
+ {
+ OP_CHECK_EXCEPTION(ICMD_CHECKNULL);
+ OP(ICMD_POP);
+ }
break;
- /* any other basic operation ******************************************/
+ /* arithmetic instructions that may become builtin functions **********/
case JAVA_IDIV:
#if !SUPPORT_DIVISION
bte = builtintable_get_internal(BUILTIN_idiv);
- OP2A(opcode, bte->md->paramcount, bte, currentline);
- m->isleafmethod = false;
+ OP_BUILTIN_ARITHMETIC(opcode, bte);
#else
+# if SUPPORT_HARDWARE_DIVIDE_BY_ZERO
OP(opcode);
+# else
+ OP_CHECK_EXCEPTION(opcode);
+# endif
#endif
break;
case JAVA_IREM:
#if !SUPPORT_DIVISION
bte = builtintable_get_internal(BUILTIN_irem);
- OP2A(opcode, bte->md->paramcount, bte, currentline);
- m->isleafmethod = false;
+ OP_BUILTIN_ARITHMETIC(opcode, bte);
#else
+# if SUPPORT_HARDWARE_DIVIDE_BY_ZERO
OP(opcode);
+# else
+ OP_CHECK_EXCEPTION(opcode);
+# endif
#endif
break;
case JAVA_LDIV:
#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
bte = builtintable_get_internal(BUILTIN_ldiv);
- OP2A(opcode, bte->md->paramcount, bte, currentline);
- m->isleafmethod = false;
+ OP_BUILTIN_ARITHMETIC(opcode, bte);
#else
+# if SUPPORT_HARDWARE_DIVIDE_BY_ZERO
OP(opcode);
+# else
+ OP_CHECK_EXCEPTION(opcode);
+# endif
#endif
break;
case JAVA_LREM:
#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
bte = builtintable_get_internal(BUILTIN_lrem);
- OP2A(opcode, bte->md->paramcount, bte, currentline);
- m->isleafmethod = false;
+ OP_BUILTIN_ARITHMETIC(opcode, bte);
#else
+# if SUPPORT_HARDWARE_DIVIDE_BY_ZERO
OP(opcode);
+# else
+ OP_CHECK_EXCEPTION(opcode);
+# endif
#endif
break;
OP(opcode);
#else
bte = builtintable_get_internal(BUILTIN_frem);
- BUILTIN(bte, false, NULL, currentline);
+ OP_BUILTIN_NO_EXCEPTION(bte);
#endif
break;
OP(opcode);
#else
bte = builtintable_get_internal(BUILTIN_drem);
- BUILTIN(bte, false, NULL, currentline);
+ OP_BUILTIN_NO_EXCEPTION(bte);
#endif
break;
#if defined(__ALPHA__)
if (!opt_noieee) {
bte = builtintable_get_internal(BUILTIN_f2i);
- BUILTIN(bte, false, NULL, currentline);
- }
+ OP_BUILTIN_NO_EXCEPTION(bte);
+ }
else
#endif
- {
- OP(opcode);
- }
+ {
+ OP(opcode);
+ }
break;
case JAVA_F2L:
#if defined(__ALPHA__)
if (!opt_noieee) {
bte = builtintable_get_internal(BUILTIN_f2l);
- BUILTIN(bte, false, NULL, currentline);
- }
- else
+ OP_BUILTIN_NO_EXCEPTION(bte);
+ }
+ else
#endif
- {
- OP(opcode);
- }
+ {
+ OP(opcode);
+ }
break;
case JAVA_D2I:
#if defined(__ALPHA__)
if (!opt_noieee) {
bte = builtintable_get_internal(BUILTIN_d2i);
- BUILTIN(bte, false, NULL, currentline);
- }
+ OP_BUILTIN_NO_EXCEPTION(bte);
+ }
else
#endif
- {
- OP(opcode);
- }
+ {
+ OP(opcode);
+ }
break;
case JAVA_D2L:
#if defined(__ALPHA__)
if (!opt_noieee) {
bte = builtintable_get_internal(BUILTIN_d2l);
- BUILTIN(bte, false, NULL, currentline);
- }
+ OP_BUILTIN_NO_EXCEPTION(bte);
+ }
else
#endif
- {
- OP(opcode);
- }
+ {
+ OP(opcode);
+ }
break;
+ /* invalid opcodes ****************************************************/
+
+ /* check for invalid opcodes if the verifier is enabled */
+#if defined(ENABLE_VERIFIER)
case JAVA_BREAKPOINT:
- *exceptionptr =
- new_verifyerror(m, "Quick instructions shouldn't appear yet.");
- return NULL;
+ exceptions_throw_verifyerror(m, "Quick instructions shouldn't appear, yet.");
+ return false;
case 186: /* unused opcode */
case 203:
case 253:
case 254:
case 255:
- *exceptionptr =
- new_verifyerror(m,"Illegal opcode %d at instr %d\n",
- opcode, ipc);
- return NULL;
+ exceptions_throw_verifyerror(m, "Illegal opcode %d at instr %d\n",
+ opcode, ircount);
+ return false;
break;
+#endif /* defined(ENABLE_VERIFIER) */
+
+ /* opcodes that don't require translation *****************************/
default:
+ /* straight-forward translation to ICMD */
OP(opcode);
break;
-
+
} /* end switch */
+ /* verifier checks ****************************************************/
+
+#if defined(ENABLE_VERIFIER)
/* If WIDE was used correctly, iswide should have been reset by now. */
- if (iswide && opcode != JAVA_WIDE) {
- *exceptionptr = new_verifyerror(m,
+ if (iswide) {
+ exceptions_throw_verifyerror(m,
"Illegal instruction: WIDE before incompatible opcode");
- return NULL;
+ return false;
}
+#endif /* defined(ENABLE_VERIFIER) */
} /* end for */
- if (p != m->jcodelength) {
- printf("p (%d) != m->jcodelength (%d)\n",p,m->jcodelength);
- *exceptionptr = new_verifyerror(m,
+ if (JITDATA_HAS_FLAG_REORDER(jd)) {
+ /* add a NOP to the last basic block */
+
+ INSTRUCTIONS_CHECK(1);
+ OP(ICMD_NOP);
+ }
+
+ /*** END OF LOOP **********************************************************/
+
+ /* assert that we did not write more ICMDs than allocated */
+
+ assert(ircount <= pd.instructionslength);
+ assert(ircount == (iptr - pd.instructions));
+
+ /*** verifier checks ******************************************************/
+
+#if defined(ENABLE_VERIFIER)
+ if (bcindex != m->jcodelength) {
+ exceptions_throw_verifyerror(m,
"Command-sequence crosses code-boundary");
- return NULL;
+ return false;
}
if (!blockend) {
- *exceptionptr = new_verifyerror(m, "Falling off the end of the code");
- return NULL;
+ exceptions_throw_verifyerror(m, "Falling off the end of the code");
+ return false;
}
+#endif /* defined(ENABLE_VERIFIER) */
+
+ /*** setup the methodinfo, allocate stack and basic blocks ****************/
- /* adjust block count if target 0 is not first intermediate instruction */
+ /* identify basic blocks */
- if (!m->basicblockindex[0] || (m->basicblockindex[0] > 1))
- b_count++;
+ /* check if first instruction is a branch target */
- /* copy local to method variables */
+ if (pd.basicblockstart[0] == 1) {
+ jd->branchtoentry = true;
+ }
+ else {
+ /* first instruction always starts a basic block */
- m->instructioncount = ipc;
- m->basicblockcount = b_count;
- m->stackcount = s_count + m->basicblockcount * m->maxstack;
+ iptr = pd.instructions;
- /* allocate stack table */
+ iptr->flags.bits |= INS_FLAG_BASICBLOCK;
+ }
- m->stack = DMNEW(stackelement, m->stackcount);
+ /* Iterate over all bytecode instructions and set missing
+ basic-block starts in IR instructions. */
- {
- basicblock *bptr;
+ for (bcindex = 0; bcindex < m->jcodelength; bcindex++) {
+ /* Does the current bytecode instruction start a basic
+ block? */
- bptr = m->basicblocks = DMNEW(basicblock, b_count + 1); /* one more for end ipc */
+ if (pd.basicblockstart[bcindex] == 1) {
+#if defined(ENABLE_VERIFIER)
+ /* Check if this bytecode basic-block start at the
+ beginning of a bytecode instruction. */
- b_count = 0;
- m->c_debug_nr = 0;
-
- /* additional block if target 0 is not first intermediate instruction */
+ if (pd.bytecodestart[bcindex] == 0) {
+ exceptions_throw_verifyerror(m,
+ "Branch into middle of instruction");
+ return false;
+ }
+#endif
+
+ /* Get the IR instruction mapped to the bytecode
+ instruction and set the basic block flag. */
+
+ irindex = pd.bytecodemap[bcindex];
+ iptr = pd.instructions + irindex;
+
+ iptr->flags.bits |= INS_FLAG_BASICBLOCK;
+ }
+ }
+
+ /* IR instruction index to basic-block index mapping */
+
+ pd.instructionmap = DMNEW(s4, ircount);
+ MZERO(pd.instructionmap, s4, ircount);
+
+ /* Iterate over all IR instructions and count the basic blocks. */
+
+ iptr = pd.instructions;
+
+ bbcount = 0;
+
+ for (i = 0; i < ircount; i++, iptr++) {
+ if (INSTRUCTION_STARTS_BASICBLOCK(iptr)) {
+ /* store the basic-block number in the IR instruction
+ map */
+
+ pd.instructionmap[i] = bbcount;
+
+ /* post-increment the basic-block count */
- if (!m->basicblockindex[0] || (m->basicblockindex[0] > 1)) {
- BASICBLOCK_INIT(bptr,m);
+ bbcount++;
+ }
+ }
+
+ /* Allocate basic block array (one more for end ipc). */
+
+ jd->basicblocks = DMNEW(basicblock, bbcount + 1);
+ MZERO(jd->basicblocks, basicblock, bbcount + 1);
+
+ /* Now iterate again over all IR instructions and initialize the
+ basic block structures and, in the same loop, resolve the
+ branch-target instruction indices to basic blocks. */
+
+ iptr = pd.instructions;
+ bptr = jd->basicblocks;
+
+ bbcount = 0;
+
+ for (i = 0; i < ircount; i++, iptr++) {
+ /* check for basic block */
+
+ if (INSTRUCTION_STARTS_BASICBLOCK(iptr)) {
+ /* intialize the basic block */
+
+ BASICBLOCK_INIT(bptr, m);
+
+ bptr->iinstr = iptr;
+
+ if (bbcount > 0) {
+ bptr[-1].icount = bptr->iinstr - bptr[-1].iinstr;
+ }
- bptr->iinstr = m->instructions;
/* bptr->icount is set when the next block is allocated */
+ bptr->nr = bbcount++;
bptr++;
- b_count++;
bptr[-1].next = bptr;
}
- /* allocate blocks */
+ /* resolve instruction indices to basic blocks */
+
+ switch (iptr->opc) {
+ case JAVA_IFEQ:
+ case JAVA_IFLT:
+ case JAVA_IFLE:
+ case JAVA_IFNE:
+ case JAVA_IFGT:
+ case JAVA_IFGE:
+ case JAVA_IFNULL:
+ case JAVA_IFNONNULL:
+ case JAVA_IF_ICMPEQ:
+ case JAVA_IF_ICMPNE:
+ case JAVA_IF_ICMPLT:
+ case JAVA_IF_ICMPGT:
+ case JAVA_IF_ICMPLE:
+ case JAVA_IF_ICMPGE:
+ case JAVA_IF_ACMPEQ:
+ case JAVA_IF_ACMPNE:
+ case JAVA_GOTO:
+ BYTECODEINDEX_TO_BASICBLOCK(iptr->dst);
+ break;
- for (p = 0; p < m->jcodelength; p++) {
- if (m->basicblockindex[p] & 1) {
- /* Check if this block starts at the beginning of an */
- /* instruction. */
+ case ICMD_JSR:
+ BYTECODEINDEX_TO_BASICBLOCK(iptr->sx.s23.s3.jsrtarget);
+ break;
- if (!instructionstart[p]) {
- *exceptionptr = new_verifyerror(m,
- "Branch into middle of instruction");
- return NULL;
- }
+ case ICMD_TABLESWITCH:
+ table = iptr->dst.table;
- /* allocate the block */
+ BYTECODEINDEX_TO_BASICBLOCK(*table);
+ table++;
- BASICBLOCK_INIT(bptr,m);
+ j = iptr->sx.s23.s3.tablehigh - iptr->sx.s23.s2.tablelow + 1;
- bptr->iinstr = m->instructions + (m->basicblockindex[p] >> 1);
- if (b_count) {
- bptr[-1].icount = bptr->iinstr - bptr[-1].iinstr;
- }
- /* bptr->icount is set when the next block is allocated */
+ while (--j >= 0) {
+ BYTECODEINDEX_TO_BASICBLOCK(*table);
+ table++;
+ }
+ break;
+
+ case ICMD_LOOKUPSWITCH:
+ BYTECODEINDEX_TO_BASICBLOCK(iptr->sx.s23.s3.lookupdefault);
+
+ lookup = iptr->dst.lookup;
- m->basicblockindex[p] = b_count;
+ j = iptr->sx.s23.s2.lookupcount;
- bptr++;
- b_count++;
- bptr[-1].next = bptr;
+ while (--j >= 0) {
+ BYTECODEINDEX_TO_BASICBLOCK(lookup->target);
+ lookup++;
}
+ break;
}
+ }
- /* set instruction count of last real block */
+ /* set instruction count of last real block */
- if (b_count) {
- bptr[-1].icount = (m->instructions + m->instructioncount) - bptr[-1].iinstr;
- }
+ if (bbcount > 0) {
+ bptr[-1].icount = (pd.instructions + ircount) - bptr[-1].iinstr;
+ }
- /* allocate additional block at end */
+ /* allocate additional block at end */
- BASICBLOCK_INIT(bptr,m);
-
- bptr->instack = bptr->outstack = NULL;
- bptr->indepth = bptr->outdepth = 0;
- bptr->iinstr = NULL;
- bptr->icount = 0;
- bptr->next = NULL;
+ BASICBLOCK_INIT(bptr, m);
+ bptr->nr = bbcount;
+
+ /* set basicblock pointers in exception table */
+
+ if (!parse_resolve_exception_table(jd, &pd))
+ return false;
+
+ /* store the local map */
+
+ jd->local_map = local_map;
+
+ /* calculate local variable renaming */
- /* set basicblock pointers in exception table */
+ {
+ s4 nlocals = 0;
+ s4 i;
+ s4 *mapptr;
+
+ mapptr = local_map;
- if (cd->exceptiontablelength > 0) {
- cd->exceptiontable[cd->exceptiontablelength - 1].down = NULL;
+ /* iterate over local_map[0..m->maxlocals*5-1] and allocate a unique */
+ /* variable index for each _used_ (javaindex,type) pair. */
+ /* (local_map[javaindex*5+type] = cacaoindex) */
+ /* Unused (javaindex,type) pairs are marked with UNUSED. */
+
+ for (i = 0; i < (m->maxlocals * 5); i++, mapptr++) {
+ if (*mapptr)
+ *mapptr = nlocals++;
+ else
+ *mapptr = UNUSED;
}
-
- for (i = 0; i < cd->exceptiontablelength; ++i) {
- p = cd->exceptiontable[i].startpc;
- cd->exceptiontable[i].start = m->basicblocks + m->basicblockindex[p];
- p = cd->exceptiontable[i].endpc;
- cd->exceptiontable[i].end = (p == m->jcodelength) ? (m->basicblocks + m->basicblockcount /*+ 1*/) : (m->basicblocks + m->basicblockindex[p]);
+ jd->localcount = nlocals;
+
+ /* calculate the (maximum) number of variables needed */
+
+ jd->varcount =
+ nlocals /* local variables */
+ + bbcount * m->maxstack /* invars */
+ + s_count; /* variables created within blocks (non-invar) */
- p = cd->exceptiontable[i].handlerpc;
- cd->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
- }
+ /* reserve the first indices for local variables */
- /* XXX activate this if you want to try inlining */
-#if 0
- for (i = 0; i < m->exceptiontablelength; ++i) {
- p = m->exceptiontable[i].startpc;
- m->exceptiontable[i].start = m->basicblocks + m->basicblockindex[p];
+ jd->vartop = nlocals;
- p = m->exceptiontable[i].endpc;
- m->exceptiontable[i].end = (p == m->jcodelength) ? (m->basicblocks + m->basicblockcount /*+ 1*/) : (m->basicblocks + m->basicblockindex[p]);
+ /* reserve extra variables needed by stack analyse */
- p = m->exceptiontable[i].handlerpc;
- m->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
- }
+ jd->varcount += STACK_EXTRA_VARS;
+ jd->vartop += STACK_EXTRA_VARS;
+
+ /* The verifier needs space for saving invars in some cases and */
+ /* extra variables. */
+
+#if defined(ENABLE_VERIFIER)
+ jd->varcount += VERIFIER_EXTRA_LOCALS + VERIFIER_EXTRA_VARS + m->maxstack;
+ jd->vartop += VERIFIER_EXTRA_LOCALS + VERIFIER_EXTRA_VARS + m->maxstack;
#endif
+ /* allocate and initialize the variable array */
+
+ jd->var = DMNEW(varinfo, jd->varcount);
+ MZERO(jd->var, varinfo, jd->varcount);
+ /* set types of all locals in jd->var */
+
+ for (mapptr = local_map, i = 0; i < (m->maxlocals * 5); i++, mapptr++)
+ if (*mapptr != UNUSED)
+ VAR(*mapptr)->type = i%5;
}
- /* just return methodinfo* to signal everything was ok */
+ /* assign local variables to method variables */
+
+ jd->instructions = pd.instructions;
+ jd->instructioncount = ircount;
+ jd->basicblockcount = bbcount;
+ jd->stackcount = s_count + bbcount * m->maxstack; /* in-stacks */
+
+ /* allocate stack table */
+
+ jd->stack = DMNEW(stackelement, jd->stackcount);
+
+ /* everything's ok */
+
+ return true;
- return m;
+ /*** goto labels for throwing verifier exceptions *************************/
#if defined(ENABLE_VERIFIER)
+
throw_unexpected_end_of_bytecode:
- *exceptionptr = new_verifyerror(m, "Unexpected end of bytecode");
- return NULL;
+ exceptions_throw_verifyerror(m, "Unexpected end of bytecode");
+ return false;
throw_invalid_bytecode_index:
- *exceptionptr =
- new_verifyerror(m, "Illegal target of branch instruction");
- return NULL;
+ exceptions_throw_verifyerror(m, "Illegal target of branch instruction");
+ return false;
+
+throw_illegal_local_variable_number:
+ exceptions_throw_verifyerror(m, "Illegal local variable number");
+ return false;
+
#endif /* ENABLE_VERIFIER */
}
projects / cacao.git / blobdiff