From b1a95648f142d108766a887ead75deb7b990a9d5 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 19 Sep 2020 20:35:35 -0400
Subject: [PATCH] De-stabilize EXIT

This marks the end of wordrefs in stable ABI. Nice.
---
 blk/265       |   6 +++---
 blk/280       |   9 ++++-----
 blk/281       |   4 ----
 blk/283       |   4 ++--
 blk/287       |   5 -----
 blk/305       |   1 -
 blk/397       |   2 +-
 blk/805       |   2 +-
 blk/811       |   1 -
 cvm/forth.bin | Bin 5208 -> 5208 bytes
 cvm/xcomp.fs  |   4 +---
 doc/impl.txt  |  25 +++++--------------------
 12 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 blk/281

diff --git a/blk/265 b/blk/265
index 905ce9b..534dbcb 100644
--- a/blk/265
+++ b/blk/265
@@ -1,7 +1,8 @@
 : X:
     (xentry) 1 ( compiled ) C,
     BEGIN
-    WORD DUP LIT" ;" S= IF DROP 0x0b , EXIT THEN
+    WORD DUP LIT" ;" S= IF
+        DROP LIT" EXIT" XFIND , EXIT THEN
     XCURRENT @ SWAP ( xcur w ) _find ( a f )
     IF   ( a )
         DUP IMMED? IF ABORT THEN
@@ -11,5 +12,4 @@
         IF DUP IMMED? NOT IF ABORT THEN EXECUTE
         ELSE (parse) XLITN THEN
     THEN
-    AGAIN
-;
+    AGAIN ;
diff --git a/blk/280 b/blk/280
index ace73f8..9892f73 100644
--- a/blk/280
+++ b/blk/280
@@ -9,8 +9,7 @@ is IP. SP points to PSP TOS, but you can still use the stack
 in native code. you just have to make sure you've restored it
 before "next".
 
-STABLE ABI: The boot binary starts with a list of references.
-The address of these references have to stay to those addr-
-esses. The rest of the Collapse OS code depend on it. In fact,
-up until 0x67, the (?br) wordref, pretty much everything has
-to stay put.                                            (cont.)
+The boot binary is loaded in 2 parts. The first part, "decla-
+rations", are loaded after xcomp, before xcomp overrides, with
+"282 LOAD". The rest, after xcomp overrides, with "283 335
+LOADR".
diff --git a/blk/281 b/blk/281
deleted file mode 100644
index 5c2b1c8..0000000
--- a/blk/281
+++ /dev/null
@@ -1,4 +0,0 @@
-The boot binary is loaded in 2 parts. The first part, "decla-
-rations", are loaded after xcomp, before xcomp overrides, with
-"282 LOAD". The rest, after xcomp overrides, with "283 335
-LOADR".
diff --git a/blk/283 b/blk/283
index cf18906..de4815d 100644
--- a/blk/283
+++ b/blk/283
@@ -1,7 +1,7 @@
 H@ ORG ! ( STABLE ABI )
 0 JP, ( 00, main ) NOP, ( unused ) NOP, NOP, ( 04, BOOT )
-NOP, NOP, ( 06, uflw ) NOP, NOP, ( 08, LATEST ) NOP, ( unused )
-0 A, 0 JP, ( 0b, EXIT ) NOP, ( unused )
+NOP, NOP, ( 06, uflw ) NOP, NOP, ( 08, LATEST )
+NOP, NOP, NOP, NOP, NOP, NOP, ( unused )
 0 JP, ( RST 10 )  NOP, NOP, ( 13, oflw )
 NOP, NOP, NOP, NOP, NOP, ( unused )
 0 JP, ( 1a, next ) NOP, NOP, NOP, ( unused )
diff --git a/blk/287 b/blk/287
index 43dbbae..9f66c93 100644
--- a/blk/287
+++ b/blk/287
@@ -1,10 +1,5 @@
 lblexec BSET L1 FSET ( B284 ) L2 FSET ( B286 )
     ( DE -> wordref )
-    ( When we have a BIN( offset, we need to adjust stable
-      ABI offsets. )
-    BIN( @ [IF]
-        A XORr, D ORr, IFZ, D BIN( @ 256 / LDri, THEN,
-    [THEN]
     LDA(DE), DE INCd,
     A ORr, IFZ, EXDEHL, JP(HL), THEN,
     A DECr, JRZ, L1 FWR ( compiled B289 )
diff --git a/blk/305 b/blk/305
index df45427..26fb37a 100644
--- a/blk/305
+++ b/blk/305
@@ -4,7 +4,6 @@ CODE EXECUTE
     lblexec @ JP,
 
 CODE EXIT
-PC ORG @ 0x0d + ! ( stable ABI JP )
     C 0 IX+ LDrIXY,
     B 1 IX+ LDrIXY,
     IX DECd, IX DECd,
diff --git a/blk/397 b/blk/397
index 81bc1a9..b1af1cd 100644
--- a/blk/397
+++ b/blk/397
@@ -9,7 +9,7 @@
 : _ ( : will get its name almost at the very end )
     (entry) 1 ( compiled ) C,
     BEGIN
-        WORD DUP LIT" ;" S= IF DROP 0x0b , EXIT THEN
+        WORD DUP LIT" ;" S= IF DROP COMPILE EXIT EXIT THEN
         FIND IF ( is word ) DUP IMMED? IF EXECUTE ELSE , THEN
         ELSE ( maybe number ) (parse) LITN THEN
     AGAIN ;
diff --git a/blk/805 b/blk/805
index 6db43f3..dbc7e12 100644
--- a/blk/805
+++ b/blk/805
@@ -3,7 +3,7 @@ H@ ORG !
 JMPn, 0 A,, ( 00, main ) 0 A, ( 03, boot driveno )
 0 A,, ( 04, BOOT )
 0 A,, ( 06, uflw ) 0 A,, ( 08, LATEST ) 0 A,, ( unused )
-JMPn, 0 A,, ( 0b, EXIT )
+0 A, 0 A,, ( 0b, EXIT )
 0 A,, 0 A,, ( unused ) 0 A,, ( 13, oflw )
 0 A,, 0 A,, 0 A, ( unused )
 JMPn, 0 A,, ( 1a, next )
diff --git a/blk/811 b/blk/811
index cabbdca..f4a2892 100644
--- a/blk/811
+++ b/blk/811
@@ -2,7 +2,6 @@
 CODE EXECUTE 1 chkPS,
     DI POPx, JMPn, lblexec @ RPCn,
 CODE EXIT
-PC 0x0f - ORG @ 0x0d + ! ( stable abi )
     DX [BP] 0 MOVx[]+, BP DECx, BP DECx, ( popRS )
 ;CODE
 
diff --git a/cvm/forth.bin b/cvm/forth.bin
index 5f034940a54960d1e6b9b209fd71cf3441ecd784..1062b4b576e7f711e326673ce25de1b7144586a1 100644
GIT binary patch
delta 2200
zcmYjSU2GIp6h3!$yF0tx|D`|3RQliDZ96Ru720gu-EFsJ?RK`^pF&d#NUWhiE0PjL
ziA1PD6H#OmO-*z)F;ZWMCYosC?~D58gD*s)F(%@RFC>H)u=t%j-QdHVne&~Wd+s^k
zy>laSBl5|g;=D$wjM3>OyGRj{A~f2U&ZjNiPB)>Cmh$<uQH%vih0o0Yu>d)RUuof>
zgbTs<1b>fbjInAYY=)&wmw{xAVISEL-7BLrM#Ll4KGJW>kc<(v91?U;;UXeSD^Hz_
z2FW2zaZp*KDWyR)2+e#$X-CP)R4!j^qbhMsysc=I&gb38_c%Etr%o@etVZKX57}1f
zTiAx`NQjH#K4}zJ<>&k27Vu%WRMw@^8?Q$7DSB{zlTAac-Bx7G5btYKe)kR!@iGk_
z8(W6sY)O$qpVFpsj?O{;MVdKd+l~sSGDa<Ye+GzB%Jdc@rjiGO61)8nGcwbRSq{b0
z=p;9;OdD|TKEw-@(RIuq(aB4%(Jlbj@BnJ+3;^1&#l$t~(ak-T9yN4*%cZ;Gavi<f
zwAI&WR5G%;+;kl}dxVbB4>X6GJMBr>m+g7T@9h1MckO#2d#d(BUaD$>{J5$F`JhUN
z)E%)9Du|D?V#yRaFjWlRJnm>5)~Krioz*cfUHKf0z|?58D~PS=N(|4nEi9EOCc@Y(
z@90M)5yaj5$+4?fqy2>uU1n~g+dSV~aiqdXo*neAivFQPGo#MNR*eondvu2k@=1~%
zUVM7hauW6#XM>n=Vu#Kg%KX~d4Ecw%W>%xlCO<0Mu(b$oHP_nXL-}>$9UBIg8{@9m
z37%duo6QwH;M_fN->Ff@2v6sXGmd&Xm{|SleZr_!)HA8JVu4d?ZM{Z)h5gCtZ3s(|
zjS8wIHS;}nCtSW!cX#nJv+1rrxai6TMb$EWq-r#sPtOMBskDIsYt$mZ1M^W=YaEAT
zab@-N*=RFP-x+7rh5qK#$s!J|Ll`b*B$`6A$$Tc6%BI5zKP1tps+ljk9z~jWT{|GZ
zbTvZ$>S~7+?i$ECcQd#<U)+~A7MhU_mqT_k5mROPyJcGeG{t-pc&q{pTYcVJ(Z`B&
zenh8eu!2M^k2rL`A&?~M$L6lOap~CkyaQ=vL^r>1H}puosSWxmcZ)cJXO&EG!Oim-
z&z1`N>QTT2z-ajIZq2k;x9_rI5L6}Bw_GEO%S)?Rh%b==ghoy*o{jPdO~HJhuigV`
zRuA-}gSl*Bk8JleW}VF#=>j{ZsF6os>^?AOsSX+dSOtlmdH6=!>Dlol)-G%V9a5x{
z%Y*oF>ppQyZ8UFb-YqRV&fQq><ltGD9%YL0Ivi+ZD}mgo%OI3vmD<R*>;Yvwk}@71
z;BRv2d!7isTfK2ajtqi>Eh6gG%#+@BbWne;O;$wW5wI>mb>bPX%fk<B2exn7>cqNt
z9Wmc~7kDo|KE|WIwgKMJNDC@kqZFN|TS^&k74Lu0kID30y)3#U=lQVAQnhA&;NwgW
ze9Wyze;;JQzZ(ZZ@9V*uoX(9yjln(d;bP1F3Ap_2AA{@)Fck}d%OGJkmmKSS4I^L%
zC}KWfLHPh6z5w$yfn-tdE1vnlAl=!rc4`>56;Y<j`(MN+6EUmgVM)nkg8RHD$i#xN
zDQ5kT5|**4nyp34Y90@EpsK6E-XIvX{KV2qRL3HB{0D*l5_}!<Xec_R(O9mPE?|;*
zy5i7rEATbzr!^ph5>ds85FgBJrfAeis-=Km0fN8bOZa<<=o#k=p!8kMyb)q*-3>LT
z@$(!Xk$HP$mUV$+OngGa$h}6o@|o>Ks7x{NJDn}yxbuo_@MX{bu&(gczYuOg^?LJ8
zWLgZTDCWVs=9}R#I-N>SWQ+j4jOz!jm`G*}Hxw&}u2iZn8O2PtRvN5ADu($GiofI6
yXu$yn9+7{#(cIK@CY$!rC6Q3S3RU(wzlAT<(yK7=);;qb3vRk7-SEHJ7X1%<sEZQ-

delta 2200
zcmYjSU2GIp6h3!$yF0tH|4V-m3*G+iZrf>TsL*C<cemY^wcFWte+o@0AhCu5tw>4~
zB@&?qO+=ANG&RxH#7KQ1nrNblzc1>W555qI#+ZmNzK{@Jz~XoAbb}9bX3lqh?z!iD
z_s)&zjp!$Tit`$!vqq<v>>^D>iqL3ZrjW68JKcmnQZ5uSMkyX76+YAd#{%ROex-$j
zk}d?_6Z}1vHAXcgY=)&mmw{xBAs^Wg-7BNBM${wKKGJW>kgO529FlZU;Uc1o%TJw*
z1<4^yaZp*MNu^OV3e9{&X-CPabiPn(qZ)Bcysc=IDHPnu_c%GDr%o>}uf!5c57}1e
zTiEv2lMolhebOkQ%Fp-3E#O0LsjNw*H=&{WG(9-K!KS^e-Bx7GUf$P+{O%pv%gZ!+
zY-|}yuq90jeM%e3IXVaV7is3SZ7V9A%o=s@{TU!isnA=9m`oiAO6>MS%*akLW;v9~
zBNN=X3a!Jv`w%ZsLDw;ZWG64ZN;?5u!viSN8343yi;HX0qnmpwJ!<Ltrb~C#<vMz|
zVQZ+>sBGl&`Kfwz_6QxLA7~aeciL01FWC!_-`V>i@7ni3_SEc$yi^l`{J5qJ`JhIJ
z)E)5<Do6~sV#zc)FjWlRJnm>3(x|Huoz*cfUHKf0z|?4@D~PS=N*vF%O)Q-)CBxV(
z@90M)5yaj5$+5Fnqy5EUU1pBZZJuwwG+bpQ&klN5RsYbTnK5Tmt44>PJ-ST>`6S5>
zFFd_sISKo;vr$Ytu|sDbWq$2!hWx`>JEKu&#E;6>Z7qUZ&9(OUP=395$A*FBN4e|u
zf~S|t<?<yDICoFncWTrz%+opJOrV|)CRV?CpD=0_^-QR(Sm2ae*Pu~faer!R3&PT5
zqoQg_&3sSY0he#oU0uA)Os1<3F1oT#F||S;sTxfcGBZJWDs5oEDzymkz})U?1y!R9
z%PXhP#+q^Z&NyQ(^tX^nm2hYs!f-Jo(G;3V6|$*xE)z!hA&JIR&3w_d9ckWmZG-&M
z)dcygs~u9fYa#31&EW1_X<x>eZ$>s;4!MbBT$SbTl5GVLiTfn*SQQwu`n;#AkCtZr
zh)&aB6^U9N3Fv%7AW6)R&0Tfl(y{Y-2hz%jZhqlz?2&q;4f-i}i#UR3g-mh5&GQ+{
zm5citP{0MiX!!4L&9rOnJFOT5)rhrC*XY91;tCexOJo3{(Gv@2V?07rFyH62-H@g>
z(2ox0bH&}V-BXx#E^B0p?3kt|9(}3%z^tV@XaHahBzorI8)=7U+ml$kxCL}blS(cR
z;>WD}#4WXvf~9#kwcHqYW8Ra8XK`wTDaPw?ppmNva-%MTP>vO9BioV(l<`Q)czA%n
z$))dkqWEt0CJ;G12oAQ0m{&7TdfU-K{kb+-5s62@x&YOSXS^;CKd>Fxx@oHyYu+`)
zeD9s-z4-VTkNDaKct^u6sBD$ebe?W06}(lv|3N<{GP4b`=(3#W!!pa7W`5w~Ob>j_
zttNjTWYND12SM-a!J3@TjYEyWJ@4USEB<k~{Ouow><Tayi-F4^VJ@E<?R*U*U<N2+
zE?_~003f~q3p9>oG4Cs$xxgUZ*|c^(ieXz36{^1fMQkb=w@Mz8luRYL&%1+6EEpqk
z>wlEAj1i5kCCh3a4|brctHItN7_{`n;&M#KB6s`;f&LPF9r9=>HmT8QzLhRuk_Ecr
z&~Yp9HS4EUAcGQ7#fcCf%v`o))Jm$QfnNcFzu`;xdx_W?=L?|pUCq1^VrtzDHD~bi
z92=H-dt{b1fn!X3Lc_?tO1koy?L??Taqv5nE8@8Gif!;^&;GEk@YO#bZb9{W^A2QM
z2&XCT!Mf&~;V?R#&WvY`0KJUs2dx-SWeqnJD~GOBt1cU*Y_3iktU{`Wxe$uK<JV~3
w0R|qCf4Y(U<Wx47@zEubRKE&U_c^zT&)3nbF!0tra~<<;x+vZ7zu6M|58xGmKmY&$

diff --git a/cvm/xcomp.fs b/cvm/xcomp.fs
index eb33c22..1ca494b 100644
--- a/cvm/xcomp.fs
+++ b/cvm/xcomp.fs
@@ -11,9 +11,7 @@ CREATE BIN( 0 ,
 270 LOAD  ( xcomp overrides )
 
 H@ ORG !
-0x0b ALLOT0
-0 C, 0 C, ( EXIT )
-0x08 ALLOT0
+0x15 ALLOT0
 ( END OF STABLE ABI )
 H@ 4 + XCURRENT ! ( make next CODE have 0 prev field )
 0x00 CODE EXIT
diff --git a/doc/impl.txt b/doc/impl.txt
index 1e015bd..97113d0 100644
--- a/doc/impl.txt
+++ b/doc/impl.txt
@@ -195,28 +195,13 @@ otherwise be difficult to access. Here's the complete list of
 these references:
 
 04 BOOT addr         06 (uflw) addr      08 LATEST
-0b EXIT wordref      13 (oflw) addr      1a next addr
+13 (oflw) addr       1a next addr
 
 BOOT, (uflw) and (oflw) exist because they are referred to
 before those words are defined (in core words). LATEST is a
 critical part of the initialization sequence.
 
-Stable wordrefs are there for more complicated reasons. When
-cross-compiling Collapse OS, we use immediate words from the
-host and some of them compile wordrefs (LITN compiles (n),
-";" compiles EXIT). These compiled wordref need to be stable
-across binaries, so they're part of the stable ABI.
-
-Another layer of complexity is the fact that some binaries
-don't begin at offset 0. In that case, the stable ABI doesn't
-begin at 0 either. The EXECUTE word has a special handling of
-those case where any wordref < 0x100 has the binary offset
-applied to it.
-
-But that's not the end of our problems. If an offsetted binary
-cross compiles a binary with a different offset, stable ABI
-references will be > 0x100 and be broken.
-
-For this reason, any stable wordref compiled in the "hot zone"
-(B397-B400) has to be compiled by direct offset reference to
-avoid having any binary offset applied to it.
+All Collapse OS binaries, regardless of architecture, have
+those values at those offsets of them. Some binaries are built
+to run at offset different than zero. This stable ABI lives at
+that offset, not 0.