Dariaceli's Git
Browse code

Implemented PEK/POK/GET/PUT

neauoire authored on 21/04/2021 17:23:58
Showing 6 changed files
README.md
History View file @ 276e508
... ... 
@@ -41,9 +41,9 @@ BRK
41 41 
 @print ( addr -- )
42 42
43 43 
 	&loop
44 
-		( send ) DUP2 PEK2 .Console/char IOW
44 
+		( send ) DUP2 GET .Console/char IOW
45 45 
 		( incr ) #0001 ADD2
46 
-		( loop ) DUP2 PEK2 #00 NEQ ,&loop JNZ
46 
+		( loop ) DUP2 GET #00 NEQ ,&loop JNZ
47 47 
 	POP2
48 48
49 49 
 RTN
build.sh
History View file @ 276e508
... ... 
@@ -32,7 +32,7 @@ else
32 32 
 fi
33 33
34 34 
 echo "Assembling.."
35 
-./bin/assembler projects/examples/dev.mouse.usm bin/boot.rom
35 
+./bin/assembler projects/examples/dev.console.usm bin/boot.rom
36 36
37 37 
 echo "Running.."
38 38 
 if [ "${2}" = '--cli' ];
projects/examples/dev.console.usm
History View file @ 276e508
... ... 
@@ -17,9 +17,9 @@ BRK
17 17 
 @print ( addr -- )
18 18
19 19 
 	&loop
20 
-		( send ) DUP2 PEK2 .Console/char IOW
20 
+		( send ) DUP2 GET .Console/char IOW
21 21 
 		( incr ) #0001 ADD2
22 
-		( loop ) DUP2 PEK2 #00 NEQ ,&loop JNZ
22 
+		( loop ) DUP2 GET #00 NEQ ,&loop JNZ
23 23 
 	POP2
24 24
25 25 
 RTN
projects/examples/dev.mouse.usm
History View file @ 276e508
... ... 
@@ -40,18 +40,18 @@ BRK
40 40
41 41 
 	( clear last cursor )
42 42 
 	;clear .Screen/addr IOW2
43 
-	.pointer/x LDR .Screen/x IOW2
44 
-	.pointer/y LDR .Screen/y IOW2
43 
+	.pointer/x PEK2 .Screen/x IOW2
44 
+	.pointer/y PEK2 .Screen/y IOW2
45 45 
 	#30 .Screen/color IOW
46 46
47 47 
 	( record pointer positions )
48 
-	.Mouse/x IOR2 .pointer/x STR
49 
-	.Mouse/y IOR2 .pointer/y STR
48 
+	.Mouse/x IOR2 .pointer/x POK2
49 
+	.Mouse/y IOR2 .pointer/y POK2
50 50
51 51 
 	( draw new cursor )
52 52 
 	;cursor .Screen/addr IOW2
53 
-	.pointer/x LDR .Screen/x IOW2
54 
-	.pointer/y LDR .Screen/y IOW2
53 
+	.pointer/x PEK2 .Screen/x IOW2
54 
+	.pointer/y PEK2 .Screen/y IOW2
55 55
56 56 
 	( colorize on state )
57 57 
 	.Mouse/state IOR #00 NEQ
src/assembler.c
History View file @ 276e508
... ... 
@@ -42,7 +42,7 @@ Program p;
42 42 
 char ops[][4] = {
43 43 
 	"BRK", "LIT", "NOP", "POP", "DUP", "SWP", "OVR", "ROT",
44 44 
 	"EQU", "NEQ", "GTH", "LTH", "GTS", "LTS", "IOR", "IOW",
45 
-	"PEK", "POK", "LDR", "STR", "JMP", "JNZ", "JSR", "STH",
45 
+	"PEK", "POK", "GET", "PUT", "JMP", "JNZ", "JSR", "STH",
46 46 
 	"ADD", "SUB", "MUL", "DIV", "AND", "ORA", "EOR", "SFT"
47 47 
 };
48 48
src/uxn.c
History View file @ 276e508
... ... 
@@ -51,8 +51,8 @@ void op_iow(Uxn *u) { Uint8 a = pop8(u->src), b = pop8(u->src); devpoke8(&u->dev
51 51 
 /* Memory */
52 52 
 void op_pek(Uxn *u) { Uint8 a = pop8(u->src); push8(u->src, mempeek8(u->ram.dat, a)); }
53 53 
 void op_pok(Uxn *u) { Uint8 a = pop8(u->src); Uint8 b = pop8(u->src); mempoke8(u->ram.dat, a, b); }
54 
-void op_ldr(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, mempeek16(u->ram.dat, a)); }
55 
-void op_str(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); mempoke16(u->ram.dat, a, b); }
54 
+void op_get(Uxn *u) { Uint16 a = pop16(u->src); push8(u->src, mempeek8(u->ram.dat, a)); }
55 
+void op_put(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); mempoke8(u->ram.dat, a, b); }
56 56 
 void op_jmp(Uxn *u) { Uint8 a = pop8(u->src); u->ram.ptr += (Sint8)a; }
57 57 
 void op_jnz(Uxn *u) { Uint8 a = pop8(u->src), b = pop8(u->src); if (b) u->ram.ptr += (Sint8)a; }
58 58 
 void op_jsr(Uxn *u) { Uint8 a = pop8(u->src); push16(u->dst, u->ram.ptr); u->ram.ptr += (Sint8)a; }
... ... 
@@ -83,10 +83,10 @@ void op_lts16(Uxn *u) { Uint16 a = pop16(u->src), b = pop16(u->src); push8(u->sr
83 83 
 void op_ior16(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, devpeek16(&u->dev[a >> 4], a)); }
84 84 
 void op_iow16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); devpoke16(&u->dev[a >> 4], a, b); }
85 85 
 /* Memory(16-bits) */
86 
-void op_pek16(Uxn *u) { Uint16 a = pop16(u->src); push8(u->src, mempeek8(u->ram.dat, a)); }
87 
-void op_pok16(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); mempoke8(u->ram.dat, a, b); }
88 
-void op_ldr16(Uxn *u) { Uint16 a = pop16(u->src); push16(u->src, mempeek16(u->ram.dat, a)); }
89 
-void op_str16(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop16(u->src); mempoke16(u->ram.dat, a, b); }
86 
+void op_pek16(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, mempeek16(u->ram.dat, a)); }
87 
+void op_pok16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); mempoke16(u->ram.dat, a, b); }
88 
+void op_get16(Uxn *u) { Uint16 a = pop16(u->src); push16(u->src, mempeek16(u->ram.dat, a)); }
89 
+void op_put16(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop16(u->src); mempoke16(u->ram.dat, a, b); }
90 90 
 void op_jmp16(Uxn *u) { u->ram.ptr = pop16(u->src); }
91 91 
 void op_jnz16(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); if (b) u->ram.ptr = a; }
92 92 
 void op_jsr16(Uxn *u) { push16(u->dst, u->ram.ptr); u->ram.ptr = pop16(u->src); }
... ... 
@@ -104,12 +104,12 @@ void op_sft16(Uxn *u) { Uint16 a = pop16(u->src), b = pop16(u->src); push16(u->s
104 104 
 void (*ops[])(Uxn *u) = {
105 105 
 	op_brk, op_lit, op_nop, op_pop, op_dup, op_swp, op_ovr, op_rot,
106 106 
 	op_equ, op_neq, op_gth, op_lth, op_gts, op_lts, op_ior, op_iow,
107 
-	op_pek, op_pok, op_ldr, op_str, op_jmp, op_jnz, op_jsr, op_sth,
107 
+	op_pek, op_pok, op_get, op_put, op_jmp, op_jnz, op_jsr, op_sth,
108 108 
 	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft,
109 109 
 	/* 16-bit */
110 110 
 	op_brk,   op_lit16, op_nop,   op_pop16, op_dup16, op_swp16, op_ovr16, op_rot16,
111 111 
 	op_equ16, op_neq16, op_gth16, op_lth16, op_gts16, op_lts16, op_ior16, op_iow16,
112 
-	op_pek16, op_pok16, op_ldr16, op_str16, op_jmp16, op_jnz16, op_jsr16, op_sth16,
112 
+	op_pek16, op_pok16, op_get16, op_put16, op_jmp16, op_jnz16, op_jsr16, op_sth16,
113 113 
 	op_add16, op_sub16, op_mul16, op_div16, op_and16, op_ora16, op_eor16, op_sft16
114 114 
 };
115 115