From ca606850677a170ceed567137370c3b575184b54 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 15 May 2020 11:34:35 -0400
Subject: [PATCH] Streamline initialization process

Instead of letting each configuration taking care of RDLN$ and
"CollapseOS" prompt, move this to BOOT to simplify xcomp units.

Initialization source code is now only for driver initialization.
---
 blk/090                |  23 +++++++++--------------
 blk/405                |   1 +
 blk/417                |   4 ++--
 blk/421                |   1 -
 blk/432                |   2 +-
 blk/436                |   4 +++-
 blk/618                |   2 +-
 emul/forth.bin         | Bin 5917 -> 5879 bytes
 emul/xcomp.fs          |  10 +++-------
 recipes/ti84/xcomp.fs  |   2 +-
 recipes/trs80/xcomp.fs |   2 +-
 11 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/blk/090 b/blk/090
index a6ca6df..156d5a5 100644
--- a/blk/090
+++ b/blk/090
@@ -1,15 +1,10 @@
-4. Call INTERPRET
+4. Call INTERPRET which interprets boot source code until
+   ASCII EOT (4) is met. This usually init drivers.
+5. Initialize rdln buffer, _sys entry (for EMPTY), prints
+   "CollapseOS" and then calls (main).
+6. (main) interprets from rdln input (usually from KEY) until
+   EOT is met, then calls BYE.
 
-In other words, BOOT interprets bytes directly following
-CURRENT as Forth source code. This code will typically
-initialize all subsystems and then call RDLN$. As soon as
-this is called, INTERPRET will begin reading from RDLN< which
-reads from KEY.
-
-In the "/emul" binaries, "HERE" is readjusted to "CURRENT @" so
-that we don't have to relocate compiled dicts. Note that in
-this context, the initialization code is fighting for space
-with HERE: New entries to the dict will overwrite that code!
-Also, because we're barebone, we can't have comments. This can
-lead to peculiar code in this area where we try to "waste"
-space in initialization code.
+In RAM-only environment, we will typically have a
+"CURRENT @ HERE !" line during init to have HERE begin at the
+end of the binary instead of RAMEND.
diff --git a/blk/405 b/blk/405
index 33eb3ba..8977d54 100644
--- a/blk/405
+++ b/blk/405
@@ -1,5 +1,6 @@
 : WS? 33 < ;
 : EOT? 4 = ; ( 4 == ASCII EOT, CTRL+D )
+: EOT, 4 C, ;
 
 : TOWORD
     0 ( dummy ) BEGIN
diff --git a/blk/417 b/blk/417
index 931cc51..11037da 100644
--- a/blk/417
+++ b/blk/417
@@ -2,8 +2,8 @@
     H@ 0x3c ( BLK(* ) RAM+ !
     1024 ALLOT
     ( LOAD detects end of block with ASCII EOT. This is why
-      we write it there. EOT == 0x04 )
-    4 C,
+      we write it there. )
+    EOT,
     0 BLKDTY !
     -1 BLK> !
 ;
diff --git a/blk/421 b/blk/421
index 3c7e85b..4ac1c29 100644
--- a/blk/421
+++ b/blk/421
@@ -11,6 +11,5 @@
 : BS 8 EMIT ; : LF 10 EMIT ; : CR 13 EMIT ;
 : CRLF CR LF ; : SPC 32 EMIT ;
 : NL 0x0a RAM+ @ ( NLPTR ) DUP IF EXECUTE ELSE DROP CRLF THEN ;
-: (ok) SPC LIT" ok" (print) NL ;
 : (uflw) LIT" stack underflow" ERR ;
 : (wnf) (print) SPC LIT" word not found" ERR ;
diff --git a/blk/432 b/blk/432
index 079e6de..f3883ca 100644
--- a/blk/432
+++ b/blk/432
@@ -2,7 +2,7 @@
     BEGIN
     WORD DUP C@ EOT? IF DROP EXIT THEN
     (find) NOT IF (parse) ELSE EXECUTE THEN
-    C<? NOT IF (ok) THEN
+    C<? NOT IF SPC LIT< ok (print) NL THEN
     AGAIN ;
 ( Read from BOOT C< PTR and inc it. )
 : (boot<)
diff --git a/blk/436 b/blk/436
index 04580fb..c03e900 100644
--- a/blk/436
+++ b/blk/436
@@ -9,4 +9,6 @@
     ( 0c == C<* )
     ['] (boot<) 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
-    1 0x06 RAM+ ! (main) ;
+    1 0x06 RAM+ ! INTERPRET
+    RDLN$ LIT< _sys [entry]
+    LIT< CollapseOS (print) NL (main) ;
diff --git a/blk/618 b/blk/618
index 3c5949f..eabcb41 100644
--- a/blk/618
+++ b/blk/618
@@ -12,4 +12,4 @@ RAMSTART 0x70 + CONSTANT ACIA_MEM
 (entry) _
 ( Update LATEST )
 PC ORG @ 8 + !
-," : _ ACIA$ RDLN$ (ok) ; _ "
+," ACIA$ " EOT,
diff --git a/emul/forth.bin b/emul/forth.bin
index 2ea7d55cbd58c94572071541a8b5bb3e57d4b47a..85666f4f91d07e2dba27df8978b0569661de9504 100644
GIT binary patch
delta 1561
zcmY*ZU2GIp6h1q1Te>sdJ2Si81+5FS+bP|3v4%E~+EnOHJEhwW-OcW{S{fwVDjPy=
z(Si*z4b`AV$v(h++6Q=1NNoIxeb~rL6KH(!C&~-KCx1v|Br!&bsU{@Wb7s-Rhxs}G
z-#Op8_j2c-Px#kW-+ICaaPt%Ynx8w_;+_C7ZUTc*zxd4G<@-VW<$uLDA?B4mGAN7U
zic(2EP;3~;JL#emfJVNen4qG&4HM~nCT+V;2%7k?YJvnkVnU5KgYs^J4ING3<8O)c
z>ddxPG|I3lepN53msBRrHP1FI$<K&)ntL0D)o%a$;`8R65-8$c^XYR(0ww?p%Qo2V
zsHGvi8dmHB7emO>qkipQVIzShd7bs(+w+UHqhC*;A}8?K@YU@$47uZl;T_PxM^IhH
zF0TbV_kIK2Zv>b`A#!6G8X+v%KyqYB-tOh7=Z)>g=o%Xln*rB%L=5mJ@x8$J`gC!X
z?{=%a02^EAT4)0a=hy^QZi73ddXnNv1NpiXcqq9;G;`4Iqh}#Epn!~lCRD|CZI`NR
zHYCm*pIuDG#Do@?*LYOCstvYPv=v4(?~EJpI{#R+V2yX9oVK(1BI@4c>*B69nW*x0
zwom>^W0DC^LF<355zt={=)q28r6RYB8GZl$B=Vxeq+HUgoE}X7>?0m>@J-4W^b5KT
z$2bO1wqAtKqzigfe4~dO$QTv(^i;CSm*MVK3ULpPAI_Dqwfj7V{!N%TCehGuu@!b5
zJ{3<JUAde=%qC9E9iL4av`s8$Fez;;$;2e;rx%i8)TfP#oHK|T2G}J^-!t-xY8wc1
z)R~NXV;dJ2dC1y@s>I9B&(6&x<FL((EqSpD&Q*Z|=2#V*M#nDdfRNQGuNXu*<zA9&
znEiq13r5eKG42>9Gyuoin_KsJ&Y-$B<OkiczMZ%Y6!4+Uu(f9J!W1fy4c7H5thLd^
zeWG=(2U%UTLb$_Sp0Z@*3`_1&&lnb*3YwUNTx;xMkoYzj#xC2%Z^5>y+jtgqpy~Z6
z-(q)yQO$&Y{NE=Z34{>>NnxBa*$L9`!7}z6mR?c`5;5~LGP4Xfk@?J6(aGoXPH_VK
z9M9TZ$Z8EhRExv>NnECsR)8<jEipYmf4VQ37Vm{Rd_Cf;P+QyW0G-KB52pp!LNvku
zVV0*wuqEZYEe^Eo#F(QkkL_#MQ`#4yW%vVAy4mz#J{3h)>9`Tzf4_4rSn$QtiMeDe
zTBpTFEv58y=xQ(y#}>{mz@id|f%)0l(y4_PvIP(12N*G!J&R|+g6q)jui@R~X0tgB
z&ZB0TG@>gUKL^SIM*P{(tK$OGrN!~mqN}M45v2W|QpPqmd^D(Te*qc0(ezxn0N>H5
zhW2^|%3cBQVpDA>4m)FEEW@OlqNy>7_;uWZV|b+t=v((B`{BAnP5GPQ<=`C3jK$#%
zTmoF>L+Q+zf`Wy6N%$?9&hhwIG2^y)>U!0>dP;}aa4u#fg3wKfW5k3w7_lC`q@Ije
zC{gUxK=yDh<2pwp@HW3BmLgFZ&Ej%ohecPY*<m_Eg?<zN`yV%BbumU_j70Vi)YMJ$

delta 1642
zcmX|BUu;ul6hFQ9+i34?zuVh?@<-sdYuK&RDj){yg6r*WS;t-5v>l-?lMI9gHaD^j
z2@hj)Q4=5fV7`UK8DEeraZwVMNF+uR+!KZe9!!)M1w+sTje8&(ePEt*JACM$^E>Bv
z{-5vf=RQvRR#nfc=>fQW)%T50{NQ`Rb6a?ow>)_<t2`^O`5NMi((HPuSdgpO*_s`I
zcD|?>pu!=a1&6bhLe_HZFnIZX)c^@haZ*kA*L<I}S<vYP4?ias)Z?2jp;CrR;<5UH
zI<GS6b^ln~jC@cm`ZI0&)xEwC#U1|+Y0W48@lVh82Mhofl`XKGLrD!7U&4sp;2?!G
zCOTsnf0<<hGx91k@!PeHr_k06H090sx$kM|Eyz2A)xOQp#xn>vkh&Of&3kk-|02L7
zqR8zHXosj|!Bzrh<V~)Rmf!d;WM5+$A#umkFG~D*{GR2zJxpBXyJnlb3isF1wAuj@
zH^2)`Zh@0mT}g4JT%{!iHY6t>!03<o1GKD`a|*~vG+brTc|vsBnlh6b=<vR$>ZZpu
z3(Sep)J`PpS^_3UVa3mP5_<OJ*tt|h3}^{?h3jHc>+QIxEi;-^I-$cn|58iB3g3%z
z)+$wMh`q;ei91@|Z1PpMPySP5k^wKnw*Ol}h5e3&y_&{JHs!Q<E%;J-3${N9b@_C#
z$?1dck8E)(1y5aG2rdLIILeVg-ZEGblNN%yMl)Mx*MUh*nj)IU5l4-<8|+Fo`5gSR
zPIdGS4wOf*x(7Utd@lxyV+R=AX2iZBUex#G>N;(Qd20ORSW3r@TxNBhN&WhaOq+oC
zv8hxP@qWE2*L4~#0}Dv{nUR&Q{U|=wjbs>;Hz(g18$X^(z$VxHv}>;5C={q7?JMzz
z-iZ^YV!Y7Wl8d^9WstiW`5HQWsE{_Wp^Zw*Y{PBpEGBV5zpES21{~A)YyAPQ>y&~8
zm0qXVy#p7E9DVN2*$*vu6!=J}g)g&h?LvgYPtg(VagX4%Ue}Ydsb0{Na9(^J>coQ5
z;@42e&`ms@pxfqq@@;lEL~ZYZd-6WHKM=(bBt@~I*Ab(T|Arb^XH*(dDI^WyHypwo
ze2YUb6l->+T(N71!N>75PlS^p23f5N-=o$%HZd{Xo!T!hhdVu{xE1c`xEY|!O}i;3
zVJS=vqno|P4BTD%H!4DrF3(MIAhH8F!;z==rGq=Q@4|EN2wgg*Y;UD&JGP7tlG1$g
zJ08J+Z;qTAPi;f(sJIdt>G%w>-qH~6brP<_Uf&YFQBJ8;*5DmP<_HnxXkvEFcYsmj
zEyx6MDe3Xz_;}D0)qohz@s9H3z!;L~%x-vlqE+~bdXV4k257he+y_pzpw?#>qZo!s
zOUk+umuQ-{Q?+$BbQNt|mZTqO87wJ}aVaeOV4;|Rckw~PBRrTb6crSbxM-ArQl{G+
zEY=E6#D!Z?Tkud2-p0xg#A2Ab0SRQ}#c(XSbzU8aB~c>oP_8skE;#mZ4BqGS;-lF1
zSyJOY;!~U(tW@k`&FC@u?22u~jf_z!7HS4Pvc^#7uwmz`JtXx!gUSscPC%RhTGyoE
w6l&eZ(W&!O#?XoJ>B;lMEhINFHa2o*>O`q(m}e$WjZdeHqGP;b6c|PL56l{4c>n+a

diff --git a/emul/xcomp.fs b/emul/xcomp.fs
index 4551be1..82ead99 100644
--- a/emul/xcomp.fs
+++ b/emul/xcomp.fs
@@ -28,13 +28,9 @@
 ( Update LATEST )
 PC ORG @ 8 + !
 ," CURRENT @ HERE ! "
-," : INIT "
 ," BLK$ "
-," ['] EFS@ BLK@* ! "
-," ['] EFS! BLK!* ! "
-," RDLN$ "
-," LIT< _sys [entry] "
-," LIT< CollapseOS (print) NL "
-," ; INIT "
+," ' EFS@ BLK@* ! "
+," ' EFS! BLK!* ! "
+EOT,
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!
diff --git a/recipes/ti84/xcomp.fs b/recipes/ti84/xcomp.fs
index a550a36..8313ea2 100644
--- a/recipes/ti84/xcomp.fs
+++ b/recipes/ti84/xcomp.fs
@@ -68,6 +68,6 @@ CREATE ~FNT CPFNT3x5
 (entry) _
 ( Update LATEST )
 PC ORG @ 8 + !
-," : _ LCD$ KBD$ (ok) RDLN$ ; _ "
+," LCD$ KBD$ " EOT,
 ORG @ 0x100 - 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!
diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs
index 53becd9..e69a94a 100644
--- a/recipes/trs80/xcomp.fs
+++ b/recipes/trs80/xcomp.fs
@@ -15,6 +15,6 @@ RS_ADDR 0x80 - CONSTANT RAMSTART
 PC ORG @ 8 + !
 ," CURRENT @ HERE ! "
 ( 0x0a == NLPTR. TRS-80 wants CR-only newlines )
-," : _ ['] CR 0x0a RAM+ ! BLK$ FD$ (ok) RDLN$ ; _ "
+," ' CR 0x0a RAM+ ! BLK$ FD$ " EOT,
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!