-/* jit/parse.c - parser for JavaVM to intermediate code translation
+/* src/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
+ Christian Thalinger
- $Id: parse.c 1429 2004-11-02 08:58:26Z jowenn $
+ $Id: parse.c 2541 2005-05-31 16:02:14Z twisti $
*/
+#include <assert.h>
#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"
+#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/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/parse.h"
+#include "vm/jit/patcher.h"
+#include "vm/jit/inline/parseRT.h"
+#include "vm/jit/inline/parseXTA.h"
+#include "vm/jit/inline/inline.h"
+#include "vm/jit/loop/loop.h"
+#include "vm/jit/inline/parseRTprint.h"
-#define METHINFO(mm) \
- { \
- printf("PARSE method name ="); \
- utf_display(mm->class->name); \
- printf("."); \
- method_display(mm); \
- fflush(stdout); \
- }
-#define DEBUGMETH(mm) \
-if (DEBUG == 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*/
+bool DEBUG4 = false; /*opcodes for parse.c*/
+
/*INLINING*/
-#define debug_writebranch if (DEBUG2==true) printf("op:: %s i: %d label_index[i]: %d label_index=%p\n",opcode_names[opcode], i, label_index[i],label_index);
+#define debug_writebranch if (DEBUG2==true) printf("op:: %s i: %d label_index[i]: %d label_index=0x%p\n",opcode_names[opcode], i, label_index[i], (void *)label_index);
#define debug_writebranch1
-
-/* function descriptor2typesL ***************************************************
-
- decodes a already checked method descriptor. The parameter count, the
- return type and the argument types are stored in the passed methodinfo.
- gets and saves classptr for object ref.s
-
-*******************************************************************************/
-
-classSetNode *descriptor2typesL(methodinfo *m)
-{
- int debugInfo = 0;
- int i;
- u1 *types, *tptr;
- int pcount, c;
- char *utf_ptr;
- classinfo** classtypes;
- char *class;
- char *desc;
- classSetNode *p=NULL;
- if (debugInfo >= 1) {
- printf("In descriptor2typesL >>>\t"); fflush(stdout);
- utf_display(m->class->name); printf(".");
- method_display(m);fflush(stdout);
- }
-
- pcount = 0;
- desc = MNEW (char, 256);
- types = DMNEW (u1, m->descriptor->blength);
- classtypes = MNEW (classinfo*, m->descriptor->blength+1);
- m->returnclass = NULL;
- tptr = types;
- if (!(m->flags & ACC_STATIC)) {
- *tptr++ = TYPE_ADR;
- if (debugInfo >= 1) {
- printf("param #0 (this?) method class =");utf_display(m->class->name);printf("\n");
- }
- classtypes[pcount] = m->class;
- p = addClassCone(p, m->class);
- pcount++;
- }
-
- utf_ptr = m->descriptor->text + 1;
- strcpy (desc,utf_ptr);
-
- while ((c = *desc++) != ')') {
- pcount++;
- switch (c) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z': *tptr++ = TYPE_INT;
- break;
- case 'J': *tptr++ = TYPE_LNG;
- break;
- case 'F': *tptr++ = TYPE_FLT;
- break;
- case 'D': *tptr++ = TYPE_DBL;
- break;
- case 'L': *tptr++ = TYPE_ADR;
- /* get class string */
- class = strtok(desc,";");
- desc = strtok(NULL,"\0");
- /* get/save classinfo ptr */
- classtypes[pcount-1] = class_get(utf_new_char(class));
- p = addClassCone(p, class_get(utf_new_char(class)));
- if (debugInfo >= 1) {
- printf("LParam#%i 's class type is: %s\n",pcount-1,class);fflush(stdout);
- printf("Lclasstypes[%i]=",pcount-1);fflush(stdout);
- utf_display(classtypes[pcount-1]->name);
- }
- break;
- case '[': *tptr++ = TYPE_ADR;
- while (c == '[')
- c = *desc++;
- /* get class string */
- if (c == 'L') {
- class = strtok(desc,";");
- desc = strtok(NULL,"\0");
- /* get/save classinfo ptr */
- classtypes[pcount-1] = class_get(utf_new_char(class));
- p= addClassCone(p, class_get(utf_new_char(class)));
- if (debugInfo >= 1) {
- printf("[Param#%i 's class type is: %s\n",pcount-1,class);
- printf("[classtypes[%i]=",pcount-1);fflush(stdout);
- utf_display(classtypes[pcount-1]->name);
- printf("\n");
- }
- }
- else
- classtypes[pcount-1] = NULL;
- break;
- default:
- panic("Ill formed methodtype-descriptor");
- }
- }
-
- /* compute return type */
- switch (*desc++) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z': m->returntype = TYPE_INT;
- break;
- case 'J': m->returntype = TYPE_LNG;
- break;
- case 'F': m->returntype = TYPE_FLT;
- break;
- case 'D': m->returntype = TYPE_DBL;
- break;
- case '[':
- m->returntype = TYPE_ADR;
- c = *desc;
- while (c == '[')
- c = *desc++;
- if (c != 'L') break;
- *(desc++);
-
- case 'L':
- m->returntype = TYPE_ADR;
-
- /* get class string */
- class = strtok(desc,";");
- m->returnclass = class_get(utf_new_char(class));
- if (m->returnclass == NULL) {
- printf("class=%s :\t",class);
- panic ("return class not found");
- }
- break;
- case 'V': m->returntype = TYPE_VOID;
- break;
-
- default: panic("Ill formed methodtype-descriptor-ReturnType");
- }
-
- m->paramcount = pcount;
- m->paramtypes = types;
- m->paramclass = classtypes;
-
- if (debugInfo >=1) {
- if (pcount > 0) {
- for (i=0; i< m->paramcount; i++) {
- if ((m->paramtypes[i] == TYPE_ADR) && (m->paramclass[i] != NULL)) {
- printf("Param #%i is:\t",i);
- utf_display(m->paramclass[i]->name);
- printf("\n");
- }
- }
- }
- if ((m->returntype == TYPE_ADR) && (m->returnclass != NULL)) {
- printf("\tReturn Type is:\t"); fflush(stdout);
- utf_display(m->returnclass->name);
- printf("\n");
- }
-
- printf("params2types: START results in a set \n");
- printf("param2types: A Set size=%i=\n",sizeOfSet(p));
- printSet(p);
- }
-
- return p;
-}
-
-
-
-/* function descriptor2types ***************************************************
-
- decodes a already checked method descriptor. The parameter count, the
- return type and the argument types are stored in the passed methodinfo.
-
-*******************************************************************************/
-
-void descriptor2types(methodinfo *m)
-{
- u1 *types, *tptr;
- int pcount, c;
- char *utf_ptr;
- pcount = 0;
- types = DMNEW(u1, m->descriptor->blength);
-
- tptr = types;
- if (!(m->flags & ACC_STATIC)) {
- *tptr++ = TYPE_ADR;
- pcount++;
- }
-
- utf_ptr = m->descriptor->text + 1;
-
- while ((c = *utf_ptr++) != ')') {
- pcount++;
- switch (c) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z':
- *tptr++ = TYPE_INT;
- break;
- case 'J':
- *tptr++ = TYPE_LNG;
- break;
- case 'F':
- *tptr++ = TYPE_FLT;
- break;
- case 'D':
- *tptr++ = TYPE_DBL;
- break;
- case 'L':
- *tptr++ = TYPE_ADR;
- while (*utf_ptr++ != ';');
- break;
- case '[':
- *tptr++ = TYPE_ADR;
- while (c == '[')
- c = *utf_ptr++;
- if (c == 'L')
- while (*utf_ptr++ != ';') /* skip */;
- break;
- default:
- panic("Ill formed methodtype-descriptor");
- }
- }
-
- /* compute return type */
-
- switch (*utf_ptr++) {
- case 'B':
- case 'C':
- case 'I':
- case 'S':
- case 'Z':
- m->returntype = TYPE_INT;
- break;
- case 'J':
- m->returntype = TYPE_LNG;
- break;
- case 'F':
- m->returntype = TYPE_FLT;
- break;
- case 'D':
- m->returntype = TYPE_DBL;
- break;
- case '[':
- case 'L':
- m->returntype = TYPE_ADR;
- break;
- case 'V':
- m->returntype = TYPE_VOID;
- break;
- default:
- panic("Ill formed methodtype-descriptor");
- }
-
- m->paramcount = pcount;
- m->paramtypes = types;
-}
-
-
-
/*******************************************************************************
function 'parse' scans the JavaVM code and generates intermediate code
int *label_index, int *block_count,
t_inlining_globals *inline_env)
{
- int b_count, i, p;
+ int b_count, p, src, insertBlock;
if (exceptiontablelength == 0)
return extable;
-
-//if (m->exceptiontablelength > 0) {
-// DEBUGMETH(m);
-// printf("m->exceptiontablelength=%i\n",m->exceptiontablelength);
-// panic("exceptiontablelength > 0");
-// }
+
+ /*if (m->exceptiontablelength > 0) {
+ METHINFOx(m);
+ printf("m->exceptiontablelength=%i\n",m->exceptiontablelength);
+ assert(0);
+ }*/
b_count = *block_count;
- for (i = 0; i < exceptiontablelength; i++) {
+ for (src = exceptiontablelength-1; src >=0; src--) {
/* printf("Excepiont table index: %d\n",i); */
- p = raw_extable[i].startpc;
+ 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);
/*** 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[i].endpc;
- if (p <= raw_extable[i].startpc)
- panic("Invalid exception handler range");
- if (p >=m->jcodelength) {
- panic("Invalid exception handler end is after code end");
+ p = raw_extable[src].endpc; /* see JVM Spec 4.7.3 */
+ if (p <= raw_extable[src].startpc) {
+ log_text("Invalid exception handler range");
+ assert(0);
+ }
+
+ if (p >inline_env->method->jcodelength) {
+ log_text("Invalid exception handler end is after code end");
+ assert(0);
}
+
+ 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, t_inlining_globals *inline_env)
+methodinfo *parse(methodinfo *m, codegendata *cd, t_inlining_globals *inline_env)
{
int p; /* java instruction counter */
int nextp; /* start of next java instruction */
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;
- codegendata *cd=m->codegendata;
+ u2 lineindex = 0;
+ u2 currentline = 0;
+ u2 linepcchange = 0;
+
+ u2 skipBasicBlockChange;
+
+#if defined(USE_INLINING)
+METHINFOt(m,"\nPARSING: ",DEBUG4);
+if ((opt_rt) || (opt_xta)) {
+ FILE *Missed;
+
+ if (opt_rt) Missed = rtMissed;
+ if (opt_xta) Missed = xtaMissed;
-if (DEBUG==true) {printf("PARSING: "); fflush(stdout);
-DEBUGMETH(m);
-}
-if (opt_rt) {
if (m->methodUsed != USED) {
- if (verbose) {
- printf(" rta missed: "); fflush(stdout);
- METHINFO(m);
+ if (opt_verbose) {
+ printf(" rta/xta missed: "); fflush(stdout);
+ METHINFO(m,opt_verbose);
}
- if ( (rtMissed = fopen("rtMissed", "a")) == NULL) {
- printf("CACAO - rtMissed file: cant open file to write append \n");
+ if ( (Missed = fopen("Missed", "a")) == NULL) {
+ printf("CACAO - rt/xtaMissed 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);
+ utf_fprint(Missed,m->class->name);
+ fprintf(Missed," "); fflush(Missed);
+ utf_fprint(Missed,m->name);
+ fprintf(Missed," "); fflush(Missed);
+ utf_fprint(Missed,m->descriptor);
+ fprintf(Missed,"\n"); fflush(Missed);
+ fclose(Missed);
}
}
}
- /* INLINING */
+#endif
+#if defined(USE_INLINING)
if (useinlining) {
label_index = inlinfo->label_index;
m->maxstack = inline_env->cummaxstack;
/*JOWENN m->exceptiontablelength = inline_env->cumextablelength;*/
- tmpinlinf = (inlining_methodinfo*)
- list_first(inlinfo->inlinedmethods);
- if (tmpinlinf != NULL) nextgp = tmpinlinf->startgp;
+
+ tmpinlinf = (inlining_methodinfo *) list_first(inlinfo->inlinedmethods);
+
+ if (tmpinlinf != NULL)
+ nextgp = tmpinlinf->startgp;
}
+#endif
/**** 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) && (verbose)) {
- /**RT_jit_parse(m);**/
+ if (opt_xta && opt_verbose) {
+ **RT_jit_parse(m);**
printf("XTA requested, not available\n");
}
- if ((opt_vta) && (verbose))
+ if (opt_vta && opt_verbose)
printf("VTA requested, not yet implemented\n");
+ ****/
/* allocate instruction array and block index table */
memset(iptr, 0, sizeof(instruction) * (inline_env->cumjcodelength + 5));
/* compute branch targets of exception table */
-//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);
+ /*
+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,
- cd->exceptiontable, m->exceptiontable, m->exceptiontablelength,
+ &(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;
if (m->linenumbercount == 0) {
lineindex = 0;
-
+ /*printf("linenumber count == 0\n");*/
} else {
linepcchange = m->linenumbers[0].start_pc;
}
+ skipBasicBlockChange=0;
for (p = 0, gp = 0; p < inline_env->method->jcodelength; gp += (nextp - p), p = nextp) {
/* DEBUG */ if (DEBUG==true) printf("----- p:%d gp:%d\n",p,gp);
if (!iswide) {
instructionstart[gp] = 1;
/*log_text("new start of instruction");*/
+ /*printf ("%s, linepcchange %d,p %d\n",inline_env->method->name->text,linepcchange,p);*/
if (linepcchange==p) {
if (inline_env->method->linenumbercount > lineindex) {
currentline = inline_env->method->linenumbers[lineindex].line_number;
}
}
- /*INLINING*/
+#if defined(USE_INLINING)
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,inline_env->method);
nextp = p += jcommandsize[opcode];
- if (nextp > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+ if (nextp > inline_env->method->jcodelength) {
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
+
tmpinlinf = list_first(inlinfo->inlinedmethods);
firstlocal = tmpinlinf->firstlocal;
label_index = tmpinlinf->label_index;
else
argBlockIdx++;
}
+
for (i = 0, tptr = tmpinlinf->method->paramtypes + tmpinlinf->method->paramcount - 1; i < tmpinlinf->method->paramcount; i++, tptr--) {
int op;
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);
- /*m->basicblockindex[gp] |= (ipc << 1);*/ /*FIXME: necessary ? */
+ /* OP1(op, firstlocal + tmpinlinf->method->paramcount - 1 - i); */
+ /* printf("inline argument load operation for local: %ld\n",firstlocal + tmpinlinf->method->paramcount - 1 - i); */
}
-if (DEBUG==true) {
-printf("BEFORE SAVE: "); fflush(stdout);
-DEBUGMETH(inline_env->method);
-}
+ skipBasicBlockChange=1;
+METHINFOt(inline_env->method,"BEFORE SAVE: ",DEBUG);
inlining_save_compiler_variables();
-if (DEBUG==true) {
-printf("AFTER SAVE: "); fflush(stdout);
-DEBUGMETH(inline_env->method);
-}
+METHINFOt(inline_env->method,"AFTER SAVE: ",DEBUG);
inlining_set_compiler_variables(tmpinlinf);
-if (DEBUG==true) {
-printf("AFTER SET :: "); fflush(stdout);
-DEBUGMETH(inline_env->method);
-}
- if (DEBUG) {
- printf("\n.......Parsing (inlined): ");
- DEBUGMETH(m);
- DEBUGMETH(inline_env->method);
- }
+METHINFOt(inline_env->method,"AFTER SET :: ",DEBUG);
+METHINFOt(m,"\n.......Parsing (inlined): ",DEBUG);
+METHINFO(inline_env->method,DEBUG);
+ OP1(ICMD_INLINE_START,tmpinlinf->level);
if (inlinfo->inlinedmethods == NULL) {
gp = -1;
label_index, &b_count, inline_env);
continue;
}
-
+#endif /* defined(USE_INLINING) */
+
opcode = code_get_u1(p,inline_env->method); /* fetch op code */
if (DEBUG==true)
{
- printf("Parse p=%i<%i< opcode=<%i> %s\n",
- p, inline_env->jcodelength, opcode, opcode_names[opcode]);
+ 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]);
}
-
-//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);
- m->basicblockindex[gp] |= (ipc << 1); /*store intermed cnt*/
-//printf("basicblockindex[gp=%i]=%i=%p \n",
-//gp,m->basicblockindex[gp],m->basicblockindex[gp]);
-//fflush(stdout);
+ /*
+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) {
-//printf("B4 BEND\t"); fflush(stdout);
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 > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+
+ if (nextp > inline_env->method->jcodelength) {
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
+
s_count += stackreq[opcode]; /* compute stack element count */
-SHOWOPCODE
+SHOWOPCODE(DEBUG4)
switch (opcode) {
case JAVA_NOP:
break;
pushconstantitem:
- if (i >= inline_env->method->class->cpcount)
- panic ("Attempt to access constant outside range");
+ if (i >= inline_env->method->class->cpcount) {
+ dolog("Attempt to access constant outside range: %d >= %d", i, inline_env->method->class->cpcount);
+ assert(0);
+ }
switch (inline_env->method->class->cptags[i]) {
case CONSTANT_Integer:
case CONSTANT_String:
LOADCONST_A(literalstring_new((utf *) (inline_env->method->class->cpinfos[i])));
break;
- default: panic("Invalid constant type to push");
+ default:
+ log_text("Invalid constant type to push");
+ assert(0);
}
break;
case JAVA_NEWARRAY:
OP(ICMD_CHECKASIZE);
- switch (code_get_s1(p + 1,inline_env->method)) {
+ switch (code_get_s1(p + 1, inline_env->method)) {
case 4:
- BUILTIN1(BUILTIN_newarray_boolean, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_boolean, TYPE_ADR, currentline);
break;
case 5:
- BUILTIN1(BUILTIN_newarray_char, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_char, TYPE_ADR, currentline);
break;
case 6:
- BUILTIN1(BUILTIN_newarray_float, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_float, TYPE_ADR, currentline);
break;
case 7:
- BUILTIN1(BUILTIN_newarray_double, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_double, TYPE_ADR, currentline);
break;
case 8:
- BUILTIN1(BUILTIN_newarray_byte, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_byte, TYPE_ADR, currentline);
break;
case 9:
- BUILTIN1(BUILTIN_newarray_short, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_short, TYPE_ADR, currentline);
break;
case 10:
- BUILTIN1(BUILTIN_newarray_int, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_int, TYPE_ADR, currentline);
break;
case 11:
- BUILTIN1(BUILTIN_newarray_long, TYPE_ADR,currentline);
+ BUILTIN1(BUILTIN_newarray_long, TYPE_ADR, currentline);
break;
- default: panic("Invalid array-type to create");
+ default:
+ log_text("Invalid array-type to create");
+ assert(0);
}
OP(ICMD_CHECKEXCEPTION);
break;
case JAVA_ANEWARRAY:
OP(ICMD_CHECKASIZE);
- i = code_get_u2(p + 1,inline_env->method);
+ i = code_get_u2(p + 1, inline_env->method);
{
- classinfo *component =
- (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ constant_classref *compr;
+ constant_classref *cr;
+ classinfo *c;
- if (!class_load(component))
+ compr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+
+ if (!(cr = class_get_classref_multiarray_of(1, compr)))
return NULL;
- if (!class_link(component))
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, &c))
return NULL;
- LOADCONST_A_BUILTIN(class_array_of(component)->vftbl);
-/* LOADCONST_A_BUILTIN(component); */
+ if (c) {
+ LOADCONST_A_BUILTIN(c->vftbl);
+ BUILTIN2T(BUILTIN_newarray, TYPE_ADR, NULL, currentline);
+
+ } else {
+ LOADCONST_A_BUILTIN(cr);
+ BUILTIN2T(PATCHER_builtin_newarray, TYPE_ADR, cr, currentline);
+ }
s_count++;
- BUILTIN2(BUILTIN_newarray, TYPE_ADR, currentline);
}
OP(ICMD_CHECKEXCEPTION);
break;
case JAVA_MULTIANEWARRAY:
inline_env->method->isleafmethod = false;
- i = code_get_u2(p + 1,inline_env->method);
+ i = code_get_u2(p + 1, inline_env->method);
{
- vftbl_t *arrayvftbl;
- s4 v = code_get_u1(p + 3,inline_env->method);
+ constant_classref *cr;
+ classinfo *c;
+ s4 v = code_get_u1(p + 3, inline_env->method);
-
-/* vftbl *arrayvftbl = */
-/* ((classinfo *) class_getconstant(class, i, CONSTANT_Class))->vftbl; */
-/* OP2A(opcode, v, arrayvftbl,currentline); */
-
-
- classinfo *component =
- (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
- if (!class_load(component))
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, &c))
return NULL;
- if (!class_link(component))
- return NULL;
+ if (c) {
+ OP2AT(opcode, v, c->vftbl, NULL, currentline);
- arrayvftbl = component->vftbl;
- OP2A(opcode, v, arrayvftbl, currentline);
-
-/* classinfo *arrayclass = */
-/* (classinfo *) class_getconstant(class, i, CONSTANT_Class); */
-/* OP2A(opcode, v, arrayclass, currentline); */
+ } else {
+ OP2AT(opcode, v, cr,
+ (voidptr) (ptrint) PATCHER_builtin_multianewarray,
+ currentline);
+ }
}
break;
debug_writebranch;
i = label_index[i];
}
+ /*printf("GOTO: %d\n",i);*/
bound_check(i);
block_insert(i);
blockend = true;
i = label_index[i];
}
bound_check(i);
-//printf("B6 JSR_W\t"); fflush(stdout);
+ /*printf("B6 JSR_W\t"); fflush(stdout);*/
block_insert(i);
blockend = true;
OP1(opcode, i);
/* break; */
/* } */
if (nextp>inline_env->method->jcodelength-1) {
- //OP1(ICMD_GOTO, inlinfo->stopgp);
- //OP(ICMD_NOP);
- //OP(ICMD_NOP);
- blockend=true;
- break;
- }//JJJJJJJ
+ /* OP1(ICMD_GOTO, inlinfo->stopgp);
+ OP(ICMD_NOP);
+ OP(ICMD_NOP);
+ */
+ blockend=true;
+ break;
+ } /* JJJJJJJ */
blockend = true;
OP1(ICMD_GOTO, inlinfo->stopgp);
break;
{
s4 num, j;
s4 *tablep;
- s4 prevvalue;
+ s4 prevvalue=0;
blockend = true;
nextp = ALIGN((p + 1), 4);
- if (nextp + 8 > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+
+ if (nextp + 8 > inline_env->method->jcodelength) {
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
+
if (!useinlining) {
tablep = (s4 *) (inline_env->method->jcode + nextp);
} else {
- num = code_get_u4(nextp + 4,inline_env->method);
+ num = code_get_u4(nextp + 4, inline_env->method);
tablep = DMNEW(s4, num * 2 + 2);
}
- OP2A(opcode, 0, tablep,currentline);
+ OP2A(opcode, 0, tablep, currentline);
/* default target */
- j = p + code_get_s4(nextp,inline_env->method);
+ j = p + code_get_s4(nextp, inline_env->method);
if (useinlining)
j = label_index[j];
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
bound_check(j);
-//printf("B7 LOOKUP1\t"); fflush(stdout);
block_insert(j);
/* number of pairs */
- num = code_get_u4(nextp,inline_env->method);
+ num = code_get_u4(nextp, inline_env->method);
*tablep = num;
tablep++;
nextp += 4;
- if (nextp + 8*(num) > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+ if (nextp + 8 * num > inline_env->method->jcodelength) {
+ /* XXX TODO VerifyError */
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
for (i = 0; i < num; i++) {
/* value */
- j = code_get_s4(nextp,inline_env->method);
+ j = code_get_s4(nextp, inline_env->method);
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* check if the lookup table is sorted correctly */
- if (i && (j <= prevvalue))
- panic("invalid LOOKUPSWITCH: table not sorted");
+ if (i && (j <= prevvalue)) {
+ *exceptionptr = new_verifyerror(m, "Unsorted lookup switch");
+ return NULL;
+ }
prevvalue = j;
/* target */
tablep++;
nextp += 4;
bound_check(j);
-//printf("B8 LOOKUP2\t"); fflush(stdout);
block_insert(j);
}
blockend = true;
nextp = ALIGN((p + 1), 4);
- if (nextp + 12 > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+ if (nextp + 12 > inline_env->method->jcodelength) {
+ /* XXX TODO VerifyError */
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
+
if (!useinlining) {
tablep = (s4 *) (inline_env->method->jcode + nextp);
tablep = DMNEW(s4, num + 1 + 3);
}
- OP2A(opcode, 0, tablep,currentline);
+ OP2A(opcode, 0, tablep, currentline);
/* default target */
- j = p + code_get_s4(nextp,inline_env->method);
+ j = p + code_get_s4(nextp, inline_env->method);
if (useinlining)
j = label_index[j];
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
bound_check(j);
-//printf("B9 TABLESWITCH1\t"); fflush(stdout);
block_insert(j);
/* lower bound */
- j = code_get_s4(nextp,inline_env->method);
+ j = code_get_s4(nextp, inline_env->method);
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* upper bound */
- num = code_get_s4(nextp,inline_env->method);
+ num = code_get_s4(nextp, inline_env->method);
*tablep = num; /* restore for little endian */
tablep++;
nextp += 4;
num -= j; /* difference of upper - lower */
- if (num < 0)
- panic("invalid TABLESWITCH: upper bound < lower bound");
- if (nextp + 4*(num+1) > inline_env->method->jcodelength)
- panic("Unexpected end of bytecode");
+ if (num < 0) {
+ /* XXX TODO VerifyError */
+ log_text("invalid TABLESWITCH: upper bound < lower bound");
+ assert(0);
+ }
+
+ if (nextp + 4 * (num + 1) > inline_env->method->jcodelength) {
+ /* XXX TODO VerifyError */
+ log_text("Unexpected end of bytecode");
+ assert(0);
+ }
for (i = 0; i <= num; i++) {
j = p + code_get_s4(nextp,inline_env->method);
- if (useinlining)
+ 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);
-//printf("B10 TABLESWITCH2\t"); fflush(stdout);
block_insert(j);
+ /*printf("TABLESWITCH: block_insert(%ld)\n",j);*/
}
break;
BUILTIN3(BUILTIN_aastore, TYPE_VOID, currentline);
break;
- case JAVA_PUTSTATIC:
case JAVA_GETSTATIC:
- i = code_get_u2(p + 1,inline_env->method);
- {
- constant_FMIref *fr;
- fieldinfo *fi;
-
- fr = class_getconstant(inline_env->method->class, i, CONSTANT_Fieldref);
-
- if (!class_load(fr->class))
- return NULL;
-
- if (!class_link(fr->class))
- return NULL;
-
- fi = class_resolvefield(fr->class,
- fr->name,
- fr->descriptor,
- inline_env->method->class,
- true);
-
- if (!fi)
- return NULL;
-
- OP2A(opcode, fi->type, fi, currentline);
- if (!fi->class->initialized) {
- inline_env->method->isleafmethod = false;
- }
- }
- break;
-
- case JAVA_PUTFIELD:
+ case JAVA_PUTSTATIC:
case JAVA_GETFIELD:
- i = code_get_u2(p + 1,inline_env->method);
+ case JAVA_PUTFIELD:
+ i = code_get_u2(p + 1, inline_env->method);
{
- constant_FMIref *fr;
- fieldinfo *fi;
+ constant_FMIref *fr;
+ unresolved_field *uf;
+ fieldinfo *fi;
fr = class_getconstant(inline_env->method->class, i, CONSTANT_Fieldref);
+ OP2A_NOINC(opcode, fr->parseddesc.fd->type, fr, currentline);
- if (!class_load(fr->class))
+ if (!(uf = create_unresolved_field(inline_env->method->class,
+ inline_env->method,
+ iptr,
+ NULL)))
return NULL;
- if (!class_link(fr->class))
- return NULL;
+ /* store unresolved_field pointer */
- fi = class_resolvefield(fr->class,
- fr->name,
- fr->descriptor,
- inline_env->method->class,
- true);
+ iptr->target = uf;
- if (!fi)
- return NULL;
+ /* only with -noverify, otherwise the typechecker does this */
- OP2A(opcode, fi->type, fi, currentline);
+ if (!opt_verify) {
+ if (!resolve_field(uf, resolveLazy, &fi))
+ return NULL;
+
+ iptr->val.a = fi;
+ }
+ PINC;
+#if defined(__MIPS__) || defined(__POWERPC__)
+ if (!fi || !fi->class->initialized)
+ inline_env->method->isleafmethod = false;
+#endif
}
break;
/* method invocation *****/
case JAVA_INVOKESTATIC:
- i = code_get_u2(p + 1,inline_env->method);
+ i = code_get_u2(p + 1, inline_env->method);
{
- constant_FMIref *mr;
- methodinfo *mi;
-
+ constant_FMIref *mr;
+ unresolved_method *um;
+ methodinfo *mi;
+
inline_env->method->isleafmethod = false;
mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
+ OP2A_NOINC(opcode, mr->parseddesc.md->paramcount, mr, currentline);
- if (!class_load(mr->class))
- return NULL;
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method,
+ iptr,
+ NULL);
- if (!class_link(mr->class))
+ if (!um)
return NULL;
- mi = class_resolveclassmethod(mr->class,
- mr->name,
- mr->descriptor,
- inline_env->method->class,
- true);
+ /* store the unresolved_method pointer */
- if (!mi)
- return NULL;
+ iptr->target = um;
- /*RTAprint*/// if (((pOpcodes == 2) || (pOpcodes == 3)) && opt_rt)
-if (DEBUG4==true)
- /*RTAprint*/ {printf(" method name =");
- /*RTAprint*/ utf_display(mi->class->name); printf(".");
- /*RTAprint*/ utf_display(mi->name);printf("\tINVOKE STATIC\n");
- /*RTAprint*/ fflush(stdout);}
+ /* only with -noverify, otherwise the typechecker does this */
- if (!(mi->flags & ACC_STATIC)) {
- *exceptionptr =
- new_exception(string_java_lang_IncompatibleClassChangeError);
- return NULL;
- }
+ if (!opt_verify) {
+ if (!resolve_method(um, resolveLazy, &mi))
+ return NULL;
- descriptor2types(mi);
- OP2A(opcode, mi->paramcount, mi, currentline);
+ iptr->val.a = mi;
+ }
+ PINC;
}
break;
case JAVA_INVOKESPECIAL:
case JAVA_INVOKEVIRTUAL:
- i = code_get_u2(p + 1,inline_env->method);
+ i = code_get_u2(p + 1, inline_env->method);
{
- constant_FMIref *mr;
- methodinfo *mi;
+ constant_FMIref *mr;
+ unresolved_method *um;
+ methodinfo *mi;
inline_env->method->isleafmethod = false;
mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
+ OP2A_NOINC(opcode, mr->parseddesc.md->paramcount + 1, mr, currentline);
- if (!class_load(mr->class))
- return NULL;
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method,
+ iptr,
+ NULL);
- if (!class_link(mr->class))
+ if (!um)
return NULL;
- mi = class_resolveclassmethod(mr->class,
- mr->name,
- mr->descriptor,
- inline_env->method->class,
- true);
+ /* store the unresolved_method* */
- if (!mi)
- return NULL;
+ iptr->target = um;
- /*RTAprint*/ // if (((pOpcodes == 2) || (pOpcodes == 3)) && opt_rt)
-if (DEBUG4==true)
- /*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 (mi->flags & ACC_STATIC) {
- *exceptionptr =
- new_exception(string_java_lang_IncompatibleClassChangeError);
- return NULL;
- }
+ /* only with -noverify, otherwise the typechecker does this */
+
+ if (!opt_verify) {
+ if (!resolve_method(um, resolveLazy, &mi))
+ return NULL;
- descriptor2types(mi);
- OP2A(opcode, mi->paramcount, mi, currentline);
+ iptr->val.a = mi;
+ }
+ PINC;
}
break;
case JAVA_INVOKEINTERFACE:
i = code_get_u2(p + 1,inline_env->method);
{
- constant_FMIref *mr;
- methodinfo *mi;
+ constant_FMIref *mr;
+ unresolved_method *um;
+ methodinfo *mi;
inline_env->method->isleafmethod = false;
mr = class_getconstant(inline_env->method->class, i, CONSTANT_InterfaceMethodref);
+ OP2A_NOINC(opcode, mr->parseddesc.md->paramcount + 1, mr, currentline);
- if (!class_load(mr->class))
- return NULL;
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method,
+ iptr,
+ NULL);
- if (!class_link(mr->class))
+ if (!um)
return NULL;
- mi = class_resolveinterfacemethod(mr->class,
- mr->name,
- mr->descriptor,
- inline_env->method->class,
- true);
- if (!mi)
- return NULL;
+ /* store the unresolved_method* */
- if (mi->flags & ACC_STATIC) {
- *exceptionptr =
- new_exception(string_java_lang_IncompatibleClassChangeError);
- return NULL;
- }
+ iptr->target = um;
+
+ /* only with -noverify, otherwise the typechecker does this */
+
+ if (!opt_verify) {
+ if (!resolve_method(um, resolveLazy, &mi))
+ return NULL;
- descriptor2types(mi);
- OP2A(opcode, mi->paramcount, mi, currentline);
+ iptr->val.a = mi;
+ }
+ PINC;
}
break;
/* miscellaneous object operations *******/
case JAVA_NEW:
- 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);
+ {
+ constant_classref *cr;
+ classinfo *c;
+
+ i = code_get_u2(p + 1, inline_env->method);
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, &c))
+ return NULL;
+
+ /* <clinit> can throw an exception over native code */
+
+ if (c && c->initialized) {
+ LOADCONST_A_BUILTIN(c);
+ BUILTIN1T(BUILTIN_new, TYPE_ADR, NULL, currentline);
+
+ } else {
+ LOADCONST_A_BUILTIN(cr);
+ BUILTIN1T(PATCHER_builtin_new, TYPE_ADR, cr, currentline);
+ }
+
+ s_count++;
+ OP(ICMD_CHECKEXCEPTION);
+ }
break;
case JAVA_CHECKCAST:
- i = code_get_u2(p + 1,inline_env->method);
+ i = code_get_u2(p + 1, inline_env->method);
{
- classinfo *cls =
- (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
-
- if (!cls->loaded)
- if (!class_load(cls))
- return NULL;
+ constant_classref *cr;
+ classinfo *c;
+
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
- if (!cls->linked)
- if (!class_link(cls))
- return NULL;
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, &c))
+ return NULL;
- if (cls->vftbl->arraydesc) {
+ if (cr->name->text[0] == '[') {
/* array type cast-check */
- LOADCONST_A_BUILTIN(cls->vftbl);
+ if (c) {
+ LOADCONST_A_BUILTIN(c->vftbl);
+ BUILTIN2T(BUILTIN_arraycheckcast, TYPE_ADR, NULL, currentline);
+
+ } else {
+ LOADCONST_A_BUILTIN(cr);
+ BUILTIN2T(PATCHER_builtin_arraycheckcast, TYPE_ADR, cr, currentline);
+ }
s_count++;
- BUILTIN2(BUILTIN_checkarraycast, TYPE_ADR,currentline);
-
- } else { /* object type cast-check */
- /*
- + LOADCONST_A_BUILTIN(class_getconstant(class, i, CONSTANT_Class));
- + s_count++;
- + BUILTIN2(BUILTIN_checkcast, TYPE_ADR,currentline);
- + */
- OP2A(opcode, 1, cls, currentline);
+
+ } else {
+ /* object type cast-check */
+ OP2AT(opcode, 1, c, cr, currentline);
}
+#if defined(__MIPS__) || defined(__POWERPC__)
+ if (!c)
+ inline_env->method->isleafmethod = false;
+#endif
}
break;
case JAVA_INSTANCEOF:
i = code_get_u2(p + 1,inline_env->method);
{
- classinfo *cls =
- (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
-
- if (!cls->loaded)
- if (!class_load(cls))
- return NULL;
+ constant_classref *cr;
+ classinfo *c;
+
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
- if (!cls->linked)
- if (!class_link(cls))
- return NULL;
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, &c))
+ return NULL;
- if (cls->vftbl->arraydesc) {
+ if (cr->name->text[0] == '[') {
/* array type cast-check */
- LOADCONST_A_BUILTIN(cls->vftbl);
+ if (c) {
+ LOADCONST_A_BUILTIN(c->vftbl);
+ BUILTIN2T(BUILTIN_arrayinstanceof, TYPE_INT, NULL, currentline);
+
+ } else {
+ LOADCONST_A_BUILTIN(cr);
+ BUILTIN2T(PATCHER_builtin_arrayinstanceof, TYPE_INT, cr, currentline);
+ }
s_count++;
- BUILTIN2(BUILTIN_arrayinstanceof, TYPE_INT, currentline);
- }
- else { /* object type cast-check */
- /*
- LOADCONST_A_BUILTIN(class_getconstant(class, i, CONSTANT_Class));
- s_count++;
- BUILTIN2(BUILTIN_instanceof, TYPE_INT,currentline);
- + */
- OP2A(opcode, 1, cls, currentline);
+
+ } else {
+ /* object type cast-check */
+ OP2AT(opcode, 1, c, cr, currentline);
}
+#if defined(__MIPS__) || defined(__POWERPC__)
+ if (!c)
+ inline_env->method->isleafmethod = false;
+#endif
}
break;
case JAVA_MONITORENTER:
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync) {
- BUILTIN1(BUILTIN_monitorenter, TYPE_VOID,currentline);
+ OP(ICMD_CHECKNULL);
+ BUILTIN1(BUILTIN_monitorenter, TYPE_VOID, currentline);
} else
#endif
{
- OP(ICMD_NULLCHECKPOP);
+ OP(ICMD_CHECKNULL);
+ OP(ICMD_POP);
}
break;
case JAVA_MONITOREXIT:
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync) {
- BUILTIN1(BUILTIN_monitorexit, TYPE_VOID,currentline);
- OP(ICMD_CHECKEXCEPTION);
+ BUILTIN1(BUILTIN_monitorexit, TYPE_VOID, currentline);
} else
#endif
{
break;
case JAVA_IREM:
+ /*log_text("parse.c: adding IREM to bytecode list");*/
OP(opcode);
break;
case 253:
case 254:
case 255:
- printf("Illegal opcode %d at instr %d\n", opcode, ipc);
- panic("Illegal opcode encountered");
+ *exceptionptr =
+ new_internalerror("Illegal opcode %d at instr %d\n",
+ opcode, ipc);
+ return NULL;
break;
default:
} /* end switch */
/* If WIDE was used correctly, iswide should have been reset by now. */
- if (iswide && opcode != JAVA_WIDE)
- panic("Illegal instruction: WIDE before incompatible opcode");
-
- /* INLINING */
-
-// if (inline_env->isinlinedmethod && p == inline_env->method->jcodelength - 1) { /* end of an inlined method */
+ if (iswide && opcode != JAVA_WIDE) {
+ log_text("Illegal instruction: WIDE before incompatible opcode");
+ assert(0);
+ }
+
+#if defined(USE_INLINING)
+ /* 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();
-//label_index = inlinfo->label_index;
-if (DEBUG==true) {
-printf("AFTER RESTORE : "); fflush(stdout);
-DEBUGMETH(inline_env->method);
-}
+ OP(ICMD_INLINE_END);
+/*label_index = inlinfo->label_index;*/
+
+METHINFOt(inline_env->method,"AFTER RESTORE : ",DEBUG);
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;
}
+#endif /* defined(USE_INLINING) */
+
} /* end for */
if (p != m->jcodelength) {
- printf("p (%ld) != m->jcodelength (%ld)\n",p,m->jcodelength);
- panic("Command-sequence crosses code-boundary");
+ printf("p (%d) != m->jcodelength (%d)\n",p,m->jcodelength);
+ log_text("Command-sequence crosses code-boundary");
+ assert(0);
}
+
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 < inline_env->cumjcodelength; p++) {
-// for (p = 0; p < m->jcodelength; 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])
- panic("Branch into middle of instruction");
+ /* Check if this block starts at the beginning of an */
+ /* instruction. */
+
+ if (!instructionstart[p]) {
+ /* XXX TODO throw exception? which one? */
+ dolog("Branch into middle of instruction: Basic Block beginn: %d\n", p);
+ assert(0);
+ }
+
/* 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;
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]);
+ cd->exceptiontable[i].end = (p == inline_env->method->jcodelength) ? (m->basicblocks + m->basicblockcount /*+ 1*/) : (m->basicblocks + m->basicblockindex[p]);
p = cd->exceptiontable[i].handlerpc;
cd->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
}
}
-
- if (useinlining) inlining_cleanup(inline_env);
+
+#if defined(USE_INLINING)
+ if (useinlining)
+ inlining_cleanup(inline_env);
+#endif
/* just return methodinfo* to signal everything was ok */
* tab-width: 4
* End:
*/
+
projects / cacao.git / blobdiff