From 1b2c4b519e4bbe3117c269cc57f3682fe4e11e61 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 29 Apr 2020 11:42:09 -0400
Subject: [PATCH] icore: add BIN+

This allows us to write LATEST at proper offset in emul/stage1.fs in
cases where we set a nonzero BIN(.
---
 blk/393         |   1 +
 emul/run.fs     |  24 ------------------------
 emul/stage0.bin | Bin 7441 -> 7457 bytes
 emul/stage1.fs  |   2 +-
 emul/stop.fs    |   2 --
 5 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 emul/run.fs
 delete mode 100644 emul/stop.fs

diff --git a/blk/393 b/blk/393
index 1f0d04f..a69f0b1 100644
--- a/blk/393
+++ b/blk/393
@@ -1,4 +1,5 @@
 : RAM+ [ RAMSTART LITN ] + ;
+: BIN+ [ BIN( @ LITN ] + ;
 : (parse*) 0x0a RAM+ ;
 : HERE 0x04 RAM+ ;
 : CURRENT* 0x51 RAM+ ;
diff --git a/emul/run.fs b/emul/run.fs
deleted file mode 100644
index 82ff697..0000000
--- a/emul/run.fs
+++ /dev/null
@@ -1,24 +0,0 @@
-: EFS@
-    256 /MOD 3 PC! 3 PC!
-    1024 0 DO
-        4 PC@
-        BLK( I + C!
-    LOOP
-;
-: EFS!
-    256 /MOD 3 PC! 3 PC!
-    1024 0 DO
-        BLK( I + C@ 4 PC!
-    LOOP
-;
-
-: INIT
-    CURRENT @ HERE !
-    BLK$
-    ['] EFS@ BLK@* !
-    ['] EFS! BLK!* !
-    RDLN$
-    LIT< _sys [entry]
-    ." Collapse OS" CRLF
-    INTERPRET
-;
diff --git a/emul/stage0.bin b/emul/stage0.bin
index c2c3b5d11448fce6d9cc10f672c24a428e6d01d2..219ea6946009e64c91f80b00b0d5237742f76fbb 100644
GIT binary patch
delta 605
zcmXYu!D|yi6vp4|&dhEaGpVhLxK_6T%LZHYSVAi}QY1y9B%y*qYDn84m3C=+Nk9U<
z<hEGml-w$^ms~6&3toEYN%UC%gPg244;Dn$H=AB&_Wg$UzVGdKP&h24PI_?i1pvMu
zr9RS2vRJyC0V-T1>N9;jaZa<Q1aIT@)>=LTT%?&2%&R$UK-xsYL;18^odG6}%{eAv
z(FP*^nfr!>h0$k&){#FLOZZAs++Rq8feLY_g-@&gTD{T8;^;ncVH)1312#F?WlgYQ
zKpIqn<|$~Yh~0DQ$S08d^o%XjE(whYT`bdx^c3OFOpo<R6Mn^7sY?d<=K1xV-Szwn
zu*4bLH=00UMM=JRXNa4{hCTy2q%m54G<y||Y2upt^yyH2;5oL*`{Y=C<F_+E_*W7e
zJ{^%ie5w<2J(Hs)2|lgB&saijeQR&0^)iQ&dQ3#7EPZ!qpJ<^7UF$l{vSw%mJmjNF
zTkw+B{5-b)=F*Z-ELE4v&&o^HaY!L@k`*|dVt<>|xX|jCAqU>}W*!`MXvyp6sDWU#
zH|V5JkzjCtty{!VH|(3!PV#%(q>?y)hdNJ+)smkC??S)>_1w<Q2mHOM_bLcX@2%y6
ffRJksO}K`s?AkgbJ%nOQ1;#F1t$sSPUtReR_Gpq0

delta 592
zcmXYu!D|yi6vn^VotfQq$=0?iLT%j!ESn-Io=Rv1w^V4A)+WJ&QM7E^C5UyYf|x@h
zy_8-A83>qLJ@k@;7KMNaBCSa8x#j4ki2p&6_07h^&hGmS?|t9fZ?EvSkU4yZ!!H27
z9%Mdpb<F36Pxzo2z~88DuI00k?kQK}!ml`@&1x*b&0x7$o`i6}nPVcrtPSS=HMflb
zGyTtyuMod6kn($Jac#zd;d)3KRl0f<udRmRAdPM@4-<Hx_Qc4@OA*0Fn}s}p<{4Dg
zPjPj0h4?V>nD@jY-(mYkhg>Z34%<~ja&&T6v{-~ciB{TSZMyU0)vf32`TMZkp4c`b
zaNJTwIeWQFn<a)m-|#L^$nxBkb7V{t&(vqkyXv#diHdBo52`0GWq-(HmKZVb6U!QF
zG^L&?$x?urm+(6YP+8x6vGwX<jwJP%4$E5l-QX>zg*xO~*QfOC8+F-~{YqQ#)7Jbn
zwf>UVtpE#4<@w^>;(YlGGK8FT1&Jf-t+CtE)#^jY!GHE74@VtX!G#mjAkg0%I;kTf
z6r5v^Ge=F?7bl$b_tsb`b^e-k?ktp-VsMJZLtWNYWap;q^1Z3|D!7#1Q_F*krqmuH
aoTpSmTW6$)aB3-G;J>ToPv7mwXa503gO7~>

diff --git a/emul/stage1.fs b/emul/stage1.fs
index 62fb584..d90a0ca 100644
--- a/emul/stage1.fs
+++ b/emul/stage1.fs
@@ -25,4 +25,4 @@
 
 (entry) _
 H@ 256 /MOD 2 PC! 2 PC!
-H@ 0x08 ! ( update LATEST )
+H@ 0x08 BIN+ ! ( update LATEST )
diff --git a/emul/stop.fs b/emul/stop.fs
deleted file mode 100644
index c2777da..0000000
--- a/emul/stop.fs
+++ /dev/null
@@ -1,2 +0,0 @@
-(entry) _
-H@ 256 /MOD 2 PC! 2 PC!