#include "vm/jit/asmpart.h"
#include "vm/jit/codegen-common.h"
+#include "vm/jit/patcher-common.h"
#include "vm/jit/dseg.h"
#include "vm/jit/emit-common.h"
#include "vm/jit/jit.h"
#include "vm/jit/abi.h"
#include "vm/jit/parse.h"
-#include "vm/jit/patcher.h"
#include "vm/jit/reg.h"
#include "vm/jit/replace.h"
#include "vm/jit/stacktrace.h"
codegendata *cd;
registerdata *rd;
s4 len, s1, s2, s3, d, disp;
- ptrint a;
varinfo *var;
basicblock *bptr;
instruction *iptr;
- exception_entry *ex;
u2 currentline;
methodinfo *lm; /* local methodinfo for ICMD_INVOKE* */
unresolved_method *um;
#if 0
#if defined(ENABLE_THREADS)
/* we need additional space to save argument of monitor_enter */
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
if (IS_2_WORD_TYPE(m->parseddesc->returntype.type)) {
cd->stackframesize += 2;
} else {
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
(void) dseg_add_unique_s4(cd, cd->stackframesize); /* FrameSize */
-#if defined(ENABLE_THREADS)
- 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);
/* XXX we use the IntSave a split field for the adr now */
(void) dseg_add_unique_s4(cd, (ADR_SAV_CNT - rd->savadrreguse) << 16 | (INT_SAV_CNT - rd->savintreguse)); /* IntSave */
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);
- }
-
#if defined(ENABLE_PROFILING)
assert(0);
#endif
#if defined(ENABLE_THREADS)
/* call lock_monitor_enter function */
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
if (m->flags & ACC_STATIC) {
M_AMOV_IMM((&m->class->object.header), REG_ATMP1);
} else {
/* arguments in place now */
switch(iptr->opc) {
- case ICMD_BUILTIN:
- disp = (ptrint) bte->fp;
+ case ICMD_BUILTIN:
+ if (bte->stub == NULL)
+ disp = (ptrint) bte->fp;
+ else
+ disp = (ptrint) bte->stub;
d = md->returntype.type;
M_JSR_IMM(disp);
REPLACEMENT_POINT_INVOKE_RETURN(cd, iptr);
- emit_exception_check(cd, iptr);
break;
case ICMD_INVOKESPECIAL:
#if defined(ENABLE_THREADS)
/* call lock_monitor_exit */
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ if (checksync && code_is_synchronized(code)) {
M_ILD(REG_ITMP3, REG_SP, rd->memuse * 8);
/* we need to save the proper return value */
/* restore return address */
#if 0
- if (!jd->isleafmethod) {
+ if (!code_is_leafmethod(code)) {
/* ATTENTION: Don't use REG_ZERO (r0) here, as M_ALD
may have a displacement overflow. */
dseg_createlinenumbertable(cd);
/* generate stubs */
- emit_patcher_stubs(jd);
+ emit_patcher_traps(jd);
return true;
}
M_AMOV_IMM(asm_call_jit_compiler, REG_ATMP3);
M_JMP(REG_ATMP3);
}
-
-/* codegen_emit_stub_builtin ***************************************************
-
- Creates a stub routine which calls a builtin function.
-
-*******************************************************************************/
-
-void codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte)
-{
- codeinfo *code;
- codegendata *cd;
- methoddesc *md;
- s4 i;
- s4 disp;
- s4 s1, s2;
-
- /* get required compiler data */
- code = jd->code;
- cd = jd->cd;
-
- /* set some variables */
- md = bte->md;
-
- /* calculate stack frame size */
- cd->stackframesize =
- sizeof(stackframeinfo) / SIZEOF_VOID_P +
- 4; /* 4 arguments or return value */
-
- /* create method header */
- (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
- (void) dseg_add_unique_s4(cd, cd->stackframesize * 4); /* 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 */
- M_AADD_IMM(-(cd->stackframesize*4), REG_SP);
-
-#if defined(ENABLE_GC_CACAO)
- /* Save callee saved integer registers in stackframeinfo (GC may
- need to recover them during a collection). */
-
- disp = cd->stackframesize * 4 - sizeof(stackframeinfo) +
- OFFSET(stackframeinfo, adrregs);
-
- for (i = 0; i < ADR_SAV_CNT; i++)
- M_AST(abi_registers_address_saved[i], REG_SP, disp + i * 4);
-#endif
-
- /* create dynamic stack info */
-
- M_AMOV(REG_SP, REG_ATMP1);
- M_AADD_IMM(cd->stackframesize * 4, REG_ATMP1);
- M_AST(REG_ATMP1, REG_SP, 0 * 4); /* datasp */
-
- M_AMOV_IMM(0, REG_ATMP1); /* we need pv patched in */
- dseg_adddata(cd); /* this does the trick */
- M_AST(REG_ATMP1, REG_SP, 1 * 4); /* pv */
-
- M_AMOV(REG_SP, REG_ATMP1);
- M_AADD_IMM(cd->stackframesize * 4 + SIZEOF_VOID_P, REG_ATMP1);
- M_AST(REG_ATMP1, REG_SP, 2 * 4); /* sp */
-
- M_ALD(REG_ATMP3, REG_SP, cd->stackframesize * 4);
- M_AST(REG_ATMP3, REG_SP, 3 * 4); /* ra */
-
- M_JSR_IMM(codegen_stub_builtin_enter);
-
- /* copy arguments into new stackframe */
-
- for (i = 0; i < md->paramcount; i++) {
- if (!md->params[i].inmemory) {
- log_text("No integer argument registers available!");
- assert(0);
-
- } else { /* float/double in memory can be copied like int/longs */
- s1 = md->params[i].regoff + cd->stackframesize * 4 + 4;
- s2 = md->params[i].regoff;
-
- M_ILD(REG_ITMP1, REG_SP, s1);
- M_IST(REG_ITMP1, REG_SP, s2);
- if (IS_2_WORD_TYPE(md->paramtypes[i].type)) {
- M_ILD(REG_ITMP1, REG_SP, s1 + 4);
- M_IST(REG_ITMP1, REG_SP, s2 + 4);
- }
-
- }
- }
-
- /* call the builtin function */
-
- M_AMOV_IMM(bte->fp, REG_ATMP3);
- M_JSR(REG_ATMP3);
-
- /* save return value */
- switch (md->returntype.type) {
- case TYPE_VOID: break;
-
- /* natives return float arguments in %d0, %d1, cacao expects them in %fp0 */
- case TYPE_DBL:
- case TYPE_LNG:
- M_IST(REG_D1, REG_SP, 2 * 4);
- /* fall through */
-
- case TYPE_FLT:
- case TYPE_INT:
- case TYPE_ADR:
- M_IST(REG_D0, REG_SP, 1 * 4);
- break;
-
- default: assert(0);
- }
-
- /* remove native stackframe info */
-
- M_AMOV(REG_SP, REG_ATMP1);
- M_AADD_IMM(cd->stackframesize * 4, REG_ATMP1);
- M_AST(REG_ATMP1, REG_SP, 0 * 4);
-
- M_JSR_IMM(codegen_stub_builtin_exit);
-
- /* restore return value */
- switch (md->returntype.type) {
- case TYPE_VOID: break;
-
- case TYPE_DBL:
- case TYPE_LNG:
- M_ILD(REG_D1, REG_SP, 2 * 4);
- /* fall through */
-
- case TYPE_FLT:
- case TYPE_INT:
- case TYPE_ADR:
- M_ILD(REG_D0, REG_SP, 1 * 4);
- break;
-
- default: assert(0);
- }
-
-#if defined(ENABLE_GC_CACAO)
- /* Restore callee saved integer registers from stackframeinfo (GC
- might have modified them during a collection). */
-
- disp = cd->stackframesize * 4 - sizeof(stackframeinfo) +
- OFFSET(stackframeinfo, adrregs);
-
- for (i = 0; i < ADR_SAV_CNT; i++)
- M_ALD(abi_registers_address_saved[i], REG_SP, disp + i * 4);
-#endif
-
- /* remove stackframe */
- M_AADD_IMM(cd->stackframesize * 4, REG_SP);
- M_RET;
-}
-
-
-
-
/* 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;
registerdata *rd;
methoddesc *md;
- s4 nativeparams, i, j, t, s1, s2;
+ s4 i, j, t, s1, s2;
/* get required compiler data */
rd = jd->rd;
md = m->parseddesc;
- nativeparams = (m->flags & ACC_STATIC) ? 2 : 1;
/* calc stackframe size */
- cd->stackframesize = sizeof(stackframeinfo) / SIZEOF_VOID_P +
- sizeof(localref_table) / SIZEOF_VOID_P +
- nmd->memuse +
- 1 + /* functionptr */
- 4; /* args for codegen_start_native_call */
+ cd->stackframesize =
+ sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
+ sizeof(localref_table) / SIZEOF_VOID_P +
+ nmd->memuse +
+ 1 + /* functionptr */
+ 4; /* args for codegen_start_native_call */
/* create method header */
(void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
M_ALD(REG_ATMP2, REG_SP, 4 * 4);
/* copy arguments into stackframe */
- 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->paramtypes[i].type;
/* all arguments via stack */
assert(md->params[i].inmemory);
M_JSR_IMM(0);
/* generate patcher stub call code */
- emit_patcher_stubs(jd);
+ emit_patcher_traps(jd);
}
projects / cacao.git / blobdiff