diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/vm-engine.c | 1 | ||||
-rw-r--r-- | libguile/vm-engine.h | 16 | ||||
-rw-r--r-- | libguile/vm-i-system.c | 20 | ||||
-rw-r--r-- | libguile/vm.c | 60 | ||||
-rw-r--r-- | libguile/vm.h | 26 |
5 files changed, 34 insertions, 89 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index ff41ce4b6..5b38060d3 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -104,7 +104,6 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) } /* Let's go! */ - BOOT_HOOK (); NEXT; #ifndef HAVE_LABELS_AS_VALUES diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h index 836648c30..dd735a365 100644 --- a/libguile/vm-engine.h +++ b/libguile/vm-engine.h @@ -224,14 +224,14 @@ #define RUN_HOOK1(h, x) #endif -#define BOOT_HOOK() RUN_HOOK (SCM_VM_BOOT_HOOK) -#define HALT_HOOK() RUN_HOOK (SCM_VM_HALT_HOOK) -#define NEXT_HOOK() RUN_HOOK (SCM_VM_NEXT_HOOK) -#define BREAK_HOOK() RUN_HOOK (SCM_VM_BREAK_HOOK) -#define ENTER_HOOK() RUN_HOOK (SCM_VM_ENTER_HOOK) -#define APPLY_HOOK() RUN_HOOK (SCM_VM_APPLY_HOOK) -#define EXIT_HOOK() RUN_HOOK (SCM_VM_EXIT_HOOK) -#define RETURN_HOOK(n) RUN_HOOK1 (SCM_VM_RETURN_HOOK, SCM_I_MAKINUM (n)) +#define APPLY_HOOK() \ + RUN_HOOK (SCM_VM_APPLY_HOOK) +#define PUSH_CONTINUATION_HOOK() \ + RUN_HOOK (SCM_VM_PUSH_CONTINUATION_HOOK) +#define POP_CONTINUATION_HOOK(n) \ + RUN_HOOK1 (SCM_VM_POP_CONTINUATION_HOOK, SCM_I_MAKINUM (n)) +#define NEXT_HOOK() \ + RUN_HOOK (SCM_VM_NEXT_HOOK) #define VM_HANDLE_INTERRUPTS \ SCM_ASYNC_TICK_WITH_CODE (SYNC_REGISTER ()) diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 9ba287d5a..063270ffd 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -31,7 +31,6 @@ VM_DEFINE_INSTRUCTION (0, nop, "nop", 0, 0, 0) VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0) { - HALT_HOOK (); nvalues = SCM_I_INUM (*sp--); NULLSTACK (1); if (nvalues == 1) @@ -62,12 +61,6 @@ VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0) goto vm_done; } -VM_DEFINE_INSTRUCTION (2, break, "break", 0, 0, 0) -{ - BREAK_HOOK (); - NEXT; -} - VM_DEFINE_INSTRUCTION (3, drop, "drop", 0, 1, 0) { DROP (); @@ -779,7 +772,7 @@ VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1) SCM_FRAME_SET_RETURN_ADDRESS (fp, ip); SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, 0); ip = SCM_C_OBJCODE_BASE (bp); - ENTER_HOOK (); + PUSH_CONTINUATION_HOOK (); APPLY_HOOK (); NEXT; } @@ -818,8 +811,6 @@ VM_DEFINE_INSTRUCTION (55, tail_call, "tail-call", 1, -1, 1) CHECK_STACK_LEAK (); #endif - EXIT_HOOK (); - /* switch programs */ CACHE_PROGRAM (); /* shuffle down the program and the arguments */ @@ -832,7 +823,6 @@ VM_DEFINE_INSTRUCTION (55, tail_call, "tail-call", 1, -1, 1) ip = SCM_C_OBJCODE_BASE (bp); - ENTER_HOOK (); APPLY_HOOK (); NEXT; } @@ -1083,7 +1073,7 @@ VM_DEFINE_INSTRUCTION (61, mv_call, "mv-call", 4, -1, 1) SCM_FRAME_SET_RETURN_ADDRESS (fp, ip); SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, mvra); ip = SCM_C_OBJCODE_BASE (bp); - ENTER_HOOK (); + PUSH_CONTINUATION_HOOK (); APPLY_HOOK (); NEXT; } @@ -1198,8 +1188,7 @@ VM_DEFINE_INSTRUCTION (65, tail_call_cc, "tail-call/cc", 0, 1, 1) VM_DEFINE_INSTRUCTION (66, return, "return", 0, 1, 1) { vm_return: - EXIT_HOOK (); - RETURN_HOOK (1); + POP_CONTINUATION_HOOK (1); VM_HANDLE_INTERRUPTS; @@ -1238,8 +1227,7 @@ VM_DEFINE_INSTRUCTION (67, return_values, "return/values", 1, -1, -1) that perhaps it might be used without declaration. Fooey to that, I say. */ nvalues = FETCH (); vm_return_values: - EXIT_HOOK (); - RETURN_HOOK (nvalues); + POP_CONTINUATION_HOOK (nvalues); VM_HANDLE_INTERRUPTS; diff --git a/libguile/vm.c b/libguile/vm.c index 7a250d4f3..fd96d7ec6 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -668,75 +668,39 @@ SCM_DEFINE (scm_vm_fp, "vm:fp", 1, 0, 0, return vp->hooks[n]; \ } -SCM_DEFINE (scm_vm_boot_hook, "vm-boot-hook", 1, 0, 0, - (SCM vm), - "") -#define FUNC_NAME s_scm_vm_boot_hook -{ - VM_DEFINE_HOOK (SCM_VM_BOOT_HOOK); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_vm_halt_hook, "vm-halt-hook", 1, 0, 0, - (SCM vm), - "") -#define FUNC_NAME s_scm_vm_halt_hook -{ - VM_DEFINE_HOOK (SCM_VM_HALT_HOOK); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_vm_next_hook, "vm-next-hook", 1, 0, 0, - (SCM vm), - "") -#define FUNC_NAME s_scm_vm_next_hook -{ - VM_DEFINE_HOOK (SCM_VM_NEXT_HOOK); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_vm_break_hook, "vm-break-hook", 1, 0, 0, - (SCM vm), - "") -#define FUNC_NAME s_scm_vm_break_hook -{ - VM_DEFINE_HOOK (SCM_VM_BREAK_HOOK); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_vm_enter_hook, "vm-enter-hook", 1, 0, 0, +SCM_DEFINE (scm_vm_apply_hook, "vm-apply-hook", 1, 0, 0, (SCM vm), "") -#define FUNC_NAME s_scm_vm_enter_hook +#define FUNC_NAME s_scm_vm_apply_hook { - VM_DEFINE_HOOK (SCM_VM_ENTER_HOOK); + VM_DEFINE_HOOK (SCM_VM_APPLY_HOOK); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_apply_hook, "vm-apply-hook", 1, 0, 0, +SCM_DEFINE (scm_vm_push_continuation_hook, "vm-push-continuation-hook", 1, 0, 0, (SCM vm), "") -#define FUNC_NAME s_scm_vm_apply_hook +#define FUNC_NAME s_scm_vm_push_continuation_hook { - VM_DEFINE_HOOK (SCM_VM_APPLY_HOOK); + VM_DEFINE_HOOK (SCM_VM_PUSH_CONTINUATION_HOOK); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_exit_hook, "vm-exit-hook", 1, 0, 0, +SCM_DEFINE (scm_vm_pop_continuation_hook, "vm-pop-continuation-hook", 1, 0, 0, (SCM vm), "") -#define FUNC_NAME s_scm_vm_exit_hook +#define FUNC_NAME s_scm_vm_pop_continuation_hook { - VM_DEFINE_HOOK (SCM_VM_EXIT_HOOK); + VM_DEFINE_HOOK (SCM_VM_POP_CONTINUATION_HOOK); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_return_hook, "vm-return-hook", 1, 0, 0, +SCM_DEFINE (scm_vm_next_hook, "vm-next-hook", 1, 0, 0, (SCM vm), "") -#define FUNC_NAME s_scm_vm_return_hook +#define FUNC_NAME s_scm_vm_next_hook { - VM_DEFINE_HOOK (SCM_VM_RETURN_HOOK); + VM_DEFINE_HOOK (SCM_VM_NEXT_HOOK); } #undef FUNC_NAME diff --git a/libguile/vm.h b/libguile/vm.h index 8e22d028c..eff6f1807 100644 --- a/libguile/vm.h +++ b/libguile/vm.h @@ -22,15 +22,13 @@ #include <libguile.h> #include <libguile/programs.h> -#define SCM_VM_BOOT_HOOK 0 -#define SCM_VM_HALT_HOOK 1 -#define SCM_VM_NEXT_HOOK 2 -#define SCM_VM_BREAK_HOOK 3 -#define SCM_VM_ENTER_HOOK 4 -#define SCM_VM_APPLY_HOOK 5 -#define SCM_VM_EXIT_HOOK 6 -#define SCM_VM_RETURN_HOOK 7 -#define SCM_VM_NUM_HOOKS 8 +enum { + SCM_VM_APPLY_HOOK, + SCM_VM_PUSH_CONTINUATION_HOOK, + SCM_VM_POP_CONTINUATION_HOOK, + SCM_VM_NEXT_HOOK, + SCM_VM_NUM_HOOKS, +}; struct scm_vm; @@ -73,14 +71,10 @@ SCM_API SCM scm_vm_p (SCM obj); SCM_API SCM scm_vm_ip (SCM vm); SCM_API SCM scm_vm_sp (SCM vm); SCM_API SCM scm_vm_fp (SCM vm); -SCM_API SCM scm_vm_boot_hook (SCM vm); -SCM_API SCM scm_vm_halt_hook (SCM vm); -SCM_API SCM scm_vm_next_hook (SCM vm); -SCM_API SCM scm_vm_break_hook (SCM vm); -SCM_API SCM scm_vm_enter_hook (SCM vm); SCM_API SCM scm_vm_apply_hook (SCM vm); -SCM_API SCM scm_vm_exit_hook (SCM vm); -SCM_API SCM scm_vm_return_hook (SCM vm); +SCM_API SCM scm_vm_push_continuation_hook (SCM vm); +SCM_API SCM scm_vm_pop_continuation_hook (SCM vm); +SCM_API SCM scm_vm_next_hook (SCM vm); SCM_API SCM scm_vm_option (SCM vm, SCM key); SCM_API SCM scm_set_vm_option_x (SCM vm, SCM key, SCM val); SCM_API SCM scm_vm_trace_level (SCM vm); |