From 32c0c5611fc0dd791ac4f7cbc24e4a2f3b541c3b Mon Sep 17 00:00:00 2001 From: zongor Date: Sat, 25 Oct 2025 21:48:12 -0700 Subject: [PATCH] Update tests and roms to new device handling --- test/add.asm.lisp | 5 ++--- test/add.rom | Bin 146 -> 139 bytes test/fib.asm.lisp | 5 ++--- test/fib.rom | Bin 190 -> 183 bytes test/hello.asm.lisp | 5 ++--- test/hello.rom | Bin 138 -> 131 bytes test/loop.asm.lisp | 25 ++++++++++++++----------- test/loop.rom | Bin 248 -> 254 bytes test/malloc.asm.lisp | 8 +++----- test/malloc.rom | Bin 178 -> 163 bytes test/paint-bw.rom | Bin 617 -> 594 bytes test/paint.rom | Bin 1417 -> 1394 bytes test/simple.asm.lisp | 5 ++--- test/simple.rom | Bin 143 -> 136 bytes test/window.rom | Bin 356 -> 326 bytes 15 files changed, 25 insertions(+), 28 deletions(-) diff --git a/test/add.asm.lisp b/test/add.asm.lisp index 39b6a17..e8a0263 100644 --- a/test/add.asm.lisp +++ b/test/add.asm.lisp @@ -16,11 +16,10 @@ (load-immediate $11 0) (syscall OPEN $1 $1 $11) (load-immediate $3 &new-line) - (load-offset-32 $7 $1 4) ; load handle (string-length $2 $0) - (syscall WRITE $7 $0 $2) + (syscall WRITE $1 $0 $2) (string-length $4 $3) - (syscall WRITE $7 $3 $4) + (syscall WRITE $1 $3 $4) (return nil))) (data (label terminal-namespace "/dev/term/0") diff --git a/test/add.rom b/test/add.rom index d7392a3857587399d10a3608a7155a71111406b2..618c517c3d9328a670095dc647f4051d1e5bc7ed 100644 GIT binary patch delta 60 zcmbQl*v-hw00fZ}StIn^m>8IufgDB#CN~yl2$PwG=|2xpOg|;HOurl9SFk! delta 44 rcmdnaxQ~&Q0SI~~vbIR`vNN&(*=|e>%*;TVoq@@Xg&D$}I9Cb)i{}MU diff --git a/test/hello.asm.lisp b/test/hello.asm.lisp index 92ad930..f410cc5 100644 --- a/test/hello.asm.lisp +++ b/test/hello.asm.lisp @@ -8,11 +8,10 @@ (load-immediate $11 0) (syscall OPEN $1 $1 $11) (load-immediate $3 &new-line) - (load-offset-32 $7 $1 4) ; load handle (string-length $2 $0) - (syscall WRITE $7 $0 $2) + (syscall WRITE $1 $0 $2) (string-length $4 $3) - (syscall WRITE $7 $3 $4) + (syscall WRITE $1 $3 $4) (return nil))) (data (label terminal-namespace "/dev/term/0") diff --git a/test/hello.rom b/test/hello.rom index 06153fcbe22fcb5b60a9fcd7022debaacc52738b..d2c1302afff69e35251c4f38b60d3f1d6914b6f7 100644 GIT binary patch delta 37 lcmeBTY-VI-00PH}tPUb>ObpD-Kn^1VlN$>&ggG%m3jkAY1ONa4 delta 44 rcmZo>>|$hP00NJRtPaw=?2Ifxwi^=zGc%B8XJB$;VTLd#Mrr{7Xe$IP diff --git a/test/loop.asm.lisp b/test/loop.asm.lisp index d217c6f..f297802 100644 --- a/test/loop.asm.lisp +++ b/test/loop.asm.lisp @@ -10,15 +10,19 @@ (add-int $1 $1 $3) (jump-ge-int &loop-body $1 $2)) (load-immediate $10 &terminal-namespace) - (real-to-nat $1 $0) - (load-immediate $7 &help) - (string-length $8 $7) - (syscall WRITE $10 $7 $8) - (load-immediate $8 32) + (load-immediate $11 0) + (syscall OPEN $10 $10 $11) ; Terminal term = open(namespace, flags) + (real-to-nat $1 $0) + (load-immediate $7 &prompt) + (string-length $8 $7) + (syscall WRITE $10 $7 $8) ; print prompt + + (load-immediate $8 32) (malloc $11 $8) - (syscall READ $10 $2 $8 $11) - (call &pln ($2) nil) + (syscall READ $10 $11 $8) ; read in max 32 byte string + + (call &pln ($11) nil) (nat-to-string $4 $1) (call &pln ($4) nil) (real-to-string $3 $0) @@ -29,13 +33,12 @@ (load-immediate $11 0) (syscall OPEN $1 $1 $11) (load-immediate $3 &new-line) - (load-offset-32 $7 $1 4) ; load handle (string-length $2 $0) - (syscall WRITE $7 $0 $2) + (syscall WRITE $1 $0 $2) (string-length $4 $3) - (syscall WRITE $7 $3 $4) + (syscall WRITE $1 $3 $4) (return nil))) (data (label terminal-namespace "/dev/term/0") - (label help "Enter a string: ") + (label prompt "Enter a string: ") (label new-line "\n"))) diff --git a/test/loop.rom b/test/loop.rom index 5b2be2bcfb7c03290b5b1af94faed5299dd87bf4..42eabd88f168876c9bcae5b8f1b74a8b51f35411 100644 GIT binary patch delta 85 zcmeyt_>Ym50SLBFWcA`>;RZ388G!^B7xzSeWhrhB##SJYk^8?d3nPTd^52h{fw6UB YucC+>69Y3dNScAkjfEM)oOn_n07nT7$^ZZW delta 78 zcmeyz_=Ay^0SGouWc8XDt1QjL!Od6!*08RM}qyPW_ diff --git a/test/malloc.asm.lisp b/test/malloc.asm.lisp index 44c44de..1ba7907 100644 --- a/test/malloc.asm.lisp +++ b/test/malloc.asm.lisp @@ -9,18 +9,16 @@ (load-immediate $1 32) ; read in a string of max 32 char length (malloc $4 $1) ; allocate memory for the string - (load-offset-32 $7 $0 4) ; load handle - (syscall READ $7 $2 $1 $4) ; read the string + (syscall READ $0 $4 $1) ; read the string (call &pln ($0 $4) nil) ; print the string (halt)) (label pln (load-immediate $3 &new-line) - (load-offset-32 $7 $0 4) ; load handle (string-length $2 $1) - (syscall WRITE $7 $1 $2) + (syscall WRITE $0 $1 $2) (string-length $4 $3) - (syscall WRITE $7 $3 $4) + (syscall WRITE $0 $3 $4) (return nil))) (data (label terminal-namespace "/dev/term/0") diff --git a/test/malloc.rom b/test/malloc.rom index 6d04d8e1ab075388f38a198c2e335c9c52df56c4..a2839c29712677553ef5767360a37f74d7689a47 100644 GIT binary patch delta 78 zcmdnQxR{ZZ0SICyvKrai0U1mTjQ?2}6@V;p7Di?!AkDzS$Ow^P`Om<@tO^uyV`5}x Q21zk8xv?-qm=l}z0a=0vp#T5? delta 93 zcmZ3?xQUUK0SK}uvKslg0U1mTjQ?2}6@V;p7Dirn1{NTTnF&a+GcmF-LR7H)XJBDg Z1&TrC-Iy4enL$bzncP^IArC_t86Nk;dKVddW-ApPjv>w`w R+tvw-bN`JOeD;BVTmT$AA?g4C delta 324 zcmY+8J5Izv42H*J&m)f^!zhy~k+!5>Rtwq{9E65;m2*(hg=;9MMm-anatHLsVb;MoQ5`ekuKFN1d+MP2`DCx5ExCYLTqSy?_iw9;V^R1 zWT->CAaY;jj!@=MGor?(DjLZTFN~rJPOm4to?eIBKhtpJP1gB3z{OI+HM^a8}tLvwSI8NFY{t{LF|G(W;{_r$FdcF!!vl;+4rvaQfv e3cY+B*5!(fMr)V8(7rFx!+Cy#d-$Bc;o%oE1tduT diff --git a/test/paint.rom b/test/paint.rom index 1d68daaea99fc15be65652eac324c86a565e2bbd..6d8d266e622e57f5977da716e8d64b12a43bce87 100644 GIT binary patch literal 1394 zcmai!zi!k(5XNWh-L<{8Z!hG0B8u;H5;W+FLnI0kh$;<;if0JdL6A5>&7Xz_2|P$HR`^;mLjVW!xhcjo)n){JccfTf~EVu{TaK%G`8XTmz4<`al% zn@=GlC>+zeC;-*?QloO?)Z&t>8JkqjD}D+Abb(nusVwgKYVnWiZC|authwktY&_FLpo9Wu=6`GwwO)LJQ8AZip8pVj!4IVX=CeURR>YE>_2El=c@jDFt4kKmx zjFDAAW%Yf!v_7%_l`IzbPY7CDeMl8$_*GHS7O!zYYkgBtItY!a$|Q(O8^%o*6B|WU zP|cmf(z$Tqz^NVn0W6%`QFH%@yH4-U+~pZPsdG3pW`5vEV#qflax*xn kTRyCCTliYYFAm468gM3jDf}tCD|{<_BRm&=7ycIh1uBAfcmMzZ literal 1417 zcmai!&5G1O5XY;(^3h4Av)ReuvYBB(5o8Y|x~!mhaW9G|pJAP&3J!YK-HR7N^Z|SY zQSc?!!?I5x`UHYUAy#!NkWDbwp?~SB|Gy_xr3V1up2me^Pqa?}O7}Cogt+lI4!XR_u`|r6Y7ktN5${OexZAT3d0`SId7?@Azut zCCx?eVaGeH9(BCe2HtHvRHx1F4y&7v_wK;^!B-pau==IreKhc%cD((n!o~oUGp(ql zO5&1B<&xOZ{`N7xa-3wL^xco7@BUDZKd(y@{Cq+|2zNymoSla5XHg0vm8on6M+X<={`7B5R!PG?~xM16xs4OJjb6)JP< z6V4Chfk)tXLiwEtwWTvAR?FI&hxllHV*eXjtk^$C7-P*LR&+q0iVnAEjp*ZQeiXEk zDhTQ-mQiI@)MiC&!?2e1!f8=CrE9Q6RJLVr|%%uM# z3c4v2bd4yg2Jn$d&7i<;`LN7w<_VKN9E#%x@RRwP`Ga|%`Ih;H`HOkR{LTCeZgP10 diff --git a/test/simple.asm.lisp b/test/simple.asm.lisp index 6562d0b..c0aae82 100644 --- a/test/simple.asm.lisp +++ b/test/simple.asm.lisp @@ -11,11 +11,10 @@ (load-immediate $11 0) (syscall OPEN $1 $1 $11) (load-immediate $3 &new-line) - (load-offset-32 $7 $1 4) ; load handle (string-length $2 $0) - (syscall WRITE $7 $0 $2) + (syscall WRITE $1 $0 $2) (string-length $4 $3) - (syscall WRITE $7 $3 $4) + (syscall WRITE $1 $3 $4) (return nil))) (data (label terminal-namespace "/dev/term/0") (label new-line "\n") diff --git a/test/simple.rom b/test/simple.rom index 1bd007cb8e00adf6afd6e93761ea7549c02188cc..13f146d7d77cfec10f670467ab81563d06737b5d 100644 GIT binary patch delta 37 lcmeBY>|kVN00O^>tiB>{ObpD-Kn^1VlN$>&ggG%+2>@4_1StRj delta 44 rcmeBR>}OiduC#fLqzmJ zhByR(uIEA&OP!l8CVm5PJY)qWKwVt?m5Qcbse+<8hp;G#ySV&|xmbEfn;WG-sI1fo z&6?E8#{P_wnrv+4M3z|bUDiplsOvGZ)U2TZ@kH%_X0-}N8`&kzE2&1XKgDdc+Jdza w`BA2*)xRxPIvQqpYfkRf+>bZsF3p;qUZ_23csga%ZJFCkVQ?EnA( literal 356 zcmX|*I}XAy42JDERSF?AirS79f&&!61RF~?P5~JKiPyv#xl*wMB~pI>{t`a`01UGH z&TcRqb@C*y0jz@{V4nfLIbznkGUSPre^Q4@BK1HtdIqy9;6AJV&^IsgCw