uxn

commit c60dbfe872a8026a24395823c12fd73cd36cc7a8
parent 5661eb2a2bbd9452731732a7c0d4ecf8b8fa95d5
Author: neauoire <aliceffekt@gmail.com>
Date:   Sun, 21 Mar 2021 11:28:59 -0700

Started implementing peek/poke

Diffstat:
M
assembler.c
 | 
2
+-
M
build.sh
 | 
2
+-
A
projects/tests/peek.usm
 | 
22
++++++++++++++++++++++
M
uxn.c
 | 
12
++++++++----

4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/assembler.c b/assembler.c
@@ -47,7 +47,7 @@ Program p;
 char ops[][4] = {
 	"BRK", "NOP", "LIT", "POP", "DUP", "SWP", "OVR", "ROT",
 	"EQU", "NEQ", "GTH", "LTH", "GTS", "LTS", "JMP", "JSR",
-	"LDR", "STR", "---", "---", "---", "---", "CLN", "STH",
+	"PEK", "POK", "LDR", "STR", "---", "---", "CLN", "STH",
 	"ADD", "SUB", "MUL", "DIV", "AND", "ORA", "EOR", "SFT"
 };
 
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 projects/software/noodle.usm bin/boot.rom
+./bin/assembler projects/software/left.usm bin/boot.rom
 ./bin/emulator bin/boot.rom
diff --git a/projects/tests/peek.usm b/projects/tests/peek.usm
@@ -0,0 +1,21 @@
+( tests/cond )
+
+;a { byte 1 }
+;b { byte1 1 byte2 1 }
+;c { byte1 1 byte2 1 byte3 1 }
+
+|0100 @RESET 
+	
+	#12 #00 POK
+
+	#00 PEK
+
+BRK
+
+|c000 @FRAME
+|d000 @ERROR 
+
+|FF00 ;Console { pad 8 char 1 byte 1 short 2 }
+
+|FFF0 .RESET .FRAME .ERROR ( vectors )
+|FFF8 [ 13fd 1ef3 1bf2 ] ( palette )
+\ No newline at end of file
diff --git a/uxn.c b/uxn.c
@@ -48,6 +48,8 @@ void op_lts(Uxn *u) { Uint8 a = pop8(u->src), b = pop8(u->src); push8(u->src, (S
 void op_jmp(Uxn *u) { Uint8 a = pop8(u->src); u->ram.ptr += (Sint8)a; }
 void op_jsr(Uxn *u) { Uint8 a = pop8(u->src); push16(u->dst, u->ram.ptr); u->ram.ptr += (Sint8)a; }
 /* Memory */
+void op_pek(Uxn *u) { Uint16 a = pop8(u->src); push8(u->src, mempeek8(u, a)); }
+void op_pok(Uxn *u) { Uint16 a = pop8(u->src); Uint8 b = pop8(u->src); mempoke8(u, a, b); }
 void op_ldr(Uxn *u) { Uint16 a = pop16(u->src); push8(u->src, mempeek8(u, a)); }
 void op_str(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); mempoke8(u, a, b); }
 void op_cln(Uxn *u) { push8(u->src, peek8(u->dst, 0)); }
@@ -79,6 +81,8 @@ void op_lts16(Uxn *u) { Uint16 a = pop16(u->src), b = pop16(u->src); push8(u->sr
 void op_jmp16(Uxn *u) { u->ram.ptr = pop16(u->src); }
 void op_jsr16(Uxn *u) { push16(u->dst, u->ram.ptr); u->ram.ptr = pop16(u->src); }
 /* Memory(16-bits) */
+void op_pek16(Uxn *u) { Uint16 a = pop16(u->src); push8(u->src, mempeek8(u, a)); }
+void op_pok16(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); mempoke8(u, a, b); }
 void op_ldr16(Uxn *u) { Uint16 a = pop16(u->src); push16(u->src, mempeek16(u, a)); }
 void op_str16(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop16(u->src); mempoke16(u, a, b); }
 void op_cln16(Uxn *u) { push16(u->src, peek16(u->dst, 0)); }
@@ -96,24 +100,24 @@ void op_sft16(Uxn *u) { Uint16 a = pop16(u->src), b = pop16(u->src); Uint8 left 
 void (*ops[])(Uxn *u) = {
 	op_brk, op_nop, op_lit, op_pop, op_dup, op_swp, op_ovr, op_rot,
 	op_equ, op_neq, op_gth, op_lth, op_gts, op_lts, op_jmp, op_jsr, 
-	op_ldr, op_str, op_nop, op_nop, op_nop, op_nop, op_cln, op_sth, 
+	op_pek, op_pok, op_ldr, op_str, op_nop, op_nop, op_cln, op_sth, 
 	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft,
 	/* 16-bit */
 	op_brk,   op_nop16, op_lit16, op_pop16, op_dup16, op_swp16, op_ovr16, op_rot16,
 	op_equ16, op_neq16, op_gth16, op_lth16, op_gts16, op_lts16, op_jmp16, op_jsr16, 
-	op_ldr16, op_str16, op_nop,   op_nop,   op_nop,  op_nop,   op_cln16, op_sth16, 
+	op_pek16, op_pok16, op_ldr16, op_str16, op_nop,   op_nop,   op_cln16, op_sth16, 
 	op_add16, op_sub16, op_mul16, op_div16, op_and16, op_ora16, op_eor16, op_sft16
 };
 
 Uint8 opr[][4] = { /* wstack-/+ rstack-/+ */
 	{0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {1,0,0,0}, {0,2,0,0}, {2,2,0,0}, {2,3,0,0}, {3,3,0,0},
 	{2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {1,0,0,0}, {1,0,0,2}, 
-	{2,1,0,0}, {3,0,0,0}, {1,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,1}, {0,1,1,0},
+	{1,1,0,0}, {2,0,0,0}, {2,1,0,0}, {3,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,1}, {0,1,1,0},
 	{2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0}, {2,1,0,0},
 	/* 16-bit */
 	{0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,2,0,0}, {0,2,0,0}, {1,1,0,0}, {4,6,0,0}, {6,6,0,0},
 	{4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,1,0,0}, {4,1,0,0}, {2,0,0,0}, {2,0,0,2},
-	{2,2,0,0}, {4,0,0,0}, {2,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,2}, {0,2,2,0},
+	{2,1,0,0}, {3,0,0,0}, {2,2,0,0}, {4,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,2}, {0,2,2,0},
 	{4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0}, {4,2,0,0},
 };