#include "vm/jit/dseg.h"
#include "vm/jit/emit-common.h"
#include "vm/jit/jit.h"
-#include "vm/jit/md.h"
+#include "vm/jit/linenumbertable.h"
#include "vm/jit/patcher-common.h"
#include "vm/jit/reg.h"
#include "vm/jit/replace.h"
varinfo *var;
basicblock *bptr;
instruction *iptr;
- exception_entry *ex;
u2 currentline;
constant_classref *cr;
unresolved_class *uc;
s4 i, p, t, l;
s4 savedregs_num;
- savedregs_num = (jd->isleafmethod) ? 0 : 1; /* space to save the RA */
+ savedregs_num = code_is_leafmethod(code) ? 0 : 1; /* space to save the RA */
/* space to save used callee saved registers */
#if defined(ENABLE_THREADS)
/* space to save argument of monitor_enter */
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
# if SIZEOF_VOID_P == 8
cd->stackframesize++;
# else
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
(void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
-#if defined(ENABLE_THREADS)
- /* IsSync contains the offset relative to the stack pointer for the
- argument of monitor_exit used in the exception handler. Since the
- offset could be zero and give a wrong meaning of the flag it is
- offset by one.
- */
-
- if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 8); /* IsSync */
+ code->synchronizedoffset = rd->memuse * 8;
+
+ /* REMOVEME: We still need it for exception handling in assembler. */
+
+ if (code_is_leafmethod(code))
+ (void) dseg_add_unique_s4(cd, 1);
else
-#endif
- (void) dseg_add_unique_s4(cd, 0); /* IsSync */
-
- (void) dseg_add_unique_s4(cd, jd->isleafmethod); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, 0);
+
(void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
(void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
- dseg_addlinenumbertablesize(cd);
- (void) dseg_add_unique_s4(cd, jd->exceptiontablelength); /* ExTableSize */
-
- /* create exception table */
- for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
- dseg_add_target(cd, ex->start);
- dseg_add_target(cd, ex->end);
- dseg_add_target(cd, ex->handler);
- (void) dseg_add_unique_address(cd, ex->catchtype.any);
- }
-
/* create stack frame (if necessary) */
if (cd->stackframesize)
/* save return address and used callee saved registers */
p = cd->stackframesize;
- if (!jd->isleafmethod) {
+ if (!code_is_leafmethod(code)) {
p--; M_AST(REG_RA, REG_SP, p * 8);
}
for (i = INT_SAV_CNT - 1; i >= rd->savintreguse; i--) {
/* call monitorenter function */
#if defined(ENABLE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
/* stack offset for monitor argument */
s1 = rd->memuse;
for (iptr = bptr->iinstr; len > 0; len--, iptr++) {
if (iptr->line != currentline) {
- dseg_addlinenumber(cd, iptr->line);
+ linenumbertable_list_entry_add(cd, iptr->line);
currentline = iptr->line;
}
case ICMD_INLINE_BODY:
REPLACEMENT_POINT_INLINE_BODY(cd, iptr);
- dseg_addlinenumber_inline_start(cd, iptr);
- dseg_addlinenumber(cd, iptr->line);
+ linenumbertable_list_entry_add_inline_start(cd, iptr);
+ linenumbertable_list_entry_add(cd, iptr->line);
break;
case ICMD_INLINE_END:
- dseg_addlinenumber_inline_end(cd, iptr);
- dseg_addlinenumber(cd, iptr->line);
+ linenumbertable_list_entry_add_inline_end(cd, iptr);
+ linenumbertable_list_entry_add(cd, iptr->line);
break;
case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
#endif
#if defined(ENABLE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
M_ALD(REG_ITMP3, REG_PV, disp);
/* restore return address */
- if (!jd->isleafmethod) {
+ if (!code_is_leafmethod(code)) {
p--; M_ALD(REG_RA, REG_SP, p * 8);
}
switch (iptr->opc) {
case ICMD_BUILTIN:
- disp = dseg_add_functionptr(cd, bte->fp);
+ if (bte->stub == NULL) {
+ disp = dseg_add_functionptr(cd, bte->fp);
+ M_ALD(REG_ITMP3, REG_PV, disp); /* built-in-function pointer */
- M_ALD(REG_ITMP3, REG_PV, disp); /* built-in-function pointer */
+ /* generate the actual call */
- /* generate the actual call */
+ /* TWISTI: i actually don't know the reason for using
+ REG_ITMP3 here instead of REG_PV. */
- /* TWISTI: i actually don't know the reason for using
- REG_ITMP3 here instead of REG_PV. */
+ M_JSR(REG_RA, REG_ITMP3);
+ M_NOP;
+ }
+ else {
+ disp = dseg_add_functionptr(cd, bte->stub);
+ M_ALD(REG_PV, REG_PV, disp); /* method pointer in pv */
+
+ /* generate the actual call */
+
+ M_JSR(REG_RA, REG_PV);
+ M_NOP;
+ }
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, -disp);
-
- emit_exception_check(cd, iptr);
break;
case ICMD_INVOKESPECIAL:
} /* if (bptr -> flags >= BBREACHED) */
} /* for basic block */
- dseg_createlinenumbertable(cd);
-
/* generate traps */
emit_patcher_traps(jd);
}
-/* codegen_emit_stub_compiler **************************************************
-
- Emits a stub routine which calls the compiler.
-
-*******************************************************************************/
-
-void codegen_emit_stub_compiler(jitdata *jd)
-{
- methodinfo *m;
- codegendata *cd;
-
- /* get required compiler data */
-
- m = jd->m;
- cd = jd->cd;
-
- /* code for the stub */
-
- M_ALD_INTERN(REG_ITMP1, REG_PV, -2 * SIZEOF_VOID_P); /* codeinfo pointer */
- M_ALD_INTERN(REG_PV, REG_PV, -3 * SIZEOF_VOID_P); /* pointer to compiler */
- M_JMP(REG_PV);
- M_NOP;
-}
-
-
/* codegen_emit_stub_native ****************************************************
Emits a stub routine which calls a native method.
*******************************************************************************/
-void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
+void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int skipparams)
{
methodinfo *m;
codeinfo *code;
codegendata *cd;
methoddesc *md;
- s4 nativeparams;
s4 i, j;
s4 t;
- s4 s1, s2, disp;
- s4 funcdisp; /* displacement of the function */
+ int s1, s2;
+ int disp;
/* get required compiler data */
/* initialize variables */
md = m->parseddesc;
- nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
/* calculate stack frame size */
cd->stackframesize =
1 + /* return address */
- sizeof(stackframeinfo) / SIZEOF_VOID_P +
+ sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
sizeof(localref_table) / SIZEOF_VOID_P +
md->paramcount + /* for saving arguments over calls */
#if SIZEOF_VOID_P == 4
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
(void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
- (void) dseg_add_unique_s4(cd, 0); /* IsSync */
(void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
(void) dseg_add_unique_s4(cd, 0); /* IntSave */
(void) dseg_add_unique_s4(cd, 0); /* FltSave */
- (void) dseg_addlinenumbertablesize(cd);
- (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
/* generate stub code */
emit_verbosecall_enter(jd);
#endif
- /* get function address (this must happen before the stackframeinfo) */
-
- funcdisp = dseg_add_functionptr(cd, f);
-
- if (f == NULL)
- patcher_add_patch_ref(jd, PATCHER_resolve_native_function, m, funcdisp);
-
/* save integer and float argument registers */
#if SIZEOF_VOID_P == 8
/* copy or spill arguments to new locations */
- for (i = md->paramcount - 1, j = i + nativeparams; i >= 0; i--, j--) {
+ for (i = md->paramcount - 1, j = i + skipparams; i >= 0; i--, j--) {
t = md->params[i].type;
if (IS_INT_LNG_TYPE(t)) {
}
}
- /* put class into second argument register */
+ /* Handle native Java methods. */
- if (m->flags & ACC_STATIC)
- M_MOV(REG_ITMP3, REG_A1);
+ if (m->flags & ACC_NATIVE) {
+ /* put class into second argument register */
- /* put env into first argument register */
+ if (m->flags & ACC_STATIC)
+ M_MOV(REG_ITMP3, REG_A1);
- disp = dseg_add_address(cd, _Jv_env);
- M_ALD(REG_A0, REG_PV, disp);
+ /* put env into first argument register */
+
+ disp = dseg_add_address(cd, _Jv_env);
+ M_ALD(REG_A0, REG_PV, disp);
+ }
- /* do the native function call */
+ /* Call the native function. */
- M_ALD(REG_ITMP3, REG_PV, funcdisp); /* load adress of native method */
+ disp = dseg_add_functionptr(cd, f);
+ M_ALD(REG_ITMP3, REG_PV, disp); /* load adress of native method */
M_JSR(REG_RA, REG_ITMP3); /* call native method */
M_NOP; /* delay slot */
#else
case TYPE_INT:
case TYPE_ADR:
- M_IST(REG_RESULT, REG_SP, 1*4 + 0 * 8);
+ M_IST(REG_RESULT, REG_SP, 2*4 + 0 * 8);
break;
case TYPE_LNG:
- M_LST(REG_RESULT_PACKED, REG_SP, 1*4 + 0 * 8);
+ M_LST(REG_RESULT_PACKED, REG_SP, 2*4 + 0 * 8);
break;
case TYPE_FLT:
case TYPE_DBL:
- M_DST(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
+ M_DST(REG_FRESULT, REG_SP, 2*4 + 0 * 8);
break;
#endif
case TYPE_VOID:
#else
case TYPE_INT:
case TYPE_ADR:
- M_ILD(REG_RESULT, REG_SP, 1*4 + 0 * 8);
+ M_ILD(REG_RESULT, REG_SP, 2*4 + 0 * 8);
break;
case TYPE_LNG:
- M_LLD(REG_RESULT_PACKED, REG_SP, 1*4 + 0 * 8);
+ M_LLD(REG_RESULT_PACKED, REG_SP, 2*4 + 0 * 8);
break;
case TYPE_FLT:
case TYPE_DBL:
- M_DLD(REG_FRESULT, REG_SP, 1*4 + 0 * 8);
+ M_DLD(REG_FRESULT, REG_SP, 2*4 + 0 * 8);
break;
#endif
case TYPE_VOID: