-/* jit/parse.c - parser for JavaVM to intermediate code translation
+/* vm/jit/parse.c - parser for JavaVM to intermediate code translation
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
- M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
- P. Tomsich, J. Wenninger
+ Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+ R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+ C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+ Institut f. Computersprachen - TU Wien
This file is part of CACAO.
Changes: Carolyn Oates
Edwin Steiner
+ Joseph Wenninger
- $Id: parse.c 1337 2004-07-21 16:00:33Z twisti $
+ $Id: parse.c 1735 2004-12-07 14:33:27Z twisti $
*/
#include <string.h>
-#include "parse.h"
-#include "global.h"
-#include "jit.h"
-#include "parseRT.h"
-#include "inline.h"
-#include "loop/loop.h"
+
+#include "config.h"
#include "types.h"
-#include "builtin.h"
-#include "exceptions.h"
-#include "tables.h"
-#include "native.h"
-#include "loader.h"
-#include "options.h"
-#include "statistics.h"
-#include "toolbox/memory.h"
+#include "mm/memory.h"
+#include "native/native.h"
#include "toolbox/logging.h"
-
-
-/* data about the currently parsed method */
-
-classinfo *rt_class; /* class the compiled method belongs to */
-methodinfo *rt_method; /* pointer to method info of compiled method */
-utf *rt_descriptor; /* type descriptor of compiled method */
-int rt_jcodelength; /* length of JavaVM-codes */
-u1 *rt_jcode; /* pointer to start of JavaVM-code */
-
-
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
+#include "vm/tables.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/parse.h"
+#include "vm/jit/inline/parseRT.h"
+#include "vm/jit/inline/inline.h"
+#include "vm/jit/loop/loop.h"
+
+
+#define METHINFO(mm) \
+ { \
+ printf("PARSE method name ="); \
+ utf_display(mm->class->name); \
+ printf("."); \
+ method_display(mm); \
+ fflush(stdout); \
+ }
+#define DEBUGMETH(mm) \
+if (DEBUG4 == true) \
+ { \
+ printf("PARSE method name ="); \
+ utf_display(mm->class->name); \
+ printf("."); \
+ method_display(mm); \
+ fflush(stdout); \
+ }
+
+#define SHOWOPCODE \
+if (DEBUG4 == true) {printf("Parse p=%i<%i< opcode=<%i> %s\n", \
+ p, m->jcodelength,opcode,opcode_names[opcode]);}
+bool DEBUG = false;
+bool DEBUG2 = false;
+bool DEBUG3 = false;
+bool DEBUG4 = false; /*opcodes*/
/*INLINING*/
-//#include "inline.c"
-/*#define debug_writebranch printf("op: %s i: %d label_index[i]: %d\n",icmd_names[opcode], i, label_index[i]);*/
-#define debug_writebranch
+#define debug_writebranch if (DEBUG2==true) printf("op:: %s i: %d label_index[i]: %d label_index=0x%x\n",opcode_names[opcode], i, label_index[i], label_index);
+#define debug_writebranch1
/* function descriptor2typesL ***************************************************
*******************************************************************************/
-static exceptiontable* fillextable(methodinfo *m, exceptiontable* extable, exceptiontable *raw_extable, int exceptiontablelength, int *label_index, int *block_count)
+static exceptiontable* fillextable(methodinfo *m,
+ exceptiontable* extable, exceptiontable *raw_extable,
+ int exceptiontablelength,
+ int *label_index, int *block_count,
+ t_inlining_globals *inline_env)
{
- int b_count, i, p;
+ int b_count, i, p, src, insertBlock;
if (exceptiontablelength == 0)
return extable;
+
+ /*if (m->exceptiontablelength > 0) {
+ DEBUGMETH(m);
+ printf("m->exceptiontablelength=%i\n",m->exceptiontablelength);
+ panic("exceptiontablelength > 0");
+ }*/
+
b_count = *block_count;
- for (i = 0; i < exceptiontablelength; i++) {
- p = raw_extable[i].startpc;
+ for (src = exceptiontablelength-1; src >=0; src--) {
+ /* printf("Excepiont table index: %d\n",i); */
+ p = raw_extable[src].startpc;
if (label_index != NULL) p = label_index[p];
- extable[i].startpc = p;
+ extable->startpc = p;
bound_check(p);
block_insert(p);
- p = raw_extable[i].endpc;
- if (p <= raw_extable[i].startpc)
+/*** if (DEBUG==true){printf("---------------------block_inserted:b_count=%i m->basicblockindex[(p=%i)]=%i=%p\n",b_count,p,m->basicblockindex[(p)],m->basicblockindex[(p)]);
+ fflush(stdout); } ***/
+ p = raw_extable[src].endpc; /* see JVM Spec 4.7.3 */
+ if (p <= raw_extable[src].startpc)
panic("Invalid exception handler range");
+
+ if (p >inline_env->method->jcodelength) {
+ panic("Invalid exception handler end is after code end");
+ }
+ if (p<inline_env->method->jcodelength) insertBlock=1; else insertBlock=0;
+ /*if (label_index !=NULL) printf("%s:translating endpc:%ld to %ld, label_index:%p\n",m->name->text,p,label_index[p],label_index); else
+ printf("%s:fillextab: endpc:%ld\n",m->name->text,p);*/
if (label_index != NULL) p = label_index[p];
- extable[i].endpc = p;
+ extable->endpc = p;
bound_check1(p);
- if (p < m->jcodelength)
- block_insert(p);
+ /*if (p < inline_env->method->jcodelength) {
+ block_insert(p); }*/
+ if (insertBlock) block_insert(p);
- p = raw_extable[i].handlerpc;
+ p = raw_extable[src].handlerpc;
if (label_index != NULL) p = label_index[p];
- extable[i].handlerpc = p;
+ extable->handlerpc = p;
bound_check(p);
block_insert(p);
- extable[i].catchtype = raw_extable[i].catchtype;
- extable[i].next = NULL;
- extable[i].down = &extable[i + 1];
+ extable->catchtype = raw_extable[src].catchtype;
+ extable->next = NULL;
+ extable->down = &extable[1];
+ extable--;
}
*block_count = b_count;
- return &extable[i]; /* return the next free xtable* */
+ return extable; /*&extable[i];*/ /* return the next free xtable* */
}
-methodinfo *parse(methodinfo *m)
+methodinfo *parse(methodinfo *m, codegendata *cd, t_inlining_globals *inline_env)
{
- int p; /* java instruction counter */
- int nextp; /* start of next java instruction */
- int opcode; /* java opcode */
- int i; /* temporary for different uses (counters) */
- int ipc = 0; /* intermediate instruction counter */
- int b_count = 0; /* basic block counter */
- int s_count = 0; /* stack element counter */
+ 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 pointer into instruction array */
- int gp; /* global java instruction counter */
- /* inlining info for current method */
- inlining_methodinfo *inlinfo = inlining_rootinfo;
+ bool iswide = false; /* true if last instruction was a wide*/
+ instruction *iptr; /* current ptr into instruction array */
+ int gp; /* global java instruction counter */
+ /* inlining info for current method */
+
+ inlining_methodinfo *inlinfo = inline_env->inlining_rootinfo;
inlining_methodinfo *tmpinlinf;
- int nextgp = -1; /* start of next method to be inlined */
- int *label_index = NULL; /* label redirection table */
- int firstlocal = 0; /* first local variable of method */
- exceptiontable* nextex; /* points next free entry in extable */
+ int nextgp = -1; /* start of next method to be inlined */
+ int *label_index = NULL; /* label redirection table */
+ int firstlocal = 0; /* first local variable of method */
+ exceptiontable* nextex; /* points next free entry in extable */
u1 *instructionstart; /* 1 for pcs which are valid instr. starts */
- u2 lineindex=0;
- u2 currentline=0;
- u2 linepcchange=0;
+ u2 lineindex = 0;
+ u2 currentline = 0;
+ u2 linepcchange = 0;
- bool useinltmp;
+ u2 skipBasicBlockChange;
+if (DEBUG4==true) {printf("\nPARSING: "); fflush(stdout);
+DEBUGMETH(m);
+}
+if (opt_rt) {
+ if (m->methodUsed != USED) {
+ if (opt_verbose) {
+ printf(" rta missed: "); fflush(stdout);
+ METHINFO(m);
+ }
+ if ( (rtMissed = fopen("rtMissed", "a")) == NULL) {
+ printf("CACAO - rtMissed file: cant open file to write append \n");
+ }
+ else {
+ utf_fprint(rtMissed,m->class->name);
+ fprintf(rtMissed," "); fflush(rtMissed);
+ utf_fprint(rtMissed,m->name);
+ fprintf(rtMissed," "); fflush(rtMissed);
+ utf_fprint(rtMissed,m->descriptor);
+ fprintf(rtMissed,"\n"); fflush(rtMissed);
+ fclose(rtMissed);
+ }
+ }
+}
/* INLINING */
+
if (useinlining) {
label_index = inlinfo->label_index;
- m->maxstack = cummaxstack;
- m->exceptiontablelength = cumextablelength;
- }
-
- useinltmp = useinlining; /* FIXME remove this after debugging */
- /*useinlining = false;*/ /* and merge the if-statements */
-
- if (!useinlining) {
-/* cumjcodelength = m->jcodelength; */
-
- } else {
- tmpinlinf = (inlining_methodinfo*) list_first(inlinfo->inlinedmethods);
+ m->maxstack = inline_env->cummaxstack;
+ /*JOWENN m->exceptiontablelength = inline_env->cumextablelength;*/
+ tmpinlinf = (inlining_methodinfo*)
+ list_first(inlinfo->inlinedmethods);
if (tmpinlinf != NULL) nextgp = tmpinlinf->startgp;
}
- if ((opt_rt || opt_xta || opt_vta) && (pOpcodes == 2 || pOpcodes == 3)) {
- printf("PARSE method name =");
- utf_display(m->class->name);
- printf(".");
- method_display(m);
- printf(">\n\n");
- fflush(stdout);
- }
-
- if (opt_rt || opt_xta) {
- RT_jit_parse(m);
-
- } else {
- if (opt_vta)
- printf("VTA requested, but not yet implemented\n");
- }
-
+/**** static analysis has to be called before inlining
+ which has to be called before reg_set
+ which has to be called before parse (or ???)
+ will check if method being parsed was analysed here
+ ****/
+ if (opt_xta && opt_verbose) {
+ /**RT_jit_parse(m);**/
+ printf("XTA requested, not available\n");
+ }
+ if (opt_vta && opt_verbose)
+ printf("VTA requested, not yet implemented\n");
/* allocate instruction array and block index table */
- /* 1 additional for end ipc */
+ /* 1 additional for end ipc * # cum inline methods*/
- m->basicblockindex = DMNEW(s4, m->jcodelength + 1);
- memset(m->basicblockindex, 0, sizeof(s4) * (m->jcodelength + 1));
+ m->basicblockindex = DMNEW(s4, inline_env->cumjcodelength + inline_env->cummethods);
+ memset(m->basicblockindex, 0, sizeof(s4) * (inline_env->cumjcodelength + inline_env->cummethods));
- instructionstart = DMNEW(u1, m->jcodelength + 1);
- memset(instructionstart, 0, sizeof(u1) * (m->jcodelength + 1));
+ instructionstart = DMNEW(u1, inline_env->cumjcodelength + inline_env->cummethods);
+ memset(instructionstart, 0, sizeof(u1) * (inline_env->cumjcodelength + inline_env->cummethods));
/* 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);
+ iptr = m->instructions = DMNEW(instruction, inline_env->cumjcodelength + 5);
/* Zero the intermediate instructions array so we don't have any
* invalid pointers in it if we cannot finish analyse_stack(). */
- memset(iptr, 0, sizeof(instruction) * (m->jcodelength + 5));
+ memset(iptr, 0, sizeof(instruction) * (inline_env->cumjcodelength + 5));
/* compute branch targets of exception table */
-
-/* m->exceptiontable = DMNEW(exceptiontable, m->exceptiontablelength + 1); */
/*
- for (i = 0; i < method->m->exceptiontablelength; i++) {
-
- p = m->exceptiontable[i].startpc = raw_extable[i].startpc;
- if (useinlining) p = label_index[p];
- bound_check(p);
- block_insert(p);
-
- p = m->exceptiontable[i].endpc = raw_extable[i].endpc;
- if (useinlining) p = label_index[p];
- bound_check1(p);
- if (p < cumjcodelength)
- block_insert(p);
-
- p = m->exceptiontable[i].handlerpc = raw_extable[i].handlerpc;
- bound_check(p);
- block_insert(p);
-
- m->exceptiontable[i].catchtype = raw_extable[i].catchtype;
-
- m->exceptiontable[i].next = NULL;
- m->exceptiontable[i].down = &m->exceptiontable[i+1];
- }
+if (m->exceptiontable == NULL) {
+ printf("m->exceptiontable=NULL\n");fflush(stdout);
+ }
+else {
+ printf("m->exceptiontable != NULL\n");fflush(stdout);
+ }
+printf("m->exceptiontablelength=%i, inline_env->method->exceptiontablelength=%i,inline_env->cumextablelength=%i\n",
+m->exceptiontablelength, inline_env->method->exceptiontablelength,inline_env->cumextablelength);
+ */
+ /*
+if (m->exceptiontablelength > 0)
+ m->exceptiontable = DMNEW(exceptiontable, m->exceptiontablelength + 1);
*/
- nextex = fillextable(m, m->exceptiontable, m->exceptiontable, m->exceptiontablelength, label_index, &b_count);
-
+ nextex = fillextable(m,
+ &(cd->exceptiontable[cd->exceptiontablelength-1]), m->exceptiontable, m->exceptiontablelength,
+ label_index, &b_count, inline_env);
s_count = 1 + m->exceptiontablelength; /* initialize stack element counter */
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
}
#endif
linepcchange = m->linenumbers[0].start_pc;
}
- for (p = 0, gp = 0; p < m->jcodelength; gp += (nextp - p), p = nextp) {
+ skipBasicBlockChange=0;
+ for (p = 0, gp = 0; p < inline_env->method->jcodelength; gp += (nextp - p), p = nextp) {
- /* DEBUG */ /*printf("p:%d gp:%d ",p,gp);*/
+ /* DEBUG */ if (DEBUG==true) printf("----- p:%d gp:%d\n",p,gp);
/* mark this position as a valid instruction start */
if (!iswide) {
instructionstart[gp] = 1;
/*log_text("new start of instruction");*/
if (linepcchange==p) {
- if (m->linenumbercount > lineindex) {
- currentline = m->linenumbers[lineindex].line_number;
+ if (inline_env->method->linenumbercount > lineindex) {
+ currentline = inline_env->method->linenumbers[lineindex].line_number;
lineindex++;
- if (lineindex < m->linenumbercount)
- linepcchange = m->linenumbers[lineindex].start_pc;
+ if (lineindex < inline_env->method->linenumbercount)
+ linepcchange = inline_env->method->linenumbers[lineindex].start_pc;
/*printf("Line number changed to: %ld\n",currentline);*/
}
}
if ((useinlining) && (gp == nextgp)) {
u1 *tptr;
bool *readonly = NULL;
+ int argBlockIdx=0;
+ block_insert(gp); /* JJJJJJJJJJ */
+ blockend=false;
+ instructionstart[gp] = 1;
+ m->basicblockindex[gp] |= (ipc << 1); /*FIXME: necessary ? */
- opcode = code_get_u1(p);
+ opcode = code_get_u1(p,inline_env->method);
nextp = p += jcommandsize[opcode];
- if (nextp > m->jcodelength)
+ if (nextp > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
tmpinlinf = list_first(inlinfo->inlinedmethods);
firstlocal = tmpinlinf->firstlocal;
label_index = tmpinlinf->label_index;
readonly = tmpinlinf->readonly;
+ for (i=0,tptr=tmpinlinf->method->paramtypes;i<tmpinlinf->method->paramcount;i++,tptr++) {
+ if ( ((*tptr)==TYPE_LNG) ||
+ ((*tptr)==TYPE_DBL) )
+ argBlockIdx+=2;
+ else
+ argBlockIdx++;
+ }
+
for (i = 0, tptr = tmpinlinf->method->paramtypes + tmpinlinf->method->paramcount - 1; i < tmpinlinf->method->paramcount; i++, tptr--) {
int op;
}
op += *tptr;
- OP1(op, firstlocal + tmpinlinf->method->paramcount - 1 - i);
-
- /* m->basicblockindex[gp] |= (ipc << 1);*/ /*FIXME: necessary ? */
+ if ( ((*tptr)==TYPE_LNG) ||
+ ((*tptr)==TYPE_DBL) )
+ argBlockIdx-=2;
+ else
+ argBlockIdx--;
+
+ OP1(op, firstlocal + argBlockIdx);
+ /* OP1(op, firstlocal + tmpinlinf->method->paramcount - 1 - i); */
+ /* printf("inline argument load operation for local: %ld\n",firstlocal + tmpinlinf->method->paramcount - 1 - i); */
}
-
+ skipBasicBlockChange=1;
+if (DEBUG==true) {
+printf("BEFORE SAVE: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
inlining_save_compiler_variables();
+if (DEBUG==true) {
+printf("AFTER SAVE: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
inlining_set_compiler_variables(tmpinlinf);
- if (compileverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Parsing (inlined): ");
- utf_sprint(logtext+strlen(logtext), m->class->name);
- strcpy(logtext+strlen(logtext), ".");
- utf_sprint(logtext+strlen(logtext), m->name);
- utf_sprint(logtext+strlen(logtext), m->descriptor);
- log_text(logtext);
+if (DEBUG==true) {
+printf("AFTER SET :: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
+ if (DEBUG) {
+ printf("\n.......Parsing (inlined): ");
+ DEBUGMETH(m);
+ DEBUGMETH(inline_env->method);
}
+ OP1(ICMD_INLINE_START,tmpinlinf->level);
+
if (inlinfo->inlinedmethods == NULL) {
gp = -1;
} else {
tmpinlinf = list_first(inlinfo->inlinedmethods);
nextgp = (tmpinlinf != NULL) ? tmpinlinf->startgp : -1;
}
- if (m->exceptiontablelength > 0)
- nextex = fillextable(m, nextex, m->exceptiontable, m->exceptiontablelength, label_index, &b_count);
+ if (inline_env->method->exceptiontablelength > 0)
+ nextex = fillextable(m, nextex,
+ inline_env->method->exceptiontable, inline_env->method->exceptiontablelength,
+ label_index, &b_count, inline_env);
continue;
}
- opcode = code_get_u1(p); /* fetch op code */
-
-
- if (opt_rt && (pOpcodes == 2 || pOpcodes == 3)) {
- printf("Parse<%i> p=%i<%i< opcode=<%i> %s\n",
- pOpcodes, p, rt_jcodelength, opcode, icmd_names[opcode]);
+ opcode = code_get_u1(p,inline_env->method); /* fetch op code */
+ if (DEBUG==true)
+ {
+ printf("Parse p=%i<%i<%i< opcode=<%i> %s\n",
+ p, gp, inline_env->jcodelength, opcode, opcode_names[opcode]);
+ if (label_index)
+ printf("label_index[%d]=%d\n",p,label_index[p]);
}
-
- m->basicblockindex[gp] |= (ipc << 1); /* store intermediate count */
+ /*
+printf("basicblockindex[gp=%i]=%i=%p ipc=%i=%p shifted ipc=%i=%p\n",
+gp,m->basicblockindex[gp],m->basicblockindex[gp],ipc,ipc,(ipc<<1),(ipc<<1));
+fflush(stdout);
+ */
+ if (!skipBasicBlockChange) {
+ m->basicblockindex[gp] |= (ipc << 1); /*store intermed cnt*/
+ } else skipBasicBlockChange=0;
+ /*
+printf("basicblockindex[gp=%i]=%i=%p \n",
+gp,m->basicblockindex[gp],m->basicblockindex[gp]);
+fflush(stdout);
+ */
if (blockend) {
block_insert(gp); /* start new block */
blockend = false;
+ /*printf("blockend was set: new blockcount: %ld at:%ld\n",b_count,gp);*/
}
nextp = p + jcommandsize[opcode]; /* compute next instruction start */
- if (nextp > m->jcodelength)
+ if (nextp > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
s_count += stackreq[opcode]; /* compute stack element count */
-
+SHOWOPCODE
switch (opcode) {
case JAVA_NOP:
break;
/* pushing constants onto the stack p */
case JAVA_BIPUSH:
- LOADCONST_I(code_get_s1(p+1));
+ LOADCONST_I(code_get_s1(p+1,inline_env->method));
break;
case JAVA_SIPUSH:
- LOADCONST_I(code_get_s2(p+1));
+ LOADCONST_I(code_get_s2(p+1,inline_env->method));
break;
case JAVA_LDC1:
- i = code_get_u1(p+1);
+ i = code_get_u1(p+1,inline_env->method);
+
goto pushconstantitem;
case JAVA_LDC2:
case JAVA_LDC2W:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
pushconstantitem:
- if (i >= m->class->cpcount)
+ if (i >= inline_env->method->class->cpcount)
panic ("Attempt to access constant outside range");
- switch (m->class->cptags[i]) {
+ switch (inline_env->method->class->cptags[i]) {
case CONSTANT_Integer:
- LOADCONST_I(((constant_integer *) (m->class->cpinfos[i]))->value);
+ LOADCONST_I(((constant_integer *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Long:
- LOADCONST_L(((constant_long *) (m->class->cpinfos[i]))->value);
+ LOADCONST_L(((constant_long *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Float:
- LOADCONST_F(((constant_float *) (m->class->cpinfos[i]))->value);
+ LOADCONST_F(((constant_float *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Double:
- LOADCONST_D(((constant_double *) (m->class->cpinfos[i]))->value);
+ LOADCONST_D(((constant_double *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_String:
- LOADCONST_A(literalstring_new((utf *) (m->class->cpinfos[i])));
+ LOADCONST_A(literalstring_new((utf *) (inline_env->method->class->cpinfos[i])));
break;
default: panic("Invalid constant type to push");
}
case JAVA_DLOAD:
case JAVA_ALOAD:
if (!iswide) {
- i = code_get_u1(p + 1);
+ i = code_get_u1(p + 1,inline_env->method);
} else {
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
nextp = p + 3;
iswide = false;
}
case JAVA_DSTORE:
case JAVA_ASTORE:
if (!iswide) {
- i = code_get_u1(p + 1);
+ i = code_get_u1(p + 1,inline_env->method);
} else {
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
iswide = false;
nextp = p + 3;
}
int v;
if (!iswide) {
- i = code_get_u1(p + 1);
- v = code_get_s1(p + 2);
+ i = code_get_u1(p + 1,inline_env->method);
+ v = code_get_s1(p + 2,inline_env->method);
} else {
- i = code_get_u2(p + 1);
- v = code_get_s2(p + 3);
+ i = code_get_u2(p + 1,inline_env->method);
+ v = code_get_s2(p + 3,inline_env->method);
iswide = false;
nextp = p + 5;
}
case JAVA_NEWARRAY:
OP(ICMD_CHECKASIZE);
- switch (code_get_s1(p + 1)) {
+ switch (code_get_s1(p + 1,inline_env->method)) {
case 4:
BUILTIN1(BUILTIN_newarray_boolean, TYPE_ADR,currentline);
break;
case JAVA_ANEWARRAY:
OP(ICMD_CHECKASIZE);
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
classinfo *component =
- (classinfo *) class_getconstant(m->class, i, CONSTANT_Class);
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
if (!class_load(component))
return NULL;
break;
case JAVA_MULTIANEWARRAY:
- m->isleafmethod = false;
- i = code_get_u2(p + 1);
+ inline_env->method->isleafmethod = false;
+ i = code_get_u2(p + 1,inline_env->method);
{
vftbl_t *arrayvftbl;
- s4 v = code_get_u1(p + 3);
+ s4 v = code_get_u1(p + 3,inline_env->method);
/* vftbl *arrayvftbl = */
classinfo *component =
- (classinfo *) class_getconstant(m->class, i, CONSTANT_Class);
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
if (!class_load(component))
return NULL;
case JAVA_IF_ACMPNE:
case JAVA_GOTO:
case JAVA_JSR:
- i = p + code_get_s2(p + 1);
+ i = p + code_get_s2(p + 1,inline_env->method);
if (useinlining) {
debug_writebranch;
i = label_index[i];
break;
case JAVA_GOTO_W:
case JAVA_JSR_W:
- i = p + code_get_s4(p + 1);
+ i = p + code_get_s4(p + 1,inline_env->method);
if (useinlining) {
debug_writebranch;
i = label_index[i];
}
bound_check(i);
+ /*printf("B6 JSR_W\t"); fflush(stdout);*/
block_insert(i);
blockend = true;
OP1(opcode, i);
case JAVA_RET:
if (!iswide) {
- i = code_get_u1(p + 1);
+ i = code_get_u1(p + 1,inline_env->method);
} else {
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
nextp = p + 3;
iswide = false;
}
blockend = true;
/*
- if (isinlinedmethod) {
+ if (inline_env->isinlinedmethod) {
OP1(ICMD_GOTO, inlinfo->stopgp);
break;
}*/
case JAVA_DRETURN:
case JAVA_ARETURN:
case JAVA_RETURN:
- if (isinlinedmethod) {
+ if (inline_env->isinlinedmethod) {
/* if (p==m->jcodelength-1) {*/ /* return is at end of inlined method */
/* OP(ICMD_NOP); */
/* break; */
/* } */
+ if (nextp>inline_env->method->jcodelength-1) {
+ /* OP1(ICMD_GOTO, inlinfo->stopgp);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ */
+ blockend=true;
+ break;
+ } /* JJJJJJJ */
blockend = true;
OP1(ICMD_GOTO, inlinfo->stopgp);
break;
blockend = true;
nextp = ALIGN((p + 1), 4);
- if (nextp + 8 > m->jcodelength)
+ if (nextp + 8 > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
if (!useinlining) {
- tablep = (s4 *) (m->jcode + nextp);
+ tablep = (s4 *) (inline_env->method->jcode + nextp);
} else {
- num = code_get_u4(nextp + 4);
+ num = code_get_u4(nextp + 4,inline_env->method);
tablep = DMNEW(s4, num * 2 + 2);
}
/* default target */
- j = p + code_get_s4(nextp);
+ j = p + code_get_s4(nextp,inline_env->method);
if (useinlining)
j = label_index[j];
*tablep = j; /* restore for little endian */
/* number of pairs */
- num = code_get_u4(nextp);
+ num = code_get_u4(nextp,inline_env->method);
*tablep = num;
tablep++;
nextp += 4;
- if (nextp + 8*(num) > m->jcodelength)
+ if (nextp + 8*(num) > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
for (i = 0; i < num; i++) {
/* value */
- j = code_get_s4(nextp);
+ j = code_get_s4(nextp,inline_env->method);
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* target */
- j = p + code_get_s4(nextp);
+ j = p + code_get_s4(nextp,inline_env->method);
if (useinlining)
j = label_index[j];
*tablep = j; /* restore for little endian */
blockend = true;
nextp = ALIGN((p + 1), 4);
- if (nextp + 12 > m->jcodelength)
+ if (nextp + 12 > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
if (!useinlining) {
- tablep = (s4 *) (m->jcode + nextp);
+ tablep = (s4 *) (inline_env->method->jcode + nextp);
} else {
- num = code_get_u4(nextp + 8) - code_get_u4(nextp + 4);
+ num = code_get_u4(nextp + 8,inline_env->method) - code_get_u4(nextp + 4,inline_env->method);
tablep = DMNEW(s4, num + 1 + 3);
}
/* default target */
- j = p + code_get_s4(nextp);
+ j = p + code_get_s4(nextp,inline_env->method);
if (useinlining)
j = label_index[j];
*tablep = j; /* restore for little endian */
/* lower bound */
- j = code_get_s4(nextp);
+ j = code_get_s4(nextp,inline_env->method);
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* upper bound */
- num = code_get_s4(nextp);
+ num = code_get_s4(nextp,inline_env->method);
*tablep = num; /* restore for little endian */
tablep++;
nextp += 4;
if (num < 0)
panic("invalid TABLESWITCH: upper bound < lower bound");
- if (nextp + 4*(num+1) > m->jcodelength)
+ if (nextp + 4*(num+1) > inline_env->method->jcodelength)
panic("Unexpected end of bytecode");
for (i = 0; i <= num; i++) {
- j = p + code_get_s4(nextp);
- if (useinlining)
+ j = p + code_get_s4(nextp,inline_env->method);
+ if (useinlining) {
+ /*printf("TABLESWITCH: j before mapping=%ld\n",j);*/
j = label_index[j];
+ }
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
bound_check(j);
block_insert(j);
+ /*printf("TABLESWITCH: block_insert(%ld)\n",j);*/
}
break;
case JAVA_PUTSTATIC:
case JAVA_GETSTATIC:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
constant_FMIref *fr;
fieldinfo *fi;
- fr = class_getconstant(m->class, i, CONSTANT_Fieldref);
+ fr = class_getconstant(inline_env->method->class, i, CONSTANT_Fieldref);
if (!class_load(fr->class))
return NULL;
fi = class_resolvefield(fr->class,
fr->name,
fr->descriptor,
- m->class,
+ inline_env->method->class,
true);
if (!fi)
OP2A(opcode, fi->type, fi, currentline);
if (!fi->class->initialized) {
- m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
}
}
break;
case JAVA_PUTFIELD:
case JAVA_GETFIELD:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
constant_FMIref *fr;
fieldinfo *fi;
- fr = class_getconstant(m->class, i, CONSTANT_Fieldref);
+ fr = class_getconstant(inline_env->method->class, i, CONSTANT_Fieldref);
if (!class_load(fr->class))
return NULL;
fi = class_resolvefield(fr->class,
fr->name,
fr->descriptor,
- m->class,
+ inline_env->method->class,
true);
if (!fi)
/* method invocation *****/
case JAVA_INVOKESTATIC:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
constant_FMIref *mr;
methodinfo *mi;
- m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
- mr = class_getconstant(m->class, i, CONSTANT_Methodref);
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
if (!class_load(mr->class))
return NULL;
mi = class_resolveclassmethod(mr->class,
mr->name,
mr->descriptor,
- m->class,
+ inline_env->method->class,
true);
if (!mi)
return NULL;
- /*RTAprint*/ if (((pOpcodes == 2) || (pOpcodes == 3)) && opt_rt)
- /*RTAprint*/ {printf(" method name =");
- /*RTAprint*/ utf_display(mi->class->name); printf(".");
- /*RTAprint*/ utf_display(mi->name);printf("\tINVOKE STATIC\n");
- /*RTAprint*/ fflush(stdout);}
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE STATIC\n");
+ fflush(stdout);}
if (!(mi->flags & ACC_STATIC)) {
*exceptionptr =
case JAVA_INVOKESPECIAL:
case JAVA_INVOKEVIRTUAL:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
constant_FMIref *mr;
methodinfo *mi;
- m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
- mr = class_getconstant(m->class, i, CONSTANT_Methodref);
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
if (!class_load(mr->class))
return NULL;
mi = class_resolveclassmethod(mr->class,
mr->name,
mr->descriptor,
- m->class,
+ inline_env->method->class,
true);
if (!mi)
return NULL;
- /*RTAprint*/ if (((pOpcodes == 2) || (pOpcodes == 3)) && opt_rt)
- /*RTAprint*/ {printf(" method name =");
- method_display(mi);
- /*RTAprint*/ utf_display(mi->class->name); printf(".");
- /*RTAprint*/ utf_display(mi->name);printf("\tINVOKE SPECIAL/VIRTUAL\n");
- /*RTAprint*/ fflush(stdout);}
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE SPEC/VIRT\n");
+ fflush(stdout);}
if (mi->flags & ACC_STATIC) {
*exceptionptr =
break;
case JAVA_INVOKEINTERFACE:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
constant_FMIref *mr;
methodinfo *mi;
- m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
- mr = class_getconstant(m->class, i, CONSTANT_InterfaceMethodref);
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_InterfaceMethodref);
if (!class_load(mr->class))
return NULL;
mi = class_resolveinterfacemethod(mr->class,
mr->name,
mr->descriptor,
- m->class,
+ inline_env->method->class,
true);
if (!mi)
return NULL;
return NULL;
}
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE INTERFACE\n");
+ fflush(stdout);}
descriptor2types(mi);
OP2A(opcode, mi->paramcount, mi, currentline);
}
/* miscellaneous object operations *******/
case JAVA_NEW:
- i = code_get_u2(p + 1);
- LOADCONST_A_BUILTIN(class_getconstant(m->class, i, CONSTANT_Class));
+ i = code_get_u2(p + 1,inline_env->method);
+ LOADCONST_A_BUILTIN(class_getconstant(inline_env->method->class, i, CONSTANT_Class));
s_count++;
BUILTIN1(BUILTIN_new, TYPE_ADR, currentline);
OP(ICMD_CHECKEXCEPTION);
break;
case JAVA_CHECKCAST:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
classinfo *cls =
- (classinfo *) class_getconstant(m->class, i, CONSTANT_Class);
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
if (!cls->loaded)
if (!class_load(cls))
break;
case JAVA_INSTANCEOF:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1,inline_env->method);
{
classinfo *cls =
- (classinfo *) class_getconstant(m->class, i, CONSTANT_Class);
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
if (!cls->loaded)
if (!class_load(cls))
break;
case JAVA_MONITORENTER:
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync) {
BUILTIN1(BUILTIN_monitorenter, TYPE_VOID,currentline);
} else
break;
case JAVA_MONITOREXIT:
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync) {
BUILTIN1(BUILTIN_monitorexit, TYPE_VOID,currentline);
- }
- else
+ OP(ICMD_CHECKEXCEPTION);
+ } else
#endif
{
OP(ICMD_POP);
/* INLINING */
- if (isinlinedmethod && p == m->jcodelength - 1) { /* end of an inlined method */
+ /* if (inline_env->isinlinedmethod && p == inline_env->method->jcodelength - 1) { */ /* end of an inlined method */
+ if (inline_env->isinlinedmethod && (nextp >= inline_env->method->jcodelength) ) { /* end of an inlined method */
/* printf("setting gp from %d to %d\n",gp, inlinfo->stopgp); */
gp = inlinfo->stopgp;
inlining_restore_compiler_variables();
+ OP(ICMD_INLINE_END);
+/*label_index = inlinfo->label_index;*/
+
+if (DEBUG==true) {
+printf("AFTER RESTORE : "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
list_remove(inlinfo->inlinedmethods, list_first(inlinfo->inlinedmethods));
- if (inlinfo->inlinedmethods == NULL) {
+ if (inlinfo->inlinedmethods == NULL) { /* JJJJ */
nextgp = -1;
} else {
tmpinlinf = list_first(inlinfo->inlinedmethods);
label_index=inlinfo->label_index;
firstlocal = inlinfo->firstlocal;
}
+
} /* end for */
- if (p != m->jcodelength)
- panic("Command-sequence crosses code-boundary");
+ if (p != m->jcodelength) {
+ printf("p (%d) != m->jcodelength (%d)\n",p,m->jcodelength);
+ panic("Command-sequence crosses code-boundary");
+ }
if (!blockend) {
*exceptionptr = new_verifyerror(m, "Falling off the end of the code");
return NULL;
bptr = m->basicblocks = DMNEW(basicblock, b_count + 1); /* one more for end ipc */
b_count = 0;
- c_debug_nr = 0;
+ m->c_debug_nr = 0;
/* additional block if target 0 is not first intermediate instruction */
bptr->type = BBTYPE_STD;
bptr->branchrefs = NULL;
bptr->pre_count = 0;
- bptr->debug_nr = c_debug_nr++;
+ bptr->debug_nr = m->c_debug_nr++;
bptr++;
b_count++;
(bptr - 1)->next = bptr;
/* allocate blocks */
-/* for (p = 0; p < cumjcodelength; p++) { */
- for (p = 0; p < m->jcodelength; p++) {
+ for (p = 0; p < inline_env->cumjcodelength; p++) {
+ /* for (p = 0; p < m->jcodelength; p++) { */
if (m->basicblockindex[p] & 1) {
/* check if this block starts at the beginning of an instruction */
- if (!instructionstart[p])
+ if (!instructionstart[p]) {
+ printf("Basic Block beginn: %d\n",p);
panic("Branch into middle of instruction");
+ }
/* allocate the block */
bptr->iinstr = m->instructions + (m->basicblockindex[p] >> 1);
- bptr->debug_nr = c_debug_nr++;
+ bptr->debug_nr = m->c_debug_nr++;
if (b_count != 0)
(bptr - 1)->icount = bptr->iinstr - (bptr - 1)->iinstr;
bptr->mpc = -1;
bptr->type = BBTYPE_STD;
bptr->branchrefs = NULL;
bptr->pre_count = 0;
- bptr->debug_nr = c_debug_nr++;
+ bptr->debug_nr = m->c_debug_nr++;
(bptr - 1)->next = bptr;
bptr->next = NULL;
- if (m->exceptiontablelength > 0) {
- m->exceptiontable[m->exceptiontablelength - 1].down = NULL;
-
- } else {
- m->exceptiontable = NULL;
+ if (cd->exceptiontablelength > 0) {
+ cd->exceptiontable[cd->exceptiontablelength - 1].down = NULL;
}
+
+ for (i = 0; i < cd->exceptiontablelength; ++i) {
+ p = cd->exceptiontable[i].startpc;
+ cd->exceptiontable[i].start = m->basicblocks + m->basicblockindex[p];
- for (i = 0; i < m->exceptiontablelength; ++i) {
- p = m->exceptiontable[i].startpc;
- m->exceptiontable[i].start = m->basicblocks + m->basicblockindex[p];
-
- p = m->exceptiontable[i].endpc;
- m->exceptiontable[i].end = (p == m->jcodelength) ? (m->basicblocks + m->basicblockcount + 1) : (m->basicblocks + m->basicblockindex[p]);
+ p = cd->exceptiontable[i].endpc;
+ cd->exceptiontable[i].end = (p == inline_env->method->jcodelength) ? (m->basicblocks + m->basicblockcount /*+ 1*/) : (m->basicblocks + m->basicblockindex[p]);
- p = m->exceptiontable[i].handlerpc;
- m->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
+ p = cd->exceptiontable[i].handlerpc;
+ cd->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
}
}
- if (useinlining) inlining_cleanup();
- useinlining = useinltmp;
+ if (useinlining) inlining_cleanup(inline_env);
/* just return methodinfo* to signal everything was ok */