diff --git a/README.md b/README.md index 7781725..0cd373c 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,10 @@ evaluxn(u, u->vframe); /* Each frame ``` ( hello world ) -:dev/w fff9 ( const write port ) +&Console { pad 8 stdio 1 } |0100 @RESET - #00 =dev/w ( set dev/write to console ) ,text1 ,print-label JSR ( print to console ) BRK @@ -65,7 +64,7 @@ BRK @print-label ( text ) @cliloop - DUP2 LDR IOW ( write pointer value to console ) + DUP2 LDR =dev/console.stdio ( write pointer value to console ) #0001 ADD2 ( increment string pointer ) DUP2 LDR #00 NEQ ,cliloop ROT JMP? POP2 ( while *ptr!=0 goto loop ) POP2 @@ -77,6 +76,8 @@ RTS |c000 @FRAME |d000 @ERROR +|FF00 ;dev/console Console + |FFF0 [ f3f0 f30b f30a ] ( palette ) |FFFA .RESET .FRAME .ERROR ``` @@ -113,10 +114,6 @@ A device that works like a NES controller, each button is a bit from a single by - GUI: - Line routine -### Devices redesign - -- Possibly remove - ### Assembler - Includes diff --git a/assembler.c b/assembler.c index 69118f8..a151410 100644 --- a/assembler.c +++ b/assembler.c @@ -44,7 +44,7 @@ Program p; /* clang-format off */ char ops[][4] = { - "BRK", "NOP", "LIT", "---", "IOR", "IOW", "LDR", "STR", + "BRK", "NOP", "LIT", "---", "---", "---", "LDR", "STR", "JMP", "JSR", "---", "RTS", "AND", "ORA", "ROL", "ROR", "POP", "DUP", "SWP", "OVR", "ROT", "WSR", "RSW", "---", "ADD", "SUB", "MUL", "DIV", "EQU", "NEQ", "GTH", "LTH" diff --git a/emulator.c b/emulator.c index f4f9797..596aa92 100644 --- a/emulator.c +++ b/emulator.c @@ -65,7 +65,7 @@ SDL_Texture *gTexture; Uint32 *pixels; Screen screen; -Device *devconsole, *devscreen, *devmouse, *devkey, *devsprite, *devcontroller; +Device *devconsole, *devscreen, *devmouse, *devkey, *devsprite, *devctrl; #pragma mark - Helpers @@ -256,7 +256,7 @@ void domouse(Uxn *u, SDL_Event *event) { Uint8 flag = 0x00; - Uint16 addr = 0xff50; /* TODO: get dynamically */ + Uint16 addr = devmouse->addr; Uint16 x = clamp(event->motion.x / ZOOM - PAD * 8, 0, HOR * 8 - 1); Uint16 y = clamp(event->motion.y / ZOOM - PAD * 8, 0, VER * 8 - 1); u->ram.dat[addr + 0] = (x >> 8) & 0xff; @@ -283,16 +283,17 @@ domouse(Uxn *u, SDL_Event *event) } void -dotext(SDL_Event *event) +dotext(Uxn *u, SDL_Event *event) { int i; + Uint16 addr = devkey->addr; if(SDL_GetModState() & KMOD_LCTRL || SDL_GetModState() & KMOD_RCTRL) return; for(i = 0; i < SDL_TEXTINPUTEVENT_TEXT_SIZE; ++i) { char c = event->text.text[i]; if(c < ' ' || c > '~') break; - devkey->mem[0] = c; + u->ram.dat[addr] = c; } } @@ -300,8 +301,8 @@ void doctrl(Uxn *u, SDL_Event *event, int z) { Uint8 flag = 0x00; - Uint16 addr = 0xff30; /* TODO: get dynamically */ - if(z && event->key.keysym.sym == SDLK_h) + Uint16 addr = devctrl->addr; + if(z && event->key.keysym.sym == SDLK_h && SDL_GetModState() & KMOD_LCTRL) GUIDES = !GUIDES; if(SDL_GetModState() & KMOD_LCTRL || SDL_GetModState() & KMOD_RCTRL) flag = 0x01; @@ -310,11 +311,11 @@ doctrl(Uxn *u, SDL_Event *event, int z) switch(event->key.keysym.sym) { case SDLK_BACKSPACE: flag = 0x04; - if(z) devkey->mem[0] = 0x08; + if(z) u->ram.dat[0xff40] = 0x08; break; case SDLK_RETURN: flag = 0x08; - if(z) devkey->mem[0] = 0x0d; + if(z) u->ram.dat[0xff40] = 0x0d; break; case SDLK_UP: flag = 0x10; break; case SDLK_DOWN: flag = 0x20; break; @@ -378,44 +379,6 @@ ppnil(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1) return b1; } -Uint8 -defaultrw(Device *d, Memory *m, Uint8 b) -{ - (void)m; - return d->mem[b]; -} - -Uint8 -consolew(Device *d, Memory *m, Uint8 b) -{ - if(b) - printf("%c", b); - fflush(stdout); - (void)d; - (void)m; - return 0; -} - -Uint8 -spritew(Device *d, Memory *m, Uint8 b) -{ - d->mem[d->ptr++] = b; - if(d->ptr == 7) { - Uint16 x = (d->mem[2] << 8) + d->mem[3]; - Uint16 y = (d->mem[0] << 8) + d->mem[1]; - Uint16 a = (d->mem[4] << 8) + d->mem[5]; - Uint8 source = d->mem[6] >> 4 & 0xf; - Uint8 *layer = source % 2 ? screen.fg : screen.bg; - if(source / 2) - paintchr(layer, x, y, &m->dat[a]); - else - painticn(layer, x, y, &m->dat[a], d->mem[6] & 0xf); - screen.reqdraw = 1; - d->ptr = 0; - } - return 0; -} - #pragma mark - Generics int @@ -432,14 +395,13 @@ start(Uxn *u) if(tick < ticknext) SDL_Delay(ticknext - tick); ticknext = tick + (1000 / FPS); - devkey->mem[0] = 0x00; /* TODO: cleanup */ while(SDL_PollEvent(&event) != 0) { switch(event.type) { case SDL_QUIT: quit(); break; case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEMOTION: domouse(u, &event); break; - case SDL_TEXTINPUT: dotext(&event); break; + case SDL_TEXTINPUT: dotext(u, &event); break; case SDL_KEYDOWN: doctrl(u, &event, 1); break; case SDL_KEYUP: doctrl(u, &event, 0); break; case SDL_WINDOWEVENT: @@ -468,12 +430,12 @@ main(int argc, char **argv) if(!init()) return error("Init", "Failed"); - devconsole = portuxn(&u, "console", defaultrw, consolew, ppnil, console_poke); - devscreen = portuxn(&u, "screen", defaultrw, defaultrw, ppnil, screen_poke); - devsprite = portuxn(&u, "sprite", defaultrw, spritew, ppnil, sprite_poke); - devcontroller = portuxn(&u, "controller", defaultrw, defaultrw, ppnil, ppnil); - devkey = portuxn(&u, "key", defaultrw, consolew, ppnil, ppnil); - devmouse = portuxn(&u, "mouse", defaultrw, defaultrw, ppnil, ppnil); + devconsole = portuxn(&u, "console", ppnil, console_poke); + devscreen = portuxn(&u, "screen", ppnil, screen_poke); + devsprite = portuxn(&u, "sprite", ppnil, sprite_poke); + devctrl = portuxn(&u, "controller", ppnil, ppnil); + devkey = portuxn(&u, "key", ppnil, ppnil); + devmouse = portuxn(&u, "mouse", ppnil, ppnil); u.ram.dat[0xff10] = (HOR * 8 >> 8) & 0xff; u.ram.dat[0xff11] = HOR * 8 & 0xff; diff --git a/examples/dev.ctrl.usm b/examples/dev.ctrl.usm index 951e3ee..49cf176 100644 --- a/examples/dev.ctrl.usm +++ b/examples/dev.ctrl.usm @@ -1,4 +1,4 @@ -( controller ) +( dev/ctrl ) &Screen { width 2 height 2 pad 4 y 2 x 2 color 1 } &Sprite { pad 8 x 2 y 2 addr 2 color 1 } diff --git a/examples/dev.key.usm b/examples/dev.key.usm new file mode 100644 index 0000000..67d540c --- /dev/null +++ b/examples/dev.key.usm @@ -0,0 +1,134 @@ +( dev/key ) + +&Screen { width 2 height 2 pad 4 y 2 x 2 color 1 } +&Sprite { pad 8 x 2 y 2 addr 2 color 1 } +&Keyboard { key 1 } + +&Point2d { x 2 y 2 } +&Rect2d { x1 2 y1 2 x2 2 y2 2 } + +;pos Point2d +;rect Rect2d +;color 1 +;textlen 2 + +|0100 @RESET + + ,redraw JSR + +BRK + +|c000 @FRAME + + ~dev/key #00 EQU ,key-end ROT JMP? POP2 + ( is backspace ) + ~dev/key #08 NEQ ,no-key-back ROT JMP? POP2 + #00 ,body ~textlen ADD2 STR + ~textlen #0001 SUB2 =textlen + ,key-end JMP + @no-key-back + + ~textlen #0001 ADD2 =textlen + ~dev/key ,body ~textlen ADD2 STR + ,redraw JSR + #00 =dev/key ( release key ) + @key-end + +BRK + +@redraw + + #02 =color + #0040 #0040 #0090 #0090 ,fill-rect JSR + #06 =color + ,body #0040 #0040 ,draw-label-multiline JSR + +RTS + +@draw-label-multiline ( text x1 y1 ) + =pos.y =pos.x + @draw-label-multiline-loop + ( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr + ~pos.y =dev/sprite.y + ~pos.x =dev/sprite.x + ~color =dev/sprite.color + ( incr ) #0001 ADD2 + ( incr ) ~pos.x #0008 ADD2 =pos.x + + ( detect linebreaks ) + DUP2 LDR #0d NEQ ,no-return ROT JMP? POP2 + #0048 =pos.x + ~pos.y #0008 ADD2 =pos.y + @no-return + + DUP2 LDR #00 NEQ ,draw-label-multiline-loop ROT JMP? POP2 + POP2 +RTS + +@fill-rect ( x1 y1 x2 y2 ) + =rect.y2 =rect.x2 ( stash x1 y1 ) =rect.y1 DUP2 WSR2 =rect.x1 + @fill-rect-ver + RSW2 DUP2 =rect.x1 WSR2 + ~rect.y1 =dev/screen.y + @fill-rect-hor + ( draw ) ~rect.x1 =dev/screen.x ~color =dev/screen.color + ( incr ) ~rect.x1 #0001 ADD2 DUP2 =rect.x1 + ~rect.x2 LTH2 ,fill-rect-hor ROT JMP? POP2 + ~rect.y1 #0001 ADD2 DUP2 =rect.y1 + ~rect.y2 LTH2 ,fill-rect-ver ROT JMP? POP2 + RSW2 POP2 +RTS + +@draw-sprite + =dev/sprite.x + =dev/sprite.y + =dev/sprite.addr + =dev/sprite.color + RTS + +@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 +] + +@body [ ] + +|d000 @ERROR BRK + +|FF10 ;dev/screen Screen +|FF20 ;dev/sprite Sprite +|FF40 ;dev/key Keyboard + +|FFF0 [ f0ff f00f f00f ] ( palette ) +|FFFA .RESET .FRAME .ERROR diff --git a/examples/dev.mouse.usm b/examples/dev.mouse.usm index b473e01..878f5a3 100644 --- a/examples/dev.mouse.usm +++ b/examples/dev.mouse.usm @@ -1,4 +1,4 @@ -( mouse ) +( dev/mouse ) &Screen { width 2 height 2 pad 4 y 2 x 2 color 1 } &Sprite { pad 8 x 2 y 2 addr 2 color 1 } diff --git a/examples/dev.screen.usm b/examples/dev.screen.usm index 14fe7b1..15ed524 100644 --- a/examples/dev.screen.usm +++ b/examples/dev.screen.usm @@ -1,4 +1,4 @@ -( screen ) +( dev/screen ) &Screen { width 2 height 2 pad 4 x 2 y 2 color 1 } diff --git a/examples/devkey.usm b/examples/devkey.usm deleted file mode 100644 index a1f46df..0000000 --- a/examples/devkey.usm +++ /dev/null @@ -1,233 +0,0 @@ -( mouse ) - -:dev/r fff8 ( std read port ) -:dev/w fff9 ( std write port ) - -&Point2d { x 2 y 2 } -&Window2d { x1 2 y1 2 x2 2 y2 2 } - -;pos Point2d -;mouse Point2d -;scenter Point2d -;win Window2d - -( drawing ) ;color 1 ;x1 2 ;x2 2 ;y1 2 ;y2 2 ;i 2 -;state 1 ;textlen 2 - -|0100 @RESET - - #01 =dev/r ( read screen for size ) - #02 =dev/w ( write to screen ) - - #08 =color - ,paint-pattern JSR - - #01 =dev/w ( write to screen ) - - #00 IOR2 #0002 DIV2 =scenter.x - #02 IOR2 #0002 DIV2 =scenter.y - - ~scenter.x #0050 SUB2 - ~scenter.y #0030 SUB2 - ~scenter.x #0050 ADD2 - ~scenter.y #0030 ADD2 ,paint-window JSR - - #05 =dev/r ( set dev/read mouse ) - #02 =dev/w ( set dev/write to sprite ) - - #09 =color - -BRK - -|c000 @FRAME - - ( clear last cursor ) - #10 ,clear_icn ~mouse.x ~mouse.y ,draw-sprite JSR - ( record mouse positions ) - #05 =dev/r ( set dev/read mouse ) - #00 IOR2 =mouse.x - #02 IOR2 =mouse.y - #11 =state - - #04 IOR #01 NEQ ,no-touch ROT JMP? POP2 - #13 =state - @no-touch - - ( clear window ) - - #04 =dev/r ( set dev/read mouse ) - #00 IOR #00 EQU ,key-end ROT JMP? POP2 - - ( is backspace ) - #00 IOR #08 NEQ ,no-key-back ROT JMP? POP2 - #00 ,body ~textlen ADD2 STR - ~textlen #0001 SUB2 =textlen - ,redraw-body-label JSR - ,key-end JMP - @no-key-back - - ~textlen #0001 ADD2 =textlen - #00 IOR ,body ~textlen ADD2 STR - ,redraw-body-label JSR - @key-end - - ( draw mouse ) - ~state ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR - -BRK - -@redraw-body-label - - #02 =color - #01 =dev/w ( write to screen ) - ~win.x1 #0004 ADD2 ~win.y1 #0004 ADD2 ~win.x2 #0010 SUB2 ~win.y2 #0010 SUB2 ,fill-rect JSR - #02 =dev/w ( write to sprite ) - #06 =color - ,body ~win.x1 #0018 ADD2 ~scenter.y ,draw-label JSR - -RTS - -@paint-pattern ( nil ) - - #01 =dev/r ( read screen for size ) - #02 =dev/w ( write to sprite ) - - #0000 - @paint-pattern-loop-hor - #0000 - @paint-pattern-loop - ( draw ) OVR2 IOW2 DUP2 IOW2 ,pattern IOW2 ~color IOW - ( incr ) #0008 ADD2 DUP2 - #00 IOR2 LTH2 ,paint-pattern-loop ROT JMP? POP2 - POP2 - ( incr ) #0008 ADD2 DUP2 - #02 IOR2 LTH2 ,paint-pattern-loop-hor ROT JMP? POP2 - POP2 - -RTS - -@paint-window ( name wx1 wy1 wx2 wy2 ) - - =win.y2 =win.x2 =win.y1 =win.x1 - - ( Draw shadow ) - #01 =color - ~win.x2 ~win.y1 #0003 ADD2 ~win.x2 #0003 ADD2 ~win.y2 #0003 ADD2 ,fill-rect JSR - ~win.x1 #0003 ADD2 ~win.y2 ~win.x2 #0003 ADD2 ~win.y2 #0003 ADD2 ,fill-rect JSR - ( Fill background ) - #02 =color - ~win.x1 ~win.y1 ~win.x2 ~win.y2 ,fill-rect JSR - ( draw outline ) - #01 =color - ~win.x1 ~win.y1 ~win.x2 ~win.y2 ,line-rect JSR - #01 =color - ~win.x1 #0002 ADD2 ~win.y1 #0002 ADD2 ~win.x2 #0002 SUB2 ~win.y2 #0002 SUB2 ,line-rect JSR - -RTS - -@draw-label ( text x1 y1 ) - - =pos.y =pos.x - @draw-label-loop - - ( draw ) ~pos.x ~pos.y IOW2 IOW2 DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 IOW2 ~color IOW - ( incr ) #0001 ADD2 - ( incr ) ~pos.x #0008 ADD2 =pos.x - - ( detect linebreaks ) - DUP2 LDR #0d NEQ ,no-return ROT JMP? POP2 - #0048 =pos.x - ( incr ) ~pos.y #0008 ADD2 =pos.y - @no-return - - DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2 - 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 - -@pattern [ 4281 1824 2418 8142 ] - -@clear_icn [ 0000 0000 0000 0000 ] -@cursor_icn [ 80c0 e0f0 f8e0 1000 ] - -@mouse0_icn [ 7c82 92ee 8282 4438 ] -@mouse1_icn [ 7cf2 f2ee 8282 4438 ] -@mouse2_icn [ 7c9e 9eee 8282 4438 ] -@mouse12_icn [ 7cfe feee 8282 4438 ] - -@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 -] - -@body [ ] - -|d000 @ERROR BRK -|FFF0 [ f0ff f00f f00f ] ( palette ) -|FFFA .RESET .FRAME .ERROR diff --git a/uxn.c b/uxn.c index 7690ea3..4ac62b7 100644 --- a/uxn.c +++ b/uxn.c @@ -34,8 +34,6 @@ Uint16 peek16(Stack *s, Uint8 a) { return peek8(s, a * 2) + (peek8(s, a * 2 + 1) void op_brk(Uxn *u) { setflag(&u->status, FLAG_HALT, 1); } void op_lit(Uxn *u) { u->literal += 1; } void op_nop(Uxn *u) { printf("0x%02x \n", pop8(&u->wst)); fflush(stdout); } -void op_ior(Uxn *u) { Device *dev = &u->dev[mempeek8(u, u->devr)]; if(dev) push8(&u->wst, dev->read(dev, &u->ram, pop8(&u->wst))); } -void op_iow(Uxn *u) { Uint8 a = pop8(&u->wst); Device *dev = &u->dev[mempeek8(u, u->devw)]; if(dev) dev->write(dev, &u->ram, a); } void op_ldr(Uxn *u) { Uint16 a = pop16(&u->wst); push8(&u->wst, mempeek8(u, a)); } void op_str(Uxn *u) { Uint16 a = pop16(&u->wst); Uint8 b = pop8(&u->wst); mempoke8(u, a, b); } /* Logic */ @@ -66,8 +64,6 @@ void op_lth(Uxn *u) { Uint8 a = pop8(&u->wst), b = pop8(&u->wst); push8(&u->wst, /* --- */ void op_lit16(Uxn *u) { u->literal += 2; } void op_nop16(Uxn *u) { printf("%04x\n", pop16(&u->wst)); } -void op_ior16(Uxn *u) { Uint8 a = pop8(&u->wst); Device *dev = &u->dev[mempeek8(u, u->devr)]; if(dev) push16(&u->wst, (dev->read(dev, &u->ram, a) << 8) + dev->read(dev, &u->ram, a + 1)); } -void op_iow16(Uxn *u) { Uint8 a = pop8(&u->wst); Uint8 b = pop8(&u->wst); Device *dev = &u->dev[mempeek8(u, u->devw)]; if(dev) { dev->write(dev, &u->ram, b); dev->write(dev, &u->ram, a); } } void op_ldr16(Uxn *u) { Uint16 a = pop16(&u->wst); push16(&u->wst, mempeek16(u, a)); } void op_str16(Uxn *u) { Uint16 a = pop16(&u->wst); Uint16 b = pop16(&u->wst); mempoke16(u, a, b); } void op_and16(Uxn *u) { Uint16 a = pop16(&u->wst), b = pop16(&u->wst); push16(&u->wst, b & a); } @@ -93,12 +89,12 @@ void op_gth16(Uxn *u) { Uint16 a = pop16(&u->wst), b = pop16(&u->wst); push8(&u- void op_lth16(Uxn *u) { Uint16 a = pop16(&u->wst), b = pop16(&u->wst); push8(&u->wst, getflag(&u->status, FLAG_SIGN) ? (Sint16)b < (Sint16)a : b < a); } void (*ops[])(Uxn *u) = { - op_brk, op_nop, op_lit, op_nop, op_ior, op_iow, op_ldr, op_str, + op_brk, op_nop, op_lit, op_nop, op_nop, op_nop, op_ldr, op_str, op_jmp, op_jsr, op_nop, op_rts, op_and, op_ora, op_rol, op_ror, op_pop, op_dup, op_swp, op_ovr, op_rot, op_wsr, op_rsw, op_nop, op_add, op_sub, op_mul, op_div, op_equ, op_neq, op_gth, op_lth, /* 16-bit */ - op_brk, op_nop16, op_lit16, op_nop, op_ior16, op_iow16, op_ldr16, op_str16, + op_brk, op_nop16, op_lit16, op_nop, op_nop, op_nop, op_ldr16, op_str16, op_jmp, op_jsr, op_nop, op_rts, op_and16, op_ora16, op_rol16, op_ror16, op_pop16, op_dup16, op_swp16, op_ovr16, op_rot16, op_wsr16, op_rsw16, op_nop, op_add16, op_sub16, op_mul16, op_div16, op_equ16, op_neq16, op_gth16, op_lth16 @@ -211,14 +207,12 @@ loaduxn(Uxn *u, char *filepath) } Device * -portuxn(Uxn *u, char *name, Uint8 (*rfn)(Device *, Memory *, Uint8), Uint8 (*wfn)(Device *, Memory *, Uint8), Uint8 (*pefn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1), Uint8 (*pofn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1)) +portuxn(Uxn *u, char *name, Uint8 (*pefn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1), Uint8 (*pofn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1)) { Device *d = &u->dev[u->devices++]; - d->read = rfn; - d->write = wfn; + d->addr = 0xff00 + (u->devices - 1) * 0x10; d->peek = pefn; d->poke = pofn; - d->ptr = 0; - printf("Device #%d: %s \n", u->devices - 1, name); + printf("Device #%d: %s, at 0x%04x \n", u->devices - 1, name, d->addr); return d; } diff --git a/uxn.h b/uxn.h index e670e38..320ff37 100644 --- a/uxn.h +++ b/uxn.h @@ -32,9 +32,7 @@ typedef struct { } Memory; typedef struct Device { - Uint8 ptr, mem[8]; - Uint8 (*read)(struct Device *, Memory *, Uint8); - Uint8 (*write)(struct Device *, Memory *, Uint8); + Uint16 addr; Uint8 (*peek)(Uint8 *, Uint16, Uint8, Uint8); Uint8 (*poke)(Uint8 *, Uint16, Uint8, Uint8); } Device; @@ -44,7 +42,7 @@ typedef struct { Uint16 counter, devr, devw, vreset, vframe, verror; Stack wst, rst; Memory ram; - Device dev[256]; + Device dev[8]; } Uxn; void setflag(Uint8 *status, char flag, int b); @@ -52,4 +50,4 @@ int getflag(Uint8 *status, char flag); int loaduxn(Uxn *c, char *filepath); int bootuxn(Uxn *c); int evaluxn(Uxn *u, Uint16 vec); -Device *portuxn(Uxn *u, char *name, Uint8 (*rfn)(Device *, Memory *, Uint8), Uint8 (*wfn)(Device *, Memory *, Uint8), Uint8 (*pefn)(Uint8 *, Uint16, Uint8, Uint8), Uint8 (*pofn)(Uint8 *, Uint16, Uint8, Uint8)); +Device *portuxn(Uxn *u, char *name, Uint8 (*pefn)(Uint8 *, Uint16, Uint8, Uint8), Uint8 (*pofn)(Uint8 *, Uint16, Uint8, Uint8));