mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 02:30:23 +02:00
Code Activity

Allocate frame objects on the stack when invoking VM hooks.

Browse source 
* libguile/vm.c (vm_dispatch_hook): Don't call `scm_c_make_frame ()'.
  Instead, allocate FRAME on the stack.
This commit is contained in:
Ludovic Courtès 2010-04-21 01:05:42 +02:00
parent f9a86f72a6
commit b3567435e1
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libguile/vm.c
View file

@ -185,7 +185,9 @@ vm_dispatch_hook (SCM vm, int hook_num)
{ {
struct scm_vm *vp; struct scm_vm *vp;
SCM hook; SCM hook;
SCM frame; struct scm_frame c_frame;
scm_t_cell frame;
SCM args[1];
vp = SCM_VM_DATA (vm); vp = SCM_VM_DATA (vm);
hook = vp->hooks[hook_num]; hook = vp->hooks[hook_num];
@ -193,10 +195,28 @@ vm_dispatch_hook (SCM vm, int hook_num)
if (SCM_LIKELY (scm_is_false (hook)) if (SCM_LIKELY (scm_is_false (hook))
|| scm_is_null (SCM_HOOK_PROCEDURES (hook))) || scm_is_null (SCM_HOOK_PROCEDURES (hook)))
return; return;
vp->trace_level--; vp->trace_level--;
frame = scm_c_make_frame (vm, vp->fp, vp->sp, vp->ip, 0);
scm_c_run_hookn (hook, &frame, 1); /* Allocate a frame object on the stack. This is more efficient than calling
`scm_c_make_frame ()' to allocate on the heap, but it forces hooks to not
capture frame objects.
At the same time, procedures such as `frame-procedure' make sense only
while the stack frame represented by the frame object is visible, so it
seems reasonable to limit the lifetime of frame objects. */
c_frame.stack_holder = vm;
c_frame.fp = vp->fp;
c_frame.sp = vp->sp;
c_frame.ip = vp->ip;
c_frame.offset = 0;
frame.word_0 = SCM_PACK (scm_tc7_frame);
frame.word_1 = PTR2SCM (&c_frame);
args[0] = PTR2SCM (&frame);
scm_c_run_hookn (hook, args, 1);
vp->trace_level++; vp->trace_level++;
} }