From 941791d6096e04bf2bce375351808904dccd4714 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 2 Apr 2020 11:39:40 -0400
Subject: [PATCH] forth: remove RAMSTART and RS_ADDR from stable ABI

---
 emul/Makefile       |   2 +-
 emul/forth/boot.bin | Bin 451 -> 451 bytes
 emul/forth/z80c.bin | Bin 1781 -> 1778 bytes
 forth/boot.fs       |   4 ++--
 forth/z80c.fs       |   9 +++++----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/emul/Makefile b/emul/Makefile
index e055c93..1728a8c 100644
--- a/emul/Makefile
+++ b/emul/Makefile
@@ -104,7 +104,7 @@ updatebootstrap: $(ZASMBIN)
 .PHONY: fbootstrap
 fbootstrap: forth/stage2
 	cat ./forth/conf.fs ../forth/boot.fs | ./forth/stage2 > forth/boot.bin
-	cat ../forth/z80c.fs forth/emul.fs ../forth/icore.fs | ./forth/stage2 | tee forth/z80c.bin > /dev/null
+	cat ./forth/conf.fs ../forth/z80c.fs forth/emul.fs ../forth/icore.fs | ./forth/stage2 | tee forth/z80c.bin > /dev/null
 
 .PHONY: clean
 clean:
diff --git a/emul/forth/boot.bin b/emul/forth/boot.bin
index 54d3ae626cbcb39c4437c7591e3996c41ee1cf8f..13921e3dc43e3465e22f82f9ff7fe0aea3b16f14 100644
GIT binary patch
delta 22
ecmX@ie3*HHDmMcI!(mRw!(EIF3>yt5GXeld4+Y%-

delta 22
ecmX@ie3*HHD)$QphQpkUhr1XVK5R6Y%m@HkR|mBK

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index c27d937bcdd18f206866e9f7c49d8b8f0d473619..4b454a4e0e97d70dac2d798490ccf9fb8aeee1b9 100644
GIT binary patch
delta 748
zcmYjPzl#$=82x5;b~d@YY*2~BD7Y6QW{(4HEYx_1H!c{?OLVixMZ}XRL2QmC7Z9r`
zmKIUA%O8+hw6%$rb~fRJSlEOuG$_~!@%wgCSnRU%-uL6ZdHW~xJM;D>U;b2pa;JUh
zH{4A0hQGI3d6oX0`Vnm##a_--P!3z2!}gkc98xwouml9&^nA|-L4ZgAwd?y{EjR`i
zVLZX^>{f$C5x{v<84Xc{YAx{m+rAgTK+ISl6kOk``@uOdZBU|vv#+Ir+3;M9_*n&&
z#leC3e2C;mMw1RO7)HyYlpUHO6kx^(8S|rPL#*cBA+`jUxdVU;Cdj4XW7HL%dt{Dy
zh?)n9v(A%)uA3vx6ZX`YFybWkDfkwB7i+z~q&ihO1DtHFpsm0l&Ffi`v4baN(3>oe
z`3`!-^7R6h6a08Vk}^&1H8xL!LBm$jqSidZeL;P%?%&9Rv|%hKtYndt=#_cue$L#q
zvRvT`nxe@Ne$L6Ao!oP|ebDVZb1#q&+PZIj5Ly(2DW5Rf{FhBpL147-netdlD>+3>
zp6Kmc0}(<VHL)b7K7Q%InvjADcJ!eMU*`(8>h<6v#a>+e7H*Pa1s5Rls6s~)zJdkY
z-ra=M*S07qQALPTX`;Z?zF6uZ+^Pn(hW?uzh-EAlT*<%-8(v%FF_v24NldBmUw15<
bn6lP)FQpY;y+nNuMik3m#*8U=fKmMecx0DU

delta 721
zcmYjO&ui0g9DU#9+oUOLDvDC-(5!5%Ed#xH&{cztffZ$~Y24~XDXw^v*y%w$6xrRP
zIrk6fO%Tsxh!^i7j1}=z55c0~O{kwwzdd+JNZ$MWc<=LmXa8j19ccDT{P<Wvsn^{P
zTIEymYwf-1=4;mHbP{jr#r1s3Ln-R?_PdqxX{2p9$bi8uKk#ix1|;(F8~w~4!*}o1
z!vzdfQl7pei>Pmhe$Wj35JNc?19-SuYXspMQZ_vKoZ7Bi5H=3vk>;Vg_;xUxjflIE
zRh$EXQJj{mxlt-Y0aL-qSM4O;lq+XH5SGDJ%>iism^cfc;-}KLPEto&L?Varp}Z)*
z$KPb7|JE4NWUsmmjU6nJrBG*K8#!Lqq(4vRw*!q<G|32+Zxpzk;l~S-_bYO@<(`Mm
z!&b<LQpRq=#%?3Hm4{*D*cgj-lg0EUt(uB9e$G5FzpO54la891(>&VCqg6*lWo(RD
zN~8PaS?@*p5=<qfV;)MSRA8cw1<Uy>CL}A=_vo2uiD8-Qk6myW<#`$|EE^qjC?n)a
zx0vTOpf8nN8)>-lW#dAhQ*&u-5v51fGKI(<mQciP|NcBub-_i!Dpy3*JV2YyJ{4a~
z4|nR}c1xLbkQj;K;aV22Y{VuTOAMvs93@xyuQ@T=$gII79|Jr{w{c7d+q}Y!4xKPD
Me(6);;UT5=4|p_^<^TWy

diff --git a/forth/boot.fs b/forth/boot.fs
index 92eb1dc..59d269f 100644
--- a/forth/boot.fs
+++ b/forth/boot.fs
@@ -25,11 +25,11 @@ JP(IY), NOP,      ( 17, nativeWord )
 0 JPnn,           ( 1d, chkPS )
 NOP, NOP,         ( 20, numberWord )
 NOP, NOP,         ( 22, litWord )
-RAMSTART ,        ( 24, RAMSTART )
+NOP, NOP,         ( 24, unused )
 NOP, NOP,         ( 26, unused )
 0 JPnn,           ( 28, flagsToBC )
 0 JPnn,           ( 2b, doesWord )
-RS_ADDR ,         ( 2e, RS_ADDR )
+NOP, NOP,         ( 2e, unused )
 NOP, NOP,         ( 30, unused )
 NOP, NOP,         ( 32, unused )
 NOP, NOP,         ( 34, unused )
diff --git a/forth/z80c.fs b/forth/z80c.fs
index ee00d88..8788330 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -18,6 +18,8 @@
 
   Oh, also: KEY and EMIT are not defined here. There're
   expected to be defined in platform-specific code.
+
+  This unit expects the same conf as boot.fs.
 )
 
 ( dummy entry for dict hook )
@@ -333,13 +335,12 @@ CODE BYE
 ;CODE
 
 CODE (resSP)
-    ( INITIAL_SP == 36 )
-    SP 36 @ LDdd(nn),
+    ( INITIAL_SP == RAM+0 )
+    SP RAMSTART LDdd(nn),
 ;CODE
 
 CODE (resRS)
-    ( RS_ADDR == 46 )
-    IX 46 @ LDddnn,
+    IX RS_ADDR LDddnn,
 ;CODE
 
 CODE SCMP