Update to bsnes v031 release.

New release posted. Perhaps the most important change was fixing a bug in the Windows port when the keyboard was used for input. For some reason, the IsDialogMessage() function I use for tab key support was causing the main window to emit the Windows error beep every time a key was pressed after a few minutes of use. I do not know why this is, so I have simply disabled the tab key support to prevent this from happening.
Other than that, lots of polishing went into this release. UPS soft-patching will work with the recently released Der Langrisser v1.02 translation, for those curious. You can also store the UPS patches in GZ/ZIP/JMA support, and bsnes will detect this and decompress the patches first. Use the same ".ups" file extension for this, as it detects via file header.
If you wish to try out the newly added OpenGL support: start bsnes, go to Settings->Configuration->Advanced and set system.video to "wgl" (or "glx" for Linux users), and then restart the emulator. Please bear in mind that ATI's OpenGL drivers are an industry-wide joke, so I'd only recommend trying this on an nVidia or Intel video card.
Changelog:
    - Fixed bug and re-enabled HDMA bus sync delays
    - Emulated newly discovered IRQ timing edge case
    - Optimized offset-per-tile rendering
    - Added state-machine implementation of S-DSP core, ~5% speedup
    - Added SPC7110 detection, will now warn that this chip is unsupported
    - Fixed very annoying Windows port OS beeping noise when using keyboard for input
    - Linux port will now save most recent folder when no default ROM path is selected
    - Added OpenGL rendering support to Windows port [krom]
    - Fixed Direct3D pixel mode scaling bug [krom, sinamas, VG]
    - Improved SNES controller graphic [FitzRoy]
    - Added UPS (not IPS) soft-patching support; UPS patch must be made against unheadered ROM
    - As always, cleaned up source code a bit

readme.txt

@@ -1,5 +1,5 @@
 bsnes
-Version: 0.030
+Version: 0.031
 Author: byuu
 
 --------
@@ -17,7 +17,7 @@ Please see license.txt for important licensing information.
 Known Limitations:
 ------------------
 S-CPU
-- Multiply / Divide register delays not implemented
+- Multiply / divide register delays not implemented
 
 S-PPU
 - Uses scanline-based renderer. This is very inaccurate, but few (if any)

src/Makefile

@@ -39,7 +39,7 @@ ifeq ($(platform),x) # X11
   link += $(call mklib,Xtst)
   delete = rm -f $1
 else ifeq ($(platform),win) # Windows
-  ruby = video.direct3d video.directdraw video.gdi audio.directsound input.directinput
+  ruby = video.direct3d video.wgl video.directdraw video.gdi audio.directsound input.directinput
   link += $(if $(findstring mingw,$(compiler)),-mwindows)
   link += $(call mklib,uuid)
   link += $(call mklib,kernel32)
@@ -64,6 +64,7 @@ rubyflags += $(if $(findstring .sdl,$(ruby)),`sdl-config --cflags`)
 link += $(if $(findstring video.direct3d,$(ruby)),$(call mklib,d3d9))
 link += $(if $(findstring video.directdraw,$(ruby)),$(call mklib,ddraw))
 link += $(if $(findstring video.glx,$(ruby)),$(call mklib,GL))
+link += $(if $(findstring video.wgl,$(ruby)),$(call mklib,opengl32))
 link += $(if $(findstring video.xv,$(ruby)),$(call mklib,Xv))
 link += $(if $(findstring audio.ao,$(ruby)),$(call mklib,ao))
 link += $(if $(findstring audio.directsound,$(ruby)),$(call mklib,dsound))

src/base.h

@@ -1,4 +1,4 @@
-#define BSNES_VERSION "0.030"
+#define BSNES_VERSION "0.031"
 #define BSNES_TITLE   "bsnes v" BSNES_VERSION
 
 #define BUSCORE sBus
@@ -7,12 +7,16 @@
 #define DSPCORE sDSP
 #define PPUCORE bPPU
 
+//S-DSP can be encapsulated into a state machine using #define magic
+//this avoids ~2.048m co_switch() calls per second (~5% speedup)
+#define USE_STATE_MACHINE
+
 //FAST_FRAMESKIP disables calculation of RTO during frameskip
 //frameskip offers near-zero speedup if RTO is calculated
 //accuracy is not affected by this define when frameskipping is off
 #define FAST_FRAMESKIP
 
-//game genie + pro action replay code support (~1-3% speed hit)
+//game genie + pro action replay code support (~2% speed hit)
 #define CHEAT_SYSTEM
 
 #include <nall/algorithm.hpp>
@@ -21,6 +25,7 @@
 #include <nall/config.hpp>
 #include <nall/detect.hpp>
 #include <nall/function.hpp>
+#include <nall/modulo.hpp>
 #include <nall/new.hpp>
 #include <nall/sort.hpp>
 #include <nall/stdint.hpp>

src/cart/cart.cpp

@@ -1,5 +1,8 @@
 #include "../base.h"
-#define CART_CPP
+#define CART_CPP
+
+#include <nall/crc32.hpp>
+#include <nall/ups.hpp>
 
 #include "cart_normal.cpp"
 #include "cart_bsx.cpp"
@@ -42,7 +45,8 @@ void Cartridge::load_begin(CartridgeType cart_type) {
   info.st       = false;
 
   info.superfx = false;
-  info.sa1     = false;
+  info.sa1     = false;
+  info.spc7110 = false;
   info.srtc    = false;
   info.sdd1    = false;
   info.cx4     = false;

src/cart/cart.h

@@ -83,7 +83,8 @@ public:
     bool superfx;
     bool sa1;
     bool srtc;
-    bool sdd1;
+    bool sdd1;
+    bool spc7110;
     bool cx4;
     bool dsp1;
     bool dsp2;
@@ -120,19 +121,27 @@ public:
   void find_header();
   void read_header();
   void read_extended_header();
-
-  bool load_file(const char *fn, uint8 *&data, uint &size);
-  bool save_file(const char *fn, uint8 *data, uint size);
+
+  enum CompressionMode {
+    CompressionNone,    //always load without compression
+    CompressionInspect, //use file header inspection
+    CompressionAuto,    //use file extension or file header inspection (configured by user)
+  };
+  bool load_file(const char *fn, uint8 *&data, uint &size, CompressionMode compression = CompressionNone);
+  bool save_file(const char *fn, uint8 *data, uint size);
+  bool apply_patch(const uint8_t *pdata, unsigned psize, uint8_t *&data, unsigned &size);
   char* modify_extension(char *filename, const char *extension);
   char* get_base_filename(char *filename);
-  char* get_path_filename(char *filename, const char *path, const char *source, const char *extension);
+  char* get_path_filename(char *filename, const char *path, const char *source, const char *extension);
+  char* get_patch_filename(const char *source, const char *extension);
   char* get_save_filename(const char *source, const char *extension);
   char* get_cheat_filename(const char *source, const char *extension);
 
   Cartridge();
   ~Cartridge();
 
-private:
+private:
+  char patchfn[PATH_MAX];
   char savefn[PATH_MAX];
   char cheatfn[PATH_MAX];
 };

src/cart/cart_bsc.cpp

@@ -9,13 +9,22 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
 
   uint8_t *data = 0;
   unsigned size;
-  load_file(cart.fn, data, size);
+  load_file(cart.fn, data, size, CompressionAuto);
   cart.rom = data, cart.rom_size = size;
 
+  if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
+    apply_patch(data, size, cart.rom, cart.rom_size);
+    if(data) { free(data); data = 0; }
+  }
+
   if(*bs.fn) {
-    if(load_file(bs.fn, data, size) == true) {
+    if(load_file(bs.fn, data, size, CompressionAuto) == true) {
       info.bsxflash = true;
       bs.ram = data, bs.ram_size = size;
+      if(load_file(get_patch_filename(bs.fn, "ups"), data, size, CompressionInspect) == true) {
+        apply_patch(data, size, bs.ram, bs.ram_size);
+        if(data) { free(data); data = 0; }
+      }
     }
   }
 
@@ -29,7 +38,7 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
     cart.ram = (uint8*)malloc(cart.ram_size = info.ram_size);
     memset(cart.ram, 0xff, cart.ram_size);
 
-    if(load_file(get_save_filename(cart.fn, "srm"), data, size) == true) {
+    if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
       memcpy(cart.ram, data, min(size, cart.ram_size));
       safe_free(data);
     }

src/cart/cart_bsx.cpp

@@ -14,27 +14,36 @@ void Cartridge::load_cart_bsx(const char *base, const char *slot) {
 
   uint8_t *data = 0;
   unsigned size;
-  load_file(cart.fn, data, size);
+  load_file(cart.fn, data, size, CompressionAuto);
   cart.rom = data, cart.rom_size = size;
   cart.ram = 0, cart.ram_size = 0;
 
+  if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
+    apply_patch(data, size, cart.rom, cart.rom_size);
+    if(data) { free(data); data = 0; }
+  }
+
   memset(bsxcart.sram.handle (), 0x00, bsxcart.sram.size ());
   memset(bsxcart.psram.handle(), 0x00, bsxcart.psram.size());
 
-  if(load_file(get_save_filename(cart.fn, "srm"), data, size) == true) {
+  if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
     memcpy(bsxcart.sram.handle (), data, min(bsxcart.sram.size (), size));
     safe_free(data);
   }
 
-  if(load_file(get_save_filename(cart.fn, "psr"), data, size) == true) {
+  if(load_file(get_save_filename(cart.fn, "psr"), data, size, CompressionNone) == true) {
     memcpy(bsxcart.psram.handle(), data, min(bsxcart.psram.size(), size));
     safe_free(data);
   }
 
   if(*bs.fn) {
-    if(load_file(bs.fn, data, size) == true) {
+    if(load_file(bs.fn, data, size, CompressionAuto) == true) {
       info.bsxflash = true;
       bs.ram = data, bs.ram_size = size;
+      if(load_file(get_patch_filename(bs.fn, "ups"), data, size, CompressionInspect) == true) {
+        apply_patch(data, size, bs.ram, bs.ram_size);
+        if(data) { free(data); data = 0; }
+      }
     }
   }
 

src/cart/cart_file.cpp

@@ -72,6 +72,10 @@ char* Cartridge::get_path_filename(char *filename, const char *path, const char
   }
 
   return filename;
+}
+
+char* Cartridge::get_patch_filename(const char *source, const char *extension) {
+  return get_path_filename(patchfn, config::path.patch, source, extension);
 }
 
 char* Cartridge::get_save_filename(const char *source, const char *extension) {
@@ -82,13 +86,19 @@ char* Cartridge::get_cheat_filename(const char *source, const char *extension) {
   return get_path_filename(cheatfn, config::path.cheat, source, extension);
 }
 
-bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
-  dprintf("* Loading \"%s\"...", fn);
+bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size, CompressionMode compression) {
+  dprintf("* Loading \"%s\" ...", fn);
 
-  if(fexists(fn) == false) return false;
+  if(fexists(fn) == false) return false;
+
+  Reader::Type filetype = Reader::Normal;
+  if(compression == CompressionInspect) filetype = Reader::detect(fn, true);
+  if(compression == CompressionAuto) filetype = Reader::detect(fn, config::file.autodetect_type);
 
-  switch(Reader::detect(fn)) {
-    default:
+  switch(filetype) {
+    default:
+      dprintf("* Warning: filetype detected as unsupported compression type.");
+      dprintf("* Will attempt to load as uncompressed file -- may fail.");
     case Reader::Normal: {
       FileReader ff(fn);
       if(!ff.ready()) {
@@ -132,6 +142,30 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
   }
 
   return true;
+}
+
+bool Cartridge::apply_patch(const uint8_t *pdata, const unsigned psize, uint8_t *&data, unsigned &size) {
+  uint8_t *outdata = 0;
+  unsigned outsize;
+  ups patcher;
+  ups::result result = patcher.apply(pdata, psize, data, size, outdata, outsize);
+
+  bool apply = false;
+  if(result == ups::ok) apply = true;
+  if(config::file.bypass_patch_crc32 == true) {
+    if(result == ups::input_crc32_invalid) apply = true;
+    if(result == ups::output_crc32_invalid) apply = true;
+  }
+
+  if(apply == true) {
+    free(data);
+    data = (uint8_t*)malloc(size = outsize);
+    memcpy(data, outdata, outsize);
+  } else {
+    dprintf("* Warning: patch application failed!");
+  }
+
+  if(outdata) delete[] outdata;
 }
 
 bool Cartridge::save_file(const char *fn, uint8 *data, uint size) {

src/cart/cart_header.cpp

@@ -51,6 +51,11 @@ void Cartridge::read_header() {
     info.sdd1 = true;
   }
 
+  if(mapper == 0x3a && (rom_type == 0xf5 || rom_type == 0xf9)) {
+    //rom_type: 0xf5 = no S-RTC, 0xf9 = S-RTC
+    info.spc7110 = true;
+  }
+
   if(mapper == 0x20 && rom_type == 0xf3) {
     info.cx4 = true;
   }

src/cart/cart_normal.cpp

@@ -5,7 +5,7 @@ void Cartridge::load_cart_normal(const char *filename) {
 
   uint8_t *data = 0;
   unsigned size;
-  if(load_file(filename, data, size) == false) return;
+  if(load_file(filename, data, size, CompressionAuto) == false) return;
   strcpy(cart.fn, filename);
 
   load_begin(CartridgeNormal);
@@ -20,6 +20,11 @@ void Cartridge::load_cart_normal(const char *filename) {
   }
   safe_free(data);
 
+  if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
+    apply_patch(data, size, cart.rom, cart.rom_size);
+    if(data) { free(data); data = 0; }
+  }
+
   info.crc32 = crc32_calculate(cart.rom, cart.rom_size);
 
   find_header();
@@ -29,7 +34,7 @@ void Cartridge::load_cart_normal(const char *filename) {
     cart.ram = (uint8*)malloc(cart.ram_size = info.ram_size);
     memset(cart.ram, 0xff, cart.ram_size);
 
-    if(load_file(get_save_filename(cart.fn, "srm"), data, size) == true) {
+    if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
       memcpy(cart.ram, data, min(size, cart.ram_size));
       safe_free(data);
     }

src/cart/cart_st.cpp

@@ -14,22 +14,30 @@ void Cartridge::load_cart_st(const char *base, const char *slotA, const char *sl
 
   uint8_t *data = 0;
   unsigned size;
-  if(load_file(cart.fn, data, size) == true) {
+  if(load_file(cart.fn, data, size, CompressionAuto) == true) {
     cart.rom = (uint8*)malloc(cart.rom_size = 0x040000);
     memcpy(cart.rom, data, min(size, cart.rom_size));
     safe_free(data);
+    if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
+      apply_patch(data, size, cart.rom, cart.rom_size);
+      if(data) { free(data); data = 0; }
+    }
   }
 
   if(*stA.fn) {
-    if(load_file(stA.fn, data, size) == true) {
+    if(load_file(stA.fn, data, size, CompressionAuto) == true) {
       stA.rom = (uint8*)malloc(stA.rom_size = 0x100000);
       memcpy(stA.rom, data, min(size, stA.rom_size));
       safe_free(data);
+      if(load_file(get_patch_filename(stA.fn, "ups"), data, size, CompressionInspect) == true) {
+        apply_patch(data, size, stA.rom, stA.rom_size);
+        if(data) { free(data); data = 0; }
+      }
 
       stA.ram = (uint8*)malloc(stA.ram_size = 0x020000);
       memset(stA.ram, 0xff, stA.ram_size);
 
-      if(load_file(get_save_filename(stA.fn, "srm"), data, size) == true) {
+      if(load_file(get_save_filename(stA.fn, "srm"), data, size, CompressionNone) == true) {
         memcpy(stA.ram, data, min(size, 0x020000U));
         safe_free(data);
       }
@@ -37,15 +45,19 @@ void Cartridge::load_cart_st(const char *base, const char *slotA, const char *sl
   }
 
   if(*stB.fn) {
-    if(load_file(stB.fn, data, size) == true) {
+    if(load_file(stB.fn, data, size, CompressionAuto) == true) {
       stB.rom = (uint8*)malloc(stB.rom_size = 0x100000);
       memcpy(stB.rom, data, min(size, stB.rom_size));
       safe_free(data);
+      if(load_file(get_patch_filename(stB.fn, "ups"), data, size, CompressionInspect) == true) {
+        apply_patch(data, size, stB.rom, stB.rom_size);
+        if(data) { free(data); data = 0; }
+      }
 
       stB.ram = (uint8*)malloc(stB.ram_size = 0x020000);
       memset(stB.ram, 0xff, stB.ram_size);
 
-      if(load_file(get_save_filename(stB.fn, "srm"), data, size) == true) {
+      if(load_file(get_save_filename(stB.fn, "srm"), data, size, CompressionNone) == true) {
         memcpy(stB.ram, data, min(size, 0x020000U));
         safe_free(data);
       }

src/cc.bat

@@ -1,3 +1,3 @@
-::@make platform=win compiler=mingw32-gcc
-@make platform=win compiler=mingw32-gcc enable_gzip=true enable_jma=true
+@make platform=win compiler=mingw32-gcc
+::@make platform=win compiler=mingw32-gcc enable_gzip=true enable_jma=true
 @pause

src/config/config.cpp

@@ -11,6 +11,14 @@ integral_setting File::autodetect_type(config(), "file.autodetect_type",
   "identified as a .zip file. However, there is an infinitesimal (1:~500,000,000)\n"
   "chance of a false detection when loading an uncompressed image file, if this\n"
   "option is enabled.",
+  integral_setting::boolean, false);
+
+integral_setting File::bypass_patch_crc32(config(), "file.bypass_patch_crc32",
+  "UPS patches contain CRC32s to validate that a patch was applied successfully.\n"
+  "By default, if this validation fails, said patch will not be applied.\n"
+  "Setting this option to true will bypass the validation,\n"
+  "which may or may not result in a working image.\n"
+  "Enabling this option is strongly discouraged.",
   integral_setting::boolean, false);
 
 string file_updatepath(const char *req_file, const char *req_path) {
@@ -39,7 +47,9 @@ string file_updatepath(const char *req_file, const char *req_path) {
 string_setting Path::base("path.base",
   "Path that bsnes resides in", "");
 string_setting Path::rom(config(), "path.rom",
-  "Default path to look for ROM files in (\"\" = use default directory)", "");
+  "Default path to look for ROM files in (\"\" = use default directory)", "");
+string_setting Path::patch(config(), "path.patch",
+  "Default path for all UPS patch files (\"\" = use current directory)", "");
 string_setting Path::save(config(), "path.save",
   "Default path for all save RAM files (\"\" = use current directory)", "");
 string_setting Path::cheat(config(), "path.cheat",

src/config/config.h

@@ -6,10 +6,11 @@ string file_updatepath(const char*, const char*);
 
 extern struct File {
   static integral_setting autodetect_type;
+  static integral_setting bypass_patch_crc32;
 } file;
 
 extern struct Path {
-  static string_setting base, rom, save, cheat;
+  static string_setting base, rom, patch, save, cheat;
   static string_setting bsx, st;
 } path;
 

src/cpu/scpu/core/cc.bat

@@ -1,3 +0,0 @@
-cl /nologo /O2 scpugen.cpp
-@pause
-@del *.obj

src/cpu/scpu/core/cc.sh

@@ -0,0 +1,4 @@
+g++ -c scpugen.cpp -I../../../lib
+g++ -c ../../../lib/nall/string.cpp -I../../../lib
+g++ -o scpugen scpugen.o string.o
+rm *.o

src/cpu/scpu/core/clean.bat

@@ -1 +0,0 @@
-@del *.exe

src/cpu/scpu/core/clean.sh

@@ -0,0 +1 @@
+rm scpugen

src/cpu/scpu/core/core.cpp

@@ -2,12 +2,6 @@
 
 #include "opfn.cpp"
 
-#include "op_read.cpp"
-#include "op_write.cpp"
-#include "op_rmw.cpp"
-#include "op_pc.cpp"
-#include "op_misc.cpp"
-
 void sCPU::enter() { loop:
   if(event.irq) {
     event.irq = false;
@@ -24,7 +18,13 @@ void sCPU::enter() { loop:
   tracer.trace_cpuop(); //traces CPU opcode (only if tracer is enabled)
 
   status.in_opcode = true;
-  (this->*optbl[op_readpc()])();
+  switch(op_readpc()) {
+    #include "op_read.cpp"
+    #include "op_write.cpp"
+    #include "op_rmw.cpp"
+    #include "op_pc.cpp"
+    #include "op_misc.cpp"
+  }
   status.in_opcode = false;
 
   goto loop;
@@ -43,6 +43,23 @@ void sCPU::op_irq() {
   regs.p.d  = 0;
   rd.h = op_read(event.irq_vector + 1);
   regs.pc.w = rd.w;
+}
+
+//immediate, 2-cycle opcodes with I/O cycle will become bus read
+//when an IRQ is to be triggered immediately after opcode completion
+//this affects the following opcodes:
+//  clc, cld, cli, clv, sec, sed, sei,
+//  tax, tay, txa, txy, tya, tyx,
+//  tcd, tcs, tdc, tsc, tsx, tcs,
+//  inc, inx, iny, dec, dex, dey,
+//  asl, lsr, rol, ror, nop, xce.
+alwaysinline void sCPU::op_io_irq() {
+  if(event.irq) {
+    //IRQ pending, modify I/O cycle to bus read cycle, do not increment PC
+    op_read(regs.pc.d);
+  } else {
+    op_io();
+  }
 }
 
 alwaysinline void sCPU::op_io_cond2() {

src/cpu/scpu/core/core.h

@@ -1,5 +1,3 @@
-  void (sCPU::*optbl[256])();
-
   CPUReg24 aa, rd;
   uint8_t dp, sp;
 
@@ -49,9 +47,8 @@
   void op_trb_w();
   void op_tsb_b();
   void op_tsb_w();
-
+
+  void op_io_irq();
   void op_io_cond2();
   void op_io_cond4(uint16 x, uint16 y);
   void op_io_cond6(uint16 addr);
-
-  #include "op.h"

src/cpu/scpu/core/op.h

@@ -1,256 +0,0 @@
-void op_adc_const();
-void op_and_const();
-void op_cmp_const();
-void op_cpx_const();
-void op_cpy_const();
-void op_eor_const();
-void op_lda_const();
-void op_ldx_const();
-void op_ldy_const();
-void op_ora_const();
-void op_sbc_const();
-void op_adc_addr();
-void op_and_addr();
-void op_bit_addr();
-void op_cmp_addr();
-void op_cpx_addr();
-void op_cpy_addr();
-void op_eor_addr();
-void op_lda_addr();
-void op_ldx_addr();
-void op_ldy_addr();
-void op_ora_addr();
-void op_sbc_addr();
-void op_adc_addrx();
-void op_and_addrx();
-void op_bit_addrx();
-void op_cmp_addrx();
-void op_eor_addrx();
-void op_lda_addrx();
-void op_ldy_addrx();
-void op_ora_addrx();
-void op_sbc_addrx();
-void op_adc_addry();
-void op_and_addry();
-void op_cmp_addry();
-void op_eor_addry();
-void op_lda_addry();
-void op_ldx_addry();
-void op_ora_addry();
-void op_sbc_addry();
-void op_adc_long();
-void op_and_long();
-void op_cmp_long();
-void op_eor_long();
-void op_lda_long();
-void op_ora_long();
-void op_sbc_long();
-void op_adc_longx();
-void op_and_longx();
-void op_cmp_longx();
-void op_eor_longx();
-void op_lda_longx();
-void op_ora_longx();
-void op_sbc_longx();
-void op_adc_dp();
-void op_and_dp();
-void op_bit_dp();
-void op_cmp_dp();
-void op_cpx_dp();
-void op_cpy_dp();
-void op_eor_dp();
-void op_lda_dp();
-void op_ldx_dp();
-void op_ldy_dp();
-void op_ora_dp();
-void op_sbc_dp();
-void op_adc_dpx();
-void op_and_dpx();
-void op_bit_dpx();
-void op_cmp_dpx();
-void op_eor_dpx();
-void op_lda_dpx();
-void op_ldy_dpx();
-void op_ora_dpx();
-void op_sbc_dpx();
-void op_ldx_dpy();
-void op_adc_idp();
-void op_and_idp();
-void op_cmp_idp();
-void op_eor_idp();
-void op_lda_idp();
-void op_ora_idp();
-void op_sbc_idp();
-void op_adc_idpx();
-void op_and_idpx();
-void op_cmp_idpx();
-void op_eor_idpx();
-void op_lda_idpx();
-void op_ora_idpx();
-void op_sbc_idpx();
-void op_adc_idpy();
-void op_and_idpy();
-void op_cmp_idpy();
-void op_eor_idpy();
-void op_lda_idpy();
-void op_ora_idpy();
-void op_sbc_idpy();
-void op_adc_ildp();
-void op_and_ildp();
-void op_cmp_ildp();
-void op_eor_ildp();
-void op_lda_ildp();
-void op_ora_ildp();
-void op_sbc_ildp();
-void op_adc_ildpy();
-void op_and_ildpy();
-void op_cmp_ildpy();
-void op_eor_ildpy();
-void op_lda_ildpy();
-void op_ora_ildpy();
-void op_sbc_ildpy();
-void op_adc_sr();
-void op_and_sr();
-void op_cmp_sr();
-void op_eor_sr();
-void op_lda_sr();
-void op_ora_sr();
-void op_sbc_sr();
-void op_adc_isry();
-void op_and_isry();
-void op_cmp_isry();
-void op_eor_isry();
-void op_lda_isry();
-void op_ora_isry();
-void op_sbc_isry();
-void op_bit_const();
-void op_sta_addr();
-void op_stx_addr();
-void op_sty_addr();
-void op_stz_addr();
-void op_sta_addrx();
-void op_stz_addrx();
-void op_sta_addry();
-void op_sta_long();
-void op_sta_longx();
-void op_sta_dp();
-void op_stx_dp();
-void op_sty_dp();
-void op_stz_dp();
-void op_sta_dpx();
-void op_sty_dpx();
-void op_stz_dpx();
-void op_stx_dpy();
-void op_sta_idp();
-void op_sta_ildp();
-void op_sta_idpx();
-void op_sta_idpy();
-void op_sta_ildpy();
-void op_sta_sr();
-void op_sta_isry();
-void op_inc();
-void op_inx();
-void op_iny();
-void op_dec();
-void op_dex();
-void op_dey();
-void op_asl();
-void op_lsr();
-void op_rol();
-void op_ror();
-void op_inc_addr();
-void op_dec_addr();
-void op_asl_addr();
-void op_lsr_addr();
-void op_rol_addr();
-void op_ror_addr();
-void op_trb_addr();
-void op_tsb_addr();
-void op_inc_addrx();
-void op_dec_addrx();
-void op_asl_addrx();
-void op_lsr_addrx();
-void op_rol_addrx();
-void op_ror_addrx();
-void op_inc_dp();
-void op_dec_dp();
-void op_asl_dp();
-void op_lsr_dp();
-void op_rol_dp();
-void op_ror_dp();
-void op_trb_dp();
-void op_tsb_dp();
-void op_inc_dpx();
-void op_dec_dpx();
-void op_asl_dpx();
-void op_lsr_dpx();
-void op_rol_dpx();
-void op_ror_dpx();
-void op_bcc();
-void op_bcs();
-void op_bne();
-void op_beq();
-void op_bpl();
-void op_bmi();
-void op_bvc();
-void op_bvs();
-void op_bra();
-void op_brl();
-void op_jmp_addr();
-void op_jmp_long();
-void op_jmp_iaddr();
-void op_jmp_iaddrx();
-void op_jmp_iladdr();
-void op_jsr_addr();
-void op_jsr_long();
-void op_jsr_iaddrx();
-void op_rti();
-void op_rts();
-void op_rtl();
-void op_nop();
-void op_wdm();
-void op_xba();
-void op_mvn();
-void op_mvp();
-void op_brk();
-void op_cop();
-void op_stp();
-void op_wai();
-void op_xce();
-void op_clc();
-void op_cld();
-void op_cli();
-void op_clv();
-void op_sec();
-void op_sed();
-void op_sei();
-void op_rep();
-void op_sep();
-void op_tax();
-void op_tay();
-void op_txa();
-void op_txy();
-void op_tya();
-void op_tyx();
-void op_tcd();
-void op_tcs();
-void op_tdc();
-void op_tsc();
-void op_tsx();
-void op_txs();
-void op_pha();
-void op_phx();
-void op_phy();
-void op_phd();
-void op_phb();
-void op_phk();
-void op_php();
-void op_pla();
-void op_plx();
-void op_ply();
-void op_pld();
-void op_plb();
-void op_plp();
-void op_pea();
-void op_pei();
-void op_per();

src/cpu/scpu/core/op_misc.b

@@ -1,6 +1,6 @@
 nop(0xea) {
-1:last_cycle();
-  op_io();
+1:last_cycle();
+  op_io_irq();
 }
 
 wdm(0x42) {
@@ -36,34 +36,33 @@ mvp(0x44, --) {
   }
 6:last_cycle();
   op_io();
-  if(regs.a.w--)regs.pc.w -= 3;
+  if(regs.a.w--) regs.pc.w -= 3;
 }
 
 brk(0x00, 0xfffe, 0xffff, 0xffe6, 0xffe7),
 cop(0x02, 0xfff4, 0xfff5, 0xffe4, 0xffe5) {
 1:op_readpc();
-2:if(!regs.e)op_writestack(regs.pc.b);
+2:if(!regs.e) op_writestack(regs.pc.b);
 3:op_writestack(regs.pc.h);
 4:op_writestack(regs.pc.l);
 5:op_writestack(regs.p);
-6:rd.l = op_readlong((regs.e) ? $1 : $3);
+6:rd.l = op_readlong(regs.e ? $1 : $3);
   regs.pc.b = 0x00;
   regs.p.i  = 1;
   regs.p.d  = 0;
 7:last_cycle();
-  rd.h = op_readlong((regs.e) ? $2 : $4);
+  rd.h = op_readlong(regs.e ? $2 : $4);
   regs.pc.w = rd.w;
 }
 
 stp(0xdb) {
 1:op_io();
 2:last_cycle();
-  while(1) { op_io(); }
+  while(true) op_io();
 }
 
 wai(0xcb) {
-//last_cycle() will set event.wai to false
-//once an NMI / IRQ edge is reached
+//last_cycle() will clear event.wai once an NMI / IRQ edge is reached
 1:event.wai = true;
   while(event.wai) {
     last_cycle();
@@ -73,9 +72,9 @@ wai(0xcb) {
 }
 
 xce(0xfb) {
-1:last_cycle();
-  op_io();
-bool carry = regs.p.c;
+1:last_cycle();
+  op_io_irq();
+  bool carry = regs.p.c;
   regs.p.c = regs.e;
   regs.e = carry;
   if(regs.e) {
@@ -96,7 +95,7 @@ sec(0x38, regs.p.c = 1),
 sed(0xf8, regs.p.d = 1),
 sei(0x78, regs.p.i = 1) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   $1;
 }
 
@@ -106,7 +105,7 @@ sep(0xe2, |=) {
 2:last_cycle();
   op_io();
   regs.p $1 rd.l;
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
@@ -120,7 +119,7 @@ txy(0x9b, regs.p.x, y, x),
 tya(0x98, regs.p.m, a, y),
 tyx(0xbb, regs.p.x, x, y) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if($1) {
     regs.$2.l = regs.$3.l;
     regs.p.n = !!(regs.$2.l & 0x80);
@@ -134,7 +133,7 @@ tyx(0xbb, regs.p.x, x, y) {
 
 tcd(0x5b) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   regs.d.w = regs.a.w;
   regs.p.n = !!(regs.d.w & 0x8000);
   regs.p.z = (regs.d.w == 0);
@@ -142,14 +141,14 @@ tcd(0x5b) {
 
 tcs(0x1b) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   regs.s.w = regs.a.w;
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 tdc(0x7b) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   regs.a.w = regs.d.w;
   regs.p.n = !!(regs.a.w & 0x8000);
   regs.p.z = (regs.a.w == 0);
@@ -157,7 +156,7 @@ tdc(0x7b) {
 
 tsc(0x3b) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   regs.a.w = regs.s.w;
   if(regs.e) {
     regs.p.n = !!(regs.a.l & 0x80);
@@ -170,7 +169,7 @@ tsc(0x3b) {
 
 tsx(0xba) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l = regs.s.l;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -184,7 +183,7 @@ tsx(0xba) {
 
 txs(0x9a) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.e) {
     regs.s.l = regs.x.l;
   } else {
@@ -206,7 +205,7 @@ phd(0x0b) {
 2:op_writestackn(regs.d.h);
 3:last_cycle();
   op_writestackn(regs.d.l);
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 phb(0x8b, regs.db),
@@ -243,7 +242,7 @@ pld(0x2b) {
   regs.d.h = op_readstackn();
   regs.p.n = !!(regs.d.w & 0x8000);
   regs.p.z = (regs.d.w == 0);
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 plb(0xab) {
@@ -260,7 +259,7 @@ plp(0x28) {
 2:op_io();
 3:last_cycle();
   regs.p = op_readstack();
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
@@ -273,7 +272,7 @@ pea(0xf4) {
 3:op_writestackn(aa.h);
 4:last_cycle();
   op_writestackn(aa.l);
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 pei(0xd4) {
@@ -284,7 +283,7 @@ pei(0xd4) {
 5:op_writestackn(aa.h);
 6:last_cycle();
   op_writestackn(aa.l);
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 per(0x62) {
@@ -295,5 +294,5 @@ per(0x62) {
 4:op_writestackn(rd.h);
 5:last_cycle();
   op_writestackn(rd.l);
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }

src/cpu/scpu/core/op_misc.cpp

@@ -1,14 +1,17 @@
-void sCPU::op_nop() {
+//nop
+case 0xea: {
   last_cycle();
-  op_io();
-}
+  op_io_irq();
+} break;
 
-void sCPU::op_wdm() {
+//wdm
+case 0x42: {
   last_cycle();
   op_readpc();
-}
+} break;
 
-void sCPU::op_xba() {
+//xba
+case 0xeb: {
   op_io();
   last_cycle();
   op_io();
@@ -17,9 +20,10 @@ void sCPU::op_xba() {
   regs.a.l ^= regs.a.h;
   regs.p.n = !!(regs.a.l & 0x80);
   regs.p.z = (regs.a.l == 0);
-}
+} break;
 
-void sCPU::op_mvn() {
+//mvn
+case 0x54: {
   dp = op_readpc();
   sp = op_readpc();
   regs.db = dp;
@@ -35,10 +39,11 @@ void sCPU::op_mvn() {
   }
   last_cycle();
   op_io();
-  if(regs.a.w--)regs.pc.w -= 3;
-}
+  if(regs.a.w--) regs.pc.w -= 3;
+} break;
 
-void sCPU::op_mvp() {
+//mvp
+case 0x44: {
   dp = op_readpc();
   sp = op_readpc();
   regs.db = dp;
@@ -54,60 +59,64 @@ void sCPU::op_mvp() {
   }
   last_cycle();
   op_io();
-  if(regs.a.w--)regs.pc.w -= 3;
-}
+  if(regs.a.w--) regs.pc.w -= 3;
+} break;
 
-void sCPU::op_brk() {
+//brk
+case 0x00: {
   op_readpc();
-  if(!regs.e)op_writestack(regs.pc.b);
+  if(!regs.e) op_writestack(regs.pc.b);
   op_writestack(regs.pc.h);
   op_writestack(regs.pc.l);
   op_writestack(regs.p);
-  rd.l = op_readlong((regs.e) ? 0xfffe : 0xffe6);
+  rd.l = op_readlong(regs.e ? 0xfffe : 0xffe6);
   regs.pc.b = 0x00;
   regs.p.i  = 1;
   regs.p.d  = 0;
   last_cycle();
-  rd.h = op_readlong((regs.e) ? 0xffff : 0xffe7);
+  rd.h = op_readlong(regs.e ? 0xffff : 0xffe7);
   regs.pc.w = rd.w;
-}
+} break;
 
-void sCPU::op_cop() {
+//cop
+case 0x02: {
   op_readpc();
-  if(!regs.e)op_writestack(regs.pc.b);
+  if(!regs.e) op_writestack(regs.pc.b);
   op_writestack(regs.pc.h);
   op_writestack(regs.pc.l);
   op_writestack(regs.p);
-  rd.l = op_readlong((regs.e) ? 0xfff4 : 0xffe4);
+  rd.l = op_readlong(regs.e ? 0xfff4 : 0xffe4);
   regs.pc.b = 0x00;
   regs.p.i  = 1;
   regs.p.d  = 0;
   last_cycle();
-  rd.h = op_readlong((regs.e) ? 0xfff5 : 0xffe5);
+  rd.h = op_readlong(regs.e ? 0xfff5 : 0xffe5);
   regs.pc.w = rd.w;
-}
+} break;
 
-void sCPU::op_stp() {
+//stp
+case 0xdb: {
   op_io();
   last_cycle();
-  while(1) { op_io(); }
-}
+  while(true) op_io();
+} break;
 
-void sCPU::op_wai() {
-  //last_cycle() will set event.wai to false
-//once an NMI / IRQ edge is reached
+//wai
+case 0xcb: {
+  //last_cycle() will clear event.wai once an NMI / IRQ edge is reached
   event.wai = true;
   while(event.wai) {
     last_cycle();
     op_io();
   }
   op_io();
-}
+} break;
 
-void sCPU::op_xce() {
+//xce
+case 0xfb: {
   last_cycle();
-  op_io();
-bool carry = regs.p.c;
+  op_io_irq();
+  bool carry = regs.p.c;
   regs.p.c = regs.e;
   regs.e = carry;
   if(regs.e) {
@@ -118,77 +127,87 @@ bool carry = regs.p.c;
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
-}
+} break;
 
-void sCPU::op_clc() {
+//clc
+case 0x18: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.c = 0;
-}
+} break;
 
-void sCPU::op_cld() {
+//cld
+case 0xd8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.d = 0;
-}
+} break;
 
-void sCPU::op_cli() {
+//cli
+case 0x58: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.i = 0;
-}
+} break;
 
-void sCPU::op_clv() {
+//clv
+case 0xb8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.v = 0;
-}
+} break;
 
-void sCPU::op_sec() {
+//sec
+case 0x38: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.c = 1;
-}
+} break;
 
-void sCPU::op_sed() {
+//sed
+case 0xf8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.d = 1;
-}
+} break;
 
-void sCPU::op_sei() {
+//sei
+case 0x78: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.p.i = 1;
-}
+} break;
 
-void sCPU::op_rep() {
+//rep
+case 0xc2: {
   rd.l = op_readpc();
   last_cycle();
   op_io();
   regs.p &=~ rd.l;
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
-}
+} break;
 
-void sCPU::op_sep() {
+//sep
+case 0xe2: {
   rd.l = op_readpc();
   last_cycle();
   op_io();
   regs.p |= rd.l;
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
-}
+} break;
 
-void sCPU::op_tax() {
+//tax
+case 0xaa: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l = regs.a.l;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -198,11 +217,12 @@ void sCPU::op_tax() {
     regs.p.n = !!(regs.x.w & 0x8000);
     regs.p.z = (regs.x.w == 0);
   }
-}
+} break;
 
-void sCPU::op_tay() {
+//tay
+case 0xa8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.y.l = regs.a.l;
     regs.p.n = !!(regs.y.l & 0x80);
@@ -212,11 +232,12 @@ void sCPU::op_tay() {
     regs.p.n = !!(regs.y.w & 0x8000);
     regs.p.z = (regs.y.w == 0);
   }
-}
+} break;
 
-void sCPU::op_txa() {
+//txa
+case 0x8a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.a.l = regs.x.l;
     regs.p.n = !!(regs.a.l & 0x80);
@@ -226,11 +247,12 @@ void sCPU::op_txa() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_txy() {
+//txy
+case 0x9b: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.y.l = regs.x.l;
     regs.p.n = !!(regs.y.l & 0x80);
@@ -240,11 +262,12 @@ void sCPU::op_txy() {
     regs.p.n = !!(regs.y.w & 0x8000);
     regs.p.z = (regs.y.w == 0);
   }
-}
+} break;
 
-void sCPU::op_tya() {
+//tya
+case 0x98: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.a.l = regs.y.l;
     regs.p.n = !!(regs.a.l & 0x80);
@@ -254,11 +277,12 @@ void sCPU::op_tya() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_tyx() {
+//tyx
+case 0xbb: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l = regs.y.l;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -268,34 +292,38 @@ void sCPU::op_tyx() {
     regs.p.n = !!(regs.x.w & 0x8000);
     regs.p.z = (regs.x.w == 0);
   }
-}
+} break;
 
-void sCPU::op_tcd() {
+//tcd
+case 0x5b: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.d.w = regs.a.w;
   regs.p.n = !!(regs.d.w & 0x8000);
   regs.p.z = (regs.d.w == 0);
-}
+} break;
 
-void sCPU::op_tcs() {
+//tcs
+case 0x1b: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.s.w = regs.a.w;
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_tdc() {
+//tdc
+case 0x7b: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.a.w = regs.d.w;
   regs.p.n = !!(regs.a.w & 0x8000);
   regs.p.z = (regs.a.w == 0);
-}
+} break;
 
-void sCPU::op_tsc() {
+//tsc
+case 0x3b: {
   last_cycle();
-  op_io();
+  op_io_irq();
   regs.a.w = regs.s.w;
   if(regs.e) {
     regs.p.n = !!(regs.a.l & 0x80);
@@ -304,11 +332,12 @@ void sCPU::op_tsc() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_tsx() {
+//tsx
+case 0xba: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l = regs.s.l;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -318,66 +347,75 @@ void sCPU::op_tsx() {
     regs.p.n = !!(regs.x.w & 0x8000);
     regs.p.z = (regs.x.w == 0);
   }
-}
+} break;
 
-void sCPU::op_txs() {
+//txs
+case 0x9a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.e) {
     regs.s.l = regs.x.l;
   } else {
     regs.s.w = regs.x.w;
   }
-}
+} break;
 
-void sCPU::op_pha() {
+//pha
+case 0x48: {
   op_io();
   if(!regs.p.m)op_writestack(regs.a.h);
   last_cycle();
   op_writestack(regs.a.l);
-}
+} break;
 
-void sCPU::op_phx() {
+//phx
+case 0xda: {
   op_io();
   if(!regs.p.x)op_writestack(regs.x.h);
   last_cycle();
   op_writestack(regs.x.l);
-}
+} break;
 
-void sCPU::op_phy() {
+//phy
+case 0x5a: {
   op_io();
   if(!regs.p.x)op_writestack(regs.y.h);
   last_cycle();
   op_writestack(regs.y.l);
-}
+} break;
 
-void sCPU::op_phd() {
+//phd
+case 0x0b: {
   op_io();
   op_writestackn(regs.d.h);
   last_cycle();
   op_writestackn(regs.d.l);
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_phb() {
+//phb
+case 0x8b: {
   op_io();
   last_cycle();
   op_writestack(regs.db);
-}
+} break;
 
-void sCPU::op_phk() {
+//phk
+case 0x4b: {
   op_io();
   last_cycle();
   op_writestack(regs.pc.b);
-}
+} break;
 
-void sCPU::op_php() {
+//php
+case 0x08: {
   op_io();
   last_cycle();
   op_writestack(regs.p);
-}
+} break;
 
-void sCPU::op_pla() {
+//pla
+case 0x68: {
   op_io();
   op_io();
   if(regs.p.m)last_cycle();
@@ -385,15 +423,16 @@ void sCPU::op_pla() {
   if(regs.p.m) {
     regs.p.n = !!(regs.a.l & 0x80);
     regs.p.z = (regs.a.l == 0);
-    return;
+    break;
   }
   last_cycle();
   regs.a.h = op_readstack();
   regs.p.n = !!(regs.a.w & 0x8000);
   regs.p.z = (regs.a.w == 0);
-}
+} break;
 
-void sCPU::op_plx() {
+//plx
+case 0xfa: {
   op_io();
   op_io();
   if(regs.p.x)last_cycle();
@@ -401,15 +440,16 @@ void sCPU::op_plx() {
   if(regs.p.x) {
     regs.p.n = !!(regs.x.l & 0x80);
     regs.p.z = (regs.x.l == 0);
-    return;
+    break;
   }
   last_cycle();
   regs.x.h = op_readstack();
   regs.p.n = !!(regs.x.w & 0x8000);
   regs.p.z = (regs.x.w == 0);
-}
+} break;
 
-void sCPU::op_ply() {
+//ply
+case 0x7a: {
   op_io();
   op_io();
   if(regs.p.x)last_cycle();
@@ -417,15 +457,16 @@ void sCPU::op_ply() {
   if(regs.p.x) {
     regs.p.n = !!(regs.y.l & 0x80);
     regs.p.z = (regs.y.l == 0);
-    return;
+    break;
   }
   last_cycle();
   regs.y.h = op_readstack();
   regs.p.n = !!(regs.y.w & 0x8000);
   regs.p.z = (regs.y.w == 0);
-}
+} break;
 
-void sCPU::op_pld() {
+//pld
+case 0x2b: {
   op_io();
   op_io();
   regs.d.l = op_readstackn();
@@ -433,40 +474,44 @@ void sCPU::op_pld() {
   regs.d.h = op_readstackn();
   regs.p.n = !!(regs.d.w & 0x8000);
   regs.p.z = (regs.d.w == 0);
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_plb() {
+//plb
+case 0xab: {
   op_io();
   op_io();
   last_cycle();
   regs.db = op_readstack();
   regs.p.n = !!(regs.db & 0x80);
   regs.p.z = (regs.db == 0);
-}
+} break;
 
-void sCPU::op_plp() {
+//plp
+case 0x28: {
   op_io();
   op_io();
   last_cycle();
   regs.p = op_readstack();
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
-}
+} break;
 
-void sCPU::op_pea() {
+//pea
+case 0xf4: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_writestackn(aa.h);
   last_cycle();
   op_writestackn(aa.l);
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_pei() {
+//pei
+case 0xd4: {
   dp = op_readpc();
   op_io_cond2();
   aa.l = op_readdp(dp);
@@ -474,10 +519,11 @@ void sCPU::op_pei() {
   op_writestackn(aa.h);
   last_cycle();
   op_writestackn(aa.l);
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_per() {
+//per
+case 0x62: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
@@ -485,6 +531,6 @@ void sCPU::op_per() {
   op_writestackn(rd.h);
   last_cycle();
   op_writestackn(rd.l);
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 

src/cpu/scpu/core/op_pc.b

@@ -6,7 +6,7 @@ bpl(0x10, !regs.p.n),
 bmi(0x30, regs.p.n),
 bvc(0x50, !regs.p.v),
 bvs(0x70, regs.p.v) {
-1:if(!$1)last_cycle();
+1:if(!$1) last_cycle();
   rd.l = op_readpc();
   if($1) {
     aa.w = regs.pc.d + (int8)rd.l;
@@ -102,7 +102,7 @@ jsr_long(0x22) {
 7:last_cycle();
   op_writestackn(regs.pc.l);
   regs.pc.d = aa.d & 0xffffff;
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 jsr_iaddrx(0xfc) {
@@ -115,20 +115,20 @@ jsr_iaddrx(0xfc) {
 7:last_cycle();
   rd.h = op_readpbr(aa.w + regs.x.w + 1);
   regs.pc.w = rd.w;
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }
 
 rti(0x40) {
 1:op_io();
 2:op_io();
 3:regs.p = op_readstack();
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
 4:rd.l = op_readstack();
-5:if(regs.e)last_cycle();
+5:if(regs.e) last_cycle();
   rd.h = op_readstack();
   if(regs.e) {
     regs.pc.w = rd.w;
@@ -159,5 +159,5 @@ rtl(0x6b) {
   rd.b = op_readstackn();
   regs.pc.d = rd.d & 0xffffff;
   regs.pc.w++;
-  if(regs.e)regs.s.h = 0x01;
+  if(regs.e) regs.s.h = 0x01;
 }

src/cpu/scpu/core/op_pc.cpp

@@ -1,157 +1,171 @@
-void sCPU::op_bcc() {
-  if(!!regs.p.c)last_cycle();
+//bcc
+case 0x90: {
+  if(!!regs.p.c) last_cycle();
   rd.l = op_readpc();
   if(!regs.p.c) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bcs() {
-  if(!regs.p.c)last_cycle();
+//bcs
+case 0xb0: {
+  if(!regs.p.c) last_cycle();
   rd.l = op_readpc();
   if(regs.p.c) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bne() {
-  if(!!regs.p.z)last_cycle();
+//bne
+case 0xd0: {
+  if(!!regs.p.z) last_cycle();
   rd.l = op_readpc();
   if(!regs.p.z) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_beq() {
-  if(!regs.p.z)last_cycle();
+//beq
+case 0xf0: {
+  if(!regs.p.z) last_cycle();
   rd.l = op_readpc();
   if(regs.p.z) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bpl() {
-  if(!!regs.p.n)last_cycle();
+//bpl
+case 0x10: {
+  if(!!regs.p.n) last_cycle();
   rd.l = op_readpc();
   if(!regs.p.n) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bmi() {
-  if(!regs.p.n)last_cycle();
+//bmi
+case 0x30: {
+  if(!regs.p.n) last_cycle();
   rd.l = op_readpc();
   if(regs.p.n) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bvc() {
-  if(!!regs.p.v)last_cycle();
+//bvc
+case 0x50: {
+  if(!!regs.p.v) last_cycle();
   rd.l = op_readpc();
   if(!regs.p.v) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bvs() {
-  if(!regs.p.v)last_cycle();
+//bvs
+case 0x70: {
+  if(!regs.p.v) last_cycle();
   rd.l = op_readpc();
   if(regs.p.v) {
     aa.w = regs.pc.d + (int8)rd.l;
     regs.pc.w = aa.w;
   } else {
-    return;
+    break;
   }
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_bra() {
+//bra
+case 0x80: {
   rd.l = op_readpc();
   aa.w = regs.pc.d + (int8)rd.l;
   regs.pc.w = aa.w;
   op_io_cond6(aa.w);
   last_cycle();
   op_io();
-}
+} break;
 
-void sCPU::op_brl() {
+//brl
+case 0x82: {
   rd.l = op_readpc();
   rd.h = op_readpc();
   last_cycle();
   op_io();
   regs.pc.w = regs.pc.d + (int16)rd.w;
-}
+} break;
 
-void sCPU::op_jmp_addr() {
+//jmp_addr
+case 0x4c: {
   rd.l = op_readpc();
   last_cycle();
   rd.h = op_readpc();
   regs.pc.w = rd.w;
-}
+} break;
 
-void sCPU::op_jmp_long() {
+//jmp_long
+case 0x5c: {
   rd.l = op_readpc();
   rd.h = op_readpc();
   last_cycle();
   rd.b = op_readpc();
   regs.pc.d = rd.d & 0xffffff;
-}
+} break;
 
-void sCPU::op_jmp_iaddr() {
+//jmp_iaddr
+case 0x6c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readaddr(aa.w);
   last_cycle();
   rd.h = op_readaddr(aa.w + 1);
   regs.pc.w = rd.w;
-}
+} break;
 
-void sCPU::op_jmp_iaddrx() {
+//jmp_iaddrx
+case 0x7c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
@@ -159,9 +173,10 @@ void sCPU::op_jmp_iaddrx() {
   last_cycle();
   rd.h = op_readpbr(aa.w + regs.x.w + 1);
   regs.pc.w = rd.w;
-}
+} break;
 
-void sCPU::op_jmp_iladdr() {
+//jmp_iladdr
+case 0xdc: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readaddr(aa.w);
@@ -169,9 +184,10 @@ void sCPU::op_jmp_iladdr() {
   last_cycle();
   rd.b = op_readaddr(aa.w + 2);
   regs.pc.d = rd.d & 0xffffff;
-}
+} break;
 
-void sCPU::op_jsr_addr() {
+//jsr_addr
+case 0x20: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
@@ -180,9 +196,10 @@ void sCPU::op_jsr_addr() {
   last_cycle();
   op_writestack(regs.pc.l);
   regs.pc.w = aa.w;
-}
+} break;
 
-void sCPU::op_jsr_long() {
+//jsr_long
+case 0x22: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_writestackn(regs.pc.b);
@@ -193,10 +210,11 @@ void sCPU::op_jsr_long() {
   last_cycle();
   op_writestackn(regs.pc.l);
   regs.pc.d = aa.d & 0xffffff;
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_jsr_iaddrx() {
+//jsr_iaddrx
+case 0xfc: {
   aa.l = op_readpc();
   op_writestackn(regs.pc.h);
   op_writestackn(regs.pc.l);
@@ -206,31 +224,33 @@ void sCPU::op_jsr_iaddrx() {
   last_cycle();
   rd.h = op_readpbr(aa.w + regs.x.w + 1);
   regs.pc.w = rd.w;
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 
-void sCPU::op_rti() {
+//rti
+case 0x40: {
   op_io();
   op_io();
   regs.p = op_readstack();
-  if(regs.e)regs.p |= 0x30;
+  if(regs.e) regs.p |= 0x30;
   if(regs.p.x) {
     regs.x.h = 0x00;
     regs.y.h = 0x00;
   }
   rd.l = op_readstack();
-  if(regs.e)last_cycle();
+  if(regs.e) last_cycle();
   rd.h = op_readstack();
   if(regs.e) {
     regs.pc.w = rd.w;
-    return;
+    break;
   }
   last_cycle();
   rd.b = op_readstack();
   regs.pc.d = rd.d & 0xffffff;
-}
+} break;
 
-void sCPU::op_rts() {
+//rts
+case 0x60: {
   op_io();
   op_io();
   rd.l = op_readstack();
@@ -239,9 +259,10 @@ void sCPU::op_rts() {
   op_io();
   regs.pc.w = rd.w;
   regs.pc.w++;
-}
+} break;
 
-void sCPU::op_rtl() {
+//rtl
+case 0x6b: {
   op_io();
   op_io();
   rd.l = op_readstackn();
@@ -250,6 +271,6 @@ void sCPU::op_rtl() {
   rd.b = op_readstackn();
   regs.pc.d = rd.d & 0xffffff;
   regs.pc.w++;
-  if(regs.e)regs.s.h = 0x01;
-}
+  if(regs.e) regs.s.h = 0x01;
+} break;
 

src/cpu/scpu/core/op_read.b

@@ -9,7 +9,7 @@ ldx_const(0xa2, ldx, regs.p.x),
 ldy_const(0xa0, ldy, regs.p.x),
 ora_const(0x09, ora, regs.p.m),
 sbc_const(0xe9, sbc, regs.p.m) {
-1:if($2)last_cycle();
+1:if($2) last_cycle();
   rd.l = op_readpc();
   if($2) { op_$1_b(); end; }
 2:last_cycle();
@@ -31,7 +31,7 @@ ora_addr(0x0d, ora, regs.p.m),
 sbc_addr(0xed, sbc, regs.p.m) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
-3:if($2)last_cycle();
+3:if($2) last_cycle();
   rd.l = op_readdbr(aa.w);
   if($2) { op_$1_b(); end; }
 4:last_cycle();
@@ -51,7 +51,7 @@ sbc_addrx(0xfd, sbc, regs.p.m) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:op_io_cond4(aa.w, aa.w + regs.x.w);
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readdbr(aa.w + regs.x.w);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -70,7 +70,7 @@ sbc_addry(0xf9, sbc, regs.p.m) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:op_io_cond4(aa.w, aa.w + regs.y.w);
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readdbr(aa.w + regs.y.w);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -88,7 +88,7 @@ sbc_long(0xef, sbc, regs.p.m) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:aa.b = op_readpc();
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readlong(aa.d);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -106,7 +106,7 @@ sbc_longx(0xff, sbc, regs.p.m) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:aa.b = op_readpc();
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readlong(aa.d + regs.x.w);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -128,7 +128,7 @@ ora_dp(0x05, ora, regs.p.m),
 sbc_dp(0xe5, sbc, regs.p.m) {
 1:dp = op_readpc();
 2:op_io_cond2();
-3:if($2)last_cycle();
+3:if($2) last_cycle();
   rd.l = op_readdp(dp);
   if($2) { op_$1_b(); end; }
 4:last_cycle();
@@ -148,7 +148,7 @@ sbc_dpx(0xf5, sbc, regs.p.m) {
 1:dp = op_readpc();
 2:op_io_cond2();
 3:op_io();
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readdp(dp + regs.x.w);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -160,7 +160,7 @@ ldx_dpy(0xb6, ldx, regs.p.x) {
 1:dp = op_readpc();
 2:op_io_cond2();
 3:op_io();
-4:if($2)last_cycle();
+4:if($2) last_cycle();
   rd.l = op_readdp(dp + regs.y.w);
   if($2) { op_$1_b(); end; }
 5:last_cycle();
@@ -179,7 +179,7 @@ sbc_idp(0xf2, sbc, regs.p.m) {
 2:op_io_cond2();
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
-5:if($2)last_cycle();
+5:if($2) last_cycle();
   rd.l = op_readdbr(aa.w);
   if($2) { op_$1_b(); end; }
 6:last_cycle();
@@ -199,7 +199,7 @@ sbc_idpx(0xe1, sbc, regs.p.m) {
 3:op_io();
 4:aa.l = op_readdp(dp + regs.x.w);
 5:aa.h = op_readdp(dp + regs.x.w + 1);
-6:if($2)last_cycle();
+6:if($2) last_cycle();
   rd.l = op_readdbr(aa.w);
   if($2) { op_$1_b(); end; }
 7:last_cycle();
@@ -219,7 +219,7 @@ sbc_idpy(0xf1, sbc, regs.p.m) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:op_io_cond4(aa.w, aa.w + regs.y.w);
-6:if($2)last_cycle();
+6:if($2) last_cycle();
   rd.l = op_readdbr(aa.w + regs.y.w);
   if($2) { op_$1_b(); end; }
 7:last_cycle();
@@ -239,7 +239,7 @@ sbc_ildp(0xe7, sbc, regs.p.m) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:aa.b = op_readdp(dp + 2);
-6:if($2)last_cycle();
+6:if($2) last_cycle();
   rd.l = op_readlong(aa.d);
   if($2) { op_$1_b(); end; }
 7:last_cycle();
@@ -259,7 +259,7 @@ sbc_ildpy(0xf7, sbc, regs.p.m) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:aa.b = op_readdp(dp + 2);
-6:if($2)last_cycle();
+6:if($2) last_cycle();
   rd.l = op_readlong(aa.d + regs.y.w);
   if($2) { op_$1_b(); end; }
 7:last_cycle();
@@ -276,7 +276,7 @@ ora_sr(0x03, ora, regs.p.m),
 sbc_sr(0xe3, sbc, regs.p.m) {
 1:sp = op_readpc();
 2:op_io();
-3:if($2)last_cycle();
+3:if($2) last_cycle();
   rd.l = op_readsp(sp);
   if($2) { op_$1_b(); end; }
 4:last_cycle();
@@ -296,7 +296,7 @@ sbc_isry(0xf3, sbc) {
 3:aa.l = op_readsp(sp);
 4:aa.h = op_readsp(sp + 1);
 5:op_io();
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   rd.l = op_readdbr(aa.w + regs.y.w);
   if(regs.p.m) { op_$1_b(); end; }
 7:last_cycle();
@@ -305,7 +305,7 @@ sbc_isry(0xf3, sbc) {
 }
 
 bit_const(0x89) {
-1:if(regs.p.m)last_cycle();
+1:if(regs.p.m) last_cycle();
   rd.l = op_readpc();
   if(regs.p.m) {
     regs.p.z = ((rd.l & regs.a.l) == 0);

src/cpu/scpu/core/op_rmw.b

@@ -2,7 +2,7 @@ inc(0x1a, regs.p.m, a),
 inx(0xe8, regs.p.x, x),
 iny(0xc8, regs.p.x, y) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if($1) {
     regs.$2.l++;
     regs.p.n = !!(regs.$2.l & 0x80);
@@ -18,7 +18,7 @@ dec(0x3a, regs.p.m, a),
 dex(0xca, regs.p.x, x),
 dey(0x88, regs.p.x, y) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if($1) {
     regs.$2.l--;
     regs.p.n = !!(regs.$2.l & 0x80);
@@ -32,7 +32,7 @@ dey(0x88, regs.p.x, y) {
 
 asl(0x0a) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.p.c = !!(regs.a.l & 0x80);
     regs.a.l <<= 1;
@@ -48,7 +48,7 @@ asl(0x0a) {
 
 lsr(0x4a) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.p.c = regs.a.l & 1;
     regs.a.l >>= 1;
@@ -64,7 +64,7 @@ lsr(0x4a) {
 
 rol(0x2a) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   uint16 c = regs.p.c;
   if(regs.p.m) {
     regs.p.c = !!(regs.a.l & 0x80);
@@ -83,17 +83,17 @@ rol(0x2a) {
 
 ror(0x6a) {
 1:last_cycle();
-  op_io();
+  op_io_irq();
   uint16 c;
   if(regs.p.m) {
-    c = (regs.p.c)?0x80:0;
+    c = regs.p.c ? 0x80 : 0;
     regs.p.c = regs.a.l & 1;
     regs.a.l >>= 1;
     regs.a.l |= c;
     regs.p.n = !!(regs.a.l & 0x80);
     regs.p.z = (regs.a.l == 0);
   } else {
-    c = (regs.p.c)?0x8000:0;
+    c = regs.p.c ? 0x8000 : 0;
     regs.p.c = regs.a.w & 1;
     regs.a.w >>= 1;
     regs.a.w |= c;
@@ -113,7 +113,7 @@ tsb_addr(0x0c, tsb) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:rd.l = op_readdbr(aa.w);
-4:if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+4:if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
 5:op_io();
   if(regs.p.m) { op_$1_b(); }
   else { op_$1_w();
@@ -132,7 +132,7 @@ ror_addrx(0x7e, ror) {
 2:aa.h = op_readpc();
 3:op_io();
 4:rd.l = op_readdbr(aa.w + regs.x.w);
-5:if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+5:if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
 6:op_io();
   if(regs.p.m) { op_$1_b(); }
   else { op_$1_w();
@@ -152,7 +152,7 @@ tsb_dp(0x04, tsb) {
 1:dp = op_readpc();
 2:op_io_cond2();
 3:rd.l = op_readdp(dp);
-4:if(!regs.p.m)rd.h = op_readdp(dp + 1);
+4:if(!regs.p.m) rd.h = op_readdp(dp + 1);
 5:op_io();
   if(regs.p.m) { op_$1_b(); }
   else { op_$1_w();
@@ -171,7 +171,7 @@ ror_dpx(0x76, ror) {
 2:op_io_cond2();
 3:op_io();
 4:rd.l = op_readdp(dp + regs.x.w);
-5:if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+5:if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
 6:op_io();
   if(regs.p.m) { op_$1_b(); }
   else { op_$1_w();

src/cpu/scpu/core/op_rmw.cpp

@@ -1,6 +1,7 @@
-void sCPU::op_inc() {
+//inc
+case 0x1a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.a.l++;
     regs.p.n = !!(regs.a.l & 0x80);
@@ -10,11 +11,12 @@ void sCPU::op_inc() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_inx() {
+//inx
+case 0xe8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l++;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -24,11 +26,12 @@ void sCPU::op_inx() {
     regs.p.n = !!(regs.x.w & 0x8000);
     regs.p.z = (regs.x.w == 0);
   }
-}
+} break;
 
-void sCPU::op_iny() {
+//iny
+case 0xc8: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.y.l++;
     regs.p.n = !!(regs.y.l & 0x80);
@@ -38,11 +41,12 @@ void sCPU::op_iny() {
     regs.p.n = !!(regs.y.w & 0x8000);
     regs.p.z = (regs.y.w == 0);
   }
-}
+} break;
 
-void sCPU::op_dec() {
+//dec
+case 0x3a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.a.l--;
     regs.p.n = !!(regs.a.l & 0x80);
@@ -52,11 +56,12 @@ void sCPU::op_dec() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_dex() {
+//dex
+case 0xca: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.x.l--;
     regs.p.n = !!(regs.x.l & 0x80);
@@ -66,11 +71,12 @@ void sCPU::op_dex() {
     regs.p.n = !!(regs.x.w & 0x8000);
     regs.p.z = (regs.x.w == 0);
   }
-}
+} break;
 
-void sCPU::op_dey() {
+//dey
+case 0x88: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.x) {
     regs.y.l--;
     regs.p.n = !!(regs.y.l & 0x80);
@@ -80,11 +86,12 @@ void sCPU::op_dey() {
     regs.p.n = !!(regs.y.w & 0x8000);
     regs.p.z = (regs.y.w == 0);
   }
-}
+} break;
 
-void sCPU::op_asl() {
+//asl
+case 0x0a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.p.c = !!(regs.a.l & 0x80);
     regs.a.l <<= 1;
@@ -96,11 +103,12 @@ void sCPU::op_asl() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_lsr() {
+//lsr
+case 0x4a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   if(regs.p.m) {
     regs.p.c = regs.a.l & 1;
     regs.a.l >>= 1;
@@ -112,11 +120,12 @@ void sCPU::op_lsr() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_rol() {
+//rol
+case 0x2a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   uint16 c = regs.p.c;
   if(regs.p.m) {
     regs.p.c = !!(regs.a.l & 0x80);
@@ -131,402 +140,431 @@ void sCPU::op_rol() {
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_ror() {
+//ror
+case 0x6a: {
   last_cycle();
-  op_io();
+  op_io_irq();
   uint16 c;
   if(regs.p.m) {
-    c = (regs.p.c)?0x80:0;
+    c = regs.p.c ? 0x80 : 0;
     regs.p.c = regs.a.l & 1;
     regs.a.l >>= 1;
     regs.a.l |= c;
     regs.p.n = !!(regs.a.l & 0x80);
     regs.p.z = (regs.a.l == 0);
   } else {
-    c = (regs.p.c)?0x8000:0;
+    c = regs.p.c ? 0x8000 : 0;
     regs.p.c = regs.a.w & 1;
     regs.a.w >>= 1;
     regs.a.w |= c;
     regs.p.n = !!(regs.a.w & 0x8000);
     regs.p.z = (regs.a.w == 0);
   }
-}
+} break;
 
-void sCPU::op_inc_addr() {
+//inc_addr
+case 0xee: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_inc_b(); }
   else { op_inc_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_dec_addr() {
+//dec_addr
+case 0xce: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_dec_b(); }
   else { op_dec_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_asl_addr() {
+//asl_addr
+case 0x0e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_asl_b(); }
   else { op_asl_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_lsr_addr() {
+//lsr_addr
+case 0x4e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_lsr_b(); }
   else { op_lsr_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_rol_addr() {
+//rol_addr
+case 0x2e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_rol_b(); }
   else { op_rol_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_ror_addr() {
+//ror_addr
+case 0x6e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_ror_b(); }
   else { op_ror_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_trb_addr() {
+//trb_addr
+case 0x1c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_trb_b(); }
   else { op_trb_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_tsb_addr() {
+//tsb_addr
+case 0x0c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   rd.l = op_readdbr(aa.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + 1);
   op_io();
   if(regs.p.m) { op_tsb_b(); }
   else { op_tsb_w();
   op_writedbr(aa.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w,     rd.l);
-}
+} break;
 
-void sCPU::op_inc_addrx() {
+//inc_addrx
+case 0xfe: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_inc_b(); }
   else { op_inc_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_dec_addrx() {
+//dec_addrx
+case 0xde: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_dec_b(); }
   else { op_dec_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_asl_addrx() {
+//asl_addrx
+case 0x1e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_asl_b(); }
   else { op_asl_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_lsr_addrx() {
+//lsr_addrx
+case 0x5e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_lsr_b(); }
   else { op_lsr_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_rol_addrx() {
+//rol_addrx
+case 0x3e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_rol_b(); }
   else { op_rol_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_ror_addrx() {
+//ror_addrx
+case 0x7e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
   rd.l = op_readdbr(aa.w + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdbr(aa.w + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdbr(aa.w + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_ror_b(); }
   else { op_ror_w();
   op_writedbr(aa.w + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedbr(aa.w + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_inc_dp() {
+//inc_dp
+case 0xe6: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_inc_b(); }
   else { op_inc_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_dec_dp() {
+//dec_dp
+case 0xc6: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_dec_b(); }
   else { op_dec_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_asl_dp() {
+//asl_dp
+case 0x06: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_asl_b(); }
   else { op_asl_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_lsr_dp() {
+//lsr_dp
+case 0x46: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_lsr_b(); }
   else { op_lsr_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_rol_dp() {
+//rol_dp
+case 0x26: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_rol_b(); }
   else { op_rol_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_ror_dp() {
+//ror_dp
+case 0x66: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_ror_b(); }
   else { op_ror_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_trb_dp() {
+//trb_dp
+case 0x14: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_trb_b(); }
   else { op_trb_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_tsb_dp() {
+//tsb_dp
+case 0x04: {
   dp = op_readpc();
   op_io_cond2();
   rd.l = op_readdp(dp);
-  if(!regs.p.m)rd.h = op_readdp(dp + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + 1);
   op_io();
   if(regs.p.m) { op_tsb_b(); }
   else { op_tsb_w();
   op_writedp(dp + 1, rd.h); }
   last_cycle();
   op_writedp(dp,     rd.l);
-}
+} break;
 
-void sCPU::op_inc_dpx() {
+//inc_dpx
+case 0xf6: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_inc_b(); }
   else { op_inc_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_dec_dpx() {
+//dec_dpx
+case 0xd6: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_dec_b(); }
   else { op_dec_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_asl_dpx() {
+//asl_dpx
+case 0x16: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_asl_b(); }
   else { op_asl_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_lsr_dpx() {
+//lsr_dpx
+case 0x56: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_lsr_b(); }
   else { op_lsr_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_rol_dpx() {
+//rol_dpx
+case 0x36: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_rol_b(); }
   else { op_rol_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 
-void sCPU::op_ror_dpx() {
+//ror_dpx
+case 0x76: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   rd.l = op_readdp(dp + regs.x.w);
-  if(!regs.p.m)rd.h = op_readdp(dp + regs.x.w + 1);
+  if(!regs.p.m) rd.h = op_readdp(dp + regs.x.w + 1);
   op_io();
   if(regs.p.m) { op_ror_b(); }
   else { op_ror_w();
   op_writedp(dp + regs.x.w + 1, rd.h); }
   last_cycle();
   op_writedp(dp + regs.x.w,     rd.l);
-}
+} break;
 

src/cpu/scpu/core/op_write.b

@@ -4,9 +4,9 @@ sty_addr(0x8c, regs.p.x, regs.y.w),
 stz_addr(0x9c, regs.p.m, 0x0000) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
-3:if($1)last_cycle();
+3:if($1) last_cycle();
   op_writedbr(aa.w,     $2);
-  if($1)end;
+  if($1) end;
 4:last_cycle();
   op_writedbr(aa.w + 1, $2 >> 8);
 }
@@ -16,9 +16,9 @@ stz_addrx(0x9e, regs.p.m, 0x0000) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:op_io();
-4:if($1)last_cycle();
+4:if($1) last_cycle();
   op_writedbr(aa.w + regs.x.w,     $2);
-  if($1)end;
+  if($1) end;
 5:last_cycle();
   op_writedbr(aa.w + regs.x.w + 1, $2 >> 8);
 }
@@ -27,9 +27,9 @@ sta_addry(0x99) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:op_io();
-4:if(regs.p.m)last_cycle();
+4:if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 5:last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
 }
@@ -38,9 +38,9 @@ sta_long(0x8f) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:aa.b = op_readpc();
-4:if(regs.p.m)last_cycle();
+4:if(regs.p.m) last_cycle();
   op_writelong(aa.d,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 5:last_cycle();
   op_writelong(aa.d + 1, regs.a.h);
 }
@@ -49,9 +49,9 @@ sta_longx(0x9f) {
 1:aa.l = op_readpc();
 2:aa.h = op_readpc();
 3:aa.b = op_readpc();
-4:if(regs.p.m)last_cycle();
+4:if(regs.p.m) last_cycle();
   op_writelong(aa.d + regs.x.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 5:last_cycle();
   op_writelong(aa.d + regs.x.w + 1, regs.a.h);
 }
@@ -62,9 +62,9 @@ sty_dp(0x84, regs.p.x, regs.y.w),
 stz_dp(0x64, regs.p.m, 0x0000) {
 1:dp = op_readpc();
 2:op_io_cond2();
-3:if($1)last_cycle();
+3:if($1) last_cycle();
   op_writedp(dp,     $2);
-  if($1)end;
+  if($1) end;
 4:last_cycle();
   op_writedp(dp + 1, $2 >> 8);
 }
@@ -75,9 +75,9 @@ stz_dpx(0x74, regs.p.m, 0x0000) {
 1:dp = op_readpc();
 2:op_io_cond2();
 3:op_io();
-4:if($1)last_cycle();
+4:if($1) last_cycle();
   op_writedp(dp + regs.x.w,     $2);
-  if($1)end;
+  if($1) end;
 5:last_cycle();
   op_writedp(dp + regs.x.w + 1, $2 >> 8);
 }
@@ -86,9 +86,9 @@ stx_dpy(0x96) {
 1:dp = op_readpc();
 2:op_io_cond2();
 3:op_io();
-4:if(regs.p.x)last_cycle();
+4:if(regs.p.x) last_cycle();
   op_writedp(dp + regs.y.w,     regs.x.l);
-  if(regs.p.x)end;
+  if(regs.p.x) end;
 5:last_cycle();
   op_writedp(dp + regs.y.w + 1, regs.x.h);
 }
@@ -98,9 +98,9 @@ sta_idp(0x92) {
 2:op_io_cond2();
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
-5:if(regs.p.m)last_cycle();
+5:if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 6:last_cycle();
   op_writedbr(aa.w + 1, regs.a.h);
 }
@@ -111,9 +111,9 @@ sta_ildp(0x87) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:aa.b = op_readdp(dp + 2);
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   op_writelong(aa.d,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 7:last_cycle();
   op_writelong(aa.d + 1, regs.a.h);
 }
@@ -124,9 +124,9 @@ sta_idpx(0x81) {
 3:op_io();
 4:aa.l = op_readdp(dp + regs.x.w);
 5:aa.h = op_readdp(dp + regs.x.w + 1);
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 7:last_cycle();
   op_writedbr(aa.w + 1, regs.a.h);
 }
@@ -137,9 +137,9 @@ sta_idpy(0x91) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:op_io();
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 7:last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
 }
@@ -150,9 +150,9 @@ sta_ildpy(0x97) {
 3:aa.l = op_readdp(dp);
 4:aa.h = op_readdp(dp + 1);
 5:aa.b = op_readdp(dp + 2);
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   op_writelong(aa.d + regs.y.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 7:last_cycle();
   op_writelong(aa.d + regs.y.w + 1, regs.a.h);
 }
@@ -160,9 +160,9 @@ sta_ildpy(0x97) {
 sta_sr(0x83) {
 1:sp = op_readpc();
 2:op_io();
-3:if(regs.p.m)last_cycle();
+3:if(regs.p.m) last_cycle();
   op_writesp(sp,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 4:last_cycle();
   op_writesp(sp + 1, regs.a.h);
 }
@@ -173,9 +173,9 @@ sta_isry(0x93) {
 3:aa.l = op_readsp(sp);
 4:aa.h = op_readsp(sp + 1);
 5:op_io();
-6:if(regs.p.m)last_cycle();
+6:if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)end;
+  if(regs.p.m) end;
 7:last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
 }

src/cpu/scpu/core/op_write.cpp

@@ -1,266 +1,290 @@
-void sCPU::op_sta_addr() {
+//sta_addr
+case 0x8d: {
   aa.l = op_readpc();
   aa.h = op_readpc();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     regs.a.w);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + 1, regs.a.w >> 8);
-}
+} break;
 
-void sCPU::op_stx_addr() {
+//stx_addr
+case 0x8e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedbr(aa.w,     regs.x.w);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedbr(aa.w + 1, regs.x.w >> 8);
-}
+} break;
 
-void sCPU::op_sty_addr() {
+//sty_addr
+case 0x8c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedbr(aa.w,     regs.y.w);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedbr(aa.w + 1, regs.y.w >> 8);
-}
+} break;
 
-void sCPU::op_stz_addr() {
+//stz_addr
+case 0x9c: {
   aa.l = op_readpc();
   aa.h = op_readpc();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     0x0000);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + 1, 0x0000 >> 8);
-}
+} break;
 
-void sCPU::op_sta_addrx() {
+//sta_addrx
+case 0x9d: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.x.w,     regs.a.w);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + regs.x.w + 1, regs.a.w >> 8);
-}
+} break;
 
-void sCPU::op_stz_addrx() {
+//stz_addrx
+case 0x9e: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.x.w,     0x0000);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + regs.x.w + 1, 0x0000 >> 8);
-}
+} break;
 
-void sCPU::op_sta_addry() {
+//sta_addry
+case 0x99: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_long() {
+//sta_long
+case 0x8f: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   aa.b = op_readpc();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writelong(aa.d,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writelong(aa.d + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_longx() {
+//sta_longx
+case 0x9f: {
   aa.l = op_readpc();
   aa.h = op_readpc();
   aa.b = op_readpc();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writelong(aa.d + regs.x.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writelong(aa.d + regs.x.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_dp() {
+//sta_dp
+case 0x85: {
   dp = op_readpc();
   op_io_cond2();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedp(dp,     regs.a.w);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedp(dp + 1, regs.a.w >> 8);
-}
+} break;
 
-void sCPU::op_stx_dp() {
+//stx_dp
+case 0x86: {
   dp = op_readpc();
   op_io_cond2();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedp(dp,     regs.x.w);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedp(dp + 1, regs.x.w >> 8);
-}
+} break;
 
-void sCPU::op_sty_dp() {
+//sty_dp
+case 0x84: {
   dp = op_readpc();
   op_io_cond2();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedp(dp,     regs.y.w);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedp(dp + 1, regs.y.w >> 8);
-}
+} break;
 
-void sCPU::op_stz_dp() {
+//stz_dp
+case 0x64: {
   dp = op_readpc();
   op_io_cond2();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedp(dp,     0x0000);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedp(dp + 1, 0x0000 >> 8);
-}
+} break;
 
-void sCPU::op_sta_dpx() {
+//sta_dpx
+case 0x95: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedp(dp + regs.x.w,     regs.a.w);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedp(dp + regs.x.w + 1, regs.a.w >> 8);
-}
+} break;
 
-void sCPU::op_sty_dpx() {
+//sty_dpx
+case 0x94: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedp(dp + regs.x.w,     regs.y.w);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedp(dp + regs.x.w + 1, regs.y.w >> 8);
-}
+} break;
 
-void sCPU::op_stz_dpx() {
+//stz_dpx
+case 0x74: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedp(dp + regs.x.w,     0x0000);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedp(dp + regs.x.w + 1, 0x0000 >> 8);
-}
+} break;
 
-void sCPU::op_stx_dpy() {
+//stx_dpy
+case 0x96: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
-  if(regs.p.x)last_cycle();
+  if(regs.p.x) last_cycle();
   op_writedp(dp + regs.y.w,     regs.x.l);
-  if(regs.p.x)return;
+  if(regs.p.x) break;
   last_cycle();
   op_writedp(dp + regs.y.w + 1, regs.x.h);
-}
+} break;
 
-void sCPU::op_sta_idp() {
+//sta_idp
+case 0x92: {
   dp = op_readpc();
   op_io_cond2();
   aa.l = op_readdp(dp);
   aa.h = op_readdp(dp + 1);
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_ildp() {
+//sta_ildp
+case 0x87: {
   dp = op_readpc();
   op_io_cond2();
   aa.l = op_readdp(dp);
   aa.h = op_readdp(dp + 1);
   aa.b = op_readdp(dp + 2);
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writelong(aa.d,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writelong(aa.d + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_idpx() {
+//sta_idpx
+case 0x81: {
   dp = op_readpc();
   op_io_cond2();
   op_io();
   aa.l = op_readdp(dp + regs.x.w);
   aa.h = op_readdp(dp + regs.x.w + 1);
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_idpy() {
+//sta_idpy
+case 0x91: {
   dp = op_readpc();
   op_io_cond2();
   aa.l = op_readdp(dp);
   aa.h = op_readdp(dp + 1);
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_ildpy() {
+//sta_ildpy
+case 0x97: {
   dp = op_readpc();
   op_io_cond2();
   aa.l = op_readdp(dp);
   aa.h = op_readdp(dp + 1);
   aa.b = op_readdp(dp + 2);
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writelong(aa.d + regs.y.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writelong(aa.d + regs.y.w + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_sr() {
+//sta_sr
+case 0x83: {
   sp = op_readpc();
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writesp(sp,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writesp(sp + 1, regs.a.h);
-}
+} break;
 
-void sCPU::op_sta_isry() {
+//sta_isry
+case 0x93: {
   sp = op_readpc();
   op_io();
   aa.l = op_readsp(sp);
   aa.h = op_readsp(sp + 1);
   op_io();
-  if(regs.p.m)last_cycle();
+  if(regs.p.m) last_cycle();
   op_writedbr(aa.w + regs.y.w,     regs.a.l);
-  if(regs.p.m)return;
+  if(regs.p.m) break;
   last_cycle();
   op_writedbr(aa.w + regs.y.w + 1, regs.a.h);
-}
+} break;
 

src/cpu/scpu/core/optable.cpp

@@ -1,256 +0,0 @@
-optbl[0x69] = &sCPU::op_adc_const;
-optbl[0x29] = &sCPU::op_and_const;
-optbl[0xc9] = &sCPU::op_cmp_const;
-optbl[0xe0] = &sCPU::op_cpx_const;
-optbl[0xc0] = &sCPU::op_cpy_const;
-optbl[0x49] = &sCPU::op_eor_const;
-optbl[0xa9] = &sCPU::op_lda_const;
-optbl[0xa2] = &sCPU::op_ldx_const;
-optbl[0xa0] = &sCPU::op_ldy_const;
-optbl[0x09] = &sCPU::op_ora_const;
-optbl[0xe9] = &sCPU::op_sbc_const;
-optbl[0x6d] = &sCPU::op_adc_addr;
-optbl[0x2d] = &sCPU::op_and_addr;
-optbl[0x2c] = &sCPU::op_bit_addr;
-optbl[0xcd] = &sCPU::op_cmp_addr;
-optbl[0xec] = &sCPU::op_cpx_addr;
-optbl[0xcc] = &sCPU::op_cpy_addr;
-optbl[0x4d] = &sCPU::op_eor_addr;
-optbl[0xad] = &sCPU::op_lda_addr;
-optbl[0xae] = &sCPU::op_ldx_addr;
-optbl[0xac] = &sCPU::op_ldy_addr;
-optbl[0x0d] = &sCPU::op_ora_addr;
-optbl[0xed] = &sCPU::op_sbc_addr;
-optbl[0x7d] = &sCPU::op_adc_addrx;
-optbl[0x3d] = &sCPU::op_and_addrx;
-optbl[0x3c] = &sCPU::op_bit_addrx;
-optbl[0xdd] = &sCPU::op_cmp_addrx;
-optbl[0x5d] = &sCPU::op_eor_addrx;
-optbl[0xbd] = &sCPU::op_lda_addrx;
-optbl[0xbc] = &sCPU::op_ldy_addrx;
-optbl[0x1d] = &sCPU::op_ora_addrx;
-optbl[0xfd] = &sCPU::op_sbc_addrx;
-optbl[0x79] = &sCPU::op_adc_addry;
-optbl[0x39] = &sCPU::op_and_addry;
-optbl[0xd9] = &sCPU::op_cmp_addry;
-optbl[0x59] = &sCPU::op_eor_addry;
-optbl[0xb9] = &sCPU::op_lda_addry;
-optbl[0xbe] = &sCPU::op_ldx_addry;
-optbl[0x19] = &sCPU::op_ora_addry;
-optbl[0xf9] = &sCPU::op_sbc_addry;
-optbl[0x6f] = &sCPU::op_adc_long;
-optbl[0x2f] = &sCPU::op_and_long;
-optbl[0xcf] = &sCPU::op_cmp_long;
-optbl[0x4f] = &sCPU::op_eor_long;
-optbl[0xaf] = &sCPU::op_lda_long;
-optbl[0x0f] = &sCPU::op_ora_long;
-optbl[0xef] = &sCPU::op_sbc_long;
-optbl[0x7f] = &sCPU::op_adc_longx;
-optbl[0x3f] = &sCPU::op_and_longx;
-optbl[0xdf] = &sCPU::op_cmp_longx;
-optbl[0x5f] = &sCPU::op_eor_longx;
-optbl[0xbf] = &sCPU::op_lda_longx;
-optbl[0x1f] = &sCPU::op_ora_longx;
-optbl[0xff] = &sCPU::op_sbc_longx;
-optbl[0x65] = &sCPU::op_adc_dp;
-optbl[0x25] = &sCPU::op_and_dp;
-optbl[0x24] = &sCPU::op_bit_dp;
-optbl[0xc5] = &sCPU::op_cmp_dp;
-optbl[0xe4] = &sCPU::op_cpx_dp;
-optbl[0xc4] = &sCPU::op_cpy_dp;
-optbl[0x45] = &sCPU::op_eor_dp;
-optbl[0xa5] = &sCPU::op_lda_dp;
-optbl[0xa6] = &sCPU::op_ldx_dp;
-optbl[0xa4] = &sCPU::op_ldy_dp;
-optbl[0x05] = &sCPU::op_ora_dp;
-optbl[0xe5] = &sCPU::op_sbc_dp;
-optbl[0x75] = &sCPU::op_adc_dpx;
-optbl[0x35] = &sCPU::op_and_dpx;
-optbl[0x34] = &sCPU::op_bit_dpx;
-optbl[0xd5] = &sCPU::op_cmp_dpx;
-optbl[0x55] = &sCPU::op_eor_dpx;
-optbl[0xb5] = &sCPU::op_lda_dpx;
-optbl[0xb4] = &sCPU::op_ldy_dpx;
-optbl[0x15] = &sCPU::op_ora_dpx;
-optbl[0xf5] = &sCPU::op_sbc_dpx;
-optbl[0xb6] = &sCPU::op_ldx_dpy;
-optbl[0x72] = &sCPU::op_adc_idp;
-optbl[0x32] = &sCPU::op_and_idp;
-optbl[0xd2] = &sCPU::op_cmp_idp;
-optbl[0x52] = &sCPU::op_eor_idp;
-optbl[0xb2] = &sCPU::op_lda_idp;
-optbl[0x12] = &sCPU::op_ora_idp;
-optbl[0xf2] = &sCPU::op_sbc_idp;
-optbl[0x61] = &sCPU::op_adc_idpx;
-optbl[0x21] = &sCPU::op_and_idpx;
-optbl[0xc1] = &sCPU::op_cmp_idpx;
-optbl[0x41] = &sCPU::op_eor_idpx;
-optbl[0xa1] = &sCPU::op_lda_idpx;
-optbl[0x01] = &sCPU::op_ora_idpx;
-optbl[0xe1] = &sCPU::op_sbc_idpx;
-optbl[0x71] = &sCPU::op_adc_idpy;
-optbl[0x31] = &sCPU::op_and_idpy;
-optbl[0xd1] = &sCPU::op_cmp_idpy;
-optbl[0x51] = &sCPU::op_eor_idpy;
-optbl[0xb1] = &sCPU::op_lda_idpy;
-optbl[0x11] = &sCPU::op_ora_idpy;
-optbl[0xf1] = &sCPU::op_sbc_idpy;
-optbl[0x67] = &sCPU::op_adc_ildp;
-optbl[0x27] = &sCPU::op_and_ildp;
-optbl[0xc7] = &sCPU::op_cmp_ildp;
-optbl[0x47] = &sCPU::op_eor_ildp;
-optbl[0xa7] = &sCPU::op_lda_ildp;
-optbl[0x07] = &sCPU::op_ora_ildp;
-optbl[0xe7] = &sCPU::op_sbc_ildp;
-optbl[0x77] = &sCPU::op_adc_ildpy;
-optbl[0x37] = &sCPU::op_and_ildpy;
-optbl[0xd7] = &sCPU::op_cmp_ildpy;
-optbl[0x57] = &sCPU::op_eor_ildpy;
-optbl[0xb7] = &sCPU::op_lda_ildpy;
-optbl[0x17] = &sCPU::op_ora_ildpy;
-optbl[0xf7] = &sCPU::op_sbc_ildpy;
-optbl[0x63] = &sCPU::op_adc_sr;
-optbl[0x23] = &sCPU::op_and_sr;
-optbl[0xc3] = &sCPU::op_cmp_sr;
-optbl[0x43] = &sCPU::op_eor_sr;
-optbl[0xa3] = &sCPU::op_lda_sr;
-optbl[0x03] = &sCPU::op_ora_sr;
-optbl[0xe3] = &sCPU::op_sbc_sr;
-optbl[0x73] = &sCPU::op_adc_isry;
-optbl[0x33] = &sCPU::op_and_isry;
-optbl[0xd3] = &sCPU::op_cmp_isry;
-optbl[0x53] = &sCPU::op_eor_isry;
-optbl[0xb3] = &sCPU::op_lda_isry;
-optbl[0x13] = &sCPU::op_ora_isry;
-optbl[0xf3] = &sCPU::op_sbc_isry;
-optbl[0x89] = &sCPU::op_bit_const;
-optbl[0x8d] = &sCPU::op_sta_addr;
-optbl[0x8e] = &sCPU::op_stx_addr;
-optbl[0x8c] = &sCPU::op_sty_addr;
-optbl[0x9c] = &sCPU::op_stz_addr;
-optbl[0x9d] = &sCPU::op_sta_addrx;
-optbl[0x9e] = &sCPU::op_stz_addrx;
-optbl[0x99] = &sCPU::op_sta_addry;
-optbl[0x8f] = &sCPU::op_sta_long;
-optbl[0x9f] = &sCPU::op_sta_longx;
-optbl[0x85] = &sCPU::op_sta_dp;
-optbl[0x86] = &sCPU::op_stx_dp;
-optbl[0x84] = &sCPU::op_sty_dp;
-optbl[0x64] = &sCPU::op_stz_dp;
-optbl[0x95] = &sCPU::op_sta_dpx;
-optbl[0x94] = &sCPU::op_sty_dpx;
-optbl[0x74] = &sCPU::op_stz_dpx;
-optbl[0x96] = &sCPU::op_stx_dpy;
-optbl[0x92] = &sCPU::op_sta_idp;
-optbl[0x87] = &sCPU::op_sta_ildp;
-optbl[0x81] = &sCPU::op_sta_idpx;
-optbl[0x91] = &sCPU::op_sta_idpy;
-optbl[0x97] = &sCPU::op_sta_ildpy;
-optbl[0x83] = &sCPU::op_sta_sr;
-optbl[0x93] = &sCPU::op_sta_isry;
-optbl[0x1a] = &sCPU::op_inc;
-optbl[0xe8] = &sCPU::op_inx;
-optbl[0xc8] = &sCPU::op_iny;
-optbl[0x3a] = &sCPU::op_dec;
-optbl[0xca] = &sCPU::op_dex;
-optbl[0x88] = &sCPU::op_dey;
-optbl[0x0a] = &sCPU::op_asl;
-optbl[0x4a] = &sCPU::op_lsr;
-optbl[0x2a] = &sCPU::op_rol;
-optbl[0x6a] = &sCPU::op_ror;
-optbl[0xee] = &sCPU::op_inc_addr;
-optbl[0xce] = &sCPU::op_dec_addr;
-optbl[0x0e] = &sCPU::op_asl_addr;
-optbl[0x4e] = &sCPU::op_lsr_addr;
-optbl[0x2e] = &sCPU::op_rol_addr;
-optbl[0x6e] = &sCPU::op_ror_addr;
-optbl[0x1c] = &sCPU::op_trb_addr;
-optbl[0x0c] = &sCPU::op_tsb_addr;
-optbl[0xfe] = &sCPU::op_inc_addrx;
-optbl[0xde] = &sCPU::op_dec_addrx;
-optbl[0x1e] = &sCPU::op_asl_addrx;
-optbl[0x5e] = &sCPU::op_lsr_addrx;
-optbl[0x3e] = &sCPU::op_rol_addrx;
-optbl[0x7e] = &sCPU::op_ror_addrx;
-optbl[0xe6] = &sCPU::op_inc_dp;
-optbl[0xc6] = &sCPU::op_dec_dp;
-optbl[0x06] = &sCPU::op_asl_dp;
-optbl[0x46] = &sCPU::op_lsr_dp;
-optbl[0x26] = &sCPU::op_rol_dp;
-optbl[0x66] = &sCPU::op_ror_dp;
-optbl[0x14] = &sCPU::op_trb_dp;
-optbl[0x04] = &sCPU::op_tsb_dp;
-optbl[0xf6] = &sCPU::op_inc_dpx;
-optbl[0xd6] = &sCPU::op_dec_dpx;
-optbl[0x16] = &sCPU::op_asl_dpx;
-optbl[0x56] = &sCPU::op_lsr_dpx;
-optbl[0x36] = &sCPU::op_rol_dpx;
-optbl[0x76] = &sCPU::op_ror_dpx;
-optbl[0x90] = &sCPU::op_bcc;
-optbl[0xb0] = &sCPU::op_bcs;
-optbl[0xd0] = &sCPU::op_bne;
-optbl[0xf0] = &sCPU::op_beq;
-optbl[0x10] = &sCPU::op_bpl;
-optbl[0x30] = &sCPU::op_bmi;
-optbl[0x50] = &sCPU::op_bvc;
-optbl[0x70] = &sCPU::op_bvs;
-optbl[0x80] = &sCPU::op_bra;
-optbl[0x82] = &sCPU::op_brl;
-optbl[0x4c] = &sCPU::op_jmp_addr;
-optbl[0x5c] = &sCPU::op_jmp_long;
-optbl[0x6c] = &sCPU::op_jmp_iaddr;
-optbl[0x7c] = &sCPU::op_jmp_iaddrx;
-optbl[0xdc] = &sCPU::op_jmp_iladdr;
-optbl[0x20] = &sCPU::op_jsr_addr;
-optbl[0x22] = &sCPU::op_jsr_long;
-optbl[0xfc] = &sCPU::op_jsr_iaddrx;
-optbl[0x40] = &sCPU::op_rti;
-optbl[0x60] = &sCPU::op_rts;
-optbl[0x6b] = &sCPU::op_rtl;
-optbl[0xea] = &sCPU::op_nop;
-optbl[0x42] = &sCPU::op_wdm;
-optbl[0xeb] = &sCPU::op_xba;
-optbl[0x54] = &sCPU::op_mvn;
-optbl[0x44] = &sCPU::op_mvp;
-optbl[0x00] = &sCPU::op_brk;
-optbl[0x02] = &sCPU::op_cop;
-optbl[0xdb] = &sCPU::op_stp;
-optbl[0xcb] = &sCPU::op_wai;
-optbl[0xfb] = &sCPU::op_xce;
-optbl[0x18] = &sCPU::op_clc;
-optbl[0xd8] = &sCPU::op_cld;
-optbl[0x58] = &sCPU::op_cli;
-optbl[0xb8] = &sCPU::op_clv;
-optbl[0x38] = &sCPU::op_sec;
-optbl[0xf8] = &sCPU::op_sed;
-optbl[0x78] = &sCPU::op_sei;
-optbl[0xc2] = &sCPU::op_rep;
-optbl[0xe2] = &sCPU::op_sep;
-optbl[0xaa] = &sCPU::op_tax;
-optbl[0xa8] = &sCPU::op_tay;
-optbl[0x8a] = &sCPU::op_txa;
-optbl[0x9b] = &sCPU::op_txy;
-optbl[0x98] = &sCPU::op_tya;
-optbl[0xbb] = &sCPU::op_tyx;
-optbl[0x5b] = &sCPU::op_tcd;
-optbl[0x1b] = &sCPU::op_tcs;
-optbl[0x7b] = &sCPU::op_tdc;
-optbl[0x3b] = &sCPU::op_tsc;
-optbl[0xba] = &sCPU::op_tsx;
-optbl[0x9a] = &sCPU::op_txs;
-optbl[0x48] = &sCPU::op_pha;
-optbl[0xda] = &sCPU::op_phx;
-optbl[0x5a] = &sCPU::op_phy;
-optbl[0x0b] = &sCPU::op_phd;
-optbl[0x8b] = &sCPU::op_phb;
-optbl[0x4b] = &sCPU::op_phk;
-optbl[0x08] = &sCPU::op_php;
-optbl[0x68] = &sCPU::op_pla;
-optbl[0xfa] = &sCPU::op_plx;
-optbl[0x7a] = &sCPU::op_ply;
-optbl[0x2b] = &sCPU::op_pld;
-optbl[0xab] = &sCPU::op_plb;
-optbl[0x28] = &sCPU::op_plp;
-optbl[0xf4] = &sCPU::op_pea;
-optbl[0xd4] = &sCPU::op_pei;
-optbl[0x62] = &sCPU::op_per;

src/cpu/scpu/core/scpugen.cpp

@@ -1,18 +1,12 @@
 #define CLASS_NAME "sCPU"
-#include "../../../lib/opgen_so.cpp"
+#include <tool/opgen_switch.cpp>
 
 int main() {
-  fph = fopen("op.h", "wb");
-  fpt = fopen("optable.cpp", "wb");
-
   generate("op_read.cpp",  "op_read.b");
   generate("op_write.cpp", "op_write.b");
   generate("op_rmw.cpp",   "op_rmw.b");
   generate("op_pc.cpp",    "op_pc.b");
   generate("op_misc.cpp",  "op_misc.b");
 
-  fclose(fph);
-  fclose(fpt);
-
   return 0;
 }

src/cpu/scpu/scpu.cpp

@@ -48,7 +48,6 @@ void sCPU::reset() {
 }
 
 sCPU::sCPU() {
-  #include "core/optable.cpp"
 }
 
 sCPU::~sCPU() {

src/cpu/scpu/timing/timing.cpp

@@ -124,38 +124,17 @@ void sCPU::cycle_edge() {
     }
   }
 
-  switch(status.dma_state) {
-    case DMASTATE_INACTIVE: break;
-
-    case DMASTATE_DMASYNC: {
-      status.dma_state = DMASTATE_RUN;
-    } break;
-
-    case DMASTATE_RUN: {
-      status.dma_state = DMASTATE_CPUSYNC;
-      status.dma_clocks = 8 - dma_counter() + 8;
-      add_clocks(status.dma_clocks);
-
-      if(status.hdmainit_pending) { hdma_init(); status.hdmainit_pending = false; }
-      if(status.hdma_pending)     { hdma_run();  status.hdma_pending     = false; }
-      if(status.dma_pending)      { dma_run();   status.dma_pending      = false; }
-
-    } break;
-  }
-
   if(status.hdmainit_triggered == false) {
     if(status.hcounter >= status.hdmainit_trigger_position || status.vcounter) {
       status.hdmainit_triggered = true;
       hdma_init_reset();
       if(hdma_enabled_channels()) {
-        add_clocks(18);
-        hdma_init();
-      //if(status.dma_state == DMASTATE_INACTIVE) {
-      //  status.dma_state = DMASTATE_DMASYNC;
-      //  status.hdmainit_pending = true;
-      //} else {
-      //  hdma_init();
-      //}
+        if(status.dma_state == DMASTATE_INACTIVE) {
+          status.dma_state = DMASTATE_DMASYNC;
+          status.hdmainit_pending = true;
+        } else {
+          hdma_init();
+        }
       }
     }
   }
@@ -164,16 +143,33 @@ void sCPU::cycle_edge() {
     if(status.hcounter >= 1106) {
       status.hdma_triggered = true;
       if(hdma_active_channels()) {
-        add_clocks(18);
-        hdma_run();
-      //if(status.dma_state == DMASTATE_INACTIVE) {
-      //  status.dma_state = DMASTATE_DMASYNC;
-      //  status.hdma_pending = true;
-      //} else {
-      //  hdma_run();
-      //}
+        if(status.dma_state == DMASTATE_INACTIVE) {
+          status.dma_state = DMASTATE_DMASYNC;
+          status.hdma_pending = true;
+        } else {
+          hdma_run();
+        }
       }
     }
+  }
+
+  switch(status.dma_state) {
+    case DMASTATE_INACTIVE: break;
+
+    case DMASTATE_DMASYNC: {
+      status.dma_state = DMASTATE_RUN;
+    } break;
+
+    case DMASTATE_RUN: {
+      status.dma_state = DMASTATE_CPUSYNC;
+      status.dma_clocks = 8 - dma_counter() + 8;
+      add_clocks(status.dma_clocks);
+
+      if(status.hdmainit_pending) { hdma_init(); status.hdmainit_pending = false; }
+      if(status.hdma_pending)     { hdma_run();  status.hdma_pending     = false; }
+      if(status.dma_pending)      { dma_run();   status.dma_pending      = false; }
+
+    } break;
   }
 }
 

src/dsp/sdsp/brr.cpp

@@ -7,15 +7,13 @@ void sDSP::brr_decode(voice_t &v) {
   const int filter = (state.t_brr_header >> 2) & 3;
   const int scale  = (state.t_brr_header >> 4);
 
-  //write to next four samples in circular buffer
-  int *pos = &v.buf[v.buf_pos];
-  v.buf_pos += 4;
-  if(v.buf_pos >= brr_buf_size) v.buf_pos = 0;
-
   //decode four samples
-  for(int *end = pos + 4; pos < end; pos++) {
-    int s = sclip<4>(nybbles >> 12); //extract upper nybble and sign extend
-    nybbles <<= 4;                   //advance nybble position
+  for(unsigned i = 0; i < 4; i++) {
+    //bits 12-15 = current nybble; sign extend, then shift right to 4-bit precision
+    //result: s = 4-bit sign-extended sample value
+    int s = (int16)nybbles >> 12;
+    nybbles <<= 4; //slide nybble so that on next loop iteration, bits 12-15 = current nybble
+
     if(scale <= 12) {
       s <<= scale;
       s >>= 1;
@@ -24,8 +22,8 @@ void sDSP::brr_decode(voice_t &v) {
     }
 
     //apply IIR filter (2 is the most commonly used)
-    const int p1 = pos[brr_buf_size - 1];
-    const int p2 = pos[brr_buf_size - 2] >> 1;
+    const int p1 = v.buffer[v.buf_pos - 1];
+    const int p2 = v.buffer[v.buf_pos - 2] >> 1;
 
     switch(filter) {
       case 0: break; //no filter
@@ -55,8 +53,9 @@ void sDSP::brr_decode(voice_t &v) {
 
     //adjust and write sample
     s = sclamp<16>(s);
-    s = sclip<16>(s << 1);
-    pos[brr_buf_size] = pos[0] = s; //second copy simplifies wrap-around
+    s = (int16)(s << 1);
+    v.buffer.write(v.buf_pos++, s);
+    if(v.buf_pos >= brr_buf_size) v.buf_pos = 0;
   }
 }
 

src/dsp/sdsp/echo.cpp

@@ -1,32 +1,27 @@
 #ifdef SDSP_CPP
 
-//current echo buffer pointer for left/right channel
-#define ECHO_PTR(ch) (&ram[state.t_echo_ptr + ch * 2])
-
-//sample in echo history buffer, where 0 is the oldest
-#define ECHO_FIR(i) state.echo_hist_pos[i]
-
-//calculate FIR point for left/right channel
-#define CALC_FIR(i, ch) ((ECHO_FIR(i + 1)[ch] * (int8)REG(fir + i * 0x10)) >> 6)
-
-void sDSP::echo_read(bool channel) {
-  uint8 *in = ECHO_PTR(channel);
-  int s = (int8)in[1] * 0x100 + in[0];
-  //second copy simplifies wrap-around handling
-  ECHO_FIR(0)[channel] = ECHO_FIR(8)[channel] = s >> 1;
+int sDSP::calc_fir(int i, bool channel) {
+  int s = state.echo_hist[channel][state.echo_hist_pos + i + 1];
+  return (s * (int8)REG(fir + i * 0x10)) >> 6;
 }
 
 int sDSP::echo_output(bool channel) {
-  int output = sclip<16>((state.t_main_out[channel] * (int8)REG(mvoll + channel * 0x10)) >> 7)
-             + sclip<16>((state.t_echo_in [channel] * (int8)REG(evoll + channel * 0x10)) >> 7);
+  int output = (int16)((state.t_main_out[channel] * (int8)REG(mvoll + channel * 0x10)) >> 7)
+             + (int16)((state.t_echo_in [channel] * (int8)REG(evoll + channel * 0x10)) >> 7);
   return sclamp<16>(output);
 }
 
+void sDSP::echo_read(bool channel) {
+  uint8 *in = &ram[state.t_echo_ptr + channel * 2];
+  int s = (int16)((in[1] << 8) + in[0]);
+  state.echo_hist[channel].write(state.echo_hist_pos, s >> 1);
+}
+
 void sDSP::echo_write(bool channel) {
-  if(!(state.t_echo_enabled & 0x20)) {
-    uint8 *out = ECHO_PTR(channel);
+  if(!(state.t_echo_disabled & 0x20)) {
+    uint8 *out = &ram[state.t_echo_ptr + channel * 2];
     int s = state.t_echo_out[channel];
-    out[0] = (uint8)s;
+    out[0] = (uint8)(s);
     out[1] = (uint8)(s >> 8);
   }
 
@@ -36,22 +31,22 @@ void sDSP::echo_write(bool channel) {
 void sDSP::echo_22() {
   //history
   state.echo_hist_pos++;
-  if(state.echo_hist_pos >= &state.echo_hist[8]) state.echo_hist_pos = state.echo_hist;
+  if(state.echo_hist_pos >= echo_hist_size) state.echo_hist_pos = 0;
 
   state.t_echo_ptr = (uint16)((state.t_esa << 8) + state.echo_offset);
   echo_read(0);
 
   //FIR
-  int l = CALC_FIR(0, 0);
-  int r = CALC_FIR(0, 1);
+  int l = calc_fir(0, 0);
+  int r = calc_fir(0, 1);
 
   state.t_echo_in[0] = l;
   state.t_echo_in[1] = r;
 }
 
 void sDSP::echo_23() {
-  int l = CALC_FIR(1, 0) + CALC_FIR(2, 0);
-  int r = CALC_FIR(1, 1) + CALC_FIR(2, 1);
+  int l = calc_fir(1, 0) + calc_fir(2, 0);
+  int r = calc_fir(1, 1) + calc_fir(2, 1);
 
   state.t_echo_in[0] += l;
   state.t_echo_in[1] += r;
@@ -60,22 +55,22 @@ void sDSP::echo_23() {
 }
 
 void sDSP::echo_24() {
-  int l = CALC_FIR(3, 0) + CALC_FIR(4, 0) + CALC_FIR(5, 0);
-  int r = CALC_FIR(3, 1) + CALC_FIR(4, 1) + CALC_FIR(5, 1);
+  int l = calc_fir(3, 0) + calc_fir(4, 0) + calc_fir(5, 0);
+  int r = calc_fir(3, 1) + calc_fir(4, 1) + calc_fir(5, 1);
 
   state.t_echo_in[0] += l;
   state.t_echo_in[1] += r;
 }
 
 void sDSP::echo_25() {
-  int l = state.t_echo_in[0] + CALC_FIR(6, 0);
-  int r = state.t_echo_in[1] + CALC_FIR(6, 1);
+  int l = state.t_echo_in[0] + calc_fir(6, 0);
+  int r = state.t_echo_in[1] + calc_fir(6, 1);
 
-  l = sclip<16>(l);
-  r = sclip<16>(r);
+  l = (int16)l;
+  r = (int16)r;
 
-  l += (int16)CALC_FIR(7, 0);
-  r += (int16)CALC_FIR(7, 1);
+  l += (int16)calc_fir(7, 0);
+  r += (int16)calc_fir(7, 1);
 
   state.t_echo_in[0] = sclamp<16>(l) & ~1;
   state.t_echo_in[1] = sclamp<16>(r) & ~1;
@@ -87,8 +82,8 @@ void sDSP::echo_26() {
   state.t_main_out[0] = echo_output(0);
 
   //echo feedback
-  int l = state.t_echo_out[0] + sclip<16>((state.t_echo_in[0] * (int8)REG(efb)) >> 7);
-  int r = state.t_echo_out[1] + sclip<16>((state.t_echo_in[1] * (int8)REG(efb)) >> 7);
+  int l = state.t_echo_out[0] + (int16)((state.t_echo_in[0] * (int8)REG(efb)) >> 7);
+  int r = state.t_echo_out[1] + (int16)((state.t_echo_in[1] * (int8)REG(efb)) >> 7);
 
   state.t_echo_out[0] = sclamp<16>(l) & ~1;
   state.t_echo_out[1] = sclamp<16>(r) & ~1;
@@ -113,7 +108,7 @@ void sDSP::echo_27() {
 }
 
 void sDSP::echo_28() {
-  state.t_echo_enabled = REG(flg);
+  state.t_echo_disabled = REG(flg);
 }
 
 void sDSP::echo_29() {
@@ -127,7 +122,7 @@ void sDSP::echo_29() {
   //write left echo
   echo_write(0);
 
-  state.t_echo_enabled = REG(flg);
+  state.t_echo_disabled = REG(flg);
 }
 
 void sDSP::echo_30() {

src/dsp/sdsp/gaussian.cpp

@@ -41,13 +41,13 @@ int sDSP::gaussian_interpolate(const voice_t &v) {
   const int16 *fwd = gaussian_table + 255 - offset;
   const int16 *rev = gaussian_table       + offset; //mirror left half of gaussian table
 
-  const int* in = &v.buf[(v.interp_pos >> 12) + v.buf_pos];
+  offset = v.buf_pos + (v.interp_pos >> 12);
   int output;
-  output  = (fwd[  0] * in[0]) >> 11;
-  output += (fwd[256] * in[1]) >> 11;
-  output += (rev[256] * in[2]) >> 11;
-  output = sclip<16>(output);
-  output += (rev[  0] * in[3]) >> 11;
+  output  = (fwd[  0] * v.buffer[offset + 0]) >> 11;
+  output += (fwd[256] * v.buffer[offset + 1]) >> 11;
+  output += (rev[256] * v.buffer[offset + 2]) >> 11;
+  output  = (int16)output;
+  output += (rev[  0] * v.buffer[offset + 3]) >> 11;
   return sclamp<16>(output) & ~1;
 }
 

src/dsp/sdsp/sdsp.cpp

@@ -1,3 +1,4 @@
+
 /*
   S-DSP emulator
   license: LGPLv2
@@ -12,6 +13,18 @@
 #define REG(n) state.regs[r_##n]
 #define VREG(n) state.regs[v.vidx + v_##n]
 
+#if !defined(USE_STATE_MACHINE)
+  #define phase_start() while(true) {
+  #define phase(n)
+  #define tick()          scheduler.addclocks_dsp(3 * 8)
+  #define phase_end()   }
+#else
+  #define phase_start() switch(phase_index) {
+  #define phase(n)        case n:
+  #define tick()          scheduler.addclocks_dsp(3 * 8); break
+  #define phase_end()   } phase_index = (phase_index + 1) & 31;
+#endif
+
 #include "gaussian.cpp"
 #include "counter.cpp"
 #include "envelope.cpp"
@@ -23,198 +36,192 @@
 /* timing */
 
 void sDSP::enter() {
-  #define tick() scheduler.addclocks_dsp(3 * 8)
+  phase_start()
 
-  tick(); //temporary to sync with bDSP timing
+  phase(0)
+    voice_5(voice[0]);
+    voice_2(voice[1]);
+    tick();
 
-  loop:
+  phase(1)
+    voice_6(voice[0]);
+    voice_3(voice[1]);
+    tick();
 
-  // 0
-  voice_5(voice[0]);
-  voice_2(voice[1]);
-  tick();
+  phase(2)
+    voice_7(voice[0]);
+    voice_4(voice[1]);
+    voice_1(voice[3]);
+    tick();
 
-  // 1
-  voice_6(voice[0]);
-  voice_3(voice[1]);
-  tick();
+  phase(3)
+    voice_8(voice[0]);
+    voice_5(voice[1]);
+    voice_2(voice[2]);
+    tick();
 
-  // 2
-  voice_7(voice[0]);
-  voice_4(voice[1]);
-  voice_1(voice[3]);
-  tick();
+  phase(4)
+    voice_9(voice[0]);
+    voice_6(voice[1]);
+    voice_3(voice[2]);
+    tick();
 
-  // 3
-  voice_8(voice[0]);
-  voice_5(voice[1]);
-  voice_2(voice[2]);
-  tick();
+  phase(5)
+    voice_7(voice[1]);
+    voice_4(voice[2]);
+    voice_1(voice[4]);
+    tick();
 
-  // 4
-  voice_9(voice[0]);
-  voice_6(voice[1]);
-  voice_3(voice[2]);
-  tick();
+  phase(6)
+    voice_8(voice[1]);
+    voice_5(voice[2]);
+    voice_2(voice[3]);
+    tick();
 
-  // 5
-  voice_7(voice[1]);
-  voice_4(voice[2]);
-  voice_1(voice[4]);
-  tick();
+  phase(7)
+    voice_9(voice[1]);
+    voice_6(voice[2]);
+    voice_3(voice[3]);
+    tick();
 
-  // 6
-  voice_8(voice[1]);
-  voice_5(voice[2]);
-  voice_2(voice[3]);
-  tick();
+  phase(8)
+    voice_7(voice[2]);
+    voice_4(voice[3]);
+    voice_1(voice[5]);
+    tick();
 
-  // 7
-  voice_9(voice[1]);
-  voice_6(voice[2]);
-  voice_3(voice[3]);
-  tick();
+  phase(9)
+    voice_8(voice[2]);
+    voice_5(voice[3]);
+    voice_2(voice[4]);
+    tick();
 
-  // 8
-  voice_7(voice[2]);
-  voice_4(voice[3]);
-  voice_1(voice[5]);
-  tick();
+  phase(10)
+    voice_9(voice[2]);
+    voice_6(voice[3]);
+    voice_3(voice[4]);
+    tick();
 
-  // 9
-  voice_8(voice[2]);
-  voice_5(voice[3]);
-  voice_2(voice[4]);
-  tick();
+  phase(11)
+    voice_7(voice[3]);
+    voice_4(voice[4]);
+    voice_1(voice[6]);
+    tick();
 
-  //10
-  voice_9(voice[2]);
-  voice_6(voice[3]);
-  voice_3(voice[4]);
-  tick();
+  phase(12)
+    voice_8(voice[3]);
+    voice_5(voice[4]);
+    voice_2(voice[5]);
+    tick();
 
-  //11
-  voice_7(voice[3]);
-  voice_4(voice[4]);
-  voice_1(voice[6]);
-  tick();
+  phase(13)
+    voice_9(voice[3]);
+    voice_6(voice[4]);
+    voice_3(voice[5]);
+    tick();
 
-  //12
-  voice_8(voice[3]);
-  voice_5(voice[4]);
-  voice_2(voice[5]);
-  tick();
+  phase(14)
+    voice_7(voice[4]);
+    voice_4(voice[5]);
+    voice_1(voice[7]);
+    tick();
 
-  //13
-  voice_9(voice[3]);
-  voice_6(voice[4]);
-  voice_3(voice[5]);
-  tick();
+  phase(15)
+    voice_8(voice[4]);
+    voice_5(voice[5]);
+    voice_2(voice[6]);
+    tick();
 
-  //14
-  voice_7(voice[4]);
-  voice_4(voice[5]);
-  voice_1(voice[7]);
-  tick();
+  phase(16)
+    voice_9(voice[4]);
+    voice_6(voice[5]);
+    voice_3(voice[6]);
+    tick();
 
-  //15
-  voice_8(voice[4]);
-  voice_5(voice[5]);
-  voice_2(voice[6]);
-  tick();
+  phase(17)
+    voice_1(voice[0]);
+    voice_7(voice[5]);
+    voice_4(voice[6]);
+    tick();
 
-  //16
-  voice_9(voice[4]);
-  voice_6(voice[5]);
-  voice_3(voice[6]);
-  tick();
+  phase(18)
+    voice_8(voice[5]);
+    voice_5(voice[6]);
+    voice_2(voice[7]);
+    tick();
 
-  //17
-  voice_1(voice[0]);
-  voice_7(voice[5]);
-  voice_4(voice[6]);
-  tick();
+  phase(19)
+    voice_9(voice[5]);
+    voice_6(voice[6]);
+    voice_3(voice[7]);
+    tick();
 
-  //18
-  voice_8(voice[5]);
-  voice_5(voice[6]);
-  voice_2(voice[7]);
-  tick();
+  phase(20)
+    voice_1(voice[1]);
+    voice_7(voice[6]);
+    voice_4(voice[7]);
+    tick();
 
-  //19
-  voice_9(voice[5]);
-  voice_6(voice[6]);
-  voice_3(voice[7]);
-  tick();
+  phase(21)
+    voice_8(voice[6]);
+    voice_5(voice[7]);
+    voice_2(voice[0]);
+    tick();
 
-  //20
-  voice_1(voice[1]);
-  voice_7(voice[6]);
-  voice_4(voice[7]);
-  tick();
+  phase(22)
+    voice_3a(voice[0]);
+    voice_9(voice[6]);
+    voice_6(voice[7]);
+    echo_22();
+    tick();
 
-  //21
-  voice_8(voice[6]);
-  voice_5(voice[7]);
-  voice_2(voice[0]);
-  tick();
+  phase(23)
+    voice_7(voice[7]);
+    echo_23();
+    tick();
 
-  //22
-  voice_3a(voice[0]);
-  voice_9(voice[6]);
-  voice_6(voice[7]);
-  echo_22();
-  tick();
+  phase(24)
+    voice_8(voice[7]);
+    echo_24();
+    tick();
 
-  //23
-  voice_7(voice[7]);
-  echo_23();
-  tick();
+  phase(25)
+    voice_3b(voice[0]);
+    voice_9(voice[7]);
+    echo_25();
+    tick();
 
-  //24
-  voice_8(voice[7]);
-  echo_24();
-  tick();
+  phase(26)
+    echo_26();
+    tick();
 
-  //25
-  voice_3b(voice[0]);
-  voice_9(voice[7]);
-  echo_25();
-  tick();
+  phase(27)
+    misc_27();
+    echo_27();
+    tick();
 
-  //26
-  echo_26();
-  tick();
+  phase(28)
+    misc_28();
+    echo_28();
+    tick();
 
-  //27
-  misc_27();
-  echo_27();
-  tick();
+  phase(29)
+    misc_29();
+    echo_29();
+    tick();
 
-  //28
-  misc_28();
-  echo_28();
-  tick();
+  phase(30)
+    misc_30();
+    voice_3c(voice[0]);
+    echo_30();
+    tick();
 
-  //29
-  misc_29();
-  echo_29();
-  tick();
+  phase(31)
+    voice_4(voice[0]);
+    voice_1(voice[2]);
+    tick();
 
-  //30
-  misc_30();
-  voice_3c(voice[0]);
-  echo_30();
-  tick();
-
-  //31
-  voice_4(voice[0]);
-  voice_1(voice[2]);
-  tick();
-
-  goto loop;
-
-  #undef tick
+  phase_end()
 }
 
 /* register interface for S-SMP $00f2,$00f3 */
@@ -243,13 +250,52 @@ void sDSP::write(uint8 addr, uint8 data) {
 
 void sDSP::power() {
   ram = (uint8*)smp.get_spcram_handle(); //TODO: move to sMemory
-  memset(&state, 0, sizeof(state_t));
+
+  memset(&state.regs, 0, sizeof state.regs);
+  state.echo_hist_pos = 0;
+  state.every_other_sample = false;
+  state.kon = 0;
+  state.noise = 0;
+  state.counter = 0;
+  state.echo_offset = 0;
+  state.echo_length = 0;
+  state.new_kon = 0;
+  state.endx_buf = 0;
+  state.envx_buf = 0;
+  state.outx_buf = 0;
+  state.t_pmon = 0;
+  state.t_non = 0;
+  state.t_eon = 0;
+  state.t_dir = 0;
+  state.t_koff = 0;
+  state.t_brr_next_addr = 0;
+  state.t_adsr0 = 0;
+  state.t_brr_header = 0;
+  state.t_brr_byte = 0;
+  state.t_srcn = 0;
+  state.t_esa = 0;
+  state.t_echo_disabled = 0;
+  state.t_dir_addr = 0;
+  state.t_pitch = 0;
+  state.t_output = 0;
+  state.t_looped = 0;
+  state.t_echo_ptr = 0;
+  state.t_main_out[0] = state.t_main_out[1] = 0;
+  state.t_echo_out[0] = state.t_echo_out[1] = 0;
+  state.t_echo_in[0] = state.t_echo_in[1] = 0;
 
   for(unsigned i = 0; i < 8; i++) {
-    memset(&voice[i], 0, sizeof(voice_t));
+    voice[i].buf_pos = 0;
+    voice[i].interp_pos = 0;
+    voice[i].brr_addr = 0;
+    voice[i].brr_offset = 1;
     voice[i].vbit = 1 << i;
     voice[i].vidx = i * 0x10;
-    voice[i].brr_offset = 1;
+    voice[i].kon_delay = 0;
+    voice[i].env_mode = env_release;
+    voice[i].env = 0;
+    voice[i].t_envx_out = 0;
+    voice[i].hidden_env = 0;
   }
 
   reset();
@@ -259,13 +305,24 @@ void sDSP::reset() {
   REG(flg) = 0xe0;
 
   state.noise              = 0x4000;
-  state.echo_hist_pos      = state.echo_hist;
+  state.echo_hist_pos      = 0;
   state.every_other_sample = 1;
   state.echo_offset        = 0;
   state.counter            = 0;
+
+  phase_index = 0;
 }
 
 sDSP::sDSP() {
+  static_assert<sizeof(int) >= 32 / 8>();      //int >= 32-bits
+  static_assert<(int8_t)0x80 == -0x80>();      //8-bit sign extension
+  static_assert<(int16_t)0x8000 == -0x8000>(); //16-bit sign extension
+  static_assert<(uint16_t)0xffff0000 == 0>();  //16-bit unsigned clip
+  static_assert<(-1 >> 1) == -1>();            //arithmetic shift right
+
+  //-0x8000 <= n <= +0x7fff
+  assert(sclamp<16>(+0x8000) == +0x7fff);
+  assert(sclamp<16>(-0x8001) == -0x8000);
 }
 
 sDSP::~sDSP() {

src/dsp/sdsp/sdsp.h

@@ -15,6 +15,9 @@ private:
   //external
   uint8 *ram;
 
+  //USE_STATE_MACHINE variable
+  unsigned phase_index;
+
   //global registers
   enum global_reg_t {
     r_mvoll = 0x0c, r_mvolr = 0x1c,
@@ -39,7 +42,8 @@ private:
   //internal envelope modes
   enum env_mode_t { env_release, env_attack, env_decay, env_sustain };
 
-  //internal voice state
+  //internal constants
+  enum { echo_hist_size =  8 };
   enum { brr_buf_size   = 12 };
   enum { brr_block_size =  9 };
 
@@ -47,9 +51,8 @@ private:
   struct state_t {
     uint8 regs[128];
 
-    //echo history keeps most recent 8 samples (twice the size to simplify wrap handling)
-    int echo_hist[8 * 2][2];
-    int (*echo_hist_pos)[2]; //&echo_hist[0 to 7]
+    modulo_array<int, echo_hist_size> echo_hist[2]; //echo history keeps most recent 8 samples
+    int echo_hist_pos;
 
     bool every_other_sample; //toggles every sample
     int kon;                 //KON value when last checked
@@ -80,7 +83,7 @@ private:
     int t_brr_byte;
     int t_srcn;
     int t_esa;
-    int t_echo_enabled;
+    int t_echo_disabled;
 
     //internal state that is recalculated every sample
     int t_dir_addr;
@@ -97,18 +100,18 @@ private:
 
   //voice state
   struct voice_t {
-    int buf[brr_buf_size * 2]; //decoded samples (twice the size to simplify wrap handling)
-    int buf_pos;               //place in buffer where next samples will be decoded
-    int interp_pos;            //relative fractional position in sample (0x1000 = 1.0)
-    int brr_addr;              //address of current BRR block
-    int brr_offset;            //current decoding offset in BRR block
-    int vbit;                  //bitmask for voice: 0x01 for voice 0, 0x02 for voice 1, etc
-    int vidx;                  //voice channel register index: 0x00 for voice 0, 0x10 for voice 1, etc
-    int kon_delay;             //KON delay/current setup phase
+    modulo_array<int, brr_buf_size> buffer; //decoded samples
+    int buf_pos;         //place in buffer where next samples will be decoded
+    int interp_pos;      //relative fractional position in sample (0x1000 = 1.0)
+    int brr_addr;        //address of current BRR block
+    int brr_offset;      //current decoding offset in BRR block
+    int vbit;            //bitmask for voice: 0x01 for voice 0, 0x02 for voice 1, etc
+    int vidx;            //voice channel register index: 0x00 for voice 0, 0x10 for voice 1, etc
+    int kon_delay;       //KON delay/current setup phase
     env_mode_t env_mode;
-    int env;                   //current envelope level
+    int env;             //current envelope level
     int t_envx_out;
-    int hidden_env;            //used by GAIN mode 7, very obscure quirk
+    int hidden_env;      //used by GAIN mode 7, very obscure quirk
   } voice[8];
 
   //gaussian
@@ -150,8 +153,9 @@ private:
   void voice_9 (voice_t &v);
 
   //echo
-  void echo_read(bool channel);
+  int calc_fir(int i, bool channel);
   int echo_output(bool channel);
+  void echo_read(bool channel);
   void echo_write(bool channel);
   void echo_22();
   void echo_23();

src/interface.h

@@ -19,11 +19,7 @@
 #include "ppu/ppu.h"
 #include "ppu/bppu/bppu.h"
 
-#include "snes/snes.h"
-#include "chip/chip.h"
-
 #ifdef INTERFACE_MAIN
-  #include "config/config.cpp"
   #define extern
 #endif
 
@@ -34,3 +30,10 @@ extern DSPCORE dsp;
 extern PPUCORE ppu;
 
 #undef extern
+
+#include "snes/snes.h"
+#include "chip/chip.h"
+
+#ifdef INTERFACE_MAIN
+  #include "config/config.cpp"
+#endif

src/lib/bbase.h

@@ -1,5 +1,5 @@
 /*
-  bbase : version 0.12 ~byuu (2007-12-12)
+  bbase : version 0.13 ~byuu (2008-04-02)
   license: public domain
 */
 
@@ -55,7 +55,8 @@ using std::max;
   #define mkdir     _mkdir
   #define putenv    _putenv
   #define rmdir     _rmdir
-  #define vsnprintf _vsnprintf
+  #define vsnprintf _vsnprintf
+  #define usleep(n) Sleep(n / 1000)
 
   static char *realpath(const char *file_name, char *resolved_name) {
     return _fullpath(resolved_name, file_name, PATH_MAX);
@@ -226,66 +227,4 @@ static int fresize(FILE *fp, long size) {
   return ftruncate(fileno(fp), size);
 }
 
-/*****
- * crc32 calculation
- *****/
-
-const uint32 crc32_table[256] = {
-  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-  0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-  0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-  0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-  0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-  0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-  0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-  0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-  0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-  0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-  0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-  0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-  0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-  0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-  0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-  0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-  0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-  0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-  0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-  0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-  0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-  0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-inline uint32 crc32_adjust(uint32 crc32, uint8 input) {
-  return ((crc32 >> 8) & 0x00ffffff) ^ crc32_table[(crc32 ^ input) & 0xff];
-}
-
-inline uint32 crc32_calculate(uint8 *data, uint length) {
-uint32 crc32 = ~0;
-  for(uint i = 0; i < length; i++) {
-    crc32 = crc32_adjust(crc32, data[i]);
-  }
-  return ~crc32;
-}
-
 #endif //ifndef BBASE_H

src/lib/hiro/gtk/hiro.cpp

@@ -40,6 +40,7 @@ void pHiro::init() {
   free(argv);
 
   is_composited = false;
+  *default_path = 0;
   screen = gdk_screen_get_default();
   if(gdk_screen_is_composited(screen)) {
     colormap = gdk_screen_get_rgba_colormap(screen);
@@ -76,10 +77,12 @@ bool pHiro::folder_select(Window *focus, char *filename, const char *path) {
     (const gchar*)0);
 
   if(path && *path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+  else if(*default_path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), default_path);
 
   if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
     char *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
     strcpy(filename, fn);
+    set_default_path(fn);
     g_free(fn);
   }
 
@@ -99,10 +102,12 @@ bool pHiro::file_open(Window *focus, char *filename, const char *path, const cha
     (const gchar*)0);
 
   if(path && *path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+  else if(*default_path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), default_path);
 
   if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
     char *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
     strcpy(filename, fn);
+    set_default_path(fn);
     g_free(fn);
   }
 
@@ -122,11 +127,13 @@ bool pHiro::file_save(Window *focus, char *filename, const char *path, const cha
     (const gchar*)0);
 
   if(path && *path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+  else if(*default_path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), default_path);
   gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
 
   if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
     char *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
     strcpy(filename, fn);
+    set_default_path(fn);
     g_free(fn);
   }
 
@@ -168,6 +175,19 @@ pHiro& phiro() {
 
 /* internal */
 
+//GTK+ does not save the most recent path to a file.
+//Strip trailing filename / folder to save path for next file dialog request.
+//This is only called when file dialog filename / folder is accepted, not when dialog cancelled.
+void pHiro::set_default_path(const char *p) {
+  strcpy(default_path, p);
+  for(int i = strlen(default_path) - 1; i >= 0; i--) {
+    if(default_path[i] == '/' || default_path[i] == '\\') {
+      default_path[i] = 0;
+      break;
+    }
+  }
+}
+
 void pHiro::screensaver_tick() {
   static clock_t delta_x = 0, delta_y = 0;
 

src/lib/hiro/gtk/hiro.h

@@ -56,7 +56,9 @@ public:
   GdkScreen *screen;
   GdkColormap *colormap;
   bool is_composited;
+  char default_path[PATH_MAX];
 
+  void set_default_path(const char*);
   bool is_screensaver_enabled;
   void screensaver_tick();
   uint16_t translate_key(uint key);

src/lib/hiro/hiro.h

@@ -1,6 +1,6 @@
 /*
   hiro
-  version: 0.002 (2008-02-19)
+  version: 0.003 (2008-04-06)
   author: byuu
   license: public domain
 */

src/lib/hiro/win/hiro.cpp

@@ -61,10 +61,11 @@ void pHiro::term() {
 bool pHiro::run() {
   MSG msg;
   if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) {
-    if(!IsDialogMessage(GetParent(msg.hwnd) ? GetParent(msg.hwnd) : msg.hwnd, &msg)) {
+    //TODO: IsDialogMessage() does not clear keyboard buffer, but is required for tab key to work ...
+    //if(!IsDialogMessage(GetParent(msg.hwnd) ? GetParent(msg.hwnd) : msg.hwnd, &msg)) {
       TranslateMessage(&msg);
       DispatchMessage(&msg);
-    }
+    //}
   }
   return pending();
 }

src/lib/nall/bit.hpp

@@ -4,22 +4,22 @@
 namespace nall {
 
 template<int bits> inline unsigned uclamp(const unsigned x) {
-enum { y = (1U << bits) - 1 };
+  enum { y = (1U << bits) - 1 };
   return y + ((x - y) & -(x < y)); //min(x, y);
 }
 
 template<int bits> inline unsigned uclip(const unsigned x) {
-enum { m = (1U << bits) - 1 };
+  enum { m = (1U << bits) - 1 };
   return (x & m);
 }
 
 template<int bits> inline signed sclamp(const signed x) {
-enum { b = 1U << (bits - 1), m = (1U << (bits - 1)) - 1 };
+  enum { b = 1U << (bits - 1), m = (1U << (bits - 1)) - 1 };
   return (x > m) ? m : (x < -b) ? -b : x;
 }
 
 template<int bits> inline signed sclip(const signed x) {
-enum { b = 1U << (bits - 1), m = (1U << bits) - 1 };
+  enum { b = 1U << (bits - 1), m = (1U << bits) - 1 };
   return ((x & m) ^ b) - b;
 }
 

src/lib/nall/crc32.hpp

@@ -0,0 +1,68 @@
+#ifndef NALL_CRC32_HPP
+#define NALL_CRC32_HPP
+
+#include <nall/stdint.hpp>
+
+namespace nall {
+
+const uint32_t crc32_table[256] = {
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+  0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+  0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+  0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+  0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+  0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+  0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+  0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+  0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+  0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+  0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+  0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+  0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+  0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+  0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+  0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+  0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+  0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+  0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+  0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+  0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+  0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+inline uint32_t crc32_adjust(uint32_t crc32, uint8_t input) {
+  return ((crc32 >> 8) & 0x00ffffff) ^ crc32_table[(crc32 ^ input) & 0xff];
+}
+
+inline uint32_t crc32_calculate(const uint8_t *data, unsigned length) {
+  uint32_t crc32 = ~0;
+  for(unsigned i = 0; i < length; i++) {
+    crc32 = crc32_adjust(crc32, data[i]);
+  }
+  return ~crc32;
+}
+
+} //namespace nall
+
+#endif //ifndef NALL_CRC32_HPP

src/lib/nall/file.hpp

@@ -23,15 +23,15 @@ public:
   }
 
   uintmax_t readl(unsigned length = 1) {
-  uintmax_t data = 0;
-    for(int i = length - 1; i >= 0; i--) {
+    uintmax_t data = 0;
+    for(int i = 0; i < length; i++) {
       data |= (uintmax_t)read() << (i << 3);
     }
     return data;
   }
 
   uintmax_t readm(unsigned length = 1) {
-  uintmax_t data = 0;
+    uintmax_t data = 0;
     while(length--) {
       data <<= 8;
       data |= read();
@@ -78,7 +78,7 @@ public:
     if(!fp) return; //file not open
     buffer_flush();
 
-  uintmax_t req_offset = file_offset;
+    uintmax_t req_offset = file_offset;
     switch(mode) {
       case seek_absolute: req_offset  = offset; break;
       case seek_relative: req_offset += offset; break;
@@ -166,7 +166,7 @@ private:
       buffer_flush();
       buffer_offset = file_offset & ~buffer_mask;
       fseek(fp, buffer_offset, SEEK_SET);
-    unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
+      unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
       if(length) fread(buffer, 1, length, fp);
     }
   }
@@ -177,7 +177,7 @@ private:
     if(buffer_offset < 0) return; //buffer unused
     if(buffer_dirty == false) return; //buffer unmodified since read
     fseek(fp, buffer_offset, SEEK_SET);
-  unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
+    unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
     if(length) fwrite(buffer, 1, length, fp);
     buffer_offset = -1; //invalidate buffer
     buffer_dirty = false;

src/lib/nall/filemap.hpp

@@ -0,0 +1,191 @@
+#ifndef NALL_FILEMAP_HPP
+#define NALL_FILEMAP_HPP
+
+#include <nall/stdint.hpp>
+
+#include <stdio.h>
+#include <stdlib.h>
+#if defined(_WIN32)
+  #include <windows.h>
+#else
+  #include <fcntl.h>
+  #include <unistd.h>
+  #include <sys/mman.h>
+  #include <sys/stat.h>
+  #include <sys/types.h>
+#endif
+
+namespace nall {
+
+class filemap {
+public:
+  enum filemode { mode_read, mode_write, mode_readwrite, mode_writeread };
+
+  bool open(const char *filename, filemode mode) { return p_open(filename, mode); }
+  void close() { return p_close(); }
+  unsigned size() const { return p_size; }
+  uint8_t* handle() { return p_handle; }
+  const uint8_t* handle() const { return p_handle; }
+  filemap() : p_size(0), p_handle(0) { p_ctor(); }
+  ~filemap() { p_dtor(); }
+
+private:
+  unsigned p_size;
+  uint8_t *p_handle;
+
+  #if defined(_WIN32)
+  //
+  // MapViewOfFile
+  //
+
+  HANDLE p_filehandle, p_maphandle;
+
+  bool p_open(const char *filename, filemode mode) {
+    int desired_access, creation_disposition, flprotect, map_access;
+
+    switch(mode) {
+      default: return false;
+      case mode_read:
+        desired_access = GENERIC_READ;
+        creation_disposition = OPEN_EXISTING;
+        flprotect = PAGE_READONLY;
+        map_access = FILE_MAP_READ;
+        break;
+      case mode_write:
+        //write access requires read access
+        desired_access = GENERIC_WRITE;
+        creation_disposition = CREATE_ALWAYS;
+        flprotect = PAGE_READWRITE;
+        map_access = FILE_MAP_ALL_ACCESS;
+        break;
+      case mode_readwrite:
+        desired_access = GENERIC_READ | GENERIC_WRITE;
+        creation_disposition = OPEN_EXISTING;
+        flprotect = PAGE_READWRITE;
+        map_access = FILE_MAP_ALL_ACCESS;
+        break;
+      case mode_writeread:
+        desired_access = GENERIC_READ | GENERIC_WRITE;
+        creation_disposition = CREATE_NEW;
+        flprotect = PAGE_READWRITE;
+        map_access = FILE_MAP_ALL_ACCESS;
+        break;
+    }
+
+    p_filehandle = CreateFile(filename, desired_access, FILE_SHARE_READ, NULL,
+      creation_disposition, FILE_ATTRIBUTE_NORMAL, NULL);
+    if(p_filehandle == INVALID_HANDLE_VALUE) return false;
+
+    p_size = GetFileSize(p_filehandle, NULL);
+
+    p_maphandle = CreateFileMapping(p_filehandle, NULL, flprotect, 0, p_size, NULL);
+    if(p_maphandle == INVALID_HANDLE_VALUE) {
+      CloseHandle(p_filehandle);
+      p_filehandle = INVALID_HANDLE_VALUE;
+      return false;
+    }
+
+    p_handle = (uint8_t*)MapViewOfFile(p_maphandle, map_access, 0, 0, p_size);
+    return p_handle;
+  }
+
+  void p_close() {
+    if(p_handle) {
+      UnmapViewOfFile(p_handle);
+      p_handle = 0;
+    }
+
+    if(p_maphandle != INVALID_HANDLE_VALUE) {
+      CloseHandle(p_maphandle);
+      p_maphandle = INVALID_HANDLE_VALUE;
+    }
+
+    if(p_filehandle != INVALID_HANDLE_VALUE) {
+      CloseHandle(p_filehandle);
+      p_filehandle = INVALID_HANDLE_VALUE;
+    }
+  }
+
+  void p_ctor() {
+    p_filehandle = INVALID_HANDLE_VALUE;
+    p_maphandle  = INVALID_HANDLE_VALUE;
+  }
+
+  void p_dtor() {
+    close();
+  }
+
+  #else
+  //
+  // mmap
+  //
+
+  int p_fd;
+
+  bool p_open(const char *filename, filemode mode) {
+    int open_flags, mmap_flags;
+
+    switch(mode) {
+      default: return false;
+      case mode_read:
+        open_flags = O_RDONLY;
+        mmap_flags = PROT_READ;
+        break;
+      case mode_write:
+        open_flags = O_RDWR | O_CREAT; //mmap() requires read access
+        mmap_flags = PROT_WRITE;
+        break;
+      case mode_readwrite:
+        open_flags = O_RDWR;
+        mmap_flags = PROT_READ | PROT_WRITE;
+        break;
+      case mode_writeread:
+        open_flags = O_RDWR | O_CREAT;
+        mmap_flags = PROT_READ | PROT_WRITE;
+        break;
+    }
+
+    p_fd = ::open(filename, open_flags);
+    if(p_fd < 0) return false;
+
+    struct stat p_stat;
+    fstat(p_fd, &p_stat);
+    p_size = p_stat.st_size;
+
+    p_handle = (uint8_t*)mmap(0, p_size, mmap_flags, MAP_SHARED, p_fd, 0);
+    if(p_handle == MAP_FAILED) {
+      p_handle = 0;
+      ::close(p_fd);
+      p_fd = -1;
+      return false;
+    }
+
+    return p_handle;
+  }
+
+  void p_close() {
+    if(p_handle) {
+      munmap(p_handle, p_size);
+      p_handle = 0;
+    }
+
+    if(p_fd >= 0) {
+      ::close(p_fd);
+      p_fd = -1;
+    }
+  }
+
+  void p_ctor() {
+    p_fd = -1;
+  }
+
+  void p_dtor() {
+    p_close();
+  }
+
+  #endif
+};
+
+} //namespace nall
+
+#endif //ifndef NALL_FILEMAP_HPP

src/lib/nall/modulo.hpp

@@ -0,0 +1,39 @@
+#ifndef NALL_MODULO_HPP
+#define NALL_MODULO_HPP
+
+#include <nall/new.hpp>
+
+namespace nall {
+
+template<typename T, int size>
+class modulo_array {
+public:
+  inline T operator[](int index) const {
+    return buffer[size + index];
+  }
+
+  inline T read(int index) const {
+    return buffer[size + index];
+  }
+
+  inline void write(unsigned index, const T value) {
+    buffer[index] =
+    buffer[index + size] =
+    buffer[index + size + size] = value;
+  }
+
+  modulo_array() {
+    buffer = new(zeromemory) T[size * 3];
+  }
+
+  ~modulo_array() {
+    delete[] buffer;
+  }
+
+private:
+  T *buffer;
+};
+
+} //namespace nall
+
+#endif //ifndef NALL_MODULO_HPP

src/lib/nall/ups.hpp

@@ -0,0 +1,193 @@
+#ifndef NALL_UPS_HPP
+#define NALL_UPS_HPP
+
+#include <stdio.h>
+#include <stdint.h>
+#include <nall/algorithm.hpp>
+#include <nall/crc32.hpp>
+#include <nall/new.hpp>
+#include <nall/stdint.hpp>
+
+namespace nall {
+
+class ups {
+public:
+  enum result {
+    ok,
+    patch_unreadable,
+    patch_unwritable,
+    patch_invalid,
+    input_invalid,
+    output_invalid,
+    patch_crc32_invalid,
+    input_crc32_invalid,
+    output_crc32_invalid,
+  };
+
+  ups::result create(const char *patch_fn, const uint8_t *x_data, unsigned x_size, const uint8_t *y_data, unsigned y_size) {
+    fp = fopen(patch_fn, "wb");
+    if(!fp) return patch_unwritable;
+
+    crc32 = ~0;
+    uint32_t x_crc32 = crc32_calculate(x_data, x_size);
+    uint32_t y_crc32 = crc32_calculate(y_data, y_size);
+
+    //header
+    write('U');
+    write('P');
+    write('S');
+    write('1');
+    encptr(x_size);
+    encptr(y_size);
+
+    //body
+    unsigned max_size = max(x_size, y_size);
+    unsigned relative = 0;
+    for(unsigned i = 0; i < max_size;) {
+      uint8_t x = i < x_size ? x_data[i] : 0x00;
+      uint8_t y = i < y_size ? y_data[i] : 0x00;
+
+      if(x == y) {
+        i++;
+        continue;
+      }
+
+      encptr(i++ - relative);
+      write(x ^ y);
+
+      while(true) {
+        if(i >= max_size) {
+          write(0x00);
+          break;
+        }
+
+        x = i < x_size ? x_data[i] : 0x00;
+        y = i < y_size ? y_data[i] : 0x00;
+        i++;
+        write(x ^ y);
+        if(x == y) break;
+      }
+
+      relative = i;
+    }
+
+    //footer
+    for(unsigned i = 0; i < 4; i++) write(x_crc32 >> (i << 3));
+    for(unsigned i = 0; i < 4; i++) write(y_crc32 >> (i << 3));
+    uint32_t p_crc32 = ~crc32;
+    for(unsigned i = 0; i < 4; i++) write(p_crc32 >> (i << 3));
+
+    fclose(fp);
+    return ok;
+  }
+
+  ups::result apply(const uint8_t *p_data, unsigned p_size, const uint8_t *x_data, unsigned x_size, uint8_t *&y_data, unsigned &y_size) {
+    if(p_size < 18) return patch_invalid;
+    p_buffer = p_data;
+
+    crc32 = ~0;
+
+    //header
+    if(read() != 'U') return patch_invalid;
+    if(read() != 'P') return patch_invalid;
+    if(read() != 'S') return patch_invalid;
+    if(read() != '1') return patch_invalid;
+
+    unsigned px_size = decptr();
+    unsigned py_size = decptr();
+
+    //mirror
+    if(x_size != px_size && x_size != py_size) return input_invalid;
+    y_size = (x_size == px_size) ? py_size : px_size;
+    y_data = new(zeromemory) uint8_t[y_size];
+
+    for(unsigned i = 0; i < x_size && i < y_size; i++) y_data[i] = x_data[i];
+    for(unsigned i = x_size; i < y_size; i++) y_data[i] = 0x00;
+
+    //body
+    unsigned relative = 0;
+    while(p_buffer < p_data + p_size - 12) {
+      relative += decptr();
+
+      while(true) {
+        uint8_t x = read();
+        if(x && relative < y_size) {
+          uint8_t y = relative < x_size ? x_data[relative] : 0x00;
+          y_data[relative] = x ^ y;
+        }
+        relative++;
+        if(!x) break;
+      }
+    }
+
+    //footer
+    unsigned px_crc32 = 0, py_crc32 = 0, pp_crc32 = 0;
+    for(unsigned i = 0; i < 4; i++) px_crc32 |= read() << (i << 3);
+    for(unsigned i = 0; i < 4; i++) py_crc32 |= read() << (i << 3);
+    uint32_t p_crc32 = ~crc32;
+    for(unsigned i = 0; i < 4; i++) pp_crc32 |= read() << (i << 3);
+
+    uint32_t x_crc32 = crc32_calculate(x_data, x_size);
+    uint32_t y_crc32 = crc32_calculate(y_data, y_size);
+
+    if(px_size != py_size) {
+      if(x_size == px_size && x_crc32 != px_crc32) return input_crc32_invalid;
+      if(x_size == py_size && x_crc32 != py_crc32) return input_crc32_invalid;
+      if(y_size == px_size && y_crc32 != px_crc32) return output_crc32_invalid;
+      if(y_size == py_size && y_crc32 != py_crc32) return output_crc32_invalid;
+    } else {
+      if(x_crc32 != px_crc32 && x_crc32 != py_crc32) return input_crc32_invalid;
+      if(y_crc32 != px_crc32 && y_crc32 != py_crc32) return output_crc32_invalid;
+      if(x_crc32 == y_crc32 && px_crc32 != py_crc32) return output_crc32_invalid;
+      if(x_crc32 != y_crc32 && px_crc32 == py_crc32) return output_crc32_invalid;
+    }
+
+    if(p_crc32 != pp_crc32) return patch_crc32_invalid;
+    return ok;
+  }
+
+private:
+  FILE *fp;
+  uint32_t crc32;
+  const uint8_t *p_buffer;
+
+  uint8_t read() {
+    uint8_t n = *p_buffer++;
+    crc32 = crc32_adjust(crc32, n);
+    return n;
+  }
+
+  void write(uint8_t n) {
+    fputc(n, fp);
+    crc32 = crc32_adjust(crc32, n);
+  }
+
+  void encptr(uint64_t offset) {
+    while(true) {
+      uint64_t x = offset & 0x7f;
+      offset >>= 7;
+      if(offset == 0) {
+        write(0x80 | x);
+        break;
+      }
+      write(x);
+      offset--;
+    }
+  }
+
+  uint64_t decptr() {
+    uint64_t offset = 0, shift = 1;
+    while(true) {
+      uint8_t x = read();
+      offset += (x & 0x7f) * shift;
+      if(x & 0x80) break;
+      shift <<= 7;
+      offset += shift;
+    }
+    return offset;
+  }
+};
+
+} //namespace nall
+
+#endif //ifndef NALL_UPS_HPP

src/lib/ruby/ruby.cpp

@@ -27,13 +27,17 @@ void VideoInterface::driver(const char *driver) {
   #endif
 
   #ifdef VIDEO_GLX
-  else if(!strcmp(driver, "opengl")) p = new VideoGLX();
+  else if(!strcmp(driver, "glx")) p = new VideoGLX();
   #endif
 
   #ifdef VIDEO_SDL
   else if(!strcmp(driver, "sdl")) p = new VideoSDL();
   #endif
 
+  #ifdef VIDEO_WGL
+  else if(!strcmp(driver, "wgl")) p = new VideoWGL();
+  #endif
+
   #ifdef VIDEO_XV
   else if(!strcmp(driver, "xv")) p = new VideoXv();
   #endif
@@ -42,6 +46,8 @@ void VideoInterface::driver(const char *driver) {
 
   #if defined(VIDEO_DIRECT3D)
   p = new VideoD3D();
+  #elif defined(VIDEO_WGL)
+  p = new VideoWGL();
   #elif defined(VIDEO_DIRECTDRAW)
   p = new VideoDD();
   #elif defined(VIDEO_GDI)

src/lib/ruby/ruby.h

@@ -1,6 +1,6 @@
 /*
   ruby
-  version: 0.01 (2008-02-03)
+  version: 0.02 (2008-04-06)
   license: public domain
 */
 

src/lib/ruby/ruby_impl.cpp

@@ -20,6 +20,10 @@
   #include <ruby/video/sdl.cpp>
 #endif
 
+#ifdef VIDEO_WGL
+  #include <ruby/video/wgl.cpp>
+#endif
+
 #ifdef VIDEO_XV
   #include <ruby/video/xv.cpp>
 #endif

src/lib/ruby/video/direct3d.cpp

@@ -1,7 +1,7 @@
 #include <windows.h>
 #include <d3d9.h>
 
-#define D3DVERTEX (D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1)
+#define D3DVERTEX (D3DFVF_XYZRHW | D3DFVF_TEX1)
 
 #include <ruby/ruby.h>
 
@@ -26,7 +26,6 @@ public:
 
   struct d3dvertex {
     float x, y, z, rhw; //screen coords
-    uint32_t color;     //diffuse color
     float u, v;         //texture coords
   };
 
@@ -48,6 +47,11 @@ public:
     unsigned filter;
   } settings;
 
+  struct {
+    unsigned width;
+    unsigned height;
+  } state;
+
   bool cap(Video::Setting setting) {
     if(setting == Video::Handle) return true;
     if(setting == Video::Synchronize) return true;
@@ -101,7 +105,7 @@ public:
      | /        |
      2----------3
 
-    (x,y) screen coords, in pixels (-0.5 for texel / pixel correction)
+    (x,y) screen coords, in pixels
     (u,v) texture coords, betweeen 0.0 (top, left) to 1.0 (bottom, right)
   */
   void set_vertex(
@@ -110,12 +114,12 @@ public:
     uint32_t x, uint32_t y, uint32_t w, uint32_t h
   ) {
     d3dvertex vertex[4];
-    vertex[0].x = vertex[2].x = (double)(x    ) - 0.5;
-    vertex[1].x = vertex[3].x = (double)(x + w) - 0.5;
-    vertex[0].y = vertex[1].y = (double)(y    ) - 0.5;
-    vertex[2].y = vertex[3].y = (double)(y + h) - 0.5;
+    vertex[0].x = vertex[2].x = (double)(x    );
+    vertex[1].x = vertex[3].x = (double)(x + w);
+    vertex[0].y = vertex[1].y = (double)(y    );
+    vertex[2].y = vertex[3].y = (double)(y + h);
 
-  //Z-buffer and RHW are unused for 2D blit, set to normal values
+    //Z-buffer and RHW are unused for 2D blit, set to normal values
     vertex[0].z = vertex[1].z = vertex[2].z = vertex[3].z = 0.0;
     vertex[0].rhw = vertex[1].rhw = vertex[2].rhw = vertex[3].rhw = 1.0;
 
@@ -149,7 +153,7 @@ public:
       }
     }
 
-  //clear primary display and all backbuffers
+    //clear primary display and all backbuffers
     for(int i = 0; i < 3; i++) {
       device->Clear(0, 0, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0x00, 0x00, 0x00), 1.0f, 0);
       device->Present(0, 0, 0, 0);
@@ -171,22 +175,28 @@ public:
     if(caps.stretchrect == false)surface->Release();
   }
 
-  void refresh(unsigned r_width, unsigned r_height) {
+  void refresh(unsigned width, unsigned height) {
     if(!device) return;
 
+    RECT rd, rs; //dest, source rectangles
+    GetClientRect(settings.handle, &rd);
+    SetRect(&rs, 0, 0, width, height);
+
+    if(state.width != rd.right || state.height != rd.bottom) {
+      //if window size changed, D3DPRESENT_PARAMETERS must be updated
+      //failure to do so causes scaling issues on some ATI drivers
+      init();
+    }
+
     device->BeginScene();
 
     if(caps.stretchrect == true) {
-      RECT rs;
-      SetRect(&rs, 0, 0, r_width, r_height);
       LPDIRECT3DSURFACE9 temp;
       device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &temp);
       device->StretchRect(surface, &rs, temp, 0, static_cast<D3DTEXTUREFILTERTYPE>(flags.filter));
       temp->Release();
     } else {
-      RECT rd;
-      GetClientRect(settings.handle, &rd);
-      set_vertex(0, 0, r_width, r_height, 1024, 1024, 0, 0, rd.right, rd.bottom);
+      set_vertex(0, 0, width, height, 1024, 1024, 0, 0, rd.right, rd.bottom);
       device->SetTexture(0, texture);
       device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
     }
@@ -194,7 +204,7 @@ public:
     device->EndScene();
 
     if(settings.synchronize) {
-    D3DRASTER_STATUS status;
+      D3DRASTER_STATUS status;
       for(;;) {
         device->GetRasterStatus(0, &status);
         if(bool(status.InVBlank) == true) break;
@@ -208,6 +218,11 @@ public:
   bool init() {
     term();
 
+    RECT rd;
+    GetClientRect(settings.handle, &rd);
+    state.width  = rd.right;
+    state.height = rd.bottom;
+
     lpd3d = Direct3DCreate9(D3D_SDK_VERSION);
     if(!lpd3d) return false;
 
@@ -231,7 +246,7 @@ public:
       return false;
     }
 
-  //detect device capabilities
+    //detect device capabilities
     device->GetDeviceCaps(&d3dcaps);
     if(d3dcaps.MaxTextureWidth < 1024 || d3dcaps.MaxTextureWidth < 1024) return false;
 

src/lib/ruby/video/glx.cpp

@@ -184,6 +184,7 @@ public:
       /* x = */ 0, /* y = */ 0, wa.width, wa.height,
       /* border_width = */ 0, vi->depth, InputOutput, vi->visual,
       CWColormap | CWBorderPixel | CWEventMask, &swa);
+    XSetWindowBackground(display, xwindow, /* color = */ 0);
     XMapWindow(display, xwindow);
     XEvent event;
     XIfEvent(display, &event, x_wait_for_map_notify, (char*)xwindow); //wait for window to appear onscreen

src/lib/ruby/video/wgl.cpp

@@ -0,0 +1,198 @@
+/*
+  video.wgl
+  author: byuu, krom
+  license: public domain
+  date: 2008-03-26
+*/
+
+#include <windows.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+
+#include <ruby/ruby.h>
+
+namespace ruby {
+
+#include "wgl.h"
+
+class pVideoWGL {
+public:
+  VideoWGL &self;
+  uint32_t *buffer;
+
+  HDC display;
+  HGLRC wglcontext;
+  HWND window;
+  HINSTANCE glwindow;
+  GLuint gltexture;
+
+  struct {
+    HWND handle;
+    unsigned filter;
+  } settings;
+
+  bool cap(Video::Setting setting) {
+    if(setting == Video::Handle) return true;
+    if(setting == Video::Filter) return true;
+    return false;
+  }
+
+  uintptr_t get(Video::Setting setting) {
+    if(setting == Video::Handle) return (uintptr_t)settings.handle;
+    if(setting == Video::Filter) return settings.filter;
+    return false;
+  }
+
+  bool set(Video::Setting setting, uintptr_t param) {
+    if(setting == Video::Handle) {
+      settings.handle = (HWND)param;
+      return true;
+    }
+    if(setting == Video::Filter) {
+      settings.filter = param;
+      return true;
+    }
+    return false;
+  }
+
+  bool lock(uint32_t *&data, unsigned &pitch) {
+    pitch = 1024 * 4;
+    return data = buffer;
+  }
+
+  void unlock() {
+  }
+
+  void clear() {
+    memset(buffer, 0, 1024 * 1024 * sizeof(uint32_t));
+    glClearColor(0.0, 0.0, 0.0, 1.0);
+    glClear(GL_COLOR_BUFFER_BIT);
+    glFlush();
+    SwapBuffers(display);
+  }
+
+  void refresh(unsigned width, unsigned height) {
+    RECT rc;
+    GetClientRect(settings.handle, &rc);
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+      settings.filter == Video::FilterPoint ? GL_NEAREST : GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+      settings.filter == Video::FilterPoint ? GL_NEAREST : GL_LINEAR);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0, width, 0, height, -1.0, 1.0);
+    glViewport(0, 0, rc.right, rc.bottom);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, 1024); //length of buffer in pixels
+    glTexSubImage2D(GL_TEXTURE_2D,
+      /* mip-map level = */ 0, /* x = */ 0, /* y = */ 0,
+      width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
+
+    //OpenGL projection sets 0,0 as *bottom-left* of screen.
+    //therefore, below vertices flip image to support top-left source.
+    //texture range = x1:0.0, y1:0.0, x2:1.0, y2:1.0
+    //vertex range = x1:0, y1:0, x2:width, y2:height
+    double w = double(width)  / 1024.0;
+    double h = double(height) / 1024.0;
+    int u = width;
+    int v = height;
+    glBegin(GL_TRIANGLE_STRIP);
+    glTexCoord2f(0, 0); glVertex3i(0, v, 0);
+    glTexCoord2f(w, 0); glVertex3i(u, v, 0);
+    glTexCoord2f(0, h); glVertex3i(0, 0, 0);
+    glTexCoord2f(w, h); glVertex3i(u, 0, 0);
+    glEnd();
+
+    glFlush();
+    SwapBuffers(display);
+  }
+
+  bool init() {
+    buffer = new(zeromemory) uint32_t[1024 * 1024 * sizeof(uint32_t)];
+
+    GLuint pixel_format;
+    PIXELFORMATDESCRIPTOR pfd;
+    memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR));
+    pfd.nSize      = sizeof(PIXELFORMATDESCRIPTOR);
+    pfd.nVersion   = 1;
+    pfd.dwFlags    = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
+    pfd.iPixelType = PFD_TYPE_RGBA;
+
+    display = GetDC(settings.handle);
+    pixel_format = ChoosePixelFormat(display, &pfd);
+    SetPixelFormat(display, pixel_format, &pfd);
+
+    wglcontext = wglCreateContext(display);
+    wglMakeCurrent(display, wglcontext);
+
+    //disable unused features
+    glDisable(GL_ALPHA_TEST);
+    glDisable(GL_BLEND);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_POLYGON_SMOOTH);
+    glDisable(GL_STENCIL_TEST);
+
+    //enable useful and required features
+    glEnable(GL_DITHER);
+    glEnable(GL_TEXTURE_2D);
+
+    //create GL texture to copy buffer to
+    gltexture = 0;
+    glGenTextures(1, &gltexture);
+    glBindTexture(GL_TEXTURE_2D, gltexture);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, 1024);
+    glTexImage2D(GL_TEXTURE_2D,
+      /* mip-map level = */ 0, /* internal format = */ GL_RGB,
+      /* width = */ 1024, /* height = */ 1024, /* border = */ 0,
+      /* format = */ GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
+
+    return true;
+  }
+
+  void term() {
+    if(gltexture) {
+      glDeleteTextures(1, &gltexture);
+      gltexture = 0;
+    }
+
+    if(wglcontext) {
+      wglDeleteContext(wglcontext);
+      wglcontext = 0;
+    }
+
+    if(buffer) {
+      delete[] buffer;
+      buffer = 0;
+    }
+  }
+
+  pVideoWGL(VideoWGL &self_) : self(self_) {
+    settings.handle = 0;
+    window = 0;
+    wglcontext = 0;
+    glwindow = 0;
+    gltexture = 0;
+  }
+
+  ~pVideoWGL() { term(); }
+};
+
+bool VideoWGL::cap(Setting setting) { return p.cap(setting); }
+uintptr_t VideoWGL::get(Setting setting) { return p.get(setting); }
+bool VideoWGL::set(Setting setting, uintptr_t param) { return p.set(setting, param); }
+bool VideoWGL::lock(uint32_t *&data, unsigned &pitch) { return p.lock(data, pitch); }
+void VideoWGL::unlock() { p.unlock(); }
+void VideoWGL::clear() { p.clear(); }
+void VideoWGL::refresh(unsigned width, unsigned height) { p.refresh(width, height); }
+bool VideoWGL::init() { return p.init(); }
+void VideoWGL::term() { p.term(); }
+VideoWGL::VideoWGL() : p(*new pVideoWGL(*this)) {}
+VideoWGL::~VideoWGL() { delete &p; }
+
+} //namespace ruby

src/lib/ruby/video/wgl.h

@@ -0,0 +1,22 @@
+class pVideoWGL;
+
+class VideoWGL : public Video {
+public:
+  bool cap(Setting);
+  uintptr_t get(Setting);
+  bool set(Setting, uintptr_t);
+
+  bool lock(uint32_t *&data, unsigned &pitch);
+  void unlock();
+
+  void clear();
+  void refresh(unsigned width, unsigned height);
+  bool init();
+  void term();
+
+  VideoWGL();
+  ~VideoWGL();
+
+private:
+  pVideoWGL &p;
+};

src/lib/tool/opgen_switch.cpp

@@ -1,46 +1,44 @@
-/* broken -- need to port libstring to bstring */
-
-#include "libbase.h"
-#include "libstring.h"
-#include "libstring.cpp"
+#include <nall/string.hpp>
+using namespace nall;
 
 FILE *fp;
 
 string data;
-stringarray line, part, subpart, output_op;
+lstring line, part, subpart, output_op;
 
 struct OpList {
-  stringarray name, arg;
+  string name;
+  lstring arg;
 } op_list[64];
 
-int32 op_count, line_num;
+int32_t op_count, line_num;
 
 void clear_op_list() {
   op_count = 0;
-  for(int i = 0; i < 64; i++) {
+  for(unsigned i = 0; i < 64; i++) {
     strcpy(op_list[i].name, "");
-    for(int l = 0; l < 8; l++) {
+    for(unsigned l = 0; l < 8; l++) {
       strcpy(op_list[i].arg[l], "");
     }
   }
 }
 
 void gen_begin() {
-int i = line_num;
-char t[4096];
-  clear_op_list();
-  while(1) {
-  int z = op_count++;
-    strcpy(part, line[i]);
-    strrtrim(part, "),");
-    strrtrim(part, ") {");
-    split(subpart, "(", part);
+  int i = line_num;
+  clear_op_list();
+
+  while(true) {
+    int z = op_count++;
+    string temp = line[i];
+    rtrim(temp, "),");
+    rtrim(temp, ") {");
+    split(subpart, "(", temp);
     strcpy(op_list[z].name, subpart[0]);
     split(part, ", ", subpart[1]);
-    for(int l = 0; l < count(part); l++) {
+    for(unsigned l = 0; l < count(part); l++) {
       strcpy(op_list[z].arg[l], part[l]);
     }
-    if(strend(line[i], " {") == true)break;
+    if(strend(line[i], " {") == true) break;
     i++;
   }
 
@@ -49,21 +47,21 @@ char t[4096];
 }
 
 void update_line(int i) {
-  replace(line[i], "end;",  "break;");
+  replace(line[i], "end;", "break;");
 }
 
 void gen_op() {
-int i = line_num, n, c;
-char t[4096];
-  while(1) {
+  int i = line_num, n, c;
+  char t[4096];
+  while(true) {
     if(!strcmp(line[i], "}"))break;
 
-  //remove cycle number
-    n = strdec(line[i]);
+    //remove cycle number
+    n = strdec((const char*)line[i]);
     sprintf(t, "%d:", n);
-    strltrim(line[i], t);
-  //sprintf(t, "//%d:\r\n", n);
-  //strcat(output_op, t);
+    ltrim(line[i], t);
+    //sprintf(t, "//%d:\r\n", n);
+    //strcat(output_op, t);
 
     update_line(i);
     if(strcmp(line[i], "")) {
@@ -73,8 +71,8 @@ char t[4096];
     }
 
     i++;
-    while(1) {
-      if(strptr(line[i])[1] == ':' || strptr(line[i])[2] == ':' || line[i] == "}")break;
+    while(true) {
+      if(line[i][1] == ':' || line[i][2] == ':' || line[i] == "}") break;
 
       update_line(i);
       strcat(output_op, line[i]);
@@ -89,9 +87,9 @@ char t[4096];
 }
 
 void gen_end() {
-string t;
-  for(int i = 0; i < op_count; i++) {
-    strcpy(t, output_op);
+  string t;
+  for(unsigned i = 0; i < op_count; i++) {
+    t = output_op[0];
     replace(t, "$$", op_list[i].name);
     replace(t, "$0", op_list[i].arg[0]);
     replace(t, "$1", op_list[i].arg[1]);
@@ -101,23 +99,12 @@ string t;
     replace(t, "$5", op_list[i].arg[5]);
     replace(t, "$6", op_list[i].arg[6]);
     replace(t, "$7", op_list[i].arg[7]);
-    fprintf(fp, "%s\r\n\r\n", strptr(t));
+    fprintf(fp, "%s\r\n\r\n", (const char*)t);
   }
 }
 
-void generate(char *dest, char *src) {
-  fp = fopen(src, "rb");
-
-  fseek(fp, 0, SEEK_END);
-int fsize = ftell(fp);
-  fseek(fp, 0, SEEK_SET);
-char *buf = (char*)malloc(fsize + 1);
-  fread(buf, 1, fsize, fp);
-  fclose(fp);
-  buf[fsize] = 0;
-
-  strcpy(data, buf);
-  free(buf);
+void generate(char *dest, char *src) {
+  fread(data, src);
   replace(data, "\r\n", "\n");
   split(line, "\n", data);
 
@@ -125,8 +112,8 @@ char *buf = (char*)malloc(fsize + 1);
 
   line_num = 0;
   while(line_num < count(line)) {
-    while(line_num < count(line) && !strcmp(line[line_num], ""))line_num++;
-    if(line_num >= count(line))break;
+    while(line_num < count(line) && !strcmp(line[line_num], "")) line_num++;
+    if(line_num >= count(line)) break;
 
     gen_begin();
     gen_op();

src/ppu/bppu/bppu_render.h

@@ -49,9 +49,9 @@ struct {
   uint16 scx, scy; //sc index offsets
 } bg_info[4];
 
-inline void   update_bg_info();
-inline uint16 bg_get_tile(uint8 bg, uint16 x, uint16 y);
-void render_line_bg(uint8 bg, uint8 color_depth, uint8 pri0_pos, uint8 pri1_pos);
+void   update_bg_info();
+uint16 bg_get_tile(uint8 bg, uint16 x, uint16 y);
+void   render_line_bg(uint8 bg, uint8 color_depth, uint8 pri0_pos, uint8 pri1_pos);
 
 //bppu_render_oam.cpp
 struct sprite_item {

src/ppu/bppu/bppu_render_bg.cpp

@@ -1,9 +1,9 @@
 #ifdef BPPU_CPP
 
-//called once at the start of every rendered scanline
+//called once at the start of every rendered scanline
 void bPPU::update_bg_info() {
-uint hires = (regs.bg_mode == 5 || regs.bg_mode == 6);
-uint width = (!hires) ? 256 : 512;
+  uint hires = (regs.bg_mode == 5 || regs.bg_mode == 6);
+  uint width = (!hires) ? 256 : 512;
 
   for(int bg = 0; bg < 4; bg++) {
     bg_info[bg].th = (regs.bg_tilesize[bg]) ? 4 : 3;
@@ -26,11 +26,11 @@ uint16 bPPU::bg_get_tile(uint8 bg, uint16 x, uint16 y) {
   x = (x & bg_info[bg].mx) >> bg_info[bg].tw;
   y = (y & bg_info[bg].my) >> bg_info[bg].th;
 
-uint16 pos = ((y & 0x1f) << 5) + (x & 0x1f);
-  if(y & 0x20)pos += bg_info[bg].scy;
-  if(x & 0x20)pos += bg_info[bg].scx;
+  uint16 pos = ((y & 0x1f) << 5) + (x & 0x1f);
+  if(y & 0x20) pos += bg_info[bg].scy;
+  if(x & 0x20) pos += bg_info[bg].scx;
 
-uint16 addr = regs.bg_scaddr[bg] + (pos << 1);
+  uint16 addr = regs.bg_scaddr[bg] + (pos << 1);
   return (vram_read(addr + 0) << 0) | (vram_read(addr + 1) << 8);
 }
 
@@ -55,60 +55,60 @@ void bPPU::render_line_bg(uint8 bg, uint8 color_depth, uint8 pri0_pos, uint8 pri
     return;
   }
 
-//are layers disabled by user?
+  //are layers disabled by user?
   if(render_enabled(bg, 0) == false)pri0_pos = 0;
   if(render_enabled(bg, 1) == false)pri1_pos = 0;
-//nothing to render?
+  //nothing to render?
   if(!pri0_pos && !pri1_pos)return;
 
-bool   bg_enabled    = regs.bg_enabled[bg];
-bool   bgsub_enabled = regs.bgsub_enabled[bg];
+  bool   bg_enabled    = regs.bg_enabled[bg];
+  bool   bgsub_enabled = regs.bgsub_enabled[bg];
 
-uint16 opt_valid_bit = (bg == BG1) ? 0x2000 : (bg == BG2) ? 0x4000 : 0x0000;
-uint8  bgpal_index   = (regs.bg_mode == 0) ? (bg << 5) : 0;
+  uint16 opt_valid_bit = (bg == BG1) ? 0x2000 : (bg == BG2) ? 0x4000 : 0x0000;
+  uint8  bgpal_index   = (regs.bg_mode == 0) ? (bg << 5) : 0;
 
-uint8  pal_size  = 2 << color_depth;      //<<2 (*4), <<4 (*16), <<8 (*256)
-uint16 tile_mask = 0x0fff >> color_depth; //0x0fff, 0x07ff, 0x03ff
-//4 + color_depth = >>(4-6) -- / {16, 32, 64 } bytes/tile
-//index is a tile number count to add to base tile number
-uint   tiledata_index = regs.bg_tdaddr[bg] >> (4 + color_depth);
+  uint8  pal_size  = 2 << color_depth;      //<<2 (*4), <<4 (*16), <<8 (*256)
+  uint16 tile_mask = 0x0fff >> color_depth; //0x0fff, 0x07ff, 0x03ff
+  //4 + color_depth = >>(4-6) -- / {16, 32, 64 } bytes/tile
+  //index is a tile number count to add to base tile number
+  uint   tiledata_index = regs.bg_tdaddr[bg] >> (4 + color_depth);
 
-uint8 *bg_td       = bg_tiledata[color_depth];
-uint8 *bg_td_state = bg_tiledata_state[color_depth];
+  uint8 *bg_td       = bg_tiledata[color_depth];
+  uint8 *bg_td_state = bg_tiledata_state[color_depth];
 
-uint8  tile_width  = bg_info[bg].tw;
-uint8  tile_height = bg_info[bg].th;
-uint16 mask_x      = bg_info[bg].mx; //screen width  mask
-uint16 mask_y      = bg_info[bg].my; //screen height mask
+  uint8  tile_width  = bg_info[bg].tw;
+  uint8  tile_height = bg_info[bg].th;
+  uint16 mask_x      = bg_info[bg].mx; //screen width  mask
+  uint16 mask_y      = bg_info[bg].my; //screen height mask
 
-uint16 y       = regs.bg_y[bg];
-uint16 hscroll = regs.bg_hofs[bg];
-uint16 vscroll = regs.bg_vofs[bg];
+  uint16 y       = regs.bg_y[bg];
+  uint16 hscroll = regs.bg_hofs[bg];
+  uint16 vscroll = regs.bg_vofs[bg];
 
-uint hires = (regs.bg_mode == 5 || regs.bg_mode == 6);
-uint width = (!hires) ? 256 : 512;
+  uint hires = (regs.bg_mode == 5 || regs.bg_mode == 6);
+  uint width = (!hires) ? 256 : 512;
 
   if(hires) {
     hscroll <<= 1;
     if(regs.interlace) y = (y << 1) + field();
   }
 
-uint16 *mtable = mosaic_table[(regs.mosaic_enabled[bg]) ? regs.mosaic_size : 0];
+  uint16 *mtable = mosaic_table[(regs.mosaic_enabled[bg]) ? regs.mosaic_size : 0];
 
-uint16 hval, vval;
-uint16 t, tile_pri, tile_num;
-uint8  pal_index, pal_num;
-uint8 *tile_ptr;
-uint   xpos, ypos;
-uint16 hoffset, voffset, opt_x, col;
-bool   mirror_x, mirror_y;
-bool   is_opt_mode = (config::ppu.opt_enable == true) && (regs.bg_mode == 2 || regs.bg_mode == 4 || regs.bg_mode == 6);
+  uint16 hval, vval;
+  uint16 t, tile_pri, tile_num;
+  uint8  pal_index, pal_num;
+  uint8 *tile_ptr;
+  uint   xpos, ypos;
+  uint16 hoffset, voffset, opt_x, col;
+  bool   mirror_x, mirror_y;
+  const bool is_opt_mode = (config::ppu.opt_enable == true) && (regs.bg_mode == 2 || regs.bg_mode == 4 || regs.bg_mode == 6);
 
   build_window_tables(bg);
-uint8 *wt_main = window[bg].main;
-uint8 *wt_sub  = window[bg].sub;
+  uint8 *wt_main = window[bg].main;
+  uint8 *wt_sub  = window[bg].sub;
 
-uint16 prev_x = 0xffff, prev_y = 0xffff;
+  uint16 prev_x = 0xffff, prev_y = 0xffff, prev_optx = 0xffff;
   for(uint16 x = 0; x < width; x++) {
     hoffset = mtable[x] + hscroll;
     voffset = y + vscroll;
@@ -116,15 +116,16 @@ uint16 prev_x = 0xffff, prev_y = 0xffff;
     if(is_opt_mode) {
       opt_x = (x + (hscroll & 7));
 
-    //tile 0 is unaffected by OPT mode...
-      if(opt_x >= 8) {
-        hval = bg_get_tile(BG3,
-          (opt_x - 8) + (regs.bg_hofs[BG3] & ~7),
-          regs.bg_vofs[BG3]);
-
-        vval = bg_get_tile(BG3,
-          (opt_x - 8) + (regs.bg_hofs[BG3] & ~7),
-          regs.bg_vofs[BG3] + 8);
+      //tile 0 is unaffected by OPT mode...
+      if(opt_x >= 8) {
+        //cache tile data in hval, vval if possible
+        if((opt_x >> 3) != (prev_optx >> 3)) {
+          hval = bg_get_tile(BG3, (opt_x - 8) + (regs.bg_hofs[BG3] & ~7), regs.bg_vofs[BG3]);
+          if(regs.bg_mode != 4) {
+            vval = bg_get_tile(BG3, (opt_x - 8) + (regs.bg_hofs[BG3] & ~7), regs.bg_vofs[BG3] + 8);
+          }
+          prev_optx = opt_x;
+        }
 
         if(regs.bg_mode == 4) {
           if(hval & opt_valid_bit) {

src/reader/reader.cpp

@@ -12,7 +12,7 @@
   #include "jmareader.cpp"
 #endif
 
-Reader::Type Reader::detect(const char *fn) {
+Reader::Type Reader::detect(const char *fn, bool inspectheader) {
   FILE *fp = fopen(fn, "rb");
   if(!fp) return Unknown;
 
@@ -21,7 +21,7 @@ Reader::Type Reader::detect(const char *fn) {
   fread(p, 1, 8, fp);
   fclose(fp);
 
-  if(config::file.autodetect_type == true) {
+  if(inspectheader == true) {
     //inspect file header to determine type
     if(p[0] == 0x1f && p[1] == 0x8b && p[2] == 0x08 && p[3] <= 0x1f) return GZIP;
     if(p[0] == 0x50 && p[1] == 0x4b && p[2] == 0x03 && p[3] == 0x04) return ZIP;

src/reader/reader.h

@@ -8,7 +8,7 @@ public:
     JMA,
   };
 
-  static Type detect(const char *fn);
+  static Type detect(const char *fn, bool inspectheader);
   virtual unsigned size() = 0;
   virtual uint8_t* read(unsigned length = 0) = 0;
   virtual bool ready() { return true; } //can only call read() when ready() returns true

src/smp/ssmp/core/cc.bat

@@ -1,3 +0,0 @@
-cl /nologo /O2 ssmpgen.cpp
-@pause
-@del *.obj

src/smp/ssmp/core/cc.sh

@@ -0,0 +1,4 @@
+g++ -c ssmpgen.cpp -I../../../lib
+g++ -c ../../../lib/nall/string.cpp -I../../../lib
+g++ -o ssmpgen ssmpgen.o string.o
+rm *.o

src/smp/ssmp/core/clean.bat

@@ -1 +0,0 @@
-@del *.exe

src/smp/ssmp/core/clean.sh

@@ -0,0 +1 @@
+rm ssmpgen

src/smp/ssmp/core/core.cpp

@@ -2,17 +2,17 @@
 
 #include "opfn.cpp"
 
-#include "op_mov.cpp"
-#include "op_pc.cpp"
-#include "op_read.cpp"
-#include "op_rmw.cpp"
-#include "op_misc.cpp"
-
 void sSMP::enter() { loop:
   tracer.trace_smpop(); //traces SMP opcode (only if tracer is enabled)
 
   status.in_opcode = true;
-  (this->*optbl[op_readpc()])();
+  switch(op_readpc()) {
+    #include "op_mov.cpp"
+    #include "op_pc.cpp"
+    #include "op_read.cpp"
+    #include "op_rmw.cpp"
+    #include "op_misc.cpp"
+  }
   status.in_opcode = false;
 
   goto loop;

src/smp/ssmp/core/core.h

@@ -1,6 +1,5 @@
-void (sSMP::*optbl[256])();
+  uint16 dp, sp, rd, wr, bit, ya;
 
-uint16 dp, sp, rd, wr, bit, ya;
   bool   in_opcode() { return status.in_opcode; }
 
   uint8  op_adc (uint8  x, uint8  y);
@@ -18,5 +17,3 @@ uint16 dp, sp, rd, wr, bit, ya;
   uint8  op_lsr (uint8  x);
   uint8  op_rol (uint8  x);
   uint8  op_ror (uint8  x);
-
-#include "op.h"

src/smp/ssmp/core/op.h

@@ -1,256 +0,0 @@
-void op_mov_a_x();
-void op_mov_a_y();
-void op_mov_x_a();
-void op_mov_y_a();
-void op_mov_x_sp();
-void op_mov_sp_x();
-void op_mov_a_const();
-void op_mov_x_const();
-void op_mov_y_const();
-void op_mov_a_ix();
-void op_mov_a_ixinc();
-void op_mov_a_dp();
-void op_mov_x_dp();
-void op_mov_y_dp();
-void op_mov_a_dpx();
-void op_mov_x_dpy();
-void op_mov_y_dpx();
-void op_mov_a_addr();
-void op_mov_x_addr();
-void op_mov_y_addr();
-void op_mov_a_addrx();
-void op_mov_a_addry();
-void op_mov_a_idpx();
-void op_mov_a_idpy();
-void op_mov_dp_dp();
-void op_mov_dp_const();
-void op_mov_ix_a();
-void op_mov_ixinc_a();
-void op_mov_dp_a();
-void op_mov_dp_x();
-void op_mov_dp_y();
-void op_mov_dpx_a();
-void op_mov_dpy_x();
-void op_mov_dpx_y();
-void op_mov_addr_a();
-void op_mov_addr_x();
-void op_mov_addr_y();
-void op_mov_addrx_a();
-void op_mov_addry_a();
-void op_mov_idpx_a();
-void op_mov_idpy_a();
-void op_movw_ya_dp();
-void op_movw_dp_ya();
-void op_mov1_c_bit();
-void op_mov1_bit_c();
-void op_bra();
-void op_beq();
-void op_bne();
-void op_bcs();
-void op_bcc();
-void op_bvs();
-void op_bvc();
-void op_bmi();
-void op_bpl();
-void op_bbs0();
-void op_bbc0();
-void op_bbs1();
-void op_bbc1();
-void op_bbs2();
-void op_bbc2();
-void op_bbs3();
-void op_bbc3();
-void op_bbs4();
-void op_bbc4();
-void op_bbs5();
-void op_bbc5();
-void op_bbs6();
-void op_bbc6();
-void op_bbs7();
-void op_bbc7();
-void op_cbne_dp();
-void op_cbne_dpx();
-void op_dbnz_dp();
-void op_dbnz_y();
-void op_jmp_addr();
-void op_jmp_iaddrx();
-void op_call();
-void op_pcall();
-void op_tcall_0();
-void op_tcall_1();
-void op_tcall_2();
-void op_tcall_3();
-void op_tcall_4();
-void op_tcall_5();
-void op_tcall_6();
-void op_tcall_7();
-void op_tcall_8();
-void op_tcall_9();
-void op_tcall_10();
-void op_tcall_11();
-void op_tcall_12();
-void op_tcall_13();
-void op_tcall_14();
-void op_tcall_15();
-void op_brk();
-void op_ret();
-void op_reti();
-void op_adc_a_const();
-void op_and_a_const();
-void op_cmp_a_const();
-void op_cmp_x_const();
-void op_cmp_y_const();
-void op_eor_a_const();
-void op_or_a_const();
-void op_sbc_a_const();
-void op_adc_a_ix();
-void op_and_a_ix();
-void op_cmp_a_ix();
-void op_eor_a_ix();
-void op_or_a_ix();
-void op_sbc_a_ix();
-void op_adc_a_dp();
-void op_and_a_dp();
-void op_cmp_a_dp();
-void op_cmp_x_dp();
-void op_cmp_y_dp();
-void op_eor_a_dp();
-void op_or_a_dp();
-void op_sbc_a_dp();
-void op_adc_a_dpx();
-void op_and_a_dpx();
-void op_cmp_a_dpx();
-void op_eor_a_dpx();
-void op_or_a_dpx();
-void op_sbc_a_dpx();
-void op_adc_a_addr();
-void op_and_a_addr();
-void op_cmp_a_addr();
-void op_cmp_x_addr();
-void op_cmp_y_addr();
-void op_eor_a_addr();
-void op_or_a_addr();
-void op_sbc_a_addr();
-void op_adc_a_addrx();
-void op_adc_a_addry();
-void op_and_a_addrx();
-void op_and_a_addry();
-void op_cmp_a_addrx();
-void op_cmp_a_addry();
-void op_eor_a_addrx();
-void op_eor_a_addry();
-void op_or_a_addrx();
-void op_or_a_addry();
-void op_sbc_a_addrx();
-void op_sbc_a_addry();
-void op_adc_a_idpx();
-void op_and_a_idpx();
-void op_cmp_a_idpx();
-void op_eor_a_idpx();
-void op_or_a_idpx();
-void op_sbc_a_idpx();
-void op_adc_a_idpy();
-void op_and_a_idpy();
-void op_cmp_a_idpy();
-void op_eor_a_idpy();
-void op_or_a_idpy();
-void op_sbc_a_idpy();
-void op_adc_ix_iy();
-void op_and_ix_iy();
-void op_cmp_ix_iy();
-void op_eor_ix_iy();
-void op_or_ix_iy();
-void op_sbc_ix_iy();
-void op_adc_dp_dp();
-void op_and_dp_dp();
-void op_cmp_dp_dp();
-void op_eor_dp_dp();
-void op_or_dp_dp();
-void op_sbc_dp_dp();
-void op_adc_dp_const();
-void op_and_dp_const();
-void op_cmp_dp_const();
-void op_eor_dp_const();
-void op_or_dp_const();
-void op_sbc_dp_const();
-void op_addw_ya_dp();
-void op_subw_ya_dp();
-void op_cmpw_ya_dp();
-void op_and1_bit();
-void op_and1_notbit();
-void op_eor1_bit();
-void op_not1_bit();
-void op_or1_bit();
-void op_or1_notbit();
-void op_inc_a();
-void op_inc_x();
-void op_inc_y();
-void op_dec_a();
-void op_dec_x();
-void op_dec_y();
-void op_asl_a();
-void op_lsr_a();
-void op_rol_a();
-void op_ror_a();
-void op_inc_dp();
-void op_dec_dp();
-void op_asl_dp();
-void op_lsr_dp();
-void op_rol_dp();
-void op_ror_dp();
-void op_inc_dpx();
-void op_dec_dpx();
-void op_asl_dpx();
-void op_lsr_dpx();
-void op_rol_dpx();
-void op_ror_dpx();
-void op_inc_addr();
-void op_dec_addr();
-void op_asl_addr();
-void op_lsr_addr();
-void op_rol_addr();
-void op_ror_addr();
-void op_tset_addr_a();
-void op_tclr_addr_a();
-void op_incw_dp();
-void op_decw_dp();
-void op_nop();
-void op_sleep();
-void op_stop();
-void op_xcn();
-void op_daa();
-void op_das();
-void op_clrc();
-void op_clrp();
-void op_setc();
-void op_setp();
-void op_clrv();
-void op_notc();
-void op_ei();
-void op_di();
-void op_set0_dp();
-void op_clr0_dp();
-void op_set1_dp();
-void op_clr1_dp();
-void op_set2_dp();
-void op_clr2_dp();
-void op_set3_dp();
-void op_clr3_dp();
-void op_set4_dp();
-void op_clr4_dp();
-void op_set5_dp();
-void op_clr5_dp();
-void op_set6_dp();
-void op_clr6_dp();
-void op_set7_dp();
-void op_clr7_dp();
-void op_push_a();
-void op_push_x();
-void op_push_y();
-void op_push_p();
-void op_pop_a();
-void op_pop_x();
-void op_pop_y();
-void op_pop_p();
-void op_mul_ya();
-void op_div_ya_x();

src/smp/ssmp/core/op_misc.cpp

@@ -1,20 +1,24 @@
-void sSMP::op_nop() {
+//nop
+case 0x00: {
   op_io();
-}
+} break;
 
-void sSMP::op_sleep() {
+//sleep
+case 0xef: {
   op_io();
   op_io();
   regs.pc--;
-}
+} break;
 
-void sSMP::op_stop() {
+//stop
+case 0xff: {
   op_io();
   op_io();
   regs.pc--;
-}
+} break;
 
-void sSMP::op_xcn() {
+//xcn
+case 0x9f: {
   op_io();
   op_io();
   op_io();
@@ -22,9 +26,10 @@ void sSMP::op_xcn() {
   regs.a = (regs.a >> 4) | (regs.a << 4);
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_daa() {
+//daa
+case 0xdf: {
   op_io();
   op_io();
   if(regs.p.c || (regs.a) > 0x99) {
@@ -36,9 +41,10 @@ void sSMP::op_daa() {
   }
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_das() {
+//das
+case 0xbe: {
   op_io();
   op_io();
   if(!regs.p.c || (regs.a) > 0x99) {
@@ -50,213 +56,246 @@ void sSMP::op_das() {
   }
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_clrc() {
+//clrc
+case 0x60: {
   op_io();
   regs.p.c = 0;
-}
+} break;
 
-void sSMP::op_clrp() {
+//clrp
+case 0x20: {
   op_io();
   regs.p.p = 0;
-}
+} break;
 
-void sSMP::op_setc() {
+//setc
+case 0x80: {
   op_io();
   regs.p.c = 1;
-}
+} break;
 
-void sSMP::op_setp() {
+//setp
+case 0x40: {
   op_io();
   regs.p.p = 1;
-}
+} break;
 
-void sSMP::op_clrv() {
+//clrv
+case 0xe0: {
   op_io();
   regs.p.v = 0;
   regs.p.h = 0;
-}
+} break;
 
-void sSMP::op_notc() {
+//notc
+case 0xed: {
   op_io();
   op_io();
   regs.p.c ^= 1;
-}
+} break;
 
-void sSMP::op_ei() {
+//ei
+case 0xa0: {
   op_io();
   op_io();
   regs.p.i = 1;
-}
+} break;
 
-void sSMP::op_di() {
+//di
+case 0xc0: {
   op_io();
   op_io();
   regs.p.i = 0;
-}
+} break;
 
-void sSMP::op_set0_dp() {
+//set0_dp
+case 0x02: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x01;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr0_dp() {
+//clr0_dp
+case 0x12: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x01;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set1_dp() {
+//set1_dp
+case 0x22: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x02;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr1_dp() {
+//clr1_dp
+case 0x32: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x02;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set2_dp() {
+//set2_dp
+case 0x42: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x04;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr2_dp() {
+//clr2_dp
+case 0x52: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x04;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set3_dp() {
+//set3_dp
+case 0x62: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x08;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr3_dp() {
+//clr3_dp
+case 0x72: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x08;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set4_dp() {
+//set4_dp
+case 0x82: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x10;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr4_dp() {
+//clr4_dp
+case 0x92: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x10;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set5_dp() {
+//set5_dp
+case 0xa2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x20;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr5_dp() {
+//clr5_dp
+case 0xb2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x20;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set6_dp() {
+//set6_dp
+case 0xc2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x40;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr6_dp() {
+//clr6_dp
+case 0xd2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x40;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_set7_dp() {
+//set7_dp
+case 0xe2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd |=  0x80;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_clr7_dp() {
+//clr7_dp
+case 0xf2: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd &= ~0x80;
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_push_a() {
+//push_a
+case 0x2d: {
   op_io();
   op_io();
   op_writestack(regs.a);
-}
+} break;
 
-void sSMP::op_push_x() {
+//push_x
+case 0x4d: {
   op_io();
   op_io();
   op_writestack(regs.x);
-}
+} break;
 
-void sSMP::op_push_y() {
+//push_y
+case 0x6d: {
   op_io();
   op_io();
   op_writestack(regs.y);
-}
+} break;
 
-void sSMP::op_push_p() {
+//push_p
+case 0x0d: {
   op_io();
   op_io();
   op_writestack(regs.p);
-}
+} break;
 
-void sSMP::op_pop_a() {
+//pop_a
+case 0xae: {
   op_io();
   op_io();
   regs.a = op_readstack();
-}
+} break;
 
-void sSMP::op_pop_x() {
+//pop_x
+case 0xce: {
   op_io();
   op_io();
   regs.x = op_readstack();
-}
+} break;
 
-void sSMP::op_pop_y() {
+//pop_y
+case 0xee: {
   op_io();
   op_io();
   regs.y = op_readstack();
-}
+} break;
 
-void sSMP::op_pop_p() {
+//pop_p
+case 0x8e: {
   op_io();
   op_io();
   regs.p = op_readstack();
-}
+} break;
 
-void sSMP::op_mul_ya() {
+//mul_ya
+case 0xcf: {
   op_io();
   op_io();
   op_io();
@@ -271,9 +310,10 @@ void sSMP::op_mul_ya() {
 //result is set based on y (high-byte) only
   regs.p.n = !!(regs.y & 0x80);
   regs.p.z = (regs.y == 0);
-}
+} break;
 
-void sSMP::op_div_ya_x() {
+//div_ya_x
+case 0x9e: {
   op_io();
   op_io();
   op_io();
@@ -302,5 +342,5 @@ void sSMP::op_div_ya_x() {
 //result is set based on a (quotient) only
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 

src/smp/ssmp/core/op_mov.cpp

@@ -1,164 +1,187 @@
-void sSMP::op_mov_a_x() {
+//mov_a_x
+case 0x7d: {
   op_io();
   regs.a = regs.x;
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_a_y() {
+//mov_a_y
+case 0xdd: {
   op_io();
   regs.a = regs.y;
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_x_a() {
+//mov_x_a
+case 0x5d: {
   op_io();
   regs.x = regs.a;
   regs.p.n = !!(regs.x & 0x80);
   regs.p.z = (regs.x == 0);
-}
+} break;
 
-void sSMP::op_mov_y_a() {
+//mov_y_a
+case 0xfd: {
   op_io();
   regs.y = regs.a;
   regs.p.n = !!(regs.y & 0x80);
   regs.p.z = (regs.y == 0);
-}
+} break;
 
-void sSMP::op_mov_x_sp() {
+//mov_x_sp
+case 0x9d: {
   op_io();
   regs.x = regs.sp;
   regs.p.n = !!(regs.x & 0x80);
   regs.p.z = (regs.x == 0);
-}
+} break;
 
-void sSMP::op_mov_sp_x() {
+//mov_sp_x
+case 0xbd: {
   op_io();
   regs.sp = regs.x;
-}
+} break;
 
-void sSMP::op_mov_a_const() {
+//mov_a_const
+case 0xe8: {
   regs.a = op_readpc();
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_x_const() {
+//mov_x_const
+case 0xcd: {
   regs.x = op_readpc();
   regs.p.n = !!(regs.x & 0x80);
   regs.p.z = (regs.x == 0);
-}
+} break;
 
-void sSMP::op_mov_y_const() {
+//mov_y_const
+case 0x8d: {
   regs.y = op_readpc();
   regs.p.n = !!(regs.y & 0x80);
   regs.p.z = (regs.y == 0);
-}
+} break;
 
-void sSMP::op_mov_a_ix() {
+//mov_a_ix
+case 0xe6: {
   op_io();
   regs.a = op_readdp(regs.x);
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_a_ixinc() {
+//mov_a_ixinc
+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;
 
-void sSMP::op_mov_a_dp() {
+//mov_a_dp
+case 0xe4: {
   sp = op_readpc();
   regs.a = op_readdp(sp);
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_x_dp() {
+//mov_x_dp
+case 0xf8: {
   sp = op_readpc();
   regs.x = op_readdp(sp);
   regs.p.n = !!(regs.x & 0x80);
   regs.p.z = (regs.x == 0);
-}
+} break;
 
-void sSMP::op_mov_y_dp() {
+//mov_y_dp
+case 0xeb: {
   sp = op_readpc();
   regs.y = op_readdp(sp);
   regs.p.n = !!(regs.y & 0x80);
   regs.p.z = (regs.y == 0);
-}
+} break;
 
-void sSMP::op_mov_a_dpx() {
+//mov_a_dpx
+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;
 
-void sSMP::op_mov_x_dpy() {
+//mov_x_dpy
+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;
 
-void sSMP::op_mov_y_dpx() {
+//mov_y_dpx
+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;
 
-void sSMP::op_mov_a_addr() {
+//mov_a_addr
+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;
 
-void sSMP::op_mov_x_addr() {
+//mov_x_addr
+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;
 
-void sSMP::op_mov_y_addr() {
+//mov_y_addr
+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;
 
-void sSMP::op_mov_a_addrx() {
+//mov_a_addrx
+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;
 
-void sSMP::op_mov_a_addry() {
+//mov_a_addry
+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;
 
-void sSMP::op_mov_a_idpx() {
+//mov_a_idpx
+case 0xe7: {
   dp = op_readpc() + regs.x;
   op_io();
   sp  = op_readdp(dp);
@@ -166,9 +189,10 @@ void sSMP::op_mov_a_idpx() {
   regs.a = op_readaddr(sp);
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_a_idpy() {
+//mov_a_idpy
+case 0xf7: {
   dp = op_readpc();
   op_io();
   sp  = op_readdp(dp);
@@ -176,116 +200,132 @@ void sSMP::op_mov_a_idpy() {
   regs.a = op_readaddr(sp + regs.y);
   regs.p.n = !!(regs.a & 0x80);
   regs.p.z = (regs.a == 0);
-}
+} break;
 
-void sSMP::op_mov_dp_dp() {
+//mov_dp_dp
+case 0xfa: {
   sp = op_readpc();
   rd = op_readdp(sp);
   dp = op_readpc();
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_mov_dp_const() {
+//mov_dp_const
+case 0x8f: {
   rd = op_readpc();
   dp = op_readpc();
   op_readdp(dp);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_mov_ix_a() {
+//mov_ix_a
+case 0xc6: {
   op_io();
   op_readdp(regs.x);
   op_writedp(regs.x, regs.a);
-}
+} break;
 
-void sSMP::op_mov_ixinc_a() {
+//mov_ixinc_a
+case 0xaf: {
   op_io();
   op_io();
   op_writedp(regs.x++, regs.a);
-}
+} break;
 
-void sSMP::op_mov_dp_a() {
+//mov_dp_a
+case 0xc4: {
   dp = op_readpc();
   op_readdp(dp);
   op_writedp(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_dp_x() {
+//mov_dp_x
+case 0xd8: {
   dp = op_readpc();
   op_readdp(dp);
   op_writedp(dp, regs.x);
-}
+} break;
 
-void sSMP::op_mov_dp_y() {
+//mov_dp_y
+case 0xcb: {
   dp = op_readpc();
   op_readdp(dp);
   op_writedp(dp, regs.y);
-}
+} break;
 
-void sSMP::op_mov_dpx_a() {
+//mov_dpx_a
+case 0xd4: {
   dp  = op_readpc();
   op_io();
   dp += regs.x;
   op_readdp(dp);
   op_writedp(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_dpy_x() {
+//mov_dpy_x
+case 0xd9: {
   dp  = op_readpc();
   op_io();
   dp += regs.y;
   op_readdp(dp);
   op_writedp(dp, regs.x);
-}
+} break;
 
-void sSMP::op_mov_dpx_y() {
+//mov_dpx_y
+case 0xdb: {
   dp  = op_readpc();
   op_io();
   dp += regs.x;
   op_readdp(dp);
   op_writedp(dp, regs.y);
-}
+} break;
 
-void sSMP::op_mov_addr_a() {
+//mov_addr_a
+case 0xc5: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_readaddr(dp);
   op_writeaddr(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_addr_x() {
+//mov_addr_x
+case 0xc9: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_readaddr(dp);
   op_writeaddr(dp, regs.x);
-}
+} break;
 
-void sSMP::op_mov_addr_y() {
+//mov_addr_y
+case 0xcc: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_readaddr(dp);
   op_writeaddr(dp, regs.y);
-}
+} break;
 
-void sSMP::op_mov_addrx_a() {
+//mov_addrx_a
+case 0xd5: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_io();
   dp += regs.x;
   op_readaddr(dp);
   op_writeaddr(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_addry_a() {
+//mov_addry_a
+case 0xd6: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_io();
   dp += regs.y;
   op_readaddr(dp);
   op_writeaddr(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_idpx_a() {
+//mov_idpx_a
+case 0xc7: {
   sp  = op_readpc();
   op_io();
   sp += regs.x;
@@ -293,9 +333,10 @@ void sSMP::op_mov_idpx_a() {
   dp |= op_readdp(sp + 1) << 8;
   op_readaddr(dp);
   op_writeaddr(dp, regs.a);
-}
+} break;
 
-void sSMP::op_mov_idpy_a() {
+//mov_idpy_a
+case 0xd7: {
   sp  = op_readpc();
   dp  = op_readdp(sp);
   dp |= op_readdp(sp + 1) << 8;
@@ -303,34 +344,38 @@ void sSMP::op_mov_idpy_a() {
   dp += regs.y;
   op_readaddr(dp);
   op_writeaddr(dp, regs.a);
-}
+} break;
 
-void sSMP::op_movw_ya_dp() {
+//movw_ya_dp
+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;
 
-void sSMP::op_movw_dp_ya() {
+//movw_dp_ya
+case 0xda: {
   dp = op_readpc();
   op_readdp(dp);
   op_writedp(dp,     regs.a);
   op_writedp(dp + 1, regs.y);
-}
+} break;
 
-void sSMP::op_mov1_c_bit() {
+//mov1_c_bit
+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;
 
-void sSMP::op_mov1_bit_c() {
+//mov1_bit_c
+case 0xca: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   bit = dp >> 13;
@@ -340,5 +385,5 @@ void sSMP::op_mov1_bit_c() {
   else        rd &= ~(1 << bit);
   op_io();
   op_writeaddr(dp, rd);
-}
+} break;
 

src/smp/ssmp/core/op_pc.cpp

@@ -1,303 +1,334 @@
-void sSMP::op_bra() {
+//bra
+case 0x2f: {
   rd = op_readpc();
-  if(0)return;
+  if(0)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_beq() {
+//beq
+case 0xf0: {
   rd = op_readpc();
-  if(!regs.p.z)return;
+  if(!regs.p.z)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bne() {
+//bne
+case 0xd0: {
   rd = op_readpc();
-  if(regs.p.z)return;
+  if(regs.p.z)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bcs() {
+//bcs
+case 0xb0: {
   rd = op_readpc();
-  if(!regs.p.c)return;
+  if(!regs.p.c)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bcc() {
+//bcc
+case 0x90: {
   rd = op_readpc();
-  if(regs.p.c)return;
+  if(regs.p.c)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bvs() {
+//bvs
+case 0x70: {
   rd = op_readpc();
-  if(!regs.p.v)return;
+  if(!regs.p.v)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bvc() {
+//bvc
+case 0x50: {
   rd = op_readpc();
-  if(regs.p.v)return;
+  if(regs.p.v)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bmi() {
+//bmi
+case 0x30: {
   rd = op_readpc();
-  if(!regs.p.n)return;
+  if(!regs.p.n)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bpl() {
+//bpl
+case 0x10: {
   rd = op_readpc();
-  if(regs.p.n)return;
+  if(regs.p.n)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs0() {
+//bbs0
+case 0x03: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x01) != 0x01)return;
+  if((sp & 0x01) != 0x01)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc0() {
+//bbc0
+case 0x13: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x01) == 0x01)return;
+  if((sp & 0x01) == 0x01)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs1() {
+//bbs1
+case 0x23: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x02) != 0x02)return;
+  if((sp & 0x02) != 0x02)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc1() {
+//bbc1
+case 0x33: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x02) == 0x02)return;
+  if((sp & 0x02) == 0x02)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs2() {
+//bbs2
+case 0x43: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x04) != 0x04)return;
+  if((sp & 0x04) != 0x04)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc2() {
+//bbc2
+case 0x53: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x04) == 0x04)return;
+  if((sp & 0x04) == 0x04)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs3() {
+//bbs3
+case 0x63: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x08) != 0x08)return;
+  if((sp & 0x08) != 0x08)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc3() {
+//bbc3
+case 0x73: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x08) == 0x08)return;
+  if((sp & 0x08) == 0x08)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs4() {
+//bbs4
+case 0x83: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x10) != 0x10)return;
+  if((sp & 0x10) != 0x10)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc4() {
+//bbc4
+case 0x93: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x10) == 0x10)return;
+  if((sp & 0x10) == 0x10)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs5() {
+//bbs5
+case 0xa3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x20) != 0x20)return;
+  if((sp & 0x20) != 0x20)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc5() {
+//bbc5
+case 0xb3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x20) == 0x20)return;
+  if((sp & 0x20) == 0x20)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs6() {
+//bbs6
+case 0xc3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x40) != 0x40)return;
+  if((sp & 0x40) != 0x40)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc6() {
+//bbc6
+case 0xd3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x40) == 0x40)return;
+  if((sp & 0x40) == 0x40)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbs7() {
+//bbs7
+case 0xe3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x80) != 0x80)return;
+  if((sp & 0x80) != 0x80)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_bbc7() {
+//bbc7
+case 0xf3: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if((sp & 0x80) == 0x80)return;
+  if((sp & 0x80) == 0x80)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_cbne_dp() {
+//cbne_dp
+case 0x2e: {
   dp = op_readpc();
   sp = op_readdp(dp);
   rd = op_readpc();
   op_io();
-  if(regs.a == sp)return;
+  if(regs.a == sp)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_cbne_dpx() {
+//cbne_dpx
+case 0xde: {
   dp = op_readpc();
   op_io();
   sp = op_readdp(dp + regs.x);
   rd = op_readpc();
   op_io();
-  if(regs.a == sp)return;
+  if(regs.a == sp)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_dbnz_dp() {
+//dbnz_dp
+case 0x6e: {
   dp = op_readpc();
   wr = op_readdp(dp);
   op_writedp(dp, --wr);
   rd = op_readpc();
-  if(wr == 0x00)return;
+  if(wr == 0x00)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_dbnz_y() {
+//dbnz_y
+case 0xfe: {
   rd = op_readpc();
   op_io();
   regs.y--;
   op_io();
-  if(regs.y == 0x00)return;
+  if(regs.y == 0x00)break;
   op_io();
   op_io();
   regs.pc += (int8)rd;
-}
+} break;
 
-void sSMP::op_jmp_addr() {
+//jmp_addr
+case 0x5f: {
   rd  = op_readpc();
   rd |= op_readpc() << 8;
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_jmp_iaddrx() {
+//jmp_iaddrx
+case 0x1f: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   op_io();
@@ -305,9 +336,10 @@ void sSMP::op_jmp_iaddrx() {
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_call() {
+//call
+case 0x3f: {
   rd  = op_readpc();
   rd |= op_readpc() << 8;
   op_io();
@@ -316,18 +348,20 @@ void sSMP::op_call() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_pcall() {
+//pcall
+case 0x4f: {
   rd = op_readpc();
   op_io();
   op_io();
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = 0xff00 | rd;
-}
+} break;
 
-void sSMP::op_tcall_0() {
+//tcall_0
+case 0x01: {
   dp = 0xffde - (0 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -337,9 +371,10 @@ void sSMP::op_tcall_0() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_1() {
+//tcall_1
+case 0x11: {
   dp = 0xffde - (1 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -349,9 +384,10 @@ void sSMP::op_tcall_1() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_2() {
+//tcall_2
+case 0x21: {
   dp = 0xffde - (2 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -361,9 +397,10 @@ void sSMP::op_tcall_2() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_3() {
+//tcall_3
+case 0x31: {
   dp = 0xffde - (3 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -373,9 +410,10 @@ void sSMP::op_tcall_3() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_4() {
+//tcall_4
+case 0x41: {
   dp = 0xffde - (4 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -385,9 +423,10 @@ void sSMP::op_tcall_4() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_5() {
+//tcall_5
+case 0x51: {
   dp = 0xffde - (5 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -397,9 +436,10 @@ void sSMP::op_tcall_5() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_6() {
+//tcall_6
+case 0x61: {
   dp = 0xffde - (6 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -409,9 +449,10 @@ void sSMP::op_tcall_6() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_7() {
+//tcall_7
+case 0x71: {
   dp = 0xffde - (7 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -421,9 +462,10 @@ void sSMP::op_tcall_7() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_8() {
+//tcall_8
+case 0x81: {
   dp = 0xffde - (8 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -433,9 +475,10 @@ void sSMP::op_tcall_8() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_9() {
+//tcall_9
+case 0x91: {
   dp = 0xffde - (9 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -445,9 +488,10 @@ void sSMP::op_tcall_9() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_10() {
+//tcall_10
+case 0xa1: {
   dp = 0xffde - (10 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -457,9 +501,10 @@ void sSMP::op_tcall_10() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_11() {
+//tcall_11
+case 0xb1: {
   dp = 0xffde - (11 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -469,9 +514,10 @@ void sSMP::op_tcall_11() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_12() {
+//tcall_12
+case 0xc1: {
   dp = 0xffde - (12 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -481,9 +527,10 @@ void sSMP::op_tcall_12() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_13() {
+//tcall_13
+case 0xd1: {
   dp = 0xffde - (13 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -493,9 +540,10 @@ void sSMP::op_tcall_13() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_14() {
+//tcall_14
+case 0xe1: {
   dp = 0xffde - (14 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -505,9 +553,10 @@ void sSMP::op_tcall_14() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_tcall_15() {
+//tcall_15
+case 0xf1: {
   dp = 0xffde - (15 << 1);
   rd  = op_readaddr(dp);
   rd |= op_readaddr(dp + 1) << 8;
@@ -517,9 +566,10 @@ void sSMP::op_tcall_15() {
   op_writestack(regs.pc >> 8);
   op_writestack(regs.pc);
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_brk() {
+//brk
+case 0x0f: {
   rd  = op_readaddr(0xffde);
   rd |= op_readaddr(0xffdf) << 8;
   op_io();
@@ -530,22 +580,24 @@ void sSMP::op_brk() {
   regs.pc = rd;
   regs.p.b = 1;
   regs.p.i = 0;
-}
+} break;
 
-void sSMP::op_ret() {
+//ret
+case 0x6f: {
   rd  = op_readstack();
   rd |= op_readstack() << 8;
   op_io();
   op_io();
   regs.pc = rd;
-}
+} break;
 
-void sSMP::op_reti() {
+//reti
+case 0x7f: {
   regs.p = op_readstack();
   rd  = op_readstack();
   rd |= op_readstack() << 8;
   op_io();
   op_io();
   regs.pc = rd;
-}
+} break;
 

src/smp/ssmp/core/op_read.cpp

@@ -1,621 +1,705 @@
-void sSMP::op_adc_a_const() {
+//adc_a_const
+case 0x88: {
   rd = op_readpc();
   regs.a = op_adc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_and_a_const() {
+//and_a_const
+case 0x28: {
   rd = op_readpc();
   regs.a = op_and(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_a_const() {
+//cmp_a_const
+case 0x68: {
   rd = op_readpc();
   regs.a = op_cmp(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_x_const() {
+//cmp_x_const
+case 0xc8: {
   rd = op_readpc();
   regs.x = op_cmp(regs.x, rd);
-}
+} break;
 
-void sSMP::op_cmp_y_const() {
+//cmp_y_const
+case 0xad: {
   rd = op_readpc();
   regs.y = op_cmp(regs.y, rd);
-}
+} break;
 
-void sSMP::op_eor_a_const() {
+//eor_a_const
+case 0x48: {
   rd = op_readpc();
   regs.a = op_eor(regs.a, rd);
-}
+} break;
 
-void sSMP::op_or_a_const() {
+//or_a_const
+case 0x08: {
   rd = op_readpc();
   regs.a = op_or(regs.a, rd);
-}
+} break;
 
-void sSMP::op_sbc_a_const() {
+//sbc_a_const
+case 0xa8: {
   rd = op_readpc();
   regs.a = op_sbc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_adc_a_ix() {
+//adc_a_ix
+case 0x86: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_adc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_and_a_ix() {
+//and_a_ix
+case 0x26: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_and(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_a_ix() {
+//cmp_a_ix
+case 0x66: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_cmp(regs.a, rd);
-}
+} break;
 
-void sSMP::op_eor_a_ix() {
+//eor_a_ix
+case 0x46: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_eor(regs.a, rd);
-}
+} break;
 
-void sSMP::op_or_a_ix() {
+//or_a_ix
+case 0x06: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_or(regs.a, rd);
-}
+} break;
 
-void sSMP::op_sbc_a_ix() {
+//sbc_a_ix
+case 0xa6: {
   op_io();
   rd = op_readdp(regs.x);
   regs.a = op_sbc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_adc_a_dp() {
+//adc_a_dp
+case 0x84: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_adc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_and_a_dp() {
+//and_a_dp
+case 0x24: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_and(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_a_dp() {
+//cmp_a_dp
+case 0x64: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_cmp(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_x_dp() {
+//cmp_x_dp
+case 0x3e: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.x = op_cmp(regs.x, rd);
-}
+} break;
 
-void sSMP::op_cmp_y_dp() {
+//cmp_y_dp
+case 0x7e: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.y = op_cmp(regs.y, rd);
-}
+} break;
 
-void sSMP::op_eor_a_dp() {
+//eor_a_dp
+case 0x44: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_eor(regs.a, rd);
-}
+} break;
 
-void sSMP::op_or_a_dp() {
+//or_a_dp
+case 0x04: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_or(regs.a, rd);
-}
+} break;
 
-void sSMP::op_sbc_a_dp() {
+//sbc_a_dp
+case 0xa4: {
   dp = op_readpc();
   rd = op_readdp(dp);
   regs.a = op_sbc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_adc_a_dpx() {
+//adc_a_dpx
+case 0x94: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_adc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_and_a_dpx() {
+//and_a_dpx
+case 0x34: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_and(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_a_dpx() {
+//cmp_a_dpx
+case 0x74: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_cmp(regs.a, rd);
-}
+} break;
 
-void sSMP::op_eor_a_dpx() {
+//eor_a_dpx
+case 0x54: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_eor(regs.a, rd);
-}
+} break;
 
-void sSMP::op_or_a_dpx() {
+//or_a_dpx
+case 0x14: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_or(regs.a, rd);
-}
+} break;
 
-void sSMP::op_sbc_a_dpx() {
+//sbc_a_dpx
+case 0xb4: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   regs.a = op_sbc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_adc_a_addr() {
+//adc_a_addr
+case 0x85: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_adc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_and_a_addr() {
+//and_a_addr
+case 0x25: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_and(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_a_addr() {
+//cmp_a_addr
+case 0x65: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_cmp(regs.a, rd);
-}
+} break;
 
-void sSMP::op_cmp_x_addr() {
+//cmp_x_addr
+case 0x1e: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.x = op_cmp(regs.x, rd);
-}
+} break;
 
-void sSMP::op_cmp_y_addr() {
+//cmp_y_addr
+case 0x5e: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.y = op_cmp(regs.y, rd);
-}
+} break;
 
-void sSMP::op_eor_a_addr() {
+//eor_a_addr
+case 0x45: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_eor(regs.a, rd);
-}
+} break;
 
-void sSMP::op_or_a_addr() {
+//or_a_addr
+case 0x05: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_or(regs.a, rd);
-}
+} break;
 
-void sSMP::op_sbc_a_addr() {
+//sbc_a_addr
+case 0xa5: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   regs.a = op_sbc(regs.a, rd);
-}
+} break;
 
-void sSMP::op_adc_a_addrx() {
+//adc_a_addrx
+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;
 
-void sSMP::op_adc_a_addry() {
+//adc_a_addry
+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;
 
-void sSMP::op_and_a_addrx() {
+//and_a_addrx
+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;
 
-void sSMP::op_and_a_addry() {
+//and_a_addry
+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;
 
-void sSMP::op_cmp_a_addrx() {
+//cmp_a_addrx
+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;
 
-void sSMP::op_cmp_a_addry() {
+//cmp_a_addry
+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;
 
-void sSMP::op_eor_a_addrx() {
+//eor_a_addrx
+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;
 
-void sSMP::op_eor_a_addry() {
+//eor_a_addry
+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;
 
-void sSMP::op_or_a_addrx() {
+//or_a_addrx
+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;
 
-void sSMP::op_or_a_addry() {
+//or_a_addry
+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;
 
-void sSMP::op_sbc_a_addrx() {
+//sbc_a_addrx
+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;
 
-void sSMP::op_sbc_a_addry() {
+//sbc_a_addry
+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;
 
-void sSMP::op_adc_a_idpx() {
+//adc_a_idpx
+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;
 
-void sSMP::op_and_a_idpx() {
+//and_a_idpx
+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;
 
-void sSMP::op_cmp_a_idpx() {
+//cmp_a_idpx
+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;
 
-void sSMP::op_eor_a_idpx() {
+//eor_a_idpx
+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;
 
-void sSMP::op_or_a_idpx() {
+//or_a_idpx
+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;
 
-void sSMP::op_sbc_a_idpx() {
+//sbc_a_idpx
+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;
 
-void sSMP::op_adc_a_idpy() {
+//adc_a_idpy
+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;
 
-void sSMP::op_and_a_idpy() {
+//and_a_idpy
+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;
 
-void sSMP::op_cmp_a_idpy() {
+//cmp_a_idpy
+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;
 
-void sSMP::op_eor_a_idpy() {
+//eor_a_idpy
+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;
 
-void sSMP::op_or_a_idpy() {
+//or_a_idpy
+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;
 
-void sSMP::op_sbc_a_idpy() {
+//sbc_a_idpy
+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;
 
-void sSMP::op_adc_ix_iy() {
+//adc_ix_iy
+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;
 
-void sSMP::op_and_ix_iy() {
+//and_ix_iy
+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;
 
-void sSMP::op_cmp_ix_iy() {
+//cmp_ix_iy
+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;
 
-void sSMP::op_eor_ix_iy() {
+//eor_ix_iy
+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;
 
-void sSMP::op_or_ix_iy() {
+//or_ix_iy
+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;
 
-void sSMP::op_sbc_ix_iy() {
+//sbc_ix_iy
+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;
 
-void sSMP::op_adc_dp_dp() {
+//adc_dp_dp
+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;
 
-void sSMP::op_and_dp_dp() {
+//and_dp_dp
+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;
 
-void sSMP::op_cmp_dp_dp() {
+//cmp_dp_dp
+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;
 
-void sSMP::op_eor_dp_dp() {
+//eor_dp_dp
+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;
 
-void sSMP::op_or_dp_dp() {
+//or_dp_dp
+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;
 
-void sSMP::op_sbc_dp_dp() {
+//sbc_dp_dp
+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;
 
-void sSMP::op_adc_dp_const() {
+//adc_dp_const
+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;
 
-void sSMP::op_and_dp_const() {
+//and_dp_const
+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;
 
-void sSMP::op_cmp_dp_const() {
+//cmp_dp_const
+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;
 
-void sSMP::op_eor_dp_const() {
+//eor_dp_const
+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;
 
-void sSMP::op_or_dp_const() {
+//or_dp_const
+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;
 
-void sSMP::op_sbc_dp_const() {
+//sbc_dp_const
+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;
 
-void sSMP::op_addw_ya_dp() {
+//addw_ya_dp
+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;
 
-void sSMP::op_subw_ya_dp() {
+//subw_ya_dp
+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;
 
-void sSMP::op_cmpw_ya_dp() {
+//cmpw_ya_dp
+case 0x5a: {
   dp  = op_readpc();
   rd  = op_readdp(dp);
   rd |= op_readdp(dp + 1) << 8;
   op_cmpw(regs.ya, rd);
-}
+} break;
 
-void sSMP::op_and1_bit() {
+//and1_bit
+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;
 
-void sSMP::op_and1_notbit() {
+//and1_notbit
+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;
 
-void sSMP::op_eor1_bit() {
+//eor1_bit
+case 0x8a: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   bit = dp >> 13;
@@ -623,9 +707,10 @@ void sSMP::op_eor1_bit() {
   rd = op_readaddr(dp);
   op_io();
   regs.p.c = regs.p.c ^ !!(rd & (1 << bit));
-}
+} break;
 
-void sSMP::op_not1_bit() {
+//not1_bit
+case 0xea: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   bit = dp >> 13;
@@ -633,9 +718,10 @@ void sSMP::op_not1_bit() {
   rd = op_readaddr(dp);
   rd ^= (1 << bit);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_or1_bit() {
+//or1_bit
+case 0x0a: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   bit = dp >> 13;
@@ -643,9 +729,10 @@ void sSMP::op_or1_bit() {
   rd = op_readaddr(dp);
   op_io();
   regs.p.c = regs.p.c | !!(rd & (1 << bit));
-}
+} break;
 
-void sSMP::op_or1_notbit() {
+//or1_notbit
+case 0x2a: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   bit = dp >> 13;
@@ -653,5 +740,5 @@ void sSMP::op_or1_notbit() {
   rd = op_readaddr(dp);
   op_io();
   regs.p.c = regs.p.c | !(rd & (1 << bit));
-}
+} break;
 

src/smp/ssmp/core/op_rmw.cpp

@@ -1,192 +1,221 @@
-void sSMP::op_inc_a() {
+//inc_a
+case 0xbc: {
   op_io();
   regs.a = op_inc(regs.a);
-}
+} break;
 
-void sSMP::op_inc_x() {
+//inc_x
+case 0x3d: {
   op_io();
   regs.x = op_inc(regs.x);
-}
+} break;
 
-void sSMP::op_inc_y() {
+//inc_y
+case 0xfc: {
   op_io();
   regs.y = op_inc(regs.y);
-}
+} break;
 
-void sSMP::op_dec_a() {
+//dec_a
+case 0x9c: {
   op_io();
   regs.a = op_dec(regs.a);
-}
+} break;
 
-void sSMP::op_dec_x() {
+//dec_x
+case 0x1d: {
   op_io();
   regs.x = op_dec(regs.x);
-}
+} break;
 
-void sSMP::op_dec_y() {
+//dec_y
+case 0xdc: {
   op_io();
   regs.y = op_dec(regs.y);
-}
+} break;
 
-void sSMP::op_asl_a() {
+//asl_a
+case 0x1c: {
   op_io();
   regs.a = op_asl(regs.a);
-}
+} break;
 
-void sSMP::op_lsr_a() {
+//lsr_a
+case 0x5c: {
   op_io();
   regs.a = op_lsr(regs.a);
-}
+} break;
 
-void sSMP::op_rol_a() {
+//rol_a
+case 0x3c: {
   op_io();
   regs.a = op_rol(regs.a);
-}
+} break;
 
-void sSMP::op_ror_a() {
+//ror_a
+case 0x7c: {
   op_io();
   regs.a = op_ror(regs.a);
-}
+} break;
 
-void sSMP::op_inc_dp() {
+//inc_dp
+case 0xab: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_inc(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_dec_dp() {
+//dec_dp
+case 0x8b: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_dec(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_asl_dp() {
+//asl_dp
+case 0x0b: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_asl(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_lsr_dp() {
+//lsr_dp
+case 0x4b: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_lsr(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_rol_dp() {
+//rol_dp
+case 0x2b: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_rol(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_ror_dp() {
+//ror_dp
+case 0x6b: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd = op_ror(rd);
   op_writedp(dp, rd);
-}
+} break;
 
-void sSMP::op_inc_dpx() {
+//inc_dpx
+case 0xbb: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_inc(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_dec_dpx() {
+//dec_dpx
+case 0x9b: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_dec(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_asl_dpx() {
+//asl_dpx
+case 0x1b: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_asl(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_lsr_dpx() {
+//lsr_dpx
+case 0x5b: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_lsr(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_rol_dpx() {
+//rol_dpx
+case 0x3b: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_rol(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_ror_dpx() {
+//ror_dpx
+case 0x7b: {
   dp = op_readpc();
   op_io();
   rd = op_readdp(dp + regs.x);
   rd = op_ror(rd);
   op_writedp(dp + regs.x, rd);
-}
+} break;
 
-void sSMP::op_inc_addr() {
+//inc_addr
+case 0xac: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_inc(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_dec_addr() {
+//dec_addr
+case 0x8c: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_dec(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_asl_addr() {
+//asl_addr
+case 0x0c: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_asl(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_lsr_addr() {
+//lsr_addr
+case 0x4c: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_lsr(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_rol_addr() {
+//rol_addr
+case 0x2c: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_rol(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_ror_addr() {
+//ror_addr
+case 0x6c: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
   rd = op_ror(rd);
   op_writeaddr(dp, rd);
-}
+} break;
 
-void sSMP::op_tset_addr_a() {
+//tset_addr_a
+case 0x0e: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
@@ -194,9 +223,10 @@ void sSMP::op_tset_addr_a() {
   regs.p.z = ((regs.a - rd) == 0);
   op_readaddr(dp);
   op_writeaddr(dp, rd | regs.a);
-}
+} break;
 
-void sSMP::op_tclr_addr_a() {
+//tclr_addr_a
+case 0x4e: {
   dp  = op_readpc();
   dp |= op_readpc() << 8;
   rd = op_readaddr(dp);
@@ -204,9 +234,10 @@ void sSMP::op_tclr_addr_a() {
   regs.p.z = ((regs.a - rd) == 0);
   op_readaddr(dp);
   op_writeaddr(dp, rd &~ regs.a);
-}
+} break;
 
-void sSMP::op_incw_dp() {
+//incw_dp
+case 0x3a: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd++;
@@ -215,9 +246,10 @@ void sSMP::op_incw_dp() {
   op_writedp(dp, rd >> 8);
   regs.p.n = !!(rd & 0x8000);
   regs.p.z = (rd == 0);
-}
+} break;
 
-void sSMP::op_decw_dp() {
+//decw_dp
+case 0x1a: {
   dp = op_readpc();
   rd = op_readdp(dp);
   rd--;
@@ -226,5 +258,5 @@ void sSMP::op_decw_dp() {
   op_writedp(dp, rd >> 8);
   regs.p.n = !!(rd & 0x8000);
   regs.p.z = (rd == 0);
-}
+} break;
 

src/smp/ssmp/core/optable.cpp

@@ -1,256 +0,0 @@
-optbl[0x7d] = &sSMP::op_mov_a_x;
-optbl[0xdd] = &sSMP::op_mov_a_y;
-optbl[0x5d] = &sSMP::op_mov_x_a;
-optbl[0xfd] = &sSMP::op_mov_y_a;
-optbl[0x9d] = &sSMP::op_mov_x_sp;
-optbl[0xbd] = &sSMP::op_mov_sp_x;
-optbl[0xe8] = &sSMP::op_mov_a_const;
-optbl[0xcd] = &sSMP::op_mov_x_const;
-optbl[0x8d] = &sSMP::op_mov_y_const;
-optbl[0xe6] = &sSMP::op_mov_a_ix;
-optbl[0xbf] = &sSMP::op_mov_a_ixinc;
-optbl[0xe4] = &sSMP::op_mov_a_dp;
-optbl[0xf8] = &sSMP::op_mov_x_dp;
-optbl[0xeb] = &sSMP::op_mov_y_dp;
-optbl[0xf4] = &sSMP::op_mov_a_dpx;
-optbl[0xf9] = &sSMP::op_mov_x_dpy;
-optbl[0xfb] = &sSMP::op_mov_y_dpx;
-optbl[0xe5] = &sSMP::op_mov_a_addr;
-optbl[0xe9] = &sSMP::op_mov_x_addr;
-optbl[0xec] = &sSMP::op_mov_y_addr;
-optbl[0xf5] = &sSMP::op_mov_a_addrx;
-optbl[0xf6] = &sSMP::op_mov_a_addry;
-optbl[0xe7] = &sSMP::op_mov_a_idpx;
-optbl[0xf7] = &sSMP::op_mov_a_idpy;
-optbl[0xfa] = &sSMP::op_mov_dp_dp;
-optbl[0x8f] = &sSMP::op_mov_dp_const;
-optbl[0xc6] = &sSMP::op_mov_ix_a;
-optbl[0xaf] = &sSMP::op_mov_ixinc_a;
-optbl[0xc4] = &sSMP::op_mov_dp_a;
-optbl[0xd8] = &sSMP::op_mov_dp_x;
-optbl[0xcb] = &sSMP::op_mov_dp_y;
-optbl[0xd4] = &sSMP::op_mov_dpx_a;
-optbl[0xd9] = &sSMP::op_mov_dpy_x;
-optbl[0xdb] = &sSMP::op_mov_dpx_y;
-optbl[0xc5] = &sSMP::op_mov_addr_a;
-optbl[0xc9] = &sSMP::op_mov_addr_x;
-optbl[0xcc] = &sSMP::op_mov_addr_y;
-optbl[0xd5] = &sSMP::op_mov_addrx_a;
-optbl[0xd6] = &sSMP::op_mov_addry_a;
-optbl[0xc7] = &sSMP::op_mov_idpx_a;
-optbl[0xd7] = &sSMP::op_mov_idpy_a;
-optbl[0xba] = &sSMP::op_movw_ya_dp;
-optbl[0xda] = &sSMP::op_movw_dp_ya;
-optbl[0xaa] = &sSMP::op_mov1_c_bit;
-optbl[0xca] = &sSMP::op_mov1_bit_c;
-optbl[0x2f] = &sSMP::op_bra;
-optbl[0xf0] = &sSMP::op_beq;
-optbl[0xd0] = &sSMP::op_bne;
-optbl[0xb0] = &sSMP::op_bcs;
-optbl[0x90] = &sSMP::op_bcc;
-optbl[0x70] = &sSMP::op_bvs;
-optbl[0x50] = &sSMP::op_bvc;
-optbl[0x30] = &sSMP::op_bmi;
-optbl[0x10] = &sSMP::op_bpl;
-optbl[0x03] = &sSMP::op_bbs0;
-optbl[0x13] = &sSMP::op_bbc0;
-optbl[0x23] = &sSMP::op_bbs1;
-optbl[0x33] = &sSMP::op_bbc1;
-optbl[0x43] = &sSMP::op_bbs2;
-optbl[0x53] = &sSMP::op_bbc2;
-optbl[0x63] = &sSMP::op_bbs3;
-optbl[0x73] = &sSMP::op_bbc3;
-optbl[0x83] = &sSMP::op_bbs4;
-optbl[0x93] = &sSMP::op_bbc4;
-optbl[0xa3] = &sSMP::op_bbs5;
-optbl[0xb3] = &sSMP::op_bbc5;
-optbl[0xc3] = &sSMP::op_bbs6;
-optbl[0xd3] = &sSMP::op_bbc6;
-optbl[0xe3] = &sSMP::op_bbs7;
-optbl[0xf3] = &sSMP::op_bbc7;
-optbl[0x2e] = &sSMP::op_cbne_dp;
-optbl[0xde] = &sSMP::op_cbne_dpx;
-optbl[0x6e] = &sSMP::op_dbnz_dp;
-optbl[0xfe] = &sSMP::op_dbnz_y;
-optbl[0x5f] = &sSMP::op_jmp_addr;
-optbl[0x1f] = &sSMP::op_jmp_iaddrx;
-optbl[0x3f] = &sSMP::op_call;
-optbl[0x4f] = &sSMP::op_pcall;
-optbl[0x01] = &sSMP::op_tcall_0;
-optbl[0x11] = &sSMP::op_tcall_1;
-optbl[0x21] = &sSMP::op_tcall_2;
-optbl[0x31] = &sSMP::op_tcall_3;
-optbl[0x41] = &sSMP::op_tcall_4;
-optbl[0x51] = &sSMP::op_tcall_5;
-optbl[0x61] = &sSMP::op_tcall_6;
-optbl[0x71] = &sSMP::op_tcall_7;
-optbl[0x81] = &sSMP::op_tcall_8;
-optbl[0x91] = &sSMP::op_tcall_9;
-optbl[0xa1] = &sSMP::op_tcall_10;
-optbl[0xb1] = &sSMP::op_tcall_11;
-optbl[0xc1] = &sSMP::op_tcall_12;
-optbl[0xd1] = &sSMP::op_tcall_13;
-optbl[0xe1] = &sSMP::op_tcall_14;
-optbl[0xf1] = &sSMP::op_tcall_15;
-optbl[0x0f] = &sSMP::op_brk;
-optbl[0x6f] = &sSMP::op_ret;
-optbl[0x7f] = &sSMP::op_reti;
-optbl[0x88] = &sSMP::op_adc_a_const;
-optbl[0x28] = &sSMP::op_and_a_const;
-optbl[0x68] = &sSMP::op_cmp_a_const;
-optbl[0xc8] = &sSMP::op_cmp_x_const;
-optbl[0xad] = &sSMP::op_cmp_y_const;
-optbl[0x48] = &sSMP::op_eor_a_const;
-optbl[0x08] = &sSMP::op_or_a_const;
-optbl[0xa8] = &sSMP::op_sbc_a_const;
-optbl[0x86] = &sSMP::op_adc_a_ix;
-optbl[0x26] = &sSMP::op_and_a_ix;
-optbl[0x66] = &sSMP::op_cmp_a_ix;
-optbl[0x46] = &sSMP::op_eor_a_ix;
-optbl[0x06] = &sSMP::op_or_a_ix;
-optbl[0xa6] = &sSMP::op_sbc_a_ix;
-optbl[0x84] = &sSMP::op_adc_a_dp;
-optbl[0x24] = &sSMP::op_and_a_dp;
-optbl[0x64] = &sSMP::op_cmp_a_dp;
-optbl[0x3e] = &sSMP::op_cmp_x_dp;
-optbl[0x7e] = &sSMP::op_cmp_y_dp;
-optbl[0x44] = &sSMP::op_eor_a_dp;
-optbl[0x04] = &sSMP::op_or_a_dp;
-optbl[0xa4] = &sSMP::op_sbc_a_dp;
-optbl[0x94] = &sSMP::op_adc_a_dpx;
-optbl[0x34] = &sSMP::op_and_a_dpx;
-optbl[0x74] = &sSMP::op_cmp_a_dpx;
-optbl[0x54] = &sSMP::op_eor_a_dpx;
-optbl[0x14] = &sSMP::op_or_a_dpx;
-optbl[0xb4] = &sSMP::op_sbc_a_dpx;
-optbl[0x85] = &sSMP::op_adc_a_addr;
-optbl[0x25] = &sSMP::op_and_a_addr;
-optbl[0x65] = &sSMP::op_cmp_a_addr;
-optbl[0x1e] = &sSMP::op_cmp_x_addr;
-optbl[0x5e] = &sSMP::op_cmp_y_addr;
-optbl[0x45] = &sSMP::op_eor_a_addr;
-optbl[0x05] = &sSMP::op_or_a_addr;
-optbl[0xa5] = &sSMP::op_sbc_a_addr;
-optbl[0x95] = &sSMP::op_adc_a_addrx;
-optbl[0x96] = &sSMP::op_adc_a_addry;
-optbl[0x35] = &sSMP::op_and_a_addrx;
-optbl[0x36] = &sSMP::op_and_a_addry;
-optbl[0x75] = &sSMP::op_cmp_a_addrx;
-optbl[0x76] = &sSMP::op_cmp_a_addry;
-optbl[0x55] = &sSMP::op_eor_a_addrx;
-optbl[0x56] = &sSMP::op_eor_a_addry;
-optbl[0x15] = &sSMP::op_or_a_addrx;
-optbl[0x16] = &sSMP::op_or_a_addry;
-optbl[0xb5] = &sSMP::op_sbc_a_addrx;
-optbl[0xb6] = &sSMP::op_sbc_a_addry;
-optbl[0x87] = &sSMP::op_adc_a_idpx;
-optbl[0x27] = &sSMP::op_and_a_idpx;
-optbl[0x67] = &sSMP::op_cmp_a_idpx;
-optbl[0x47] = &sSMP::op_eor_a_idpx;
-optbl[0x07] = &sSMP::op_or_a_idpx;
-optbl[0xa7] = &sSMP::op_sbc_a_idpx;
-optbl[0x97] = &sSMP::op_adc_a_idpy;
-optbl[0x37] = &sSMP::op_and_a_idpy;
-optbl[0x77] = &sSMP::op_cmp_a_idpy;
-optbl[0x57] = &sSMP::op_eor_a_idpy;
-optbl[0x17] = &sSMP::op_or_a_idpy;
-optbl[0xb7] = &sSMP::op_sbc_a_idpy;
-optbl[0x99] = &sSMP::op_adc_ix_iy;
-optbl[0x39] = &sSMP::op_and_ix_iy;
-optbl[0x79] = &sSMP::op_cmp_ix_iy;
-optbl[0x59] = &sSMP::op_eor_ix_iy;
-optbl[0x19] = &sSMP::op_or_ix_iy;
-optbl[0xb9] = &sSMP::op_sbc_ix_iy;
-optbl[0x89] = &sSMP::op_adc_dp_dp;
-optbl[0x29] = &sSMP::op_and_dp_dp;
-optbl[0x69] = &sSMP::op_cmp_dp_dp;
-optbl[0x49] = &sSMP::op_eor_dp_dp;
-optbl[0x09] = &sSMP::op_or_dp_dp;
-optbl[0xa9] = &sSMP::op_sbc_dp_dp;
-optbl[0x98] = &sSMP::op_adc_dp_const;
-optbl[0x38] = &sSMP::op_and_dp_const;
-optbl[0x78] = &sSMP::op_cmp_dp_const;
-optbl[0x58] = &sSMP::op_eor_dp_const;
-optbl[0x18] = &sSMP::op_or_dp_const;
-optbl[0xb8] = &sSMP::op_sbc_dp_const;
-optbl[0x7a] = &sSMP::op_addw_ya_dp;
-optbl[0x9a] = &sSMP::op_subw_ya_dp;
-optbl[0x5a] = &sSMP::op_cmpw_ya_dp;
-optbl[0x4a] = &sSMP::op_and1_bit;
-optbl[0x6a] = &sSMP::op_and1_notbit;
-optbl[0x8a] = &sSMP::op_eor1_bit;
-optbl[0xea] = &sSMP::op_not1_bit;
-optbl[0x0a] = &sSMP::op_or1_bit;
-optbl[0x2a] = &sSMP::op_or1_notbit;
-optbl[0xbc] = &sSMP::op_inc_a;
-optbl[0x3d] = &sSMP::op_inc_x;
-optbl[0xfc] = &sSMP::op_inc_y;
-optbl[0x9c] = &sSMP::op_dec_a;
-optbl[0x1d] = &sSMP::op_dec_x;
-optbl[0xdc] = &sSMP::op_dec_y;
-optbl[0x1c] = &sSMP::op_asl_a;
-optbl[0x5c] = &sSMP::op_lsr_a;
-optbl[0x3c] = &sSMP::op_rol_a;
-optbl[0x7c] = &sSMP::op_ror_a;
-optbl[0xab] = &sSMP::op_inc_dp;
-optbl[0x8b] = &sSMP::op_dec_dp;
-optbl[0x0b] = &sSMP::op_asl_dp;
-optbl[0x4b] = &sSMP::op_lsr_dp;
-optbl[0x2b] = &sSMP::op_rol_dp;
-optbl[0x6b] = &sSMP::op_ror_dp;
-optbl[0xbb] = &sSMP::op_inc_dpx;
-optbl[0x9b] = &sSMP::op_dec_dpx;
-optbl[0x1b] = &sSMP::op_asl_dpx;
-optbl[0x5b] = &sSMP::op_lsr_dpx;
-optbl[0x3b] = &sSMP::op_rol_dpx;
-optbl[0x7b] = &sSMP::op_ror_dpx;
-optbl[0xac] = &sSMP::op_inc_addr;
-optbl[0x8c] = &sSMP::op_dec_addr;
-optbl[0x0c] = &sSMP::op_asl_addr;
-optbl[0x4c] = &sSMP::op_lsr_addr;
-optbl[0x2c] = &sSMP::op_rol_addr;
-optbl[0x6c] = &sSMP::op_ror_addr;
-optbl[0x0e] = &sSMP::op_tset_addr_a;
-optbl[0x4e] = &sSMP::op_tclr_addr_a;
-optbl[0x3a] = &sSMP::op_incw_dp;
-optbl[0x1a] = &sSMP::op_decw_dp;
-optbl[0x00] = &sSMP::op_nop;
-optbl[0xef] = &sSMP::op_sleep;
-optbl[0xff] = &sSMP::op_stop;
-optbl[0x9f] = &sSMP::op_xcn;
-optbl[0xdf] = &sSMP::op_daa;
-optbl[0xbe] = &sSMP::op_das;
-optbl[0x60] = &sSMP::op_clrc;
-optbl[0x20] = &sSMP::op_clrp;
-optbl[0x80] = &sSMP::op_setc;
-optbl[0x40] = &sSMP::op_setp;
-optbl[0xe0] = &sSMP::op_clrv;
-optbl[0xed] = &sSMP::op_notc;
-optbl[0xa0] = &sSMP::op_ei;
-optbl[0xc0] = &sSMP::op_di;
-optbl[0x02] = &sSMP::op_set0_dp;
-optbl[0x12] = &sSMP::op_clr0_dp;
-optbl[0x22] = &sSMP::op_set1_dp;
-optbl[0x32] = &sSMP::op_clr1_dp;
-optbl[0x42] = &sSMP::op_set2_dp;
-optbl[0x52] = &sSMP::op_clr2_dp;
-optbl[0x62] = &sSMP::op_set3_dp;
-optbl[0x72] = &sSMP::op_clr3_dp;
-optbl[0x82] = &sSMP::op_set4_dp;
-optbl[0x92] = &sSMP::op_clr4_dp;
-optbl[0xa2] = &sSMP::op_set5_dp;
-optbl[0xb2] = &sSMP::op_clr5_dp;
-optbl[0xc2] = &sSMP::op_set6_dp;
-optbl[0xd2] = &sSMP::op_clr6_dp;
-optbl[0xe2] = &sSMP::op_set7_dp;
-optbl[0xf2] = &sSMP::op_clr7_dp;
-optbl[0x2d] = &sSMP::op_push_a;
-optbl[0x4d] = &sSMP::op_push_x;
-optbl[0x6d] = &sSMP::op_push_y;
-optbl[0x0d] = &sSMP::op_push_p;
-optbl[0xae] = &sSMP::op_pop_a;
-optbl[0xce] = &sSMP::op_pop_x;
-optbl[0xee] = &sSMP::op_pop_y;
-optbl[0x8e] = &sSMP::op_pop_p;
-optbl[0xcf] = &sSMP::op_mul_ya;
-optbl[0x9e] = &sSMP::op_div_ya_x;

src/smp/ssmp/core/ssmpgen.cpp

@@ -1,18 +1,12 @@
 #define CLASS_NAME "sSMP"
-#include "../../../lib/opgen_so.cpp"
+#include <tool/opgen_switch.cpp>
 
 int main() {
-  fph = fopen("op.h", "wb");
-  fpt = fopen("optable.cpp", "wb");
-
   generate("op_mov.cpp",  "op_mov.b");
   generate("op_pc.cpp",   "op_pc.b");
   generate("op_read.cpp", "op_read.b");
   generate("op_rmw.cpp",  "op_rmw.b");
   generate("op_misc.cpp", "op_misc.b");
 
-  fclose(fph);
-  fclose(fpt);
-
   return 0;
 }

src/smp/ssmp/ssmp.cpp

@@ -66,7 +66,6 @@ void sSMP::reset() {
 }
 
 sSMP::sSMP() {
-  #include "core/optable.cpp"
 }
 
 sSMP::~sSMP() {

src/snes/scheduler/scheduler.h

@@ -40,18 +40,18 @@ public:
 
   // SMP <> DSP
 
-  alwaysinline void sync_smpdsp() {
-    if(clock.smpdsp < 0) {
+  alwaysinline void sync_smpdsp() {
+    if(clock.smpdsp < 0) {
       clock.active = THREAD_DSP;
-      co_switch(thread_dsp);
-    }
+      co_switch(thread_dsp);
+    }
   }
 
-  alwaysinline void sync_dspsmp() {
+  alwaysinline void sync_dspsmp() {
     if(clock.smpdsp >= 0) {
       clock.active = THREAD_SMP;
       co_switch(thread_smp);
-    }
+    }
   }
 
   // Timing
@@ -64,13 +64,19 @@ public:
   alwaysinline void addclocks_smp(uint clocks) {
     clock.cpusmp += clocks * (uint64)clock.cpu_freq;
     if(clock.cpusmp > +(250000 * (int64)20000000)) sync_smpcpu();
-    clock.smpdsp -= clocks;
-    sync_smpdsp();
+    clock.smpdsp -= clocks;
+    #if !defined(USE_STATE_MACHINE)
+    sync_smpdsp();
+    #else
+    while(clock.smpdsp < 0) dsp.enter();
+    #endif
   }
 
   alwaysinline void addclocks_dsp(uint clocks) {
-    clock.smpdsp += clocks;
-    sync_dspsmp();
+    clock.smpdsp += clocks;
+    #if !defined(USE_STATE_MACHINE)
+    sync_dspsmp();
+    #endif
   }
 
   void enter();

src/ui/event.cpp

@@ -294,6 +294,7 @@ void load_cart_normal(const char *filename) {
 //warn if unsupported hardware detected
   if(cartridge.info.superfx) alert("Warning: unsupported SuperFX chip detected.");
   if(cartridge.info.sa1)     alert("Warning: unsupported SA-1 chip detected.");
+  if(cartridge.info.spc7110) alert("Warning: unsupported SPC7110 chip detected.");
   if(cartridge.info.st011)   alert("Warning: unsupported ST011 chip detected.");
   if(cartridge.info.st018)   alert("Warning: unsupported ST018 chip detected.");
 

src/ui/main.cpp

@@ -74,12 +74,7 @@ void set_config_filename() {
 
 void get_base_path(const char *image) {
   char full_name[PATH_MAX] = "";
-
-  #if defined(PLATFORM_WIN)
-  GetFullPathName(image, PATH_MAX, full_name, 0);
-  #elif defined(PLATFORM_X)
   realpath(image, full_name);
-  #endif
 
   string t = full_name;
   if(strlen(t) != 0) {
@@ -117,11 +112,7 @@ void run() {
 
   if(cartridge.loaded() == false || app.pause == true || app.autopause == true) {
     //prevent bsnes from consuming 100% CPU resources when idle
-    #if defined(PLATFORM_WIN)
-    Sleep(20);
-    #elif defined(PLATFORM_X)
     usleep(20 * 1000);
-    #endif
   } else {
     snes.runtoframe();
     event::update_status();

src/ui/settings/advanced.cpp

@@ -53,11 +53,11 @@ void AdvancedWindow::load() {
     string name = config::config().list[i]->name;
 
     //blacklist (omit/hide options that can be configured through the standard UI)
-    if(name == "file.autodetect_type") continue;
+    if(strbegin(name, "file.")) continue;
     if(strbegin(name, "path.")) continue;
     if(strbegin(name, "snes.controller_port_")) continue;
-    if(strpos(name, "colorfilter.") >= 0) continue;
-    if(name == "misc.status_enable") continue;
+    if(strpos(name, "colorfilter.") >= 0) continue;
+    if(name == "misc.status_enable") continue;
     if(name == "system.regulate_speed") continue;
     if(strbegin(name, "video.windowed.") && name != "video.windowed.synchronize") continue;
     if(strbegin(name, "video.fullscreen.") && name != "video.fullscreen.synchronize") continue;

src/ui/settings/pathsettings.cpp

@@ -10,6 +10,32 @@ uintptr_t PathSettingsWindow::selectpath_rom(Event) {
 uintptr_t PathSettingsWindow::defaultpath_rom(Event) {
   config::path.rom = "";
   rompath.set_text("");
+  return true;
+}
+
+uintptr_t PathSettingsWindow::autodetect_tick(Event) {
+  config::file.autodetect_type = autodetect.checked();
+  return true;
+}
+
+uintptr_t PathSettingsWindow::selectpath_patch(Event) {
+  char t[PATH_MAX];
+  if(hiro().folder_select(&window_settings, t) == true) {
+    config::path.patch = t;
+    patchpath.set_text(config::path.patch);
+  }
+  return true;
+}
+
+uintptr_t PathSettingsWindow::defaultpath_patch(Event) {
+  config::path.patch = "";
+  patchpath.set_text("");
+  return true;
+}
+
+uintptr_t PathSettingsWindow::bypass_crc32_tick(Event) {
+  config::file.bypass_patch_crc32 = bypass_crc32.checked();
+  return true;
 }
 
 uintptr_t PathSettingsWindow::selectpath_save(Event) {
@@ -24,6 +50,7 @@ uintptr_t PathSettingsWindow::selectpath_save(Event) {
 uintptr_t PathSettingsWindow::defaultpath_save(Event) {
   config::path.save = "";
   savepath.set_text("");
+  return true;
 }
 
 uintptr_t PathSettingsWindow::selectpath_cheat(Event) {
@@ -38,10 +65,7 @@ uintptr_t PathSettingsWindow::selectpath_cheat(Event) {
 uintptr_t PathSettingsWindow::defaultpath_cheat(Event) {
   config::path.cheat = "";
   cheatpath.set_text("");
-}
-
-uintptr_t PathSettingsWindow::autodetect_tick(Event) {
-  config::file.autodetect_type = autodetect.checked();
+  return true;
 }
 
 void PathSettingsWindow::setup() {
@@ -51,6 +75,13 @@ void PathSettingsWindow::setup() {
   rompath.create(Editbox::Readonly, 265, 30);
   romselect.create(0, 100, 30, "Select");
   romdefault.create(0, 100, 30, "Default");
+  autodetect.create(0, 475, 20, "Auto-detect file compression type (ignore file extension)");
+
+  lpatchpath.create(0, 475, 20, "Default UPS patch path:");
+  patchpath.create(Editbox::Readonly, 265, 30);
+  patchselect.create(0, 100, 30, "Select");
+  patchdefault.create(0, 100, 30, "Default");
+  bypass_crc32.create(0, 475, 20, "Bypass CRC32 patch validation (not recommended)");
 
   lsavepath.create(0, 475, 20, "Default save RAM path:");
   savepath.create(Editbox::Readonly, 265, 30);
@@ -62,33 +93,47 @@ void PathSettingsWindow::setup() {
   cheatselect.create(0, 100, 30, "Select");
   cheatdefault.create(0, 100, 30, "Default");
 
-  autodetect.create(0, 475, 20, "Auto-detect file compression type (ignore file extension)");
-
   unsigned y = 0;
   attach(lrompath, 0, y); y += 20;
   attach(rompath, 0, y);
   attach(romselect, 270, y);
-  attach(romdefault, 375, y); y += 35;
+  attach(romdefault, 375, y); y += 30;
+  attach(autodetect, 0, y); y += 25;
+
+  attach(lpatchpath, 0, y); y += 20;
+  attach(patchpath, 0, y);
+  attach(patchselect, 270, y);
+  attach(patchdefault, 375, y); y += 30;
+  attach(bypass_crc32, 0, y); y += 25;
+
   attach(lsavepath, 0, y); y += 20;
   attach(savepath, 0, y);
   attach(saveselect, 270, y);
   attach(savedefault, 375, y); y += 35;
+
   attach(lcheatpath, 0, y); y += 20;
   attach(cheatpath, 0, y);
   attach(cheatselect, 270, y);
   attach(cheatdefault, 375, y); y += 35;
-  attach(autodetect, 0, y); y += 20;
 
   romselect.on_tick = bind(&PathSettingsWindow::selectpath_rom, this);
   romdefault.on_tick = bind(&PathSettingsWindow::defaultpath_rom, this);
-  saveselect.on_tick = bind(&PathSettingsWindow::selectpath_save, this);
-  savedefault.on_tick = bind(&PathSettingsWindow::defaultpath_save, this);
-  cheatselect.on_tick = bind(&PathSettingsWindow::selectpath_cheat, this);
-  cheatdefault.on_tick = bind(&PathSettingsWindow::defaultpath_cheat, this);
   autodetect.on_tick = bind(&PathSettingsWindow::autodetect_tick, this);
 
+  patchselect.on_tick = bind(&PathSettingsWindow::selectpath_patch, this);
+  patchdefault.on_tick = bind(&PathSettingsWindow::defaultpath_patch, this);
+  bypass_crc32.on_tick = bind(&PathSettingsWindow::bypass_crc32_tick, this);
+
+  saveselect.on_tick = bind(&PathSettingsWindow::selectpath_save, this);
+  savedefault.on_tick = bind(&PathSettingsWindow::defaultpath_save, this);
+
+  cheatselect.on_tick = bind(&PathSettingsWindow::selectpath_cheat, this);
+  cheatdefault.on_tick = bind(&PathSettingsWindow::defaultpath_cheat, this);
+
   rompath.set_text(config::path.rom);
+  autodetect.check(config::file.autodetect_type);
+  patchpath.set_text(config::path.patch);
+  bypass_crc32.check(config::file.bypass_patch_crc32);
   savepath.set_text(config::path.save);
   cheatpath.set_text(config::path.cheat);
-  autodetect.check(config::file.autodetect_type);
 }

src/ui/settings/pathsettings.h

@@ -4,6 +4,13 @@ public:
   Editbox rompath;
   Button romselect;
   Button romdefault;
+  Checkbox autodetect;
+
+  Label lpatchpath;
+  Editbox patchpath;
+  Button patchselect;
+  Button patchdefault;
+  Checkbox bypass_crc32;
 
   Label lsavepath;
   Editbox savepath;
@@ -15,14 +22,19 @@ public:
   Button cheatselect;
   Button cheatdefault;
 
-  Checkbox autodetect;
-
   uintptr_t selectpath_rom(Event);
   uintptr_t defaultpath_rom(Event);
+  uintptr_t autodetect_tick(Event);
+
+  uintptr_t selectpath_patch(Event);
+  uintptr_t defaultpath_patch(Event);
+  uintptr_t bypass_crc32_tick(Event);
+
   uintptr_t selectpath_save(Event);
   uintptr_t defaultpath_save(Event);
+
   uintptr_t selectpath_cheat(Event);
   uintptr_t defaultpath_cheat(Event);
-  uintptr_t autodetect_tick(Event);
+
   void setup();
 } window_path_settings;