Browse code

Do not check twice for short mode in LIT opcode

Devine Lu Linvega authored on 02/01/2023 00:44:18
Showing 1 changed files
... ...
@@ -25,7 +25,8 @@ WITH REGARD TO THIS SOFTWARE.
25 25
 #define POP16(o) { if((j = *sp) <= 1) HALT(1) o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
26 26
 #define POP(o) { if(bs) { POP16(o) } else { POP8(o) } }
27 27
 #define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } }
28
-#define PEEK(o, x) { if(bs) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; } else { o = u->ram[(x)]; } }
28
+#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; }
29
+#define PEEK(o, x) { if(bs) PEEK16(o, x) else o = u->ram[(x)]; }
29 30
 #define DEVR(o, x) { o = u->dei(u, x); if (bs) o = (o << 8) + u->dei(u, ((x) + 1) & 0xFF); }
30 31
 #define DEVW(x, y) { if (bs) { u->deo(u, (x), (y) >> 8); u->deo(u, ((x) + 1) & 0xFF, (y)); } else { u->deo(u, x, (y)); } }
31 32
 #define JUMP(x) { if(bs) pc = (x); else pc += (Sint8)(x); }
... ...
@@ -45,9 +46,10 @@ uxn_eval(Uxn *u, Uint16 pc)
45 46
 		if(instr & 0x80) { kptr = src->ptr; sp = &kptr; }
46 47
 		else sp = &src->ptr;
47 48
 		/* Short Mode */
48
-		bs = instr & 0x20 ? 1 : 0;
49
+		bs = instr & 0x20;
49 50
 		switch(instr & 0x1f) {
50
-		case 0x00: /* LIT */ PEEK(a, pc) PUSH(src, a) pc += 1 + bs; break;
51
+		case 0x00: /* LIT */ if(bs) { PEEK16(a, pc) PUSH16(src, a) pc += 2; }
52
+		                     else   { a = u->ram[pc]; PUSH8(src, a) pc++; } break;
51 53
 		case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break;
52 54
 		case 0x02: /* POP */ POP(a) break;
53 55
 		case 0x03: /* NIP */ POP(a) POP(b) PUSH(src, a) break;