From b0ca1dc05ed730dce84b3d0f1054953bea0d3df9 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Sat, 29 Jun 2024 19:10:10 -0800 Subject: [PATCH] (uxncore) Added base core --- cli/uxncore/makefile | 9 ++- cli/uxncore/src/main.c | 138 ++++++++++++++++++++++++++++++++++++ cli/uxncore/src/uxncore.tal | 78 ++++++++++++++++---- 3 files changed, 211 insertions(+), 14 deletions(-) create mode 100644 cli/uxncore/src/main.c diff --git a/cli/uxncore/makefile b/cli/uxncore/makefile index 805bdad..f0a7734 100644 --- a/cli/uxncore/makefile +++ b/cli/uxncore/makefile @@ -5,12 +5,14 @@ LIN=uxncli ${DIR}/uxnlin.rom EMU=uxncli ROM=bin/${ID}.rom -all: ${ROM} +all: ${ROM} bin/main lint: @ ${LIN} src/${ID}.tal run: all @ ${EMU} ${ROM} + @ ./bin/main + @ rm ./bin/main clean: @ rm -f ${ROM} ${ROM}.sym install: ${ROM} @@ -18,7 +20,10 @@ install: ${ROM} uninstall: @ rm -f ${DIR}/${ID}.rom -.PHONY: all clean lint run install uninstall +.PHONY: all clean lint run install uninstall + +bin/main: src/main.c + @ cc src/main.c -o bin/main ${ROM}: src/* @ mkdir -p bin diff --git a/cli/uxncore/src/main.c b/cli/uxncore/src/main.c new file mode 100644 index 0000000..23aa9fc --- /dev/null +++ b/cli/uxncore/src/main.c @@ -0,0 +1,138 @@ +#include + +typedef unsigned char Uint8; +typedef signed char Sint8; +typedef unsigned short Uint16; + +typedef struct { + Uint8 dat[0x100], ptr; +} Stack; + +typedef struct Uxn { + Uint8 ram[0x10000], dev[0x100]; + Stack wst, rst; +} Uxn; + +Uxn uxn; + +static void +system_print(Stack *s) +{ + Uint8 i; + for(i = s->ptr - 7; i != (Uint8)(s->ptr + 1); i++) + fprintf(stderr, "%02x%c", s->dat[i], i == 2 ? '|' : ' '); + fprintf(stderr, "< \n"); +} + +void +system_inspect(void) +{ + fprintf(stderr, "WST "), system_print(&uxn.wst); + fprintf(stderr, "RST "), system_print(&uxn.rst); +} + +Uint8 +emu_dei(Uint8 addr) +{ + return uxn.dev[addr]; +} + +void +emu_deo(Uint8 addr, Uint8 value) +{ + uxn.dev[addr] = value; + switch(addr) { + case 0x18: fputc(uxn.dev[0x18], stdout), fflush(stdout); return; + case 0x19: fputc(uxn.dev[0x19], stderr), fflush(stderr); return; + } +} + +#define FLIP { s = ins & 0x40 ? &uxn.wst : &uxn.rst; } +#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); } +#define POP1(o) { o = s->dat[--*sp]; } +#define POP2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); } +#define POPx(o) { if(m2) { POP2(o) } else POP1(o) } +#define PUSH1(y) { s->dat[s->ptr++] = (y); } +#define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; } +#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) } +#define PEEK(o, x, r) { if(m2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)]; } +#define POKE(x, y, r) { if(m2) { r = (x); uxn.ram[r++] = y >> 8; uxn.ram[r] = y; } else uxn.ram[(x)] = (y); } +#define DEVR(o, p) { if(m2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); } +#define DEVW(p, y) { if(m2) { emu_deo(p, y >> 8); emu_deo(p + 1, y); } else emu_deo(p, y); } + +int +uxn_eval(Uint16 pc) +{ + if(!pc || uxn.dev[0x0f]) return 0; + for(;;) { + Uint16 tt, a, b, c; + Uint8 t, kp, *sp, ins = uxn.ram[pc++]; + /* 2 */ Uint8 m2 = ins & 0x20; + /* r */ Stack *s = ins & 0x40 ? &uxn.rst : &uxn.wst; + /* k */ if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr; + switch(ins & 0x1f) { + case 0x00: + switch(ins) { + case 0x00: /* BRK */ return 1; + case 0x20: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* fall */ + case 0x40: /* JMI */ a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break; + case 0x60: /* JSI */ PUSH2(pc + 2) a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break; + case 0xa0: case 0xe0: /* LIT2 */ PUSH1(uxn.ram[pc++]) /* fall */ + case 0x80: case 0xc0: /* LIT */ PUSH1(uxn.ram[pc++]) break; + } break; + case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break; + case 0x02: /* POP */ POPx(a) break; + case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break; + case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break; + case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break; + case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break; + case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break; + case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break; + case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break; + case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break; + case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break; + case 0x0c: /* JMP */ POPx(a) JUMP(a) break; + case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break; + case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break; + case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break; + case 0x10: /* LDZ */ POP1(a) PEEK(b, a, t) PUSHx(b) break; + case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b, t) break; + case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) break; + case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) break; + case 0x14: /* LDA */ POP2(a) PEEK(b, a, tt) PUSHx(b) break; + case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b, tt) break; + case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break; + case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break; + case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break; + case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break; + case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx(b * a) break; + case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break; + case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break; + case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break; + case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break; + case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break; + } + system_inspect(); + } +} + +void +console_input(char c, int type) +{ + uxn.dev[0x12] = c, uxn.dev[0x17] = type; + uxn_eval(uxn.dev[0x10] << 8 | uxn.dev[0x11]); +} + +int +main(int argc, char **argv) +{ + uxn.ram[0x100] = 0xa0; + uxn.ram[0x101] = 0x12; + uxn.ram[0x102] = 0x34; + if(uxn_eval(0x0100) && (uxn.dev[0x10] << 8 | uxn.dev[0x11])) { + while(!uxn.dev[0x0f]) { + + } + } + return uxn.dev[0x0f] & 0x7f; +} diff --git a/cli/uxncore/src/uxncore.tal b/cli/uxncore/src/uxncore.tal index a19e9b3..dedbe38 100644 --- a/cli/uxncore/src/uxncore.tal +++ b/cli/uxncore/src/uxncore.tal @@ -28,7 +28,7 @@ [ LIT2 "/ 18 ] DEO #2018 DEO ( | body ) - #00 OVR #1f AND DUP ADD ;opc-lut ADD2 LDA2 JSR2 + #00 OVR #1f AND DUP ADD ;opc-lut ADD2 LDA2 JSR2 #2018 DEO ( ) ;dict/break #0a18 DEO JMP2r @@ -80,8 +80,8 @@ @|body ) @opc-lut [ - =op-brk =op-inc =op-pop =op-brk - =op-brk =op-brk =op-brk =op-brk + =op-brk =op-inc =op-pop =op-nip + =op-swp =op-rot =op-dup =op-ovr =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk =op-brk @@ -91,7 +91,6 @@ @op-brk ( byte -- ) ;dict/return - #2018 DEO POP JMP2r @op-inc ( byte -- ) @@ -102,16 +101,71 @@ [ LIT2 "] 18 ] DEO [ LIT2 "; 18 ] DEO - #2018 DEO POP JMP2r @op-pop ( byte -- ) [ LIT2 "; 18 ] DEO - #2018 DEO POP JMP2r +@op-nip ( byte -- ) + + [ LIT2 "[ 18 ] DEO + + + [ LIT2 "] 18 ] DEO + + + [ LIT2 "[ 18 ] DEO + + [ LIT2 "] 18 ] DEO + [ LIT2 "; 18 ] DEO + POP JMP2r + +@op-swp ( byte -- ) + ( | a ) + + [ LIT2 "[ 18 ] DEO + + #01 + [ LIT2 "] 18 ] DEO + + ( | b ) + + [ LIT2 "[ 18 ] DEO + + #02 + [ LIT2 "] 18 ] DEO + [ LIT2 "; 18 ] DEO + POP JMP2r + +@op-rot ( byte -- ) + POP JMP2r + +@op-dup ( byte -- ) + + [ LIT2 "[ 18 ] DEO + + [ LIT2 "] 18 ] DEO + + + [ LIT2 "[ 18 ] DEO + + [ LIT2 "] 18 ] DEO + [ LIT2 "; 18 ] DEO + #2018 DEO + + + [ LIT2 "; 18 ] DEO + POP JMP2r + +@op-ovr ( byte -- ) + POP JMP2r + +( +@|framework ) + @ ( -- ) [ LIT2 "+ 18 ] DEOk DEO JMP2r @@ -149,13 +203,13 @@ [ LIT "0 ] ADD #18 DEO JMP2r -@ ( -- ) - ;dict/uxn-wst-dat - JMP2r +@ ( byte -- byte ) + DUP #40 AND ?{ ;dict/uxn-wst-dat ! } + ;dict/uxn-rst-dat ! -@ ( -- ) - ;dict/uxn-wst-ptr - JMP2r +@ ( byte -- byte ) + DUP #40 AND ?{ ;dict/uxn-wst-ptr ! } + ;dict/uxn-rst-ptr ! ( @|utils )