From 93caa2ed665c5809210b179dfb7900b031a687ff Mon Sep 17 00:00:00 2001
From: Simon Forman <sforman@hushmail.com>
Date: Wed, 13 Nov 2019 11:41:41 -0800
Subject: [PATCH] Definitions.

---
 thun/asm-dump.txt       |  45 +++++++++++++++++++++++++++++++++++++---
 thun/compiler.markII.pl |  20 +++++++++++++++++-
 thun/joy_asmii.bin      | Bin 848 -> 968 bytes
 3 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/thun/asm-dump.txt b/thun/asm-dump.txt
index 794d706..3aaa519 100644
--- a/thun/asm-dump.txt
+++ b/thun/asm-dump.txt
@@ -5,7 +5,7 @@ label(A),
 mov_imm(0, 0),
 store_word(0, 0, 0),
 mov_imm(0, 4096),
-mov_imm(1, S1),
+mov_imm(1, B2),
 mov_imm(2, 0),
 mov_imm(3, 0),
 store_word(2, 0, 0),
@@ -243,8 +243,47 @@ ior(9, 9, 6),
 store_word(9, 0, 0),
 do_offset(H),
 label(S1),
+symbol(S1),
+mov_imm(2, T1),
+do_offset(V1),
+label(T1),
+expr_cell(I1, 4),
+expr_cell(J, 0),
+label(U1),
+symbol(U1),
+mov_imm(2, W1),
+do_offset(V1),
+label(W1),
+expr_cell(R, 4),
+expr_cell(S, 0),
+label(X1),
+symbol(X1),
+mov_imm(2, Y1),
+do_offset(V1),
+label(Y1),
+expr_cell(J1, 4),
+expr_cell(J, 0),
+label(V1),
+mov_imm(7, 4),
+sub_imm(0, 0, 4),
+sub_imm(2, 2, 0),
+eq_offset(Z1),
+sub(2, 2, 0),
+and_imm(2, 2, 32767),
+label(Z1),
+sub_imm(7, 7, 0),
+eq_offset(A2),
+sub(7, 7, 0),
+and_imm(7, 7, 32767),
+label(A2),
+lsl_imm(2, 2, 15),
+ior(2, 2, 7),
+store_word(2, 0, 0),
+mov_imm(7, S),
+add_imm(7, 7, 4),
+do(7),
+label(B2),
 expr_cell(I1, 4),
 expr_cell(R, 4),
-expr_cell(J1, 4),
-expr_cell(J, 4),
+expr_cell(X1, 4),
 expr_cell(S, 0)].
\ No newline at end of file
diff --git a/thun/compiler.markII.pl b/thun/compiler.markII.pl
index 39e3bf9..1dd61ab 100644
--- a/thun/compiler.markII.pl
+++ b/thun/compiler.markII.pl
@@ -168,9 +168,21 @@ Mark II
     sub_base_merge_and_store(TEMP3, TEMP0, SP),  % Push first item onto stack.
     jump(Main),
 
+    definition(Unit, [New, Cons], DoDef, TOS),
+    definition(X, [Dup, I], DoDef, TOS),
+    definition(Swons, [Swap, Cons], DoDef, TOS),
+
+    label(DoDef),  % TOS points to body expr, set by definition.
+    asm(mov_imm(TEMP1, 4)),  % Used for linking to previous cell.
+    incr(SP),
+    sub_base_merge_and_store(TOS, TEMP1, SP),  % Push body expr onto stack.
+    asm(mov_imm(TEMP1, I)),  % Get address of I's machine code.
+    asm(add_imm(TEMP1, TEMP1, 4)),
+    asm(do(TEMP1)),
+
     % ======================================
     label(Expression),
-    dexpr([New, Dup, Swap, Cons, I])
+    dexpr([New, Dup, Swons, I])
 ]).
 
 
@@ -244,6 +256,12 @@ language.
 
 ⟐(definition(Name)) --> [label(Name), symbol(Name)].
 
+⟐(definition(Name, Body, DoDef, TEMP)) --> ⟐(definition(Name)),
+    [mov_imm(TEMP, BodyList),
+     do_offset(DoDef),
+     label(BodyList)],
+    dexpr(Body).
+
 ⟐(head_addr(Pair, HeadAddr)) --> [lsl_imm(HeadAddr, Pair, 2), asr_imm(HeadAddr, HeadAddr, 17)].
 
 ⟐(repeat_until(Condition, Body)) -->
diff --git a/thun/joy_asmii.bin b/thun/joy_asmii.bin
index 5e85ec7f1d7740b4d23c7bea72ed3d712f97d15e..9e6a2a164d9a1f88dd93ea0cdd02e94724b7883c 100644
GIT binary patch
delta 161
zcmcb>c7mO8&qPLj#x)xa*_rE2m>C*um>HaS7#N<jFwFVSz;NK72T&{kD8>#JV*!eB
z{f_~Pr2xg4z+!zsu{Hl#7#Q4H7&sjm7&JlR4}mn(|9TZC28K#^2)~m3e|?ENKZ7FB
mEH$7I!=emEke&*6pxMV+7*YiPvoKr%8gvP0;EjJk1q=YL0w<gR

delta 40
rcmX@Xeu0hAWg??KqrpZ)c4i3{hDHBb7=(a$2@oIp$G{-+p8*H}=YI<s