-/* jit/mips/codegen.c - machine code generator for mips
+/* vm/jit/mips/codegen.c - machine code generator for mips
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Institut f. Computersprachen, TU Wien
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
- S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
- J. Wenninger
+ Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+ R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+ C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+ Institut f. Computersprachen - TU Wien
This file is part of CACAO.
This module generates MIPS machine code for a sequence of
intermediate code commands (ICMDs).
- $Id: codegen.c 597 2003-11-09 20:08:18Z twisti $
+ $Id: codegen.c 1735 2004-12-07 14:33:27Z twisti $
*/
#include <signal.h>
#include <unistd.h>
#include <sys/mman.h>
-#include "types.h"
-#include "codegen.h"
-#include "jit.h"
-#include "reg.h"
-#include "builtin.h"
-#include "asmpart.h"
-#include "jni.h"
-#include "loader.h"
-#include "tables.h"
-#include "native.h"
-
-/* include independent code generation stuff */
-#include "codegen.inc"
-#include "reg.inc"
+
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/mips/codegen.h"
+#include "vm/jit/mips/types.h"
/* *****************************************************************************
/* #define REG_END -1 last entry in tables */
-int nregdescint[] = {
+static int nregdescint[] = {
REG_RES, REG_RES, REG_RET, REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
/* for use of reserved registers, see comment above */
-int nregdescfloat[] = {
+static int nregdescfloat[] = {
REG_RET, REG_RES, REG_RES, REG_RES, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
/* for use of reserved registers, see comment above */
-/* parameter allocation mode */
-
-int nreg_parammode = PARAMMODE_NUMBERED;
-
- /* parameter-registers will be allocated by assigning the
- 1. parameter: int/float-reg a0
- 2. parameter: int/float-reg a1
- 3. parameter: int/float-reg a2 ....
- */
-
-
-/* stackframe-infos ***********************************************************/
-
-int parentargs_base; /* offset in stackframe for the parameter from the caller*/
-
-/* -> see file 'calling.doc' */
-
-
-/* additional functions and macros to generate code ***************************/
-
-/* #define BlockPtrOfPC(pc) block+block_index[pc] */
-#define BlockPtrOfPC(pc) ((basicblock *) iptr->target)
-
-
-#ifdef STATISTICS
-#define COUNT_SPILLS count_spills++
-#else
-#define COUNT_SPILLS
-#endif
-
-
-/* gen_nullptr_check(objreg) */
+/* Include independent code generation stuff -- include after register */
+/* descriptions to avoid extern definitions. */
-#ifdef SOFTNULLPTRCHECK
-#define gen_nullptr_check(objreg) \
- if (checknull) {\
- M_BEQZ((objreg), 0);\
- codegen_addxnullrefs(mcodeptr);\
- M_NOP;\
- }
-#else
-#define gen_nullptr_check(objreg)
+#include "vm/jit/codegen.inc"
+#include "vm/jit/reg.inc"
+#ifdef LSRA
+#include "vm/jit/lsra.inc"
#endif
-/* MCODECHECK(icnt) */
-
-#define MCODECHECK(icnt) \
- if((mcodeptr+(icnt))>mcodeend)mcodeptr=codegen_increase((u1*)mcodeptr)
-
-/* M_INTMOVE:
- generates an integer-move from register a to b.
- if a and b are the same int-register, no code will be generated.
-*/
-
-#define M_INTMOVE(a,b) if(a!=b){M_MOV(a,b);}
-
-
-/* M_FLTMOVE:
- generates a floating-point-move from register a to b.
- if a and b are the same float-register, no code will be generated
-*/
-
-#define M_FLTMOVE(a,b) {if(a!=b){M_DMOV(a,b);}}
-
-#define M_TFLTMOVE(t,a,b) \
- {if(a!=b) \
- if ((t)==TYPE_DBL) \
- {M_DMOV(a,b);} \
- else {M_FMOV(a,b);} \
- }
-
-#define M_TFLD(t,a,b,disp) \
- if ((t)==TYPE_DBL) \
- {M_DLD(a,b,disp);} \
- else \
- {M_FLD(a,b,disp);}
-
-#define M_TFST(t,a,b,disp) \
- if ((t)==TYPE_DBL) \
- {M_DST(a,b,disp);} \
- else \
- {M_FST(a,b,disp);}
-
-#define M_CCFLTMOVE(t1,t2,a,b) \
- if ((t1)==(t2)) \
- {M_TFLTMOVE(t1,a,b);} \
- else \
- if ((t1)==TYPE_DBL) \
- {M_CVTDF(a,b);} \
- else \
- {M_CVTFD(a,b);}
-
-#define M_CCFLD(t1,t2,a,b,disp) \
- if ((t1)==(t2)) \
- {M_DLD(a,b,disp);} \
- else { \
- M_DLD(REG_FTMP1,b,disp); \
- if ((t1)==TYPE_DBL) \
- {M_CVTDF(REG_FTMP1,a);} \
- else \
- {M_CVTFD(REG_FTMP1,a);} \
- }
-
-#define M_CCFST(t1,t2,a,b,disp) \
- if ((t1)==(t2)) \
- {M_DST(a,b,disp);} \
- else { \
- if ((t1)==TYPE_DBL) \
- {M_CVTDF(a,REG_FTMP1);} \
- else \
- {M_CVTFD(a,REG_FTMP1);} \
- M_DST(REG_FTMP1,b,disp); \
- }
-
-
-/* var_to_reg_xxx:
- this function generates code to fetch data from a pseudo-register
- into a real register.
- If the pseudo-register has actually been assigned to a real
- register, no code will be emitted, since following operations
- can use this register directly.
-
- v: pseudoregister to be fetched from
- tempregnum: temporary register to be used if v is actually spilled to ram
-
- return: the register number, where the operand can be found after
- fetching (this wil be either tempregnum or the register
- number allready given to v)
-*/
-
-#define var_to_reg_int(regnr,v,tempnr) { \
- if ((v)->flags & INMEMORY) \
- {COUNT_SPILLS;M_LLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
- else regnr=(v)->regoff; \
-}
-
-
-#define var_to_reg_flt(regnr,v,tempnr) { \
- if ((v)->flags & INMEMORY) \
- {COUNT_SPILLS;M_DLD(tempnr,REG_SP,8*(v)->regoff);regnr=tempnr;} \
- else regnr=(v)->regoff; \
-}
-
-
-/* reg_of_var:
- This function determines a register, to which the result of an operation
- should go, when it is ultimatively intended to store the result in
- pseudoregister v.
- If v is assigned to an actual register, this register will be returned.
- Otherwise (when v is spilled) this function returns tempregnum.
- If not already done, regoff and flags are set in the stack location.
-*/
+/* NullPointerException handlers and exception handling initialisation */
-static int reg_of_var(stackptr v, int tempregnum)
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+void thread_restartcriticalsection(ucontext_t *uc)
{
- varinfo *var;
-
- switch (v->varkind) {
- case TEMPVAR:
- if (!(v->flags & INMEMORY))
- return(v->regoff);
- break;
- case STACKVAR:
- var = &(interfaces[v->varnum][v->type]);
- v->regoff = var->regoff;
- if (!(var->flags & INMEMORY))
- return(var->regoff);
- break;
- case LOCALVAR:
- var = &(locals[v->varnum][v->type]);
- v->regoff = var->regoff;
- if (!(var->flags & INMEMORY))
- return(var->regoff);
- break;
- case ARGVAR:
- v->regoff = v->varnum;
- if (IS_FLT_DBL_TYPE(v->type)) {
- if (v->varnum < fltreg_argnum) {
- v->regoff = argfltregs[v->varnum];
- return(argfltregs[v->varnum]);
- }
- }
- else
- if (v->varnum < intreg_argnum) {
- v->regoff = argintregs[v->varnum];
- return(argintregs[v->varnum]);
- }
- v->regoff -= intreg_argnum;
- break;
- }
- v->flags |= INMEMORY;
- return tempregnum;
+ void *critical;
+ if ((critical = thread_checkcritical((void*) uc->uc_mcontext.gregs[CTX_EPC])) != NULL)
+ uc->uc_mcontext.gregs[CTX_EPC] = (u8) critical;
}
-
-
-/* store_reg_to_var_xxx:
- This function generates the code to store the result of an operation
- back into a spilled pseudo-variable.
- If the pseudo-variable has not been spilled in the first place, this
- function will generate nothing.
-
- v ............ Pseudovariable
- tempregnum ... Number of the temporary registers as returned by
- reg_of_var.
-*/
-
-#define store_reg_to_var_int(sptr, tempregnum) { \
- if ((sptr)->flags & INMEMORY) { \
- COUNT_SPILLS; \
- M_LST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
- } \
- }
-
-#define store_reg_to_var_flt(sptr, tempregnum) { \
- if ((sptr)->flags & INMEMORY) { \
- COUNT_SPILLS; \
- M_DST(tempregnum, REG_SP, 8 * (sptr)->regoff); \
- } \
- }
-
-
-/* NullPointerException handlers and exception handling initialisation */
+#endif
/* NullPointerException signal handler for hardware null pointer check */
sigset_t nsig;
int instr;
long faultaddr;
+ java_objectheader *xptr;
/* Reset signal handler - necessary for SysV, does no harm for BSD */
sigemptyset(&nsig);
sigaddset(&nsig, sig);
sigprocmask(SIG_UNBLOCK, &nsig, NULL); /* unblock signal */
- sigctx->sc_regs[REG_ITMP1_XPTR] =
- (long) proto_java_lang_NullPointerException;
+
+ xptr = new_nullpointerexception();
+
+ sigctx->sc_regs[REG_ITMP1_XPTR] = (u8) xptr;
sigctx->sc_regs[REG_ITMP2_XPC] = sigctx->sc_pc;
- sigctx->sc_pc = (long) asm_handle_exception;
- }
- else {
+ sigctx->sc_pc = (u8) asm_handle_exception;
+
+ } else {
faultaddr += (long) ((instr << 16) >> 16);
fprintf(stderr, "faulting address: 0x%lx at 0x%lx\n", (long) faultaddr, (long) sigctx->sc_pc);
panic("Stack overflow");
- }
+ }
}
+#include <sys/fpu.h>
+
void init_exceptions(void)
{
struct sigaction sa;
sigset_t unblockmask;
- createcalljava();
-
/* The Boehm GC initialization blocks the SIGSEGV signal. So we do a
dummy allocation here to ensure that the GC is initialized.
*/
sigemptyset(&unblockmask);
sa.sa_flags = 0;
- sa.sa_sigaction = catch_NullPointerException;
+ sa.sa_sigaction = (functionptr) catch_NullPointerException;
sigemptyset(&sa.sa_mask);
if (!checknull) {
-
#if defined(SIGSEGV)
sigaction(SIGSEGV, &sa, NULL);
sigaddset(&unblockmask, SIGSEGV);
}
sigprocmask(SIG_UNBLOCK, &unblockmask, NULL);
+
+ /* Turn off flush-to-zero */
+ {
+ union fpc_csr n;
+ n.fc_word = get_fpc_csr();
+ n.fc_struct.flush = 0;
+ set_fpc_csr(n.fc_word);
+ }
}
*******************************************************************************/
-#define MethodPointer -8
-#define FrameSize -12
-#define IsSync -16
-#define IsLeaf -20
-#define IntSave -24
-#define FltSave -28
-#define ExTableSize -32
-#define ExTableStart -32
-
-#if POINTERSIZE==8
-#define ExEntrySize -32
-#define ExStartPC -8
-#define ExEndPC -16
-#define ExHandlerPC -24
-#define ExCatchType -32
-#else
-#define ExEntrySize -16
-#define ExStartPC -4
-#define ExEndPC -8
-#define ExHandlerPC -12
-#define ExCatchType -16
-#endif
-
-void codegen()
+void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
{
- int len, s1, s2, s3, d;
- s4 a;
- s4 *mcodeptr;
- stackptr src;
- varinfo *var;
- basicblock *bptr;
- instruction *iptr;
- xtable *ex;
+ s4 len, s1, s2, s3, d;
+ s4 a;
+ s4 parentargs_base;
+ s4 *mcodeptr;
+ stackptr src;
+ varinfo *var;
+ basicblock *bptr;
+ instruction *iptr;
+ exceptiontable *ex;
{
- int p, pa, t, l, r;
+ s4 i, p, pa, t, l;
+ s4 savedregs_num;
- savedregs_num = (isleafmethod) ? 0 : 1; /* space to save the RA */
+ savedregs_num = (m->isleafmethod) ? 0 : 1; /* space to save the RA */
/* space to save used callee saved registers */
- savedregs_num += (savintregcnt - maxsavintreguse);
- savedregs_num += (savfltregcnt - maxsavfltreguse);
+ savedregs_num += (rd->savintregcnt - rd->maxsavintreguse);
+ savedregs_num += (rd->savfltregcnt - rd->maxsavfltreguse);
- parentargs_base = maxmemuse + savedregs_num;
+ parentargs_base = rd->maxmemuse + savedregs_num;
-#ifdef USE_THREADS /* space to save argument of monitor_enter */
+#if defined(USE_THREADS) /* space to save argument of monitor_enter */
- if (checksync && (method->flags & ACC_SYNCHRONIZED))
+ if (checksync && (m->flags & ACC_SYNCHRONIZED))
parentargs_base++;
#endif
/* create method header */
-#if POINTERSIZE==4
- (void) dseg_addaddress(method); /* Filler */
+#if POINTERSIZE == 4
+ (void) dseg_addaddress(cd, m); /* Filler */
#endif
- (void) dseg_addaddress(method); /* MethodPointer */
- (void) dseg_adds4(parentargs_base * 8); /* FrameSize */
+ (void) dseg_addaddress(cd, m); /* MethodPointer */
+ (void) dseg_adds4(cd, parentargs_base * 8); /* FrameSize */
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
/* IsSync contains the offset relative to the stack pointer for the
argument of monitor_exit used in the exception handler. Since the
offset by one.
*/
- if (checksync && (method->flags & ACC_SYNCHRONIZED))
- (void) dseg_adds4((maxmemuse + 1) * 8); /* IsSync */
+ if (checksync && (m->flags & ACC_SYNCHRONIZED))
+ (void) dseg_adds4(cd, (rd->maxmemuse + 1) * 8); /* IsSync */
else
#endif
- (void) dseg_adds4(0); /* IsSync */
+ (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(isleafmethod); /* IsLeaf */
- (void) dseg_adds4(savintregcnt - maxsavintreguse); /* IntSave */
- (void) dseg_adds4(savfltregcnt - maxsavfltreguse); /* FltSave */
- (void) dseg_adds4(exceptiontablelength); /* ExTableSize */
+ (void) dseg_adds4(cd, m->isleafmethod); /* IsLeaf */
+ (void) dseg_adds4(cd, rd->savintregcnt - rd->maxsavintreguse);/* IntSave */
+ (void) dseg_adds4(cd, rd->savfltregcnt - rd->maxsavfltreguse);/* FltSave */
+ (void) dseg_adds4(cd, cd->exceptiontablelength); /* ExTableSize */
/* create exception table */
- for (ex = extable; ex != NULL; ex = ex->down) {
-
-#ifdef LOOP_DEBUG
- if (ex->start != NULL)
- printf("adding start - %d - ", ex->start->debug_nr);
- else {
- printf("PANIC - start is NULL");
- exit(-1);
- }
-#endif
-
- dseg_addtarget(ex->start);
-
-#ifdef LOOP_DEBUG
- if (ex->end != NULL)
- printf("adding end - %d - ", ex->end->debug_nr);
- else {
- printf("PANIC - end is NULL");
- exit(-1);
- }
-#endif
-
- dseg_addtarget(ex->end);
-
-#ifdef LOOP_DEBUG
- if (ex->handler != NULL)
- printf("adding handler - %d\n", ex->handler->debug_nr);
- else {
- printf("PANIC - handler is NULL");
- exit(-1);
- }
-#endif
-
- dseg_addtarget(ex->handler);
-
- (void) dseg_addaddress(ex->catchtype);
- }
+ for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
+ dseg_addtarget(cd, ex->start);
+ dseg_addtarget(cd, ex->end);
+ dseg_addtarget(cd, ex->handler);
+ (void) dseg_addaddress(cd, ex->catchtype);
+ }
/* initialize mcode variables */
- mcodeptr = (s4*) mcodebase;
- mcodeend = (s4*) (mcodebase + mcodesize);
- MCODECHECK(128 + mparamcount);
+ mcodeptr = (s4 *) cd->mcodebase;
+ cd->mcodeend = (s4 *) (cd->mcodebase + cd->mcodesize);
+ MCODECHECK(128 + m->paramcount);
/* create stack frame (if necessary) */
- if (parentargs_base)
- {M_LDA (REG_SP, REG_SP, -parentargs_base * 8);}
+ if (parentargs_base) {
+ M_LDA(REG_SP, REG_SP, -parentargs_base * 8);
+ }
/* save return address and used callee saved registers */
p = parentargs_base;
- if (!isleafmethod)
- {p--; M_LST (REG_RA, REG_SP, 8*p);}
- for (r = savintregcnt - 1; r >= maxsavintreguse; r--)
- {p--; M_LST (savintregs[r], REG_SP, 8 * p);}
- for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--)
- {p--; M_DST (savfltregs[r], REG_SP, 8 * p);}
+ if (!m->isleafmethod) {
+ p--; M_LST(REG_RA, REG_SP, 8 * p);
+ }
+ for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
+ p--; M_LST(rd->savintregs[i], REG_SP, 8 * p);
+ }
+ for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
+ p--; M_DST(rd->savfltregs[i], REG_SP, 8 * p);
+ }
/* save monitorenter argument */
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- if (method->flags & ACC_STATIC) {
- p = dseg_addaddress (class);
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (m->flags & ACC_STATIC) {
+ p = dseg_addaddress(cd, m->class);
M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, 8 * maxmemuse);
- }
- else {
- M_AST (argintregs[0], REG_SP, 8 * maxmemuse);
- }
- }
+ M_AST(REG_ITMP1, REG_SP, rd->maxmemuse * 8);
+
+ } else {
+ M_AST(rd->argintregs[0], REG_SP, rd->maxmemuse * 8);
+ }
+ }
#endif
/* copy argument registers to stack and call trace function with pointer
*/
if (runverbose) {
- M_LDA (REG_SP, REG_SP, -(18*8));
-
- M_LST(REG_RA, REG_SP, 1*8);
-
- M_LST(argintregs[0], REG_SP, 2*8);
- M_LST(argintregs[1], REG_SP, 3*8);
- M_LST(argintregs[2], REG_SP, 4*8);
- M_LST(argintregs[3], REG_SP, 5*8);
- M_LST(argintregs[4], REG_SP, 6*8);
- M_LST(argintregs[5], REG_SP, 7*8);
- M_LST(argintregs[6], REG_SP, 8*8);
- M_LST(argintregs[7], REG_SP, 9*8);
-
- M_DST(argfltregs[0], REG_SP, 10*8);
- M_DST(argfltregs[1], REG_SP, 11*8);
- M_DST(argfltregs[2], REG_SP, 12*8);
- M_DST(argfltregs[3], REG_SP, 13*8);
- M_DST(argfltregs[4], REG_SP, 14*8);
- M_DST(argfltregs[5], REG_SP, 15*8);
- M_DST(argfltregs[6], REG_SP, 16*8);
- M_DST(argfltregs[7], REG_SP, 17*8);
-
- p = dseg_addaddress (method);
+ M_LDA(REG_SP, REG_SP, -(18 * 8));
+ M_LST(REG_RA, REG_SP, 1 * 8);
+
+ /* save integer argument registers */
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
+ M_LST(rd->argintregs[p], REG_SP, (2 + p) * 8);
+ }
+
+ /* save and copy float arguments into integer registers */
+ for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
+ t = m->paramtypes[p];
+
+ if (IS_FLT_DBL_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t)) {
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_LLD(rd->argintregs[p], REG_SP, (10 + p) * 8);
+
+ } else {
+ M_FST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_ILD(rd->argintregs[p], REG_SP, (10 + p) * 8);
+ }
+
+ } else {
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
+ }
+
+ p = dseg_addaddress(cd, m);
M_ALD(REG_ITMP1, REG_PV, p);
M_LST(REG_ITMP1, REG_SP, 0);
- p = dseg_addaddress ((void*) (builtin_trace_args));
+ p = dseg_addaddress(cd, (void *) builtin_trace_args);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- M_LLD(REG_RA, REG_SP, 1*8);
-
- M_LLD(argintregs[0], REG_SP, 2*8);
- M_LLD(argintregs[1], REG_SP, 3*8);
- M_LLD(argintregs[2], REG_SP, 4*8);
- M_LLD(argintregs[3], REG_SP, 5*8);
- M_LLD(argintregs[4], REG_SP, 6*8);
- M_LLD(argintregs[5], REG_SP, 7*8);
- M_LLD(argintregs[6], REG_SP, 8*8);
- M_LLD(argintregs[7], REG_SP, 9*8);
-
- M_DLD(argfltregs[0], REG_SP, 10*8);
- M_DLD(argfltregs[1], REG_SP, 11*8);
- M_DLD(argfltregs[2], REG_SP, 12*8);
- M_DLD(argfltregs[3], REG_SP, 13*8);
- M_DLD(argfltregs[4], REG_SP, 14*8);
- M_DLD(argfltregs[5], REG_SP, 15*8);
- M_DLD(argfltregs[6], REG_SP, 16*8);
- M_DLD(argfltregs[7], REG_SP, 17*8);
-
- M_LDA (REG_SP, REG_SP, 18*8);
+ M_LLD(REG_RA, REG_SP, 1 * 8);
+
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
+ M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
+ }
+
+ for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
+ t = m->paramtypes[p];
+
+ if (IS_FLT_DBL_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t)) {
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+
+ } else {
+ M_FLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
+
+ } else {
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
}
+ M_LDA(REG_SP, REG_SP, 18 * 8);
+ }
+
/* take arguments out of register or stack frame */
- for (p = 0, l = 0; p < mparamcount; p++) {
- t = mparamtypes[p];
- var = &(locals[l][t]);
+ for (p = 0, l = 0; p < m->paramcount; p++) {
+ t = m->paramtypes[p];
+ var = &(rd->locals[l][t]);
l++;
if (IS_2_WORD_TYPE(t)) /* increment local counter for 2 word types */
l++;
if (var->type < 0)
continue;
- r = var->regoff;
if (IS_INT_LNG_TYPE(t)) { /* integer args */
if (p < INT_ARG_CNT) { /* register arguments */
- if (!(var->flags & INMEMORY)) /* reg arg -> register */
- {M_INTMOVE (argintregs[p], r);}
- else /* reg arg -> spilled */
- M_LST (argintregs[p], REG_SP, 8 * r);
+ if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ M_INTMOVE(rd->argintregs[p], var->regoff);
+ } else { /* reg arg -> spilled */
+ M_LST(rd->argintregs[p], REG_SP, 8 * var->regoff);
}
- else { /* stack arguments */
+
+ } else { /* stack arguments */
pa = p - INT_ARG_CNT;
- if (!(var->flags & INMEMORY)) /* stack arg -> register */
- M_LLD (r, REG_SP, 8 * (parentargs_base + pa));
- else { /* stack arg -> spilled */
- M_LLD (REG_ITMP1, REG_SP, 8 * (parentargs_base + pa));
- M_LST (REG_ITMP1, REG_SP, 8 * r);
- }
- }
- }
- else { /* floating args */
+ if (!(var->flags & INMEMORY)) { /* stack arg -> register */
+ M_LLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
+
+ } else { /* stack arg -> spilled */
+ M_LLD(REG_ITMP1, REG_SP, 8 * (parentargs_base + pa));
+ M_LST(REG_ITMP1, REG_SP, 8 * var->regoff);
+ }
+ }
+
+ } else { /* floating args */
if (p < FLT_ARG_CNT) { /* register arguments */
- if (!(var->flags & INMEMORY)) /* reg arg -> register */
- {M_TFLTMOVE (var->type, argfltregs[p], r);}
- else /* reg arg -> spilled */
- M_DST (argfltregs[p], REG_SP, 8 * r);
+ if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ M_TFLTMOVE(var->type, rd->argfltregs[p], var->regoff);
+
+ } else { /* reg arg -> spilled */
+ M_DST(rd->argfltregs[p], REG_SP, var->regoff * 8);
}
- else { /* stack arguments */
+
+ } else { /* stack arguments */
pa = p - FLT_ARG_CNT;
if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
- M_DLD (r, REG_SP, 8 * (parentargs_base + pa) );
- } else { /* stack-arg -> spilled */
- M_DLD (REG_FTMP1, REG_SP, 8 * (parentargs_base + pa));
- M_DST (REG_FTMP1, REG_SP, 8 * r);
- }
- }
- }
- } /* end for */
+ M_DLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
- /* call trace function */
-
-#if 0
- if (runverbose && !isleafmethod) {
- M_LDA (REG_SP, REG_SP, -8);
- p = dseg_addaddress (method);
- M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, 0);
- p = dseg_addaddress ((void*) (builtin_trace_args));
- M_ALD(REG_ITMP3, REG_PV, p);
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
- M_LDA(REG_SP, REG_SP, 8);
+ } else { /* stack-arg -> spilled */
+ M_DLD(REG_FTMP1, REG_SP, 8 * (parentargs_base + pa));
+ M_DST(REG_FTMP1, REG_SP, 8 * var->regoff);
+ }
+ }
}
-#endif
+ } /* end for */
/* call monitorenter function */
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- int disp;
- p = dseg_addaddress ((void*) (builtin_monitorenter));
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ s4 disp;
+ s8 func_enter = (m->flags & ACC_STATIC) ?
+ (s8) builtin_staticmonitorenter : (s8) builtin_monitorenter;
+ p = dseg_addaddress(cd, (void *) func_enter);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(argintregs[0], REG_SP, 8 * maxmemuse);
- disp = -(int)((u1*) mcodeptr - mcodebase);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8);
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
- }
+ }
#endif
}
/* end of header generation */
/* walk through all basic blocks */
- for (bptr = block; bptr != NULL; bptr = bptr->next) {
+ for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
- bptr -> mpc = (int)((u1*) mcodeptr - mcodebase);
+ bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
if (bptr->flags >= BBREACHED) {
- /* branch resolving */
-
- {
- branchref *brefs;
- for (brefs = bptr->branchrefs; brefs != NULL; brefs = brefs->next) {
- gen_resolvebranch((u1*) mcodebase + brefs->branchpos,
- brefs->branchpos, bptr->mpc);
+ /* branch resolving */
+ {
+ branchref *bref;
+ for (bref = bptr->branchrefs; bref != NULL; bref = bref->next) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ bptr->mpc);
+ }
}
- }
/* copy interface registers to their destination */
while (src != NULL) {
len--;
if ((len == 0) && (bptr->type != BBTYPE_STD)) {
- d = reg_of_var(src, REG_ITMP1);
+ d = reg_of_var(rd, src, REG_ITMP1);
M_INTMOVE(REG_ITMP1, d);
store_reg_to_var_int(src, d);
- }
- else {
- d = reg_of_var(src, REG_IFTMP);
+
+ } else {
+ d = reg_of_var(rd, src, REG_IFTMP);
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
- if (!(interfaces[len][s2].flags & INMEMORY)) {
- s1 = interfaces[len][s2].regoff;
- M_TFLTMOVE(s2,s1,d);
- }
- else {
- M_DLD(d, REG_SP, 8 * interfaces[len][s2].regoff);
- }
- store_reg_to_var_flt(src, d);
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ s1 = rd->interfaces[len][s2].regoff;
+ M_TFLTMOVE(s2, s1, d);
+
+ } else {
+ M_DLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
- else {
- if (!(interfaces[len][s2].flags & INMEMORY)) {
- s1 = interfaces[len][s2].regoff;
+ store_reg_to_var_flt(src, d);
+
+ } else {
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ s1 = rd->interfaces[len][s2].regoff;
M_INTMOVE(s1,d);
- }
- else {
- M_LLD(d, REG_SP, 8 * interfaces[len][s2].regoff);
- }
- store_reg_to_var_int(src, d);
+
+ } else {
+ M_LLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
+ store_reg_to_var_int(src, d);
}
}
- src = src->prev;
}
+ src = src->prev;
+ }
/* walk through all instructions */
src = bptr->instack;
len = bptr->icount;
- for (iptr = bptr->iinstr;
- len > 0;
- src = iptr->dst, len--, iptr++) {
+ for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
MCODECHECK(64); /* an instruction usually needs < 64 words */
switch (iptr->opc) {
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addxnullrefs(mcodeptr);
+ codegen_addxnullrefs(cd, mcodeptr);
M_NOP;
break;
/* constant operations ************************************************/
-#define ICONST(r,c) if(((c)>=-32768)&&((c)<= 32767)){M_IADD_IMM(REG_ZERO,c,r);} \
- else if(((c)>=0)&&((c)<=0xffff)){M_OR_IMM(REG_ZERO,c,r);} \
- else{a=dseg_adds4(c);M_ILD(r,REG_PV,a);}
-
-#define LCONST(r,c) if(((c)>=-32768)&&((c)<= 32767)){M_LADD_IMM(REG_ZERO,c,r);} \
- else if(((c)>=0)&&((c)<=0xffff)){M_OR_IMM(REG_ZERO,c,r);} \
- else{a=dseg_adds8(c);M_LLD(r,REG_PV,a);}
-
case ICMD_ICONST: /* ... ==> ..., constant */
/* op1 = 0, val.i = constant */
- d = reg_of_var(iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
ICONST(d, iptr->val.i);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LCONST: /* ... ==> ..., constant */
/* op1 = 0, val.l = constant */
- d = reg_of_var(iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
LCONST(d, iptr->val.l);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_FCONST: /* ... ==> ..., constant */
/* op1 = 0, val.f = constant */
- d = reg_of_var (iptr->dst, REG_FTMP1);
- a = dseg_addfloat (iptr->val.f);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ a = dseg_addfloat(cd, iptr->val.f);
M_FLD(d, REG_PV, a);
- store_reg_to_var_flt (iptr->dst, d);
+ store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_DCONST: /* ... ==> ..., constant */
/* op1 = 0, val.d = constant */
- d = reg_of_var (iptr->dst, REG_FTMP1);
- a = dseg_adddouble (iptr->val.d);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ a = dseg_adddouble(cd, iptr->val.d);
M_DLD(d, REG_PV, a);
store_reg_to_var_flt (iptr->dst, d);
break;
case ICMD_ACONST: /* ... ==> ..., constant */
/* op1 = 0, val.a = constant */
- d = reg_of_var(iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
if (iptr->val.a) {
- a = dseg_addaddress (iptr->val.a);
+ a = dseg_addaddress(cd, iptr->val.a);
M_ALD(d, REG_PV, a);
- }
- else {
+ } else {
M_INTMOVE(REG_ZERO, d);
- }
+ }
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LLOAD: /* op1 = local variable */
case ICMD_ALOAD:
- d = reg_of_var(iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- var = &(locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
- if (var->flags & INMEMORY)
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+ if (var->flags & INMEMORY) {
M_LLD(d, REG_SP, 8 * var->regoff);
- else
- {M_INTMOVE(var->regoff,d);}
+ } else {
+ M_INTMOVE(var->regoff,d);
+ }
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_FLOAD: /* ... ==> ..., content of local variable */
case ICMD_DLOAD: /* op1 = local variable */
- d = reg_of_var(iptr->dst, REG_FTMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- var = &(locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
{
int t2 = ((iptr->opc == ICMD_FLOAD) ? TYPE_FLT : TYPE_DBL);
- if (var->flags & INMEMORY)
- {M_CCFLD(var->type,t2,d, REG_SP, 8 * var->regoff);}
- else
- {M_CCFLTMOVE(var->type,t2,var->regoff,d);}
+ if (var->flags & INMEMORY) {
+ M_CCFLD(var->type, t2, d, REG_SP, 8 * var->regoff);
+ } else {
+ M_CCFLTMOVE(var->type, t2, var->regoff, d);
+ }
}
store_reg_to_var_flt(iptr->dst, d);
break;
if ((src->varkind == LOCALVAR) &&
(src->varnum == iptr->op1))
break;
- var = &(locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
var_to_reg_int(s1, src, REG_ITMP1);
M_LST(s1, REG_SP, 8 * var->regoff);
- }
- else {
+
+ } else {
var_to_reg_int(s1, src, var->regoff);
M_INTMOVE(s1, var->regoff);
- }
+ }
break;
case ICMD_FSTORE: /* ..., value ==> ... */
if ((src->varkind == LOCALVAR) &&
(src->varnum == iptr->op1))
break;
- var = &(locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
{
int t1 = ((iptr->opc == ICMD_FSTORE) ? TYPE_FLT : TYPE_DBL);
if (var->flags & INMEMORY) {
var_to_reg_flt(s1, src, REG_FTMP1);
- M_CCFST(t1,var->type,s1, REG_SP, 8 * var->regoff);
- }
- else {
+ M_CCFST(t1, var->type, s1, REG_SP, 8 * var->regoff);
+
+ } else {
var_to_reg_flt(s1, src, var->regoff);
- M_CCFLTMOVE(t1,var->type,s1, var->regoff);
- }
+ M_CCFLTMOVE(t1, var->type, s1, var->regoff);
+ }
}
break;
case ICMD_POP2: /* ..., value, value ==> ... */
break;
-#define M_COPY(from,to) \
- d = reg_of_var(to, REG_IFTMP); \
- if ((from->regoff != to->regoff) || \
- ((from->flags ^ to->flags) & INMEMORY)) { \
- if (IS_FLT_DBL_TYPE(from->type)) { \
- var_to_reg_flt(s1, from, d); \
- M_TFLTMOVE(from->type,s1,d); \
- store_reg_to_var_flt(to, d); \
- }\
- else { \
- var_to_reg_int(s1, from, d); \
- M_INTMOVE(s1,d); \
- store_reg_to_var_int(to, d); \
- }\
- }
-
case ICMD_DUP: /* ..., a ==> ..., a, a */
M_COPY(src, iptr->dst);
break;
case ICMD_DUP_X1: /* ..., a, b ==> ..., b, a, b */
- M_COPY(src, iptr->dst->prev->prev);
+ M_COPY(src, iptr->dst);
+ M_COPY(src->prev, iptr->dst->prev);
+ M_COPY(iptr->dst, iptr->dst->prev->prev);
+ break;
+
+ case ICMD_DUP_X2: /* ..., a, b, c ==> ..., c, a, b, c */
+
+ M_COPY(src, iptr->dst);
+ M_COPY(src->prev, iptr->dst->prev);
+ M_COPY(src->prev->prev, iptr->dst->prev->prev);
+ M_COPY(iptr->dst, iptr->dst->prev->prev->prev);
+ break;
case ICMD_DUP2: /* ..., a, b ==> ..., a, b, a, b */
case ICMD_DUP2_X1: /* ..., a, b, c ==> ..., b, c, a, b, c */
- M_COPY(src->prev, iptr->dst->prev->prev->prev);
-
- case ICMD_DUP_X2: /* ..., a, b, c ==> ..., c, a, b, c */
-
M_COPY(src, iptr->dst);
M_COPY(src->prev, iptr->dst->prev);
M_COPY(src->prev->prev, iptr->dst->prev->prev);
- M_COPY(src, iptr->dst->prev->prev->prev);
+ M_COPY(iptr->dst, iptr->dst->prev->prev->prev);
+ M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev);
break;
case ICMD_DUP2_X2: /* ..., a, b, c, d ==> ..., c, d, a, b, c, d */
M_COPY(src->prev, iptr->dst->prev);
M_COPY(src->prev->prev, iptr->dst->prev->prev);
M_COPY(src->prev->prev->prev, iptr->dst->prev->prev->prev);
- M_COPY(src, iptr->dst->prev->prev->prev->prev);
- M_COPY(src->prev, iptr->dst->prev->prev->prev->prev->prev);
+ M_COPY(iptr->dst, iptr->dst->prev->prev->prev->prev);
+ M_COPY(iptr->dst->prev, iptr->dst->prev->prev->prev->prev->prev);
break;
case ICMD_SWAP: /* ..., a, b ==> ..., b, a */
- M_COPY(src, iptr->dst->prev);
+ M_COPY(src, iptr->dst->prev);
M_COPY(src->prev, iptr->dst);
break;
case ICMD_INEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LNEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_I2L: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_L2I: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL_IMM(s1, 0, d );
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, 56, d);
M_LSRA_IMM( d, 56, d);
store_reg_to_var_int(iptr->dst, d);
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_CZEXT(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, 48, d);
M_LSRA_IMM( d, 48, d);
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_IADD_IMM(s1, iptr->val.i, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
M_LADD_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
M_IADD_IMM(s1, -iptr->val.i, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= -32767) && (iptr->val.l <= 32768)) {
M_LADD_IMM(s1, -iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IDIV(s1, s2);
M_MFLO(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IDIV(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LDIV(s1, s2);
M_MFLO(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LDIV(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IDIV(s1, s2);
M_MFHI(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IDIV(s1, REG_ITMP2);
M_MFHI(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LDIV(s1, s2);
M_MFHI(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LDIV(s1, REG_ITMP2);
M_MFHI(d);
case ICMD_LDIVPOW2: /* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA_IMM(s1, 63, REG_ITMP2);
M_LSRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
M_LADD(s1, REG_ITMP2, REG_ITMP2);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRA_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_AND(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_AND_IMM(s1, iptr->val.i, d);
}
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
store_reg_to_var_int(iptr->dst, d);
break;
- case ICMD_IREM0X10001: /* ..., value ==> ..., value % 0x100001 */
-
-/* b = value & 0xffff;
- a = value >> 16;
- a = ((b - a) & 0xffff) + (b < a);
-*/
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- if (s1 == d) {
- M_MOV(s1, REG_ITMP3);
- s1 = REG_ITMP3;
- }
- M_BLTZ(s1, 7);
- M_CZEXT(s1, REG_ITMP2); /* delay slot */
- M_ISRA_IMM(s1, 16, d);
- M_CMPLT(REG_ITMP2, d, REG_ITMP1);
- M_ISUB(REG_ITMP2, d, d);
- M_CZEXT(d, d);
- M_BR(7);
- M_IADD(d, REG_ITMP1, d); /* delay slot */
-
- M_LUI(REG_ITMP2, 1);
- M_IADD_IMM(REG_ITMP2, 1, REG_ITMP2);
- M_IDIV(s1, REG_ITMP2);
- M_MFHI(d);
- M_NOP;
- M_NOP;
- store_reg_to_var_int(iptr->dst, d);
- break;
-
case ICMD_LANDCONST: /* ..., value ==> ..., value & constant */
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_AND_IMM(s1, iptr->val.l, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
store_reg_to_var_int(iptr->dst, d);
break;
- case ICMD_LREM0X10001:/* ..., value ==> ..., value % 0x10001 */
-
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_LUI(REG_ITMP2, 1);
- M_LADD_IMM(REG_ITMP2, 1, REG_ITMP2);
- M_LDIV(s1, REG_ITMP2);
- M_MFHI(d);
- M_NOP;
- M_NOP;
- store_reg_to_var_int(iptr->dst, d);
- break;
-
case ICMD_IOR: /* ..., val1, val2 ==> ..., val1 | val2 */
case ICMD_LOR:
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_OR( s1,s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_OR_IMM(s1, iptr->val.i, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_XOR(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.i, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_CMPLT(s1, s2, REG_ITMP3);
M_CMPLT(s2, s1, REG_ITMP1);
M_LSUB (REG_ITMP1, REG_ITMP3, d);
case ICMD_IINC: /* ..., value ==> ..., value + constant */
/* op1 = variable, val.i = constant */
- var = &(locals[iptr->op1][TYPE_INT]);
+ var = &(rd->locals[iptr->op1][TYPE_INT]);
if (var->flags & INMEMORY) {
s1 = REG_ITMP1;
M_LLD(s1, REG_SP, 8 * var->regoff);
- }
- else
+
+ } else
s1 = var->regoff;
M_IADD_IMM(s1, iptr->val.i, s1);
if (var->flags & INMEMORY)
case ICMD_FNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_DNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FDIV(s1,s2, REG_FTMP3);
M_FLOORFL(REG_FTMP3, REG_FTMP3);
M_CVTLF(REG_FTMP3, REG_FTMP3);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DDIV(s1,s2, REG_FTMP3);
M_FLOORDL(REG_FTMP3, REG_FTMP3);
M_CVTLD(REG_FTMP3, REG_FTMP3);
case ICMD_I2F: /* ..., value ==> ..., (float) value */
case ICMD_L2F:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_MOVLD(s1, d);
M_CVTLF(d, d);
store_reg_to_var_flt(iptr->dst, d);
case ICMD_I2D: /* ..., value ==> ..., (double) value */
case ICMD_L2D:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_MOVLD(s1, d);
M_CVTLD(d, d);
store_reg_to_var_flt(iptr->dst, d);
case ICMD_F2I: /* ..., (float) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCFI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_D2I: /* ..., (double) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCDI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_F2L: /* ..., (float) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCFL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
case ICMD_D2L: /* ..., (double) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCDL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
case ICMD_F2D: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_CVTFD(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_D2F: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_CVTDF(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_FCMPUEQF(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instructions */
- M_LSUB_IMM(REG_ZERO, 1, d); /* delay slot */
- M_CLR(d);
- M_FCMPULTF(s2, s1);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_NOP;
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_FCMPULEF(s1, s2);
+ M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
+ M_BR(4);
+ M_NOP;
+ M_FCMPEQF(s1, s2);
+ M_LSUB_IMM(REG_ZERO, 1, d);
+ M_CMOVT(REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
-
+
case ICMD_DCMPL: /* ..., val1, val2 ==> ..., val1 fcmpl val2 */
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_FCMPUEQD(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instructions */
- M_LSUB_IMM(REG_ZERO, 1, d); /* delay slot */
- M_CLR(d);
- M_FCMPULTD(s2, s1);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_NOP;
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_FCMPULED(s1, s2);
+ M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
+ M_BR(4);
+ M_NOP;
+ M_FCMPEQD(s1, s2);
+ M_LSUB_IMM(REG_ZERO, 1, d);
+ M_CMOVT(REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_FCMPUEQF(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_LADD_IMM(REG_ZERO, 1, d); /* delay slot */
- M_CLR(d);
- M_FCMPULTF(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_NOP;
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_FCMPOLTF(s1, s2);
+ M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
+ M_BR(4);
+ M_NOP;
+ M_FCMPEQF(s1, s2);
+ M_LADD_IMM(REG_ZERO, 1, d);
+ M_CMOVT(REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_FCMPUEQD(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_LADD_IMM(REG_ZERO, 1, d); /* delay slot */
- M_CLR(d);
- M_FCMPULTD(s1, s2);
- M_NOP; /* compare delay */
- M_FBF(2); /* jump over next instruction */
- M_NOP;
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_FCMPOLTD(s1, s2);
+ M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
+ M_BR(4);
+ M_NOP;
+ M_FCMPEQD(s1, s2);
+ M_LADD_IMM(REG_ZERO, 1, d);
+ M_CMOVT(REG_ZERO, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* memory operations **************************************************/
-#define gen_bound_check \
- if (checkbounds) {\
- M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));\
- M_CMPULT(s2, REG_ITMP3, REG_ITMP3);\
- M_BEQZ(REG_ITMP3, 0);\
- codegen_addxboundrefs(mcodeptr);\
- M_NOP;\
- }
-
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., length */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
gen_nullptr_check(s1);
M_ILD(d, s1, OFFSET(java_arrayheader, size));
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
case ICMD_PUTSTATIC: /* ..., value ==> ... */
/* op1 = type, val.a = field address */
- a = dseg_addaddress (&(((fieldinfo *)(iptr->val.a))->value));
+ /* If the static fields' class is not yet initialized, we do it */
+ /* now. The call code is generated later. */
+ if (!((fieldinfo *) iptr->val.a)->class->initialized) {
+ codegen_addclinitref(cd, mcodeptr, ((fieldinfo *) iptr->val.a)->class);
+
+ /* This is just for debugging purposes. Is very difficult to */
+ /* read patched code. Here we patch the following 2 nop's */
+ /* so that the real code keeps untouched. */
+ if (showdisassemble) {
+ M_NOP;
+ M_NOP;
+ }
+ }
+
+ a = dseg_addaddress(cd, &(((fieldinfo *) iptr->val.a)->value));
M_ALD(REG_ITMP1, REG_PV, a);
switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_IST(s2, REG_ITMP1, 0);
- break;
- case TYPE_LNG:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_LST(s2, REG_ITMP1, 0);
- break;
- case TYPE_ADR:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_AST(s2, REG_ITMP1, 0);
- break;
- case TYPE_FLT:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_FST(s2, REG_ITMP1, 0);
- break;
- case TYPE_DBL:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_DST(s2, REG_ITMP1, 0);
- break;
- default: panic ("internal error");
- }
+ case TYPE_INT:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_IST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_LNG:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_LST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_ADR:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_AST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_FLT:
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ M_FST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_DBL:
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ M_DST(s2, REG_ITMP1, 0);
+ break;
+ default:
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown PUTSTATIC operand type %d",
+ iptr->op1);
+ }
break;
case ICMD_GETSTATIC: /* ... ==> ..., value */
/* op1 = type, val.a = field address */
- a = dseg_addaddress (&(((fieldinfo *)(iptr->val.a))->value));
+ /* If the static fields' class is not yet initialized, we do it */
+ /* now. The call code is generated later. */
+ if (!((fieldinfo *) iptr->val.a)->class->initialized) {
+ codegen_addclinitref(cd, mcodeptr, ((fieldinfo *) iptr->val.a)->class);
+
+ /* This is just for debugging purposes. Is very difficult to */
+ /* read patched code. Here we patch the following 2 nop's */
+ /* so that the real code keeps untouched. */
+ if (showdisassemble) {
+ M_NOP;
+ M_NOP;
+ }
+ }
+
+ a = dseg_addaddress(cd, &(((fieldinfo *) iptr->val.a)->value));
M_ALD(REG_ITMP1, REG_PV, a);
switch (iptr->op1) {
- case TYPE_INT:
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_ILD(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_LNG:
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_LLD(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_ADR:
- d = reg_of_var(iptr->dst, REG_ITMP3);
- M_ALD(d, REG_ITMP1, 0);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_FLT:
- d = reg_of_var(iptr->dst, REG_FTMP1);
- M_FLD(d, REG_ITMP1, 0);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- case TYPE_DBL:
- d = reg_of_var(iptr->dst, REG_FTMP1);
- M_DLD(d, REG_ITMP1, 0);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- default: panic ("internal error");
- }
+ case TYPE_INT:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_ILD(d, REG_ITMP1, 0);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_LNG:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_LLD(d, REG_ITMP1, 0);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_ADR:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_ALD(d, REG_ITMP1, 0);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_FLT:
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ M_FLD(d, REG_ITMP1, 0);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ case TYPE_DBL:
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ M_DLD(d, REG_ITMP1, 0);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ default:
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown GETSTATIC operand type %d",
+ iptr->op1);
+ }
break;
a = ((fieldinfo *)(iptr->val.a))->offset;
switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_IST(s2, s1, a);
- break;
- case TYPE_LNG:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_LST(s2, s1, a);
- break;
- case TYPE_ADR:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_AST(s2, s1, a);
- break;
- case TYPE_FLT:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- gen_nullptr_check(s1);
- M_FST(s2, s1, a);
- break;
- case TYPE_DBL:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- gen_nullptr_check(s1);
- M_DST(s2, s1, a);
- break;
- default: panic ("internal error");
- }
+ case TYPE_INT:
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ gen_nullptr_check(s1);
+ M_IST(s2, s1, a);
+ break;
+ case TYPE_LNG:
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ gen_nullptr_check(s1);
+ M_LST(s2, s1, a);
+ break;
+ case TYPE_ADR:
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ gen_nullptr_check(s1);
+ M_AST(s2, s1, a);
+ break;
+ case TYPE_FLT:
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ gen_nullptr_check(s1);
+ M_FST(s2, s1, a);
+ break;
+ case TYPE_DBL:
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ gen_nullptr_check(s1);
+ M_DST(s2, s1, a);
+ break;
+ default:
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown PUTFIELD operand type %d",
+ iptr->op1);
+ }
break;
case ICMD_GETFIELD: /* ... ==> ..., value */
a = ((fieldinfo *)(iptr->val.a))->offset;
switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_ILD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_LNG:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_LLD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_ADR:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_ALD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_FLT:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_FTMP1);
- gen_nullptr_check(s1);
- M_FLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- case TYPE_DBL:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_FTMP1);
- gen_nullptr_check(s1);
- M_DLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- default: panic ("internal error");
- }
+ case TYPE_INT:
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ gen_nullptr_check(s1);
+ M_ILD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_LNG:
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ gen_nullptr_check(s1);
+ M_LLD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_ADR:
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ gen_nullptr_check(s1);
+ M_ALD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_FLT:
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ gen_nullptr_check(s1);
+ M_FLD(d, s1, a);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ case TYPE_DBL:
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ gen_nullptr_check(s1);
+ M_DLD(d, s1, a);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ default:
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown GETFIELD operand type %d",
+ iptr->op1);
+ }
break;
/* branch operations **************************************************/
-#define ALIGNCODENOP {if((int)((long)mcodeptr&7)){M_NOP;}}
-
case ICMD_ATHROW: /* ..., objectref ==> ... (, objectref) */
var_to_reg_int(s1, src, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1_XPTR);
- a = dseg_addaddress(asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP2, REG_PV, a);
M_JSR(REG_ITMP2_XPC, REG_ITMP2);
M_NOP;
case ICMD_GOTO: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_BR(0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
- dseg_addtarget(BlockPtrOfPC(iptr->op1));
- M_ALD(REG_ITMP1, REG_PV, -dseglen);
+ dseg_addtarget(cd, BlockPtrOfPC(iptr->op1));
+ M_ALD(REG_ITMP1, REG_PV, -(cd->dseglen));
M_JSR(REG_ITMP1, REG_ITMP1); /* REG_ITMP1 = return address */
M_NOP;
break;
case ICMD_RET: /* ... ==> ... */
/* op1 = local variable */
- var = &(locals[iptr->op1][TYPE_ADR]);
+ var = &(rd->locals[iptr->op1][TYPE_ADR]);
if (var->flags & INMEMORY) {
M_ALD(REG_ITMP1, REG_SP, 8 * var->regoff);
M_RET(REG_ITMP1);
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
M_BNEZ(s1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
ICONST(REG_ITMP2, iptr->val.i);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
ICONST(REG_ITMP2, iptr->val.i);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BEQ(s1, s2, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BNE(s1, s2, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 0) && (iptr[1].val.i == 1)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
case ICMD_LRETURN:
case ICMD_ARETURN:
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- int disp;
- a = dseg_addaddress ((void*) (builtin_monitorexit));
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ s4 disp;
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(argintregs[0], REG_SP, 8 * maxmemuse); /* delay slot */
- disp = -(int)((u1*) mcodeptr - mcodebase);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8); /* delay slot */
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
- }
+ }
#endif
var_to_reg_int(s1, src, REG_RESULT);
M_INTMOVE(s1, REG_RESULT);
case ICMD_FRETURN: /* ..., retvalue ==> ... */
case ICMD_DRETURN:
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- int disp;
- a = dseg_addaddress ((void*) (builtin_monitorexit));
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ s4 disp;
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(argintregs[0], REG_SP, 8 * maxmemuse); /* delay slot */
- disp = -(int)((u1*) mcodeptr - mcodebase);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8); /* delay slot */
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
- }
+ }
#endif
var_to_reg_flt(s1, src, REG_FRESULT);
{
case ICMD_RETURN: /* ... ==> ... */
-#ifdef USE_THREADS
- if (checksync && (method->flags & ACC_SYNCHRONIZED)) {
- int disp;
- a = dseg_addaddress ((void*) (builtin_monitorexit));
+#if defined(USE_THREADS)
+ if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ s4 disp;
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(argintregs[0], REG_SP, 8 * maxmemuse); /* delay slot */
- disp = -(int)((u1*) mcodeptr - mcodebase);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8); /* delay slot */
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
- }
+ }
#endif
nowperformreturn:
{
- int r, p;
+ s4 i, p;
p = parentargs_base;
/* restore return address */
- if (!isleafmethod)
- {p--; M_LLD (REG_RA, REG_SP, 8 * p);}
+ if (!m->isleafmethod) {
+ p--; M_LLD(REG_RA, REG_SP, 8 * p);
+ }
/* restore saved registers */
- for (r = savintregcnt - 1; r >= maxsavintreguse; r--)
- {p--; M_LLD(savintregs[r], REG_SP, 8 * p);}
- for (r = savfltregcnt - 1; r >= maxsavfltreguse; r--)
- {p--; M_DLD(savfltregs[r], REG_SP, 8 * p);}
+ for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
+ p--; M_LLD(rd->savintregs[i], REG_SP, 8 * p);
+ }
+ for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
+ p--; M_DLD(rd->savfltregs[i], REG_SP, 8 * p);
+ }
/* call trace function */
M_LST(REG_RA, REG_SP, 0);
M_LST(REG_RESULT, REG_SP, 8);
M_DST(REG_FRESULT, REG_SP,16);
- a = dseg_addaddress (method);
- M_ALD(argintregs[0], REG_PV, a);
- M_MOV(REG_RESULT, argintregs[1]);
- M_FLTMOVE(REG_FRESULT, argfltregs[2]);
- M_FMOV(REG_FRESULT, argfltregs[3]);
- a = dseg_addaddress ((void*) (builtin_displaymethodstop));
+ a = dseg_addaddress(cd, m);
+ M_ALD(rd->argintregs[0], REG_PV, a);
+ M_MOV(REG_RESULT, rd->argintregs[1]);
+ M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
+ M_FMOV(REG_FRESULT, rd->argfltregs[3]);
+ a = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR (REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_RESULT, REG_SP, 8);
M_LLD(REG_RA, REG_SP, 0);
M_LDA (REG_SP, REG_SP, 24);
- }
+ }
M_RET(REG_RA);
/* deallocate stack */
- if (parentargs_base)
- {M_LDA(REG_SP, REG_SP, parentargs_base*8);}
- else
- {M_NOP;}
+ if (parentargs_base) {
+ M_LDA(REG_SP, REG_SP, parentargs_base * 8);
+
+ } else {
+ M_NOP;
+ }
+
ALIGNCODENOP;
}
break;
M_CMPULT_IMM(REG_ITMP1, i, REG_ITMP2);
M_BEQZ(REG_ITMP2, 0);
- codegen_addreference((basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_ASLL_IMM(REG_ITMP1, POINTERSHIFT, REG_ITMP1); /* delay slot*/
/* build jump table top down and use address of lowest entry */
tptr += i;
while (--i >= 0) {
- /* dseg_addtarget(BlockPtrOfPC(*--s4ptr)); */
- dseg_addtarget((basicblock *) tptr[0]);
+ /* dseg_addtarget(cd, BlockPtrOfPC(*--s4ptr)); */
+ dseg_addtarget(cd, (basicblock *) tptr[0]);
--tptr;
}
}
/* length of dataseg after last dseg_addtarget is used by load */
M_AADD(REG_ITMP1, REG_PV, REG_ITMP2);
- M_ALD(REG_ITMP2, REG_ITMP2, -dseglen);
+ M_ALD(REG_ITMP2, REG_ITMP2, -(cd->dseglen));
M_JMP(REG_ITMP2);
M_NOP;
ALIGNCODENOP;
case ICMD_LOOKUPSWITCH: /* ..., key ==> ... */
{
- s4 i, l, val, *s4ptr;
+ s4 i, /*l, */val, *s4ptr;
void **tptr;
tptr = (void **) iptr->target;
s4ptr = iptr->val.a;
- l = s4ptr[0]; /* default */
+ /*l = s4ptr[0];*/ /* default */
i = s4ptr[1]; /* count */
MCODECHECK((i<<2)+8);
val = s4ptr[0];
ICONST(REG_ITMP2, val);
M_BEQ(s1, REG_ITMP2, 0);
- codegen_addreference((basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_NOP;
}
M_BR(0);
tptr = (void **) iptr->target;
- codegen_addreference((basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
s3 = iptr->op1;
gen_method: {
- methodinfo *m;
- classinfo *ci;
+ methodinfo *lm;
MCODECHECK((s3 << 1) + 64);
continue;
if (IS_INT_LNG_TYPE(src->type)) {
if (s3 < INT_ARG_CNT) {
- s1 = argintregs[s3];
+ s1 = rd->argintregs[s3];
var_to_reg_int(d, src, s1);
M_INTMOVE(d, s1);
- }
- else {
+
+ } else {
var_to_reg_int(d, src, REG_ITMP1);
M_LST(d, REG_SP, 8 * (s3 - INT_ARG_CNT));
- }
}
- else
+
+ } else {
if (s3 < FLT_ARG_CNT) {
- s1 = argfltregs[s3];
+ s1 = rd->argfltregs[s3];
var_to_reg_flt(d, src, s1);
- M_TFLTMOVE(src->type,d, s1);
- }
- else {
+ M_TFLTMOVE(src->type, d, s1);
+
+ } else {
var_to_reg_flt(d, src, REG_FTMP1);
M_DST(d, REG_SP, 8 * (s3 - FLT_ARG_CNT));
- }
- } /* end of for */
+ }
+ }
+ } /* end of for */
- m = iptr->val.a;
+ lm = iptr->val.a;
switch (iptr->opc) {
- case ICMD_BUILTIN3:
- case ICMD_BUILTIN2:
- case ICMD_BUILTIN1:
- a = dseg_addaddress ((void*) (m));
- M_ALD(REG_ITMP3, REG_PV, a); /* built-in-function pointer */
- M_JSR (REG_RA, REG_ITMP3);
- M_NOP;
- d = iptr->op1; /* return type */
- goto afteractualcall;
-
- case ICMD_INVOKESTATIC:
- case ICMD_INVOKESPECIAL:
- a = dseg_addaddress (m->stubroutine);
+ case ICMD_BUILTIN3:
+ case ICMD_BUILTIN2:
+ case ICMD_BUILTIN1:
+ a = dseg_addaddress(cd, (void *) lm);
+ d = iptr->op1; /* return type */
- M_ALD(REG_PV, REG_PV, a ); /* method pointer in pv */
+ M_ALD(REG_ITMP3, REG_PV, a); /* built-in-function pointer */
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ goto afteractualcall;
- d = m->returntype;
- goto makeactualcall;
+ case ICMD_INVOKESTATIC:
+ case ICMD_INVOKESPECIAL:
+ a = dseg_addaddress(cd, lm->stubroutine);
+ d = lm->returntype;
- case ICMD_INVOKEVIRTUAL:
+ M_ALD(REG_PV, REG_PV, a); /* method pointer in pv */
+ break;
- gen_nullptr_check(argintregs[0]);
- M_ALD(REG_METHODPTR, argintregs[0],
- OFFSET(java_objectheader, vftbl));
- M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl, table[0]) +
- sizeof(methodptr) * m->vftblindex);
+ case ICMD_INVOKEVIRTUAL:
+ d = lm->returntype;
- d = m->returntype;
- goto makeactualcall;
+ gen_nullptr_check(rd->argintregs[0]);
+ M_ALD(REG_METHODPTR, rd->argintregs[0], OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * lm->vftblindex);
+ break;
- case ICMD_INVOKEINTERFACE:
- ci = m->class;
+ case ICMD_INVOKEINTERFACE:
+ d = lm->returntype;
- gen_nullptr_check(argintregs[0]);
- M_ALD(REG_METHODPTR, argintregs[0],
- OFFSET(java_objectheader, vftbl));
- M_ALD(REG_METHODPTR, REG_METHODPTR,
- OFFSET(vftbl, interfacetable[0]) -
- sizeof(methodptr*) * ci->index);
- M_ALD(REG_PV, REG_METHODPTR,
- sizeof(methodptr) * (m - ci->methods));
-
- d = m->returntype;
- goto makeactualcall;
-
- default:
- d = 0;
- sprintf (logtext, "Unkown ICMD-Command: %d", iptr->opc);
- error ();
- }
-
-makeactualcall:
+ gen_nullptr_check(rd->argintregs[0]);
+ M_ALD(REG_METHODPTR, rd->argintregs[0], OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_METHODPTR, REG_METHODPTR, OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * lm->class->index);
+ M_ALD(REG_PV, REG_METHODPTR, sizeof(methodptr) * (lm - lm->class->methods));
+ break;
+ }
- M_JSR (REG_RA, REG_PV);
+ M_JSR(REG_RA, REG_PV);
M_NOP;
/* recompute pv */
afteractualcall:
- s1 = (int)((u1*) mcodeptr - mcodebase);
- if (s1<=32768) M_LDA (REG_PV, REG_RA, -s1);
+ s1 = (s4) ((u1 *) mcodeptr - cd->mcodebase);
+ if (s1 <= 32768) M_LDA(REG_PV, REG_RA, -s1);
else {
- s4 ml=-s1, mh=0;
- while (ml<-32768) { ml+=65536; mh--; }
- M_LUI(REG_PV, mh);
- M_IADD_IMM(REG_PV, ml, REG_PV);
- M_LADD(REG_PV, REG_RA, REG_PV);
- }
+ s4 ml = -s1, mh = 0;
+ while (ml < -32768) { ml += 65536; mh--; }
+ M_LUI(REG_PV, mh);
+ M_IADD_IMM(REG_PV, ml, REG_PV);
+ M_LADD(REG_PV, REG_RA, REG_PV);
+ }
/* d contains return type */
if (d != TYPE_VOID) {
if (IS_INT_LNG_TYPE(iptr->dst->type)) {
- s1 = reg_of_var(iptr->dst, REG_RESULT);
+ s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
store_reg_to_var_int(iptr->dst, s1);
- }
- else {
- s1 = reg_of_var(iptr->dst, REG_FRESULT);
+
+ } else {
+ s1 = reg_of_var(rd, iptr->dst, REG_FRESULT);
M_TFLTMOVE(iptr->dst->type, REG_FRESULT, s1);
store_reg_to_var_flt(iptr->dst, s1);
- }
}
}
+ }
break;
{
classinfo *super = (classinfo*) iptr->val.a;
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
M_BEQZ(s1, 8);
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
+ M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
M_BLEZ(REG_ITMP2, 3);
M_NOP;
M_ALD(REG_ITMP1, REG_ITMP1,
- OFFSET(vftbl, interfacetable[0]) -
+ OFFSET(vftbl_t, interfacetable[0]) -
super->index * sizeof(methodptr*));
M_CMPULT(REG_ZERO, REG_ITMP1, d); /* REG_ITMP1 != 0 */
}
M_BEQZ(s1, 5);
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
+ M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
M_CMPULT_IMM(REG_ITMP1, s2 + 1, d);
*/
M_BEQZ(s1, 9);
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress ((void*) super->vftbl);
+ a = dseg_addaddress(cd, (void *) super->vftbl);
M_ALD(REG_ITMP2, REG_PV, a);
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
- M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl, baseval));
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
+ M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
M_CMPULT(REG_ITMP2, REG_ITMP1, d);
M_XOR_IMM(d, 1, d);
{
classinfo *super = (classinfo*) iptr->val.a;
- d = reg_of_var(iptr->dst, REG_ITMP3);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
+
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
var_to_reg_int(s1, src, d);
if (iptr->op1) { /* class/interface */
if (super->flags & ACC_INTERFACE) { /* interface */
M_BEQZ(s1, 9);
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl, interfacetablelength));
+ M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
M_BLEZ(REG_ITMP2, 0);
- codegen_addxcastrefs(mcodeptr);
+ codegen_addxcastrefs(cd, mcodeptr);
M_NOP;
M_ALD(REG_ITMP2, REG_ITMP1,
- OFFSET(vftbl, interfacetable[0]) -
+ OFFSET(vftbl_t, interfacetable[0]) -
super->index * sizeof(methodptr*));
M_BEQZ(REG_ITMP2, 0);
- codegen_addxcastrefs(mcodeptr);
+ codegen_addxcastrefs(cd, mcodeptr);
M_NOP;
}
else { /* class */
M_BEQZ(s1, 6 + (s2 != 0));
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
+ M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
if (s2 == 0) {
M_BNEZ(REG_ITMP1, 0);
M_BEQZ(s1, 10 + (d == REG_ITMP3));
M_NOP;
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress ((void*) super->vftbl);
+ a = dseg_addaddress(cd, (void *) super->vftbl);
M_ALD(REG_ITMP2, REG_PV, a);
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl, baseval));
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
+ M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
if (d != REG_ITMP3) {
- M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl, baseval));
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
} else {
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, baseval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
M_ISUB(REG_ITMP1, REG_ITMP2, REG_ITMP1);
M_ALD(REG_ITMP2, REG_PV, a);
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl, diffval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
+#endif
}
M_CMPULT(REG_ITMP2, REG_ITMP1, REG_ITMP2);
M_BNEZ(REG_ITMP2, 0);
- codegen_addxcastrefs(mcodeptr);
+ codegen_addxcastrefs(cd, mcodeptr);
M_NOP;
}
}
var_to_reg_int(s1, src, REG_ITMP1);
M_BLTZ(s1, 0);
- codegen_addxcheckarefs(mcodeptr);
+ codegen_addxcheckarefs(cd, mcodeptr);
+ M_NOP;
+ break;
+
+ case ICMD_CHECKEXCEPTION: /* ... ==> ... */
+
+ M_BEQZ(REG_RESULT, 0);
+ codegen_addxexceptionrefs(cd, mcodeptr);
M_NOP;
break;
for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
var_to_reg_int(s2, src, REG_ITMP1);
M_BLTZ(s2, 0);
- codegen_addxcheckarefs(mcodeptr);
+ codegen_addxcheckarefs(cd, mcodeptr);
M_NOP;
/* copy sizes to stack (argument numbers >= INT_ARG_CNT) */
if (src->varkind != ARGVAR) {
M_LST(s2, REG_SP, 8 * (s1 + INT_ARG_CNT));
- }
}
+ }
/* a0 = dimension count */
- ICONST(argintregs[0], iptr->op1);
+ ICONST(rd->argintregs[0], iptr->op1);
/* a1 = arraydescriptor */
- a = dseg_addaddress(iptr->val.a);
- M_ALD(argintregs[1], REG_PV, a);
+ a = dseg_addaddress(cd, iptr->val.a);
+ M_ALD(rd->argintregs[1], REG_PV, a);
/* a2 = pointer to dimensions = stack pointer */
- M_INTMOVE(REG_SP, argintregs[2]);
+ M_INTMOVE(REG_SP, rd->argintregs[2]);
- a = dseg_addaddress((void*) (builtin_nmultianewarray));
+ a = dseg_addaddress(cd, (void*) builtin_nmultianewarray);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- s1 = (int)((u1*) mcodeptr - mcodebase);
+ s1 = (int)((u1*) mcodeptr - cd->mcodebase);
if (s1 <= 32768)
M_LDA (REG_PV, REG_RA, -s1);
else {
panic("To big");
- }
- s1 = reg_of_var(iptr->dst, REG_RESULT);
+ }
+ s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
store_reg_to_var_int(iptr->dst, s1);
break;
-
- default: sprintf (logtext, "Unknown pseudo command: %d", iptr->opc);
- error();
-
-
-
+ default:
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown ICMD %d", iptr->opc);
} /* switch */
} /* for instruction */
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
var_to_reg_flt(s1, src, REG_FTMP1);
- if (!(interfaces[len][s2].flags & INMEMORY)) {
- M_TFLTMOVE(s2,s1,interfaces[len][s2].regoff);
- }
- else {
- M_DST(s1, REG_SP, 8 * interfaces[len][s2].regoff);
- }
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ M_TFLTMOVE(s2, s1, rd->interfaces[len][s2].regoff);
+
+ } else {
+ M_DST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
- else {
+
+ } else {
var_to_reg_int(s1, src, REG_ITMP1);
- if (!(interfaces[len][s2].flags & INMEMORY)) {
- M_INTMOVE(s1,interfaces[len][s2].regoff);
- }
- else {
- M_LST(s1, REG_SP, 8 * interfaces[len][s2].regoff);
- }
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
+
+ } else {
+ M_LST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
}
- src = src->prev;
}
+ src = src->prev;
+ }
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- /* bptr -> mpc = (int)((u1*) mcodeptr - mcodebase); */
-
{
/* generate bound check stubs */
- s4 *xcodeptr = NULL;
-
- for (; xboundrefs != NULL; xboundrefs = xboundrefs->next) {
- if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos,
- xboundrefs->branchpos, (u1*) xcodeptr - (u1*) mcodebase - 4);
- continue;
- }
+ s4 *xcodeptr = NULL;
+ branchref *bref;
+ for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
- gen_resolvebranch((u1*) mcodebase + xboundrefs->branchpos,
- xboundrefs->branchpos, (u1*) mcodeptr - mcodebase);
+ MCODECHECK(14);
- MCODECHECK(8);
-
- M_LDA(REG_ITMP2_XPC, REG_PV, xboundrefs->branchpos - 4);
+ M_MOV(bref->reg, REG_ITMP1);
+ M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
if (xcodeptr != NULL) {
- int disp = xcodeptr-mcodeptr;
- M_BR(disp-1);
+ M_BR(xcodeptr - mcodeptr);
M_NOP;
- }
- else {
+
+ } else {
xcodeptr = mcodeptr;
- a = dseg_addaddress(asm_handle_exception);
+ M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
+ M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ M_MOV(REG_ITMP1, rd->argintregs[0]);
+ a = dseg_addaddress(cd, new_arrayindexoutofboundsexception);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+ M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
- a = dseg_addaddress(proto_java_lang_ArrayIndexOutOfBoundsException);
- M_ALD(REG_ITMP1_XPTR, REG_PV, a);
- }
+ M_NOP;
}
+ }
/* generate negative array size check stubs */
xcodeptr = NULL;
- for (; xcheckarefs != NULL; xcheckarefs = xcheckarefs->next) {
- if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1*) mcodebase + xcheckarefs->branchpos,
- xcheckarefs->branchpos, (u1*) xcodeptr - (u1*) mcodebase - 4);
+ for (bref = cd->xcheckarefs; bref != NULL; bref = bref->next) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) xcodeptr - cd->mcodebase - 4);
continue;
- }
+ }
- gen_resolvebranch((u1*) mcodebase + xcheckarefs->branchpos,
- xcheckarefs->branchpos, (u1*) mcodeptr - mcodebase);
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
- M_LDA(REG_ITMP2_XPC, REG_PV, xcheckarefs->branchpos - 4);
+ M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
if (xcodeptr != NULL) {
- int disp = xcodeptr-mcodeptr;
- M_BR(disp-1);
+ M_BR(xcodeptr - mcodeptr);
M_NOP;
- }
- else {
+
+ } else {
xcodeptr = mcodeptr;
- a = dseg_addaddress(asm_handle_exception);
+ M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
+ M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ a = dseg_addaddress(cd, new_negativearraysizeexception);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+ M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
- a = dseg_addaddress(proto_java_lang_NegativeArraySizeException);
- M_ALD(REG_ITMP1_XPTR, REG_PV, a);
- }
+ M_NOP;
}
+ }
/* generate cast check stubs */
xcodeptr = NULL;
- for (; xcastrefs != NULL; xcastrefs = xcastrefs->next) {
- if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1*) mcodebase + xcastrefs->branchpos,
- xcastrefs->branchpos, (u1*) xcodeptr - (u1*) mcodebase - 4);
+ for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) xcodeptr - cd->mcodebase - 4);
continue;
- }
+ }
- gen_resolvebranch((u1*) mcodebase + xcastrefs->branchpos,
- xcastrefs->branchpos, (u1*) mcodeptr - mcodebase);
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
- M_LDA(REG_ITMP2_XPC, REG_PV, xcastrefs->branchpos - 4);
+ M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
if (xcodeptr != NULL) {
- int disp = xcodeptr-mcodeptr;
- M_BR(disp-1);
+ M_BR(xcodeptr - mcodeptr);
M_NOP;
- }
- else {
+
+ } else {
xcodeptr = mcodeptr;
- a = dseg_addaddress(asm_handle_exception);
+ M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
+ M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ a = dseg_addaddress(cd, new_classcastexception);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+ M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
- a = dseg_addaddress(proto_java_lang_ClassCastException);
- M_ALD(REG_ITMP1_XPTR, REG_PV, a);
- }
+ M_NOP;
}
+ }
+ /* generate exception check stubs */
+
+ xcodeptr = NULL;
+
+ for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) xcodeptr - cd->mcodebase - 4);
+ continue;
+ }
-#ifdef SOFTNULLPTRCHECK
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
+
+ MCODECHECK(13);
+
+ M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
+
+ if (xcodeptr != NULL) {
+ M_BR(xcodeptr - mcodeptr);
+ M_NOP;
+
+ } else {
+ xcodeptr = mcodeptr;
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
+ M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ a = dseg_addaddress(cd, builtin_get_exceptionptrptr);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+
+ /* get the exceptionptr from the ptrprt and clear it */
+ M_ALD(REG_ITMP1_XPTR, REG_RESULT, 0);
+ M_AST(REG_ZERO, REG_RESULT, 0);
+
+ M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+#else
+ a = dseg_addaddress(cd, &_exceptionptr);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_ALD(REG_ITMP1_XPTR, REG_ITMP3, 0);
+ M_AST(REG_ZERO, REG_ITMP3, 0);
+#endif
+
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
/* generate null pointer check stubs */
xcodeptr = NULL;
- for (; xnullrefs != NULL; xnullrefs = xnullrefs->next) {
- if ((exceptiontablelength == 0) && (xcodeptr != NULL)) {
- gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos,
- xnullrefs->branchpos, (u1*) xcodeptr - (u1*) mcodebase - 4);
+ for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) xcodeptr - cd->mcodebase - 4);
continue;
- }
+ }
- gen_resolvebranch((u1*) mcodebase + xnullrefs->branchpos,
- xnullrefs->branchpos, (u1*) mcodeptr - mcodebase);
+ gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
+ bref->branchpos,
+ (u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
- M_LDA(REG_ITMP2_XPC, REG_PV, xnullrefs->branchpos - 4);
+ M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
if (xcodeptr != NULL) {
- int disp = xcodeptr-mcodeptr;
- M_BR(disp-1);
+ M_BR(xcodeptr - mcodeptr);
M_NOP;
- }
- else {
+
+ } else {
xcodeptr = mcodeptr;
- a = dseg_addaddress(asm_handle_exception);
+ M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
+ M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
+
+ a = dseg_addaddress(cd, new_nullpointerexception);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+ M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
+ M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
- a = dseg_addaddress(proto_java_lang_NullPointerException);
- M_ALD(REG_ITMP1_XPTR, REG_PV, a);
- }
+ M_NOP;
}
-
-#endif
}
- codegen_finish((int)((u1*) mcodeptr - mcodebase));
- docacheflush((void*) method->entrypoint,
- ((u1*) mcodeptr - mcodebase));
-}
+ /* generate put/getstatic stub call code */
+ {
+ clinitref *cref;
+ u8 mcode;
+ s4 *tmpmcodeptr;
-/* redefinition of code generation macros (compiling into array) **************/
+ for (cref = cd->clinitrefs; cref != NULL; cref = cref->next) {
+ /* Get machine code which is patched back in later. The call is */
+ /* 2 instruction words long. */
+ xcodeptr = (s4 *) (cd->mcodebase + cref->branchpos);
-/*
-These macros are newly defined to allow code generation into an array.
-This is necessary, because the original M_.. macros generate code by
-calling 'codegen_adds4' that uses an additional data structure to
-receive the code.
+ /* We need to split this, because an unaligned 8 byte read causes */
+ /* a SIGSEGV. */
+ mcode = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
-For a faster (but less flexible) version to generate code, these
-macros directly use the (s4* p) - pointer to put the code directly
-in a locally defined array.
-This makes sense only for the stub-generation-routines below.
-*/
+ /* patch in the call to call the following code (done at compile */
+ /* time) */
-#undef M_ITYPE
-#define M_ITYPE(op, rs, rt, imm)\
- *(p++) = (((op)<<26)|((rs)<<21)|((rt)<<16)|((imm)&0xffff))
+ tmpmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = xcodeptr; /* set mcodeptr to patch position */
-#undef M_JTYPE
-#define M_JTYPE(op, imm)\
- *(p++) = (((op)<<26)|((off)&0x3ffffff))
+ M_BRS(tmpmcodeptr - (xcodeptr + 1));
+ M_NOP;
+
+ mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
-#undef M_RTYPE
-#define M_RTYPE(op, rs, rt, rd, sa, fu)\
- *(p++) = (((op)<<26)|((rs)<<21)|((rt)<<16)|((rd)<<11)|((sa)<<6)|(fu))
+ MCODECHECK(5);
+
+ /* move class pointer into REG_ITMP1 */
+ a = dseg_addaddress(cd, cref->class);
+ M_ALD(REG_ITMP1, REG_PV, a);
+
+ /* move machine code into REG_ITMP2 */
+ a = dseg_adds8(cd, mcode);
+ M_LLD(REG_ITMP2, REG_PV, a);
+
+ a = dseg_addaddress(cd, asm_check_clinit);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
+ }
+
+ codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+
+ docacheflush((void*) m->entrypoint, ((u1*) mcodeptr - cd->mcodebase));
+}
/* function createcompilerstub *************************************************
*******************************************************************************/
-#define COMPSTUBSIZE 4
+#define COMPSTUB_SIZE 4
-u1 *createcompilerstub (methodinfo *m)
+u1 *createcompilerstub(methodinfo *m)
{
- u8 *s = CNEW(u8, COMPSTUBSIZE); /* memory to hold the stub */
- s4 *p = (s4*) s; /* code generation pointer */
+ u8 *s = CNEW(u8, COMPSTUB_SIZE); /* memory to hold the stub */
+ s4 *mcodeptr = (s4 *) s; /* code generation pointer */
/* code for the stub */
M_ALD(REG_PV, REG_PV, 24); /* load pointer to the compiler */
in itmp1 is used as method pointer */
M_NOP;
- s[2] = (u8) m; /* literals to be adressed */
+ s[2] = (u8) m; /* literals to be adressed */
s[3] = (u8) asm_call_jit_compiler; /* jump directly via PV from above */
- (void) docacheflush((void*) s, (char*) p - (char*) s);
+ (void) docacheflush((void*) s, (char*) mcodeptr - (char*) s);
-#ifdef STATISTICS
- count_cstub_len += COMPSTUBSIZE * 8;
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_cstub_len += COMPSTUB_SIZE * 8;
#endif
- return (u1*) s;
+ return (u1 *) s;
}
*******************************************************************************/
-void removecompilerstub (u1 *stub)
+void removecompilerstub(u1 *stub)
{
- CFREE(stub, COMPSTUBSIZE * 8);
+ CFREE(stub, COMPSTUB_SIZE * 8);
}
+
/* function: createnativestub **************************************************
creates a stub routine which calls a native method
*******************************************************************************/
-#define NATIVESTUBSIZE 20
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#define NATIVESTUB_STACK 2
+#define NATIVESTUB_THREAD_EXTRA 5
+#else
+#define NATIVESTUB_STACK 1
+#define NATIVESTUB_THREAD_EXTRA 1
+#endif
+
+#define NATIVESTUB_SIZE (54 + 4 + NATIVESTUB_THREAD_EXTRA - 1)
+#define NATIVESTUB_STATIC_SIZE 5
+#define NATIVESTUB_VERBOSE_SIZE (50 + 17)
+#define NATIVESTUB_OFFSET 10
-u1 *createnativestub (functionptr f, methodinfo *m)
+
+u1 *createnativestub(functionptr f, methodinfo *m)
{
- u8 *s = CNEW(u8, NATIVESTUBSIZE); /* memory to hold the stub */
- s4 *p = (s4*) s; /* code generation pointer */
+ u8 *s; /* memory to hold the stub */
+ u8 *cs;
+ s4 *mcodeptr; /* code generation pointer */
+ s4 stackframesize = 0; /* size of stackframe if needed */
+ s4 disp;
+ s4 stubsize;
+ codegendata *cd;
+ registerdata *rd;
+ t_inlining_globals *id;
+ s4 dumpsize;
+
+ /* mark start of dump memory area */
+
+ dumpsize = dump_size();
+
+ /* setup registers before using it */
+
+ cd = DNEW(codegendata);
+ rd = DNEW(registerdata);
+ id = DNEW(t_inlining_globals);
- reg_init(m);
+ inlining_setup(m, id);
+ reg_setup(m, rd, id);
- M_MOV (argintregs[4], argintregs[5]);
- M_DMFC1 (REG_ITMP1, argfltregs[4]);
+ descriptor2types(m); /* set paramcount and paramtypes */
- M_MOV (argintregs[3], argintregs[4]);
- M_DMTC1 (REG_ITMP1, argfltregs[5]);
+ stubsize = NATIVESTUB_SIZE; /* calculate nativestub size */
- M_MOV (argintregs[2], argintregs[3]);
- M_DMFC1 (REG_ITMP1, argfltregs[3]);
+ if ((m->flags & ACC_STATIC) && !m->class->initialized)
+ stubsize += NATIVESTUB_STATIC_SIZE;
- M_MOV (argintregs[1], argintregs[2]);
- M_DMTC1 (REG_ITMP1, argfltregs[4]);
+ if (runverbose)
+ stubsize += NATIVESTUB_VERBOSE_SIZE;
- M_MOV (argintregs[0], argintregs[1]);
- M_DMFC1 (REG_ITMP1, argfltregs[2]);
+ s = CNEW(u8, stubsize); /* memory to hold the stub */
+ cs = s + NATIVESTUB_OFFSET;
+ mcodeptr = (s4 *) (cs); /* code generation pointer */
- M_ALD (argintregs[0], REG_PV, 19*8); /* load adress of jni_environement */
- M_DMTC1 (REG_ITMP1, argfltregs[3]);
+ /* set some required varibles which are normally set by codegen_setup */
+ cd->mcodebase = (u1 *) mcodeptr;
+ cd->clinitrefs = NULL;
- M_DMFC1 (REG_ITMP1, argfltregs[1]);
- M_DMFC1 (REG_ITMP2, argfltregs[0]);
+ *(cs-1) = (u8) f; /* address of native method */
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ *(cs-2) = (u8) &builtin_get_exceptionptrptr;
+#else
+ *(cs-2) = (u8) (&_exceptionptr); /* address of exceptionptr */
+#endif
+ *(cs-3) = (u8) asm_handle_nat_exception;/* addr of asm exception handler */
+ *(cs-4) = (u8) (&env); /* addr of jni_environement */
+ *(cs-5) = (u8) builtin_trace_args;
+ *(cs-6) = (u8) m;
+ *(cs-7) = (u8) builtin_displaymethodstop;
+ *(cs-8) = (u8) m->class;
+ *(cs-9) = (u8) asm_check_clinit;
+ *(cs-10) = (u8) NULL; /* filled with machine code */
+
+ M_LDA(REG_SP, REG_SP, -NATIVESTUB_STACK * 8); /* build up stackframe */
+ M_LST(REG_RA, REG_SP, 0); /* store return address */
+
+ /* if function is static, check for initialized */
+
+ if (m->flags & ACC_STATIC && !m->class->initialized) {
+ codegen_addclinitref(cd, mcodeptr, m->class);
+ }
- M_DMTC1 (REG_ITMP1, argfltregs[2]);
- M_DMTC1 (REG_ITMP2, argfltregs[1]);
+ /* max. 50 instructions */
+ if (runverbose) {
+ s4 p;
+ s4 t;
- M_ALD (REG_ITMP3, REG_PV, 16*8); /* load adress of native method */
- M_LDA (REG_SP, REG_SP, -8); /* build up stackframe */
+ M_LDA(REG_SP, REG_SP, -(18 * 8));
+ M_AST(REG_RA, REG_SP, 1 * 8);
- M_LST (REG_RA, REG_SP, 0); /* store return address */
- M_JSR (REG_RA, REG_ITMP3); /* call native method */
+ /* save integer argument registers */
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
+ M_LST(rd->argintregs[p], REG_SP, (2 + p) * 8);
+ }
- M_NOP; /* delay slot */
- M_ALD (REG_ITMP3, REG_PV, 17*8); /* get address of exceptionptr */
+ /* save and copy float arguments into integer registers */
+ for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
+ t = m->paramtypes[p];
- M_LLD (REG_RA, REG_SP, 0); /* load return address */
- M_ALD (REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
+ if (IS_FLT_DBL_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t)) {
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_LLD(rd->argintregs[p], REG_SP, (10 + p) * 8);
- M_BNEZ (REG_ITMP1, 2); /* if no exception then return */
- M_LDA (REG_SP, REG_SP, 8); /* remove stackframe, delay slot */
+ } else {
+ M_FST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_ILD(rd->argintregs[p], REG_SP, (10 + p) * 8);
+ }
- M_RET (REG_RA); /* return to caller */
- M_NOP; /* delay slot */
-
- M_AST (REG_ZERO, REG_ITMP3, 0); /* store NULL into exceptionptr */
- M_ALD (REG_ITMP3, REG_PV,18*8); /* load asm exception handler address */
+ } else {
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
+ }
- M_JMP (REG_ITMP3); /* jump to asm exception handler */
- M_LDA (REG_ITMP2, REG_RA, -4); /* move fault address into reg. itmp2 */
- /* delay slot */
+ M_ALD(REG_ITMP1, REG_PV, -6 * 8); /* method address */
+ M_AST(REG_ITMP1, REG_SP, 0);
+ M_ALD(REG_ITMP3, REG_PV, -5 * 8); /* builtin_trace_args */
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ disp = -(s4) (mcodeptr - (s4 *) cs) * 4;
+ M_LDA(REG_PV, REG_RA, disp);
- s[16] = (u8) f; /* address of native method */
- s[17] = (u8) (&exceptionptr); /* address of exceptionptr */
- s[18]= (u8) (asm_handle_nat_exception); /* addr of asm exception handler */
- s[19] = (u8) (&env); /* addr of jni_environement */
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
+ M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
+ }
- (void) docacheflush((void*) s, (char*) p - (char*) s);
+ for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
+ t = m->paramtypes[p];
-#ifdef STATISTICS
- count_nstub_len += NATIVESTUBSIZE * 8;
-#endif
+ if (IS_FLT_DBL_TYPE(t)) {
+ if (IS_2_WORD_TYPE(t)) {
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
- return (u1*) s;
-}
+ } else {
+ M_FLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
-/* function: removenativestub **************************************************
+ } else {
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ }
+ }
- removes a previously created native-stub from memory
-
-*******************************************************************************/
+ M_ALD(REG_RA, REG_SP, 1 * 8);
+ M_LDA(REG_SP, REG_SP, 18 * 8);
+ }
-void removenativestub (u1 *stub)
-{
- CFREE(stub, NATIVESTUBSIZE * 8);
-}
+ /* save argument registers on stack -- if we have to */
+ if ((m->flags & ACC_STATIC && m->paramcount > (INT_ARG_CNT - 2)) || m->paramcount > (INT_ARG_CNT - 1)) {
+ s4 i;
+ s4 paramshiftcnt = (m->flags & ACC_STATIC) ? 2 : 1;
+ s4 stackparamcnt = (m->paramcount > INT_ARG_CNT) ? m->paramcount - INT_ARG_CNT : 0;
+ stackframesize = stackparamcnt + paramshiftcnt;
-/* function: createcalljava ****************************************************
+ M_LDA(REG_SP, REG_SP, -stackframesize * 8);
- creates the asm_calljavamethod (MIPS assembler does not like data in the
- text segment). Documentation can be found in asmpart.c.
-
-*******************************************************************************/
+ /* copy stack arguments into new stack frame -- if any */
+ for (i = 0; i < stackparamcnt; i++) {
+ M_LLD(REG_ITMP1, REG_SP, (stackparamcnt + 1 + i) * 8);
+ M_LST(REG_ITMP1, REG_SP, (paramshiftcnt + i) * 8);
+ }
-#define REG_FSS0 20
-#define REG_FSS1 22
-#define REG_FSS2 25
-#define REG_FSS3 27
-#define REG_FSS4 29
-#define REG_FSS5 31
+ if (m->flags & ACC_STATIC) {
+ if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
+ M_DST(rd->argfltregs[5], REG_SP, 1 * 8);
+ } else {
+ M_LST(rd->argintregs[5], REG_SP, 1 * 8);
+ }
-#define CALL_JAVA_MEM_SIZE 60
-#define CALL_JAVA_ENTRY 20
-#define CALL_JAVA_XHANDLER 55
+ if (IS_FLT_DBL_TYPE(m->paramtypes[4])) {
+ M_DST(rd->argfltregs[4], REG_SP, 0 * 8);
+ } else {
+ M_LST(rd->argintregs[4], REG_SP, 0 * 8);
+ }
-static s4 calljavamem[CALL_JAVA_MEM_SIZE];
+ } else {
+ if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
+ M_DST(rd->argfltregs[5], REG_SP, 0 * 8);
+ } else {
+ M_LST(rd->argintregs[5], REG_SP, 0 * 8);
+ }
+ }
+ }
-void createcalljava ()
-{
- s4 *p;
-
- *((void**)(calljavamem + 0)) = (void*) asm_call_jit_compiler;
- *((void**)(calljavamem + 2)) = (void*) builtin_throw_exception;
-#if POINTERSIZE==8
- *((void**)(calljavamem + 4)) = NULL;
- *((void**)(calljavamem + 6)) = (void*) (calljavamem + CALL_JAVA_XHANDLER);
- *((void**)(calljavamem + 8)) = (void*) (calljavamem + CALL_JAVA_XHANDLER);
- *((void**)(calljavamem +10)) = (void*) (calljavamem + CALL_JAVA_ENTRY);
-#else
- *((void**)(calljavamem + 8)) = NULL;
- *((void**)(calljavamem + 9)) = (void*) (calljavamem + CALL_JAVA_XHANDLER);
- *((void**)(calljavamem +10)) = (void*) (calljavamem + CALL_JAVA_XHANDLER);
- *((void**)(calljavamem +11)) = (void*) (calljavamem + CALL_JAVA_ENTRY);
-#endif
-
- calljavamem[12] = 1; /* extable size */
- calljavamem[13] = 0; /* fltsave */
- calljavamem[14] = 0; /* intsave */
- calljavamem[15] = 0; /* isleaf */
- calljavamem[16] = 0; /* IsSync */
- calljavamem[17] = 80; /* frame size */
- calljavamem[18] = 0; /* method pointer (NULL) */
- calljavamem[19] = 0; /* method pointer (NULL) */
-
- p = calljavamem + CALL_JAVA_ENTRY; /* code generation pointer */
-
-/* 20 */
- M_LDA (REG_SP, REG_SP, -10*8); /* allocate stackframe */
- M_LST (REG_RA, REG_SP, 0); /* save return address */
-
- M_BRS(1); /* compute current program counter */
- M_LST (REG_PV, REG_SP, 3*8); /* save procedure vector */
-/* 24 */
- M_LDA (REG_PV, REG_RA, -4*4); /* compute procedure vector */
- M_DST (REG_FSS0, REG_SP, 4*8); /* save non JavaABI saved flt regs */
-
- M_DST (REG_FSS1, REG_SP, 5*8);
- M_DST (REG_FSS2, REG_SP, 6*8);
-/* 28 */
- M_DST (REG_FSS3, REG_SP, 7*8);
- M_DST (REG_FSS4, REG_SP, 8*8);
-
- M_DST (REG_FSS5, REG_SP, 9*8);
- M_LST (REG_ARG_0, REG_SP, 2*8); /* save method pointer for compiler */
-/* 32 */
- M_LDA (REG_ITMP1, REG_SP, 2*8); /* pass pointer to methodptr via itmp1*/
- M_MOV (REG_ARG_1, REG_ARG_0); /* pass the remaining parameters */
-
- M_MOV (REG_ARG_2, REG_ARG_1);
- M_MOV (REG_ARG_3, REG_ARG_2);
-/* 36 */
- M_MOV (REG_ARG_4, REG_ARG_3);
- M_ALD (REG_METHODPTR, REG_PV, -80); /* address of asm_call_jit_compiler */
-
- M_AST (REG_METHODPTR, REG_SP, 8); /* store function address */
- M_MOV (REG_SP, REG_METHODPTR); /* set method pointer */
-/* 40 */
- M_ALD (REG_PV, REG_METHODPTR, 8); /* method call as in Java */
- M_JSR (REG_RA, REG_PV); /* call JIT compiler */
+ if (m->flags & ACC_STATIC) {
+ M_MOV(rd->argintregs[5], rd->argintregs[7]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[5]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[7]);
+
+ M_MOV(rd->argintregs[4], rd->argintregs[6]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[6]);
+
+ M_MOV(rd->argintregs[3], rd->argintregs[5]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[3]);
+
+ M_MOV(rd->argintregs[2], rd->argintregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[5]);
+
+ M_MOV(rd->argintregs[1], rd->argintregs[3]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[2]);
+
+ M_MOV(rd->argintregs[0], rd->argintregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[4]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[1]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[0]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+
+ M_ALD(rd->argintregs[1], REG_PV, -8 * 8);
+
+ } else {
+ M_MOV(rd->argintregs[6], rd->argintregs[7]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[6]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[7]);
+
+ M_MOV(rd->argintregs[5], rd->argintregs[6]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[5]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[6]);
+
+ M_MOV(rd->argintregs[4], rd->argintregs[5]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[4]);
+
+ M_MOV(rd->argintregs[3], rd->argintregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[5]);
+
+ M_MOV(rd->argintregs[2], rd->argintregs[3]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[3]);
+
+ M_MOV(rd->argintregs[1], rd->argintregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[4]);
+
+ M_MOV(rd->argintregs[0], rd->argintregs[1]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[2]);
+
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
+
+ M_DMFC1(REG_ITMP1, rd->argfltregs[1]);
+ M_DMFC1(REG_ITMP2, rd->argfltregs[0]);
+
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+ M_DMTC1(REG_ITMP2, rd->argfltregs[1]);
+ }
+
+ M_ALD(rd->argintregs[0], REG_PV, -4 * 8); /* jni environement */
+ M_ALD(REG_ITMP3, REG_PV, -1 * 8); /* load adress of native method */
+ M_JSR(REG_RA, REG_ITMP3); /* call native method */
M_NOP; /* delay slot */
- M_LDA (REG_PV, REG_RA, -23*4); /* recompute procedure vector */
-/* 44 */
-#if 0
- M_CLR (REG_RESULT); /* clear return value (exception ptr) */
+ /* remove stackframe if there is one */
+ if (stackframesize) {
+ M_LDA(REG_SP, REG_SP, stackframesize * 8);
+ }
+
+ /* 17 instructions */
+ if (runverbose) {
+ M_LDA(REG_SP, REG_SP, -(3 * 8));
+ M_AST(REG_RA, REG_SP, 0 * 8);
+ M_LST(REG_RESULT, REG_SP, 1 * 8);
+ M_DST(REG_FRESULT, REG_SP, 2 * 8);
+ M_ALD(rd->argintregs[0], REG_PV, -6 * 8);
+ M_MOV(REG_RESULT, rd->argintregs[1]);
+ M_DMFC1(REG_ITMP1, REG_FRESULT);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
+ M_ALD(REG_ITMP3, REG_PV, -7 * 8);/* builtin_displaymethodstop */
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ disp = -(s4) (mcodeptr - (s4 *) cs) * 4;
+ M_LDA(REG_PV, REG_RA, disp);
+ M_ALD(REG_RA, REG_SP, 0 * 8);
+ M_LLD(REG_RESULT, REG_SP, 1 * 8);
+ M_DLD(REG_FRESULT, REG_SP, 2 * 8);
+ M_LDA(REG_SP, REG_SP, 3 * 8);
+ }
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ M_ALD(REG_ITMP3, REG_PV, -2 * 8); /* builtin_get_exceptionptrptr */
+ M_JSR(REG_RA, REG_ITMP3);
+
+ /* delay slot */
+ if (IS_FLT_DBL_TYPE(m->returntype)) {
+ M_DST(REG_FRESULT, REG_SP, 1 * 8);
+
+ } else {
+ M_AST(REG_RESULT, REG_SP, 1 * 8);
+ }
+
+ M_MOV(REG_RESULT, REG_ITMP3);
+
+ if (IS_FLT_DBL_TYPE(m->returntype)) {
+ M_DLD(REG_FRESULT, REG_SP, 1 * 8);
+
+ } else {
+ M_ALD(REG_RESULT, REG_SP, 1 * 8);
+ }
#else
- M_NOP;
+ M_ALD(REG_ITMP3, REG_PV, -2 * 8); /* get address of exceptionptr */
#endif
-/* calljava_return: */
- M_LLD (REG_RA, REG_SP, 0); /* restore return address */
- M_LLD (REG_PV, REG_SP, 3*8); /* restore procedure vector */
- M_DLD (REG_FSS0, REG_SP, 4*8); /* restore non JavaABI saved flt regs */
-/* 48 */
- M_DLD (REG_FSS1, REG_SP, 5*8);
- M_DLD (REG_FSS2, REG_SP, 6*8);
+ M_LLD(REG_RA, REG_SP, 0); /* load return address */
+ M_ALD(REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
- M_DLD (REG_FSS3, REG_SP, 7*8);
- M_DLD (REG_FSS4, REG_SP, 8*8);
-/* 52 */
- M_DLD (REG_FSS5, REG_SP, 9*8);
- M_RET(REG_RA); /* return */
+ M_BNEZ(REG_ITMP1, 2); /* if no exception then return */
+ M_LDA(REG_SP, REG_SP, NATIVESTUB_STACK * 8);/*remove stackframe, delay slot*/
- M_LDA (REG_SP, REG_SP, 10*8); /* deallocate stackframe (delay slot) */
+ M_RET(REG_RA); /* return to caller */
+ M_NOP; /* delay slot */
+
+ M_AST(REG_ZERO, REG_ITMP3, 0); /* store NULL into exceptionptr */
+ M_ALD(REG_ITMP3, REG_PV, -3 * 8); /* load asm exception handler address */
-/* 55 */
-/* calljava_xhandler: */
+ M_JMP(REG_ITMP3); /* jump to asm exception handler */
+ M_LDA(REG_ITMP2, REG_RA, -4); /* move fault address into reg. itmp2 */
+ /* delay slot */
- M_ALD (REG_ITMP3, REG_PV, -72); /* address of builtin_throw_exception */
+ /* generate static stub call code */
- M_JSR (REG_RA, REG_ITMP3); /* call builtin */
- M_MOV (REG_ITMP1, REG_ARG_0); /* pass parameter (delay slot) */
-/* 58 */
- M_BR(-14); /* branch calljava_return */
- M_NOP; /* delay slot */
+ {
+ s4 *xcodeptr;
+ clinitref *cref;
+ s4 *tmpmcodeptr;
- (void) docacheflush((void*)(calljavamem + CALL_JAVA_ENTRY),
- (CALL_JAVA_MEM_SIZE - CALL_JAVA_ENTRY) * (int) sizeof(s4));
-}
+ /* there can only be one clinit ref entry */
+ cref = cd->clinitrefs;
+ if (cref) {
+ /* Get machine code which is patched back in later. The call is */
+ /* 2 instruction words long. */
+ xcodeptr = (s4 *) (cd->mcodebase + cref->branchpos);
-typedef java_objectheader* (*asm_fptr)(methodinfo*, void*, void*, void*, void*);
+ /* We need to split this, because an unaligned 8 byte read causes */
+ /* a SIGSEGV. */
+ *(cs-10) = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
+ /* patch in the call to call the following code (done at compile */
+ /* time) */
-java_objectheader *asm_calljavamethod (methodinfo *m, void *arg1, void *arg2,
- void *arg3, void *arg4)
-{
- java_objectheader *r = ((asm_fptr)(calljavamem + 20))(m, arg1, arg2, arg3, arg4);
- return (exceptionptr ? r : NULL);
+ tmpmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = xcodeptr; /* set mcodeptr to patch position */
+
+ M_BRS(tmpmcodeptr - (xcodeptr + 1));
+ M_NOP;
+
+ mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+
+ /* move class pointer into REG_ITMP1 */
+ M_ALD(REG_ITMP1, REG_PV, -8 * 8); /* class */
+
+ /* move machine code into REG_ITMP2 */
+ M_LLD(REG_ITMP2, REG_PV, -10 * 8); /* machine code */
+
+ M_ALD(REG_ITMP3, REG_PV, -9 * 8); /* asm_check_clinit */
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
+
+ (void) docacheflush((void*) cs, (char*) mcodeptr - (char*) cs);
+
+#if 0
+ dolog_plain("stubsize: %d (for %d params)\n",
+ (int) (mcodeptr - (s4*) s), m->paramcount);
+#endif
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_nstub_len += NATIVESTUB_SIZE * 8;
+#endif
+
+ /* release dump area */
+
+ dump_release(dumpsize);
+
+ return (u1 *) (s + NATIVESTUB_OFFSET);
}
-java_objectheader *asm_calljavafunction (methodinfo *m, void *arg1, void *arg2,
- void *arg3, void *arg4)
+/* function: removenativestub **************************************************
+
+ removes a previously created native-stub from memory
+
+*******************************************************************************/
+
+void removenativestub(u1 *stub)
{
- return ((asm_fptr)(calljavamem + 20))(m, arg1, arg2, arg3, arg4);
+ CFREE((u8 *) stub - NATIVESTUB_OFFSET, NATIVESTUB_SIZE * 8);
}
projects / cacao.git / blobdiff