mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

* eval.c (SCM_CEVAL:SCM_IM_DISPATCH): Bugfix: Jump back to

Browse source 
cdrxnoap and loopnoap instead of begin and loop.
This commit is contained in:
Mikael Djurfeldt 1999-08-04 22:55:08 +00:00
parent 9daf81240a
commit 04b6c08138
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/eval.c
View file

@ -1866,6 +1866,12 @@ SCM_CEVAL (x, env)
scm_debug_info *debug_info_end; scm_debug_info *debug_info_end;
debug.prev = scm_last_debug_frame; debug.prev = scm_last_debug_frame;
debug.status = scm_debug_eframe_size; debug.status = scm_debug_eframe_size;
/*
* The debug.vect contains twice as much scm_debug_info frames as the
* user has specified with (debug-set! frames <n>).
*
* Even frames are eval frames, odd frames are apply frames.
*/
debug.vect = (scm_debug_info *) alloca (scm_debug_eframe_size debug.vect = (scm_debug_info *) alloca (scm_debug_eframe_size
* sizeof (debug.vect[0])); * sizeof (debug.vect[0]));
debug.info = debug.vect; debug.info = debug.vect;
@ -1893,6 +1899,16 @@ loop:
SCM_CLEAR_ARGSREADY (debug); SCM_CLEAR_ARGSREADY (debug);
if (SCM_OVERFLOWP (debug)) if (SCM_OVERFLOWP (debug))
--debug.info; --debug.info;
/*
* In theory, this should be the only place where it is necessary to
* check for space in debug.vect since both eval frames and
* available space are even.
*
* For this to be the case, however, it is necessary that primitive
* special forms which jump back to `loop', `begin' or some similar
* label call PREP_APPLY. A convenient way to do this is to jump to
* `loopnoap' or `cdrxnoap'.
*/
else if (++debug.info >= debug_info_end) else if (++debug.info >= debug_info_end)
{ {
SCM_SET_OVERFLOW (debug); SCM_SET_OVERFLOW (debug);
@ -2312,13 +2328,13 @@ dispatch:
be used also in normal code. */ be used also in normal code. */
env = EXTEND_ENV (SCM_CADR (arg2), SCM_CDDAR (env), env = EXTEND_ENV (SCM_CADR (arg2), SCM_CDDAR (env),
SCM_CAR (arg2)); SCM_CAR (arg2));
x = SCM_CDDR (arg2); x = SCM_CDR (arg2);
goto begin; goto cdrxnoap;
next_method: next_method:
i = (i + 1) & mask; i = (i + 1) & mask;
} while (i != end); } while (i != end);
scm_memoize_method (x, SCM_CDAR (env)); scm_memoize_method (x, SCM_CDAR (env));
goto loop; goto loopnoap;
case (SCM_ISYMNUM (SCM_IM_HASH_DISPATCH)): case (SCM_ISYMNUM (SCM_IM_HASH_DISPATCH)):
/* (SCM_IM_HASH_DISPATCH N-SPECIALIZED HASHSET MASK /* (SCM_IM_HASH_DISPATCH N-SPECIALIZED HASHSET MASK