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/intrinsics.h | |
| 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/intrinsics.h')
| -rw-r--r-- | libguile/intrinsics.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libguile/intrinsics.h b/libguile/intrinsics.h index b00471123..30e85c5fc 100644 --- a/libguile/intrinsics.h +++ b/libguile/intrinsics.h @@ -92,6 +92,7 @@ typedef SCM (*scm_t_scm_from_ptr_intrinsic) (SCM*); typedef void (*scm_t_ptr_scm_intrinsic) (SCM*, SCM); typedef SCM (*scm_t_scm_from_ptr_scm_intrinsic) (SCM*, SCM); typedef SCM (*scm_t_scm_from_ptr_scm_scm_intrinsic) (SCM*, SCM, SCM); +typedef uint32_t* scm_t_vcode_intrinsic; #define SCM_FOR_ALL_VM_INTRINSICS(M) \ M(scm_from_scm_scm, add, "add", ADD) \ @@ -167,6 +168,7 @@ typedef SCM (*scm_t_scm_from_ptr_scm_scm_intrinsic) (SCM*, SCM, SCM); M(ptr_scm, atomic_set_scm, "atomic-set-scm", ATOMIC_SET_SCM) \ M(scm_from_ptr_scm, atomic_swap_scm, "atomic-swap-scm", ATOMIC_SWAP_SCM) \ M(scm_from_ptr_scm_scm, atomic_compare_and_swap_scm, "atomic-compare-and-swap-scm", ATOMIC_COMPARE_AND_SWAP_SCM) \ + M(vcode, handle_interrupt_code, "%handle-interrupt-code", HANDLE_INTERRUPT_CODE) \ /* Add new intrinsics here; also update scm_bootstrap_intrinsics. */ enum scm_vm_intrinsic |