...
|
...
|
@@ -12,7 +12,7 @@ WITH REGARD TO THIS SOFTWARE.
|
12
|
12
|
*/
|
13
|
13
|
|
14
|
14
|
#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
|
15
|
|
-#define FLIP { s = (ins & 0x40) ? &u->wst : &u->rst; }
|
|
15
|
+#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
|
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)]; }
|
...
|
...
|
@@ -47,7 +47,7 @@ uxn_eval(Uxn *u, Uint16 pc)
|
47
|
47
|
case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
|
48
|
48
|
case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
|
49
|
49
|
case -0x4: /* LIT */
|
50
|
|
- case -0x6: /* LITr */ a = ram[pc++]; PUSH1(a) break;
|
|
50
|
+ case -0x6: /* LITr */ PUSH1(ram[pc++]) break;
|
51
|
51
|
case -0x5: /* LIT2 */
|
52
|
52
|
case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
|
53
|
53
|
/* ALU */
|