From 21f3a2d870595b4594a8e69faad87a2a664dba6d Mon Sep 17 00:00:00 2001 From: neauoire Date: Mon, 14 Mar 2022 10:21:36 -0700 Subject: [PATCH] Moved some demos to /old --- build.sh | 6 +- projects/examples/demos/automata.tal | 119 ------------- projects/examples/demos/clock.tal | 167 +++++++----------- .../examples/{demos => old}/asma-piano.tal | 0 projects/examples/{demos => old}/darena.tal | 0 projects/examples/{demos => old}/dungeon.tal | 0 projects/examples/{demos => old}/prng.tal | 0 projects/examples/{demos => old}/rule110.tal | 0 8 files changed, 69 insertions(+), 223 deletions(-) delete mode 100644 projects/examples/demos/automata.tal rename projects/examples/{demos => old}/asma-piano.tal (100%) rename projects/examples/{demos => old}/darena.tal (100%) rename projects/examples/{demos => old}/dungeon.tal (100%) rename projects/examples/{demos => old}/prng.tal (100%) rename projects/examples/{demos => old}/rule110.tal (100%) diff --git a/build.sh b/build.sh index 5b51beb..231a1a7 100755 --- a/build.sh +++ b/build.sh @@ -39,11 +39,7 @@ while [ $# -gt 0 ]; do done echo "Cleaning.." -rm -f ./bin/uxnasm -rm -f ./bin/uxnemu -rm -f ./bin/uxncli -rm -f ./bin/launcher.rom -rm -f ./bin/asma.rom +rm -f ./bin/* # When clang-format is present diff --git a/projects/examples/demos/automata.tal b/projects/examples/demos/automata.tal deleted file mode 100644 index de88a3e..0000000 --- a/projects/examples/demos/automata.tal +++ /dev/null @@ -1,119 +0,0 @@ -( Project by Alex Schroeder - https://alexschroeder.ch ) - -%RTN { JMP2r } -%INCR { SWP INC SWP } -%CELL { #1000 } -%NEXT { #2000 } - -( devices ) - -|00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] -|20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ] -|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] - -|0000 - -( program ) - -@seed [ &x $1 &w $2 &s $2 ] - -|0100 ( -> ) - - ( theme ) - #2aac .System/r DEO2 - #269b .System/g DEO2 - #378d .System/b DEO2 - - ;seed-line JSR2 - - ( run for a few generations ) - #00 #ff - &loop - OVR #00 SWP ;print-line JSR2 - ;compute-next JSR2 - ;copy-next JSR2 - ( incr ) INCR - ( loop ) LTHk ,&loop JCN - POP2 - -BRK - -@print-line ( y -- ) - - ( set ) .Screen/y DEO2 - ( loop through cells ) - #00 #ff - &loop - ( copy ) OVR #00 SWP DUP2 - ( pos ) .Screen/x DEO2 - ( addr ) CELL ADD2 - ( draw ) LDA .Screen/pixel DEO - ( incr ) INCR - ( loop ) LTHk ,&loop JCN - POP2 - -RTN - -@compute-next ( -- ) - - ( loop through 62 cells ) - #01 #fe - &loop - OVR DUP DUP ( three copies of the counter ) - #01 SUB #00 SWP CELL ADD2 LDA - SWP - INC #00 SWP CELL ADD2 LDA - ( the cell dies if the neighbors are either both dead or both alive, i.e. Rule 90 ) - NEQ - ( one copy of the counter and the life value ) - SWP #00 SWP NEXT ADD2 STA - ( incr ) INCR - ( loop ) LTHk ,&loop JCN - POP2 - -RTN - -@copy-next ( -- ) - - ( loop through cells ) - #00 #ff - &loop - OVR DUP ( two copies of the counter ) - #00 SWP NEXT ADD2 LDA ( one copy of the counter and the value ) - SWP #00 SWP CELL ADD2 STA - ( incr ) INCR - ( loop ) LTHk ,&loop JCN - POP2 - -RTN - -@seed-line ( -- ) - - .DateTime/second DEI .seed/x STZ - #0000 .seed/w STZ2 - #e2a9 .seed/s STZ2 - ( loop through cells ) - #01 #fe - &loop - OVR ( one copy of the counter ) - ;rand JSR2 - #10 AND ( pick a bit ) - SWP #00 SWP CELL ADD2 STA - ( incr ) INCR - ( loop ) LTHk ,&loop JCN - POP2 - -RTN - -( https://en.wikipedia.org/wiki/Middle-square_method ) - -@rand ( -- 1 ) - - .seed/x LDZ #00 SWP DUP2 MUL2 - .seed/w LDZ2 .seed/s LDZ2 ADD2 - DUP2 .seed/w STZ2 - ADD2 - #04 SFT SWP #40 SFT ADD - DUP .seed/x STZ - -RTN \ No newline at end of file diff --git a/projects/examples/demos/clock.tal b/projects/examples/demos/clock.tal index 07548a1..da45000 100644 --- a/projects/examples/demos/clock.tal +++ b/projects/examples/demos/clock.tal @@ -1,42 +1,10 @@ -( Dev/Time ) - -%+ { ADD } %- { SUB } %* { MUL } %/ { DIV } -%< { LTH } %> { GTH } %= { EQU } %! { NEQ } -%++ { ADD2 } %-- { SUB2 } %** { MUL2 } %// { DIV2 } -%<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 } - -%4* { #20 SFT } -%10* { #40 SFT } -%2** { #10 SFT2 } %2// { #01 SFT2 } -%4// { #02 SFT2 } -%10** { #40 SFT2 } -%20** { #50 SFT2 } - -%TOS { #00 SWP } -%RTN { JMP2r } -%MOD { DUP2 DIV MUL SUB } -%ABS2 { DUP2 #0f SFT2 EQU #05 JCN #0000 SWP2 -- } -%LTS2 { #8000 ++ SWP2 #8000 ++ GTH2 } -%GTS2 { #8000 ++ SWP2 #8000 ++ LTH2 } - -%RADIUS { #0040 } -%SCALEX { 2// .center/x LDZ2 ++ RADIUS -- } -%SCALEY { 2// .center/y LDZ2 ++ RADIUS -- } -%12HOURS { #0c MOD } - -%IS-UC { DUP #40 > SWP #5b < AND } -%IS-LC { DUP #60 > SWP #7b < AND } -%IS-NUM { DUP #2f > SWP #3a < AND } - -( devices ) +( Clock ) |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &read $1 &pad $5 &write $1 &error $1 ] |20 @Screen [ &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ] |b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] -( variables ) - |0000 @last @@ -58,34 +26,27 @@ &x0 $2 &y0 $2 &x $2 &y $2 &sx $2 &sy $2 &dx $2 &dy $2 &e1 $2 &e2 $2 &color $1 -( program ) - |0100 ( -> ) ( theme ) #0ff8 .System/r DEO2 #0f08 .System/g DEO2 #0f08 .System/b DEO2 - ( resize ) #00f0 .Screen/width DEO2 #0120 .Screen/height DEO2 - ( vectors ) ;on-frame .Screen/vector DEO2 - ( center ) - .Screen/width DEI2 2// + .Screen/width DEI2 #01 SFT2 DUP2 .center/x STZ2 - DUP2 #0028 -- .date/x STZ2 - #0020 -- .time/x STZ2 - .Screen/height DEI2 2// + DUP2 #0028 SUB2 .date/x STZ2 + #0020 SUB2 .time/x STZ2 + .Screen/height DEI2 #01 SFT2 DUP2 .center/y STZ2 - DUP2 #0078 -- .date/y STZ2 - #006c ++ .time/y STZ2 - + DUP2 #0078 SUB2 .date/y STZ2 + #006c ADD2 .time/y STZ2 ;draw-watchface JSR2 - ( time buffer ) LIT ': DUP .buf/s1 STZ @@ -97,7 +58,7 @@ ( once per second ) .DateTime/second DEI - DUP .last/sec LDZ = ,&same-sec JCN + DUP .last/sec LDZ EQU ,&same-sec JCN ( make time ) .DateTime/hour DEI .buf/h ;decimal JSR2 .DateTime/minute DEI .buf/m ;decimal JSR2 @@ -116,14 +77,14 @@ ( once per day ) .DateTime/day DEI - DUP .last/day LDZ = ,&same-day JCN + DUP .last/day LDZ EQU ,&same-day JCN ( make date ) DUP .buf/d ;decimal JSR2 ( draw label ) .date/x LDZ2 .Screen/x DEO2 .date/y LDZ2 .Screen/y DEO2 - .DateTime/dotw DEI 4* TOS ;week-txt ++ ;draw-text JSR2 - .DateTime/month DEI 4* TOS ;month-txt ++ ;draw-text JSR2 + [ #00 .DateTime/dotw DEI #20 SFT ] ;week-txt ADD2 ;draw-text JSR2 + [ #00 .DateTime/month DEI #20 SFT ] ;month-txt ADD2 ;draw-text JSR2 ;buf/d ;draw-text JSR2 DUP .last/day STZ &same-day @@ -136,20 +97,20 @@ BRK STH .center/x LDZ2 .center/y LDZ2 OVR2 OVR2 - .needles/zx LDZ2 .needles/zy LDZ2 #02 STHkr * ;draw-line JSR2 + .needles/zx LDZ2 .needles/zy LDZ2 #02 STHkr MUL ;draw-line JSR2 OVR2 OVR2 - .needles/sx LDZ2 .needles/sy LDZ2 #02 STHkr * ;draw-line JSR2 + .needles/sx LDZ2 .needles/sy LDZ2 #02 STHkr MUL ;draw-line JSR2 OVR2 OVR2 - .needles/mx LDZ2 .needles/my LDZ2 #01 STHkr * ;draw-line JSR2 + .needles/mx LDZ2 .needles/my LDZ2 #01 STHkr MUL ;draw-line JSR2 OVR2 OVR2 - .needles/hx LDZ2 .needles/hy LDZ2 #01 STHr * ;draw-line JSR2 + .needles/hx LDZ2 .needles/hy LDZ2 #01 STHr MUL ;draw-line JSR2 ( middle ) - #0001 -- .Screen/y DEO2 - #0001 -- .Screen/x DEO2 + #0001 SUB2 .Screen/y DEO2 + #0001 SUB2 .Screen/x DEO2 ;middle-icn .Screen/addr DEO2 #0a .Screen/sprite DEO -RTN +JMP2r @draw-text ( addr* -- ) @@ -157,68 +118,68 @@ RTN .Screen/y DEI2 ,&anchor-y STR2 &while LDAk - DUP IS-LC ,&lc JCN - DUP IS-UC ,&uc JCN - DUP IS-NUM ,&num JCN - DUP LIT '/ = ,&slash JCN - DUP LIT ': = ,&colon JCN + DUP ;is-lc JSR2 ,&lc JCN + DUP ;is-uc JSR2 ,&uc JCN + DUP ;is-num JSR2 ,&num JCN + DUP LIT '/ EQU ,&slash JCN + DUP LIT ': EQU ,&colon JCN POP ;font/blank &end .Screen/addr DEO2 #03 .Screen/sprite DEOk DEO [ LIT2 &anchor-y $2 ] .Screen/y DEO2 - .Screen/x DEI2k #0008 ++ ROT DEO2 + .Screen/x DEI2k #0008 ADD2 ROT DEO2 INC2 LDAk ,&while JCN POP2 ( auto none ) #00 .Screen/auto DEO - .Screen/x DEI2k #0008 ++ ROT DEO2 + .Screen/x DEI2k #0008 ADD2 ROT DEO2 -RTN - &lc #61 - TOS 10** ;font/lc ++ ,&end JMP - &uc #41 - TOS 10** ;font/uc ++ ,&end JMP - &num #30 - TOS 10** ;font/num ++ ,&end JMP +JMP2r + &lc #61 SUB #00 SWP #40 SFT2 ;font/lc ADD2 ,&end JMP + &uc #41 SUB #00 SWP #40 SFT2 ;font/uc ADD2 ,&end JMP + &num #30 SUB #00 SWP #40 SFT2 ;font/num ADD2 ,&end JMP &slash POP ;font/slash ,&end JMP &colon POP ;font/colon ,&end JMP @draw-line ( x1* y1* x2* y2* color -- ) ( load ) .line/color STZ .line/y0 STZ2 .line/x0 STZ2 .line/y STZ2 .line/x STZ2 - .line/x0 LDZ2 .line/x LDZ2 -- ABS2 .line/dx STZ2 - .line/y0 LDZ2 .line/y LDZ2 -- ABS2 #0000 SWP2 -- .line/dy STZ2 - #ffff #00 .line/x LDZ2 .line/x0 LDZ2 LTS2 2** ++ .line/sx STZ2 - #ffff #00 .line/y LDZ2 .line/y0 LDZ2 LTS2 2** ++ .line/sy STZ2 - .line/dx LDZ2 .line/dy LDZ2 ++ .line/e1 STZ2 + .line/x0 LDZ2 .line/x LDZ2 SUB2 ;abs2 JSR2 .line/dx STZ2 + .line/y0 LDZ2 .line/y LDZ2 SUB2 ;abs2 JSR2 #0000 SWP2 SUB2 .line/dy STZ2 + #ffff #00 .line/x LDZ2 .line/x0 LDZ2 ;lts2 JSR2 #10 SFT2 ADD2 .line/sx STZ2 + #ffff #00 .line/y LDZ2 .line/y0 LDZ2 ;lts2 JSR2 #10 SFT2 ADD2 .line/sy STZ2 + .line/dx LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2 &loop .line/x LDZ2 .Screen/x DEO2 .line/y LDZ2 .Screen/y DEO2 .line/color LDZ .Screen/pixel DEO - [ .line/x LDZ2 .line/x0 LDZ2 == ] - [ .line/y LDZ2 .line/y0 LDZ2 == ] AND ,&end JCN - .line/e1 LDZ2 2** .line/e2 STZ2 - .line/e2 LDZ2 .line/dy LDZ2 LTS2 ,&skipy JCN - .line/e1 LDZ2 .line/dy LDZ2 ++ .line/e1 STZ2 - .line/x LDZ2 .line/sx LDZ2 ++ .line/x STZ2 + [ .line/x LDZ2 .line/x0 LDZ2 EQU2 ] + [ .line/y LDZ2 .line/y0 LDZ2 EQU2 ] AND ,&end JCN + .line/e1 LDZ2 #10 SFT2 .line/e2 STZ2 + .line/e2 LDZ2 .line/dy LDZ2 ;lts2 JSR2 ,&skipy JCN + .line/e1 LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2 + .line/x LDZ2 .line/sx LDZ2 ADD2 .line/x STZ2 &skipy - .line/e2 LDZ2 .line/dx LDZ2 GTS2 ,&skipx JCN - .line/e1 LDZ2 .line/dx LDZ2 ++ .line/e1 STZ2 - .line/y LDZ2 .line/sy LDZ2 ++ .line/y STZ2 + .line/e2 LDZ2 .line/dx LDZ2 ;gts2 JSR2 ,&skipx JCN + .line/e1 LDZ2 .line/dx LDZ2 ADD2 .line/e1 STZ2 + .line/y LDZ2 .line/sy LDZ2 ADD2 .line/y STZ2 &skipx ;&loop JMP2 &end -RTN +JMP2r @draw-watchface ( -- ) #3c00 &loop ( dots ) - #00 OVR 2** ;table ++ LDA2 + #00 OVR #10 SFT2 ;table ADD2 LDA2 #0018 ;circle JSR2 .Screen/x DEO2 .Screen/y DEO2 #01 .Screen/pixel DEO ( markers ) - DUP #05 MOD ,&no-marker JCN - #00 OVR 2** ;table ++ LDA2 + DUP #05 ;mod JSR2 ,&no-marker JCN + #00 OVR #10 SFT2 ;table ADD2 LDA2 STH2k #0018 ;circle JSR2 SWP2 STH2r #001c ;circle JSR2 SWP2 #01 ;draw-line JSR2 @@ -226,39 +187,47 @@ RTN INC GTHk ;&loop JCN2 POP2 -RTN +JMP2r @make-needles ( -- ) - [ #00 .DateTime/second DEI #1e + #3c MOD ] 2** ;table ++ LDA2 + [ #00 .DateTime/second DEI #1e ADD #3c ;mod JSR2 ] #10 SFT2 ;table ADD2 LDA2 #00a0 ,circle JSR .needles/zx STZ2 .needles/zy STZ2 - [ #00 .DateTime/second DEI ] 2** ;table ++ LDA2 + [ #00 .DateTime/second DEI ] #10 SFT2 ;table ADD2 LDA2 #0020 ,circle JSR .needles/sx STZ2 .needles/sy STZ2 - [ #00 .DateTime/minute DEI ] 2** ;table ++ LDA2 + [ #00 .DateTime/minute DEI ] #10 SFT2 ;table ADD2 LDA2 #0022 ,circle JSR .needles/mx STZ2 .needles/my STZ2 - [ #00 .DateTime/hour DEI 12HOURS #20 SFTk NIP ADD ] - ( minute offset ) [ #00 .DateTime/minute DEI #0f / ++ ] 2** ;table ++ LDA2 + [ #00 .DateTime/hour DEI #0c ;mod JSR2 #20 SFTk NIP ADD ] + ( minute offset ) [ #00 .DateTime/minute DEI #0f DIV ADD2 ] #10 SFT2 ;table ADD2 LDA2 #002a ,circle JSR .needles/hx STZ2 .needles/hy STZ2 -RTN +JMP2r @circle ( cx cy radius* -- y* x* ) STH2 SWP - TOS 10** STH2kr // .center/x LDZ2 ++ #0800 STH2kr // -- + #00 SWP #40 SFT2 STH2kr DIV2 .center/x LDZ2 ADD2 #0800 STH2kr DIV2 SUB2 STH2 SWP2r - TOS 10** STH2kr // .center/y LDZ2 ++ #0800 STH2kr // -- + #00 SWP #40 SFT2 STH2kr DIV2 .center/y LDZ2 ADD2 #0800 STH2kr DIV2 SUB2 POP2r STH2r -RTN +JMP2r @decimal ( value* zp-label -- ) STH - DUP #0a DIV #30 + STHkr STZ - #0a MOD #30 + STHr INC STZ + DUP #0a DIV #30 ADD STHkr STZ + #0a ;mod JSR2 #30 ADD STHr INC STZ -RTN +JMP2r + +@mod DUP2 DIV MUL SUB JMP2r +@abs2 DUP2 #0f SFT2 EQU #05 JCN #0000 SWP2 SUB2 JMP2r +@lts2 #8000 ADD2 SWP2 #8000 ADD2 GTH2 JMP2r +@gts2 #8000 ADD2 SWP2 #8000 ADD2 LTH2 JMP2r +@is-uc DUP #40 GTH SWP #5b LTH AND JMP2r +@is-lc DUP #60 GTH SWP #7b LTH AND JMP2r +@is-num DUP #2f GTH SWP #3a LTH AND JMP2r @week-txt "Sun $1 "Mon $1 "Tue $1 "Wed $1 "Thu $1 "Fri $1 diff --git a/projects/examples/demos/asma-piano.tal b/projects/examples/old/asma-piano.tal similarity index 100% rename from projects/examples/demos/asma-piano.tal rename to projects/examples/old/asma-piano.tal diff --git a/projects/examples/demos/darena.tal b/projects/examples/old/darena.tal similarity index 100% rename from projects/examples/demos/darena.tal rename to projects/examples/old/darena.tal diff --git a/projects/examples/demos/dungeon.tal b/projects/examples/old/dungeon.tal similarity index 100% rename from projects/examples/demos/dungeon.tal rename to projects/examples/old/dungeon.tal diff --git a/projects/examples/demos/prng.tal b/projects/examples/old/prng.tal similarity index 100% rename from projects/examples/demos/prng.tal rename to projects/examples/old/prng.tal diff --git a/projects/examples/demos/rule110.tal b/projects/examples/old/rule110.tal similarity index 100% rename from projects/examples/demos/rule110.tal rename to projects/examples/old/rule110.tal