Browse code

(uxn.c) Merged PUSH calls

neauoire authored on 09/08/2023 02:53:23
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,24 @@
1
+( init )
2
+
3
+|0100 @program
4
+
5
+	#1234 SWP
6
+	#010e DEO
7
+	#010f DEO
8
+BRK
9
+	#1234 #5678 SWP2
10
+	
11
+BRK
12
+
13
+	;hello-word
14
+
15
+	&while
16
+		( send ) LDAk #18 DEO
17
+		( loop ) INC2 LDAk ,&while JCN
18
+	POP2
19
+
20
+	#010f DEO
21
+
22
+BRK
23
+
24
+@hello-word "Hello 20 "World! 00
... ...
@@ -16,20 +16,22 @@ WITH REGARD TO THIS SOFTWARE.
16 16
 #define JUMP(x)      { if(m2) pc = (x); else pc += (Sint8)(x); }
17 17
 #define POKE(x, y)   { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
18 18
 #define PEEK(o, x)   { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
19
+#define DEVW(p, y)   { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
20
+#define DEVR(o, p)   { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
21
+
19 22
 #define PUSH1(y)     { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
20 23
 #define PUSH2(y)     { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
21 24
 #define PUSHx(y)     { if(m2) { PUSH2(y) } else { PUSH1(y) } }
22
-#define PUSH11(y, z) { if((tsp = s->ptr) >= 0xfe) HALT(2) s->dat[s->ptr++] = y; s->dat[s->ptr++] = z; }
23
-#define PUSH22(y, z) { PUSH2(y) PUSH2(z) }
25
+#define PUSH11(y, z) { if(s->ptr >= 0xfe) HALT(2) s->dat[s->ptr++] = (y); s->dat[s->ptr++] = (z); }
26
+#define PUSH22(y, z) { if((tsp = s->ptr) >= 0xfc) HALT(2) POKE2(&s->dat[tsp], (y)); POKE2(&s->dat[tsp+2], (z)); s->ptr = tsp + 4; }
24 27
 #define PUSHxx(y, z) { if(m2) { PUSH22(y, z) } else { PUSH11(y, z) } }
28
+
25 29
 #define POP1(o)      { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
26 30
 #define POP2(o)      { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
27 31
 #define POPx(o)      { if(m2) { POP2(o) } else { POP1(o) } }
28
-#define POP11(o, p)  { POP1(o) POP1(p) }
32
+#define POP11(o, p)  { if((tsp = *sp) <= 0x01) HALT(1) o = s->dat[--*sp]; p = s->dat[--*sp]; }
29 33
 #define POP22(o, p)  { POP2(o) POP2(p) }
30 34
 #define POPxx(o, p)  { if(m2) { POP22(o, p) } else { POP11(o, p) } }
31
-#define DEVW(p, y)   { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
32
-#define DEVR(o, p)   { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
33 35
 
34 36
 int
35 37
 uxn_eval(Uxn *u, Uint16 pc)