Start converting some opcodes to cycle-based.

apu/bapu/smp/core.cpp

@@ -13,12 +13,25 @@ void SMP::tick() {
 #endif
 }
 
+void SMP::tick(unsigned clocks) {
+  timer0.tick(clocks);
+  timer1.tick(clocks);
+  timer2.tick(clocks);
+
+  clock += clocks;
+  dsp.clock += clocks;
+}
+
 void SMP::op_io() {
   #if defined(CYCLE_ACCURATE)
   tick();
   #endif
 }
 
+void SMP::op_io(unsigned clocks) {
+  tick(clocks);
+}
+
 uint8 SMP::op_read(uint16 addr) {
   #if defined(CYCLE_ACCURATE)
   tick();

apu/bapu/smp/core/opcycle_misc.cpp

@@ -1,70 +1,34 @@
 case 0x00: {
-  switch(opcode_cycle++) {
-  case 1:
   op_io();
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0xef: {
-  switch(opcode_cycle++) {
+  op_io(2);
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
   regs.pc--;
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0xff: {
-  switch(opcode_cycle++) {
+  op_io(2);
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
   regs.pc--;
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0x9f: {
-  switch(opcode_cycle++) {
+  op_io(4);
-  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++) {
+  op_io(2);
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
   if(regs.p.c || (regs.a) > 0x99) {
     regs.a += 0x60;
     regs.p.c = 1;
@@ -77,16 +41,9 @@ case 0xdf: {
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0xbe: {
-  switch(opcode_cycle++) {
+  op_io(2);
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
   if(!regs.p.c || (regs.a) > 0x99) {
     regs.a -= 0x60;
     regs.p.c = 0;
@@ -99,92 +56,56 @@ case 0xbe: {
   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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  case 1:
-    op_io();
-    break;
-  case 2:
-    op_io();
   regs.p.i = 1;
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0xc0: {
   switch(opcode_cycle++) {
@@ -473,158 +394,63 @@ case 0xf2: {
 }
 
 case 0x2d: {
-  switch(opcode_cycle++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(2);
-  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++) {
+  op_io(8);
-  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;
@@ -634,43 +460,9 @@ case 0xcf: {
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 
 case 0x9e: {
-  switch(opcode_cycle++) {
+  op_io(11);
-  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);
@@ -691,6 +483,4 @@ case 0x9e: {
   opcode_cycle = 0;
   break;
 }
-  break;
-}
 

apu/bapu/smp/core/opcycle_rmw.cpp

@@ -1,101 +1,65 @@
 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++) {

apu/bapu/smp/smp.hpp

@@ -96,7 +96,9 @@ public:
   Timer< 16> timer2;
 
   inline void tick();
+  inline void tick(unsigned clocks);
   alwaysinline void op_io();
+  alwaysinline void op_io(unsigned clocks);
   debugvirtual alwaysinline uint8 op_read(uint16 addr);
   debugvirtual alwaysinline void op_write(uint16 addr, uint8 data);
   debugvirtual alwaysinline void op_step();