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

Ray's fix to mprotect logic

Browse Source 
svn: r2853
This commit is contained in:
Matthew Flatt 2006-05-03 03:15:27 +00:00
parent c8b3032775
commit 06f7b8603b
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mzscheme/src/env.c
View File

@ -2258,7 +2258,12 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
int issame; int issame;
if (frame->flags & SCHEME_CAPTURE_WITHOUT_RENAME) if (frame->flags & SCHEME_CAPTURE_WITHOUT_RENAME)
issame = scheme_stx_module_eq(find_id, COMPILE_DATA(frame)->const_names[i], phase); issame = scheme_stx_module_eq(find_id, COMPILE_DATA(frame)->const_names[i], phase);
else { else if (frame->flags & SCHEME_FOR_INTDEF) {
/* Comparing to uid is unreliable in case the bound
identifier has multiple renamings at the same level, so
use the general stx_bound_eq function: */
issame = scheme_stx_bound_eq(find_id, COMPILE_DATA(frame)->const_names[i], phase);
} else {
if (COMPILE_DATA(frame)->const_uids) uid = COMPILE_DATA(frame)->const_uids[i]; if (COMPILE_DATA(frame)->const_uids) uid = COMPILE_DATA(frame)->const_uids[i];
issame = (SAME_OBJ(SCHEME_STX_VAL(find_id), issame = (SAME_OBJ(SCHEME_STX_VAL(find_id),
SCHEME_STX_VAL(COMPILE_DATA(frame)->const_names[i])) SCHEME_STX_VAL(COMPILE_DATA(frame)->const_names[i]))
@ -3573,6 +3578,7 @@ local_get_shadower(int argc, Scheme_Object *argv[])
break; break;
for (i = COMPILE_DATA(frame)->num_const; i--; ) { for (i = COMPILE_DATA(frame)->num_const; i--; ) {
printf("here %s\n", SCHEME_SYM_VAL(SCHEME_STX_SYM(sym)));
if (!(frame->flags & SCHEME_CAPTURE_WITHOUT_RENAME)) { if (!(frame->flags & SCHEME_CAPTURE_WITHOUT_RENAME)) {
if (SAME_OBJ(SCHEME_STX_VAL(sym), if (SAME_OBJ(SCHEME_STX_VAL(sym),
SCHEME_STX_VAL(COMPILE_DATA(frame)->const_names[i]))) { SCHEME_STX_VAL(COMPILE_DATA(frame)->const_names[i]))) {
@ -3580,9 +3586,13 @@ local_get_shadower(int argc, Scheme_Object *argv[])
env_marks = scheme_stx_extract_marks(esym); env_marks = scheme_stx_extract_marks(esym);
if (scheme_equal(env_marks, sym_marks)) { if (scheme_equal(env_marks, sym_marks)) {
sym = esym; sym = esym;
if (COMPILE_DATA(frame)->const_uids) if (COMPILE_DATA(frame)->const_uids) {
if (frame->flags & SCHEME_FOR_INTDEF) {
return esym;
} else {
uid = COMPILE_DATA(frame)->const_uids[i]; uid = COMPILE_DATA(frame)->const_uids[i];
else }
} else
uid = frame->uid; uid = frame->uid;
break; break;
} }

3
src/mzscheme/src/lightning/i386/funcs.h
View File

@ -79,7 +79,8 @@ jit_flush_code(void *dest, void *end)
/* See if we can extend the previously mprotect'ed memory area towards /* See if we can extend the previously mprotect'ed memory area towards
lower addresses: the highest address remains the same as before. */ lower addresses: the highest address remains the same as before. */
else if (page < prev_page && page + length <= prev_page + prev_length) else if (page < prev_page && page + length >= prev_page
&& page + length <= prev_page + prev_length)
prev_length += prev_page - page, prev_page = page; prev_length += prev_page - page, prev_page = page;
/* Nothing to do, replace the area. */ /* Nothing to do, replace the area. */