diff options
| author | Andy Wingo <wingo@pobox.com> | 2018-08-17 08:15:04 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2018-08-17 08:50:33 +0200 |
| commit | 3827769aff190a5e155b29d37fe157dd6115ad04 (patch) | |
| tree | cca82537cba9073fce356cd75575be82e98e466c /libguile/vm-engine.c | |
| parent | e6304fb2425475ddf441439ee3c510060f9464d4 (diff) | |
| download | guile-3827769aff190a5e155b29d37fe157dd6115ad04.tar.gz | |
Add instrumentation to VM builtins
* libguile/intrinsics.h: Add "intrinsic" for handle-interrupts code.
Unlike the other intrinsics, this one isn't a function.
* libguile/programs.c (try_parse_arity): Add cases for instructions used
in VM builtins.
(scm_primitive_call_ip): Return #f if call-ip not found.
* libguile/vm-engine.c (handle-interrupts): Get code from intrinsics.
* libguile/vm.c
* libguile/vm.c (instrumented_code, define_vm_builtins): Add
instrumentation to the builtins, so that they can be JIT-compiled.
(INIT_BUILTIN): Remove min-arity setting; the fallback min-arity
interpreter should figure it out.
(scm_bootstrap_vm): Call the new define_vm_builtins function.
* libguile/gsubr.c (primitive_call_ip): Return 0 if call IP not found.
(primitive_subr_idx): Interpret call ip == 0 as not-a-subr.
* module/system/vm/program.scm (program-arguments-alist): Allow a #f
call-ip.
Diffstat (limited to 'libguile/vm-engine.c')
| -rw-r--r-- | libguile/vm-engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 2af02dcea..e8787eeeb 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -2385,7 +2385,7 @@ VM_NAME (scm_thread *thread) SYNC_IP (); CALL_INTRINSIC (push_interrupt_frame, (thread, 0)); CACHE_SP (); - ip = (uint32_t *) vm_handle_interrupt_code; + ip = scm_vm_intrinsics.handle_interrupt_code; NEXT (0); } |