coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify CALL_PRIM dispatch: vm_globals as single source of truth

Browse Source 
Seed all primitives into vm_globals as NativeFn values at init.
CALL_PRIM now looks up vm.globals only (not the separate primitives
table). This means OP_DEFINE and registerNative naturally override
primitives — browser.sx's (define set-cookie ...) now takes effect.

The primitives Hashtbl remains for the compiler's primitive? predicate
but has no runtime dispatch role.

Tests: 2435 pass / 64 fail (pre-existing), vs 1718/771 baseline.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
giles
2026-04-02 10:53:09 +00:00
parent 3aa6695c69
commit c430ef8110
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/ocaml/bin/sx_server.ml
View File

@@ -680,6 +680,14 @@ let () =
if env.parent = None then
Hashtbl.replace _shared_vm_globals name v)
(* Seed _shared_vm_globals with all primitives as NativeFn values.
Makes vm_globals the single source of truth for CALL_PRIM dispatch. *)
let () =
Hashtbl.iter (fun name fn ->
if not (Hashtbl.mem _shared_vm_globals name) then
Hashtbl.replace _shared_vm_globals name (NativeFn (name, fn))
) Sx_primitives.primitives
let make_server_env () =
let env = make_env () in
Sx_render.setup_render_env env;

9
hosts/ocaml/browser/sx_browser.ml
View File

@@ -857,6 +857,15 @@ let () =
let () = ignore (env_bind global_env "enable-jit!" (NativeFn ("enable-jit!", fun _ -> _jit_enabled := true; Nil)))
(* Seed _vm_globals with all primitives as NativeFn values.
This makes _vm_globals the single source of truth for CALL_PRIM dispatch.
OP_DEFINE and registerNative naturally override entries here. *)
let () =
Hashtbl.iter (fun name fn ->
if not (Hashtbl.mem _vm_globals name) then
Hashtbl.replace _vm_globals name (NativeFn (name, fn))
) Sx_primitives.primitives
(* ================================================================== *)
(* Register global SxKernel object *)
(* ================================================================== *)

9
hosts/ocaml/lib/sx_vm.ml
View File

@@ -387,11 +387,10 @@ and run vm =
| _ -> v) args in
let result =
try
(* Check primitives FIRST (native implementations of map/filter/etc.),
then globals (which may have ho_via_cek wrappers that route
through the CEK — these can't call VM closures). *)
let fn_val = try Sx_primitives.get_primitive name with _ ->
try Hashtbl.find vm.globals name with Not_found ->
(* Single lookup: vm.globals is the sole source of truth.
Primitives are seeded into vm.globals at init as NativeFn values.
OP_DEFINE and registerNative naturally override them. *)
let fn_val = try Hashtbl.find vm.globals name with Not_found ->
raise (Eval_error ("VM: unknown primitive " ^ name))
in
(match fn_val with