-/* jit/parse.c *****************************************************************
-
- Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst
-
- See file COPYRIGHT for information on usage and disclaimer of warranties
-
- Parser for JavaVM to intermediate code translation
-
- Author: Andreas Krall EMAIL: cacao@complang.tuwien.ac.at
-
- Last Change: $Id: parse.c 530 2003-10-23 21:18:38Z stefan $
- include Rapid Type Analysis parse - 5/2003 - carolyn
-
-
-*******************************************************************************/
-
-#include "math.h"
-#include "sets.h"
- /* data about the currently parsed method */
-
-static classinfo *rt_class; /* class the compiled method belongs to */
-static methodinfo *rt_method; /* pointer to method info of compiled method */
-static utf *rt_descriptor; /* type descriptor of compiled method */
-static int rt_jcodelength; /*length of JavaVM-codes */
-static u1 *rt_jcode; /* pointer to start of JavaVM-code */
-
-
-/* macros for byte code fetching ***********************************************
-
- fetch a byte code of given size from position p in code array jcode
-
-*******************************************************************************/
-
-#define code_get_u1(p) jcode[p]
-#define code_get_s1(p) ((s1)jcode[p])
-#define code_get_u2(p) ((((u2)jcode[p])<<8)+jcode[p+1])
-#define code_get_s2(p) ((s2)((((u2)jcode[p])<<8)+jcode[p+1]))
-#define code_get_u4(p) ((((u4)jcode[p])<<24)+(((u4)jcode[p+1])<<16)\
- +(((u4)jcode[p+2])<<8)+jcode[p+3])
-#define code_get_s4(p) ((s4)((((u4)jcode[p])<<24)+(((u4)jcode[p+1])<<16)\
- +(((u4)jcode[p+2])<<8)+jcode[p+3]))
-
-
+/* vm/jit/parse.c - parser for JavaVM to intermediate code translation
+
+ 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.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+
+ Contact: cacao@complang.tuwien.ac.at
+
+ Author: Andreas Krall
+
+ Changes: Carolyn Oates
+ Edwin Steiner
+ Joseph Wenninger
+
+ $Id: parse.c 1735 2004-12-07 14:33:27Z twisti $
+
+*/
+
+
+#include <string.h>
+
+#include "config.h"
+#include "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/loader.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
+#include "vm/tables.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/parse.h"
+#include "vm/jit/inline/parseRT.h"
+#include "vm/jit/inline/inline.h"
+#include "vm/jit/loop/loop.h"
+
+
+#define METHINFO(mm) \
+ { \
+ printf("PARSE method name ="); \
+ utf_display(mm->class->name); \
+ printf("."); \
+ method_display(mm); \
+ fflush(stdout); \
+ }
+#define DEBUGMETH(mm) \
+if (DEBUG4 == true) \
+ { \
+ printf("PARSE method name ="); \
+ utf_display(mm->class->name); \
+ printf("."); \
+ method_display(mm); \
+ fflush(stdout); \
+ }
+
+#define SHOWOPCODE \
+if (DEBUG4 == true) {printf("Parse p=%i<%i< opcode=<%i> %s\n", \
+ p, m->jcodelength,opcode,opcode_names[opcode]);}
+bool DEBUG = false;
+bool DEBUG2 = false;
+bool DEBUG3 = false;
+bool DEBUG4 = false; /*opcodes*/
/*INLINING*/
-#include "inline.c"
-/*#define debug_writebranch printf("op: %s i: %d label_index[i]: %d\n",icmd_names[opcode], i, label_index[i]);*/
-#define debug_writebranch
-
-/* functionc compiler_addinitclass *********************************************
-
- add class into the list of classes to initialize
-
-*******************************************************************************/
-
-static void compiler_addinitclass (classinfo *c)
-{
- classinfo *cl;
-
- if (c->initialized) return;
-
- cl = chain_first(uninitializedclasses);
- if (cl == c)
- return;
-
- if (cl == class)
- cl = chain_next(uninitializedclasses);
- for (;;) {
- if (cl == c)
- return;
- if (cl == NULL) {
- if (runverbose) {
- sprintf(logtext, "compiler_addinitclass: ");
- utf_sprint(logtext+strlen(logtext), c->name);
- dolog();
- }
- chain_addlast(uninitializedclasses, c);
- return;
- }
- if (c < cl) {
- if (runverbose) {
- sprintf(logtext, "compiler_addinitclass: ");
- utf_sprint(logtext+strlen(logtext), c->name);
- dolog();
- }
- chain_addbefore(uninitializedclasses, c);
- return;
- }
- cl = chain_next(uninitializedclasses);
- }
-}
+#define debug_writebranch if (DEBUG2==true) printf("op:: %s i: %d label_index[i]: %d label_index=0x%x\n",opcode_names[opcode], i, label_index[i], label_index);
+#define debug_writebranch1
/* function descriptor2typesL ***************************************************
*******************************************************************************/
-classSetNode * descriptor2typesL (methodinfo *m)
+classSetNode *descriptor2typesL(methodinfo *m)
{
-int debugInfo = 0;
+ int debugInfo = 0;
int i;
u1 *types, *tptr;
int pcount, c;
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);
+ if (debugInfo >= 1) {
+ printf("In descriptor2typesL >>>\t"); fflush(stdout);
+ utf_display(m->class->name); printf(".");
+ method_display(m);fflush(stdout);
}
pcount = 0;
*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");
+ 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 '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;
+ 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;
+ /* 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 (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);
+ 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;
+ return p;
}
+
+
/* function descriptor2types ***************************************************
decodes a already checked method descriptor. The parameter count, the
*******************************************************************************/
-static void descriptor2types (methodinfo *m)
+void descriptor2types(methodinfo *m)
{
u1 *types, *tptr;
int pcount, c;
char *utf_ptr;
pcount = 0;
- types = DMNEW (u1, m->descriptor->blength);
+ 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 '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 '[':
- case 'L': m->returntype = TYPE_ADR;
- break;
- case 'V': m->returntype = TYPE_VOID;
- break;
-
- default: panic ("Ill formed methodtype-descriptor");
+ *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
*******************************************************************************/
-/* intermediate code generating macros */
-
-#define PINC iptr++;ipc++
-#define LOADCONST_I(v) iptr->opc=ICMD_ICONST;iptr->op1=0;iptr->val.i=(v);PINC
-#define LOADCONST_L(v) iptr->opc=ICMD_LCONST;iptr->op1=0;iptr->val.l=(v);PINC
-#define LOADCONST_F(v) iptr->opc=ICMD_FCONST;iptr->op1=0;iptr->val.f=(v);PINC
-#define LOADCONST_D(v) iptr->opc=ICMD_DCONST;iptr->op1=0;iptr->val.d=(v);PINC
-#define LOADCONST_A(v) iptr->opc=ICMD_ACONST;iptr->op1=0;iptr->val.a=(v);PINC
-#define OP(o) iptr->opc=(o);iptr->op1=0;iptr->val.l=0;PINC
-#define OP1(o,o1) iptr->opc=(o);iptr->op1=(o1);iptr->val.l=(0);PINC
-#define OP2I(o,o1,v) iptr->opc=(o);iptr->op1=(o1);iptr->val.i=(v);PINC
-#define OP2A(o,o1,v) iptr->opc=(o);iptr->op1=(o1);iptr->val.a=(v);PINC
-#define BUILTIN1(v,t) isleafmethod=false;iptr->opc=ICMD_BUILTIN1;iptr->op1=t;\
- iptr->val.a=(v);PINC
-#define BUILTIN2(v,t) isleafmethod=false;iptr->opc=ICMD_BUILTIN2;iptr->op1=t;\
- iptr->val.a=(v);PINC
-#define BUILTIN3(v,t) isleafmethod=false;iptr->opc=ICMD_BUILTIN3;iptr->op1=t;\
- iptr->val.a=(v);PINC
-
-
-/* block generating and checking macros */
-
-#define block_insert(i) {if(!(block_index[i]&1))\
- {b_count++;block_index[i] |= 1;}}
-#define bound_check(i) {if((i< 0) || (i>=cumjcodelength)) \
- panic("branch target out of code-boundary");}
-#define bound_check1(i) {if((i< 0) || (i>cumjcodelength)) \
- panic("branch target out of code-boundary");}
-/* FIXME really use cumjcodelength for the bound_checkers ? */
-
-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, i, p, src, insertBlock;
if (exceptiontablelength == 0)
return extable;
+
+ /*if (m->exceptiontablelength > 0) {
+ DEBUGMETH(m);
+ printf("m->exceptiontablelength=%i\n",m->exceptiontablelength);
+ panic("exceptiontablelength > 0");
+ }*/
+
b_count = *block_count;
- for (i = 0; i < exceptiontablelength; i++) {
-
- p = raw_extable[i].startpc;
+
+ for (src = exceptiontablelength-1; src >=0; src--) {
+ /* printf("Excepiont table index: %d\n",i); */
+ p = raw_extable[src].startpc;
if (label_index != NULL) p = label_index[p];
- extable[i].startpc = p;
+ extable->startpc = p;
bound_check(p);
block_insert(p);
- p = raw_extable[i].endpc;
+/*** if (DEBUG==true){printf("---------------------block_inserted:b_count=%i m->basicblockindex[(p=%i)]=%i=%p\n",b_count,p,m->basicblockindex[(p)],m->basicblockindex[(p)]);
+ fflush(stdout); } ***/
+ p = raw_extable[src].endpc; /* see JVM Spec 4.7.3 */
+ if (p <= raw_extable[src].startpc)
+ panic("Invalid exception handler range");
+
+ if (p >inline_env->method->jcodelength) {
+ panic("Invalid exception handler end is after code end");
+ }
+ if (p<inline_env->method->jcodelength) insertBlock=1; else insertBlock=0;
+ /*if (label_index !=NULL) printf("%s:translating endpc:%ld to %ld, label_index:%p\n",m->name->text,p,label_index[p],label_index); else
+ printf("%s:fillextab: endpc:%ld\n",m->name->text,p);*/
if (label_index != NULL) p = label_index[p];
- extable[i].endpc = p;
+ extable->endpc = p;
bound_check1(p);
- if (p < cumjcodelength)
- 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->catchtype = raw_extable[src].catchtype;
+ extable->next = NULL;
+ extable->down = &extable[1];
+ extable--;
+ }
- extable[i].next = NULL;
- extable[i].down = &extable[i+1];
- }
*block_count = b_count;
- return &extable[i]; /* return the next free xtable* */
+ return extable; /*&extable[i];*/ /* return the next free xtable* */
}
-static 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, *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 */
-
- bool useinltmp;
-
-/*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;
+ bool iswide = false; /* true if last instruction was a wide*/
+ instruction *iptr; /* current ptr into instruction array */
+ int gp; /* global java instruction counter */
+ /* inlining info for current method */
+
+ inlining_methodinfo *inlinfo = inline_env->inlining_rootinfo;
+ inlining_methodinfo *tmpinlinf;
+ int nextgp = -1; /* start of next method to be inlined */
+ int *label_index = NULL; /* label redirection table */
+ int firstlocal = 0; /* first local variable of method */
+ exceptiontable* nextex; /* points next free entry in extable */
+ u1 *instructionstart; /* 1 for pcs which are valid instr. starts */
+
+ u2 lineindex = 0;
+ u2 currentline = 0;
+ u2 linepcchange = 0;
+
+ u2 skipBasicBlockChange;
+
+if (DEBUG4==true) {printf("\nPARSING: "); fflush(stdout);
+DEBUGMETH(m);
+}
+if (opt_rt) {
+ if (m->methodUsed != USED) {
+ if (opt_verbose) {
+ printf(" rta missed: "); fflush(stdout);
+ METHINFO(m);
+ }
+ if ( (rtMissed = fopen("rtMissed", "a")) == NULL) {
+ printf("CACAO - rtMissed file: cant open file to write append \n");
+ }
+ else {
+ utf_fprint(rtMissed,m->class->name);
+ fprintf(rtMissed," "); fflush(rtMissed);
+ utf_fprint(rtMissed,m->name);
+ fprintf(rtMissed," "); fflush(rtMissed);
+ utf_fprint(rtMissed,m->descriptor);
+ fprintf(rtMissed,"\n"); fflush(rtMissed);
+ fclose(rtMissed);
+ }
+ }
+}
+ /* INLINING */
+
+ if (useinlining) {
+ label_index = inlinfo->label_index;
+ m->maxstack = inline_env->cummaxstack;
+ /*JOWENN m->exceptiontablelength = inline_env->cumextablelength;*/
+ tmpinlinf = (inlining_methodinfo*)
+ list_first(inlinfo->inlinedmethods);
+ if (tmpinlinf != NULL) nextgp = tmpinlinf->startgp;
}
- /*RTAprint*/ if ( ((opt_rt) ||(opt_xta) || (opt_vta)) && ((pOpcodes == 2) || (pOpcodes == 3)) )
- /*RTAprint*/ {printf("PARSE method name =");
- /*RTAprint*/ utf_display(method->class->name);printf(".");
- /*RTAprint*/ method_display(method); printf(">\n\n");fflush(stdout);}
- if ((opt_rt) || (opt_xta)) {
- RT_jit_parse(method);
- }
- else {
- if (opt_vta)
- printf("VTA requested, but not yet implemented\n");
+/**** static analysis has to be called before inlining
+ which has to be called before reg_set
+ which has to be called before parse (or ???)
+ will check if method being parsed was analysed here
+ ****/
+ if (opt_xta && opt_verbose) {
+ /**RT_jit_parse(m);**/
+ printf("XTA requested, not available\n");
}
-
+ if (opt_vta && opt_verbose)
+ printf("VTA requested, not yet implemented\n");
/* allocate instruction array and block index table */
- /* 1 additional for end ipc and 3 for loop unrolling */
+ /* 1 additional for end ipc * # cum inline methods*/
- block_index = DMNEW(int, 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);
-
- /* initialize block_index table (unrolled four times) */
+ iptr = m->instructions = DMNEW(instruction, inline_env->cumjcodelength + 5);
- {
- int *ip;
-
- for (i = 0, ip = block_index; i <= cumjcodelength; i += 4, ip += 4) {
- ip[0] = 0;
- ip[1] = 0;
- ip[2] = 0;
- ip[3] = 0;
- }
- }
+ /* 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) * (inline_env->cumjcodelength + 5));
+
/* 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];
- }
+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(extable, raw_extable, method->exceptiontablelength, label_index, &b_count);
-
- s_count = 1 + exceptiontablelength; /* initialize stack element counter */
+ nextex = fillextable(m,
+ &(cd->exceptiontable[cd->exceptiontablelength-1]), m->exceptiontable, m->exceptiontablelength,
+ label_index, &b_count, inline_env);
+ s_count = 1 + m->exceptiontablelength; /* initialize stack element counter */
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- isleafmethod=false;
- }
+#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;
- for (p = 0, gp = 0; p < jcodelength; gp += (nextp - p), p = nextp) {
-
- /* DEBUG printf("p:%d gp:%d ",p,gp); */
+ if (m->linenumbercount == 0) {
+ lineindex = 0;
-/*INLINING*/
- if ((useinlining) && (gp == nextgp)) {
- u1 *tptr;
- bool *readonly = NULL;
-
- opcode = code_get_u1 (p);
- nextp = p += jcommandsize[opcode];
- tmpinlinf = list_first(inlinfo->inlinedmethods);
- firstlocal = tmpinlinf->firstlocal;
- label_index = tmpinlinf->label_index;
- readonly = tmpinlinf->readonly;
- for (i=0, tptr=tmpinlinf->method->paramtypes + tmpinlinf->method->paramcount - 1 ; i<tmpinlinf->method->paramcount; i++, tptr--)
- {
- int op;
-
- 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);
-
- /* block_index[gp] |= (ipc << 1);*/ /*FIXME: necessary ? */
- }
- inlining_save_compiler_variables();
- inlining_set_compiler_variables(tmpinlinf);
- 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;
- }
-
- opcode = code_get_u1 (p); /* fetch op code */
+ } else {
+ linepcchange = m->linenumbers[0].start_pc;
+ }
+ skipBasicBlockChange=0;
+ for (p = 0, gp = 0; p < inline_env->method->jcodelength; gp += (nextp - p), p = nextp) {
- /*RTAprint*/ if ((opt_rt) && ((pOpcodes == 2) || (pOpcodes == 3)) )
- /*RTAprint*/ {printf("Parse<%i> p=%i<%i< opcode=<%i> %s\n",
- /*RTAprint*/ pOpcodes, p,rt_jcodelength,opcode,icmd_names[opcode]);}
-
- block_index[gp] |= (ipc << 1); /* store intermediate count */
+ /* DEBUG */ if (DEBUG==true) printf("----- p:%d gp:%d\n",p,gp);
+
+ /* mark this position as a valid instruction start */
+ if (!iswide) {
+ instructionstart[gp] = 1;
+ /*log_text("new start of instruction");*/
+ if (linepcchange==p) {
+ if (inline_env->method->linenumbercount > lineindex) {
+ currentline = inline_env->method->linenumbers[lineindex].line_number;
+ lineindex++;
+ if (lineindex < inline_env->method->linenumbercount)
+ linepcchange = inline_env->method->linenumbers[lineindex].start_pc;
+ /*printf("Line number changed to: %ld\n",currentline);*/
+ }
+ }
+ }
- if (blockend) {
- block_insert(gp); /* start new block */
- blockend = false;
- }
+ /*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");
+ tmpinlinf = list_first(inlinfo->inlinedmethods);
+ firstlocal = tmpinlinf->firstlocal;
+ label_index = tmpinlinf->label_index;
+ readonly = tmpinlinf->readonly;
+
+ for (i=0,tptr=tmpinlinf->method->paramtypes;i<tmpinlinf->method->paramcount;i++,tptr++) {
+ if ( ((*tptr)==TYPE_LNG) ||
+ ((*tptr)==TYPE_DBL) )
+ argBlockIdx+=2;
+ else
+ argBlockIdx++;
+ }
- nextp = p + jcommandsize[opcode]; /* compute next instruction start */
- s_count += stackreq[opcode]; /* compute stack element count */
+ for (i = 0, tptr = tmpinlinf->method->paramtypes + tmpinlinf->method->paramcount - 1; i < tmpinlinf->method->paramcount; i++, tptr--) {
+ int op;
- switch (opcode) {
+ if ((i == 0) && inlineparamopt) {
+ OP1(ICMD_CLEAR_ARGREN, firstlocal);
+ }
- case JAVA_NOP:
- break;
+ if (!inlineparamopt || !readonly[i]) {
+ op = ICMD_ISTORE;
- /* pushing constants onto the stack p */
+ } else {
+ op = ICMD_READONLY_ARG;
+ }
- case JAVA_BIPUSH:
- LOADCONST_I(code_get_s1(p+1));
- break;
+ op += *tptr;
+ if ( ((*tptr)==TYPE_LNG) ||
+ ((*tptr)==TYPE_DBL) )
+ argBlockIdx-=2;
+ else
+ argBlockIdx--;
- case JAVA_SIPUSH:
- LOADCONST_I(code_get_s2(p+1));
- break;
+ OP1(op, firstlocal + argBlockIdx);
+ /* OP1(op, firstlocal + tmpinlinf->method->paramcount - 1 - i); */
+ /* printf("inline argument load operation for local: %ld\n",firstlocal + tmpinlinf->method->paramcount - 1 - i); */
+ }
+ skipBasicBlockChange=1;
+if (DEBUG==true) {
+printf("BEFORE SAVE: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
+ inlining_save_compiler_variables();
+if (DEBUG==true) {
+printf("AFTER SAVE: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
+ inlining_set_compiler_variables(tmpinlinf);
+if (DEBUG==true) {
+printf("AFTER SET :: "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
+ if (DEBUG) {
+ printf("\n.......Parsing (inlined): ");
+ DEBUGMETH(m);
+ DEBUGMETH(inline_env->method);
+ }
- case JAVA_LDC1:
- i = code_get_u1(p+1);
- goto pushconstantitem;
- case JAVA_LDC2:
- case JAVA_LDC2W:
- i = code_get_u2(p + 1);
-
- pushconstantitem:
-
- if (i >= class->cpcount)
- panic ("Attempt to access constant outside range");
-
- switch (class->cptags[i]) {
- case CONSTANT_Integer:
- LOADCONST_I(((constant_integer*)
- (class->cpinfos[i]))->value);
- break;
- case CONSTANT_Long:
- LOADCONST_L(((constant_long*)
- (class->cpinfos[i]))->value);
- break;
- case CONSTANT_Float:
- LOADCONST_F(((constant_float*)
- (class->cpinfos[i]))->value);
- break;
- case CONSTANT_Double:
- LOADCONST_D(((constant_double*)
- (class->cpinfos[i]))->value);
- break;
- case CONSTANT_String:
- LOADCONST_A(literalstring_new((utf*)
- (class->cpinfos[i])));
- break;
- default: panic("Invalid constant type to push");
- }
- break;
- case JAVA_ACONST_NULL:
- LOADCONST_A(NULL);
- break;
+ OP1(ICMD_INLINE_START,tmpinlinf->level);
- case JAVA_ICONST_M1:
- case JAVA_ICONST_0:
- case JAVA_ICONST_1:
- case JAVA_ICONST_2:
- case JAVA_ICONST_3:
- case JAVA_ICONST_4:
- case JAVA_ICONST_5:
- LOADCONST_I(opcode - JAVA_ICONST_0);
- break;
+ if (inlinfo->inlinedmethods == NULL) {
+ gp = -1;
+ } else {
+ tmpinlinf = list_first(inlinfo->inlinedmethods);
+ nextgp = (tmpinlinf != NULL) ? tmpinlinf->startgp : -1;
+ }
+ if (inline_env->method->exceptiontablelength > 0)
+ nextex = fillextable(m, nextex,
+ inline_env->method->exceptiontable, inline_env->method->exceptiontablelength,
+ label_index, &b_count, inline_env);
+ continue;
+ }
+
+ opcode = code_get_u1(p,inline_env->method); /* fetch op code */
+ if (DEBUG==true)
+ {
+ printf("Parse p=%i<%i<%i< opcode=<%i> %s\n",
+ p, gp, inline_env->jcodelength, opcode, opcode_names[opcode]);
+ if (label_index)
+ printf("label_index[%d]=%d\n",p,label_index[p]);
+ }
+ /*
+printf("basicblockindex[gp=%i]=%i=%p ipc=%i=%p shifted ipc=%i=%p\n",
+gp,m->basicblockindex[gp],m->basicblockindex[gp],ipc,ipc,(ipc<<1),(ipc<<1));
+fflush(stdout);
+ */
+ if (!skipBasicBlockChange) {
+ m->basicblockindex[gp] |= (ipc << 1); /*store intermed cnt*/
+ } else skipBasicBlockChange=0;
+ /*
+printf("basicblockindex[gp=%i]=%i=%p \n",
+gp,m->basicblockindex[gp],m->basicblockindex[gp]);
+fflush(stdout);
+ */
+
+ if (blockend) {
+ block_insert(gp); /* start new block */
+ blockend = false;
+ /*printf("blockend was set: new blockcount: %ld at:%ld\n",b_count,gp);*/
+ }
- case JAVA_LCONST_0:
- case JAVA_LCONST_1:
- LOADCONST_L(opcode - JAVA_LCONST_0);
- break;
+ nextp = p + jcommandsize[opcode]; /* compute next instruction start */
+ if (nextp > inline_env->method->jcodelength)
+ panic("Unexpected end of bytecode");
+ s_count += stackreq[opcode]; /* compute stack element count */
+SHOWOPCODE
+ switch (opcode) {
+ case JAVA_NOP:
+ break;
- case JAVA_FCONST_0:
- case JAVA_FCONST_1:
- case JAVA_FCONST_2:
- LOADCONST_F(opcode - JAVA_FCONST_0);
- break;
+ /* pushing constants onto the stack p */
- case JAVA_DCONST_0:
- case JAVA_DCONST_1:
- LOADCONST_D(opcode - JAVA_DCONST_0);
- break;
+ case JAVA_BIPUSH:
+ LOADCONST_I(code_get_s1(p+1,inline_env->method));
+ break;
- /* loading variables onto the stack */
+ case JAVA_SIPUSH:
+ LOADCONST_I(code_get_s2(p+1,inline_env->method));
+ break;
- case JAVA_ILOAD:
- case JAVA_LLOAD:
- case JAVA_FLOAD:
- case JAVA_DLOAD:
- case JAVA_ALOAD:
- if (!iswide)
- i = code_get_u1(p+1);
- else {
- i = code_get_u2(p+1);
- nextp = p+3;
- iswide = false;
- }
- OP1(opcode, i + firstlocal);
- break;
+ case JAVA_LDC1:
+ i = code_get_u1(p+1,inline_env->method);
- case JAVA_ILOAD_0:
- case JAVA_ILOAD_1:
- case JAVA_ILOAD_2:
- case JAVA_ILOAD_3:
- OP1(ICMD_ILOAD, opcode - JAVA_ILOAD_0 + firstlocal);
- break;
+ goto pushconstantitem;
+ case JAVA_LDC2:
+ case JAVA_LDC2W:
+ i = code_get_u2(p + 1,inline_env->method);
- case JAVA_LLOAD_0:
- case JAVA_LLOAD_1:
- case JAVA_LLOAD_2:
- case JAVA_LLOAD_3:
- OP1(ICMD_LLOAD, opcode - JAVA_LLOAD_0 + firstlocal);
- break;
+ pushconstantitem:
- case JAVA_FLOAD_0:
- case JAVA_FLOAD_1:
- case JAVA_FLOAD_2:
- case JAVA_FLOAD_3:
- OP1(ICMD_FLOAD, opcode - JAVA_FLOAD_0 + firstlocal);
- break;
+ if (i >= inline_env->method->class->cpcount)
+ panic ("Attempt to access constant outside range");
- case JAVA_DLOAD_0:
- case JAVA_DLOAD_1:
- case JAVA_DLOAD_2:
- case JAVA_DLOAD_3:
- OP1(ICMD_DLOAD, opcode - JAVA_DLOAD_0 + firstlocal);
+ switch (inline_env->method->class->cptags[i]) {
+ case CONSTANT_Integer:
+ LOADCONST_I(((constant_integer *) (inline_env->method->class->cpinfos[i]))->value);
break;
-
- case JAVA_ALOAD_0:
- case JAVA_ALOAD_1:
- case JAVA_ALOAD_2:
- case JAVA_ALOAD_3:
- OP1(ICMD_ALOAD, opcode - JAVA_ALOAD_0 + firstlocal);
+ case CONSTANT_Long:
+ LOADCONST_L(((constant_long *) (inline_env->method->class->cpinfos[i]))->value);
break;
-
- /* storing stack values into local variables */
-
- case JAVA_ISTORE:
- case JAVA_LSTORE:
- case JAVA_FSTORE:
- case JAVA_DSTORE:
- case JAVA_ASTORE:
- if (!iswide)
- i = code_get_u1(p+1);
- else {
- i = code_get_u2(p+1);
- iswide=false;
- nextp = p+3;
- }
- OP1(opcode, i + firstlocal);
+ case CONSTANT_Float:
+ LOADCONST_F(((constant_float *) (inline_env->method->class->cpinfos[i]))->value);
break;
-
- case JAVA_ISTORE_0:
- case JAVA_ISTORE_1:
- case JAVA_ISTORE_2:
- case JAVA_ISTORE_3:
- OP1(ICMD_ISTORE, opcode - JAVA_ISTORE_0 + firstlocal);
+ case CONSTANT_Double:
+ LOADCONST_D(((constant_double *) (inline_env->method->class->cpinfos[i]))->value);
break;
-
- case JAVA_LSTORE_0:
- case JAVA_LSTORE_1:
- case JAVA_LSTORE_2:
- case JAVA_LSTORE_3:
- OP1(ICMD_LSTORE, opcode - JAVA_LSTORE_0 + firstlocal);
+ case CONSTANT_String:
+ LOADCONST_A(literalstring_new((utf *) (inline_env->method->class->cpinfos[i])));
break;
+ default: panic("Invalid constant type to push");
+ }
+ break;
+
+ case JAVA_ACONST_NULL:
+ LOADCONST_A(NULL);
+ break;
+
+ case JAVA_ICONST_M1:
+ case JAVA_ICONST_0:
+ case JAVA_ICONST_1:
+ case JAVA_ICONST_2:
+ case JAVA_ICONST_3:
+ case JAVA_ICONST_4:
+ case JAVA_ICONST_5:
+ LOADCONST_I(opcode - JAVA_ICONST_0);
+ break;
+
+ case JAVA_LCONST_0:
+ case JAVA_LCONST_1:
+ LOADCONST_L(opcode - JAVA_LCONST_0);
+ break;
+
+ case JAVA_FCONST_0:
+ case JAVA_FCONST_1:
+ case JAVA_FCONST_2:
+ LOADCONST_F(opcode - JAVA_FCONST_0);
+ break;
+
+ case JAVA_DCONST_0:
+ case JAVA_DCONST_1:
+ LOADCONST_D(opcode - JAVA_DCONST_0);
+ break;
- case JAVA_FSTORE_0:
- case JAVA_FSTORE_1:
- case JAVA_FSTORE_2:
- case JAVA_FSTORE_3:
- OP1(ICMD_FSTORE, opcode - JAVA_FSTORE_0 + firstlocal);
- break;
+ /* loading variables onto the stack */
- case JAVA_DSTORE_0:
- case JAVA_DSTORE_1:
- case JAVA_DSTORE_2:
- case JAVA_DSTORE_3:
- OP1(ICMD_DSTORE, opcode - JAVA_DSTORE_0 + firstlocal);
- break;
+ case JAVA_ILOAD:
+ case JAVA_LLOAD:
+ case JAVA_FLOAD:
+ case JAVA_DLOAD:
+ case JAVA_ALOAD:
+ if (!iswide) {
+ i = code_get_u1(p + 1,inline_env->method);
+ } else {
+ i = code_get_u2(p + 1,inline_env->method);
+ nextp = p + 3;
+ iswide = false;
+ }
+ OP1LOAD(opcode, i + firstlocal);
+ break;
+
+ case JAVA_ILOAD_0:
+ case JAVA_ILOAD_1:
+ case JAVA_ILOAD_2:
+ case JAVA_ILOAD_3:
+ OP1LOAD(ICMD_ILOAD, opcode - JAVA_ILOAD_0 + firstlocal);
+ break;
+
+ case JAVA_LLOAD_0:
+ case JAVA_LLOAD_1:
+ case JAVA_LLOAD_2:
+ case JAVA_LLOAD_3:
+ OP1LOAD(ICMD_LLOAD, opcode - JAVA_LLOAD_0 + firstlocal);
+ break;
+
+ case JAVA_FLOAD_0:
+ case JAVA_FLOAD_1:
+ case JAVA_FLOAD_2:
+ case JAVA_FLOAD_3:
+ OP1LOAD(ICMD_FLOAD, opcode - JAVA_FLOAD_0 + firstlocal);
+ break;
+
+ case JAVA_DLOAD_0:
+ case JAVA_DLOAD_1:
+ case JAVA_DLOAD_2:
+ case JAVA_DLOAD_3:
+ OP1LOAD(ICMD_DLOAD, opcode - JAVA_DLOAD_0 + firstlocal);
+ break;
+
+ case JAVA_ALOAD_0:
+ case JAVA_ALOAD_1:
+ case JAVA_ALOAD_2:
+ case JAVA_ALOAD_3:
+ OP1LOAD(ICMD_ALOAD, opcode - JAVA_ALOAD_0 + firstlocal);
+ break;
- case JAVA_ASTORE_0:
- case JAVA_ASTORE_1:
- case JAVA_ASTORE_2:
- case JAVA_ASTORE_3:
- OP1(ICMD_ASTORE, opcode - JAVA_ASTORE_0 + firstlocal);
- break;
+ /* storing stack values into local variables */
- case JAVA_IINC:
- {
+ case JAVA_ISTORE:
+ case JAVA_LSTORE:
+ case JAVA_FSTORE:
+ case JAVA_DSTORE:
+ case JAVA_ASTORE:
+ if (!iswide) {
+ i = code_get_u1(p + 1,inline_env->method);
+ } else {
+ i = code_get_u2(p + 1,inline_env->method);
+ iswide = false;
+ nextp = p + 3;
+ }
+ OP1STORE(opcode, i + firstlocal);
+ break;
+
+ case JAVA_ISTORE_0:
+ case JAVA_ISTORE_1:
+ case JAVA_ISTORE_2:
+ case JAVA_ISTORE_3:
+ OP1STORE(ICMD_ISTORE, opcode - JAVA_ISTORE_0 + firstlocal);
+ break;
+
+ case JAVA_LSTORE_0:
+ case JAVA_LSTORE_1:
+ case JAVA_LSTORE_2:
+ case JAVA_LSTORE_3:
+ OP1STORE(ICMD_LSTORE, opcode - JAVA_LSTORE_0 + firstlocal);
+ break;
+
+ case JAVA_FSTORE_0:
+ case JAVA_FSTORE_1:
+ case JAVA_FSTORE_2:
+ case JAVA_FSTORE_3:
+ OP1STORE(ICMD_FSTORE, opcode - JAVA_FSTORE_0 + firstlocal);
+ break;
+
+ case JAVA_DSTORE_0:
+ case JAVA_DSTORE_1:
+ case JAVA_DSTORE_2:
+ case JAVA_DSTORE_3:
+ OP1STORE(ICMD_DSTORE, opcode - JAVA_DSTORE_0 + firstlocal);
+ break;
+
+ case JAVA_ASTORE_0:
+ case JAVA_ASTORE_1:
+ case JAVA_ASTORE_2:
+ case JAVA_ASTORE_3:
+ OP1STORE(ICMD_ASTORE, opcode - JAVA_ASTORE_0 + firstlocal);
+ break;
+
+ case JAVA_IINC:
+ {
int v;
if (!iswide) {
- i = code_get_u1(p + 1);
- v = code_get_s1(p + 2);
- }
- else {
- i = code_get_u2(p + 1);
- v = code_get_s2(p + 3);
+ 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,inline_env->method);
+ v = code_get_s2(p + 3,inline_env->method);
iswide = false;
- nextp = p+5;
- }
- OP2I(opcode, i + firstlocal, v);
+ nextp = p + 5;
}
- break;
+ INDEX_ONEWORD(i + firstlocal);
+ OP2I(opcode, i + firstlocal, v);
+ }
+ break;
/* wider index for loading, storing and incrementing */
- case JAVA_WIDE:
- iswide = true;
- nextp = p + 1;
- break;
+ case JAVA_WIDE:
+ iswide = true;
+ nextp = p + 1;
+ break;
/* managing arrays ************************************************/
- case JAVA_NEWARRAY:
- OP2I(ICMD_CHECKASIZE, 0, 0);
- switch (code_get_s1(p+1)) {
- case 4:
- BUILTIN1((functionptr)builtin_newarray_boolean, TYPE_ADR);
- break;
- case 5:
- BUILTIN1((functionptr)builtin_newarray_char, TYPE_ADR);
- break;
- case 6:
- BUILTIN1((functionptr)builtin_newarray_float, TYPE_ADR);
- break;
- case 7:
- BUILTIN1((functionptr)builtin_newarray_double, TYPE_ADR);
- break;
- case 8:
- BUILTIN1((functionptr)builtin_newarray_byte, TYPE_ADR);
- break;
- case 9:
- BUILTIN1((functionptr)builtin_newarray_short, TYPE_ADR);
- break;
- case 10:
- BUILTIN1((functionptr)builtin_newarray_int, TYPE_ADR);
- break;
- case 11:
- BUILTIN1((functionptr)builtin_newarray_long, TYPE_ADR);
- break;
- default: panic("Invalid array-type to create");
- }
+ case JAVA_NEWARRAY:
+ OP(ICMD_CHECKASIZE);
+ switch (code_get_s1(p + 1,inline_env->method)) {
+ case 4:
+ BUILTIN1(BUILTIN_newarray_boolean, TYPE_ADR,currentline);
break;
-
- case JAVA_ANEWARRAY:
- OP2I(ICMD_CHECKASIZE, 0, 0);
- i = code_get_u2(p+1);
- /* array or class type ? */
- if (class_constanttype (class, i) == CONSTANT_Arraydescriptor) {
- s_count++;
- LOADCONST_A(class_getconstant(class, i,
- CONSTANT_Arraydescriptor));
-#if defined(__I386__)
- BUILTIN2((functionptr) asm_builtin_newarray_array, TYPE_ADR);
-#else
- BUILTIN2((functionptr)builtin_newarray_array, TYPE_ADR);
-#endif
- }
- else {
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Class));
- s_count++;
-#if defined(__I386__)
- BUILTIN2((functionptr) asm_builtin_anewarray, TYPE_ADR);
-#else
- BUILTIN2((functionptr)builtin_anewarray, TYPE_ADR);
-#endif
- }
+ case 5:
+ BUILTIN1(BUILTIN_newarray_char, TYPE_ADR,currentline);
break;
-
- case JAVA_MULTIANEWARRAY:
- isleafmethod=false;
- i = code_get_u2(p+1);
- {
- int v = code_get_u1(p+3);
- constant_arraydescriptor *desc =
- class_getconstant (class, i, CONSTANT_Arraydescriptor);
- OP2A(opcode, v, desc);
- }
+ case 6:
+ BUILTIN1(BUILTIN_newarray_float, TYPE_ADR,currentline);
break;
-
- case JAVA_IFEQ:
- case JAVA_IFLT:
- case JAVA_IFLE:
- case JAVA_IFNE:
- case JAVA_IFGT:
- case JAVA_IFGE:
- case JAVA_IFNULL:
- case JAVA_IFNONNULL:
- case JAVA_IF_ICMPEQ:
- case JAVA_IF_ICMPNE:
- case JAVA_IF_ICMPLT:
- case JAVA_IF_ICMPGT:
- case JAVA_IF_ICMPLE:
- case JAVA_IF_ICMPGE:
- case JAVA_IF_ACMPEQ:
- case JAVA_IF_ACMPNE:
- case JAVA_GOTO:
- case JAVA_JSR:
- i = p + code_get_s2(p+1);
- if (useinlining) {
- debug_writebranch
- i = label_index[i];
- }
- bound_check(i);
- block_insert(i);
- blockend = true;
- OP1(opcode, i);
+ case 7:
+ BUILTIN1(BUILTIN_newarray_double, TYPE_ADR,currentline);
break;
- case JAVA_GOTO_W:
- case JAVA_JSR_W:
- i = p + code_get_s4(p+1);
- if (useinlining) {
- debug_writebranch
- i = label_index[i];
- }
- bound_check(i);
- block_insert(i);
- blockend = true;
- OP1(opcode, i);
+ case 8:
+ BUILTIN1(BUILTIN_newarray_byte, TYPE_ADR,currentline);
+ break;
+ case 9:
+ BUILTIN1(BUILTIN_newarray_short, TYPE_ADR,currentline);
+ break;
+ case 10:
+ BUILTIN1(BUILTIN_newarray_int, TYPE_ADR,currentline);
break;
+ case 11:
+ BUILTIN1(BUILTIN_newarray_long, TYPE_ADR,currentline);
+ break;
+ default: panic("Invalid array-type to create");
+ }
+ OP(ICMD_CHECKEXCEPTION);
+ break;
+
+ case JAVA_ANEWARRAY:
+ OP(ICMD_CHECKASIZE);
+ i = code_get_u2(p + 1,inline_env->method);
+ {
+ classinfo *component =
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
+
+ if (!class_load(component))
+ return NULL;
+
+ if (!class_link(component))
+ return NULL;
+
+ LOADCONST_A_BUILTIN(class_array_of(component)->vftbl);
+/* LOADCONST_A_BUILTIN(component); */
+ 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);
+ {
+ vftbl_t *arrayvftbl;
+ s4 v = code_get_u1(p + 3,inline_env->method);
- case JAVA_RET:
- if (!iswide)
- i = code_get_u1(p+1);
- else {
- i = code_get_u2(p+1);
- nextp = p+3;
- iswide = false;
- }
- blockend = true;
- /*
- if (isinlinedmethod) {
- OP1(ICMD_GOTO, inlinfo->stopgp);
- break;
- }*/
+/* vftbl *arrayvftbl = */
+/* ((classinfo *) class_getconstant(class, i, CONSTANT_Class))->vftbl; */
+/* OP2A(opcode, v, arrayvftbl,currentline); */
- OP1(opcode, i + firstlocal);
- break;
+
+ classinfo *component =
+ (classinfo *) class_getconstant(inline_env->method->class, i, CONSTANT_Class);
- case JAVA_IRETURN:
- case JAVA_LRETURN:
- case JAVA_FRETURN:
- case JAVA_DRETURN:
- case JAVA_ARETURN:
- case JAVA_RETURN:
-
-
- if (isinlinedmethod) {
-/* if (p==jcodelength-1) {*/ /* return is at end of inlined method */
-/* OP(ICMD_NOP); */
-/* break; */
-/* } */
- blockend = true;
- OP1(ICMD_GOTO, inlinfo->stopgp);
- break;
- }
+ if (!class_load(component))
+ return NULL;
- blockend = true;
- OP(opcode);
- break;
+ if (!class_link(component))
+ return NULL;
+
+ arrayvftbl = component->vftbl;
+ OP2A(opcode, v, arrayvftbl, currentline);
- case JAVA_ATHROW:
+/* classinfo *arrayclass = */
+/* (classinfo *) class_getconstant(class, i, CONSTANT_Class); */
+/* OP2A(opcode, v, arrayclass, currentline); */
+ }
+ break;
+
+ case JAVA_IFEQ:
+ case JAVA_IFLT:
+ case JAVA_IFLE:
+ case JAVA_IFNE:
+ case JAVA_IFGT:
+ case JAVA_IFGE:
+ case JAVA_IFNULL:
+ case JAVA_IFNONNULL:
+ case JAVA_IF_ICMPEQ:
+ case JAVA_IF_ICMPNE:
+ case JAVA_IF_ICMPLT:
+ case JAVA_IF_ICMPGT:
+ case JAVA_IF_ICMPLE:
+ case JAVA_IF_ICMPGE:
+ case JAVA_IF_ACMPEQ:
+ case JAVA_IF_ACMPNE:
+ case JAVA_GOTO:
+ case JAVA_JSR:
+ i = p + code_get_s2(p + 1,inline_env->method);
+ if (useinlining) {
+ debug_writebranch;
+ i = label_index[i];
+ }
+ bound_check(i);
+ block_insert(i);
+ blockend = true;
+ OP1(opcode, i);
+ break;
+ case JAVA_GOTO_W:
+ case JAVA_JSR_W:
+ i = p + code_get_s4(p + 1,inline_env->method);
+ if (useinlining) {
+ debug_writebranch;
+ i = label_index[i];
+ }
+ bound_check(i);
+ /*printf("B6 JSR_W\t"); fflush(stdout);*/
+ block_insert(i);
+ blockend = true;
+ OP1(opcode, i);
+ break;
+
+ case JAVA_RET:
+ if (!iswide) {
+ i = code_get_u1(p + 1,inline_env->method);
+ } else {
+ i = code_get_u2(p + 1,inline_env->method);
+ nextp = p + 3;
+ iswide = false;
+ }
+ blockend = true;
+
+ /*
+ if (inline_env->isinlinedmethod) {
+ OP1(ICMD_GOTO, inlinfo->stopgp);
+ break;
+ }*/
+
+ OP1LOAD(opcode, i + firstlocal);
+ break;
+
+ case JAVA_IRETURN:
+ case JAVA_LRETURN:
+ case JAVA_FRETURN:
+ case JAVA_DRETURN:
+ case JAVA_ARETURN:
+ case JAVA_RETURN:
+ 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;
- OP(opcode);
+ OP1(ICMD_GOTO, inlinfo->stopgp);
break;
+ }
+
+ blockend = true;
+ OP(opcode);
+ break;
+
+ case JAVA_ATHROW:
+ blockend = true;
+ OP(opcode);
+ break;
/* table jumps ********************************/
- case JAVA_LOOKUPSWITCH:
- {
+ case JAVA_LOOKUPSWITCH:
+ {
s4 num, j;
s4 *tablep;
+ s4 prevvalue;
blockend = true;
nextp = ALIGN((p + 1), 4);
+ if (nextp + 8 > inline_env->method->jcodelength)
+ panic("Unexpected end of bytecode");
if (!useinlining) {
- tablep = (s4*)(jcode + nextp);
- }
- else {
- num = code_get_u4(nextp + 4);
+ tablep = (s4 *) (inline_env->method->jcode + nextp);
+
+ } else {
+ num = code_get_u4(nextp + 4,inline_env->method);
tablep = DMNEW(s4, num * 2 + 2);
}
- OP2A(opcode, 0, tablep);
+ OP2A(opcode, 0, tablep,currentline);
/* default target */
- j = p + code_get_s4(nextp);
- if (useinlining) j = label_index[j];
+ j = p + code_get_s4(nextp,inline_env->method);
+ if (useinlining)
+ j = label_index[j];
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* number of pairs */
- num = code_get_u4(nextp);
+ num = code_get_u4(nextp,inline_env->method);
*tablep = num;
tablep++;
nextp += 4;
- for (i = 0; i < num; i++) {
+ if (nextp + 8*(num) > inline_env->method->jcodelength)
+ panic("Unexpected end of bytecode");
+ for (i = 0; i < num; i++) {
/* value */
- j = code_get_s4(nextp);
+ j = code_get_s4(nextp,inline_env->method);
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
+ /* check if the lookup table is sorted correctly */
+
+ if (i && (j <= prevvalue))
+ panic("invalid LOOKUPSWITCH: table not sorted");
+ prevvalue = j;
+
/* target */
- j = p + code_get_s4(nextp);
- if (useinlining) j = label_index[j];
+ 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);
block_insert(j);
- }
+ }
break;
- }
+ }
- case JAVA_TABLESWITCH:
- {
+ case JAVA_TABLESWITCH:
+ {
s4 num, j;
s4 *tablep;
blockend = true;
nextp = ALIGN((p + 1), 4);
+ if (nextp + 12 > inline_env->method->jcodelength)
+ panic("Unexpected end of bytecode");
if (!useinlining) {
- tablep = (s4*)(jcode + nextp);
- }
- else {
- num = code_get_u4(nextp + 8) - code_get_u4(nextp + 4);
+ tablep = (s4 *) (inline_env->method->jcode + nextp);
+
+ } else {
+ 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);
+ OP2A(opcode, 0, tablep,currentline);
/* default target */
- j = p + code_get_s4(nextp);
- if (useinlining) j = label_index[j];
+ j = p + code_get_s4(nextp,inline_env->method);
+ if (useinlining)
+ j = label_index[j];
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
/* 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;
+ 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");
for (i = 0; i <= num; i++) {
- j = p + code_get_s4(nextp);
- if (useinlining) j = label_index[j];
+ j = p + code_get_s4(nextp,inline_env->method);
+ if (useinlining) {
+ /*printf("TABLESWITCH: j before mapping=%ld\n",j);*/
+ j = label_index[j];
+ }
*tablep = j; /* restore for little endian */
tablep++;
nextp += 4;
bound_check(j);
block_insert(j);
- }
+ /*printf("TABLESWITCH: block_insert(%ld)\n",j);*/
+ }
break;
- }
+ }
/* load and store of object fields *******************/
- case JAVA_AASTORE:
- BUILTIN3((functionptr) asm_builtin_aastore, TYPE_VOID);
- break;
+ case JAVA_AASTORE:
+ BUILTIN3(BUILTIN_aastore, TYPE_VOID, currentline);
+ break;
- case JAVA_PUTSTATIC:
- case JAVA_GETSTATIC:
- i = code_get_u2(p + 1);
- {
+ case JAVA_PUTSTATIC:
+ case JAVA_GETSTATIC:
+ i = code_get_u2(p + 1,inline_env->method);
+ {
constant_FMIref *fr;
fieldinfo *fi;
- fr = class_getconstant (class, i, CONSTANT_Fieldref);
- fi = class_findfield (fr->class, fr->name, fr->descriptor);
- compiler_addinitclass (fr->class);
- OP2A(opcode, fi->type, 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_GETFIELD:
- i = code_get_u2(p + 1);
- {
+ }
+ break;
+
+ case JAVA_PUTFIELD:
+ case JAVA_GETFIELD:
+ i = code_get_u2(p + 1,inline_env->method);
+ {
constant_FMIref *fr;
fieldinfo *fi;
- fr = class_getconstant (class, i, CONSTANT_Fieldref);
- fi = class_findfield (fr->class, fr->name, fr->descriptor);
- OP2A(opcode, fi->type, fi);
- }
- break;
+
+ 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);
+ }
+ break;
/* method invocation *****/
- case JAVA_INVOKESTATIC:
- i = code_get_u2(p + 1);
- {
+ case JAVA_INVOKESTATIC:
+ i = code_get_u2(p + 1,inline_env->method);
+ {
constant_FMIref *mr;
methodinfo *mi;
- mr = class_getconstant (class, i, CONSTANT_Methodref);
- mi = class_findmethod (mr->class, mr->name, mr->descriptor);
- /*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);
+ inline_env->method->isleafmethod = false;
+
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
+
+ if (!class_load(mr->class))
+ return NULL;
+
+ if (!class_link(mr->class))
+ return NULL;
+
+ mi = class_resolveclassmethod(mr->class,
+ mr->name,
+ mr->descriptor,
+ inline_env->method->class,
+ true);
- isleafmethod=false;
- OP2A(opcode, mi->paramcount, mi);
+ if (!mi)
+ return NULL;
+
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE STATIC\n");
+ fflush(stdout);}
+
+ if (!(mi->flags & ACC_STATIC)) {
+ *exceptionptr =
+ new_exception(string_java_lang_IncompatibleClassChangeError);
+ return NULL;
}
- break;
- case JAVA_INVOKESPECIAL:
- case JAVA_INVOKEVIRTUAL:
- i = code_get_u2(p + 1);
- {
+
+ descriptor2types(mi);
+ OP2A(opcode, mi->paramcount, mi, currentline);
+ }
+ break;
+
+ case JAVA_INVOKESPECIAL:
+ case JAVA_INVOKEVIRTUAL:
+ i = code_get_u2(p + 1,inline_env->method);
+ {
constant_FMIref *mr;
methodinfo *mi;
-
- mr = class_getconstant (class, i, CONSTANT_Methodref);
- mi = class_findmethod (mr->class, mr->name, mr->descriptor);
- /*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);
+
+ inline_env->method->isleafmethod = false;
+
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_Methodref);
+
+ if (!class_load(mr->class))
+ return NULL;
+
+ if (!class_link(mr->class))
+ return NULL;
+
+ mi = class_resolveclassmethod(mr->class,
+ mr->name,
+ mr->descriptor,
+ inline_env->method->class,
+ true);
+
+ if (!mi)
+ return NULL;
+
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE SPEC/VIRT\n");
+ fflush(stdout);}
+
+ if (mi->flags & ACC_STATIC) {
+ *exceptionptr =
+ new_exception(string_java_lang_IncompatibleClassChangeError);
+ return NULL;
}
- break;
- case JAVA_INVOKEINTERFACE:
- i = code_get_u2(p + 1);
- {
+
+ descriptor2types(mi);
+ OP2A(opcode, mi->paramcount, mi, currentline);
+ }
+ break;
+
+ case JAVA_INVOKEINTERFACE:
+ i = code_get_u2(p + 1,inline_env->method);
+ {
constant_FMIref *mr;
methodinfo *mi;
- mr = class_getconstant (class, i, CONSTANT_InterfaceMethodref);
- mi = class_findmethod (mr->class, mr->name, mr->descriptor);
- if (mi->flags & ACC_STATIC)
- panic ("Static/Nonstatic mismatch calling static method");
- descriptor2types(mi);
- isleafmethod=false;
- OP2A(opcode, mi->paramcount, mi);
- }
- break;
+ inline_env->method->isleafmethod = false;
- /* miscellaneous object operations *******/
+ mr = class_getconstant(inline_env->method->class, i, CONSTANT_InterfaceMethodref);
- case JAVA_NEW:
- i = code_get_u2 (p+1);
+ if (!class_load(mr->class))
+ return NULL;
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Class));
- s_count++;
- BUILTIN1((functionptr) builtin_new, TYPE_ADR);
- break;
+ if (!class_link(mr->class))
+ return NULL;
- case JAVA_CHECKCAST:
- i = code_get_u2(p+1);
+ mi = class_resolveinterfacemethod(mr->class,
+ mr->name,
+ mr->descriptor,
+ inline_env->method->class,
+ true);
+ if (!mi)
+ return NULL;
- /* array type cast-check */
- if (class_constanttype (class, i) == CONSTANT_Arraydescriptor) {
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Arraydescriptor));
+ if (mi->flags & ACC_STATIC) {
+ *exceptionptr =
+ new_exception(string_java_lang_IncompatibleClassChangeError);
+ return NULL;
+ }
+
+if (DEBUG4==true) {
+ method_display_w_class(mi);
+ printf("\tINVOKE INTERFACE\n");
+ fflush(stdout);}
+ descriptor2types(mi);
+ OP2A(opcode, mi->paramcount, mi, currentline);
+ }
+ 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);
+ break;
+
+ case JAVA_CHECKCAST:
+ 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;
+
+ if (!cls->linked)
+ if (!class_link(cls))
+ return NULL;
+
+ if (cls->vftbl->arraydesc) {
+ /* array type cast-check */
+ LOADCONST_A_BUILTIN(cls->vftbl);
s_count++;
- BUILTIN2((functionptr) asm_builtin_checkarraycast, TYPE_ADR);
- }
- else { /* object type cast-check */
+ BUILTIN2(BUILTIN_checkarraycast, TYPE_ADR,currentline);
+
+ } else { /* object type cast-check */
/*
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Class));
- s_count++;
- BUILTIN2((functionptr) asm_builtin_checkcast, TYPE_ADR);
- */
- OP2A(opcode, 1, (class_getconstant(class, i, CONSTANT_Class)));
- }
- break;
+ + LOADCONST_A_BUILTIN(class_getconstant(class, i, CONSTANT_Class));
+ + s_count++;
+ + BUILTIN2(BUILTIN_checkcast, TYPE_ADR,currentline);
+ + */
+ OP2A(opcode, 1, cls, currentline);
+ }
+ }
+ 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);
- case JAVA_INSTANCEOF:
- i = code_get_u2(p+1);
+ if (!cls->loaded)
+ if (!class_load(cls))
+ return NULL;
- /* array type cast-check */
- if (class_constanttype (class, i) == CONSTANT_Arraydescriptor) {
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Arraydescriptor));
+ if (!cls->linked)
+ if (!class_link(cls))
+ return NULL;
+
+ if (cls->vftbl->arraydesc) {
+ /* array type cast-check */
+ LOADCONST_A_BUILTIN(cls->vftbl);
s_count++;
-#if defined(__I386__)
- BUILTIN2((functionptr) asm_builtin_arrayinstanceof, TYPE_INT);
-#else
- BUILTIN2((functionptr) builtin_arrayinstanceof, TYPE_INT);
-#endif
- }
+ BUILTIN2(BUILTIN_arrayinstanceof, TYPE_INT, currentline);
+ }
else { /* object type cast-check */
/*
- LOADCONST_A(class_getconstant(class, i, CONSTANT_Class));
- s_count++;
- BUILTIN2((functionptr) builtin_instanceof, TYPE_INT);
- */
- OP2A(opcode, 1, (class_getconstant(class, i, CONSTANT_Class)));
- }
- break;
+ LOADCONST_A_BUILTIN(class_getconstant(class, i, CONSTANT_Class));
+ s_count++;
+ BUILTIN2(BUILTIN_instanceof, TYPE_INT,currentline);
+ + */
+ OP2A(opcode, 1, cls, currentline);
+ }
+ }
+ break;
- case JAVA_MONITORENTER:
-#ifdef USE_THREADS
- if (checksync) {
- BUILTIN1((functionptr) asm_builtin_monitorenter, TYPE_VOID);
- } else
+ case JAVA_MONITORENTER:
+#if defined(USE_THREADS)
+ if (checksync) {
+ BUILTIN1(BUILTIN_monitorenter, TYPE_VOID,currentline);
+ } else
#endif
- {
+ {
OP(ICMD_NULLCHECKPOP);
- }
- break;
-
- case JAVA_MONITOREXIT:
-#ifdef USE_THREADS
- if (checksync) {
- BUILTIN1((functionptr) asm_builtin_monitorexit, TYPE_VOID);
- }
- else
+ }
+ break;
+
+ case JAVA_MONITOREXIT:
+#if defined(USE_THREADS)
+ if (checksync) {
+ BUILTIN1(BUILTIN_monitorexit, TYPE_VOID,currentline);
+ OP(ICMD_CHECKEXCEPTION);
+ } else
#endif
- {
+ {
OP(ICMD_POP);
- }
- break;
+ }
+ break;
/* any other basic operation **************************************/
- case JAVA_IDIV:
- OP(opcode);
- break;
+ case JAVA_IDIV:
+ OP(opcode);
+ break;
- case JAVA_IREM:
- OP(opcode);
- break;
+ case JAVA_IREM:
+ OP(opcode);
+ break;
- case JAVA_LDIV:
- OP(opcode);
- break;
+ case JAVA_LDIV:
+ OP(opcode);
+ break;
- case JAVA_LREM:
- OP(opcode);
- break;
+ case JAVA_LREM:
+ OP(opcode);
+ break;
- case JAVA_FREM:
+ case JAVA_FREM:
#if defined(__I386__)
- OP(opcode);
+ OP(opcode);
#else
- BUILTIN2((functionptr) builtin_frem, TYPE_FLOAT);
+ BUILTIN2(BUILTIN_frem, TYPE_FLOAT,currentline);
#endif
- break;
+ break;
- case JAVA_DREM:
+ case JAVA_DREM:
#if defined(__I386__)
- OP(opcode);
+ OP(opcode);
#else
- BUILTIN2((functionptr) builtin_drem, TYPE_DOUBLE);
+ BUILTIN2(BUILTIN_drem, TYPE_DOUBLE,currentline);
#endif
- break;
+ break;
- case JAVA_F2I:
- if (checkfloats) {
- BUILTIN1((functionptr) builtin_f2i, TYPE_INT);
- }
- else {
+ case JAVA_F2I:
+#if defined(__ALPHA__)
+ if (!opt_noieee) {
+ BUILTIN1(BUILTIN_f2i, TYPE_INT,currentline);
+ } else
+#endif
+ {
OP(opcode);
- }
- break;
+ }
+ break;
- case JAVA_F2L:
- if (checkfloats) {
- BUILTIN1((functionptr) builtin_f2l, TYPE_LONG);
- }
- else {
+ case JAVA_F2L:
+#if defined(__ALPHA__)
+ if (!opt_noieee) {
+ BUILTIN1(BUILTIN_f2l, TYPE_LONG,currentline);
+ } else
+#endif
+ {
OP(opcode);
- }
- break;
+ }
+ break;
- case JAVA_D2I:
- if (checkfloats) {
- BUILTIN1((functionptr) builtin_d2i, TYPE_INT);
- }
- else {
+ case JAVA_D2I:
+#if defined(__ALPHA__)
+ if (!opt_noieee) {
+ BUILTIN1(BUILTIN_d2i, TYPE_INT,currentline);
+ } else
+#endif
+ {
OP(opcode);
- }
- break;
+ }
+ break;
- case JAVA_D2L:
- if (checkfloats) {
- BUILTIN1((functionptr) builtin_d2l, TYPE_LONG);
- }
- else {
+ case JAVA_D2L:
+#if defined(__ALPHA__)
+ if (!opt_noieee) {
+ BUILTIN1(BUILTIN_d2l, TYPE_LONG,currentline);
+ } else
+#endif
+ {
OP(opcode);
- }
- break;
-
- case JAVA_BREAKPOINT:
- panic("Illegal opcode Breakpoint encountered");
- break;
-
- case 203:
- case 204:
- case 205:
- case 206:
- case 207:
- case 208:
- case 209:
- case 210:
- case 211:
- case 212:
- case 213:
- case 214:
- case 215:
- case 216:
- case 217:
- case 218:
- case 219:
- case 220:
- case 221:
- case 222:
- case 223:
- case 224:
- case 225:
- case 226:
- case 227:
- case 228:
- case 229:
- case 230:
- case 231:
- case 232:
- case 233:
- case 234:
- case 235:
- case 236:
- case 237:
- case 238:
- case 239:
- case 240:
- case 241:
- case 242:
- case 243:
- case 244:
- case 245:
- case 246:
- case 247:
- case 248:
- case 249:
- case 250:
- case 251:
- case 252:
- case 253:
- case 254:
- case 255:
- printf("Illegal opcode %d at instr %d", opcode, ipc);
- panic("encountered");
- break;
-
- default:
- OP(opcode);
- break;
+ }
+ break;
+
+ case JAVA_BREAKPOINT:
+ *exceptionptr =
+ new_verifyerror(m, "Quick instructions shouldn't appear yet.");
+ return NULL;
+
+ case 204: /* unused opcode */
+ case 205:
+ case 206:
+ case 207:
+ case 208:
+ case 209:
+ case 210:
+ case 211:
+ case 212:
+ case 213:
+ case 214:
+ case 215:
+ case 216:
+ case 217:
+ case 218:
+ case 219:
+ case 220:
+ case 221:
+ case 222:
+ case 223:
+ case 224:
+ case 225:
+ case 226:
+ case 227:
+ case 228:
+ case 229:
+ case 230:
+ case 231:
+ case 232:
+ case 233:
+ case 234:
+ case 235:
+ case 236:
+ case 237:
+ case 238:
+ case 239:
+ case 240:
+ case 241:
+ case 242:
+ case 243:
+ case 244:
+ case 245:
+ case 246:
+ case 247:
+ case 248:
+ case 249:
+ case 250:
+ case 251:
+ case 252:
+ case 253:
+ case 254:
+ case 255:
+ printf("Illegal opcode %d at instr %d\n", opcode, ipc);
+ panic("Illegal opcode encountered");
+ break;
+
+ default:
+ OP(opcode);
+ break;
- } /* end switch */
+ } /* 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); */
- gp = inlinfo->stopgp;
- inlining_restore_compiler_variables();
- list_remove(inlinfo->inlinedmethods, list_first(inlinfo->inlinedmethods));
- if (inlinfo->inlinedmethods == NULL) 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;
+ /* if (inline_env->isinlinedmethod && p == inline_env->method->jcodelength - 1) { */ /* end of an inlined method */
+ if (inline_env->isinlinedmethod && (nextp >= inline_env->method->jcodelength) ) { /* end of an inlined method */
+ /* printf("setting gp from %d to %d\n",gp, inlinfo->stopgp); */
+ gp = inlinfo->stopgp;
+ inlining_restore_compiler_variables();
+ OP(ICMD_INLINE_END);
+/*label_index = inlinfo->label_index;*/
+
+if (DEBUG==true) {
+printf("AFTER RESTORE : "); fflush(stdout);
+DEBUGMETH(inline_env->method);
+}
+ list_remove(inlinfo->inlinedmethods, list_first(inlinfo->inlinedmethods));
+ if (inlinfo->inlinedmethods == NULL) { /* 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;
}
- } /* end for */
- if (p != jcodelength)
- panic("Command-sequence crosses code-boundary");
+ } /* end for */
- if (!blockend)
- panic("Code does not end with branch/return/athrow - stmt");
- /* adjust block count if target 0 is not first intermediate instruction */
+ if (p != m->jcodelength) {
+ printf("p (%d) != m->jcodelength (%d)\n",p,m->jcodelength);
+ panic("Command-sequence crosses code-boundary");
+ }
+ if (!blockend) {
+ *exceptionptr = new_verifyerror(m, "Falling off the end of the code");
+ return NULL;
+ }
+
+ /* 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;
-
- /* additional block if target 0 is not first intermediate instruction */
-
- if (!block_index[0] || (block_index[0] > 1)) {
- bptr->iinstr = instr;
- bptr->mpc = -1;
- bptr->flags = -1;
- bptr->type = BBTYPE_STD;
- bptr->branchrefs = NULL;
- bptr->pre_count = 0;
- bptr->debug_nr = c_debug_nr++;
- bptr++;
- b_count++;
- (bptr - 1)->next = bptr;
+ b_count = 0;
+ m->c_debug_nr = 0;
- }
-
- /* allocate blocks */
+ /* additional block if target 0 is not first intermediate instruction */
-
- for (p = 0; p < cumjcodelength; p++)
-
- if (block_index[p] & 1) {
- bptr->iinstr = instr + (block_index[p] >> 1);
- bptr->debug_nr = c_debug_nr++;
- if (b_count != 0)
- (bptr - 1)->icount = bptr->iinstr - (bptr - 1)->iinstr;
+ if (!m->basicblockindex[0] || (m->basicblockindex[0] > 1)) {
+ bptr->iinstr = m->instructions;
bptr->mpc = -1;
bptr->flags = -1;
- bptr->lflags = 0;
bptr->type = BBTYPE_STD;
bptr->branchrefs = NULL;
- block_index[p] = b_count;
bptr->pre_count = 0;
+ 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++) { */
+ if (m->basicblockindex[p] & 1) {
+ /* check if this block starts at the beginning of an instruction */
+ if (!instructionstart[p]) {
+ printf("Basic Block beginn: %d\n",p);
+ panic("Branch into middle of instruction");
+ }
+ /* allocate the block */
+ bptr->iinstr = m->instructions + (m->basicblockindex[p] >> 1);
+ bptr->debug_nr = m->c_debug_nr++;
+ if (b_count != 0)
+ (bptr - 1)->icount = bptr->iinstr - (bptr - 1)->iinstr;
+ bptr->mpc = -1;
+ bptr->flags = -1;
+ bptr->lflags = 0;
+ bptr->type = BBTYPE_STD;
+ bptr->branchrefs = NULL;
+ m->basicblockindex[p] = b_count;
+ bptr->pre_count = 0;
+ bptr++;
+ b_count++;
+ (bptr - 1)->next = bptr;
}
+ }
- /* allocate additional block at end */
+ /* allocate additional block at end */
-
- bptr->instack = bptr->outstack = NULL;
- bptr->indepth = bptr->outdepth = 0;
- bptr->iinstr = NULL;
- (bptr - 1)->icount = (instr + instr_count) - (bptr - 1)->iinstr;
- bptr->icount = 0;
- bptr->mpc = -1;
- bptr->flags = -1;
- bptr->lflags = 0;
- bptr->type = BBTYPE_STD;
- bptr->branchrefs = NULL;
- bptr->pre_count = 0;
- bptr->debug_nr = 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];
-
- p = extable[i].endpc;
- extable[i].end = block + block_index[p];
-
- p = extable[i].handlerpc;
- extable[i].handler = block + block_index[p];
+ bptr->instack = bptr->outstack = NULL;
+ bptr->indepth = bptr->outdepth = 0;
+ bptr->iinstr = NULL;
+ (bptr - 1)->icount = (m->instructions + m->instructioncount) - (bptr - 1)->iinstr;
+ bptr->icount = 0;
+ bptr->mpc = -1;
+ bptr->flags = -1;
+ bptr->lflags = 0;
+ bptr->type = BBTYPE_STD;
+ bptr->branchrefs = NULL;
+ bptr->pre_count = 0;
+ bptr->debug_nr = m->c_debug_nr++;
+ (bptr - 1)->next = bptr;
+ bptr->next = NULL;
+
+ if (cd->exceptiontablelength > 0) {
+ cd->exceptiontable[cd->exceptiontablelength - 1].down = NULL;
+ }
+
+ for (i = 0; i < cd->exceptiontablelength; ++i) {
+ p = cd->exceptiontable[i].startpc;
+ cd->exceptiontable[i].start = m->basicblocks + m->basicblockindex[p];
+
+ 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 = cd->exceptiontable[i].handlerpc;
+ cd->exceptiontable[i].handler = m->basicblocks + m->basicblockindex[p];
}
}
- if (useinlining) inlining_cleanup();
- useinlining = useinltmp;
+ if (useinlining) inlining_cleanup(inline_env);
+
+ /* just return methodinfo* to signal everything was ok */
+
+ return m;
}
-#include "sets.c"
-#include "parseRT.h"
+
/*
* These are local overrides for various environment variables in Emacs.
projects / cacao.git / blobdiff