-/* 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, 2006 R. Grafl, A. Krall, C. Kruegel,
+ C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+ E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+ J. Wenninger, Institut f. Computersprachen - TU Wien
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Author: Andreas Krall
Changes: Carolyn Oates
Edwin Steiner
+ Joseph Wenninger
+ Christian Thalinger
- $Id: parse.c 1009 2004-03-31 22:44:07Z edwin $
+ $Id: parse.c 4357 2006-01-22 23:33:38Z twisti $
*/
+#include <assert.h>
#include <string.h>
-#include "parse.h"
-#include "global.h"
-#include "main.h"
-#include "jit.h"
-#include "parseRT.h"
-#include "inline.h"
-#include "loop/loop.h"
-#include "types.h"
-#include "builtin.h"
-#include "tables.h"
-#include "native.h"
-#include "loader.h"
-#include "toolbox/memory.h"
-#include "toolbox/loging.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 */
-
-
-
-/*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
-
-
-/* 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;
-}
-
+#include "config.h"
+
+#include "vm/types.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/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"
/*******************************************************************************
*******************************************************************************/
-/* intermediate code generating macros */
-
-#define PINC iptr++;ipc++
-#define LOADCONST_I(v) iptr->opc=ICMD_ICONST;/*iptr->op1=0*/;iptr->val.i=(v);iptr->line=currentline;iptr->clazz=class;PINC
-#define LOADCONST_L(v) iptr->opc=ICMD_LCONST;/*iptr->op1=0*/;iptr->val.l=(v);iptr->line=currentline;iptr->clazz=class;PINC
-#define LOADCONST_F(v) iptr->opc=ICMD_FCONST;/*iptr->op1=0*/;iptr->val.f=(v);iptr->line=currentline;iptr->clazz=class;PINC
-#define LOADCONST_D(v) iptr->opc=ICMD_DCONST;/*iptr->op1=0*/;iptr->val.d=(v);iptr->line=currentline;iptr->clazz=class;PINC
-#define LOADCONST_A(v) iptr->opc=ICMD_ACONST;/*iptr->op1=0*/;iptr->val.a=(v);iptr->line=currentline;iptr->clazz=class;PINC
-
-/* ACONST instructions generated as arguments for builtin functions
- * have op1 set to non-zero. This is used for stack overflow checking
- * in stack.c. */
-#define LOADCONST_A_BUILTIN(v) \
- iptr->opc=ICMD_ACONST;iptr->op1=1;iptr->val.a=(v);iptr->line=currentline;iptr->clazz=class;PINC
-
-#define OP(o) iptr->opc=(o);/*iptr->op1=0*/;/*iptr->val.l=0*/;iptr->line=currentline;iptr->clazz=class;PINC
-#define OP1(o,o1) iptr->opc=(o);iptr->op1=(o1);/*iptr->val.l=(0)*/;iptr->line=currentline;iptr->clazz=class;PINC
-#define OP2I(o,o1,v) iptr->opc=(o);iptr->op1=(o1);iptr->val.i=(v);iptr->line=currentline;iptr->clazz=class;PINC
-#define OP2A(o,o1,v,l) iptr->opc=(o);iptr->op1=(o1);iptr->val.a=(v);iptr->line=l;iptr->clazz=class;PINC
-#define BUILTIN1(v,t,l) isleafmethod=false;iptr->opc=ICMD_BUILTIN1;iptr->op1=t;\
- iptr->val.a=(v);iptr->line=l;iptr->clazz=class;PINC
-#define BUILTIN2(v,t,l) isleafmethod=false;iptr->opc=ICMD_BUILTIN2;iptr->op1=t;\
- iptr->val.a=(v);iptr->line=l;iptr->clazz=class;PINC
-#define BUILTIN3(v,t,l) isleafmethod=false;iptr->opc=ICMD_BUILTIN3;iptr->op1=t;\
- iptr->val.a=(v);iptr->line=l;iptr->clazz=class;PINC
-
-/* We have to check local variables indices here because they are
- * used in stack.c to index the locals array. */
-
-#define INDEX_ONEWORD(num) \
- do { if((num)<0 || (num)>=maxlocals) \
- panic("Invalid local variable index"); } while (0)
-#define INDEX_TWOWORD(num) \
- do { if((num)<0 || ((num)+1)>=maxlocals) \
- panic("Invalid local variable index"); } while (0)
-
-#define OP1LOAD(o,o1) \
- do {if (o == ICMD_LLOAD || o == ICMD_DLOAD) \
- INDEX_TWOWORD(o1); \
- else \
- INDEX_ONEWORD(o1); \
- OP1(o,o1);} while(0)
-
-#define OP1STORE(o,o1) \
- do {if (o == ICMD_LSTORE || o == ICMD_DSTORE) \
- INDEX_TWOWORD(o1); \
- else \
- INDEX_ONEWORD(o1); \
- OP1(o,o1);} while(0)
-
-/* block generating and checking macros */
-
-#define block_insert(i) \
- do { \
- if (!(block_index[(i)] & 1)) { \
- b_count++; \
- block_index[(i)] |= 1; \
- } \
- } while (0)
-
-
-/* FIXME really use cumjcodelength for the bound_checkers ? */
-
-#define bound_check(i) \
- do { \
- if (i < 0 || i >= cumjcodelength) { \
- panic("branch target out of code-boundary"); \
- } \
- } while (0)
-
-/* bound_check1 is used for the inclusive ends of exception handler ranges */
-#define bound_check1(i) \
- do { \
- if (i < 0 || i > cumjcodelength) { \
- panic("branch target out of code-boundary"); \
- } \
- } while (0)
-
-
-
-static xtable* fillextable(xtable* 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, p, src, insertBlock;
if (exceptiontablelength == 0)
return extable;
-
+
b_count = *block_count;
- for (i = 0; i < exceptiontablelength; i++) {
- p = raw_extable[i].startpc;
+ for (src = exceptiontablelength-1; src >=0; src--) {
+ 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)
- panic("Invalid exception handler range");
+ p = raw_extable[src].endpc; /* see JVM Spec 4.7.3 */
+ if (p <= raw_extable[src].startpc) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Invalid exception handler range");
+ return NULL;
+ }
+
+ if (p >inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Invalid exception handler end is after code end");
+ return NULL;
+ }
+
+ if (p<inline_env->method->jcodelength) insertBlock=1; else insertBlock=0;
if (label_index != NULL) p = label_index[p];
- extable[i].endpc = p;
+ extable->endpc = p;
bound_check1(p);
- if (p < cumjcodelength)
+ /* 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* */
}
-void parse()
+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 */
- xtable* 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;
-
- bool useinltmp;
-
- if (compileverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Parsing: ");
- utf_sprint(logtext+strlen(logtext), method->class->name);
- strcpy(logtext+strlen(logtext), ".");
- utf_sprint(logtext+strlen(logtext), method->name);
- utf_sprint(logtext+strlen(logtext), method->descriptor);
- log_text(logtext);
- }
-
- /* INLINING */
- if (useinlining) {
- label_index = inlinfo->label_index;
- maxstack = cummaxstack;
- exceptiontablelength = cumextablelength;
- }
-
- useinltmp = useinlining; /* FIXME remove this after debugging */
- /*useinlining = false;*/ /* and merge the if-statements */
-
- if (!useinlining) {
- cumjcodelength = jcodelength;
-
- } else {
- 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(method->class->name);
- printf(".");
- method_display(method);
- printf(">\n\n");
- fflush(stdout);
- }
+ constant_classref *cr;
+ constant_classref *compr;
+ classinfo *c;
+ builtintable_entry *bte;
- if (opt_rt || opt_xta) {
- RT_jit_parse(method);
+ u2 lineindex = 0;
+ u2 currentline = 0;
+ u2 linepcchange = 0;
- } else {
- if (opt_vta)
- printf("VTA requested, but not yet implemented\n");
- }
-
+ u2 skipBasicBlockChange;
/* allocate instruction array and block index table */
- /* 1 additional for end ipc and 3 for loop unrolling */
+ /* 1 additional for end ipc * # cum inline methods*/
- block_index = DMNEW(int, cumjcodelength + 4);
- instructionstart = DMNEW(u1, cumjcodelength + 4);
- memset(instructionstart,0,sizeof(u1) * (cumjcodelength + 4));
+ 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, 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 = instr = DMNEW(instruction, cumjcodelength + 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) * (cumjcodelength + 5));
-
- /* initialize block_index table (unrolled four times) */
- {
- int *ip;
+ memset(iptr, 0, sizeof(instruction) * (inline_env->cumjcodelength + 5));
- for (i = 0, ip = block_index; i <= cumjcodelength; i += 4, ip += 4) {
- ip[0] = 0;
- ip[1] = 0;
- ip[2] = 0;
- ip[3] = 0;
- }
- }
-
/* compute branch targets of exception table */
- extable = DMNEW(xtable, exceptiontablelength + 1);
- /*
- for (i = 0; i < method->exceptiontablelength; i++) {
-
- p = extable[i].startpc = raw_extable[i].startpc;
- if (useinlining) p = label_index[p];
- bound_check(p);
- block_insert(p);
-
- p = extable[i].endpc = raw_extable[i].endpc;
- if (useinlining) p = label_index[p];
- bound_check1(p);
- if (p < cumjcodelength)
- block_insert(p);
-
- p = extable[i].handlerpc = raw_extable[i].handlerpc;
- bound_check(p);
- block_insert(p);
-
- extable[i].catchtype = raw_extable[i].catchtype;
-
- extable[i].next = NULL;
- extable[i].down = &extable[i+1];
- }
- */
-
- nextex = fillextable(extable, raw_extable, method->exceptiontablelength, label_index, &b_count);
-
- s_count = 1 + exceptiontablelength; /* initialize stack element counter */
-
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- isleafmethod = false;
+ nextex = fillextable(m,
+ &(cd->exceptiontable[cd->exceptiontablelength-1]), m->exceptiontable, m->exceptiontablelength,
+ label_index, &b_count, inline_env);
+ if (!nextex)
+ return NULL;
+ s_count = 1 + m->exceptiontablelength; /* initialize stack element counter */
+
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ m->isleafmethod = false;
+ inline_env->method->isleafmethod = false;
}
#endif
/* scan all java instructions */
- currentline=0;
- linepcchange=0;
- if (jlinenumbercount==0) {
- lineindex=0;
+ currentline = 0;
+ linepcchange = 0;
+
+ if (m->linenumbercount == 0) {
+ lineindex = 0;
} else {
- linepcchange=jlinenumbers[0].start_pc;
+ linepcchange = m->linenumbers[0].start_pc;
}
- for (p = 0, gp = 0; p < 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);*/
-
/* mark this position as a valid instruction start */
if (!iswide) {
instructionstart[gp] = 1;
- /*log_text("new start of instruction");*/
if (linepcchange==p) {
- if (jlinenumbercount>lineindex) {
- currentline=jlinenumbers[lineindex].line_number;
+ if (inline_env->method->linenumbercount > lineindex) {
+ currentline = inline_env->method->linenumbers[lineindex].line_number;
lineindex++;
- if (lineindex<jlinenumbercount)
- linepcchange=jlinenumbers[lineindex].start_pc;
- /*printf("Line number changed to: %ld\n",currentline);*/
+ if (lineindex < inline_env->method->linenumbercount)
+ linepcchange = inline_env->method->linenumbers[lineindex].start_pc;
}
}
}
- /*INLINING*/
- if ((useinlining) && (gp == nextgp)) {
- u1 *tptr;
- bool *readonly = NULL;
-
-
- opcode = code_get_u1(p);
- nextp = p += jcommandsize[opcode];
- if (nextp > jcodelength)
- panic("Unexpected end of bytecode");
- tmpinlinf = list_first(inlinfo->inlinedmethods);
- firstlocal = tmpinlinf->firstlocal;
- label_index = tmpinlinf->label_index;
- readonly = tmpinlinf->readonly;
+ /* fetch next opcode */
- for (i = 0, tptr = tmpinlinf->method->paramtypes + tmpinlinf->method->paramcount - 1; i < tmpinlinf->method->paramcount; i++, tptr--) {
- int op;
+ opcode = code_get_u1(p, inline_env->method);
- if ((i == 0) && inlineparamopt) {
- OP1(ICMD_CLEAR_ARGREN, firstlocal);
- }
-
- if (!inlineparamopt || !readonly[i]) {
- op = ICMD_ISTORE;
-
- } else {
- op = ICMD_READONLY_ARG;
- }
-
- op += *tptr;
- OP1(op, firstlocal + tmpinlinf->method->paramcount - 1 - i);
+ if (!skipBasicBlockChange) {
+ m->basicblockindex[gp] |= (ipc << 1); /*store intermed cnt*/
+ } else skipBasicBlockChange=0;
- /* block_index[gp] |= (ipc << 1);*/ /*FIXME: necessary ? */
- }
+ /* some compilers put a JAVA_NOP after a blockend instruction */
- inlining_save_compiler_variables();
- inlining_set_compiler_variables(tmpinlinf);
- if (compileverbose) {
- char logtext[MAXLOGTEXT];
- sprintf(logtext, "Parsing (inlined): ");
- utf_sprint(logtext+strlen(logtext), method->class->name);
- strcpy(logtext+strlen(logtext), ".");
- utf_sprint(logtext+strlen(logtext), method->name);
- utf_sprint(logtext+strlen(logtext), method->descriptor);
- log_text(logtext);
- }
+ if ((opcode != JAVA_NOP) && (blockend == true)) {
+ /* start new block */
-
- if (inlinfo->inlinedmethods == NULL) {
- gp = -1;
- } else {
- tmpinlinf = list_first(inlinfo->inlinedmethods);
- nextgp = (tmpinlinf != NULL) ? tmpinlinf->startgp : -1;
- }
- if (method->exceptiontablelength > 0)
- nextex = fillextable(nextex, method->exceptiontable, method->exceptiontablelength, label_index, &b_count);
- continue;
+ block_insert(gp);
+ blockend = false;
}
-
- 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]);
- }
-
- block_index[gp] |= (ipc << 1); /* store intermediate count */
+ nextp = p + jcommandsize[opcode]; /* compute next instruction start */
- if (blockend) {
- block_insert(gp); /* start new block */
- blockend = false;
+ if (nextp > inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Unexpected end of bytecode");
+ return NULL;
}
- nextp = p + jcommandsize[opcode]; /* compute next instruction start */
- if (nextp > jcodelength)
- panic("Unexpected end of bytecode");
s_count += stackreq[opcode]; /* compute stack element count */
-
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 >= class->cpcount)
- panic ("Attempt to access constant outside range");
+ if (i >= inline_env->method->class->cpcount) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Attempt to access constant outside range");
+ return NULL;
+ }
- switch (class->cptags[i]) {
+ switch (inline_env->method->class->cptags[i]) {
case CONSTANT_Integer:
- LOADCONST_I(((constant_integer*)
- (class->cpinfos[i]))->value);
+ LOADCONST_I(((constant_integer *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Long:
- LOADCONST_L(((constant_long*)
- (class->cpinfos[i]))->value);
+ LOADCONST_L(((constant_long *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Float:
- LOADCONST_F(((constant_float*)
- (class->cpinfos[i]))->value);
+ LOADCONST_F(((constant_float *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_Double:
- LOADCONST_D(((constant_double*)
- (class->cpinfos[i]))->value);
+ LOADCONST_D(((constant_double *) (inline_env->method->class->cpinfos[i]))->value);
break;
case CONSTANT_String:
- LOADCONST_A(literalstring_new((utf*)
- (class->cpinfos[i])));
+ LOADCONST_A(literalstring_new((utf *) (inline_env->method->class->cpinfos[i])));
+ break;
+ case CONSTANT_Class:
+ cr = (constant_classref *) (inline_env->method->class->cpinfos[i]);
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true,
+ true, &c))
+ return NULL;
+
+ /* if not resolved, c == NULL */
+
+ LOADCONST_A_CLASS(c, cr);
break;
- default: panic("Invalid constant type to push");
+ default:
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Invalid constant type to push");
+ return NULL;
}
break;
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;
}
nextp = p + 1;
break;
- /* managing arrays ************************************************/
+ /* managing arrays ****************************************************/
case JAVA_NEWARRAY:
- OP2I(ICMD_CHECKASIZE, 0, 0);
- switch (code_get_s1(p + 1)) {
+ switch (code_get_s1(p + 1, inline_env->method)) {
case 4:
- BUILTIN1(BUILTIN_newarray_boolean, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_boolean);
break;
case 5:
- BUILTIN1(BUILTIN_newarray_char, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_char);
break;
case 6:
- BUILTIN1(BUILTIN_newarray_float, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_float);
break;
case 7:
- BUILTIN1(BUILTIN_newarray_double, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_double);
break;
case 8:
- BUILTIN1(BUILTIN_newarray_byte, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_byte);
break;
case 9:
- BUILTIN1(BUILTIN_newarray_short, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_short);
break;
case 10:
- BUILTIN1(BUILTIN_newarray_int, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_int);
break;
case 11:
- BUILTIN1(BUILTIN_newarray_long, TYPE_ADR,currentline);
+ bte = builtintable_get_internal(BUILTIN_newarray_long);
break;
- default: panic("Invalid array-type to create");
+ default:
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Invalid array-type to create");
+ return NULL;
}
+ BUILTIN(bte, true, NULL, currentline);
break;
case JAVA_ANEWARRAY:
- OP2I(ICMD_CHECKASIZE, 0, 0);
- i = code_get_u2(p + 1);
- {
- classinfo *component = (classinfo*)class_getconstant(class, i, CONSTANT_Class);
- LOADCONST_A_BUILTIN(class_array_of(component)->vftbl);
+ i = code_get_u2(p + 1, inline_env->method);
+ compr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ if (!compr)
+ return NULL;
- s_count++;
+ if (!(cr = class_get_classref_multiarray_of(1, compr)))
+ return NULL;
- BUILTIN2(BUILTIN_newarray, TYPE_ADR,currentline);
- }
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, true, &c))
+ return NULL;
+
+ LOADCONST_A_BUILTIN(c, cr);
+ bte = builtintable_get_internal(BUILTIN_newarray);
+ BUILTIN(bte, true, NULL, currentline);
+ s_count++;
break;
case JAVA_MULTIANEWARRAY:
- isleafmethod=false;
- i = code_get_u2(p + 1);
+ inline_env->method->isleafmethod = false;
+ i = code_get_u2(p + 1, inline_env->method);
{
- int v = code_get_u1(p + 3);
- vftbl *arrayvftbl = ((classinfo*)class_getconstant (class, i, CONSTANT_Class))->vftbl;
- OP2A(opcode, v, arrayvftbl,currentline);
+ s4 v = code_get_u1(p + 3, inline_env->method);
+
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ if (!cr)
+ return NULL;
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, true, &c))
+ return NULL;
+
+ /* if unresolved, c == NULL */
+ OP2AT(opcode, v, c, cr, currentline);
}
break;
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];
}
bound_check(i);
blockend = true;
OP1(opcode, 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);
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 (p==jcodelength-1) {*/ /* return is at end of inlined method */
+ 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;
+ /* zero val.a so no patcher is inserted */
+ /* the type checker may set this later */
+ iptr->val.a = NULL;
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;
OP(opcode);
break;
- /* table jumps ********************************/
+ /* table jumps ********************************************************/
case JAVA_LOOKUPSWITCH:
{
s4 num, j;
s4 *tablep;
- s4 prevvalue;
+ s4 prevvalue=0;
blockend = true;
nextp = ALIGN((p + 1), 4);
- if (nextp + 8 > jcodelength)
- panic("Unexpected end of bytecode");
+
+ if (nextp + 8 > inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Unexpected end of bytecode");
+ return NULL;
+ }
+
if (!useinlining) {
- tablep = (s4*)(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);
}
- OP2A(opcode, 0, tablep,currentline);
+ OP2A(opcode, 0, tablep, currentline);
/* 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) > jcodelength)
- panic("Unexpected end of bytecode");
+ if (nextp + 8 * num > inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Unexpected end of bytecode");
+ return NULL;
+ }
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;
/* 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 */
- 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 > jcodelength)
- panic("Unexpected end of bytecode");
+ if (nextp + 12 > inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Unexpected end of bytecode");
+ return NULL;
+ }
+
if (!useinlining) {
- tablep = (s4*)(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);
}
- OP2A(opcode, 0, tablep,currentline);
+ OP2A(opcode, 0, tablep, currentline);
/* 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;
num -= j; /* difference of upper - lower */
- if (num < 0)
- panic("invalid TABLESWITCH: upper bound < lower bound");
- if (nextp + 4*(num+1) > jcodelength)
- panic("Unexpected end of bytecode");
+ if (num < 0) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "invalid TABLESWITCH: upper bound < lower bound");
+ return NULL;
+ }
+
+ if (nextp + 4 * (num + 1) > inline_env->method->jcodelength) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Unexpected end of bytecode");
+ return NULL;
+ }
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) {
j = label_index[j];
+ }
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
}
- /* load and store of object fields *******************/
+ /* load and store of object fields ************************************/
case JAVA_AASTORE:
- BUILTIN3(BUILTIN_aastore, TYPE_VOID,currentline);
+ OP(opcode);
+ inline_env->method->isleafmethod = false;
break;
- case JAVA_PUTSTATIC:
case JAVA_GETSTATIC:
- i = code_get_u2(p + 1);
- {
- constant_FMIref *fr;
- fieldinfo *fi;
- fr = class_getconstant(class, i, CONSTANT_Fieldref);
- fi = class_resolvefield(fr->class, fr->name, fr->descriptor, class, true);
- if (!fi)
- panic("Exception thrown while parsing bytecode"); /* XXX should be passed on */
- OP2A(opcode, fi->type, fi,currentline);
- if (!fi->class->initialized) {
- isleafmethod = false;
- }
- }
- break;
-
- case JAVA_PUTFIELD:
+ case JAVA_PUTSTATIC:
case JAVA_GETFIELD:
- i = code_get_u2(p + 1);
+ case JAVA_PUTFIELD:
{
- constant_FMIref *fr;
- fieldinfo *fi;
- fr = class_getconstant (class, i, CONSTANT_Fieldref);
- fi = class_resolvefield(fr->class, fr->name, fr->descriptor, class, true);
- if (!fi)
- panic("Exception thrown while parsing bytecode"); /* XXX should be passed on */
- OP2A(opcode, fi->type, fi,currentline);
+ constant_FMIref *fr;
+ unresolved_field *uf;
+ fieldinfo *fi;
+
+ i = code_get_u2(p + 1, inline_env->method);
+ fr = class_getconstant(inline_env->method->class, i,
+ CONSTANT_Fieldref);
+ if (!fr)
+ return NULL;
+
+ OP2A_NOINC(opcode, fr->parseddesc.fd->type, fr, currentline);
+
+ if (!(uf = create_unresolved_field(inline_env->method->class,
+ inline_env->method,
+ iptr)))
+ return NULL;
+
+ /* store unresolved_field pointer */
+
+ iptr->target = uf;
+
+ /* only with -noverify, otherwise the typechecker does this */
+
+ if (!opt_verify) {
+ if (!resolve_field(uf, resolveLazy, &fi))
+ return NULL;
+
+ iptr->val.a = fi;
+
+ } else {
+ iptr->val.a = NULL;
+ }
+ PINC;
}
break;
- /* method invocation *****/
+ /* 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;
-
- mr = class_getconstant (class, i, CONSTANT_Methodref);
- mi = class_resolveclassmethod (mr->class, mr->name, mr->descriptor, class, true);
- if (!mi)
- panic("Exception thrown while parsing bytecode"); /* XXX should be passed on */
- /*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 (!(mi->flags & ACC_STATIC))
- panic ("Static/Nonstatic mismatch calling static method");
- descriptor2types(mi);
-
- isleafmethod=false;
- OP2A(opcode, mi->paramcount, mi,currentline);
+ constant_FMIref *mr;
+ methoddesc *md;
+ unresolved_method *um;
+ methodinfo *mi;
+
+ inline_env->method->isleafmethod = false;
+
+ mr = class_getconstant(inline_env->method->class, i,
+ CONSTANT_Methodref);
+ if (!mr)
+ return NULL;
+
+ md = mr->parseddesc.md;
+
+ if (!md->params)
+ if (!descriptor_params_from_paramtypes(md, ACC_STATIC))
+ return NULL;
+
+ OP2A_NOINC(opcode, 0, mr, currentline);
+
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method, iptr);
+
+ if (!um)
+ return NULL;
+
+ /* 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;
case JAVA_INVOKESPECIAL:
case JAVA_INVOKEVIRTUAL:
- i = code_get_u2(p + 1);
{
- constant_FMIref *mr;
- methodinfo *mi;
-
- mr = class_getconstant (class, i, CONSTANT_Methodref);
- mi = class_resolveclassmethod (mr->class, mr->name, mr->descriptor, class, true);
- if (!mi)
- panic("Exception thrown while parsing bytecode"); /* XXX should be passed on */
- /*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 (mi->flags & ACC_STATIC)
- panic ("Static/Nonstatic mismatch calling static method");
- descriptor2types(mi);
- isleafmethod=false;
- OP2A(opcode, mi->paramcount, mi,currentline);
+ constant_FMIref *mr;
+ methoddesc *md;
+ unresolved_method *um;
+ methodinfo *mi;
+
+ inline_env->method->isleafmethod = false;
+
+ i = code_get_u2(p + 1, inline_env->method);
+ mr = class_getconstant(inline_env->method->class, i,
+ CONSTANT_Methodref);
+ if (!mr)
+ return NULL;
+
+ md = mr->parseddesc.md;
+
+ if (!md->params)
+ if (!descriptor_params_from_paramtypes(md, 0))
+ return NULL;
+
+ OP2A_NOINC(opcode, 0, mr, currentline);
+
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method, iptr);
+
+ if (!um)
+ return NULL;
+
+ /* store the unresolved_method* */
+
+ 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;
case JAVA_INVOKEINTERFACE:
- i = code_get_u2(p + 1);
+ i = code_get_u2(p + 1, inline_env->method);
{
- constant_FMIref *mr;
- methodinfo *mi;
+ constant_FMIref *mr;
+ methoddesc *md;
+ unresolved_method *um;
+ methodinfo *mi;
- mr = class_getconstant (class, i, CONSTANT_InterfaceMethodref);
- mi = class_resolveinterfacemethod (mr->class, mr->name, mr->descriptor, class, true);
- if (!mi)
- panic("Exception thrown while parsing bytecode"); /* XXX should be passed on */
- if (mi->flags & ACC_STATIC)
- panic ("Static/Nonstatic mismatch calling static method");
- descriptor2types(mi);
- isleafmethod=false;
- OP2A(opcode, mi->paramcount, mi,currentline);
+ inline_env->method->isleafmethod = false;
+
+ mr = class_getconstant(inline_env->method->class, i,
+ CONSTANT_InterfaceMethodref);
+ if (!mr)
+ return NULL;
+
+ md = mr->parseddesc.md;
+
+ if (!md->params)
+ if (!descriptor_params_from_paramtypes(md, 0))
+ return NULL;
+
+ OP2A_NOINC(opcode, 0, mr, currentline);
+
+ um = create_unresolved_method(inline_env->method->class,
+ inline_env->method, iptr);
+
+ if (!um)
+ return NULL;
+
+ /* store the unresolved_method* */
+
+ 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;
- /* miscellaneous object operations *******/
+ /* miscellaneous object operations ************************************/
case JAVA_NEW:
- i = code_get_u2 (p+1);
-
- LOADCONST_A_BUILTIN(class_getconstant(class, i, CONSTANT_Class));
+ i = code_get_u2(p + 1, inline_env->method);
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ if (!cr)
+ return NULL;
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, true,
+ &c))
+ return NULL;
+
+ LOADCONST_A_BUILTIN(c, cr);
+ bte = builtintable_get_internal(BUILTIN_new);
+ BUILTIN(bte, true, NULL, currentline);
s_count++;
- BUILTIN1(BUILTIN_new, TYPE_ADR,currentline);
break;
case JAVA_CHECKCAST:
- i = code_get_u2(p+1);
- {
- classinfo *cls = (classinfo*)class_getconstant(class, i, CONSTANT_Class);
- if (cls->vftbl->arraydesc) {
- /* array type cast-check */
- LOADCONST_A_BUILTIN(cls->vftbl);
- 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);
- }
- }
+ i = code_get_u2(p + 1, inline_env->method);
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ if (!cr)
+ return NULL;
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true,
+ true, &c))
+ return NULL;
+ if (cr->name->text[0] == '[') {
+ /* array type cast-check */
+ OP2AT(opcode, 0, c, cr, currentline);
+ inline_env->method->isleafmethod = false;
+
+ } else {
+ /* object type cast-check */
+ OP2AT(opcode, 1, c, cr, currentline);
+ }
break;
case JAVA_INSTANCEOF:
- i = code_get_u2(p+1);
-
- {
- classinfo *cls = (classinfo*)class_getconstant(class, i, CONSTANT_Class);
- if (cls->vftbl->arraydesc) {
- /* array type cast-check */
- LOADCONST_A_BUILTIN(cls->vftbl);
- 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);
- }
- }
+ i = code_get_u2(p + 1,inline_env->method);
+ cr = (constant_classref *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+ if (!cr)
+ return NULL;
+
+ if (!resolve_classref(inline_env->method, cr, resolveLazy, true, true, &c))
+ return NULL;
+
+ if (cr->name->text[0] == '[') {
+ /* array type cast-check */
+ LOADCONST_A_BUILTIN(c, cr);
+ bte = builtintable_get_internal(BUILTIN_arrayinstanceof);
+ BUILTIN(bte, false, NULL, currentline);
+ s_count++;
+
+ } else {
+ /* object type cast-check */
+ OP2AT(opcode, 1, c, cr, currentline);
+ }
break;
case JAVA_MONITORENTER:
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
if (checksync) {
- BUILTIN1(BUILTIN_monitorenter, TYPE_VOID,currentline);
+ OP(ICMD_CHECKNULL);
+ bte = builtintable_get_internal(BUILTIN_monitorenter);
+ BUILTIN(bte, false, NULL, 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);
- }
- else
+ bte = builtintable_get_internal(BUILTIN_monitorexit);
+ BUILTIN(bte, false, NULL, currentline);
+ } else
#endif
{
OP(ICMD_POP);
}
break;
- /* any other basic operation **************************************/
+ /* any other basic operation ******************************************/
case JAVA_IDIV:
+#if !SUPPORT_DIVISION
+ bte = builtintable_get_internal(BUILTIN_idiv);
+ OP2A(opcode, bte->md->paramcount, bte, currentline);
+ inline_env->method->isleafmethod = false;
+#else
OP(opcode);
+#endif
break;
case JAVA_IREM:
+#if !SUPPORT_DIVISION
+ bte = builtintable_get_internal(BUILTIN_irem);
+ OP2A(opcode, bte->md->paramcount, bte, currentline);
+ inline_env->method->isleafmethod = false;
+#else
OP(opcode);
+#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);
+ inline_env->method->isleafmethod = false;
+#else
OP(opcode);
+#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);
+ inline_env->method->isleafmethod = false;
+#else
OP(opcode);
+#endif
break;
case JAVA_FREM:
#if defined(__I386__)
OP(opcode);
#else
- BUILTIN2(BUILTIN_frem, TYPE_FLOAT,currentline);
+ bte = builtintable_get_internal(BUILTIN_frem);
+ BUILTIN(bte, false, NULL, currentline);
#endif
break;
#if defined(__I386__)
OP(opcode);
#else
- BUILTIN2(BUILTIN_drem, TYPE_DOUBLE,currentline);
+ bte = builtintable_get_internal(BUILTIN_drem);
+ BUILTIN(bte, false, NULL, currentline);
#endif
break;
case JAVA_F2I:
#if defined(__ALPHA__)
if (!opt_noieee) {
- BUILTIN1(BUILTIN_f2i, TYPE_INT,currentline);
+ bte = builtintable_get_internal(BUILTIN_f2i);
+ BUILTIN(bte, false, NULL, currentline);
} else
#endif
{
case JAVA_F2L:
#if defined(__ALPHA__)
if (!opt_noieee) {
- BUILTIN1(BUILTIN_f2l, TYPE_LONG,currentline);
+ bte = builtintable_get_internal(BUILTIN_f2l);
+ BUILTIN(bte, false, NULL, currentline);
} else
#endif
{
case JAVA_D2I:
#if defined(__ALPHA__)
if (!opt_noieee) {
- BUILTIN1(BUILTIN_d2i, TYPE_INT,currentline);
+ bte = builtintable_get_internal(BUILTIN_d2i);
+ BUILTIN(bte, false, NULL, currentline);
} else
#endif
{
case JAVA_D2L:
#if defined(__ALPHA__)
if (!opt_noieee) {
- BUILTIN1(BUILTIN_d2l, TYPE_LONG,currentline);
+ bte = builtintable_get_internal(BUILTIN_d2l);
+ BUILTIN(bte, false, NULL, currentline);
} else
#endif
{
break;
case JAVA_BREAKPOINT:
- panic("Illegal opcode Breakpoint encountered");
- break;
+ *exceptionptr =
+ new_verifyerror(m, "Quick instructions shouldn't appear yet.");
+ return NULL;
- case 186: /* unused opcode */
+ case 186: /* unused opcode */
case 203:
case 204:
case 205:
case 253:
case 254:
case 255:
- printf("Illegal opcode %d at instr %d\n", opcode, ipc);
- panic("Illegal opcode encountered");
+ *exceptionptr =
+ new_verifyerror(inline_env->method,"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 (isinlinedmethod && p == jcodelength - 1) { /* end of an inlined method */
- /* printf("setting gp from %d to %d\n",gp, inlinfo->stopgp); */
+ if (iswide && opcode != JAVA_WIDE) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Illegal instruction: WIDE before incompatible opcode");
+ return NULL;
+ }
+
+#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 */
gp = inlinfo->stopgp;
inlining_restore_compiler_variables();
+ OP(ICMD_INLINE_END);
+ /*label_index = inlinfo->label_index;*/
+
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);
nextgp = (tmpinlinf != NULL) ? tmpinlinf->startgp : -1;
}
- /* printf("nextpgp: %d\n", nextgp); */
label_index=inlinfo->label_index;
firstlocal = inlinfo->firstlocal;
}
+#endif /* defined(USE_INLINING) */
+
} /* end for */
- if (p != jcodelength)
- panic("Command-sequence crosses code-boundary");
- if (!blockend)
- panic("Code does not end with branch/return/athrow - stmt");
+ if (p != m->jcodelength) {
+ printf("p (%d) != m->jcodelength (%d)\n",p,m->jcodelength);
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Command-sequence crosses code-boundary");
+ return NULL;
+ }
+
+ if (!blockend) {
+ *exceptionptr = new_verifyerror(m, "Falling off the end of the code");
+ return NULL;
+ }
- /* adjust block count if target 0 is not first intermediate instruction */
+ /* adjust block count if target 0 is not first intermediate instruction */
- if (!block_index[0] || (block_index[0] > 1))
+ if (!m->basicblockindex[0] || (m->basicblockindex[0] > 1))
b_count++;
- /* copy local to global variables */
+ /* copy local to method variables */
- instr_count = ipc;
- block_count = b_count;
- stack_count = s_count + block_count * maxstack;
+ m->instructioncount = ipc;
+ m->basicblockcount = b_count;
+ m->stackcount = s_count + m->basicblockcount * m->maxstack;
/* allocate stack table */
- stack = DMNEW(stackelement, stack_count);
+ m->stack = DMNEW(stackelement, m->stackcount);
{
- basicblock *bptr;
+ basicblock *bptr;
- bptr = block = DMNEW(basicblock, b_count + 1); /* one more for end ipc */
+ 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 */
+ /* additional block if target 0 is not first intermediate instruction */
- if (!block_index[0] || (block_index[0] > 1)) {
- bptr->iinstr = instr;
+ if (!m->basicblockindex[0] || (m->basicblockindex[0] > 1)) {
+ bptr->iinstr = m->instructions;
bptr->mpc = -1;
bptr->flags = -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++;
b_count++;
(bptr - 1)->next = bptr;
/* allocate blocks */
- for (p = 0; p < cumjcodelength; p++) {
- if (block_index[p] & 1) {
- /* check if this block starts at the beginning of an instruction */
- if (!instructionstart[p])
- panic("Branch into middle of instruction");
+ 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]) {
+ *exceptionptr = new_verifyerror(inline_env->method,
+ "Branch into middle of instruction");
+ return NULL;
+ }
+
/* allocate the block */
- bptr->iinstr = instr + (block_index[p] >> 1);
- bptr->debug_nr = c_debug_nr++;
+ bptr->iinstr = m->instructions + (m->basicblockindex[p] >> 1);
+ bptr->debug_nr = m->c_debug_nr++;
if (b_count != 0)
(bptr - 1)->icount = bptr->iinstr - (bptr - 1)->iinstr;
bptr->mpc = -1;
bptr->lflags = 0;
bptr->type = BBTYPE_STD;
bptr->branchrefs = NULL;
- block_index[p] = b_count;
+ m->basicblockindex[p] = b_count;
bptr->pre_count = 0;
bptr++;
b_count++;
bptr->instack = bptr->outstack = NULL;
bptr->indepth = bptr->outdepth = 0;
bptr->iinstr = NULL;
- (bptr - 1)->icount = (instr + instr_count) - (bptr - 1)->iinstr;
+ (bptr - 1)->icount = (m->instructions + m->instructioncount) - (bptr - 1)->iinstr;
bptr->icount = 0;
bptr->mpc = -1;
bptr->flags = -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;
- last_block = bptr;
-
- if (exceptiontablelength > 0)
- extable[exceptiontablelength - 1].down = NULL;
- else
- extable = NULL;
-
- for (i = 0; i < exceptiontablelength; ++i) {
- p = extable[i].startpc;
- extable[i].start = block + block_index[p];
+ 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];
- p = extable[i].endpc;
- extable[i].end = (p == cumjcodelength) ? last_block : (block + block_index[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 = extable[i].handlerpc;
- extable[i].handler = block + block_index[p];
+ p = cd->exceptiontable[i].handlerpc;
+ cd->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
}
}
-
- if (useinlining) inlining_cleanup();
- useinlining = useinltmp;
+
+ /* just return methodinfo* to signal everything was ok */
+
+ return m;
}
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/
projects / cacao.git / blobdiff