diff --git a/apu/apu.cpp b/apu/apu.cpp
index fd4822e0..eb8abee9 100644
--- a/apu/apu.cpp
+++ b/apu/apu.cpp
@@ -335,7 +335,6 @@ void S9xResetAPU(void)
     spc::remainder = 0;
 
     SNES::cpu.reset();
-    SNES::cpu.frequency = (int)(Settings.PAL ? PAL_MASTER_CLOCK : NTSC_MASTER_CLOCK);
     SNES::smp.power();
     SNES::dsp.power();
     SNES::dsp.spc_dsp.set_spc_snapshot_callback(SPCSnapshotCallback);
diff --git a/apu/bapu/smp/core.cpp b/apu/bapu/smp/core.cpp
index c723db80..53d0ef09 100644
--- a/apu/bapu/smp/core.cpp
+++ b/apu/bapu/smp/core.cpp
@@ -3,14 +3,8 @@ void SMP::tick() {
   timer1.tick();
   timer2.tick();
 
-#ifndef SNES9X
-  clock += cycle_step_cpu;
-  dsp.clock -= 24;
-  synchronize_dsp();
-#else
   clock++;
   dsp.clock++;
-#endif
 }
 
 void SMP::tick(unsigned clocks) {
@@ -23,9 +17,7 @@ void SMP::tick(unsigned clocks) {
 }
 
 void SMP::op_io() {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
 }
 
 void SMP::op_io(unsigned clocks) {
@@ -33,17 +25,13 @@ void SMP::op_io(unsigned clocks) {
 }
 
 uint8 SMP::op_read(uint16 addr) {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
   if((addr & 0xfff0) == 0x00f0) return mmio_read(addr);
   return apuram[addr];
 }
 
 void SMP::op_write(uint16 addr, uint8 data) {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
   if((addr & 0xfff0) == 0x00f0 || addr >= 0xffc0)
     mmio_write(addr, data);
   else
@@ -51,23 +39,17 @@ void SMP::op_write(uint16 addr, uint8 data) {
 }
 
 uint8 SMP::op_readpc() {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
   return apuram[regs.pc++];
 }
 
 uint8 SMP::op_readstack() {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
   return apuram[0x0100 | ++regs.sp];
 }
 
 void SMP::op_writestack(uint8 data) {
-  #if defined(CYCLE_ACCURATE)
   tick();
-  #endif
   apuram[0x0100 | regs.sp--] = data;
 }
 
@@ -77,9 +59,6 @@ void SMP::op_step() {
   #define op_readaddr(addr) op_read(addr)
   #define op_writeaddr(addr, data) op_write(addr, data)
 
-  #if defined(CYCLE_ACCURATE)
-  #if defined(PSEUDO_CYCLE)
-
   if(opcode_cycle == 0)
   {
 #ifdef DEBUGGER
@@ -92,7 +71,6 @@ void SMP::op_step() {
     opcode_number = op_readpc();
   }
 
-
   switch(opcode_number) {
     #include "core/oppseudo_misc.cpp"
     #include "core/oppseudo_mov.cpp"
@@ -100,72 +78,4 @@ void SMP::op_step() {
     #include "core/oppseudo_read.cpp"
     #include "core/oppseudo_rmw.cpp"
   }
-
-  #else
-
-  if(opcode_cycle == 0) {
-    opcode_number = op_readpc();
-    opcode_cycle++;
-  } else switch(opcode_number) {
-    #include "core/opcycle_misc.cpp"
-    #include "core/opcycle_mov.cpp"
-    #include "core/opcycle_pc.cpp"
-    #include "core/opcycle_read.cpp"
-    #include "core/opcycle_rmw.cpp"
-  }
-
-  #endif // defined(PSEUDO_CYCLE)
-  #else
-
-  unsigned opcode = op_readpc();
-  switch(opcode) {
-    #include "core/op_misc.cpp"
-    #include "core/op_mov.cpp"
-    #include "core/op_pc.cpp"
-    #include "core/op_read.cpp"
-    #include "core/op_rmw.cpp"
-  }
-
-  //TODO: untaken branches should consume less cycles
-
-  timer0.tick(cycle_count_table[opcode]);
-  timer1.tick(cycle_count_table[opcode]);
-  timer2.tick(cycle_count_table[opcode]);
-
-#ifndef SNES9X
-  clock += cycle_table_cpu[opcode];
-  dsp.clock -= cycle_table_dsp[opcode];
-  synchronize_dsp();
-#else
-  clock += cycle_count_table[opcode];
-  dsp.clock += cycle_count_table[opcode];
-#endif
-
-  #endif // defined(CYCLE_ACCURATE)
 }
-
-const unsigned SMP::cycle_count_table[256] = {
-  #define c 12
-//0 1 2 3   4 5 6 7   8 9 A B   C D E F
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,4,6,8,  //0
-  4,8,4,7,  4,5,5,6,  5,5,6,5,  2,2,4,6,  //1
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,4,7,4,  //2
-  4,8,4,7,  4,5,5,6,  5,5,6,5,  2,2,3,8,  //3
-
-  2,8,4,7,  3,4,3,6,  2,6,4,4,  5,4,6,6,  //4
-  4,8,4,7,  4,5,5,6,  5,5,4,5,  2,2,4,3,  //5
-  2,8,4,7,  3,4,3,6,  2,6,4,4,  5,4,7,5,  //6
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,3,6,  //7
-
-  2,8,4,7,  3,4,3,6,  2,6,5,4,  5,2,4,5,  //8
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,c,5,  //9
-  3,8,4,7,  3,4,3,6,  2,6,4,4,  5,2,4,4,  //A
-  4,8,4,7,  4,5,5,6,  5,5,5,5,  2,2,3,4,  //B
-
-  3,8,4,7,  4,5,4,7,  2,5,6,4,  5,2,4,9,  //C
-  4,8,4,7,  5,6,6,7,  4,5,5,5,  2,2,8,3,  //D
-  2,8,4,7,  3,4,3,6,  2,4,5,3,  4,3,4,1,  //E
-  4,8,4,7,  4,5,5,6,  3,4,5,4,  2,2,6,1,  //F
-
-  #undef c
-};
diff --git a/apu/bapu/smp/core/cc.sh b/apu/bapu/smp/core/cc.sh
deleted file mode 100755
index 937b7139..00000000
--- a/apu/bapu/smp/core/cc.sh
+++ /dev/null
@@ -1 +0,0 @@
-g++-4.5 -std=gnu++0x -I../../../.. -o generate generate.cpp
diff --git a/apu/bapu/smp/core/generate.cpp b/apu/bapu/smp/core/generate.cpp
deleted file mode 100644
index 77ab3ed2..00000000
--- a/apu/bapu/smp/core/generate.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <nall/file.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-using namespace nall;
-
-static bool cycle_accurate;
-
-struct opcode_t {
-  string name;
-  lstring args;
-  unsigned opcode;
-};
-
-void generate(const char *sourceFilename, const char *targetFilename) {
-  file fp;
-  fp.open(targetFilename, file::mode::write);
-
-  string filedata;
-  filedata.readfile(sourceFilename);
-  filedata.replace("\r", "");
-
-  lstring block;
-  block.split("\n\n", filedata);
-
-  foreach(data, block) {
-    lstring lines;
-    lines.split("\n", data);
-
-    linear_vector<opcode_t> array;
-
-    unsigned sourceStart = 0;
-    foreach(line, lines, currentLine) {
-      line.transform("()", "``");
-      lstring part;
-      part.split("`", line);
-      lstring arguments;
-      arguments.split(", ", part[1]);
-
-      opcode_t opcode;
-      opcode.name = part[0];
-      opcode.args = arguments;
-      opcode.opcode = hex(arguments[0]);
-      array.append(opcode);
-
-      line.rtrim<1>(",");
-      if(line.endswith(" {")) {
-        line.rtrim<1>("{ ");
-        sourceStart = currentLine + 1;
-        break;
-      }
-    }
-
-    if(cycle_accurate == false) {
-      foreach(opcode, array) {
-        fp.print("case 0x", hex<2>(opcode.opcode), ": {\n");
-
-        for(unsigned n = sourceStart; n < lines.size(); n++) {
-          if(lines[n] == "}") break;
-
-          string output;
-
-          if(lines[n].beginswith("  ")) {
-            output = lines[n];
-          } else {
-            lstring part;
-            part.split<1>(":", lines[n]);
-            output = { "  ", part[1] };
-          }
-
-          output.replace("$1", opcode.args[1]);
-          output.replace("$2", opcode.args[2]);
-          output.replace("$3", opcode.args[3]);
-          output.replace("$4", opcode.args[4]);
-          output.replace("$5", opcode.args[5]);
-          output.replace("$6", opcode.args[6]);
-          output.replace("$7", opcode.args[7]);
-          output.replace("$8", opcode.args[8]);
-          output.replace("end;", "break;");
-
-          fp.print(output, "\n");
-        }
-
-        fp.print("  break;\n");
-        fp.print("}\n\n");
-      }
-    } else {
-      foreach(opcode, array) {
-        fp.print("case 0x", hex<2>(opcode.opcode), ": {\n");
-        fp.print("  switch(opcode_cycle++) {\n");
-
-        for(unsigned n = sourceStart; n < lines.size(); n++) {
-          if(lines[n] == "}") break;
-
-          bool nextLineEndsCycle = false;
-          if(lines[n + 1] == "}") nextLineEndsCycle = true;
-          if(lines[n + 1].beginswith("  ") == false) nextLineEndsCycle = true;
-
-          string output;
-
-          if(lines[n].beginswith("  ")) {
-            output = { "  ", lines[n] };
-          } else {
-            lstring part;
-            part.split<1>(":", lines[n]);
-            fp.print("  case ", (unsigned)decimal(part[0]), ":\n");
-            output = { "    ", part[1] };
-          }
-
-          output.replace("$1", opcode.args[1]);
-          output.replace("$2", opcode.args[2]);
-          output.replace("$3", opcode.args[3]);
-          output.replace("$4", opcode.args[4]);
-          output.replace("$5", opcode.args[5]);
-          output.replace("$6", opcode.args[6]);
-          output.replace("$7", opcode.args[7]);
-          output.replace("$8", opcode.args[8]);
-          output.replace("end;", "{ opcode_cycle = 0; break; }");
-
-          fp.print(output, "\n");
-          if(nextLineEndsCycle) {
-            if(lines[n + 1].beginswith("}")) {
-              fp.print("    opcode_cycle = 0;\n");
-            }
-            fp.print("    break;\n");
-          }
-        }
-
-        fp.print("  }\n");
-        fp.print("  break;\n");
-        fp.print("}\n\n");
-      }
-    }
-  }
-
-  fp.close();
-}
-
-int main() {
-  cycle_accurate = false;
-  generate("op_misc.b", "op_misc.cpp");
-  generate("op_mov.b",  "op_mov.cpp" );
-  generate("op_pc.b",   "op_pc.cpp" );
-  generate("op_read.b", "op_read.cpp");
-  generate("op_rmw.b",  "op_rmw.cpp" );
-
-  cycle_accurate = true;
-  generate("op_misc.b", "opcycle_misc.cpp");
-  generate("op_mov.b",  "opcycle_mov.cpp" );
-  generate("op_pc.b",   "opcycle_pc.cpp" );
-  generate("op_read.b", "opcycle_read.cpp");
-  generate("op_rmw.b",  "opcycle_rmw.cpp" );
-
-  return 0;
-}
diff --git a/apu/bapu/smp/core/op_misc.b b/apu/bapu/smp/core/op_misc.b
deleted file mode 100644
index fb258650..00000000
--- a/apu/bapu/smp/core/op_misc.b
+++ /dev/null
@@ -1,163 +0,0 @@
-nop(0x00) {
-1:op_io();
-}
-
-sleep(0xef),
-stop(0xff) {
-1:op_io();
-2:op_io();
-  regs.pc--;
-}
-
-xcn(0x9f) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-  regs.a = (regs.a >> 4) | (regs.a << 4);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-daa(0xdf) {
-1:op_io();
-2:op_io();
-  if(regs.p.c || (regs.a) > 0x99) {
-    regs.a += 0x60;
-    regs.p.c = 1;
-  }
-  if(regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a += 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-das(0xbe) {
-1:op_io();
-2:op_io();
-  if(!regs.p.c || (regs.a) > 0x99) {
-    regs.a -= 0x60;
-    regs.p.c = 0;
-  }
-  if(!regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a -= 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-clrc(0x60, regs.p.c = 0),
-clrp(0x20, regs.p.p = 0),
-setc(0x80, regs.p.c = 1),
-setp(0x40, regs.p.p = 1) {
-1:op_io();
-  $1;
-}
-
-clrv(0xe0) {
-1:op_io();
-  regs.p.v = 0;
-  regs.p.h = 0;
-}
-
-notc(0xed) {
-1:op_io();
-2:op_io();
-  regs.p.c = !regs.p.c;
-}
-
-ei(0xa0, 1),
-di(0xc0, 0) {
-1:op_io();
-2:op_io();
-  regs.p.i = $1;
-}
-
-set0_dp(0x02, rd |=  0x01),
-clr0_dp(0x12, rd &= ~0x01),
-set1_dp(0x22, rd |=  0x02),
-clr1_dp(0x32, rd &= ~0x02),
-set2_dp(0x42, rd |=  0x04),
-clr2_dp(0x52, rd &= ~0x04),
-set3_dp(0x62, rd |=  0x08),
-clr3_dp(0x72, rd &= ~0x08),
-set4_dp(0x82, rd |=  0x10),
-clr4_dp(0x92, rd &= ~0x10),
-set5_dp(0xa2, rd |=  0x20),
-clr5_dp(0xb2, rd &= ~0x20),
-set6_dp(0xc2, rd |=  0x40),
-clr6_dp(0xd2, rd &= ~0x40),
-set7_dp(0xe2, rd |=  0x80),
-clr7_dp(0xf2, rd &= ~0x80) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-3:$1;
-  op_writedp(dp, rd);
-}
-
-push_a(0x2d, a),
-push_x(0x4d, x),
-push_y(0x6d, y),
-push_p(0x0d, p) {
-1:op_io();
-2:op_io();
-3:op_writestack(regs.$1);
-}
-
-pop_a(0xae, a),
-pop_x(0xce, x),
-pop_y(0xee, y),
-pop_p(0x8e, p) {
-1:op_io();
-2:op_io();
-3:regs.$1 = op_readstack();
-}
-
-mul_ya(0xcf) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_io();
-7:op_io();
-8:op_io();
-  ya = regs.y * regs.a;
-  regs.a = ya;
-  regs.y = ya >> 8;
-  //result is set based on y (high-byte) only
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-}
-
-div_ya_x(0x9e) {
-1:op_io();
-2:op_io();
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_io();
-7:op_io();
-8:op_io();
-9:op_io();
-10:op_io();
-11:op_io();
-  ya = regs.ya;
-  //overflow set if quotient >= 256
-  regs.p.v = !!(regs.y >= regs.x);
-  regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-  if(regs.y < (regs.x << 1)) {
-    //if quotient is <= 511 (will fit into 9-bit result)
-    regs.a = ya / regs.x;
-    regs.y = ya % regs.x;
-  } else {
-    //otherwise, the quotient won't fit into regs.p.v + regs.a
-    //this emulates the odd behavior of the S-SMP in this case
-    regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-    regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-  }
-  //result is set based on a (quotient) only
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
diff --git a/apu/bapu/smp/core/op_misc.cpp b/apu/bapu/smp/core/op_misc.cpp
deleted file mode 100644
index 9a6a062d..00000000
--- a/apu/bapu/smp/core/op_misc.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-case 0x00: {
-  op_io();
-  break;
-}
-
-case 0xef: {
-  op_io();
-  op_io();
-  regs.pc--;
-  break;
-}
-
-case 0xff: {
-  op_io();
-  op_io();
-  regs.pc--;
-  break;
-}
-
-case 0x9f: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  regs.a = (regs.a >> 4) | (regs.a << 4);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xdf: {
-  op_io();
-  op_io();
-  if(regs.p.c || (regs.a) > 0x99) {
-    regs.a += 0x60;
-    regs.p.c = 1;
-  }
-  if(regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a += 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xbe: {
-  op_io();
-  op_io();
-  if(!regs.p.c || (regs.a) > 0x99) {
-    regs.a -= 0x60;
-    regs.p.c = 0;
-  }
-  if(!regs.p.h || (regs.a & 15) > 0x09) {
-    regs.a -= 0x06;
-  }
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0x60: {
-  op_io();
-  regs.p.c = 0;
-  break;
-}
-
-case 0x20: {
-  op_io();
-  regs.p.p = 0;
-  break;
-}
-
-case 0x80: {
-  op_io();
-  regs.p.c = 1;
-  break;
-}
-
-case 0x40: {
-  op_io();
-  regs.p.p = 1;
-  break;
-}
-
-case 0xe0: {
-  op_io();
-  regs.p.v = 0;
-  regs.p.h = 0;
-  break;
-}
-
-case 0xed: {
-  op_io();
-  op_io();
-  regs.p.c = !regs.p.c;
-  break;
-}
-
-case 0xa0: {
-  op_io();
-  op_io();
-  regs.p.i = 1;
-  break;
-}
-
-case 0xc0: {
-  op_io();
-  op_io();
-  regs.p.i = 0;
-  break;
-}
-
-case 0x02: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x01;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x12: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x01;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x22: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x02;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x32: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x02;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x42: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x04;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x52: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x04;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x62: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x08;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x72: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x08;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x82: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x10;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x92: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x10;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xa2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x20;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xb2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x20;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xc2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x40;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xd2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x40;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xe2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd |=  0x80;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xf2: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd &= ~0x80;
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x2d: {
-  op_io();
-  op_io();
-  op_writestack(regs.a);
-  break;
-}
-
-case 0x4d: {
-  op_io();
-  op_io();
-  op_writestack(regs.x);
-  break;
-}
-
-case 0x6d: {
-  op_io();
-  op_io();
-  op_writestack(regs.y);
-  break;
-}
-
-case 0x0d: {
-  op_io();
-  op_io();
-  op_writestack(regs.p);
-  break;
-}
-
-case 0xae: {
-  op_io();
-  op_io();
-  regs.a = op_readstack();
-  break;
-}
-
-case 0xce: {
-  op_io();
-  op_io();
-  regs.x = op_readstack();
-  break;
-}
-
-case 0xee: {
-  op_io();
-  op_io();
-  regs.y = op_readstack();
-  break;
-}
-
-case 0x8e: {
-  op_io();
-  op_io();
-  regs.p = op_readstack();
-  break;
-}
-
-case 0xcf: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  ya = regs.y * regs.a;
-  regs.a = ya;
-  regs.y = ya >> 8;
-  //result is set based on y (high-byte) only
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0x9e: {
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  op_io();
-  ya = regs.ya;
-  //overflow set if quotient >= 256
-  regs.p.v = !!(regs.y >= regs.x);
-  regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-  if(regs.y < (regs.x << 1)) {
-    //if quotient is <= 511 (will fit into 9-bit result)
-    regs.a = ya / regs.x;
-    regs.y = ya % regs.x;
-  } else {
-    //otherwise, the quotient won't fit into regs.p.v + regs.a
-    //this emulates the odd behavior of the S-SMP in this case
-    regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-    regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-  }
-  //result is set based on a (quotient) only
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
diff --git a/apu/bapu/smp/core/op_mov.b b/apu/bapu/smp/core/op_mov.b
deleted file mode 100644
index dee821af..00000000
--- a/apu/bapu/smp/core/op_mov.b
+++ /dev/null
@@ -1,217 +0,0 @@
-mov_a_x(0x7d, a, x),
-mov_a_y(0xdd, a, y),
-mov_x_a(0x5d, x, a),
-mov_y_a(0xfd, y, a),
-mov_x_sp(0x9d, x, sp) {
-1:op_io();
-  regs.$1 = regs.$2;
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_sp_x(0xbd, sp, x) {
-1:op_io();
-  regs.$1 = regs.$2;
-}
-
-mov_a_const(0xe8, a),
-mov_x_const(0xcd, x),
-mov_y_const(0x8d, y) {
-1:regs.$1 = op_readpc();
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_ix(0xe6) {
-1:op_io();
-2:regs.a = op_readdp(regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_ixinc(0xbf) {
-1:op_io();
-2:regs.a = op_readdp(regs.x++);
-3:op_io();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_dp(0xe4, a),
-mov_x_dp(0xf8, x),
-mov_y_dp(0xeb, y) {
-1:sp = op_readpc();
-2:regs.$1 = op_readdp(sp);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_dpx(0xf4, a, x),
-mov_x_dpy(0xf9, x, y),
-mov_y_dpx(0xfb, y, x) {
-1:sp = op_readpc();
-2:op_io();
-3:regs.$1 = op_readdp(sp + regs.$2);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_addr(0xe5, a),
-mov_x_addr(0xe9, x),
-mov_y_addr(0xec, y) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:regs.$1 = op_readaddr(sp);
-  regs.p.n = !!(regs.$1 & 0x80);
-  regs.p.z = (regs.$1 == 0);
-}
-
-mov_a_addrx(0xf5, x),
-mov_a_addry(0xf6, y) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:op_io();
-4:regs.a = op_readaddr(sp + regs.$1);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_idpx(0xe7) {
-1:dp = op_readpc() + regs.x;
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_a_idpy(0xf7) {
-1:dp = op_readpc();
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-}
-
-mov_dp_dp(0xfa) {
-1:sp = op_readpc();
-2:rd = op_readdp(sp);
-3:dp = op_readpc();
-4:op_writedp(dp, rd);
-}
-
-mov_dp_const(0x8f) {
-1:rd = op_readpc();
-2:dp = op_readpc();
-3:op_readdp(dp);
-4:op_writedp(dp, rd);
-}
-
-mov_ix_a(0xc6) {
-1:op_io();
-2:op_readdp(regs.x);
-3:op_writedp(regs.x, regs.a);
-}
-
-mov_ixinc_a(0xaf) {
-1:op_io();
-2:op_io();
-3:op_writedp(regs.x++, regs.a);
-}
-
-mov_dp_a(0xc4, a),
-mov_dp_x(0xd8, x),
-mov_dp_y(0xcb, y) {
-1:dp = op_readpc();
-2:op_readdp(dp);
-3:op_writedp(dp, regs.$1);
-}
-
-mov_dpx_a(0xd4, x, a),
-mov_dpy_x(0xd9, y, x),
-mov_dpx_y(0xdb, x, y) {
-1:dp  = op_readpc();
-2:op_io();
-  dp += regs.$1;
-3:op_readdp(dp);
-4:op_writedp(dp, regs.$2);
-}
-
-mov_addr_a(0xc5, a),
-mov_addr_x(0xc9, x),
-mov_addr_y(0xcc, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_readaddr(dp);
-4:op_writeaddr(dp, regs.$1);
-}
-
-mov_addrx_a(0xd5, x),
-mov_addry_a(0xd6, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-  dp += regs.$1;
-4:op_readaddr(dp);
-5:op_writeaddr(dp, regs.a);
-}
-
-mov_idpx_a(0xc7) {
-1:sp  = op_readpc();
-2:op_io();
-  sp += regs.x;
-3:dp  = op_readdp(sp);
-4:dp |= op_readdp(sp + 1) << 8;
-5:op_readaddr(dp);
-6:op_writeaddr(dp, regs.a);
-}
-
-mov_idpy_a(0xd7) {
-1:sp  = op_readpc();
-2:dp  = op_readdp(sp);
-3:dp |= op_readdp(sp + 1) << 8;
-4:op_io();
-  dp += regs.y;
-5:op_readaddr(dp);
-6:op_writeaddr(dp, regs.a);
-}
-
-movw_ya_dp(0xba) {
-1:sp = op_readpc();
-2:regs.a = op_readdp(sp);
-3:op_io();
-4:regs.y = op_readdp(sp + 1);
-  regs.p.n = !!(regs.ya & 0x8000);
-  regs.p.z = (regs.ya == 0);
-}
-
-movw_dp_ya(0xda) {
-1:dp = op_readpc();
-2:op_readdp(dp);
-3:op_writedp(dp,     regs.a);
-4:op_writedp(dp + 1, regs.y);
-}
-
-mov1_c_bit(0xaa) {
-1:sp  = op_readpc();
-2:sp |= op_readpc() << 8;
-3:bit = sp >> 13;
-  sp &= 0x1fff;
-  rd = op_readaddr(sp);
-  regs.p.c = !!(rd & (1 << bit));
-}
-
-mov1_bit_c(0xca) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  if(regs.p.c)rd |=  (1 << bit);
-  else        rd &= ~(1 << bit);
-4:op_io();
-5:op_writeaddr(dp, rd);
-}
diff --git a/apu/bapu/smp/core/op_mov.cpp b/apu/bapu/smp/core/op_mov.cpp
deleted file mode 100644
index f3079423..00000000
--- a/apu/bapu/smp/core/op_mov.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-case 0x7d: {
-  op_io();
-  regs.a = regs.x;
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xdd: {
-  op_io();
-  regs.a = regs.y;
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0x5d: {
-  op_io();
-  regs.x = regs.a;
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xfd: {
-  op_io();
-  regs.y = regs.a;
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0x9d: {
-  op_io();
-  regs.x = regs.sp;
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xbd: {
-  op_io();
-  regs.sp = regs.x;
-  break;
-}
-
-case 0xe8: {
-  regs.a = op_readpc();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xcd: {
-  regs.x = op_readpc();
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0x8d: {
-  regs.y = op_readpc();
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xe6: {
-  op_io();
-  regs.a = op_readdp(regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xbf: {
-  op_io();
-  regs.a = op_readdp(regs.x++);
-  op_io();
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe4: {
-  sp = op_readpc();
-  regs.a = op_readdp(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf8: {
-  sp = op_readpc();
-  regs.x = op_readdp(sp);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xeb: {
-  sp = op_readpc();
-  regs.y = op_readdp(sp);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xf4: {
-  sp = op_readpc();
-  op_io();
-  regs.a = op_readdp(sp + regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf9: {
-  sp = op_readpc();
-  op_io();
-  regs.x = op_readdp(sp + regs.y);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xfb: {
-  sp = op_readpc();
-  op_io();
-  regs.y = op_readdp(sp + regs.x);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xe5: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe9: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.x = op_readaddr(sp);
-  regs.p.n = !!(regs.x & 0x80);
-  regs.p.z = (regs.x == 0);
-  break;
-}
-
-case 0xec: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  regs.y = op_readaddr(sp);
-  regs.p.n = !!(regs.y & 0x80);
-  regs.p.z = (regs.y == 0);
-  break;
-}
-
-case 0xf5: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  op_io();
-  regs.a = op_readaddr(sp + regs.x);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf6: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  op_io();
-  regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xe7: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  regs.a = op_readaddr(sp);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xf7: {
-  dp = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  regs.a = op_readaddr(sp + regs.y);
-  regs.p.n = !!(regs.a & 0x80);
-  regs.p.z = (regs.a == 0);
-  break;
-}
-
-case 0xfa: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x8f: {
-  rd = op_readpc();
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xc6: {
-  op_io();
-  op_readdp(regs.x);
-  op_writedp(regs.x, regs.a);
-  break;
-}
-
-case 0xaf: {
-  op_io();
-  op_io();
-  op_writedp(regs.x++, regs.a);
-  break;
-}
-
-case 0xc4: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.a);
-  break;
-}
-
-case 0xd8: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.x);
-  break;
-}
-
-case 0xcb: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp, regs.y);
-  break;
-}
-
-case 0xd4: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.x;
-  op_readdp(dp);
-  op_writedp(dp, regs.a);
-  break;
-}
-
-case 0xd9: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.y;
-  op_readdp(dp);
-  op_writedp(dp, regs.x);
-  break;
-}
-
-case 0xdb: {
-  dp  = op_readpc();
-  op_io();
-  dp += regs.x;
-  op_readdp(dp);
-  op_writedp(dp, regs.y);
-  break;
-}
-
-case 0xc5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xc9: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.x);
-  break;
-}
-
-case 0xcc: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.y);
-  break;
-}
-
-case 0xd5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.x;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xd6: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.y;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xc7: {
-  sp  = op_readpc();
-  op_io();
-  sp += regs.x;
-  dp  = op_readdp(sp);
-  dp |= op_readdp(sp + 1) << 8;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xd7: {
-  sp  = op_readpc();
-  dp  = op_readdp(sp);
-  dp |= op_readdp(sp + 1) << 8;
-  op_io();
-  dp += regs.y;
-  op_readaddr(dp);
-  op_writeaddr(dp, regs.a);
-  break;
-}
-
-case 0xba: {
-  sp = op_readpc();
-  regs.a = op_readdp(sp);
-  op_io();
-  regs.y = op_readdp(sp + 1);
-  regs.p.n = !!(regs.ya & 0x8000);
-  regs.p.z = (regs.ya == 0);
-  break;
-}
-
-case 0xda: {
-  dp = op_readpc();
-  op_readdp(dp);
-  op_writedp(dp,     regs.a);
-  op_writedp(dp + 1, regs.y);
-  break;
-}
-
-case 0xaa: {
-  sp  = op_readpc();
-  sp |= op_readpc() << 8;
-  bit = sp >> 13;
-  sp &= 0x1fff;
-  rd = op_readaddr(sp);
-  regs.p.c = !!(rd & (1 << bit));
-  break;
-}
-
-case 0xca: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  if(regs.p.c)rd |=  (1 << bit);
-  else        rd &= ~(1 << bit);
-  op_io();
-  op_writeaddr(dp, rd);
-  break;
-}
-
diff --git a/apu/bapu/smp/core/op_pc.b b/apu/bapu/smp/core/op_pc.b
deleted file mode 100644
index affaf844..00000000
--- a/apu/bapu/smp/core/op_pc.b
+++ /dev/null
@@ -1,179 +0,0 @@
-bra(0x2f, 0),
-beq(0xf0, !regs.p.z),
-bne(0xd0, regs.p.z),
-bcs(0xb0, !regs.p.c),
-bcc(0x90, regs.p.c),
-bvs(0x70, !regs.p.v),
-bvc(0x50, regs.p.v),
-bmi(0x30, !regs.p.n),
-bpl(0x10, regs.p.n) {
-1:rd = op_readpc();
-  if($1)end;
-2:op_io();
-3:op_io();
-  regs.pc += (int8)rd;
-}
-
-bbs0(0x03, 0x01, !=),
-bbc0(0x13, 0x01, ==),
-bbs1(0x23, 0x02, !=),
-bbc1(0x33, 0x02, ==),
-bbs2(0x43, 0x04, !=),
-bbc2(0x53, 0x04, ==),
-bbs3(0x63, 0x08, !=),
-bbc3(0x73, 0x08, ==),
-bbs4(0x83, 0x10, !=),
-bbc4(0x93, 0x10, ==),
-bbs5(0xa3, 0x20, !=),
-bbc5(0xb3, 0x20, ==),
-bbs6(0xc3, 0x40, !=),
-bbc6(0xd3, 0x40, ==),
-bbs7(0xe3, 0x80, !=),
-bbc7(0xf3, 0x80, ==) {
-1:dp = op_readpc();
-2:sp = op_readdp(dp);
-3:rd = op_readpc();
-4:op_io();
-  if((sp & $1) $2 $1)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-cbne_dp(0x2e) {
-1:dp = op_readpc();
-2:sp = op_readdp(dp);
-3:rd = op_readpc();
-4:op_io();
-  if(regs.a == sp)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-cbne_dpx(0xde) {
-1:dp = op_readpc();
-2:op_io();
-3:sp = op_readdp(dp + regs.x);
-4:rd = op_readpc();
-5:op_io();
-  if(regs.a == sp)end;
-6:op_io();
-7:op_io();
-  regs.pc += (int8)rd;
-}
-
-dbnz_dp(0x6e) {
-1:dp = op_readpc();
-2:wr = op_readdp(dp);
-3:op_writedp(dp, --wr);
-4:rd = op_readpc();
-  if(wr == 0x00)end;
-5:op_io();
-6:op_io();
-  regs.pc += (int8)rd;
-}
-
-dbnz_y(0xfe) {
-1:rd = op_readpc();
-2:op_io();
-  regs.y--;
-3:op_io();
-  if(regs.y == 0x00)end;
-4:op_io();
-5:op_io();
-  regs.pc += (int8)rd;
-}
-
-jmp_addr(0x5f) {
-1:rd  = op_readpc();
-2:rd |= op_readpc() << 8;
-  regs.pc = rd;
-}
-
-jmp_iaddrx(0x1f) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-  dp += regs.x;
-4:rd  = op_readaddr(dp);
-5:rd |= op_readaddr(dp + 1) << 8;
-  regs.pc = rd;
-}
-
-call(0x3f) {
-1:rd  = op_readpc();
-2:rd |= op_readpc() << 8;
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_writestack(regs.pc >> 8);
-7:op_writestack(regs.pc);
-  regs.pc = rd;
-}
-
-pcall(0x4f) {
-1:rd = op_readpc();
-2:op_io();
-3:op_io();
-4:op_writestack(regs.pc >> 8);
-5:op_writestack(regs.pc);
-  regs.pc = 0xff00 | rd;
-}
-
-tcall_0(0x01, 0),
-tcall_1(0x11, 1),
-tcall_2(0x21, 2),
-tcall_3(0x31, 3),
-tcall_4(0x41, 4),
-tcall_5(0x51, 5),
-tcall_6(0x61, 6),
-tcall_7(0x71, 7),
-tcall_8(0x81, 8),
-tcall_9(0x91, 9),
-tcall_10(0xa1, 10),
-tcall_11(0xb1, 11),
-tcall_12(0xc1, 12),
-tcall_13(0xd1, 13),
-tcall_14(0xe1, 14),
-tcall_15(0xf1, 15) {
-1:dp = 0xffde - ($1 << 1);
-  rd  = op_readaddr(dp);
-2:rd |= op_readaddr(dp + 1) << 8;
-3:op_io();
-4:op_io();
-5:op_io();
-6:op_writestack(regs.pc >> 8);
-7:op_writestack(regs.pc);
-  regs.pc = rd;
-}
-
-brk(0x0f) {
-1:rd  = op_readaddr(0xffde);
-2:rd |= op_readaddr(0xffdf) << 8;
-3:op_io();
-4:op_io();
-5:op_writestack(regs.pc >> 8);
-6:op_writestack(regs.pc);
-7:op_writestack(regs.p);
-  regs.pc = rd;
-  regs.p.b = 1;
-  regs.p.i = 0;
-}
-
-ret(0x6f) {
-1:rd  = op_readstack();
-2:rd |= op_readstack() << 8;
-3:op_io();
-4:op_io();
-  regs.pc = rd;
-}
-
-reti(0x7f) {
-1:regs.p = op_readstack();
-2:rd  = op_readstack();
-3:rd |= op_readstack() << 8;
-4:op_io();
-5:op_io();
-  regs.pc = rd;
-}
diff --git a/apu/bapu/smp/core/op_pc.cpp b/apu/bapu/smp/core/op_pc.cpp
deleted file mode 100644
index 763a033e..00000000
--- a/apu/bapu/smp/core/op_pc.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-case 0x2f: {
-  rd = op_readpc();
-  if(0)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xf0: {
-  rd = op_readpc();
-  if(!regs.p.z)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xd0: {
-  rd = op_readpc();
-  if(regs.p.z)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xb0: {
-  rd = op_readpc();
-  if(!regs.p.c)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x90: {
-  rd = op_readpc();
-  if(regs.p.c)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x70: {
-  rd = op_readpc();
-  if(!regs.p.v)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x50: {
-  rd = op_readpc();
-  if(regs.p.v)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x30: {
-  rd = op_readpc();
-  if(!regs.p.n)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x10: {
-  rd = op_readpc();
-  if(regs.p.n)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x03: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x01) != 0x01)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x13: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x01) == 0x01)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x23: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x02) != 0x02)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x33: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x02) == 0x02)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x43: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x04) != 0x04)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x53: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x04) == 0x04)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x63: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x08) != 0x08)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x73: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x08) == 0x08)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x83: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x10) != 0x10)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x93: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x10) == 0x10)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xa3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x20) != 0x20)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xb3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x20) == 0x20)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xc3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x40) != 0x40)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xd3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x40) == 0x40)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xe3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x80) != 0x80)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xf3: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if((sp & 0x80) == 0x80)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x2e: {
-  dp = op_readpc();
-  sp = op_readdp(dp);
-  rd = op_readpc();
-  op_io();
-  if(regs.a == sp)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xde: {
-  dp = op_readpc();
-  op_io();
-  sp = op_readdp(dp + regs.x);
-  rd = op_readpc();
-  op_io();
-  if(regs.a == sp)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x6e: {
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  op_writedp(dp, --wr);
-  rd = op_readpc();
-  if(wr == 0x00)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0xfe: {
-  rd = op_readpc();
-  op_io();
-  regs.y--;
-  op_io();
-  if(regs.y == 0x00)break;
-  op_io();
-  op_io();
-  regs.pc += (int8)rd;
-  break;
-}
-
-case 0x5f: {
-  rd  = op_readpc();
-  rd |= op_readpc() << 8;
-  regs.pc = rd;
-  break;
-}
-
-case 0x1f: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  dp += regs.x;
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  regs.pc = rd;
-  break;
-}
-
-case 0x3f: {
-  rd  = op_readpc();
-  rd |= op_readpc() << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x4f: {
-  rd = op_readpc();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = 0xff00 | rd;
-  break;
-}
-
-case 0x01: {
-  dp = 0xffde - (0 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x11: {
-  dp = 0xffde - (1 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x21: {
-  dp = 0xffde - (2 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x31: {
-  dp = 0xffde - (3 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x41: {
-  dp = 0xffde - (4 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x51: {
-  dp = 0xffde - (5 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x61: {
-  dp = 0xffde - (6 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x71: {
-  dp = 0xffde - (7 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x81: {
-  dp = 0xffde - (8 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x91: {
-  dp = 0xffde - (9 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xa1: {
-  dp = 0xffde - (10 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xb1: {
-  dp = 0xffde - (11 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xc1: {
-  dp = 0xffde - (12 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xd1: {
-  dp = 0xffde - (13 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xe1: {
-  dp = 0xffde - (14 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0xf1: {
-  dp = 0xffde - (15 << 1);
-  rd  = op_readaddr(dp);
-  rd |= op_readaddr(dp + 1) << 8;
-  op_io();
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  regs.pc = rd;
-  break;
-}
-
-case 0x0f: {
-  rd  = op_readaddr(0xffde);
-  rd |= op_readaddr(0xffdf) << 8;
-  op_io();
-  op_io();
-  op_writestack(regs.pc >> 8);
-  op_writestack(regs.pc);
-  op_writestack(regs.p);
-  regs.pc = rd;
-  regs.p.b = 1;
-  regs.p.i = 0;
-  break;
-}
-
-case 0x6f: {
-  rd  = op_readstack();
-  rd |= op_readstack() << 8;
-  op_io();
-  op_io();
-  regs.pc = rd;
-  break;
-}
-
-case 0x7f: {
-  regs.p = op_readstack();
-  rd  = op_readstack();
-  rd |= op_readstack() << 8;
-  op_io();
-  op_io();
-  regs.pc = rd;
-  break;
-}
-
diff --git a/apu/bapu/smp/core/op_read.b b/apu/bapu/smp/core/op_read.b
deleted file mode 100644
index fd2f9d82..00000000
--- a/apu/bapu/smp/core/op_read.b
+++ /dev/null
@@ -1,205 +0,0 @@
-adc_a_const(0x88, adc, a),
-and_a_const(0x28, and, a),
-cmp_a_const(0x68, cmp, a),
-cmp_x_const(0xc8, cmp, x),
-cmp_y_const(0xad, cmp, y),
-eor_a_const(0x48, eor, a),
-or_a_const(0x08, or, a),
-sbc_a_const(0xa8, sbc, a) {
-1:rd = op_readpc();
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_ix(0x86, adc),
-and_a_ix(0x26, and),
-cmp_a_ix(0x66, cmp),
-eor_a_ix(0x46, eor),
-or_a_ix(0x06, or),
-sbc_a_ix(0xa6, sbc) {
-1:op_io();
-2:rd = op_readdp(regs.x);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_dp(0x84, adc, a),
-and_a_dp(0x24, and, a),
-cmp_a_dp(0x64, cmp, a),
-cmp_x_dp(0x3e, cmp, x),
-cmp_y_dp(0x7e, cmp, y),
-eor_a_dp(0x44, eor, a),
-or_a_dp(0x04, or, a),
-sbc_a_dp(0xa4, sbc, a) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_dpx(0x94, adc),
-and_a_dpx(0x34, and),
-cmp_a_dpx(0x74, cmp),
-eor_a_dpx(0x54, eor),
-or_a_dpx(0x14, or),
-sbc_a_dpx(0xb4, sbc) {
-1:dp = op_readpc();
-2:op_io();
-3:rd = op_readdp(dp + regs.x);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_addr(0x85, adc, a),
-and_a_addr(0x25, and, a),
-cmp_a_addr(0x65, cmp, a),
-cmp_x_addr(0x1e, cmp, x),
-cmp_y_addr(0x5e, cmp, y),
-eor_a_addr(0x45, eor, a),
-or_a_addr(0x05, or, a),
-sbc_a_addr(0xa5, sbc, a) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-  regs.$2 = op_$1(regs.$2, rd);
-}
-
-adc_a_addrx(0x95, adc, x),
-adc_a_addry(0x96, adc, y),
-and_a_addrx(0x35, and, x),
-and_a_addry(0x36, and, y),
-cmp_a_addrx(0x75, cmp, x),
-cmp_a_addry(0x76, cmp, y),
-eor_a_addrx(0x55, eor, x),
-eor_a_addry(0x56, eor, y),
-or_a_addrx(0x15, or, x),
-or_a_addry(0x16, or, y),
-sbc_a_addrx(0xb5, sbc, x),
-sbc_a_addry(0xb6, sbc, y) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:op_io();
-4:rd = op_readaddr(dp + regs.$2);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_idpx(0x87, adc),
-and_a_idpx(0x27, and),
-cmp_a_idpx(0x67, cmp),
-eor_a_idpx(0x47, eor),
-or_a_idpx(0x07, or),
-sbc_a_idpx(0xa7, sbc) {
-1:dp = op_readpc() + regs.x;
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:rd = op_readaddr(sp);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_a_idpy(0x97, adc),
-and_a_idpy(0x37, and),
-cmp_a_idpy(0x77, cmp),
-eor_a_idpy(0x57, eor),
-or_a_idpy(0x17, or),
-sbc_a_idpy(0xb7, sbc) {
-1:dp  = op_readpc();
-2:op_io();
-3:sp  = op_readdp(dp);
-4:sp |= op_readdp(dp + 1) << 8;
-5:rd = op_readaddr(sp + regs.y);
-  regs.a = op_$1(regs.a, rd);
-}
-
-adc_ix_iy(0x99, adc, 1),
-and_ix_iy(0x39, and, 1),
-cmp_ix_iy(0x79, cmp, 0),
-eor_ix_iy(0x59, eor, 1),
-or_ix_iy(0x19, or, 1),
-sbc_ix_iy(0xb9, sbc, 1) {
-1:op_io();
-2:rd = op_readdp(regs.y);
-3:wr = op_readdp(regs.x);
-  wr = op_$1(wr, rd);
-4:($2) ? op_writedp(regs.x, wr) : op_io();
-}
-
-adc_dp_dp(0x89, adc, 1),
-and_dp_dp(0x29, and, 1),
-cmp_dp_dp(0x69, cmp, 0),
-eor_dp_dp(0x49, eor, 1),
-or_dp_dp(0x09, or, 1),
-sbc_dp_dp(0xa9, sbc, 1) {
-1:sp = op_readpc();
-2:rd = op_readdp(sp);
-3:dp = op_readpc();
-4:wr = op_readdp(dp);
-5:wr = op_$1(wr, rd);
-  ($2) ? op_writedp(dp, wr) : op_io();
-}
-
-adc_dp_const(0x98, adc, 1),
-and_dp_const(0x38, and, 1),
-cmp_dp_const(0x78, cmp, 0),
-eor_dp_const(0x58, eor, 1),
-or_dp_const(0x18, or, 1),
-sbc_dp_const(0xb8, sbc, 1) {
-1:rd = op_readpc();
-2:dp = op_readpc();
-3:wr = op_readdp(dp);
-4:wr = op_$1(wr, rd);
-  ($2) ? op_writedp(dp, wr) : op_io();
-}
-
-addw_ya_dp(0x7a, addw),
-subw_ya_dp(0x9a, subw) {
-1:dp  = op_readpc();
-2:rd  = op_readdp(dp);
-3:op_io();
-4:rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_$1(regs.ya, rd);
-}
-
-cmpw_ya_dp(0x5a) {
-1:dp  = op_readpc();
-2:rd  = op_readdp(dp);
-3:rd |= op_readdp(dp + 1) << 8;
-  op_cmpw(regs.ya, rd);
-}
-
-and1_bit(0x4a, !!),
-and1_notbit(0x6a, !) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & $1(rd & (1 << bit));
-}
-
-eor1_bit(0x8a) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-4:op_io();
-  regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-}
-
-not1_bit(0xea) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  rd ^= (1 << bit);
-4:op_writeaddr(dp, rd);
-}
-
-or1_bit(0x0a, !!),
-or1_notbit(0x2a, !) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-4:op_io();
-  regs.p.c = regs.p.c | $1(rd & (1 << bit));
-}
diff --git a/apu/bapu/smp/core/op_read.cpp b/apu/bapu/smp/core/op_read.cpp
deleted file mode 100644
index 2a16a3c8..00000000
--- a/apu/bapu/smp/core/op_read.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-case 0x88: {
-  rd = op_readpc();
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x28: {
-  rd = op_readpc();
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x68: {
-  rd = op_readpc();
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0xc8: {
-  rd = op_readpc();
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0xad: {
-  rd = op_readpc();
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x48: {
-  rd = op_readpc();
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x08: {
-  rd = op_readpc();
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa8: {
-  rd = op_readpc();
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x86: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x26: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x66: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x46: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x06: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa6: {
-  op_io();
-  rd = op_readdp(regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x84: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x24: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x64: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x3e: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0x7e: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x44: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x04: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa4: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x94: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x34: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x74: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x54: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x14: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb4: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x85: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x25: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x65: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x1e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.x = op_cmp(regs.x, rd);
-  break;
-}
-
-case 0x5e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.y = op_cmp(regs.y, rd);
-  break;
-}
-
-case 0x45: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x05: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x95: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x96: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x35: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x36: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x75: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x76: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x55: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x56: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x15: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0x16: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb5: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.x);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0xb6: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  op_io();
-  rd = op_readaddr(dp + regs.y);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x87: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x27: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x67: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x47: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x07: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xa7: {
-  dp = op_readpc() + regs.x;
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x97: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_adc(regs.a, rd);
-  break;
-}
-
-case 0x37: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_and(regs.a, rd);
-  break;
-}
-
-case 0x77: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_cmp(regs.a, rd);
-  break;
-}
-
-case 0x57: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_eor(regs.a, rd);
-  break;
-}
-
-case 0x17: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_or(regs.a, rd);
-  break;
-}
-
-case 0xb7: {
-  dp  = op_readpc();
-  op_io();
-  sp  = op_readdp(dp);
-  sp |= op_readdp(dp + 1) << 8;
-  rd = op_readaddr(sp + regs.y);
-  regs.a = op_sbc(regs.a, rd);
-  break;
-}
-
-case 0x99: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x39: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x79: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x59: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x19: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0xb9: {
-  op_io();
-  rd = op_readdp(regs.y);
-  wr = op_readdp(regs.x);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(regs.x, wr) : op_io();
-  break;
-}
-
-case 0x89: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x29: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x69: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x49: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x09: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0xa9: {
-  sp = op_readpc();
-  rd = op_readdp(sp);
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x98: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_adc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x38: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_and(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x78: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_cmp(wr, rd);
-  (0) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x58: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_eor(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x18: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_or(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0xb8: {
-  rd = op_readpc();
-  dp = op_readpc();
-  wr = op_readdp(dp);
-  wr = op_sbc(wr, rd);
-  (1) ? op_writedp(dp, wr) : op_io();
-  break;
-}
-
-case 0x7a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  op_io();
-  rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_addw(regs.ya, rd);
-  break;
-}
-
-case 0x9a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  op_io();
-  rd |= op_readdp(dp + 1) << 8;
-  regs.ya = op_subw(regs.ya, rd);
-  break;
-}
-
-case 0x5a: {
-  dp  = op_readpc();
-  rd  = op_readdp(dp);
-  rd |= op_readdp(dp + 1) << 8;
-  op_cmpw(regs.ya, rd);
-  break;
-}
-
-case 0x4a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & !!(rd & (1 << bit));
-  break;
-}
-
-case 0x6a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  regs.p.c = regs.p.c & !(rd & (1 << bit));
-  break;
-}
-
-case 0x8a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-  break;
-}
-
-case 0xea: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  rd ^= (1 << bit);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c | !!(rd & (1 << bit));
-  break;
-}
-
-case 0x2a: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  bit = dp >> 13;
-  dp &= 0x1fff;
-  rd = op_readaddr(dp);
-  op_io();
-  regs.p.c = regs.p.c | !(rd & (1 << bit));
-  break;
-}
-
diff --git a/apu/bapu/smp/core/op_rmw.b b/apu/bapu/smp/core/op_rmw.b
deleted file mode 100644
index 425574e8..00000000
--- a/apu/bapu/smp/core/op_rmw.b
+++ /dev/null
@@ -1,74 +0,0 @@
-inc_a(0xbc, inc, a),
-inc_x(0x3d, inc, x),
-inc_y(0xfc, inc, y),
-dec_a(0x9c, dec, a),
-dec_x(0x1d, dec, x),
-dec_y(0xdc, dec, y),
-asl_a(0x1c, asl, a),
-lsr_a(0x5c, lsr, a),
-rol_a(0x3c, rol, a),
-ror_a(0x7c, ror, a) {
-1:op_io();
-  regs.$2 = op_$1(regs.$2);
-}
-
-inc_dp(0xab, inc),
-dec_dp(0x8b, dec),
-asl_dp(0x0b, asl),
-lsr_dp(0x4b, lsr),
-rol_dp(0x2b, rol),
-ror_dp(0x6b, ror) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-3:rd = op_$1(rd);
-  op_writedp(dp, rd);
-}
-
-inc_dpx(0xbb, inc),
-dec_dpx(0x9b, dec),
-asl_dpx(0x1b, asl),
-lsr_dpx(0x5b, lsr),
-rol_dpx(0x3b, rol),
-ror_dpx(0x7b, ror) {
-1:dp = op_readpc();
-2:op_io();
-3:rd = op_readdp(dp + regs.x);
-4:rd = op_$1(rd);
-  op_writedp(dp + regs.x, rd);
-}
-
-inc_addr(0xac, inc),
-dec_addr(0x8c, dec),
-asl_addr(0x0c, asl),
-lsr_addr(0x4c, lsr),
-rol_addr(0x2c, rol),
-ror_addr(0x6c, ror) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-4:rd = op_$1(rd);
-  op_writeaddr(dp, rd);
-}
-
-tset_addr_a(0x0e, |),
-tclr_addr_a(0x4e, &~) {
-1:dp  = op_readpc();
-2:dp |= op_readpc() << 8;
-3:rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-4:op_readaddr(dp);
-5:op_writeaddr(dp, rd $1 regs.a);
-}
-
-incw_dp(0x3a, ++),
-decw_dp(0x1a, --) {
-1:dp = op_readpc();
-2:rd = op_readdp(dp);
-  rd$1;
-3:op_writedp(dp++, rd);
-4:rd += op_readdp(dp) << 8;
-5:op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-}
diff --git a/apu/bapu/smp/core/op_rmw.cpp b/apu/bapu/smp/core/op_rmw.cpp
deleted file mode 100644
index f89ecacf..00000000
--- a/apu/bapu/smp/core/op_rmw.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-case 0xbc: {
-  op_io();
-  regs.a = op_inc(regs.a);
-  break;
-}
-
-case 0x3d: {
-  op_io();
-  regs.x = op_inc(regs.x);
-  break;
-}
-
-case 0xfc: {
-  op_io();
-  regs.y = op_inc(regs.y);
-  break;
-}
-
-case 0x9c: {
-  op_io();
-  regs.a = op_dec(regs.a);
-  break;
-}
-
-case 0x1d: {
-  op_io();
-  regs.x = op_dec(regs.x);
-  break;
-}
-
-case 0xdc: {
-  op_io();
-  regs.y = op_dec(regs.y);
-  break;
-}
-
-case 0x1c: {
-  op_io();
-  regs.a = op_asl(regs.a);
-  break;
-}
-
-case 0x5c: {
-  op_io();
-  regs.a = op_lsr(regs.a);
-  break;
-}
-
-case 0x3c: {
-  op_io();
-  regs.a = op_rol(regs.a);
-  break;
-}
-
-case 0x7c: {
-  op_io();
-  regs.a = op_ror(regs.a);
-  break;
-}
-
-case 0xab: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_inc(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x8b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_dec(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x0b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_asl(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x4b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_lsr(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x2b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_rol(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0x6b: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd = op_ror(rd);
-  op_writedp(dp, rd);
-  break;
-}
-
-case 0xbb: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_inc(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x9b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_dec(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x1b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_asl(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x5b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_lsr(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x3b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_rol(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0x7b: {
-  dp = op_readpc();
-  op_io();
-  rd = op_readdp(dp + regs.x);
-  rd = op_ror(rd);
-  op_writedp(dp + regs.x, rd);
-  break;
-}
-
-case 0xac: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_inc(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x8c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_dec(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_asl(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x4c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_lsr(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x2c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_rol(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x6c: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  rd = op_ror(rd);
-  op_writeaddr(dp, rd);
-  break;
-}
-
-case 0x0e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-  op_readaddr(dp);
-  op_writeaddr(dp, rd | regs.a);
-  break;
-}
-
-case 0x4e: {
-  dp  = op_readpc();
-  dp |= op_readpc() << 8;
-  rd = op_readaddr(dp);
-  regs.p.n = !!((regs.a - rd) & 0x80);
-  regs.p.z = ((regs.a - rd) == 0);
-  op_readaddr(dp);
-  op_writeaddr(dp, rd &~ regs.a);
-  break;
-}
-
-case 0x3a: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd++;
-  op_writedp(dp++, rd);
-  rd += op_readdp(dp) << 8;
-  op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-  break;
-}
-
-case 0x1a: {
-  dp = op_readpc();
-  rd = op_readdp(dp);
-  rd--;
-  op_writedp(dp++, rd);
-  rd += op_readdp(dp) << 8;
-  op_writedp(dp, rd >> 8);
-  regs.p.n = !!(rd & 0x8000);
-  regs.p.z = (rd == 0);
-  break;
-}
-
diff --git a/apu/bapu/smp/core/opcycle_misc.cpp b/apu/bapu/smp/core/opcycle_misc.cpp
deleted file mode 100644
index 963f9fc2..00000000
--- a/apu/bapu/smp/core/opcycle_misc.cpp
+++ /dev/null
@@ -1,696 +0,0 @@
-case 0x00: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xef: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.pc--;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xff: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.pc--;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9f: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    regs.a = (regs.a >> 4) | (regs.a << 4);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    if(regs.p.c || (regs.a) > 0x99) {
-      regs.a += 0x60;
-      regs.p.c = 1;
-    }
-    if(regs.p.h || (regs.a & 15) > 0x09) {
-      regs.a += 0x06;
-    }
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbe: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    if(!regs.p.c || (regs.a) > 0x99) {
-      regs.a -= 0x60;
-      regs.p.c = 0;
-    }
-    if(!regs.p.h || (regs.a & 15) > 0x09) {
-      regs.a -= 0x06;
-    }
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x60: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.c = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x20: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.p = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x80: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.c = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x40: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.p = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.p.v = 0;
-    regs.p.h = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xed: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.c = !regs.p.c;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.i = 1;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc0: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    regs.p.i = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x02: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x01;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x12: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x01;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x22: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x02;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x32: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x02;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x42: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x04;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x52: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x04;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x62: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x08;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x72: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x08;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x82: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x10;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x92: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x10;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x20;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x20;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x40;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x40;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd |=  0x80;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf2: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd &= ~0x80;
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writestack(regs.p);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xae: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.a = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xce: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.x = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xee: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.y = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8e: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.p = op_readstack();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    break;
-  case 7:
-    op_io();
-    break;
-  case 8:
-    op_io();
-    ya = regs.y * regs.a;
-    regs.a = ya;
-    regs.y = ya >> 8;
-    //result is set based on y (high-byte) only
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9e: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    break;
-  case 7:
-    op_io();
-    break;
-  case 8:
-    op_io();
-    break;
-  case 9:
-    op_io();
-    break;
-  case 10:
-    op_io();
-    break;
-  case 11:
-    op_io();
-    ya = regs.ya;
-    //overflow set if quotient >= 256
-    regs.p.v = !!(regs.y >= regs.x);
-    regs.p.h = !!((regs.y & 15) >= (regs.x & 15));
-    if(regs.y < (regs.x << 1)) {
-      //if quotient is <= 511 (will fit into 9-bit result)
-      regs.a = ya / regs.x;
-      regs.y = ya % regs.x;
-    } else {
-      //otherwise, the quotient won't fit into regs.p.v + regs.a
-      //this emulates the odd behavior of the S-SMP in this case
-      regs.a = 255    - (ya - (regs.x << 9)) / (256 - regs.x);
-      regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
-    }
-    //result is set based on a (quotient) only
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
diff --git a/apu/bapu/smp/core/opcycle_mov.cpp b/apu/bapu/smp/core/opcycle_mov.cpp
deleted file mode 100644
index 635c7ca5..00000000
--- a/apu/bapu/smp/core/opcycle_mov.cpp
+++ /dev/null
@@ -1,806 +0,0 @@
-case 0x7d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = regs.x;
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = regs.y;
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = regs.a;
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = regs.a;
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = regs.sp;
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbd: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.sp = regs.x;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe8: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.a = op_readpc();
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcd: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.x = op_readpc();
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8d: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.y = op_readpc();
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe6: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    regs.a = op_readdp(regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    regs.a = op_readdp(regs.x++);
-    break;
-  case 3:
-    op_io();
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe4: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.a = op_readdp(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf8: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.x = op_readdp(sp);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xeb: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.y = op_readdp(sp);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf4: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.a = op_readdp(sp + regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf9: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.x = op_readdp(sp + regs.y);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfb: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    regs.y = op_readdp(sp + regs.x);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe5: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.a = op_readaddr(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe9: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.x = op_readaddr(sp);
-    regs.p.n = !!(regs.x & 0x80);
-    regs.p.z = (regs.x == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xec: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    regs.y = op_readaddr(sp);
-    regs.p.n = !!(regs.y & 0x80);
-    regs.p.z = (regs.y == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf5: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.a = op_readaddr(sp + regs.x);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf6: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.a = op_readaddr(sp + regs.y);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    regs.a = op_readaddr(sp);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    regs.a = op_readaddr(sp + regs.y);
-    regs.p.n = !!(regs.a & 0x80);
-    regs.p.z = (regs.a == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfa: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc6: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_readdp(regs.x);
-    break;
-  case 3:
-    op_writedp(regs.x, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xaf: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_writedp(regs.x++, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd8: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.x;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd9: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.y;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    dp += regs.x;
-    break;
-  case 3:
-    op_readdp(dp);
-    break;
-  case 4:
-    op_writedp(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc9: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xcc: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_readaddr(dp);
-    break;
-  case 4:
-    op_writeaddr(dp, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    dp += regs.x;
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd6: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    dp += regs.y;
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc7: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    sp += regs.x;
-    break;
-  case 3:
-    dp  = op_readdp(sp);
-    break;
-  case 4:
-    dp |= op_readdp(sp + 1) << 8;
-    break;
-  case 5:
-    op_readaddr(dp);
-    break;
-  case 6:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd7: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    dp  = op_readdp(sp);
-    break;
-  case 3:
-    dp |= op_readdp(sp + 1) << 8;
-    break;
-  case 4:
-    op_io();
-    dp += regs.y;
-    break;
-  case 5:
-    op_readaddr(dp);
-    break;
-  case 6:
-    op_writeaddr(dp, regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xba: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    regs.a = op_readdp(sp);
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    regs.y = op_readdp(sp + 1);
-    regs.p.n = !!(regs.ya & 0x8000);
-    regs.p.z = (regs.ya == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xda: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp,     regs.a);
-    break;
-  case 4:
-    op_writedp(dp + 1, regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xaa: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp  = op_readpc();
-    break;
-  case 2:
-    sp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = sp >> 13;
-    sp &= 0x1fff;
-    rd = op_readaddr(sp);
-    regs.p.c = !!(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xca: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    if(regs.p.c)rd |=  (1 << bit);
-    else        rd &= ~(1 << bit);
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
diff --git a/apu/bapu/smp/core/opcycle_pc.cpp b/apu/bapu/smp/core/opcycle_pc.cpp
deleted file mode 100644
index 1cdda647..00000000
--- a/apu/bapu/smp/core/opcycle_pc.cpp
+++ /dev/null
@@ -1,1347 +0,0 @@
-case 0x2f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(0){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf0: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(!regs.p.z){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd0: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(regs.p.z){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb0: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(!regs.p.c){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x90: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(regs.p.c){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x70: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(!regs.p.v){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x50: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(regs.p.v){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x30: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(!regs.p.n){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x10: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    if(regs.p.n){ opcode_cycle = 0; break; }
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x03: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x01) != 0x01){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x13: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x01) == 0x01){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x23: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x02) != 0x02){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x33: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x02) == 0x02){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x43: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x04) != 0x04){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x53: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x04) == 0x04){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x63: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x08) != 0x08){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x73: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x08) == 0x08){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x83: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x10) != 0x10){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x93: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x10) == 0x10){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x20) != 0x20){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x20) == 0x20){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x40) != 0x40){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x40) == 0x40){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x80) != 0x80){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf3: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if((sp & 0x80) == 0x80){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    sp = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_readpc();
-    break;
-  case 4:
-    op_io();
-    if(regs.a == sp){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xde: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_readpc();
-    break;
-  case 5:
-    op_io();
-    if(regs.a == sp){ opcode_cycle = 0; break; }
-    break;
-  case 6:
-    op_io();
-    break;
-  case 7:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    wr = op_readdp(dp);
-    break;
-  case 3:
-    op_writedp(dp, --wr);
-    break;
-  case 4:
-    rd = op_readpc();
-    if(wr == 0x00){ opcode_cycle = 0; break; }
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfe: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    op_io();
-    regs.y--;
-    break;
-  case 3:
-    op_io();
-    if(regs.y == 0x00){ opcode_cycle = 0; break; }
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    regs.pc += (int8)rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd  = op_readpc();
-    break;
-  case 2:
-    rd |= op_readpc() << 8;
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1f: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    dp += regs.x;
-    break;
-  case 4:
-    rd  = op_readaddr(dp);
-    break;
-  case 5:
-    rd |= op_readaddr(dp + 1) << 8;
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd  = op_readpc();
-    break;
-  case 2:
-    rd |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 5:
-    op_writestack(regs.pc);
-    regs.pc = 0xff00 | rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x01: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (0 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x11: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (1 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x21: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (2 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x31: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (3 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x41: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (4 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x51: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (5 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x61: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (6 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x71: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (7 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x81: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (8 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x91: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (9 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (10 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (11 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (12 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xd1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (13 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xe1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (14 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xf1: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = 0xffde - (15 << 1);
-    rd  = op_readaddr(dp);
-    break;
-  case 2:
-    rd |= op_readaddr(dp + 1) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    break;
-  case 6:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 7:
-    op_writestack(regs.pc);
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd  = op_readaddr(0xffde);
-    break;
-  case 2:
-    rd |= op_readaddr(0xffdf) << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_writestack(regs.pc >> 8);
-    break;
-  case 6:
-    op_writestack(regs.pc);
-    break;
-  case 7:
-    op_writestack(regs.p);
-    regs.pc = rd;
-    regs.p.b = 1;
-    regs.p.i = 0;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6f: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd  = op_readstack();
-    break;
-  case 2:
-    rd |= op_readstack() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    op_io();
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7f: {
-  switch(opcode_cycle++) {
-  case 1:
-    regs.p = op_readstack();
-    break;
-  case 2:
-    rd  = op_readstack();
-    break;
-  case 3:
-    rd |= op_readstack() << 8;
-    break;
-  case 4:
-    op_io();
-    break;
-  case 5:
-    op_io();
-    regs.pc = rd;
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
diff --git a/apu/bapu/smp/core/opcycle_read.cpp b/apu/bapu/smp/core/opcycle_read.cpp
deleted file mode 100644
index 6c19f3a9..00000000
--- a/apu/bapu/smp/core/opcycle_read.cpp
+++ /dev/null
@@ -1,1599 +0,0 @@
-case 0x88: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x28: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x68: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xc8: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.x = op_cmp(regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xad: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.y = op_cmp(regs.y, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x48: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x08: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa8: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x86: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x26: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x66: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x46: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x06: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa6: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.x);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x84: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x24: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x64: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.x = op_cmp(regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.y = op_cmp(regs.y, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x44: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x04: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x94: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x34: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x74: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x54: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x14: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb4: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x85: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x25: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x65: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.x = op_cmp(regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.y = op_cmp(regs.y, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x45: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x05: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x95: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x96: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x35: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x36: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x75: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x76: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x55: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x56: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x15: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x16: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb5: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.x);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb6: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd = op_readaddr(dp + regs.y);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x87: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x27: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x67: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x47: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x07: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc() + regs.x;
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x97: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_adc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x37: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_and(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x77: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_cmp(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x57: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_eor(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x17: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_or(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb7: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    sp  = op_readdp(dp);
-    break;
-  case 4:
-    sp |= op_readdp(dp + 1) << 8;
-    break;
-  case 5:
-    rd = op_readaddr(sp + regs.y);
-    regs.a = op_sbc(regs.a, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x99: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_adc(wr, rd);
-    break;
-  case 4:
-    (1) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x39: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_and(wr, rd);
-    break;
-  case 4:
-    (1) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x79: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_cmp(wr, rd);
-    break;
-  case 4:
-    (0) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x59: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_eor(wr, rd);
-    break;
-  case 4:
-    (1) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x19: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_or(wr, rd);
-    break;
-  case 4:
-    (1) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb9: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    break;
-  case 2:
-    rd = op_readdp(regs.y);
-    break;
-  case 3:
-    wr = op_readdp(regs.x);
-    wr = op_sbc(wr, rd);
-    break;
-  case 4:
-    (1) ? op_writedp(regs.x, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x89: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_adc(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x29: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_and(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x69: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_cmp(wr, rd);
-    (0) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x49: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_eor(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x09: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_or(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xa9: {
-  switch(opcode_cycle++) {
-  case 1:
-    sp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(sp);
-    break;
-  case 3:
-    dp = op_readpc();
-    break;
-  case 4:
-    wr = op_readdp(dp);
-    break;
-  case 5:
-    wr = op_sbc(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x98: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_adc(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x38: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_and(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x78: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_cmp(wr, rd);
-    (0) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x58: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_eor(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x18: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_or(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xb8: {
-  switch(opcode_cycle++) {
-  case 1:
-    rd = op_readpc();
-    break;
-  case 2:
-    dp = op_readpc();
-    break;
-  case 3:
-    wr = op_readdp(dp);
-    break;
-  case 4:
-    wr = op_sbc(wr, rd);
-    (1) ? op_writedp(dp, wr) : op_io();
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    rd  = op_readdp(dp);
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd |= op_readdp(dp + 1) << 8;
-    regs.ya = op_addw(regs.ya, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    rd  = op_readdp(dp);
-    break;
-  case 3:
-    op_io();
-    break;
-  case 4:
-    rd |= op_readdp(dp + 1) << 8;
-    regs.ya = op_subw(regs.ya, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    rd  = op_readdp(dp);
-    break;
-  case 3:
-    rd |= op_readdp(dp + 1) << 8;
-    op_cmpw(regs.ya, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    regs.p.c = regs.p.c & !!(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    regs.p.c = regs.p.c & !(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    op_io();
-    regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xea: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    rd ^= (1 << bit);
-    break;
-  case 4:
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    op_io();
-    regs.p.c = regs.p.c | !!(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    bit = dp >> 13;
-    dp &= 0x1fff;
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    op_io();
-    regs.p.c = regs.p.c | !(rd & (1 << bit));
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
diff --git a/apu/bapu/smp/core/opcycle_rmw.cpp b/apu/bapu/smp/core/opcycle_rmw.cpp
deleted file mode 100644
index eca62f02..00000000
--- a/apu/bapu/smp/core/opcycle_rmw.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-case 0xbc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_inc(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = op_inc(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xfc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = op_inc(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_dec(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1d: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.x = op_dec(regs.x);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xdc: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.y = op_dec(regs.y);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_asl(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_lsr(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_rol(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7c: {
-  switch(opcode_cycle++) {
-  case 1:
-    op_io();
-    regs.a = op_ror(regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xab: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_inc(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_dec(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_asl(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_lsr(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_rol(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    break;
-  case 3:
-    rd = op_ror(rd);
-    op_writedp(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xbb: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_inc(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x9b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_dec(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_asl(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x5b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_lsr(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_rol(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x7b: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    op_io();
-    break;
-  case 3:
-    rd = op_readdp(dp + regs.x);
-    break;
-  case 4:
-    rd = op_ror(rd);
-    op_writedp(dp + regs.x, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0xac: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_inc(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x8c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_dec(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_asl(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_lsr(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x2c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_rol(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x6c: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    break;
-  case 4:
-    rd = op_ror(rd);
-    op_writeaddr(dp, rd);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x0e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.p.n = !!((regs.a - rd) & 0x80);
-    regs.p.z = ((regs.a - rd) == 0);
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, rd | regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x4e: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp  = op_readpc();
-    break;
-  case 2:
-    dp |= op_readpc() << 8;
-    break;
-  case 3:
-    rd = op_readaddr(dp);
-    regs.p.n = !!((regs.a - rd) & 0x80);
-    regs.p.z = ((regs.a - rd) == 0);
-    break;
-  case 4:
-    op_readaddr(dp);
-    break;
-  case 5:
-    op_writeaddr(dp, rd &~ regs.a);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x3a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    rd++;
-    break;
-  case 3:
-    op_writedp(dp++, rd);
-    break;
-  case 4:
-    rd += op_readdp(dp) << 8;
-    break;
-  case 5:
-    op_writedp(dp, rd >> 8);
-    regs.p.n = !!(rd & 0x8000);
-    regs.p.z = (rd == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
-case 0x1a: {
-  switch(opcode_cycle++) {
-  case 1:
-    dp = op_readpc();
-    break;
-  case 2:
-    rd = op_readdp(dp);
-    rd--;
-    break;
-  case 3:
-    op_writedp(dp++, rd);
-    break;
-  case 4:
-    rd += op_readdp(dp) << 8;
-    break;
-  case 5:
-    op_writedp(dp, rd >> 8);
-    regs.p.n = !!(rd & 0x8000);
-    regs.p.z = (rd == 0);
-    opcode_cycle = 0;
-    break;
-  }
-  break;
-}
-
diff --git a/apu/bapu/smp/memory.cpp b/apu/bapu/smp/memory.cpp
index fd7b509e..2b89646c 100644
--- a/apu/bapu/smp/memory.cpp
+++ b/apu/bapu/smp/memory.cpp
@@ -18,7 +18,6 @@ unsigned SMP::mmio_read(unsigned addr) {
   case 0xf5:
   case 0xf6:
   case 0xf7:
-    synchronize_cpu();
     return cpu.port_read(addr);
 
   case 0xf8:
@@ -78,7 +77,6 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
     }
 
     if(data & 0x30) {
-      synchronize_cpu();
       if(data & 0x20) {
         cpu.port_write(3, 0x00);
         cpu.port_write(2, 0x00);
@@ -122,7 +120,6 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
   case 0xf5:
   case 0xf6:
   case 0xf7:
-    synchronize_cpu();
     port_write(addr, data);
     break;
 
diff --git a/apu/bapu/smp/smp.cpp b/apu/bapu/smp/smp.cpp
index c8c4ed5b..9901c297 100644
--- a/apu/bapu/smp/smp.cpp
+++ b/apu/bapu/smp/smp.cpp
@@ -1,6 +1,3 @@
-#define CYCLE_ACCURATE
-#define PSEUDO_CYCLE
-
 #ifdef DEBUGGER
 #include "../../../snes9x.h"
 #include "../../../debug.h"
@@ -12,63 +9,29 @@ char tmp[1024];
 #define SMP_CPP
 namespace SNES {
 
-// TODO: reactivate once APU debugger works again
 #ifdef DEBUGGER
-//  #include "debugger/debugger.cpp"
-  #include "debugger/disassembler.cpp"
-  SMP smp;
-#else
-  SMP smp;
+#include "debugger/disassembler.cpp"
 #endif
 
+SMP smp;
+
 #include "algorithms.cpp"
 #include "core.cpp"
 #include "iplrom.cpp"
 #include "memory.cpp"
 #include "timing.cpp"
 
-void SMP::synchronize_cpu() {
-#ifndef SNES9X
-  if(CPU::Threaded == true) {
-  //if(clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(cpu.thread);
-  } else {
-    while(clock >= 0) cpu.enter();
-  }
-#endif
-}
-
-void SMP::synchronize_dsp() {
-#ifndef SNES9X
-  if(DSP::Threaded == true) {
-  //if(dsp.clock < 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(dsp.thread);
-  } else {
-    while(dsp.clock < 0) dsp.enter();
-  }
-#endif
-}
-
 void SMP::enter() {
   while(clock < 0) op_step();
 }
 
 void SMP::power() {
-#ifndef SNES9X
-  Processor::frequency = system.apu_frequency();
-#endif
-
   Processor::clock = 0;
 
   timer0.target = 0;
   timer1.target = 0;
   timer2.target = 0;
 
-  for(unsigned n = 0; n < 256; n++) {
-    cycle_table_dsp[n] = (cycle_count_table[n] * 24);
-    cycle_table_cpu[n] = (cycle_count_table[n] * 24) * cpu.frequency;
-  }
-
-  cycle_step_cpu = 24 * cpu.frequency;
-
   reset();
 }
 
@@ -104,58 +67,6 @@ void SMP::reset() {
   timer0.stage3_ticks = timer1.stage3_ticks = timer2.stage3_ticks = 0;
 }
 
-#ifndef SNES9X
-void SMP::serialize(serializer &s) {
-  Processor::serialize(s);
-
-  s.array(apuram, 64 * 1024);
-
-  s.integer(opcode_number);
-  s.integer(opcode_cycle);
-
-  s.integer(regs.pc);
-  s.integer(regs.sp);
-  s.integer(regs.a);
-  s.integer(regs.x);
-  s.integer(regs.y);
-
-  s.integer(regs.p.n);
-  s.integer(regs.p.v);
-  s.integer(regs.p.p);
-  s.integer(regs.p.b);
-  s.integer(regs.p.h);
-  s.integer(regs.p.i);
-  s.integer(regs.p.z);
-  s.integer(regs.p.c);
-
-  s.integer(status.iplrom_enable);
-
-  s.integer(status.dsp_addr);
-
-  s.integer(status.ram00f8);
-  s.integer(status.ram00f9);
-
-  s.integer(timer0.enable);
-  s.integer(timer0.target);
-  s.integer(timer0.stage1_ticks);
-  s.integer(timer0.stage2_ticks);
-  s.integer(timer0.stage3_ticks);
-
-  s.integer(timer1.enable);
-  s.integer(timer1.target);
-  s.integer(timer1.stage1_ticks);
-  s.integer(timer1.stage2_ticks);
-  s.integer(timer1.stage3_ticks);
-
-  s.integer(timer2.enable);
-  s.integer(timer2.target);
-
-  s.integer(timer2.stage1_ticks);
-  s.integer(timer2.stage2_ticks);
-  s.integer(timer2.stage3_ticks);
-}
-#endif
-
 SMP::SMP() {
   apuram = new uint8[64 * 1024];
 }
diff --git a/apu/bapu/smp/smp.hpp b/apu/bapu/smp/smp.hpp
index 70438468..9f474102 100644
--- a/apu/bapu/smp/smp.hpp
+++ b/apu/bapu/smp/smp.hpp
@@ -4,10 +4,6 @@ public:
   uint8 highmem[64];
   uint8 *apuram;
 
-  enum { Threaded = false };
-  alwaysinline void synchronize_cpu();
-  alwaysinline void synchronize_dsp();
-
   unsigned port_read(unsigned port);
   void port_write(unsigned port, unsigned data);
 
@@ -18,13 +14,9 @@ public:
   void power();
   void reset();
 
-#ifndef SNES9X
-  void serialize(serializer&);
-#else
   void load_state(uint8 **);
   void save_state(uint8 **);
   void save_spc (uint8 *);
-#endif
   SMP();
   ~SMP();
 
@@ -133,10 +125,4 @@ public:
 #endif
 };
 
-// TODO: reactivate once APU debugger works again
-#if 0 // DEBUGGER
-  #include "debugger/debugger.hpp"
-  extern SMPDebugger smp;
-#else
-  extern SMP smp;
-#endif
+extern SMP smp;
diff --git a/apu/bapu/smp/smp_state.cpp b/apu/bapu/smp/smp_state.cpp
index 5b6bde5a..c992ba53 100644
--- a/apu/bapu/smp/smp_state.cpp
+++ b/apu/bapu/smp/smp_state.cpp
@@ -205,4 +205,4 @@ void SMP::load_state(uint8 **block) {
   *block = ptr;
 }
 
-} /* namespace SNES */
+} // namespace SNES
diff --git a/apu/bapu/snes/snes.hpp b/apu/bapu/snes/snes.hpp
index d85e99f0..e8dccfe0 100644
--- a/apu/bapu/snes/snes.hpp
+++ b/apu/bapu/snes/snes.hpp
@@ -5,8 +5,6 @@
 #include "../../resampler.h"
 #include "../../../msu1.h"
 
-#define SNES9X
-
 #if defined(__GNUC__)
   #define inline        inline
   #define alwaysinline  inline __attribute__((always_inline))
@@ -35,8 +33,6 @@ struct Processor
 class CPU
 {
 public:
-    enum { Threaded = false };
-    int frequency;
     uint8 registers[4];
 
     inline void reset ()
@@ -57,6 +53,6 @@ public:
 
 extern CPU cpu;
 
-} /* namespace SNES */
+} // namespace SNES
 
 #endif