commit 0f84c646f61b0b2230c12e18857ce6389882225b
parent b34fe1b67506b95bb6cffb75a6cac01ae3798cfc
Author: neauoire <aliceffekt@gmail.com>
Date: Mon, 22 Feb 2021 12:07:36 -0800
Added window example
Diffstat:
5 files changed, 185 insertions(+), 173 deletions(-)
diff --git a/README.md b/README.md
@@ -100,6 +100,8 @@ A device that works like a NES controller, each button is a bit from a single by
- Line routine
- Getting rid of IOR/IOW would be nice..
+- Example of button pointing to a subroutine
+- Labels should not have the trailing space
### Misc TODOs
diff --git a/build.sh b/build.sh
@@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr
# cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator
# run
-./bin/assembler examples/pattern.usm bin/boot.rom
+./bin/assembler examples/window.usm bin/boot.rom
./bin/emulator bin/boot.rom
diff --git a/emulator.c b/emulator.c
@@ -320,13 +320,13 @@ consolew(Device *d, Memory *m, Uint8 b)
Uint8
screenr(Device *d, Memory *m, Uint8 b)
{
+ loadtheme(m->dat + 0xfff0);
switch(b) {
case 0: return (HOR * 8 >> 8) & 0xff;
case 1: return HOR * 8 & 0xff;
case 2: return (VER * 8 >> 8) & 0xff;
case 3: return VER * 8 & 0xff;
}
- loadtheme(m->dat + 0xfff0);
(void)m;
return d->mem[b];
}
diff --git a/examples/pattern.usm b/examples/pattern.usm
@@ -1,171 +0,0 @@
-( sprite )
-
-:dev/r fff8 ( std read port )
-:dev/w fff9 ( std write port )
-
-;color 1 ;x1 2 ;x2 2 ;y1 2 ;y2 2
-
-;mousex 2 ;mousey 2
-;lastx 2 ;lasty 2
-;state 1
-
-|0100 @RESET
-
- ( fill background )
- #01 =dev/r
- #02 =dev/w
- ,fill-sprite JSR
-
- ( draw rect )
- #01 =dev/w
- #00 =color
- #00 IOR2 #0002 DIV2 #0060 SUB2
- #02 IOR2 #0002 DIV2 #0030 SUB2
- #00 IOR2 #0002 DIV2 #0060 ADD2
- #02 IOR2 #0002 DIV2 #0030 ADD2 ,fill-rect JSR
- #01 =color
- #00 IOR2 #0002 DIV2 #0060 SUB2
- #02 IOR2 #0002 DIV2 #0030 SUB2
- #00 IOR2 #0002 DIV2 #0060 ADD2
- #02 IOR2 #0002 DIV2 #0030 ADD2 ,line-rect JSR
- #01 =color
- #00 IOR2 #0002 DIV2 #0060 SUB2 #0002 ADD2
- #02 IOR2 #0002 DIV2 #0030 SUB2 #0002 ADD2
- #00 IOR2 #0002 DIV2 #0060 ADD2 #0002 SUB2
- #02 IOR2 #0002 DIV2 #0030 ADD2 #0002 SUB2 ,line-rect JSR
-
- #05 =dev/r ( set dev/read mouse )
- #02 =dev/w ( set dev/read mouse )
-
- #01 =color
- ,text1 #0028 #0030 ,draw-label JSR
-
- #01 ,checkon_icn #0028 #0050 ,draw-sprite JSR
- ,text2 #0038 #0050 ,draw-label JSR
-
- #01 ,checkoff_icn #0028 #0060 ,draw-sprite JSR
- ,text3 #0038 #0060 ,draw-label JSR
-
-BRK
-
-|c000 @FRAME
-
- ( clear last cursor )
- #10 ,clear_icn ~lastx ~lasty ,draw-sprite JSR
- ( record mouse positions )
- #00 IOR2 =mousex #02 IOR2 =mousey
- ( record mouse state )
- #04 IOR #11 ADD =state
- ( draw mouse )
- ~state ,cursor_icn ~mousex ~mousey ,draw-sprite JSR
- ( update last pos )
- ~mousex =lastx ~mousey =lasty
-
-BRK
-
-@fill-sprite
- #0000
- @fill-sprite-loop-hor
- #0000
- @fill-sprite-loop
- ( draw ) OVR2 IOW2 DUP2 IOW2 ,texture IOW2 #01 IOW
- ( incr ) #0008 ADD2 DUP2
- #00 IOR2 LTH2 ,fill-sprite-loop ROT JMP? POP2
- POP2
- ( incr ) #0008 ADD2 DUP2
- #02 IOR2 LTH2 ,fill-sprite-loop-hor ROT JMP? POP2
-RTS
-
-@fill-rect ( x1 y1 x2 y2 )
- =y2 =x2 ( stash x1 y1 ) =y1 DUP2 WSR2 =x1
- @fill-rect-ver
- RSW2 DUP2 =x1 WSR2
- @fill-rect-hor
- ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
- ( incr ) ~x1 #0001 ADD2 DUP2 =x1
- ~x2 LTH2 ,fill-rect-hor ROT JMP? POP2
- ~y1 #0001 ADD2 DUP2 =y1
- ~y2 LTH2 ,fill-rect-ver ROT JMP? POP2
- RSW2 POP2
-RTS
-
-@line-rect ( x1 y1 x2 y2 )
- =y2 =x2 ( stash x1 y1 ) DUP2 WSR2 =y1 DUP2 WSR2 =x1
- @line-rect-hor
- ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
- ( draw ) ~x1 ~y2 IOW2 IOW2 ~color IOW
- ( incr ) ~x1 #0001 ADD2 DUP2 =x1
- ~x2 #0001 ADD2 LTH2 ,line-rect-hor ROT JMP? POP2
- ( restore x1 y1 ) RSW2 =x1 RSW2 =y1
- @line-rect-ver
- ( incr ) ~y1 #0001 ADD2 DUP2 =y1
- ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
- ( draw ) ~x2 ~y1 IOW2 IOW2 ~color IOW
- ~y2 #0001 SUB2 LTH2 ,line-rect-ver ROT JMP? POP2
-RTS
-
-@draw-sprite
- IOW2 ( y byte )
- IOW2 ( x byte )
- IOW2 ( sprite address )
- IOW ( layer-color )
-RTS
-
-@draw-label ( x1 y1 text )
- =y1 =x1
- @draw-label-loop
- ( draw ) ~x1 ~y1 IOW2 IOW2 DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 IOW2 ~color IOW
- ( incr ) #0001 ADD2
- ( incr ) ~x1 #0008 ADD2 =x1
- DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
-RTS
-
-@texture [ aa55 aa55 aa55 aa55 ]
-@clear_icn [ 0000 0000 0000 0000 ]
-@cursor_icn [ 80c0 e0f0 f8e0 1000 ]
-@checkoff_icn [ 7e81 8181 8181 817e ]
-@checkon_icn [ 7e81 99bd bd99 817e ]
-
-@text1 " Hello World " ( add string to memory )
-@text2 " To Jupiter "
-@text3 " To Neptune "
-
-@font ( spectrum-zx font )
-[
- 0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
- 0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
- 007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
- 0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
- 0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
- 003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
- 0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
- 0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
- 0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
- 0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
- 0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
- 0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
- 003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
- 0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
- 003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
- 0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
- 003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
- 0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
- 0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
- 0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
- 007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
- 00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
- 0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
- 0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
- 0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
- 0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
- 0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
- 0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
- 0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
- 0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
- 0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
- 0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
-]
-
-|d000 @ERROR BRK
-|FFF0 [ f1c3 f12e f12a ] ( palette )
-|FFFA .RESET .FRAME .ERROR
diff --git a/examples/window.usm b/examples/window.usm
@@ -0,0 +1,181 @@
+( sprite )
+
+:dev/r fff8 ( std read port )
+:dev/w fff9 ( std write port )
+
+( window ) ;wx1 2 ;wy1 2 ;wx2 2 ;wy2 2
+( drawing ) ;color 1 ;x1 2 ;x2 2 ;y1 2 ;y2 2
+( mouse ) ;mousex 2 ;mousey 2 ;state 1
+
+|0100 @RESET
+
+ ,paint-background JSR
+ #0020 #0020 #00d0 #0080 ,paint-window JSR
+ #0040 #0040 #00f0 #0070 ,paint-window JSR
+ #0060 #004c #00c0 #007a ,paint-window JSR
+
+ #05 =dev/r ( set dev/read mouse )
+ #02 =dev/w ( set dev/write sprite )
+
+BRK
+
+|c000 @FRAME
+
+ ( clear last cursor )
+ #10 ,clear_icn ~mousex ~mousey ,draw-sprite JSR
+ ( record mouse positions )
+ #00 IOR2 =mousex #02 IOR2 =mousey
+ ( record mouse state )
+ #04 IOR #11 ADD =state
+
+ #04 IOR #01 NEQ ,no-touch ROT JMP? POP2
+ ,on-touch JSR
+ @no-touch
+
+ ( draw mouse )
+ ~state ,cursor_icn ~mousex ~mousey ,draw-sprite JSR
+
+BRK
+
+@paint-background ( nil )
+
+ #01 =dev/r ( read screen for size )
+ #02 =dev/w ( write to sprite )
+
+ #0000
+ @paint-background-loop-hor
+ #0000
+ @paint-background-loop
+ ( draw ) OVR2 IOW2 DUP2 IOW2 ,texture IOW2 #01 IOW
+ ( incr ) #0008 ADD2 DUP2
+ #00 IOR2 LTH2 ,paint-background-loop ROT JMP? POP2
+ POP2
+ ( incr ) #0008 ADD2 DUP2
+ #02 IOR2 LTH2 ,paint-background-loop-hor ROT JMP? POP2
+ POP2
+
+RTS
+
+@paint-window ( wx1 wy1 wx2 wy2 )
+
+ =wy2 =wx2 =wy1 =wx1
+
+ #01 =dev/r ( read screen for size )
+ #01 =dev/w ( write to screen )
+
+ ( Draw background )
+ #01 =color
+ ~wx1 #0003 ADD2 ~wy1 #0003 ADD2 ~wx2 #0003 ADD2 ~wy2 #0003 ADD2 ,fill-rect JSR
+ #02 =color
+ ~wx1 ~wy1 ~wx2 ~wy2 ,fill-rect JSR
+ ( draw outline )
+ #01 =color
+ ~wx1 ~wy1 ~wx2 ~wy2 ,line-rect JSR
+ #02 =color
+ ~wx1 #0002 ADD2 ~wy1 #0002 ADD2 ~wx2 #0002 SUB2 ~wy2 #0002 SUB2 ,line-rect JSR
+
+ #02 =dev/w
+ #09 =color
+ ,text1 ~wx1 #0008 ADD2 ~wy1 #0008 ADD2 ,draw-label JSR
+
+RTS
+
+@on-touch
+
+RTS
+
+@fill-rect ( x1 y1 x2 y2 )
+ =y2 =x2 ( stash x1 y1 ) =y1 DUP2 WSR2 =x1
+ @fill-rect-ver
+ RSW2 DUP2 =x1 WSR2
+ @fill-rect-hor
+ ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
+ ( incr ) ~x1 #0001 ADD2 DUP2 =x1
+ ~x2 LTH2 ,fill-rect-hor ROT JMP? POP2
+ ~y1 #0001 ADD2 DUP2 =y1
+ ~y2 LTH2 ,fill-rect-ver ROT JMP? POP2
+ RSW2 POP2
+RTS
+
+@line-rect ( x1 y1 x2 y2 )
+ =y2 =x2 ( stash x1 y1 ) DUP2 WSR2 =y1 DUP2 WSR2 =x1
+ @line-rect-hor
+ ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
+ ( draw ) ~x1 ~y2 IOW2 IOW2 ~color IOW
+ ( incr ) ~x1 #0001 ADD2 DUP2 =x1
+ ~x2 #0001 ADD2 LTH2 ,line-rect-hor ROT JMP? POP2
+ ( restore x1 y1 ) RSW2 =x1 RSW2 =y1
+ @line-rect-ver
+ ( incr ) ~y1 #0001 ADD2 DUP2 =y1
+ ( draw ) ~x1 ~y1 IOW2 IOW2 ~color IOW
+ ( draw ) ~x2 ~y1 IOW2 IOW2 ~color IOW
+ ~y2 #0001 SUB2 LTH2 ,line-rect-ver ROT JMP? POP2
+RTS
+
+@draw-sprite
+ IOW2 ( y byte )
+ IOW2 ( x byte )
+ IOW2 ( sprite address )
+ IOW ( layer-color )
+RTS
+
+@draw-label ( text x1 y1 )
+ =y1 =x1
+ @draw-label-loop
+ ( draw ) ~x1 ~y1 IOW2 IOW2 DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 IOW2 ~color IOW
+ ( incr ) #0001 ADD2
+ ( incr ) ~x1 #0008 ADD2 =x1
+ DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
+RTS
+
+@texture [ aa55 aa55 aa55 aa55 ]
+@clear_icn [ 0000 0000 0000 0000 ]
+@cursor_icn [ 80c0 e0f0 f8e0 1000 ]
+@checkoff_icn [ 7e81 8181 8181 817e ]
+@checkon_icn [ 7e81 99bd bd99 817e ]
+
+@text1 " Planet " ( add string to memory )
+@text2 " To Jupiter "
+@text3 " To Neptune "
+@text4 " To Nereid "
+@text5 " Theme "
+
+@font ( spectrum-zx font )
+[
+ 0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
+ 0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
+ 007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
+ 0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
+ 0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
+ 003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
+ 0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
+ 0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
+ 0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
+ 0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
+ 0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
+ 0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
+ 003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
+ 0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
+ 003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
+ 0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
+ 003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
+ 0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
+ 0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
+ 0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
+ 007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
+ 00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
+ 0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
+ 0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
+ 0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
+ 0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
+ 0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
+ 0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
+ 0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
+ 0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
+ 0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
+ 0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
+]
+
+|d000 @ERROR BRK
+|FFF0 [ 31ff e1ff b10f ] ( palette )
+|FFFA .RESET .FRAME .ERROR
