diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-21 17:24:48 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-21 17:24:48 +0100 |
commit | 59f85eedc27fb82522fcd2788b4ab25409481630 (patch) | |
tree | 7dab55e07d6d9ecea5206f2426c125f69f629e63 /libguile/vm.c | |
parent | 5515edc5f21e042ade15cf508300c496ce2f4818 (diff) | |
download | guile-59f85eedc27fb82522fcd2788b4ab25409481630.tar.gz |
Dispatch hooks use "vp" rather than "vm"
* libguile/vm.c (vm_dispatch_hook):
(vm_dispatch_apply_hook):
(vm_dispatch_push_continuation_hook):
(vm_dispatch_pop_continuation_hook):
(vm_dispatch_next_hook):
(vm_dispatch_abort_hook):
(vm_dispatch_restore_continuation_hook): Use scm_vm pointer instead of
Scheme vm object.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r-- | libguile/vm.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index c4e48952b..a34155654 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -168,23 +168,21 @@ scm_i_capture_current_stack (void) 0); } -static void vm_dispatch_apply_hook (SCM vm) SCM_NOINLINE; -static void vm_dispatch_push_continuation_hook (SCM vm) SCM_NOINLINE; -static void vm_dispatch_pop_continuation_hook (SCM vm, SCM *old_fp) SCM_NOINLINE; -static void vm_dispatch_next_hook (SCM vm) SCM_NOINLINE; -static void vm_dispatch_abort_hook (SCM vm) SCM_NOINLINE; -static void vm_dispatch_restore_continuation_hook (SCM vm) SCM_NOINLINE; +static void vm_dispatch_apply_hook (struct scm_vm *vp) SCM_NOINLINE; +static void vm_dispatch_push_continuation_hook (struct scm_vm *vp) SCM_NOINLINE; +static void vm_dispatch_pop_continuation_hook (struct scm_vm *vp, SCM *old_fp) SCM_NOINLINE; +static void vm_dispatch_next_hook (struct scm_vm *vp) SCM_NOINLINE; +static void vm_dispatch_abort_hook (struct scm_vm *vp) SCM_NOINLINE; +static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp) SCM_NOINLINE; static void -vm_dispatch_hook (SCM vm, int hook_num, SCM *argv, int n) +vm_dispatch_hook (struct scm_vm *vp, int hook_num, SCM *argv, int n) { - struct scm_vm *vp; SCM hook; struct scm_frame c_frame; scm_t_cell *frame; int saved_trace_level; - vp = SCM_VM_DATA (vm); hook = vp->hooks[hook_num]; if (SCM_LIKELY (scm_is_false (hook)) @@ -242,35 +240,33 @@ vm_dispatch_hook (SCM vm, int hook_num, SCM *argv, int n) } static void -vm_dispatch_apply_hook (SCM vm) +vm_dispatch_apply_hook (struct scm_vm *vp) { - return vm_dispatch_hook (vm, SCM_VM_APPLY_HOOK, NULL, 0); + return vm_dispatch_hook (vp, SCM_VM_APPLY_HOOK, NULL, 0); } -static void vm_dispatch_push_continuation_hook (SCM vm) +static void vm_dispatch_push_continuation_hook (struct scm_vm *vp) { - return vm_dispatch_hook (vm, SCM_VM_PUSH_CONTINUATION_HOOK, NULL, 0); + return vm_dispatch_hook (vp, SCM_VM_PUSH_CONTINUATION_HOOK, NULL, 0); } -static void vm_dispatch_pop_continuation_hook (SCM vm, SCM *old_fp) +static void vm_dispatch_pop_continuation_hook (struct scm_vm *vp, SCM *old_fp) { - struct scm_vm *vp = SCM_VM_DATA (vm); - return vm_dispatch_hook (vm, SCM_VM_POP_CONTINUATION_HOOK, + return vm_dispatch_hook (vp, SCM_VM_POP_CONTINUATION_HOOK, &SCM_FRAME_LOCAL (old_fp, 1), SCM_FRAME_NUM_LOCALS (old_fp, vp->sp) - 1); } -static void vm_dispatch_next_hook (SCM vm) +static void vm_dispatch_next_hook (struct scm_vm *vp) { - return vm_dispatch_hook (vm, SCM_VM_NEXT_HOOK, NULL, 0); + return vm_dispatch_hook (vp, SCM_VM_NEXT_HOOK, NULL, 0); } -static void vm_dispatch_abort_hook (SCM vm) +static void vm_dispatch_abort_hook (struct scm_vm *vp) { - struct scm_vm *vp = SCM_VM_DATA (vm); - return vm_dispatch_hook (vm, SCM_VM_ABORT_CONTINUATION_HOOK, + return vm_dispatch_hook (vp, SCM_VM_ABORT_CONTINUATION_HOOK, &SCM_FRAME_LOCAL (vp->fp, 1), SCM_FRAME_NUM_LOCALS (vp->fp, vp->sp) - 1); } -static void vm_dispatch_restore_continuation_hook (SCM vm) +static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp) { - return vm_dispatch_hook (vm, SCM_VM_RESTORE_CONTINUATION_HOOK, NULL, 0); + return vm_dispatch_hook (vp, SCM_VM_RESTORE_CONTINUATION_HOOK, NULL, 0); } static void |