suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix another safe-for-space problem related to closures tat become unreachable as they are applied

Browse Source 
svn: r15129
This commit is contained in:
Matthew Flatt 2009-06-10 03:34:55 +00:00
parent c132ff9944
commit 921399cf01
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mzscheme/src/eval.c
View File

@ -7660,7 +7660,7 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
{
Scheme_Type type;
Scheme_Object *v;
GC_CAN_IGNORE Scheme_Object *tmpv;
GC_CAN_IGNORE Scheme_Object *tmpv; /* safe-for-space relies on GC_CAN_IGNORE */
GC_MAYBE_IGNORE_INTERIOR Scheme_Object **old_runstack;
GC_MAYBE_IGNORE_INTERIOR MZ_MARK_STACK_TYPE old_cont_mark_stack;
#if USE_LOCAL_RUNSTACK
@ -8056,7 +8056,9 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
goto returnv;
}
v = data->code(obj, num_rands, rands);
tmpv = obj;
obj = NULL; /* save for space, since tmpv is ignored by the GC */
v = data->code(tmpv, num_rands, rands);
if (v == SCHEME_TAIL_CALL_WAITING) {
/* [TC-SFS]; see schnapp.inc */

28
src/mzscheme/src/jit.c
View File

@ -171,6 +171,7 @@ typedef struct {
int log_depth;
int self_pos, self_closure_size, self_toplevel_pos;
int self_to_closure_delta, closure_to_args_delta;
int closure_self_on_runstack;
int example_argc;
Scheme_Object **example_argv;
void *self_restart_code;
@ -2602,8 +2603,8 @@ static int generate_nontail_self_setup(mz_jit_state *jitter)
jitter->patch_depth = pd;
(void)jit_patchable_movi_p(JIT_R0, jitter->self_nontail_code);
#ifdef JIT_PRECISE_GC
/* Get this closure's pointer from the run stack */
{
if (jitter->closure_self_on_runstack) {
/* Get this closure's pointer from the run stack */
int depth = jitter->depth + jitter->extra_pushed - 1;
jit_ldxi_p(JIT_V1, JIT_RUNSTACK, WORDS_TO_BYTES(depth));
}
@ -2742,9 +2743,11 @@ static int generate_app(Scheme_App_Rec *app, Scheme_Object **alt_rands, int num_
}
#ifdef JIT_PRECISE_GC
/* We can get this closure's pointer back from the Scheme stack. */
if (nontail_self)
direct_self = 1;
if (jitter->closure_self_on_runstack) {
/* We can get this closure's pointer back from the Scheme stack. */
if (nontail_self)
direct_self = 1;
}
#endif
if (direct_self)
@ -7942,10 +7945,17 @@ static int do_generate_closure(mz_jit_state *jitter, void *_data)
}
#ifdef JIT_PRECISE_GC
/* Keeping the native-closure pointer on the runstack
ensures that the code won't be GCed while we're running
it. */
mz_pushr_p(JIT_R0); /* no sync */
/* Keeping the native-closure code pointer on the runstack ensures
that the code won't be GCed while we're running it. If the
closure is empty, it's ok, faster, and useful to keep it,
otherwise keep just the code pointer for space safety. */
if (!data->closure_size) {
jitter->closure_self_on_runstack = 1;
mz_pushr_p(JIT_R0); /* no sync */
} else {
jit_ldxi_p(JIT_R1, JIT_R0, &((Scheme_Native_Closure *)0x0)->code);
mz_pushr_p(JIT_R1); /* no sync */
}
to_args = 0;
#else
to_args = 0;