From 76037ca1e7bf2ca406e850ee88df34f1b7256dbb Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 13 May 2020 14:19:54 -0400
Subject: [PATCH] Simplify boot process

That INIT thing is unnecessary.
---
 blk/089        |  14 +++++++-------
 blk/090        |  27 +++++++++++++--------------
 blk/091        |  16 ----------------
 blk/411        |   3 +--
 blk/430        |   2 +-
 emul/forth.bin | Bin 5884 -> 5858 bytes
 emul/stage1.fs |   4 ++--
 7 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 blk/091

diff --git a/blk/089 b/blk/089
index 0aac0f4..518d49c 100644
--- a/blk/089
+++ b/blk/089
@@ -1,16 +1,16 @@
 Initialization sequence
 
-On boot, we jump to the "main" routine in boot.fs which does
+On boot, we jump to the "main" routine in B289 which does
 very few things.
 
-1. Set SP to 0x10000-6
+1. Set SP to PS_ADDR and IX to RS_ADDR
 2. Sets HERE to RAMEND (RAMSTART+0x80).
 3. Sets CURRENT to value of LATEST field in stable ABI.
 4. Look for the word "BOOT" and calls it.
 
-In a normal system, BOOT is in icore and does a few things:
+In a normal system, BOOT is in xcomp core (B411) and does a
+few things:
 
-1. Find "(c<)" a set CINPTR to it (what C< calls).
-2. Initialize all overrides to 0.
-3. Write LATEST in BOOT C< PTR ( see below )
-4. Find "INIT". If found, execute. Otherwise, "INTERPRET"(cont)
+1. Initialize all overrides to 0.
+2. Write LATEST in BOOT C< PTR ( see below )
+3. Set "C<*", the word that C< calls to (boot<).        (cont.)
diff --git a/blk/090 b/blk/090
index af74409..a6ca6df 100644
--- a/blk/090
+++ b/blk/090
@@ -1,16 +1,15 @@
-On a bare system (only boot+icore), this sequence will result
-in (c<) reading characters from memory starting from CURRENT
-(this is why we put CURRENT in BOOT C< PTR, it tracks current
-pos ).
+4. Call INTERPRET
 
-This means that you can put initialization code in source form
-right into your binary, right after your last compiled dict
-entry and it's going to be executed as such until you set a new
-(c<).
+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.
 
-Note that there is no EMIT in a bare system. You have to take
-care of supplying one before your load core.fs and its higher
-levels.
-
-
-                                                        (cont.)
+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.
diff --git a/blk/091 b/blk/091
deleted file mode 100644
index 531e4fb..0000000
--- a/blk/091
+++ /dev/null
@@ -1,16 +0,0 @@
-(cont.) 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.
-
-
-
-
-
-
-
-
-
diff --git a/blk/411 b/blk/411
index 22a0271..881afcc 100644
--- a/blk/411
+++ b/blk/411
@@ -9,7 +9,6 @@
     ['] (boot<) 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
     1 0x06 RAM+ !
-    LIT< INIT (find)
-    IF EXECUTE ELSE DROP INTERPRET THEN
+    INTERPRET
 ;
 
diff --git a/blk/430 b/blk/430
index 38c1c92..866332d 100644
--- a/blk/430
+++ b/blk/430
@@ -6,7 +6,7 @@
       the last typed 0x0a and one for the following NULL. )
     IN) IN> - 2+ ALLOT
     (infl)
-    LIT< RDLN< (find) DROP 0x0c RAM+ !
+    ['] RDLN< 0x0c RAM+ !
     1 0x06 RAM+ !  ( 06 == C<? )
 ;
 
diff --git a/emul/forth.bin b/emul/forth.bin
index f4efd95e527e3e3f96b0bba9dc1526d654b600b6..7be25aefc2698aafb4911f839f5c285cb4196463 100644
GIT binary patch
delta 1534
zcmYjRZ%7+w7=P~WjV8I=dzZw^=0^3Rr@h$dW{aD%+tf2rL(@b}#0J?qS8LEZvucNw
zA<Ebv#*neTjD0I?bbnC%P!OSou?|=EsU@Hv*N&Dl9F)SKpUS3t-aGB~;gWlP@ALeg
z-~0Tzznkwj`!;1^(-HvgT=g}|l?A^I{avH%gnV8ovLEGc;SSrA&s2H?21wv#lYuYf
z9hr!~1g1R;(i-z9u|+|#!A_ruHU+>#4G>`;cwGU4HaV~p`GN`+h*TUPmh0g?uw&dF
zQ49d0OAe{2BGN7!P=GWhG{8%)phck7w?g`q1!<Ekw&9<vAcoFu%Cgje&jZ1Au%S0S
zoa=uUwe=xf#Mp0L!CgUgzo8J3hy3X&qAp#uf!hmG#G!C$qm3B6;iR*{I{VJ#g&4oc
z3i%21S}acEg31cCQHZl8dTe4IPg;E@4AN?!4c&HjC|~zHd`!QhCfxOK%+4twVj;W`
zr#7T}WykV6R?m=YDf?Esmlx$8-9pdYK#w0J3^X9ls?}QYFUmU9AuCQdNt<*;C87bZ
zfKYL8l{n48!#x{1TR@=8(iB@)UwZjVte*x2={q$}`C~)NscJ_62nDIEmQ@>0Qw-p2
z9jJncWp$Ubs8&_MPx1A**3=ZIOK^WLfX<2GlLKR@af?PV!i&^Vk(aqlR>(E@M`fRD
zhsQqCY)EA+SH1|Y84EbK>4Hau1J>ls#B?m^ly+4k;$>|?;;lve?YWqa_+@QbTGe>3
z2-v`_-wF5Hr8n6#LBp)U+gP*X(=%scbx`TJUw7R7STaB4Fid8n!NaxuR$Qyw_CGK=
zPq&QeHjuE$z78H*ysf<$1RR(rds}o><7sRdN~ANdK8NGLo!2CS7Y%?DB6IQ|f-b&7
zgbF_Ad}iGs^C$-KK^}3y>&RzHk8qf8YbM+b8c4&PH^|el2(%n+#lCQ%et7KMd6!PH
z(NKMI8+SwlUfz3BnY4s<aVEO(y-gZXbX3JH9oxXqxyt@f5jk}6S4Smp-OgTsZH6qN
zjXez2tJ@0Sx)w)*30GN7xKr3>Z-#3Ud^dFIRtU#5+npHF@D^p_5)*Ms4XC$5OYj(H
z%sD=C2%F@FM4h$bBF?iL;hg?+xQO+BAn-C(`*K*E@4aixsu~#IkyBMR^kh#Cq|!+W
zpHL2%=)_lLbRT~s0-xf6vpvbaR3-o)VL5TV`nppYKN==>x7yb(n-cdK&g4_+DhDod
znEh7O_!=+22v;yF-=ECr@FCW=U4CDVio8q7bS@c0%q4O?|2uDIo%-ad^`{Iy*-S3q
zoymv6OV?4>Tlz9`B(e&8fDG3hDZD7z0oCDL`ky$fbS@Ugh1sQbP&$X-iNK{uZNnhF
z>%r-rpP7i&V3h}*<N4C;xG__@U`&+Wn;C~emWVV9BWyPE0{(szsqeU`m~bo-!7r8x
qlaU7ee-f;N({mT+AndP$p3?O6*t>IQjcktR;j4Wdgj6P#H~s|*?LJrl

delta 1575
zcmYjR-A^M`6hAX_%eI})M?a>DE^AwAX(3?N&0?15E*)ByLO+m}XcH2GKnbCtE9{17
zwka|0`m)_<?jNAZCTfU27!s0dj6|N+2jRsBjbXDNBtXo@n2iq#!E^6y)raZyocWz|
zf9L$pxevOJx*c1xuoV>mj=pk4<kKNYWm5&XW19mzJQDKI0)|+0nlRLVh4#vC3)kuA
za$NX>9?H|F+FSvUpp6z>AIZlu5r1}-ZB^-e`nxMu^D8Ep>5*Wk3v6ltM0o1Br~pBm
zH0?y8s6h*QTAH4yg|Ij67_-Yt0Du@0Pa4+HlaT{Zgft!)06S@*Mc}MsjZ7$2X^YGc
z<I7?YL-4Rtm-_H|Bv=3w2GisDp=XiX1iI%i_G^o9zZ>B{DMVx;2iOMI027#9mAZHe
zD{U}>!5d_P3aTlDX+n(%ak`+MtKCx9$XQ1iN@}aagt(a-D}<hho9Y*87<O&UXXX_U
zv1B{MRTI*KGPj)E8W^)I<*Ah(Waa;<?jtfkI^YBe0|WeHHr)(N+v*Y#Ey?VbW-S_h
zQ5%cK)h%*f>eq-EfD0hBH0z10dHC(bgiAdjsCB7EKh}C*U&AKqP?WyW;wpPg=y|i1
za|59$?P+_O36m-Yuxx$EfrxvWS7V)DBMt0P9kpQ4Ao|%C8qqsD<LW9rI0<5GVmvcC
zh1Kk<K}=xBlY&T^zz$*I9-Y3ccho-7O`O4~Rj3G-8FTTv`{6NRj_CYisT_0T+^msJ
zorvptRbq0Z|E=Yif&O*9E^X>eKLRE&>mFe!ul5U;HIgibc*1cUp#NIOIu|j-bBKs8
z&6F3XV<9-jQ*HB9PHemr@|ZF}2i+Ynum-R?tTFi;i7_g5q_TmBU8lF)ZM_fmq#JO+
z{yN!LH+4qAgt0_A`|5KzJ`DUNSIz}IL}tmqb+6NV?$aY|!r$N%zKwxl=`l|ELp@}L
z<BA%1xQl<^AZ&lwE}&#DUqHziF(*9X^?S7%z36FA9^ek?T&erg4jJ(<<@({ibY3be
z2C`t5fs!=P$5_pJ<}imL{>oV~8TU_u^ixk%7^d5vcI`l6TiL_U4a1LA@Lm!QXxw`y
z!FI=x4m~*Bxp-ns$5MBQm6(V%EvOxOR^bVbAOGCdhJslkLB4j3#BF-Vn>Tj7&3lMI
ztApwDnf(VU`$m1oa>-}HKrS<yN+(tLKt%_w`22mxGGDRe<y6)MH}IOk9lRV*Wu0h*
zQM^`1Mh;61GoCG^(mw8<V{ZDLFY*j)x(E%7DhwsF2E320%*Y?oBVVi1z&j5A%R#X!
zWoXEluigC@J&?=h3-N5h3wHG`Qm7hr6eE#S;5|IH!H;G2=0-Kl8HUyW5s6k7VqV+}
zuNH#J0$v<!S)$iU<&~HZTN8rit5eepfoqF1vrDCNWd#wtHbktnEtX<uu(>53x>8x1
z2`pBw21*r#LWy?xyM;0x_rHX{H~j6d+*ZOc>hHpfEDSgOefZWqA(&i#XBoWC5DZkx
U<*6&nvw>Wmb70s0<ZB@O10^3wsQ>@~

diff --git a/emul/stage1.fs b/emul/stage1.fs
index 73d3f51..484c541 100644
--- a/emul/stage1.fs
+++ b/emul/stage1.fs
@@ -20,9 +20,9 @@
     RDLN$
     LIT< _sys [entry]
     ." Collapse OS" NL
-    INTERPRET
 ;
 
 (entry) _
-H@ 256 /MOD 2 PC! 2 PC!
 H@ 0x08 BIN+ ! ( update LATEST )
+ ," INIT "
+H@ 256 /MOD 2 PC! 2 PC!