From e8b57d8bdeba390cb4719591d9e93f5745d357f6 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sat, 6 Aug 2022 06:35:01 -0700
Subject: [PATCH] Progress on memory management

---
 etc/sapphire14.uf2 | Bin 0 -> 8448 bytes
 etc/ss10x10.chr    | Bin 4096 -> 4096 bytes
 src/assets.tal     |   5 +++++
 src/desktop.tal    |   7 ++++++-
 src/draw.tal       |   8 +++++---
 src/potato.tal     |  29 +++++++++++++++++++----------
 6 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 etc/sapphire14.uf2

diff --git a/etc/sapphire14.uf2 b/etc/sapphire14.uf2
new file mode 100644
index 0000000000000000000000000000000000000000..ed61654fe6b53943a0c0b56a17ae7e712cae1600
GIT binary patch
literal 8448
zcmeHJJ#5=X6s9DGKhlY$?ZTlN#-eK1Nr4RK$c>fwN9UwS12lCqW(WdV2ABdZQU(qh
zHwh{ZhMU0%G!$)y44yi7=-^R<VPpzCb><K_8P%c)G<fK{JCY`4D;*0IJb}mi?tAau
z-FxpIB?#|tc~M4rghWL_NJ1x2LCUkH<Yh@IDtV)*>$+j+@HS}E4S-q^2AYgywJ55p
ztSU-gmDIeX<rOur7Gzb`z^EcA1?~N-r)=th)B~vp{yPtl1~fth(y))+#I<iGCXOY-
zNu|^(mEai)COpsg=o3IuJNc<4pZH*YN#rwxG9K-Cvu{>%5;CzJVAAnmM79XW=EPOU
zoLpJ?xWqB<8{QTZ1HpzJNXGfYv1Zuxgbi#SUy5B5NwkTId#IEc*+Yd^@fMEeI$MG-
zcqGDENos+9gkj*v0Uz7gu#e6LGp#<x@52CzYaE^AGa2T;24To<1da)$wUgtEgf!gR
z>G1qsr$Y$w0$wp|w@hd?O9^I@FEln)$;rsT-+vwwo(H4Q0Pu?$EweZ^hGIMuVK|eM
z3nSyLoSe&qJiNhu9*6Y>`^+a(34O?pLw(2}``-QK<w|Iu=^gU*mXOJc2pZpi=a6Cx
z(EOP;&pFKrlP}oUqp`{|Bv<Cr?dbgR<*Bq$GuYFo89@lGAPkJJ2)PZ}hr~$!$N<8h
z$N)c{L4+!U335b@O<0px;P$`<&1nA#LD{S{9p`Qnn=+g4qJ77C>)N8}Gpv`f^Tp)}
z-I!luxZQPs!x(ol9GW)0JaxHPR5N2|t}y)a#kp(kt-Vd9?K3Q@!;|+MXWG)aeQ&4d
z0wF40&QpB|j}q$l4lEih6zZ4j&2{zEsgZ2iX7<__?`$f@fgtv}49mJ%fg1)FZ227x
z@#|N=jFY{$osP$7fv<npnJ(*Wg063q1C&^w9-w@N@h{sGOF#d*yCJRbC<?@c?hnm>
zsb&^F3wWEv6M*J^CZ~_&viR`^$p7{FTANiA;xYMX|8;&pVE^9QbDPx6c9M^sj}qbe
zEI7YnmW*2KM<&1i>W}^1{oUO+uhtpHYcH(Pks)L5#s<UYTzS+m+Iy~x8P1C8$V|2R
zp(f`Tc6$~KbJ@^7+`n87_CF3Mfb9#`<kbynW9KW-ZZ`n;$ItK9EKPELQs2F1_E`Lw
z|Hc`H_+Nk8_MfB8mki4VQ_Bff{R-h1jIP`1)(pSHXz=g(&(u<>7~X&X&mUfZe>2&G
z9up9eh32l){NVdHcsVky?Y(1po24g)AaVO5Ivwa|*~H~HU#~!G{vG76QM;|l<*Wz`
zF#h5l5z-6F;WO$DIDc$?eS}_iRt`<`c@LqkAh5jEvtqfv$mE5mJ>vOL!FKrm*VxyE
zc279p*R$&@C5j)F@H)Zw_6fTUv^!p3u`cvk91Igh1jJzbg54nYU=7C1FHMf#a~@Ta
zVjhReO?-Z4wpx7{_%kWQkh$;x;|BwHw`Pq&e#Z3!%aJ8>Vf8|7kbZF#A3!}CXdkQ$
z&pZbEvqN_48Mn!E!(;1&`(M2@oQYP94dAP6)Le|+0sDtbla)1EfO3^Pn=!>;$nBq>
zTb&L60C6JBPvBV_WFMs2{$u)QX^Ky88{uO8JY>(|_ZNiF=v~Lzr#Jfe#`LR?e#d7?
zOu&oA=7rU2b#>+xFAy*tQo(z8W^F3z|4;yAq0N2UtSiR+4UV{aRG$^&U*k7aeaPY$
z>hrh9UxvNBLi6XlSbPF16lgSQe$9TwG4wXx#_qNqVkiN6VF=$0@m9wZygi?UI9k8X
zKY_vdJueU#yGWn_SiJthoZW!}5EVGh#MsA!{$7GOgr7Zuwf-0U0Yx%GrrS?&Jhvn#
z3F0NNc0c|Tgjy&5ONgc*^+4)@)B~vpQV*maNIj5xAoW1%fz$)32T~8D9{8Vn;2(2*
BXp8^=

literal 0
HcmV?d00001

diff --git a/etc/ss10x10.chr b/etc/ss10x10.chr
index c4167bbc931f1ed9d9b6470f3918a2e6f1ffb21a..607ffbb0e114ccdf8af2de4b3c66dc34573a4d37 100644
GIT binary patch
delta 83
pcmZorXi!+dXb%Jb(Ev;wovz;xfl%d>8(Bmr3ozzvKEUX}2LSs<Dd7MB

delta 15
WcmZorXi!+dI9ZeJz~%#t4txMAW(6hy

diff --git a/src/assets.tal b/src/assets.tal
index 14bef68..3dea1f0 100644
--- a/src/assets.tal
+++ b/src/assets.tal
@@ -276,6 +276,11 @@ c060 3018 0c06 0300 3c0c 0c0c 0c0c 3c00
 @menu-chr
 	ffff ffff ffff ffff ffff ffff ffff ffff
 	ffff ffff ffff ff00 ffff ffff ffff ffff
+@prog-chrs
+	3f3f 3f3f 3f3f 3f3f ffff ffff ffff ffff
+	ffff ffff ffff ffff 3f3f 3f3f 3f3f 3f3f
+	3f3f 3f3f 3f3f 3f3f 3f3f 3f3f 3f3f 3f3f
+	7fbf 7fbf 7fbf 7fbf ffff ffff ffff ffff
 
 ( blobs )
 
diff --git a/src/desktop.tal b/src/desktop.tal
index f6bd991..c88c4a1 100644
--- a/src/desktop.tal
+++ b/src/desktop.tal
@@ -306,8 +306,13 @@ JMP2r
 @close-win ( -- )
 
 	.length LDZ ,&continue JCN
-		JMP2r
+		( nothing to close ) JMP2r
 		&continue
+
+	;get-active-win JSR2
+		( win/mem-ptr ) #000a ADD2 LDA2k SWP2
+		( win/mem-len ) INC2 INC2 LDA2 ;mem-rel JSR2
+
 	.length LDZk #01 SUB SWP STZ
 	;sel-desktop JSR2
 	;draw-desktop JSR2
diff --git a/src/draw.tal b/src/draw.tal
index c70f33b..a665dc6 100644
--- a/src/draw.tal
+++ b/src/draw.tal
@@ -143,12 +143,14 @@ JMP2r
 
 @draw-memory ( -- )
 
+	#01 .Screen/auto DEO
 	.Screen/x DEI2 ,&x STR2
 	;vert1-icn .Screen/addr DEO2
-	#ff00
+	#8000
 	&loop
-		#00 OVR [ LIT2 &x $2 ] ADD2 .Screen/x DEO2
-		#00 OVR #80 SFT2 ;mem-type JSR2 #05 MUL .Screen/sprite DEO
+		#00 OVR #10 SFT2 [ LIT2 &x $2 ] ADD2 .Screen/x DEO2
+		#00 OVR #90 SFT2 ;mem-type JSR2 #00 SWP #40 SFT2 ;prog-chrs ADD2 .Screen/addr DEO2
+		#81 .Screen/sprite DEO
 		INC GTHk ,&loop JCN
 	POP2
 
diff --git a/src/potato.tal b/src/potato.tal
index 436a555..696abe8 100644
--- a/src/potato.tal
+++ b/src/potato.tal
@@ -61,30 +61,39 @@
 	;dict/home-ext ;set-dir JSR2
 	;untrap JSR2
 
+	( auto-start with about )
+	;no-name ;app-about #2213 #0120 #0060 ;add-win JSR2
+
 BRK
 
 ( memory operations )
 
-@mem-req ( len* -- <addr*> )
+@mem-req ( len* -- <ptr*> )
 
-	( TODO: check for space )
-	.bounds LDZ2 ADD2 .bounds STZ2
-	;mem
+	( ptr ) ;mem .bounds LDZ2 ADD2 BUG2k
+	( update ) SWP2 .bounds LDZ2 ADD2 .bounds STZ2
+
+JMP2r
+
+@mem-rel ( ptr* len* -- )
+
+	( update bound )
+	.bounds LDZ2 OVR2 SUB2 .bounds STZ2
+
+	BUG2 BUG2
 
 JMP2r
 
 @mem-type ( addr* -- type )
 
 	DUP2 ;mem LTH2 ,&static JCN
-	DUP2 ;mem .bounds LDZ2 ADD2 LTH2 ,&dynamic JCN
-
-	.length LDZ #00 EQU ,&free JCN
-	POP2 #03
+	( DUP2 ;mem .bounds LDZ2 ADD2 LTH2 ,&dynamic JCN )
+	( free ) POP2 #02
 
 JMP2r
-	&static POP2 #02 JMP2r
+	&static POP2 #00 JMP2r
 	&dynamic POP2 #01 JMP2r
-	&free POP2 #01 JMP2r
+	&selected POP2 #02 JMP2r
 
 ( directory operations )