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

fix optimization that avoids some space-safety work

Browse Source 
svn: r8608
This commit is contained in:
Matthew Flatt 2008-02-09 17:07:19 +00:00
parent 350903f027
commit 937e912728
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3589,8 +3589,8 @@ static Scheme_Object *sfs_one_branch(SFS_Info *info, int ip,
in this branch). */ in this branch). */
o = SCHEME_VEC_ELS(vec)[((1 - delta) * SFS_BRANCH_W) + 3]; o = SCHEME_VEC_ELS(vec)[((1 - delta) * SFS_BRANCH_W) + 3];
b_end = SCHEME_INT_VAL(o); b_end = SCHEME_INT_VAL(o);
if (((nt > ip) && (nt < b_end)) /* => non-tail call in branch */ if (((nt > (ip + 1)) && (nt < b_end)) /* => non-tail call in branch */
|| (ip < save_nt)) { /* => non-tail call after branches */ || ((ip + 1) < save_nt)) { /* => non-tail call after branches */
o = SCHEME_VEC_ELS(vec)[(1 - delta) * SFS_BRANCH_W]; o = SCHEME_VEC_ELS(vec)[(1 - delta) * SFS_BRANCH_W];
t_min_t = SCHEME_INT_VAL(o); t_min_t = SCHEME_INT_VAL(o);
if (t_min_t > -1) { if (t_min_t > -1) {

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

@ -4610,6 +4610,27 @@ static int generate_non_tail(Scheme_Object *obj, mz_jit_state *jitter, int multi
/* expression codegen */ /* expression codegen */
/*========================================================================*/ /*========================================================================*/
static int generate_ignored_non_tail(Scheme_Object *obj, mz_jit_state *jitter, int multi_ok, int need_ends)
{
Scheme_Type t = SCHEME_TYPE(obj);
if (SAME_TYPE(t, scheme_local_type)
|| SAME_TYPE(t, scheme_local_unbox_type)) {
/* Must be here to clear */
if (SCHEME_LOCAL_FLAGS(obj) & SCHEME_LOCAL_CLEAR_ON_READ) {
int pos;
START_JIT_DATA();
pos = mz_remap(SCHEME_LOCAL_POS(obj));
LOG_IT(("clear %d\n", pos));
jit_stxi_p(WORDS_TO_BYTES(pos), JIT_RUNSTACK, JIT_RUNSTACK);
END_JIT_DATA(2);
}
return 1;
}
return generate_non_tail(obj, jitter, multi_ok, need_ends);
}
static Scheme_Object *generate_k(void) static Scheme_Object *generate_k(void)
{ {
Scheme_Thread *p = scheme_current_thread; Scheme_Thread *p = scheme_current_thread;
@ -4780,7 +4801,7 @@ static int generate(Scheme_Object *obj, mz_jit_state *jitter, int is_tail, int m
mz_patch_branch(ref2); mz_patch_branch(ref2);
__END_SHORT_JUMPS__(1); __END_SHORT_JUMPS__(1);
for (i = 1; i < seq->count; i++) { for (i = 1; i < seq->count; i++) {
generate_non_tail(seq->array[i], jitter, 1, 1); generate_ignored_non_tail(seq->array[i], jitter, 1, 1);
CHECK_LIMIT(); CHECK_LIMIT();
} }
@ -5107,7 +5128,7 @@ static int generate(Scheme_Object *obj, mz_jit_state *jitter, int is_tail, int m
LOG_IT(("begin\n")); LOG_IT(("begin\n"));
for (i = 0; i < cnt - 1; i++) { for (i = 0; i < cnt - 1; i++) {
generate_non_tail(seq->array[i], jitter, 1, 1); generate_ignored_non_tail(seq->array[i], jitter, 1, 1);
CHECK_LIMIT(); CHECK_LIMIT();
} }