summaryrefslogtreecommitdiff
path: root/ocaml
diff options
context:
space:
mode:
Diffstat (limited to 'ocaml')
-rw-r--r--ocaml/ivorypillnock.md12
-rw-r--r--ocaml/lib/boot.ml6
-rw-r--r--ocaml/lib/nock.ml110
-rw-r--r--ocaml/test/dune10
-rw-r--r--ocaml/test/test_bisect_lifecycle.ml71
-rw-r--r--ocaml/test/test_op8.ml38
-rw-r--r--ocaml/test/test_op9.ml45
-rw-r--r--ocaml/test/test_opcodes.ml75
-rw-r--r--ocaml/test/test_simple_lifecycle.ml47
-rw-r--r--ocaml/test/test_two_stage_boot.ml5
10 files changed, 360 insertions, 59 deletions
diff --git a/ocaml/ivorypillnock.md b/ocaml/ivorypillnock.md
new file mode 100644
index 0000000..025986f
--- /dev/null
+++ b/ocaml/ivorypillnock.md
@@ -0,0 +1,12 @@
+
+[6] Verifying kernel structure...
+ ✓ Has poke gate at slot 23
+ Checking structural properties:
+ Slot 2 (battery): cell ✓
+ Slot 3 (payload): cell ✓
+ Slot 23 (poke): cell (gate) ✓
+ Poke battery: atom ✗
+ Computing mugs of sub-structures:
+ Slot 2 (battery) mug: 0x6d668e4a
+ Slot 3 (payload) mug: 0x5be29baa
+ Slot 23 (poke) mug: 0x39aec359 so yeah not great
diff --git a/ocaml/lib/boot.ml b/ocaml/lib/boot.ml
index 1aeafaf..26f2177 100644
--- a/ocaml/lib/boot.ml
+++ b/ocaml/lib/boot.ml
@@ -208,6 +208,7 @@ let life eve =
let result = Nock.nock_on eve lifecycle_formula in
Printf.printf "[Boot] ✓ Nock.nock_on returned successfully\n%!";
+ Printf.printf "[Boot] Gate mug: 0x%08lx\n%!" (Noun.mug result);
result
with e ->
Printf.printf "[Boot] ✗ Nock failed during lifecycle: %s\n%!"
@@ -216,11 +217,14 @@ let life eve =
in
Printf.printf "[Boot] ✓ Lifecycle formula completed\n%!";
+ Printf.printf "[Boot] (gate structure for comparison)\n%!";
(* Extract slot 7 (the kernel) from resulting gate *)
let cor =
try
- Noun.slot (Z.of_int 7) gat
+ let result_slot7 = Noun.slot (Z.of_int 7) gat in
+ Printf.printf "[Boot] Slot 7 mug: 0x%08lx\n%!" (Noun.mug result_slot7);
+ result_slot7
with e ->
Printf.printf "[Boot] ✗ Failed to extract slot 7: %s\n%!"
(Printexc.to_string e);
diff --git a/ocaml/lib/nock.ml b/ocaml/lib/nock.ml
index 5658ed7..64daa91 100644
--- a/ocaml/lib/nock.ml
+++ b/ocaml/lib/nock.ml
@@ -41,40 +41,41 @@ let opcode_name op =
let rec nock_on init_bus init_fol =
let bus = ref init_bus in
let fol = ref init_fol in
+ let my_call = !call_count in
- let rec loop () =
- let my_call = !call_count in
-
- (* Check if this is opcode 0 (slot lookup) - C doesn't log these *)
- let is_slot = match !fol with
- | Cell { h = Atom { z = op; _ }; _ } when Z.fits_int op && Z.to_int op = 0 -> true
- | _ -> false
- in
+ (* Check if this is opcode 0 (slot lookup) - C doesn't log these *)
+ let is_slot = match init_fol with
+ | Cell { h = Atom { z = op; _ }; _ } when Z.fits_int op && Z.to_int op = 0 -> true
+ | _ -> false
+ in
- let should_log = my_call < max_calls && not is_slot in
+ let should_log = my_call < max_calls && not is_slot in
- (* Log entry *)
- if should_log then begin
- let opcode_str = match !fol with
- | Cell { h = Atom { z = op; _ }; _ } when Z.fits_int op -> opcode_name (Z.to_int op)
- | Cell { h = Cell _; _ } -> "CELL(dist)"
- | _ -> "?"
- in
- if !show_mugs || !depth <= !max_mug_depth then begin
- let bus_mug = mug !bus in
- Printf.eprintf "%s>>> ENTER call #%d depth=%d opcode=%s bus=%s[mug=0x%lx]\n%!"
- (indent ()) my_call !depth opcode_str
- (if is_cell !bus then "cell" else "atom")
- bus_mug
- end else begin
- Printf.eprintf "%s>>> ENTER call #%d depth=%d opcode=%s bus=%s\n%!"
- (indent ()) my_call !depth opcode_str
- (if is_cell !bus then "cell" else "atom")
- end;
- incr call_count
+ (* Log entry ONCE at function entry *)
+ if should_log then begin
+ let opcode_str = match init_fol with
+ | Cell { h = Atom { z = op; _ }; _ } when Z.fits_int op -> opcode_name (Z.to_int op)
+ | Cell { h = Cell _; _ } -> "CELL(dist)"
+ | _ -> "?"
+ in
+ if !show_mugs || !depth <= !max_mug_depth then begin
+ let bus_mug = mug init_bus in
+ Printf.eprintf "%s>>> ENTER call #%d depth=%d opcode=%s bus=%s[mug=0x%lx]\n%!"
+ (indent ()) my_call !depth opcode_str
+ (if is_cell init_bus then "cell" else "atom")
+ bus_mug
+ end else begin
+ Printf.eprintf "%s>>> ENTER call #%d depth=%d opcode=%s bus=%s\n%!"
+ (indent ()) my_call !depth opcode_str
+ (if is_cell init_bus then "cell" else "atom")
end;
+ incr call_count
+ end;
+
+ (* Increment depth ONCE at function entry *)
+ incr depth;
- incr depth;
+ let rec loop () =
try
let result = match !fol with
@@ -101,18 +102,29 @@ let rec nock_on init_bus init_fol =
if not (is_cell gal) then raise Exit;
let c_gal = tail gal in
let b_gal = head gal in
+
+ (* Debug first call *)
+ if my_call = 0 then begin
+ Printf.eprintf "[Op2 Debug] Computing formula (tail gal):\n%!";
+ Printf.eprintf " c_gal mug: 0x%lx\n%!" (mug c_gal);
+ end;
+
let nex = nock_on !bus c_gal in
+
+ if my_call = 0 then begin
+ Printf.eprintf " nex mug: 0x%lx\n%!" (mug nex);
+ Printf.eprintf "[Op2 Debug] Computing subject (head gal):\n%!";
+ Printf.eprintf " b_gal mug: 0x%lx\n%!" (mug b_gal);
+ end;
+
let seb = nock_on !bus b_gal in
+
+ if my_call = 0 then begin
+ Printf.eprintf " seb mug: 0x%lx\n%!" (mug seb);
+ end;
+
bus := seb;
fol := nex;
- decr depth;
- if should_log then begin
- if !show_mugs || !depth <= !max_mug_depth then begin
- let result_mug = mug !bus in
- Printf.eprintf "%s<<< CONTINUE call #%d depth=%d with bus[mug=0x%lx]\n%!"
- (indent ()) my_call !depth result_mug
- end
- end;
loop ()
| 3 ->
@@ -145,11 +157,7 @@ let rec nock_on init_bus init_fol =
| _ -> raise Exit
in
fol := nex;
- decr depth;
- if should_log then begin
- Printf.eprintf "%s<<< CONTINUE call #%d depth=%d (if-branch)\n%!"
- (indent ()) my_call !depth
- end;
+ (* Don't decr depth for tail calls *)
loop ()
| 7 ->
@@ -160,14 +168,7 @@ let rec nock_on init_bus init_fol =
let bod = nock_on !bus b_gal in
bus := bod;
fol := c_gal;
- decr depth;
- if should_log then begin
- if !show_mugs || !depth <= !max_mug_depth then begin
- let result_mug = mug !bus in
- Printf.eprintf "%s<<< CONTINUE call #%d depth=%d with bus[mug=0x%lx]\n%!"
- (indent ()) my_call !depth result_mug
- end
- end;
+ (* Don't decr depth for tail calls *)
loop ()
| 8 ->
@@ -179,14 +180,7 @@ let rec nock_on init_bus init_fol =
let bod = cell heb !bus in
bus := bod;
fol := c_gal;
- decr depth;
- if should_log then begin
- if !show_mugs || !depth <= !max_mug_depth then begin
- let result_mug = mug !bus in
- Printf.eprintf "%s<<< CONTINUE call #%d depth=%d with bus[mug=0x%lx]\n%!"
- (indent ()) my_call !depth result_mug
- end
- end;
+ (* Don't decr depth for tail calls *)
loop ()
| 9 ->
diff --git a/ocaml/test/dune b/ocaml/test/dune
index 84a47a3..d23fc4d 100644
--- a/ocaml/test/dune
+++ b/ocaml/test/dune
@@ -278,6 +278,16 @@
(libraries nock_lib))
(executable
+ (name test_opcodes)
+ (modules test_opcodes)
+ (libraries nock_lib))
+
+(executable
+ (name test_bisect_lifecycle)
+ (modules test_bisect_lifecycle)
+ (libraries nock_lib eio_main))
+
+(executable
(name test_slot3)
(modules test_slot3)
(libraries nock_lib eio_main))
diff --git a/ocaml/test/test_bisect_lifecycle.ml b/ocaml/test/test_bisect_lifecycle.ml
new file mode 100644
index 0000000..7e37516
--- /dev/null
+++ b/ocaml/test/test_bisect_lifecycle.ml
@@ -0,0 +1,71 @@
+(* Bisect the ivory pill to find where lifecycle formula diverges *)
+
+open Nock_lib
+
+let lifecycle_formula = Noun.cell
+ (Noun.atom 2)
+ (Noun.cell
+ (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 2)))
+
+let test_lifecycle subject_name subject =
+ Printf.printf "Testing: %s\n" subject_name;
+ Printf.printf " Subject mug: 0x%08lx\n" (Noun.mug subject);
+
+ (* Check if subject has valid structure for lifecycle *)
+ if not (Noun.is_cell subject) then begin
+ Printf.printf " SKIP: subject is atom\n\n";
+ None
+ end else begin
+ let slot2 = Noun.head subject in
+
+ (* Check if slot 2 is a valid formula *)
+ if not (Noun.is_cell slot2) then begin
+ Printf.printf " SKIP: slot 2 is atom (not a formula)\n\n";
+ None
+ end else begin
+ try
+ let result = Nock.nock_on subject lifecycle_formula in
+ let result_mug = Noun.mug result in
+ Printf.printf " Result mug: 0x%08lx\n\n" result_mug;
+ Some result_mug
+ with _ ->
+ Printf.printf " CRASH: nock failed\n\n";
+ None
+ end
+ end
+
+let rec walk_tree prefix subject depth max_depth =
+ if depth >= max_depth then () else begin
+ (* Test current node *)
+ let _ = test_lifecycle prefix subject in
+
+ (* Walk children if cell *)
+ if Noun.is_cell subject then begin
+ let h = Noun.head subject in
+ let t = Noun.tail subject in
+ walk_tree (prefix ^ ".2") h (depth + 1) max_depth;
+ walk_tree (prefix ^ ".3") t (depth + 1) max_depth
+ end
+ end
+
+let () =
+ Eio_main.run (fun env ->
+ let fs = Eio.Stdenv.fs env in
+
+ Printf.printf "Loading ivory.pill...\n";
+ let pill_bytes = Eio.Path.(load (fs / "ivory.pill")) |> Bytes.of_string in
+ let pill = Serial.cue pill_bytes in
+ let core = Noun.tail pill in
+
+ Printf.printf "Ivory core mug: 0x%08lx\n\n" (Noun.mug core);
+ Printf.printf "Walking tree and testing lifecycle at each node...\n";
+ Printf.printf "Format: slot path (e.g. '.2.3' = slot 6)\n\n";
+
+ (* Reset counters *)
+ Nock.call_count := 0;
+ Nock.depth := 0;
+
+ (* Walk tree up to depth 5 *)
+ walk_tree "core" core 0 5
+ )
diff --git a/ocaml/test/test_op8.ml b/ocaml/test/test_op8.ml
new file mode 100644
index 0000000..5c63926
--- /dev/null
+++ b/ocaml/test/test_op8.ml
@@ -0,0 +1,38 @@
+(* Test opcode 8 (extend) *)
+
+open Nock_lib
+
+let () =
+ (* Test: *[[42 99] [8 [1 123] [0 1]]] *)
+ (* This should compute: *[[123 [42 99]] [0 1]] = [123 [42 99]] *)
+
+ let subject = Noun.cell (Noun.atom 42) (Noun.atom 99) in
+ let formula = Noun.cell
+ (Noun.atom 8)
+ (Noun.cell
+ (Noun.cell (Noun.atom 1) (Noun.atom 123)) (* [1 123] produces 123 *)
+ (Noun.cell (Noun.atom 0) (Noun.atom 1))) (* [0 1] returns whole subject *)
+ in
+
+ Printf.printf "Subject: [42 99]\n";
+ Printf.printf "Subject mug: 0x%08lx\n" (Noun.mug subject);
+ Printf.printf "Formula: [8 [1 123] [0 1]]\n";
+ Printf.printf "Formula mug: 0x%08lx\n\n" (Noun.mug formula);
+
+ Printf.printf "This should compute:\n";
+ Printf.printf " 1. Evaluate [1 123] on [42 99] → 123\n";
+ Printf.printf " 2. Extend subject: [123 [42 99]]\n";
+ Printf.printf " 3. Evaluate [0 1] on [123 [42 99]] → [123 [42 99]]\n\n";
+
+ let result = Nock.nock_on subject formula in
+
+ Printf.printf "Result mug: 0x%08lx\n" (Noun.mug result);
+ Printf.printf "Result: %s\n"
+ (if Noun.is_cell result then
+ let h = Noun.head result in
+ let t = Noun.tail result in
+ match (h, t) with
+ | (Noun.Atom { z = zh; _ }, Noun.Cell { h = Noun.Atom { z = zth; _ }; t = Noun.Atom { z = ztt; _ }; _ }) ->
+ Printf.sprintf "[%s [%s %s]]" (Z.to_string zh) (Z.to_string zth) (Z.to_string ztt)
+ | _ -> "cell (unexpected structure)"
+ else "atom")
diff --git a/ocaml/test/test_op9.ml b/ocaml/test/test_op9.ml
new file mode 100644
index 0000000..dc34c8a
--- /dev/null
+++ b/ocaml/test/test_op9.ml
@@ -0,0 +1,45 @@
+(* Test opcode 9 (invoke) *)
+
+open Nock_lib
+
+let () =
+ (* Build a simple core: [[formula] payload] *)
+ (* Formula at slot 2: [0 3] (returns payload) *)
+ (* Payload at slot 3: 42 *)
+ let core = Noun.cell
+ (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.atom 42)
+ in
+
+ (* Test: *[core [9 2 [0 1]]] *)
+ (* This should:
+ 1. Evaluate [0 1] on core → core
+ 2. Extract slot 2 from core → [0 3]
+ 3. Evaluate [0 3] on core → 42
+ *)
+
+ let subject = core in
+ let formula = Noun.cell
+ (Noun.atom 9)
+ (Noun.cell
+ (Noun.atom 2)
+ (Noun.cell (Noun.atom 0) (Noun.atom 1)))
+ in
+
+ Printf.printf "Subject (core): [[0 3] 42]\n";
+ Printf.printf "Subject mug: 0x%08lx\n" (Noun.mug subject);
+ Printf.printf "Formula: [9 2 [0 1]]\n";
+ Printf.printf "Formula mug: 0x%08lx\n\n" (Noun.mug formula);
+
+ Printf.printf "This should compute:\n";
+ Printf.printf " 1. Evaluate [0 1] on core → core\n";
+ Printf.printf " 2. Extract slot 2 from result → [0 3]\n";
+ Printf.printf " 3. Evaluate [0 3] on core → 42\n\n";
+
+ let result = Nock.nock_on subject formula in
+
+ Printf.printf "Result mug: 0x%08lx\n" (Noun.mug result);
+ Printf.printf "Result: %s\n"
+ (match result with
+ | Noun.Atom { z; _ } -> Z.to_string z
+ | Noun.Cell _ -> "cell")
diff --git a/ocaml/test/test_opcodes.ml b/ocaml/test/test_opcodes.ml
new file mode 100644
index 0000000..7ef7a48
--- /dev/null
+++ b/ocaml/test/test_opcodes.ml
@@ -0,0 +1,75 @@
+(* Consolidated opcode tests *)
+
+open Nock_lib
+
+let test_name name =
+ Printf.printf "\n=== %s ===\n" name
+
+let test_op2_simple () =
+ test_name "Opcode 2: Simple lifecycle [0 1] → 99";
+ let formula_slot2 = Noun.cell (Noun.atom 0) (Noun.atom 1) in
+ let payload = Noun.atom 99 in
+ let subject = Noun.cell formula_slot2 payload in
+ let formula = Noun.cell (Noun.atom 2)
+ (Noun.cell (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 2))) in
+
+ let result = Nock.nock_on subject formula in
+ Printf.printf "Result: %s, mug: 0x%08lx\n"
+ (match result with Noun.Atom { z; _ } -> Z.to_string z | _ -> "cell")
+ (Noun.mug result)
+
+let test_op7_compose () =
+ test_name "Opcode 7: Compose with [0 1]";
+ let formula_slot2 = Noun.cell (Noun.atom 7)
+ (Noun.cell (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 1))) in
+ let payload = Noun.cell (Noun.atom 42) (Noun.atom 99) in
+ let subject = Noun.cell formula_slot2 payload in
+ let formula = Noun.cell (Noun.atom 2)
+ (Noun.cell (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 2))) in
+
+ let result = Nock.nock_on subject formula in
+ Printf.printf "Result mug: 0x%08lx\n" (Noun.mug result)
+
+let test_op8_extend () =
+ test_name "Opcode 8: Extend subject";
+ let subject = Noun.cell (Noun.atom 42) (Noun.atom 99) in
+ let formula = Noun.cell (Noun.atom 8)
+ (Noun.cell (Noun.cell (Noun.atom 1) (Noun.atom 123))
+ (Noun.cell (Noun.atom 0) (Noun.atom 1))) in
+
+ let result = Nock.nock_on subject formula in
+ Printf.printf "Result: %s, mug: 0x%08lx\n"
+ (if Noun.is_cell result then
+ let h = Noun.head result in
+ let t = Noun.tail result in
+ match (h, t) with
+ | (Noun.Atom { z = zh; _ }, Noun.Cell { h = Noun.Atom { z = zth; _ }; t = Noun.Atom { z = ztt; _ }; _ }) ->
+ Printf.sprintf "[%s [%s %s]]" (Z.to_string zh) (Z.to_string zth) (Z.to_string ztt)
+ | _ -> "cell"
+ else "atom")
+ (Noun.mug result)
+
+let test_op9_invoke () =
+ test_name "Opcode 9: Invoke core arm";
+ let core = Noun.cell
+ (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.atom 42) in
+ let formula = Noun.cell (Noun.atom 9)
+ (Noun.cell (Noun.atom 2)
+ (Noun.cell (Noun.atom 0) (Noun.atom 1))) in
+
+ let result = Nock.nock_on core formula in
+ Printf.printf "Result: %s, mug: 0x%08lx\n"
+ (match result with Noun.Atom { z; _ } -> Z.to_string z | _ -> "cell")
+ (Noun.mug result)
+
+let () =
+ Printf.printf "Testing Nock opcodes...\n";
+ test_op2_simple ();
+ test_op7_compose ();
+ test_op8_extend ();
+ test_op9_invoke ();
+ Printf.printf "\nAll tests complete.\n"
diff --git a/ocaml/test/test_simple_lifecycle.ml b/ocaml/test/test_simple_lifecycle.ml
new file mode 100644
index 0000000..96e0603
--- /dev/null
+++ b/ocaml/test/test_simple_lifecycle.ml
@@ -0,0 +1,47 @@
+(* Simple test of lifecycle formula on small noun *)
+
+open Nock_lib
+
+let () =
+ (* Test subject: [[formula] payload] *)
+ (* Formula: [7 [0 3] [0 1]] - compose: *[payload [0 1]] returns payload *)
+ (* Payload: [42 99] *)
+ let formula_slot2 = Noun.cell
+ (Noun.atom 7)
+ (Noun.cell
+ (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 1)))
+ in
+ let payload = Noun.cell (Noun.atom 42) (Noun.atom 99) in
+ let subject = Noun.cell formula_slot2 payload in
+
+ (* Lifecycle formula: [2 [0 3] [0 2]] *)
+ let formula = Noun.cell
+ (Noun.atom 2)
+ (Noun.cell
+ (Noun.cell (Noun.atom 0) (Noun.atom 3))
+ (Noun.cell (Noun.atom 0) (Noun.atom 2)))
+ in
+
+ Printf.printf "Subject: [[7 [0 3] [0 1]] [42 99]]\n";
+ Printf.printf "Subject mug: 0x%08lx\n" (Noun.mug subject);
+ Printf.printf "Formula: [2 [0 3] [0 2]]\n";
+ Printf.printf "Formula mug: 0x%08lx\n\n" (Noun.mug formula);
+
+ Printf.printf "Slot 2 of subject (formula): [7 [0 3] [0 1]] (mug=0x%08lx)\n"
+ (Noun.mug formula_slot2);
+
+ Printf.printf "Slot 3 of subject (payload): [42 99] (mug=0x%08lx)\n\n"
+ (Noun.mug payload);
+
+ Printf.printf "Running nock...\n";
+ Printf.printf "This should compute: *[[42 99] [7 [0 3] [0 1]]]\n";
+ Printf.printf "Which is: *[99 [0 1]] = 99\n\n";
+
+ let result = Nock.nock_on subject formula in
+
+ Printf.printf "Result mug: 0x%08lx\n" (Noun.mug result);
+ Printf.printf "Result: %s\n"
+ (match result with
+ | Noun.Atom { z; _ } -> Z.to_string z
+ | Noun.Cell _ -> "cell")
diff --git a/ocaml/test/test_two_stage_boot.ml b/ocaml/test/test_two_stage_boot.ml
index 863c3a1..258e882 100644
--- a/ocaml/test/test_two_stage_boot.ml
+++ b/ocaml/test/test_two_stage_boot.ml
@@ -54,6 +54,11 @@ let stage1_ivory_boot env =
Printf.printf "[5] Running u3v_life() on Arvo core...\n%!";
Printf.printf " Formula: [2 [0 3] [0 2]]\n";
Printf.printf " Subject: Arvo core (cell, mug: 0x%08lx)\n%!" core_mug;
+
+ (* Check slot 3 of input core *)
+ let core_slot3 = Noun.slot (Z.of_int 3) core in
+ Printf.printf " Core slot 3 (before lifecycle) mug: 0x%08lx\n%!" (Noun.mug core_slot3);
+
Printf.printf " Enabling mug logging for all nock steps...\n%!";
(* Enable mug logging at every step *)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-16 15:22:05 +0000