Update to bsnes v029 release.

A new version of bsnes has been released. It contains a few minor emulation fixes, as well as user interface improvements. Behind the scenes, the source has been cleaned up more in preparation for running the CPU and PPU (video processor) separately from each other (eg with no enslavement.) This is required for implementing a clock cycle based PPU renderer. - Greatly improved invalid DMA transfer behavior, should be nearly perfect now - Major code cleanup -- most importantly, almost all PPU timing-related settings moved back to PPU, from CPU - Added option to auto-detect file type by inspecting file headers rather than file extensions - Rewrote video filter system to move it out of the emulation core -- HQ2x and Scale2x will work even in hires and interlace modes now, 50% scanline filter added - Re-added bsnes window icon - Added new controller graphic when assigning joypad keys [FitzRoy] - Redundant "Advanced" panel settings which can be configured via the GUI are no longer displayed - Improved speed regulation settings - XP and Vista themes will now apply to bsnes controls - Added "Path Settings" window to allow easy selection of default file directories - Tab key now mostly works throughout most of the GUI (needs improvement) - Main window will no longer disappear when setting a video multipler which results in a window size larger than the current desktop resolution - Added two new advanced options: one to control GUI window opacity, and one to adjust the statusbar text
2008-03-18 06:19:43 +00:00 · 2008-03-18 06:19:43 +00:00 · 805398e5a8
parent 7e6e3e3a69
commit 805398e5a8
316 changed files with 6230 additions and 4402 deletions
--- a/readme.txt
+++ b/readme.txt
@ -1,5 +1,5 @@
 bsnes
-Version: 0.028
+Version: 0.029
 Author: byuu
 --------
@ -17,7 +17,6 @@ Please see license.txt for important licensing information.
 Known Limitations:
 ------------------
 S-CPU
 - Invalid DMA / HDMA transfers not fully emulated
 - Multiply / Divide register delays not implemented
 S-PPU
--- a/src/Makefile
+++ b/src/Makefile
@ -1,7 +1,5 @@
 include lib/nall/Makefile.string
 prefix = /usr/local
 arch = ARCH_LSB
 ################
 ### compiler ###
@ -37,12 +35,11 @@ endif
 ifeq ($(platform),x) # X11
  ruby = video.glx video.xv video.sdl audio.openal audio.oss audio.ao input.sdl input.x
  arch += PLATFORM_X
  link += `pkg-config --libs gtk+-2.0`
  link += $(call mklib,Xtst)
  delete = rm -f $1
 else ifeq ($(platform),win) # Windows
  ruby = video.direct3d video.directdraw video.gdi audio.directsound input.directinput
  arch += PLATFORM_WIN
  link += $(if $(findstring mingw,$(compiler)),-mwindows)
  link += $(call mklib,uuid)
  link += $(call mklib,kernel32)
@ -61,13 +58,16 @@ endif
 ### ruby ###
 ############
 rubyflags =
 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.xv,$(ruby)),$(call mklib,Xv))
 link += $(if $(findstring audio.ao,$(ruby)),$(call mklib,ao))
 link += $(if $(findstring audio.directsound,$(ruby)),$(call mklib,dsound))
-link += $(if $(findstring audio.openal,$(ruby)),$(call mklib,openal) $(call mklib,alut))
+link += $(if $(findstring audio.openal,$(ruby)),$(if $(call streq,$(platform),x),$(call mklib,openal),$(call mklib,openal32)))
 link += $(if $(findstring input.directinput,$(ruby)),$(call mklib,dinput8) $(call mklib,dxguid))
 link += $(if $(findstring input.sdl,$(ruby)),`sdl-config --libs`)
@ -75,7 +75,7 @@ link += $(if $(findstring input.sdl,$(ruby)),`sdl-config --libs`)
 ### main target and dependencies ###
 ####################################
-objects = main libco hiro ruby $(ruby) string reader cart cheat \
+objects = main libco hiro ruby libfilter string reader cart cheat \
  memory smemory cpu scpu smp ssmp bdsp ppu bppu snes \
  bsx srtc sdd1 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010
@ -89,7 +89,6 @@ ifeq ($(enable_jma),true)
  flags += $(call mkdef,JMA_SUPPORT)
 endif
 arch := $(patsubst %,$(call mkdef,%),$(arch))
 objects := $(patsubst %,obj/%.$(obj),$(objects))
 rubydef := $(foreach c,$(subst .,_,$(call strupper,$(ruby))),$(call mkdef,$c))
@ -124,46 +123,21 @@ all: build;
 ### main ###
 ############
-obj/main.$(obj): ui/main.cpp config/* lib/nall/* lib/ruby/* ui/* ui/loader/* ui/settings/*
+obj/main.$(obj): ui/main.cpp ui/* ui/base/* ui/loader/* ui/settings/*
-	$(call compile,$(arch))
+obj/bsnes.res: ui/bsnes.rc; rc /r /foobj/bsnes.res ui/bsnes.rc
-
+obj/bsnesrc.$(obj): ui/bsnes.rc; windres ui/bsnes.rc obj/bsnesrc.$(obj)
 obj/bsnes.res     : ui/bsnes.rc; rc /r /foobj/bsnes.res ui/bsnes.rc
 obj/bsnesrc.$(obj): ui/bsnes.rc; windres -I data ui/bsnes.rc obj/bsnesrc.$(obj)
 ############
 ### ruby ###
 ############
 obj/ruby.$(obj)             : lib/ruby/ruby.cpp lib/ruby/*
 	$(call compile,$(rubydef))
 obj/video.direct3d.$(obj)   : lib/ruby/video/direct3d.cpp lib/ruby/video/direct3d.*
 obj/video.directdraw.$(obj) : lib/ruby/video/directdraw.cpp lib/ruby/video/directdraw.*
 obj/video.gdi.$(obj)        : lib/ruby/video/gdi.cpp lib/ruby/video/gdi.*
 obj/video.glx.$(obj)        : lib/ruby/video/glx.cpp lib/ruby/video/glx.*
 obj/video.sdl.$(obj)        : lib/ruby/video/sdl.cpp lib/ruby/video/sdl.*
 	$(call compile,`sdl-config --cflags`)
 obj/video.xv.$(obj)         : lib/ruby/video/xv.cpp lib/ruby/video/xv.*
 obj/audio.ao.$(obj)         : lib/ruby/audio/ao.cpp lib/ruby/audio/ao.*
 obj/audio.directsound.$(obj): lib/ruby/audio/directsound.cpp lib/ruby/audio/directsound.*
 obj/audio.openal.$(obj)     : lib/ruby/audio/openal.cpp lib/ruby/audio/openal.*
 obj/audio.oss.$(obj)        : lib/ruby/audio/oss.cpp lib/ruby/audio/oss.*
 obj/input.directinput.$(obj): lib/ruby/input/directinput.cpp lib/ruby/input/directinput.*
 obj/input.sdl.$(obj)        : lib/ruby/input/sdl.cpp lib/ruby/input/sdl.*
 	$(call compile,`sdl-config --cflags`)
 obj/input.x.$(obj)          : lib/ruby/input/x.cpp lib/ruby/input/x.*
 ############
 ### hiro ###
 ############
 obj/hiro.$(obj): lib/hiro.cpp lib/hiro.* lib/hiro_gtk/* lib/hiro_win/*
 	$(call compile,$(if $(call streq,$(platform),x),`pkg-config --cflags gtk+-2.0`))
 #################
 ### libraries ###
 #################
-obj/libco.$(obj): lib/libco.c lib/libco.* lib/libco/*
+obj/ruby.$(obj): lib/ruby/ruby.cpp lib/ruby/*
 	$(call compile,$(rubydef) $(rubyflags))
 obj/hiro.$(obj): lib/hiro/hiro.cpp lib/hiro/* lib/hiro/gtk/* lib/hiro/win/*
 	$(call compile,$(if $(call streq,$(platform),x),`pkg-config --cflags gtk+-2.0`))
 obj/libco.$(obj):     lib/libco/libco.c lib/libco/*
 	$(call compile,-static)
 obj/libfilter.$(obj): lib/libfilter/libfilter.cpp lib/libfilter/*
 obj/string.$(obj):    lib/nall/string.cpp lib/nall/*
 #################
@ -179,7 +153,6 @@ obj/cheat.$(obj) : cheat/cheat.cpp cheat/*
 ##############
 obj/memory.$(obj) : memory/memory.cpp memory/*
 obj/bmemory.$(obj): memory/bmemory/bmemory.cpp memory/bmemory/* memory/bmemory/mapper/*
 obj/smemory.$(obj): memory/smemory/smemory.cpp memory/smemory/* memory/smemory/mapper/*
 ###########
@ -270,8 +243,8 @@ build: $(objects)
 	$(strip $(cpp) $(call mkbin,../bsnes) $(objects) $(link))
 install:
-	install -D -m 755 ../bsnes $(prefix)/bin/bsnes
+	install -D -m 755 ../bsnes $(DESTDIR)$(prefix)/bin/bsnes
-	install -D -m 644 data/bsnes.png $(prefix)/share/icons/bsnes.png
+	install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/icons/bsnes.png
 clean:
 	-@$(call delete,obj/*.$(obj))
--- a/src/base.h
+++ b/src/base.h
@ -1,4 +1,4 @@
-#define BSNES_VERSION "0.028.01"
+#define BSNES_VERSION "0.029"
 #define BSNES_TITLE   "bsnes v" BSNES_VERSION
 #define BUSCORE sBus
@ -7,32 +7,28 @@
 #define DSPCORE bDSP
 #define PPUCORE bPPU
-//FAVOR_ACCURACY calculates RTO during frameskip, whereas FAVOR_SPEED does not
+//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
 //#define FAVOR_ACCURACY
 #define FAVOR_SPEED
 //game genie + pro action replay code support (~1-3% speed hit)
 #define CHEAT_SYSTEM
 #if !defined(ARCH_LSB) && !defined(ARCH_MSB)
  #define ARCH_LSB //guess
 #endif
 #include <nall/algorithm.hpp>
 #include <nall/array.hpp>
 #include <nall/bit.hpp>
 #include <nall/config.hpp>
 #include <nall/detect.hpp>
 #include <nall/function.hpp>
 #include <nall/new.hpp>
 #include <nall/sort.hpp>
 #include <nall/stdint.hpp>
 #include <nall/string.hpp>
 #include <nall/vector.hpp>
 using namespace nall;
-#include <libco.h>
+#include <libco/libco.h>
 #include <bbase.h>
 //platform-specific global functions
--- a/src/cart/cart.cpp
+++ b/src/cart/cart.cpp
@ -1,4 +1,5 @@
 #include "../base.h"
 #define CART_CPP
 #include "cart_normal.cpp"
 #include "cart_bsx.cpp"
@ -82,12 +83,9 @@ void Cartridge::load_end() {
  memory::stBrom.write_protect(true);
  memory::stBram.write_protect(false);
-char fn[PATH_MAX];
+  if(fexists(get_cheat_filename(cart.fn, "cht"))) {
  strcpy(fn, cart.fn);
  modify_extension(fn, "cht");
  if(fexists(fn)) {
    cheat.clear();
-    cheat.load(fn);
+    cheat.load(cheatfn);
  }
  cart.loaded = true;
@ -114,11 +112,11 @@ bool Cartridge::unload() {
  safe_free(stB.rom);
  safe_free(stB.ram);
-char fn[PATH_MAX];
+  char fn[PATH_MAX];
  strcpy(fn, cart.fn);
  modify_extension(fn, "cht");
-  if(cheat.count() > 0 || fexists(fn)) {
+  if(cheat.count() > 0 || fexists(get_cheat_filename(cart.fn, "cht"))) {
-    cheat.save(fn);
+    cheat.save(cheatfn);
    cheat.clear();
  }
--- a/src/cart/cart.h
+++ b/src/cart/cart.h
@ -68,6 +68,7 @@ public:
    CartridgeType type;
    uint32 crc32;
    char filename[PATH_MAX * 4];
    char name[128];
    Region region;
@ -123,13 +124,17 @@ public:
  bool load_file(const char *fn, uint8 *&data, uint &size);
  bool save_file(const char *fn, uint8 *data, uint 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_save_filename(const char *source, const char *extension);
  char* get_cheat_filename(const char *source, const char *extension);
  Cartridge();
  ~Cartridge();
 private:
  char savefn[PATH_MAX];
  char cheatfn[PATH_MAX];
 };
 namespace memory {
--- a/src/cart/cart_bsc.cpp
+++ b/src/cart/cart_bsc.cpp
@ -1,3 +1,5 @@
 #ifdef CART_CPP
 void Cartridge::load_cart_bsc(const char *base, const char *slot) {
  if(!base || !*base) return;
@ -5,8 +7,8 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
  strcpy(bs.fn, slot ? slot : "");
  load_begin(CartridgeBSC);
-uint8 *data;
+  uint8_t *data = 0;
-uint size;
+  unsigned size;
  load_file(cart.fn, data, size);
  cart.rom = data, cart.rom_size = size;
@ -34,8 +36,21 @@ uint size;
  }
  load_end();
  //set base filename
  strcpy(info.filename, cart.fn);
  get_base_filename(info.filename);
  if(*bs.fn) {
    char filenameBS[PATH_MAX];
    strcpy(filenameBS, bs.fn);
    get_base_filename(filenameBS);
    strcat(info.filename, " + ");
    strcat(info.filename, filenameBS);
  }
 }
 void Cartridge::unload_cart_bsc() {
  if(cart.ram) save_file(get_save_filename(cart.fn, "srm"), cart.ram, cart.ram_size);
 }
 #endif //ifdef CART_CPP
--- a/src/cart/cart_bsx.cpp
+++ b/src/cart/cart_bsx.cpp
@ -1,3 +1,5 @@
 #ifdef CART_CPP
 void Cartridge::load_cart_bsx(const char *base, const char *slot) {
  if(!base || !*base) return;
@ -10,8 +12,8 @@ void Cartridge::load_cart_bsx(const char *base, const char *slot) {
  info.mapper = BSXROM;
  info.region = NTSC;
-uint8 *data;
+  uint8_t *data = 0;
-uint size;
+  unsigned size;
  load_file(cart.fn, data, size);
  cart.rom = data, cart.rom_size = size;
  cart.ram = 0, cart.ram_size = 0;
@ -37,9 +39,14 @@ uint size;
  }
  load_end();
  strcpy(info.filename, !*bs.fn ? cart.fn : bs.fn);
  get_base_filename(info.filename);
 }
 void Cartridge::unload_cart_bsx() {
  save_file(get_save_filename(cart.fn, "srm"), bsxcart.sram.handle (), bsxcart.sram.size ());
  save_file(get_save_filename(cart.fn, "psr"), bsxcart.psram.handle(), bsxcart.psram.size());
 }
 #endif //ifdef CART_CPP
--- a/src/cart/cart_file.cpp
+++ b/src/cart/cart_file.cpp
@ -1,3 +1,5 @@
 #ifdef CART_CPP
 #include "../reader/filereader.h"
 #if defined(GZIP_SUPPORT)
@ -10,7 +12,7 @@
 #endif
 char* Cartridge::modify_extension(char *filename, const char *extension) {
-int i;
+  int i;
  for(i = strlen(filename); i >= 0; i--) {
    if(filename[i] == '.') break;
    if(filename[i] == '/') break;
@ -22,29 +24,62 @@ int i;
  return filename;
 }
-char* Cartridge::get_save_filename(const char *source, const char *extension) {
+//remove directory information and file extension ("/foo/bar.ext" -> "bar")
-  strcpy(savefn, source);
+char* Cartridge::get_base_filename(char *filename) {
-  for(char *p = savefn; *p; p++) { if(*p == '\\') *p = '/'; }
+  //remove extension
-  modify_extension(savefn, extension);
+  for(int i = strlen(filename) - 1; i >= 0; i--) {
    if(filename[i] == '.') {
      filename[i] = 0;
      break;
    }
  }
-//override path with user-specified folder, if one was defined
+  //remove directory information
-  if(config::path.save != "") {
+  for(int i = strlen(filename) - 1; i >= 0; i--) {
    if(filename[i] == '/' || filename[i] == '\\') {
      i++;
      char *output = filename;
      while(true) {
        *output++ = filename[i];
        if(!filename[i]) break;
        i++;
      }
      break;
    }
  }
 }
 char* Cartridge::get_path_filename(char *filename, const char *path, const char *source, const char *extension) {
  strcpy(filename, source);
  for(char *p = filename; *p; p++) { if(*p == '\\') *p = '/'; }
  modify_extension(filename, extension);
  //override path with user-specified folder, if one was defined
  if(path != "") {
    lstring part;
-    split(part, "/", savefn);
+    split(part, "/", filename);
-  string fn = (const char*)config::path.save;
+    string fn = path;
    if(strend(fn, "/") == false) strcat(fn, "/");
    strcat(fn, part[count(part) - 1]);
-    strcpy(savefn, fn);
+    strcpy(filename, fn);
    //resolve relative path, if found
    if(strbegin(fn, "./") == true) {
      ltrim(fn, "./");
-      strcpy(savefn, config::path.base);
+      strcpy(filename, config::path.base);
-      strcat(savefn, fn);
+      strcat(filename, fn);
    }
  }
-  return savefn;
+  return filename;
 }
 char* Cartridge::get_save_filename(const char *source, const char *extension) {
  return get_path_filename(savefn, config::path.save, source, extension);
 }
 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) {
@ -54,7 +89,7 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
  switch(Reader::detect(fn)) {
    default:
-    case Reader::RF_NORMAL: {
+    case Reader::Normal: {
      FileReader ff(fn);
      if(!ff.ready()) {
        alert("Error loading image file (%s)!", fn);
@ -65,7 +100,7 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
    } break;
    #ifdef GZIP_SUPPORT
-    case Reader::RF_GZ: {
+    case Reader::GZIP: {
      GZReader gf(fn);
      if(!gf.ready()) {
        alert("Error loading image file (%s)!", fn);
@ -75,7 +110,7 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
      data = gf.read();
    } break;
-    case Reader::RF_ZIP: {
+    case Reader::ZIP: {
      ZipReader zf(fn);
      size = zf.size();
      data = zf.read();
@ -83,7 +118,7 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
    #endif
    #ifdef JMA_SUPPORT
-    case Reader::RF_JMA: {
+    case Reader::JMA: {
      try {
        JMAReader jf(fn);
        size = jf.size();
@ -100,8 +135,10 @@ bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size) {
 }
 bool Cartridge::save_file(const char *fn, uint8 *data, uint size) {
-FileWriter ff(fn);
+  FileWriter ff(fn);
  if(!ff.ready())return false;
  ff.write(data, size);
  return true;
 }
 #endif //ifdef CART_CPP
--- a/src/cart/cart_header.cpp
+++ b/src/cart/cart_header.cpp
@ -1,13 +1,15 @@
-void Cartridge::read_header() {
+#ifdef CART_CPP
 uint8 *rom = cart.rom;
 uint index = info.header_index;
 uint8 mapper   = rom[index + MAPPER];
 uint8 rom_type = rom[index + ROM_TYPE];
 uint8 company  = rom[index + COMPANY];
 uint8 region   = rom[index + REGION] & 0x7f;
-//detect presence of BS-X flash cartridge connector (reads extended header information)
+void Cartridge::read_header() {
-bool has_bsxflash = false;
+  uint8 *rom = cart.rom;
  uint index = info.header_index;
  uint8 mapper   = rom[index + MAPPER];
  uint8 rom_type = rom[index + ROM_TYPE];
  uint8 company  = rom[index + COMPANY];
  uint8 region   = rom[index + REGION] & 0x7f;
  //detect presence of BS-X flash cartridge connector (reads extended header information)
  bool has_bsxflash = false;
  if(rom[index - 14] == 'Z') {
    if(rom[index - 11] == 'J') {
      uint8 n13 = rom[index - 13];
@ -92,9 +94,9 @@ bool has_bsxflash = false;
  }
  if(mapper == 0x30 && rom_type == 0xf6) {
-  //TODO: both ST010 and ST011 share the same mapper + rom_type
+    //TODO: both ST010 and ST011 share the same mapper + rom_type.
-  //need way to determine which is which
+    //need way to determine which is which.
-  //for now, default to supported ST010
+    //for now, default to supported ST010.
    info.st010 = true;
  }
@ -108,24 +110,25 @@ bool has_bsxflash = false;
    info.ram_size = 0;
  }
-//0, 1, 13 = NTSC; 2 - 12 = PAL
+  //0, 1, 13 = NTSC; 2 - 12 = PAL
  info.region = (region <= 1 || region >= 13) ? NTSC : PAL;
  memcpy(&info.name, &rom[info.header_index + CART_NAME], 21);
  info.name[21] = 0;
  trim(info.name);
-  for(int i = 0; i < 22; i++) {
+  //convert undisplayable characters (half-width katakana, etc) to '?' characters
-    if(info.name[i] & 0x80) {
+  for(int i = 0; i < 21; i++) {
-      info.name[i] = '?';
+    if(info.name[i] & 0x80) info.name[i] = '?';
    }
  }
  //always display something
  if(!info.name[0]) strcpy(info.name, "(untitled)");
 }
 void Cartridge::find_header() {
-int32 score_lo = 0,
+  int32 score_lo = 0, score_hi = 0, score_ex = 0;
-      score_hi = 0,
+  uint8_t *rom = cart.rom;
      score_ex = 0;
 uint8 *rom = cart.rom;
  if(cart.rom_size < 0x010000) {
    //cart too small to be anything but lorom
@ -133,28 +136,28 @@ uint8 *rom = cart.rom;
    return;
  }
-  if((rom[0x7fc0 + MAPPER] & ~0x10) == 0x20)score_lo++;
+  if((rom[0x7fc0 + MAPPER] & ~0x10) == 0x20) score_lo++;
-  if((rom[0xffc0 + MAPPER] & ~0x10) == 0x21)score_hi++;
+  if((rom[0xffc0 + MAPPER] & ~0x10) == 0x21) score_hi++;
-  if(rom[0x7fc0 + ROM_TYPE] < 0x08)score_lo++;
+  if(rom[0x7fc0 + ROM_TYPE] < 0x08) score_lo++;
-  if(rom[0xffc0 + ROM_TYPE] < 0x08)score_hi++;
+  if(rom[0xffc0 + ROM_TYPE] < 0x08) score_hi++;
-  if(rom[0x7fc0 + ROM_SIZE] < 0x10)score_lo++;
+  if(rom[0x7fc0 + ROM_SIZE] < 0x10) score_lo++;
-  if(rom[0xffc0 + ROM_SIZE] < 0x10)score_hi++;
+  if(rom[0xffc0 + ROM_SIZE] < 0x10) score_hi++;
-  if(rom[0x7fc0 + RAM_SIZE] < 0x08)score_lo++;
+  if(rom[0x7fc0 + RAM_SIZE] < 0x08) score_lo++;
-  if(rom[0xffc0 + RAM_SIZE] < 0x08)score_hi++;
+  if(rom[0xffc0 + RAM_SIZE] < 0x08) score_hi++;
-  if(rom[0x7fc0 + REGION] < 14)score_lo++;
+  if(rom[0x7fc0 + REGION] < 14) score_lo++;
-  if(rom[0xffc0 + REGION] < 14)score_hi++;
+  if(rom[0xffc0 + REGION] < 14) score_hi++;
-  if(rom[0x7fc0 + COMPANY] < 3)score_lo++;
+  if(rom[0x7fc0 + COMPANY] < 3) score_lo++;
-  if(rom[0xffc0 + COMPANY] < 3)score_hi++;
+  if(rom[0xffc0 + COMPANY] < 3) score_hi++;
-  if(rom[0x7fc0 + RESH] & 0x80)score_lo += 2;
+  if(rom[0x7fc0 + RESH] & 0x80) score_lo += 2;
-  if(rom[0xffc0 + RESH] & 0x80)score_hi += 2;
+  if(rom[0xffc0 + RESH] & 0x80) score_hi += 2;
-uint16 cksum, icksum;
+  uint16 cksum, icksum;
  cksum  = rom[0x7fc0 +  CKSUM] | (rom[0x7fc0 +  CKSUM + 1] << 8);
  icksum = rom[0x7fc0 + ICKSUM] | (rom[0x7fc0 + ICKSUM + 1] << 8);
  if((cksum + icksum) == 0xffff && (cksum != 0) && (icksum != 0)) {
@ -170,7 +173,7 @@ uint16 cksum, icksum;
  if(cart.rom_size < 0x401000) {
    score_ex = 0;
  } else {
-    if(rom[0x7fc0 + MAPPER] == 0x32)score_lo++;
+    if(rom[0x7fc0 + MAPPER] == 0x32) score_lo++;
    else score_ex += 16;
  }
@ -182,3 +185,5 @@ uint16 cksum, icksum;
    info.header_index = 0x40ffc0;
  }
 }
 #endif //ifdef CART_CPP
--- a/src/cart/cart_normal.cpp
+++ b/src/cart/cart_normal.cpp
@ -1,14 +1,16 @@
 #ifdef CART_CPP
 void Cartridge::load_cart_normal(const char *filename) {
  if(!filename || !*filename) return;
-uint8 *data;
+  uint8_t *data = 0;
-uint size;
+  unsigned size;
  if(load_file(filename, data, size) == false) return;
  strcpy(cart.fn, filename);
  load_begin(CartridgeNormal);
-//load ROM data, ignore 512-byte header if detected
+  //load ROM data, ignore 512-byte header if detected
  if((size & 0x7fff) != 512) {
    cart.rom = (uint8*)malloc(cart.rom_size = size);
    memcpy(cart.rom, data, size);
@ -34,8 +36,14 @@ uint size;
  }
  load_end();
  //set base filename
  strcpy(info.filename, cart.fn);
  get_base_filename(info.filename);
 }
 void Cartridge::unload_cart_normal() {
  if(cart.ram) save_file(get_save_filename(cart.fn, "srm"), cart.ram, cart.ram_size);
 }
 #endif //ifdef CART_CPP
--- a/src/cart/cart_st.cpp
+++ b/src/cart/cart_st.cpp
@ -1,3 +1,5 @@
 #ifdef CART_CPP
 void Cartridge::load_cart_st(const char *base, const char *slotA, const char *slotB) {
  if(!base || !*base) return;
@ -10,8 +12,8 @@ void Cartridge::load_cart_st(const char *base, const char *slotA, const char *sl
  info.mapper = STROM;
  info.region = NTSC;
-uint8 *data;
+  uint8_t *data = 0;
-uint size;
+  unsigned size;
  if(load_file(cart.fn, data, size) == true) {
    cart.rom = (uint8*)malloc(cart.rom_size = 0x040000);
    memcpy(cart.rom, data, min(size, cart.rom_size));
@ -51,9 +53,32 @@ uint size;
  }
  load_end();
  //set base filename
  if(!*stA.fn && !*stB.fn) {
    strcpy(info.filename, cart.fn);
    get_base_filename(info.filename);
  } else if(*stA.fn && !*stB.fn) {
    strcpy(info.filename, stA.fn);
    get_base_filename(info.filename);
  } else if(!*stA.fn && *stB.fn) {
    strcpy(info.filename, stB.fn);
    get_base_filename(info.filename);
  } else {
    char filenameA[PATH_MAX], filenameB[PATH_MAX];
    strcpy(filenameA, stA.fn);
    get_base_filename(filenameA);
    strcpy(filenameB, stB.fn);
    get_base_filename(filenameB);
    strcpy(info.filename, filenameA);
    strcat(info.filename, " + ");
    strcat(info.filename, filenameB);
  }
 }
 void Cartridge::unload_cart_st() {
  if(stA.ram) save_file(get_save_filename(stA.fn, "srm"), stA.ram, stA.ram_size);
  if(stB.ram) save_file(get_save_filename(stB.fn, "srm"), stB.ram, stB.ram_size);
 }
 #endif //ifdef CART_CPP
--- a/src/cheat/cheat.cpp
+++ b/src/cheat/cheat.cpp
@ -10,18 +10,18 @@ Cheat cheat;
 *****/
 bool Cheat::decode(char *str, uint32 &addr, uint8 &data, uint8 &type) {
-string t, part;
+  string t, part;
  strcpy(t, str);
  strlower(t());
  if(strlen(t) == 8 || (strlen(t) == 9 && t()[6] == ':')) {
-    type = CT_PRO_ACTION_REPLAY;
+    type = ProActionReplay;
    replace(t, ":", "");
    uint32 r = strhex((const char*)t);
    addr = r >> 8;
    data = r & 0xff;
    return true;
  } else if(strlen(t) == 9 && t()[4] == '-') {
-    type = CT_GAME_GENIE;
+    type = GameGenie;
    replace(t, "-", "");
    strtr(t, "df4709156bc8a23e", "0123456789abcdef");
    uint32 r = strhex((const char*)t);
@ -47,10 +47,10 @@ string t, part;
 }
 bool Cheat::encode(char *str, uint32 addr, uint8 data, uint8 type) {
-  if(type == CT_PRO_ACTION_REPLAY) {
+  if(type == ProActionReplay) {
    sprintf(str, "%0.6x:%0.2x", addr, data);
    return true;
-  } else if(type == CT_GAME_GENIE) {
+  } else if(type == GameGenie) {
  uint32 r = addr;
    addr = (!!(r & 0x008000) << 23) | (!!(r & 0x004000) << 22) |
           (!!(r & 0x002000) << 21) | (!!(r & 0x001000) << 20) |
@ -79,9 +79,9 @@ bool Cheat::encode(char *str, uint32 addr, uint8 data, uint8 type) {
 *****/
 uint Cheat::mirror_address(uint addr) {
-  if((addr & 0x40e000) != 0x0000)return addr;
+  if((addr & 0x40e000) != 0x0000) return addr;
-//8k WRAM mirror
+  //8k WRAM mirror
-//$[00-3f|80-bf]:[0000-1fff] -> $7e:[0000-1fff]
+  //$[00-3f|80-bf]:[0000-1fff] -> $7e:[0000-1fff]
  return (0x7e0000 + (addr & 0x1fff));
 }
@ -104,10 +104,10 @@ void Cheat::set(uint32 addr) {
 void Cheat::clear(uint32 addr) {
  addr = mirror_address(addr);
-//is there more than one cheat code using the same address
+  //is there more than one cheat code using the same address
-//(and likely a different override value) that is enabled?
+  //(and likely a different override value) that is enabled?
-//if so, do not clear code lookup table entry for this address.
+  //if so, do not clear code lookup table entry for this address.
-uint8 r;
+  uint8 r;
  if(read(addr, r) == true)return;
  mask[addr >> 3] &= ~(1 << (addr & 7));
@ -133,13 +133,13 @@ uint8 r;
 bool Cheat::read(uint32 addr, uint8 &data) {
  addr = mirror_address(addr);
  for(int i = 0; i < cheat_count; i++) {
-    if(enabled(i) == false)continue;
+    if(enabled(i) == false) continue;
    if(addr == mirror_address(index[i].addr)) {
      data = index[i].data;
      return true;
    }
  }
-//code not found, or code is disabled
+  //code not found, or code is disabled
  return false;
 }
@ -148,8 +148,9 @@ bool Cheat::read(uint32 addr, uint8 &data) {
 * enabled. if any are, make sure the cheat system is on.
 * otherwise, turn cheat system off to speed up emulation.
 *****/
 void Cheat::update_cheat_status() {
-  for(int i = 0; i < cheat_count; i++) {
+  for(unsigned i = 0; i < cheat_count; i++) {
    if(index[i].enabled) {
      cheat_enabled = true;
      return;
@ -163,11 +164,11 @@ void Cheat::update_cheat_status() {
 *****/
 bool Cheat::add(bool enable, char *code, char *desc) {
-  if(cheat_count >= CHEAT_LIMIT)return false;
+  if(cheat_count >= CheatLimit) return false;
-uint32 addr, len;
+  uint32 addr, len;
-uint8  data, type;
+  uint8  data, type;
-  if(decode(code, addr, data, type) == false)return false;
+  if(decode(code, addr, data, type) == false) return false;
  index[cheat_count].enabled = enable;
  index[cheat_count].addr = addr;
@ -188,17 +189,17 @@ uint8  data, type;
 }
 bool Cheat::edit(uint32 n, bool enable, char *code, char *desc) {
-  if(n >= cheat_count)return false;
+  if(n >= cheat_count) return false;
-uint32 addr, len;
+  uint32 addr, len;
-uint8  data, type;
+  uint8  data, type;
-  if(decode(code, addr, data, type) == false)return false;
+  if(decode(code, addr, data, type) == false) return false;
-//disable current code and clear from code lookup table
+  //disable current code and clear from code lookup table
  index[n].enabled = false;
  clear(index[n].addr);
-//update code and enable in code lookup table
+  //update code and enable in code lookup table
  index[n].enabled = enable;
  index[n].addr = addr;
  index[n].data = data;
@ -217,9 +218,9 @@ uint8  data, type;
 }
 bool Cheat::remove(uint32 n) {
-  if(n >= cheat_count)return false;
+  if(n >= cheat_count) return false;
-  for(int i = n; i < cheat_count; i++) {
+  for(unsigned i = n; i < cheat_count; i++) {
    index[i].enabled = index[i + 1].enabled;
    index[i].addr    = index[i + 1].addr;
    index[i].data    = index[i + 1].data;
@ -233,7 +234,7 @@ bool Cheat::remove(uint32 n) {
 }
 bool Cheat::get(uint32 n, bool &enable, uint32 &addr, uint8 &data, char *code, char *desc) {
-  if(n >= cheat_count)return false;
+  if(n >= cheat_count) return false;
  enable = index[n].enabled;
  addr   = index[n].addr;
  data   = index[n].data;
@ -247,19 +248,19 @@ bool Cheat::get(uint32 n, bool &enable, uint32 &addr, uint8 &data, char *code, c
 *****/
 bool Cheat::enabled(uint32 n) {
-  if(n >= cheat_count)return false;
+  if(n >= cheat_count) return false;
  return index[n].enabled;
 }
 void Cheat::enable(uint32 n) {
-  if(n >= cheat_count)return;
+  if(n >= cheat_count) return;
  index[n].enabled = true;
  set(index[n].addr);
  update_cheat_status();
 }
 void Cheat::disable(uint32 n) {
-  if(n >= cheat_count)return;
+  if(n >= cheat_count) return;
  index[n].enabled = false;
  clear(index[n].addr);
  update_cheat_status();
@ -274,15 +275,15 @@ void Cheat::disable(uint32 n) {
 /* ... */
 bool Cheat::load(const char *fn) {
-string data;
+  string data;
  if(!fread(data, fn)) return false;
  replace(data, "\r\n", "\n");
  qreplace(data, "=", ",");
  qreplace(data, " ", "");
-lstring line;
+  lstring line;
  split(line, "\n", data);
-  for(int i = 0; i < ::count(line); i++) {
+  for(unsigned i = 0; i < ::count(line); i++) {
    lstring part;
    split(part, ",", line[i]);
    if(::count(part) != 3) continue;
@ -294,9 +295,9 @@ lstring line;
 }
 bool Cheat::save(const char *fn) {
-FILE *fp = fopen(fn, "wb");
+  FILE *fp = fopen(fn, "wb");
  if(!fp) return false;
-  for(int i = 0; i < cheat_count; i++) {
+  for(unsigned i = 0; i < cheat_count; i++) {
    fprintf(fp, "%9s = %8s, \"%s\"\r\n",
      index[i].code,
      index[i].enabled ? "enabled" : "disabled",
@ -314,7 +315,7 @@ void Cheat::clear() {
  cheat_enabled = false;
  cheat_count = 0;
  memset(mask, 0, 0x200000);
-  for(int i = 0; i <= CHEAT_LIMIT; i++) {
+  for(unsigned i = 0; i <= CheatLimit; i++) {
    index[i].enabled = false;
    index[i].addr = 0x000000;
    index[i].data = 0x00;
--- a/src/cheat/cheat.h
+++ b/src/cheat/cheat.h
@ -1,10 +1,10 @@
 #define CHEAT_LIMIT 1024
 class Cheat {
 public:
-  enum {
+  enum { CheatLimit = 1024 };
-    CT_PRO_ACTION_REPLAY,
+
-    CT_GAME_GENIE
+  enum Type {
    ProActionReplay,
    GameGenie,
  };
  struct CheatIndex {
@ -13,7 +13,7 @@ public:
    uint8 data;
    char code[ 16 + 1];
    char desc[128 + 1];
-  } index[CHEAT_LIMIT + 1];
+  } index[CheatLimit + 1];
  bool cheat_enabled;
  uint32 cheat_count;
@ -32,9 +32,9 @@ public:
  bool add(bool enable, char *code, char *desc);
  bool edit(uint32 n, bool enable, char *code, char *desc);
  bool get(uint32 n, bool &enable, uint32 &addr, uint8 &data, char *code, char *desc);
-  bool  remove (uint32 n);
+  bool remove(uint32 n);
  bool enabled(uint32 n);
-  void  enable (uint32 n);
+  void enable(uint32 n);
  void disable(uint32 n);
  bool load(const char *fn);
  bool save(const char *fn);
--- a/src/chip/bsx/bsx.cpp
+++ b/src/chip/bsx/bsx.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define BSX_CPP
 #include "bsx_base.cpp"
 #include "bsx_cart.cpp"
--- a/src/chip/bsx/bsx_base.cpp
+++ b/src/chip/bsx/bsx_base.cpp
@ -1,3 +1,5 @@
 #ifdef BSX_CPP
 void BSXBase::init() {
 }
@ -131,3 +133,5 @@ void BSXBase::mmio_write(uint addr, uint8 data) {
    } break;
  }
 }
 #endif //ifdef BSX_CPP
--- a/src/chip/bsx/bsx_cart.cpp
+++ b/src/chip/bsx/bsx_cart.cpp
@ -1,3 +1,5 @@
 #ifdef BSX_CPP
 void BSXCart::init() {
 }
@ -93,3 +95,5 @@ BSXCart::~BSXCart() {
  safe_free(sram_data);
  safe_free(psram_data);
 }
 #endif //ifdef BSX_CPP
--- a/src/chip/bsx/bsx_flash.cpp
+++ b/src/chip/bsx/bsx_flash.cpp
@ -1,3 +1,5 @@
 #ifdef BSX_CPP
 void BSXFlash::init() {}
 void BSXFlash::enable() {}
@ -107,3 +109,5 @@ void BSXFlash::write(uint addr, uint8 data) {
    }
  }
 }
 #endif //ifdef BSX_CPP
--- a/src/chip/cx4/cx4.cpp
+++ b/src/chip/cx4/cx4.cpp
@ -6,6 +6,7 @@
 */
 #include "../../base.h"
 #define CX4_CPP
 #include "cx4data.cpp"
 #include "cx4fn.cpp"
--- a/src/chip/cx4/cx4data.cpp
+++ b/src/chip/cx4/cx4data.cpp
@ -1,3 +1,5 @@
 #ifdef CX4_CPP
 const uint8 Cx4::immediate_data[48] = {
  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff,
  0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x80, 0xff, 0xff, 0x7f,
@ -181,3 +183,5 @@ const int16 Cx4::CosTable[512] = {
   32138,  32214,  32285,  32351,  32413,  32469,  32521,  32568,
   32610,  32647,  32679,  32706,  32728,  32745,  32758,  32765
 };
 #endif //ifdef CX4_CPP
--- a/src/chip/cx4/cx4fn.cpp
+++ b/src/chip/cx4/cx4fn.cpp
@ -1,3 +1,5 @@
 #ifdef CX4_CPP
 #include <math.h>
 #define Tan(a) (CosTable[a] ? ((((int32)SinTable[a]) << 16) / CosTable[a]) : 0x80000000)
 #define sar(b, n) ((b) >> (n))
@ -240,3 +242,5 @@ uint8 bit    = 0x80;
    LineY += D;
  }
 }
 #endif //ifdef CX4_CPP
--- a/src/chip/cx4/cx4oam.cpp
+++ b/src/chip/cx4/cx4oam.cpp
@ -1,3 +1,5 @@
 #ifdef CX4_CPP
 //Build OAM
 void Cx4::op00_00() {
 uint32 oamptr = ram[0x626] << 2;
@ -217,3 +219,5 @@ uint16 mask2   = 0x3f3f;
    destptr += 16;
  }
 }
 #endif //ifdef CX4_CPP
--- a/src/chip/cx4/cx4ops.cpp
+++ b/src/chip/cx4/cx4ops.cpp
@ -1,3 +1,5 @@
 #ifdef CX4_CPP
 //Sprite Functions
 void Cx4::op00() {
  switch(reg[0x4d]) {
@ -220,3 +222,5 @@ void Cx4::op89() {
  str(0, 0x054336);
  str(1, 0xffffff);
 }
 #endif //ifdef CX4_CPP
--- a/src/chip/dsp1/dsp1.cpp
+++ b/src/chip/dsp1/dsp1.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define DSP1_CPP
 #include "dsp1emu.cpp"
--- a/src/chip/dsp1/dsp1emu.cpp
+++ b/src/chip/dsp1/dsp1emu.cpp
@ -1,3 +1,5 @@
 #ifdef DSP1_CPP
 // DSP-1's emulation code
 //
 // Based on research by Overload, The Dumper, Neviksti and Andreas Naive
@ -1620,3 +1622,4 @@ const int16 Dsp1::SinTable[256] = {
 //////////////////////////////////////////////////////////////////
 #endif //ifdef DSP1_CPP
--- a/src/chip/dsp2/dsp2.cpp
+++ b/src/chip/dsp2/dsp2.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define DSP2_CPP
 #include "dsp2_op.cpp"
--- a/src/chip/dsp2/dsp2_op.cpp
+++ b/src/chip/dsp2/dsp2_op.cpp
@ -1,3 +1,5 @@
 #ifdef DSP2_CPP
 //convert bitmap to bitplane tile
 void DSP2::op01() {
 //op01 size is always 32 bytes input and output
@ -171,3 +173,5 @@ uint8  pixelarray[512];
    status.output[i] = (pixelarray[i << 1] << 4) | pixelarray[(i << 1) + 1];
  }
 }
 #endif //ifdef DSP2_CPP
--- a/src/chip/dsp3/dsp3.cpp
+++ b/src/chip/dsp3/dsp3.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define DSP3_CPP
 namespace DSP3i {
  #define bool8 uint8
--- a/src/chip/dsp3/dsp3emu.c
+++ b/src/chip/dsp3/dsp3emu.c
@ -1,3 +1,5 @@
 #ifdef DSP3_CPP
 //DSP-3 emulator code
 //Copyright (c) 2003-2006 John Weidman, Kris Bleakley, Lancer, z80 gaiden
@ -1140,3 +1142,5 @@ void InitDSP3()
 {
  DSP3_Reset();
 }
 #endif //ifdef DSP3_CPP
--- a/src/chip/dsp4/dsp4.cpp
+++ b/src/chip/dsp4/dsp4.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define DSP4_CPP
 namespace DSP4i {
  inline uint16 READ_WORD(uint8 *addr) {
--- a/src/chip/dsp4/dsp4emu.c
+++ b/src/chip/dsp4/dsp4emu.c
@ -1,3 +1,5 @@
 #ifdef DSP4_CPP
 //DSP-4 emulator code
 //Copyright (c) 2004-2006 Dreamer Nom, John Weidman, Kris Bleakley, Nach, z80 gaiden
@ -2144,3 +2146,5 @@ void DSP4GetByte()
    dsp4_byte = 0xff;
  }
 }
 #endif //ifdef DSP4_CPP
--- a/src/chip/sdd1/sdd1.cpp
+++ b/src/chip/sdd1/sdd1.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define SDD1_CPP
 #include "sdd1emu.cpp"
--- a/src/chip/sdd1/sdd1emu.cpp
+++ b/src/chip/sdd1/sdd1emu.cpp
@ -1,3 +1,5 @@
 #ifdef SDD1_CPP
 /************************************************************************
 S-DD1'algorithm emulation code
@ -445,3 +447,5 @@ SDD1emu::SDD1emu() :
 }
 ///////////////////////////////////////////////////////////
 #endif //ifdef SDD1_CPP
--- a/src/chip/st010/st010.cpp
+++ b/src/chip/st010/st010.cpp
@ -1,4 +1,6 @@
 #include "../../base.h"
 #define ST010_CPP
 #include "st010_data.h"
 #include "st010_op.cpp"
--- a/src/chip/st010/st010_op.cpp
+++ b/src/chip/st010/st010_op.cpp
@ -1,3 +1,5 @@
 #ifdef ST010_CPP
 //ST-010 emulation code - Copyright (C) 2003 The Dumper, Matthew Kendora, Overload, Feather
 //bsnes port - Copyright (C) 2007 byuu
@ -255,3 +257,5 @@ int16 x1, y1;
  writew(0x0010, x1);
  writew(0x0012, y1);
 }
 #endif //ifdef ST010_CPP
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@ -1,16 +1,24 @@
 namespace config {
 configuration& config() {
-static configuration config;
+  static configuration config;
  return config;
 }
 integral_setting File::autodetect_type(config(), "file.autodetect_type",
  "Auto-detect file type by inspecting file header, rather than by file extension.\n"
  "In other words, if a .zip file is renamed to .smc, it will still be correctly\n"
  "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);
 string file_updatepath(const char *req_file, const char *req_path) {
-string file(req_file);
+  string file(req_file);
  replace(file, "\\", "/");
  if(!req_path || strlen(req_path) == 0) { return file; }
-string path(req_path);
+  string path(req_path);
  replace(path, "\\", "/");
  if(!strend(path, "/")) { strcat(path, "/"); }
@ -22,7 +30,7 @@ string path(req_path);
    strcpy(path, temp);
  }
-lstring part;
+  lstring part;
  split(part, "/", file);
  strcat(path, part[count(part) - 1]);
  return path;
@ -33,34 +41,16 @@ string_setting Path::base("path.base",
 string_setting Path::rom(config(), "path.rom",
  "Default path to look for ROM files in (\"\" = use default directory)", "");
 string_setting Path::save(config(), "path.save",
-  "Default path for all save RAM and cheat files (\"\" = use current directory)", "");
+  "Default path for all save RAM files (\"\" = use current directory)", "");
 string_setting Path::cheat(config(), "path.cheat",
  "Default path for all cheat files (\"\" = use current directory)", "");
 string_setting Path::bsx(config(), "path.bsx", "", "");
 string_setting Path::st(config(), "path.st", "", "");
 integral_setting SNES::gamma_ramp(config(), "snes.colorfilter.gamma_ramp",
  "Use precalculated TV-style gamma ramp", integral_setting::boolean, true);
 integral_setting SNES::sepia(config(), "snes.colorfilter.sepia",
  "Convert color to sepia tone", integral_setting::boolean, false);
 integral_setting SNES::grayscale(config(), "snes.colorfilter.grayscale",
  "Convert color to grayscale tone", integral_setting::boolean, false);
 integral_setting SNES::invert(config(), "snes.colorfilter.invert",
  "Invert output image colors", integral_setting::boolean, false);
 integral_setting SNES::contrast(config(), "snes.colorfilter.contrast",
  "Contrast", integral_setting::decimal, 0);
 integral_setting SNES::brightness(config(), "snes.colorfilter.brightness",
  "Brightness", integral_setting::decimal, 0);
 integral_setting SNES::gamma(config(), "snes.colorfilter.gamma",
  "Gamma", integral_setting::decimal, 80);
 integral_setting SNES::ntsc_merge_fields(config(), "snes.ntsc_merge_fields",
  "Merge fields in NTSC video filter\n"
  "Set to true if using filter at any refresh rate other than 60hz\n"
  "", integral_setting::boolean, true);
 integral_setting SNES::controller_port0(config(), "snes.controller_port_1",
-  "Controller attached to SNES port 1", integral_setting::decimal, ::SNES::DEVICEID_JOYPAD1);
+  "Controller attached to SNES port 1", integral_setting::decimal, ::SNES::Input::DeviceIDJoypad1);
 integral_setting SNES::controller_port1(config(), "snes.controller_port_2",
-  "Controller attached to SNES port 2", integral_setting::decimal, ::SNES::DEVICEID_JOYPAD2);
+  "Controller attached to SNES port 2", integral_setting::decimal, ::SNES::Input::DeviceIDJoypad2);
 integral_setting CPU::ntsc_clock_rate(config(), "cpu.ntsc_clock_rate",
  "NTSC S-CPU clock rate (in hz)", integral_setting::decimal, 21477272);
@ -126,4 +116,4 @@ integral_setting PPU::oam_pri1_enable("ppu.oam_pri1_enable", "Enable OAM Priorit
 integral_setting PPU::oam_pri2_enable("ppu.oam_pri2_enable", "Enable OAM Priority 2", integral_setting::boolean, true);
 integral_setting PPU::oam_pri3_enable("ppu.oam_pri3_enable", "Enable OAM Priority 3", integral_setting::boolean, true);
-};
+} //namespace config
--- a/src/config/config.h
+++ b/src/config/config.h
@ -2,16 +2,18 @@ namespace config {
 extern configuration& config();
-string file_updatepath(const char *, const char *);
+string file_updatepath(const char*, const char*);
 extern struct File {
  static integral_setting autodetect_type;
 } file;
 extern struct Path {
-  static string_setting base, rom, save;
+  static string_setting base, rom, save, cheat;
  static string_setting bsx, st;
 } path;
 extern struct SNES {
  static integral_setting gamma_ramp, sepia, grayscale, invert, contrast, brightness, gamma;
  static integral_setting ntsc_merge_fields;
  static integral_setting controller_port0;
  static integral_setting controller_port1;
 } snes;
--- a/src/cpu/cpu.cpp
+++ b/src/cpu/cpu.cpp
@ -1,4 +1,6 @@
 #include "../base.h"
 #define CPU_CPP
 #include "dcpu.cpp"
 CPU::CPU() {
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@ -4,41 +4,35 @@ class CPU : public MMIO {
 public:
  virtual void enter() = 0;
-public:
+  //CPU version number
-//CPU version number
+  //* 1 and 2 are known
-//* 1 and 2 are known
+  //* reported by $4210
-//* reported by $4210
+  //* affects DRAM refresh behavior
-//* affects DRAM refresh behavior
+  uint8 cpu_version;
 uint8 cpu_version;
-//timing
+  //timing
  virtual uint16 vcounter() = 0;
  virtual uint16 hcounter() = 0;
-  virtual uint16 hclock() = 0;
+  virtual uint16 hdot() = 0;
  virtual bool   interlace() = 0;
  virtual bool   interlace_field() = 0;
  virtual bool   overscan() = 0;
  virtual uint16 region_scanlines() = 0;
  virtual void   set_interlace(bool r) = 0;
  virtual void   set_overscan (bool r) = 0;
-CPURegs regs;
+  virtual uint8 pio_status() = 0;
-  virtual uint8 port_read (uint8 port) = 0;
+  virtual uint8 port_read(uint8 port) = 0;
  virtual void port_write(uint8 port, uint8 value) = 0;
  CPURegs regs;
  enum {
    FLAG_N = 0x80, FLAG_V = 0x40,
    FLAG_M = 0x20, FLAG_X = 0x10,
    FLAG_D = 0x08, FLAG_I = 0x04,
    FLAG_Z = 0x02, FLAG_C = 0x01
  };
-  virtual uint8  pio_status() = 0;
+
  virtual void scanline() = 0;
  virtual void frame() = 0;
  virtual void power() = 0;
  virtual void reset() = 0;
-/*****
+  /*****
   * in opcode-based CPU emulators, the main emulation routine
   * will only be able to call the disassemble_opcode() function
   * on clean opcode edges. but with cycle-based CPU emulators,
@ -53,10 +47,10 @@ CPURegs regs;
   *****/
  virtual bool in_opcode() { return false; }
-/*****
+  /*****
   * opcode disassembler
   *****/
-enum {
+  enum {
    OPTYPE_DP = 0,    //dp
    OPTYPE_DPX,       //dp,x
    OPTYPE_DPY,       //dp,y
@ -78,7 +72,7 @@ enum {
    OPTYPE_IADDR_PC,  //pbr:(addr)
    OPTYPE_RELB,      //relb
    OPTYPE_RELW,      //relw
-};
+  };
  void   disassemble_opcode(char *output);
  uint8  dreadb(uint32 addr);
--- a/src/cpu/cpuregs.h
+++ b/src/cpu/cpuregs.h
@ -1,11 +1,11 @@
 class CPURegFlags {
 public:
-union {
+  union {
    uint8 data;
    struct {
      bool order_msb8(n:1, v:1, m:1, x:1, d:1, i:1, z:1, c:1);
    };
-};
+  };
  inline operator unsigned() const { return data; }
  template<typename T> inline unsigned operator  = (const T i) { data  = i; return data; }
@ -18,10 +18,10 @@ union {
 class CPUReg16 {
 public:
-union {
+  union {
    uint16 w;
    struct { uint8 order_lsb2(l, h); };
-};
+  };
  inline operator unsigned() const { return w; }
  template<typename T> inline unsigned operator   = (const T i) { w   = i; return w; }
@ -41,11 +41,11 @@ union {
 class CPUReg24 {
 public:
-union {
+  union {
    uint32 d;
    struct { uint16 order_lsb2(w, wh); };
    struct { uint8  order_lsb4(l, h, b, bh); };
-};
+  };
  inline operator unsigned() const { return d; }
  template<typename T> inline unsigned operator   = (const T i) { d = uclip<24>(i);      return d; }
@ -65,11 +65,11 @@ union {
 class CPURegs {
 public:
-CPUReg24 pc;
+  CPUReg24 pc;
-CPUReg16 a, x, y, s, d;
+  CPUReg16 a, x, y, s, d;
-CPURegFlags p;
+  CPURegFlags p;
-uint8 db;
+  uint8 db;
-uint8 mdr;
+  uint8 mdr;
-bool  e;
+  bool  e;
  CPURegs() : db(0), mdr(0x00), e(false) {}
 };
--- a/src/cpu/dcpu.cpp
+++ b/src/cpu/dcpu.cpp
@ -1,3 +1,5 @@
 #ifdef CPU_CPP
 uint8  CPU::dreadb(uint32 addr) {
  if((addr & 0x40ffff) >= 0x2000 && (addr & 0x40ffff) <= 0x5fff) {
  //$[00-3f|80-bf]:[2000-5fff]
@ -423,7 +425,7 @@ uint8 op2 = dreadb(pc.d);
  strcat(s, t);
  strcat(s, " ");
-  sprintf(t, "V:%3d H:%4d", vcounter(), hclock());
+  sprintf(t, "V:%3d H:%4d", vcounter(), hcounter());
  strcat(s, t);
 }
@ -473,3 +475,5 @@ static uint8 op_len_tbl[256] = {
  if(len == 6)return (regs.e || regs.p.x) ? 2 : 3;
  return len;
 }
 #endif //ifdef CPU_CPP
--- a/src/cpu/scpu/core/core.cpp
+++ b/src/cpu/scpu/core/core.cpp
@ -1,3 +1,5 @@
 #ifdef SCPU_CPP
 #include "opfn.cpp"
 #include "op_read.cpp"
@ -43,8 +45,6 @@ void sCPU::op_irq() {
  regs.pc.w = rd.w;
 }
 //
 alwaysinline void sCPU::op_io_cond2() {
  if(regs.d.l != 0x00) {
    op_io();
@ -62,3 +62,5 @@ alwaysinline void sCPU::op_io_cond6(uint16 addr) {
    op_io();
  }
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/core/core.h
+++ b/src/cpu/scpu/core/core.h
@ -1,13 +1,13 @@
-void (sCPU::*optbl[256])();
+  void (sCPU::*optbl[256])();
-CPUReg24 aa, rd;
+  CPUReg24 aa, rd;
-uint8    dp, sp;
+  uint8_t dp, sp;
  void op_irq();
  inline bool in_opcode() { return status.in_opcode; }
-//op_read
+  //op_read
  void op_adc_b();
  void op_adc_w();
  void op_and_b();
@ -32,7 +32,7 @@ uint8    dp, sp;
  void op_ora_w();
  void op_sbc_b();
  void op_sbc_w();
-//op_rmw
+  //op_rmw
  void op_inc_b();
  void op_inc_w();
  void op_dec_b();
@ -54,4 +54,4 @@ uint8    dp, sp;
  void op_io_cond4(uint16 x, uint16 y);
  void op_io_cond6(uint16 addr);
-#include "op.h"
+  #include "op.h"
--- a/src/cpu/scpu/core/opfn.cpp
+++ b/src/cpu/scpu/core/opfn.cpp
@ -1,3 +1,5 @@
 #ifdef SCPU_CPP
 //op_read
 inline void sCPU::op_adc_b() {
 int32 r = regs.a.l + rd.l + regs.p.c;
@ -371,3 +373,5 @@ inline void sCPU::op_tsb_w() {
  regs.p.z = ((rd.w & regs.a.w) == 0);
  rd.w |= regs.a.w;
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/dma/dma.cpp
+++ b/src/cpu/scpu/dma/dma.cpp
@ -1,3 +1,5 @@
 #ifdef SCPU_CPP
 void sCPU::dma_add_clocks(uint clocks) {
  status.dma_clocks += clocks;
  add_clocks(clocks);
@ -10,30 +12,44 @@ void sCPU::dma_add_clocks(uint clocks) {
 * $[00-3f|80-bf]:43[00-7f] <DMA control registers>
 * $[00-3f|80-bf]:420b      <DMA enable register>
 * $[00-3f|80-bf]:420c      <HDMA enable register>
- * WRAM<>WRAM transfers via $2180
+ *
 * WRAM<>WRAM transfers via $2180 are also illegal
 *****/
 void sCPU::dma_transfer(bool direction, uint8 bbus, uint32 abus) {
-uint8 r;
+  if(direction == 0) {
-  if(direction == 0) { //a->b
+    //a->b transfer (to $21xx)
-    if((abus & 0x40ff00) == 0x2100 || (abus & 0x40ff80) == 0x4300 ||
+    if(bbus == 0x80 && ((abus & 0xfe0000) == 0x7e0000 || (abus & 0x40e000) == 0x0000)) {
-       (abus & 0x40ffff) == 0x420b || (abus & 0x40ffff) == 0x420c) {
+      //illegal WRAM->WRAM transfer
-      r = regs.mdr;
+      //read most likely occurs; no write occurs
      //read is irrelevant, as it has no observable effect on emulation
    } else if((abus & 0x40ff00) == 0x2100 || (abus & 0x40ff80) == 0x4300
           || (abus & 0x40ffff) == 0x420b || (abus & 0x40ffff) == 0x420c) {
      //illegal register access
      bus.write(0x2100 | bbus, regs.mdr); //TODO: verify if MDR is written here
    } else {
-      r = bus.read(abus);
+      //valid transfer
      bus.write(0x2100 | bbus, bus.read(abus));
    }
    bus.write(0x2100 | bbus, r);
  } else { //b->a
    if(bbus == 0x80 && ((abus & 0x7e0000) == 0x7e0000 || (abus & 0x40e000) == 0x0000)) {
    //prevent WRAM->WRAM transfers
      r = regs.mdr;
  } else {
-      r = bus.read(0x2100 | bbus);
+    //b->a transfer (from $21xx)
    if(bbus == 0x80 && ((abus & 0xfe0000) == 0x7e0000 || (abus & 0x40e000) == 0x0000)) {
      //illegal WRAM->WRAM transfer
      //no read occurs; write does occur
      //does not write MDR as expected
      //TODO: 0x00 was observed on hardware; verify if other values are possible
      bus.write(abus, 0x00);
    } else if((abus & 0x40ff00) == 0x2100 || (abus & 0x40ff80) == 0x4300
           || (abus & 0x40ffff) == 0x420b || (abus & 0x40ffff) == 0x420c) {
      //illegal register access
      bus.write(abus, regs.mdr); //TODO: verify if MDR is written here
    } else {
      //valid transfer
      bus.write(abus, bus.read(0x2100 | bbus));
    }
    if((abus & 0x40ff00) == 0x2100 || (abus & 0x40ff80) == 0x4300 ||
       (abus & 0x40ffff) == 0x420b || (abus & 0x40ffff) == 0x420c)return;
    bus.write(abus, r);
  }
  //each byte *always* consumes 8 clocks, even if transfer is invalid and no read and/or write occurs
  dma_add_clocks(8);
  cycle_edge();
 }
@ -43,21 +59,20 @@ uint8 r;
 *****/
 uint8 sCPU::dma_bbus(uint8 i, uint8 index) {
-  switch(channel[i].xfermode) {
+  switch(channel[i].xfermode) { default:
-  default:
+    case 0: return (channel[i].destaddr);                      //0
-  case 0: return (channel[i].destaddr);                      break; //0
+    case 1: return (channel[i].destaddr + (index & 1));        //0,1
-  case 1: return (channel[i].destaddr + (index & 1));        break; //0,1
+    case 2: return (channel[i].destaddr);                      //0,0
-  case 2: return (channel[i].destaddr);                      break; //0,0
+    case 3: return (channel[i].destaddr + ((index >> 1) & 1)); //0,0,1,1
-  case 3: return (channel[i].destaddr + ((index >> 1) & 1)); break; //0,0,1,1
+    case 4: return (channel[i].destaddr + (index & 3));        //0,1,2,3
-  case 4: return (channel[i].destaddr + (index & 3));        break; //0,1,2,3
+    case 5: return (channel[i].destaddr + (index & 1));        //0,1,0,1
-  case 5: return (channel[i].destaddr + (index & 1));        break; //0,1,0,1
+    case 6: return (channel[i].destaddr);                      //0,0     [2]
-  case 6: return (channel[i].destaddr);                      break; //0,0     [2]
+    case 7: return (channel[i].destaddr + ((index >> 1) & 1)); //0,0,1,1 [3]
  case 7: return (channel[i].destaddr + ((index >> 1) & 1)); break; //0,0,1,1 [3]
  }
 }
 inline uint32 sCPU::dma_addr(uint8 i) {
-uint32 r = (channel[i].srcbank << 16) | (channel[i].srcaddr);
+  uint32 r = (channel[i].srcbank << 16) | (channel[i].srcaddr);
  if(channel[i].fixedxfer == false) {
    if(channel[i].reversexfer == false) {
@ -97,7 +112,7 @@ void sCPU::dma_transfertobusa(uint8 i, uint8 bbus) {
 }
 inline void sCPU::dma_write(uint8 i, uint8 index) {
-//cannot use dma_transfer() directly, due to current S-DD1 implementation
+  //cannot use dma_transfer() directly, due to current S-DD1 implementation
  if(channel[i].direction == 0) {
    dma_transfertobusb(i, index);
  } else {
@ -107,7 +122,7 @@ inline void sCPU::dma_write(uint8 i, uint8 index) {
 void sCPU::dma_run() {
  for(int i = 0; i < 8; i++) {
-    if(channel[i].dma_enabled == false)continue;
+    if(channel[i].dma_enabled == false) continue;
    dma_add_clocks(8);
    if(cartridge.info.sdd1 == true) {
@ -144,24 +159,23 @@ inline bool sCPU::hdma_active(uint8 i) {
 inline bool sCPU::hdma_active_after(uint8 i) {
  for(int n = i + 1; n < 8; n++) {
-    if(hdma_active(n) == true) { return true; }
+    if(hdma_active(n) == true) return true;
  }
  return false;
 }
 inline uint8 sCPU::hdma_enabled_channels() {
-uint8 r = 0;
+  uint8 r = 0;
  for(int i = 0; i < 8; i++) {
-    if(channel[i].hdma_enabled)r++;
+    if(channel[i].hdma_enabled) r++;
  }
  return r;
 }
 inline uint8 sCPU::hdma_active_channels() {
-uint8 r = 0;
+  uint8 r = 0;
  for(int i = 0; i < 8; i++) {
-    if(hdma_active(i) == true)r++;
+    if(hdma_active(i) == true) r++;
  }
  return r;
 }
@ -186,9 +200,9 @@ void sCPU::hdma_update(uint8 i) {
 }
 void sCPU::hdma_run() {
-static uint8 hdma_xferlen[8] = { 1, 2, 2, 4, 4, 4, 2, 4 };
+  static uint8 hdma_xferlen[8] = { 1, 2, 2, 4, 4, 4, 2, 4 };
  for(int i = 0; i < 8; i++) {
-    if(hdma_active(i) == false)continue;
+    if(hdma_active(i) == false) continue;
    channel[i].dma_enabled = false; //HDMA run during DMA will stop DMA mid-transfer
    dma_add_clocks(8);
@ -271,3 +285,5 @@ void sCPU::dma_reset() {
    channel[i].hdma_do_transfer  = false;
  }
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/dma/dma.h
+++ b/src/cpu/scpu/dma/dma.h
@ -1,11 +1,11 @@
-struct {
+  struct {
-//$420b
+    //$420b
    bool   dma_enabled;
-//$420c
+    //$420c
    bool   hdma_enabled;
-//$43x0
+    //$43x0
    uint8  dmap;
    bool   direction;
    bool   hdma_indirect;
@ -13,37 +13,37 @@ struct {
    bool   fixedxfer;
    uint8  xfermode;
-//$43x1
+    //$43x1
    uint8  destaddr;
-//$43x2-$43x3
+    //$43x2-$43x3
    uint16 srcaddr;
-//$43x4
+    //$43x4
    uint8  srcbank;
-//$43x5-$43x6
+    //$43x5-$43x6
    union {
      uint16 xfersize;
      uint16 hdma_iaddr;
    };
-//$43x7
+    //$43x7
    uint8  hdma_ibank;
-//$43x8-$43x9
+    //$43x8-$43x9
    uint16 hdma_addr;
-//$43xa
+    //$43xa
    uint8  hdma_line_counter;
-//$43xb/$43xf
+    //$43xb/$43xf
    uint8  unknown;
-//internal variables
+    //internal variables
    bool   hdma_completed;
    bool   hdma_do_transfer;
-} channel[8];
+  } channel[8];
  void dma_add_clocks(uint clocks);
  void dma_transfer(bool direction, uint8 bbus, uint32 abus);
--- a/src/cpu/scpu/memory/memory.cpp
+++ b/src/cpu/scpu/memory/memory.cpp
@ -1,3 +1,5 @@
 #ifdef SCPU_CPP
 /*****
 * These 3 functions control bus timing for the CPU.
 * cpu_io is an I/O cycle, and always 6 clock cycles long.
@ -119,3 +121,5 @@ alwaysinline void sCPU::op_writedp(uint32 addr, uint8 data) {
 alwaysinline void sCPU::op_writesp(uint32 addr, uint8 data) {
  op_write((regs.s + (addr & 0xffff)) & 0xffff, data);
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/memory/memory.h
+++ b/src/cpu/scpu/memory/memory.h
@ -1,18 +1,18 @@
-/*****
+  /*****
   * CPU<>APU communication ports
   *****/
-uint8 apu_port[4];
+  uint8 apu_port[4];
-  uint8  port_read (uint8 port)             { return apu_port[port & 3]; }
+  uint8 port_read(uint8 port) { return apu_port[port & 3]; }
  void port_write(uint8 port, uint8 data) { apu_port[port & 3] = data; }
-/*****
+  /*****
   * core CPU bus functions
   *****/
  void op_io();
-  uint8  op_read (uint32 addr);
+  uint8 op_read(uint32 addr);
  void op_write(uint32 addr, uint8 data);
-/*****
+  /*****
   * helper memory addressing functions used by CPU core
   *****/
  uint8 op_readpc    ();
--- a/src/cpu/scpu/mmio/mmio.cpp
+++ b/src/cpu/scpu/mmio/mmio.cpp
@ -1,10 +1,12 @@
 #ifdef SCPU_CPP
 uint8 sCPU::pio_status() {
  return status.pio;
 }
 //WMDATA
 uint8 sCPU::mmio_r2180() {
-uint8 r = bus.read(0x7e0000 | status.wram_addr);
+  uint8 r = bus.read(0x7e0000 | status.wram_addr);
  status.wram_addr = (status.wram_addr + 1) & 0x01ffff;
  return r;
 }
@ -41,7 +43,7 @@ void sCPU::mmio_w4016(uint8 data) {
  status.joypad_strobe_latch = !!(data & 1);
  if(status.joypad_strobe_latch == 1) {
-    snes.poll_input();
+    snes.input.poll();
  }
 }
@ -52,8 +54,8 @@ void sCPU::mmio_w4016(uint8 data) {
 //TODO: test whether strobe latch of zero returns
 //realtime or buffered status of joypadN.b
 uint8 sCPU::mmio_r4016() {
-uint8 r = regs.mdr & 0xfc;
+  uint8 r = regs.mdr & 0xfc;
-  r |= (uint8)snes.port_read(0);
+  r |= (uint8)snes.input.port_read(0);
  return r;
 }
@ -62,8 +64,8 @@ uint8 r = regs.mdr & 0xfc;
 //4-2 = Always 1 (pins are connected to GND)
 //1-0 = Joypad serial data
 uint8 sCPU::mmio_r4017() {
-uint8 r = (regs.mdr & 0xe0) | 0x1c;
+  uint8 r = (regs.mdr & 0xe0) | 0x1c;
-  r |= (uint8)snes.port_read(1);
+  r |= (uint8)snes.input.port_read(1);
  return r;
 }
@ -167,7 +169,7 @@ void sCPU::mmio_w420d(uint8 data) {
 //6-4 = MDR
 //3-0 = CPU (5a22) version
 uint8 sCPU::mmio_r4210() {
-uint8 r = (regs.mdr & 0x70);
+  uint8 r = (regs.mdr & 0x70);
  r |= (uint8)(rdnmi()) << 7;
  r |= (cpu_version & 0x0f);
  return r;
@ -177,7 +179,7 @@ uint8 r = (regs.mdr & 0x70);
 //7   = IRQ acknowledge
 //6-0 = MDR
 uint8 sCPU::mmio_r4211() {
-uint8 r = (regs.mdr & 0x7f);
+  uint8 r = (regs.mdr & 0x7f);
  r |= (uint8)(timeup()) << 7;
  return r;
 }
@ -188,16 +190,16 @@ uint8 r = (regs.mdr & 0x7f);
 //5-1 = MDR
 //0   = JOYPAD acknowledge
 uint8 sCPU::mmio_r4212() {
-uint8 r = (regs.mdr & 0x3e);
+  uint8 r = (regs.mdr & 0x3e);
-uint16 vs = !overscan() ? 225 : 240;
+  uint16 vs = ppu.overscan() == false ? 225 : 240;
-//auto joypad polling
+  //auto joypad polling
  if(status.vcounter >= vs && status.vcounter <= (vs + 2))r |= 0x01;
-//hblank
+  //hblank
-  if(status.hclock <= 2 || status.hclock >= 1096)r |= 0x40;
+  if(status.hcounter <= 2 || status.hcounter >= 1096)r |= 0x40;
-//vblank
+  //vblank
  if(status.vcounter >= vs)r |= 0x80;
  return r;
@ -375,40 +377,40 @@ void sCPU::mmio_power() {
 }
 void sCPU::mmio_reset() {
-//$2181-$2183
+  //$2181-$2183
  status.wram_addr = 0x000000;
-//$4016-$4017
+  //$4016-$4017
  status.joypad_strobe_latch = 0;
  status.joypad1_bits = ~0;
  status.joypad2_bits = ~0;
-//$4200
+  //$4200
  status.nmi_enabled      = false;
  status.hirq_enabled     = false;
  status.virq_enabled     = false;
  status.auto_joypad_poll = false;
-//$4201
+  //$4201
  status.pio = 0xff;
-//$4202-$4203
+  //$4202-$4203
  status.mul_a = 0xff;
  status.mul_b = 0xff;
-//$4204-$4206
+  //$4204-$4206
  status.div_a = 0xffff;
  status.div_b = 0xff;
-//$4207-$420a
+  //$4207-$420a
  status.hirq_pos = 0x01ff;
  status.virq_pos = 0x01ff;
-//$4214-$4217
+  //$4214-$4217
  status.r4214 = 0x0000;
  status.r4216 = 0x0000;
-//$4218-$421f
+  //$4218-$421f
  status.joy1l = 0x00;
  status.joy1h = 0x00;
  status.joy2l = 0x00;
@ -422,13 +424,13 @@ void sCPU::mmio_reset() {
 uint8 sCPU::mmio_read(uint addr) {
  addr &= 0xffff;
-//APU
+  //APU
  if((addr & 0xffc0) == 0x2140) { //$2140-$217f
    scheduler.sync_cpusmp();
    return smp.port_read(addr & 3);
  }
-//DMA
+  //DMA
  if((addr & 0xff80) == 0x4300) { //$4300-$437f
    uint i = (addr >> 4) & 7;
    switch(addr & 0xf) {
@ -479,14 +481,14 @@ uint8 sCPU::mmio_read(uint addr) {
 void sCPU::mmio_write(uint addr, uint8 data) {
  addr &= 0xffff;
-//APU
+  //APU
  if((addr & 0xffc0) == 0x2140) { //$2140-$217f
    scheduler.sync_cpusmp();
    port_write(addr & 3, data);
    return;
  }
-//DMA
+  //DMA
  if((addr & 0xff80) == 0x4300) { //$4300-$437f
  uint i = (addr >> 4) & 7;
    switch(addr & 0xf) {
@ -532,3 +534,5 @@ void sCPU::mmio_write(uint addr, uint8 data) {
    case 0x420d: mmio_w420d(data); return;
  }
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/mmio/mmio.h
+++ b/src/cpu/scpu/mmio/mmio.h
@ -1,6 +1,6 @@
  void mmio_power();
  void mmio_reset();
-  uint8  mmio_read (uint addr);
+  uint8 mmio_read(uint addr);
  void mmio_write(uint addr, uint8 data);
  uint8 pio_status();
--- a/src/cpu/scpu/scpu.cpp
+++ b/src/cpu/scpu/scpu.cpp
@ -1,4 +1,5 @@
 #include "../../base.h"
 #define SCPU_CPP
 #include "core/core.cpp"
 #include "dma/dma.cpp"
@ -7,8 +8,6 @@
 #include "timing/timing.cpp"
 void sCPU::power() {
  status.region = (bool)snes.region();
  regs.a = regs.x = regs.y = 0x0000;
  regs.s = 0x01ff;
@ -24,7 +23,7 @@ void sCPU::reset() {
  regs.pc.l = bus.read(0xfffc);
  regs.pc.h = bus.read(0xfffd);
-//note: some registers are not fully reset by SNES
+  //note: some registers are not fully reset by SNES
  regs.x.h  = 0x00;
  regs.y.h  = 0x00;
  regs.s.h  = 0x01;
--- a/src/cpu/scpu/scpu.h
+++ b/src/cpu/scpu/scpu.h
@ -1,19 +1,20 @@
-class sCPU : public CPU { public:
+class sCPU : public CPU {
 public:
  void enter();
-#include "core/core.h"
+  #include "core/core.h"
-#include "dma/dma.h"
+  #include "dma/dma.h"
-#include "memory/memory.h"
+  #include "memory/memory.h"
-#include "mmio/mmio.h"
+  #include "mmio/mmio.h"
-#include "timing/timing.h"
+  #include "timing/timing.h"
-struct {
+  struct {
    bool wai;
    bool irq;
    uint16 irq_vector;
-} event;
+  } event;
-struct {
+  struct {
    uint   nmi_hold;
    uint   irq_hold;
@ -33,31 +34,25 @@ struct {
        ctr  = 0;
      }
    }
-} counter;
+  } counter;
-enum {
+  enum {
    DMASTATE_INACTIVE,
    DMASTATE_DMASYNC,
    DMASTATE_RUN,
    DMASTATE_CPUSYNC,
-};
+  };
-struct {
+  struct {
-//core
+    //core
    uint8  opcode;
    bool   in_opcode;
    uint   clock_count;
-//timing
+    //timing
-  bool   region;
+    uint16 vcounter, hcounter;
  uint16 region_scanlines;
  uint16 vcounter, hcounter, hclock;
  bool   interlace, interlace_field;
  bool   overscan;
    uint16 field_lines, line_clocks;
  uint16 prev_field_lines, prev_line_clocks;
  uint16 vblstart;
    bool   line_rendered;
    uint16 line_render_position;
@ -72,7 +67,6 @@ struct {
    uint16 irq_delay;
  uint16 vnmi_trigger_pos;
    bool   nmi_valid;
    bool   nmi_line;
    bool   nmi_transition;
@ -84,7 +78,7 @@ struct {
    bool   irq_transition;
    bool   irq_pending;
-//dma
+    //dma
    uint   dma_counter;
    uint   dma_clocks;
    uint   dma_state;
@ -92,44 +86,44 @@ struct {
    bool   hdma_pending;
    bool   hdmainit_pending;
-//mmio
+    //mmio
-//$2181-$2183
+    //$2181-$2183
    uint32 wram_addr;
-//$4016-$4017
+    //$4016-$4017
    bool   joypad_strobe_latch;
    uint32 joypad1_bits;
    uint32 joypad2_bits;
-//$4200
+    //$4200
    bool   nmi_enabled;
    bool   hirq_enabled, virq_enabled;
    bool   auto_joypad_poll;
-//$4201
+    //$4201
    uint8  pio;
-//$4202-$4203
+    //$4202-$4203
    uint8  mul_a, mul_b;
-//$4204-$4206
+    //$4204-$4206
    uint16 div_a;
    uint8  div_b;
-//$4207-$420a
+    //$4207-$420a
    uint16 hirq_pos, virq_pos;
-//$4214-$4217
+    //$4214-$4217
    uint16 r4214;
    uint16 r4216;
-//$4218-$421f
+    //$4218-$421f
    uint8  joy1l, joy1h;
    uint8  joy2l, joy2h;
    uint8  joy3l, joy3h;
    uint8  joy4l, joy4h;
-} status;
+  } status;
  void power();
  void reset();
--- a/src/cpu/scpu/timing/irq.cpp
+++ b/src/cpu/scpu/timing/irq.cpp
@ -1,60 +1,137 @@
-#include "irqtiming.cpp"
+#ifdef SCPU_CPP
 void sCPU::update_interrupts() {
  if(irq_pos_valid() == true) {
    status.virq_trigger_pos = status.virq_pos;
    status.hirq_trigger_pos = 4 * ((status.hirq_enabled) ? (status.hirq_pos + 1) : 0);
  } else {
    status.virq_trigger_pos = IRQ_TRIGGER_NEVER;
    status.hirq_trigger_pos = IRQ_TRIGGER_NEVER;
  }
 }
 alwaysinline void sCPU::poll_interrupts() {
  uint16_t vpos, hpos;
  //NMI hold
  if(counter.nmi_hold) {
    counter.nmi_hold -= 2;
    if(counter.nmi_hold == 0) {
      if(status.nmi_enabled == true) status.nmi_transition = true;
    }
  }
  //NMI test
  history.query(2, vpos, hpos);
  bool nmi_valid = (vpos >= (!ppu.overscan() ? 225 : 240));
  if(status.nmi_valid == false && nmi_valid == true) {
    //0->1 edge sensitive transition
    status.nmi_line = true;
    counter.nmi_hold = 4;
  } else if(status.nmi_valid == true && nmi_valid == false) {
    //1->0 edge sensitive transition
    status.nmi_line = false;
  }
  status.nmi_valid = nmi_valid;
  //IRQ hold
  if(counter.irq_hold) counter.irq_hold -= 2;
  if(status.irq_line == true && counter.irq_hold == 0) {
    if(status.virq_enabled == true || status.hirq_enabled == true) status.irq_transition = true;
  }
  //IRQ test
  history.query(10, vpos, hpos);
  bool irq_valid = (status.virq_enabled == true || status.hirq_enabled == true);
  if(irq_valid == true) {
    if(status.virq_enabled == true && vpos != status.virq_trigger_pos) irq_valid = false;
    if(status.hirq_enabled == true && hpos != status.hirq_trigger_pos) irq_valid = false;
  }
  if(status.irq_valid == false && irq_valid == true) {
    //0->1 edge sensitive transition
    status.irq_line = true;
    counter.irq_hold = 4;
  }
  status.irq_valid = irq_valid;
 }
 void sCPU::nmitimen_update(uint8 data) {
  bool nmi_enabled  = status.nmi_enabled;
  bool virq_enabled = status.virq_enabled;
  bool hirq_enabled = status.hirq_enabled;
  status.nmi_enabled  = !!(data & 0x80);
  status.virq_enabled = !!(data & 0x20);
  status.hirq_enabled = !!(data & 0x10);
  //0->1 edge sensitive transition
  if(nmi_enabled == false && status.nmi_enabled == true && status.nmi_line == true) {
    status.nmi_transition = true;
  }
  //?->1 level sensitive transition
  if(status.virq_enabled == true && status.hirq_enabled == false && status.irq_line == true) {
    status.irq_transition = true;
  }
  if(status.virq_enabled == false && status.hirq_enabled == false) {
    status.irq_line = false;
    status.irq_transition = false;
  }
  update_interrupts();
  counter.set(counter.irq_delay, 2);
 }
 void sCPU::hvtime_update(uint16 addr) {
  update_interrupts();
 }
 bool sCPU::rdnmi() {
  bool result = status.nmi_line;
  if(counter.nmi_hold == 0) {
    status.nmi_line = false;
  }
  return result;
 }
 bool sCPU::timeup() {
  bool result = status.irq_line;
  if(counter.irq_hold == 0) {
    status.irq_line = false;
    status.irq_transition = false;
  }
  return result;
 }
 bool sCPU::irq_pos_valid() {
-uint vpos   = status.virq_pos;
+  uint vpos = status.virq_pos;
-uint hpos   = (status.hirq_enabled) ? status.hirq_pos : 0;
+  uint hpos = (status.hirq_enabled) ? status.hirq_pos : 0;
-uint vlimit = region_scanlines() >> 1;
+  uint vlimit = (snes.region() == SNES::NTSC ? 525 : 625) >> 1;
-//positions that can never be latched
+  //positions that can never be latched
-//vlimit = 262/NTSC, 312/PAL
+  //vlimit = 262/NTSC, 312/PAL
-//PAL results are unverified on hardware
+  //PAL results are unverified on hardware
-  if(vpos == 240 && hpos == 339 && interlace() == false && interlace_field() == 1)return false;
+  if(vpos == 240 && hpos == 339 && ppu.interlace() == false && ppu.field() == 1) return false;
-  if(vpos == (vlimit - 1) && hpos == 339 && interlace() == false)return false;
+  if(vpos == (vlimit - 1) && hpos == 339 && ppu.interlace() == false) return false;
-  if(vpos == vlimit && interlace() == false)return false;
+  if(vpos == vlimit && ppu.interlace() == false) return false;
-  if(vpos == vlimit && hpos == 339)return false;
+  if(vpos == vlimit && hpos == 339) return false;
-  if(vpos  > vlimit)return false;
+  if(vpos  > vlimit) return false;
-  if(hpos  > 339)return false;
+  if(hpos  > 339) return false;
  return true;
 }
-alwaysinline
+alwaysinline bool sCPU::nmi_test() {
-bool sCPU::nmi_test() {
+  if(status.nmi_transition == false) return false;
  if(status.nmi_transition == false) { return false; }
  status.nmi_transition = false;
  event.wai = false;
  return true;
 }
-alwaysinline
+alwaysinline bool sCPU::irq_test() {
-bool sCPU::irq_test() {
+  if(status.irq_transition == false) return false;
  if(status.irq_transition == false) { return false; }
  status.irq_transition = false;
  event.wai = false;
-  return (regs.p.i) ? false : true;
+  return regs.p.i ? false : true;
 }
-/*
+#endif //ifdef SCPU_CPP
  if(status.irq_transition == 1)goto irq_trigger;
  if(status.irq_read == 0) {
    if(status.irq_line == 1 && irq_edge()) {
      return false;
    }
    goto irq_trigger;
  }
  if(status.irq_line == 0) {
    status.irq_line = 1;
    goto irq_trigger;
  }
  return false;
 irq_trigger:
  status.irq_transition = 0;
  event.wai = false;
  return (regs.p.i) ? false : true;
 }
 */
--- a/src/cpu/scpu/timing/irqtiming.cpp
+++ b/src/cpu/scpu/timing/irqtiming.cpp
@ -1,105 +0,0 @@
 void sCPU::update_interrupts() {
  status.vnmi_trigger_pos = status.vblstart;
  if(irq_pos_valid() == true) {
    status.virq_trigger_pos = status.virq_pos;
    status.hirq_trigger_pos = 4 * ((status.hirq_enabled) ? (status.hirq_pos + 1) : 0);
  } else {
    status.virq_trigger_pos = IRQ_TRIGGER_NEVER;
    status.hirq_trigger_pos = IRQ_TRIGGER_NEVER;
  }
 }
 alwaysinline
 void sCPU::poll_interrupts() {
 uint vpos = status.vcounter, hpos = status.hclock;
 //NMI test
  timeshift_backward(2, vpos, hpos);
 bool nmi_valid = (vpos >= status.vnmi_trigger_pos);
  if(status.nmi_valid == false && nmi_valid == true) {
  //0->1 edge sensitive transition
    status.nmi_line = true;
    counter.nmi_hold = 6;
  } else if(status.nmi_valid == true && nmi_valid == false) {
  //1->0 edge sensitive transition
    status.nmi_line = false;
  }
  status.nmi_valid = nmi_valid;
 //NMI hold
  if(counter.nmi_hold) {
    counter.nmi_hold -= 2;
    if(counter.nmi_hold == 0) {
      if(status.nmi_enabled == true) { status.nmi_transition = true; }
    }
  }
 //IRQ test
  timeshift_backward(8, vpos, hpos);
 bool irq_valid = (status.virq_enabled == true || status.hirq_enabled == true);
  if(irq_valid == true) {
    if(status.virq_enabled == true && vpos != status.virq_trigger_pos) { irq_valid = false; }
    if(status.hirq_enabled == true && hpos != status.hirq_trigger_pos) { irq_valid = false; }
  }
  if(status.irq_valid == false && irq_valid == true) {
  //0->1 edge sensitive transition
    status.irq_line = true;
    counter.irq_hold = 6;
  }
  status.irq_valid = irq_valid;
 //IRQ hold
  if(counter.irq_hold) { counter.irq_hold -= 2; }
  if(status.irq_line == true && counter.irq_hold == 0) {
    if(status.virq_enabled == true || status.hirq_enabled == true) { status.irq_transition = true; }
  }
 }
 void sCPU::nmitimen_update(uint8 data) {
 bool nmi_enabled  = status.nmi_enabled;
 bool virq_enabled = status.virq_enabled;
 bool hirq_enabled = status.hirq_enabled;
  status.nmi_enabled  = !!(data & 0x80);
  status.virq_enabled = !!(data & 0x20);
  status.hirq_enabled = !!(data & 0x10);
 //0->1 edge sensitive transition
  if(nmi_enabled == false && status.nmi_enabled == true && status.nmi_line == true) {
    status.nmi_transition = true;
  }
 //?->1 level sensitive transition
  if(status.virq_enabled == true && status.hirq_enabled == false && status.irq_line == true) {
    status.irq_transition = true;
  }
  if(status.virq_enabled == false && status.hirq_enabled == false) {
    status.irq_line = false;
    status.irq_transition = false;
  }
  update_interrupts();
  counter.set(counter.irq_delay, 2);
 }
 void sCPU::hvtime_update(uint16 addr) {
  update_interrupts();
 }
 bool sCPU::rdnmi() {
 bool result = status.nmi_line;
  if(counter.nmi_hold == 0) {
    status.nmi_line = false;
  }
  return result;
 }
 bool sCPU::timeup() {
 bool result = status.irq_line;
  if(counter.irq_hold == 0) {
    status.irq_line = false;
    status.irq_transition = false;
  }
  return result;
 }
--- a/src/cpu/scpu/timing/joypad.cpp
+++ b/src/cpu/scpu/timing/joypad.cpp
@ -1,8 +1,10 @@
 #ifdef SCPU_CPP
 void sCPU::run_auto_joypad_poll() {
-uint16 joy1 = 0, joy2 = 0;
+  uint16_t joy1 = 0, joy2 = 0;
-  for(int i = 0; i < 16; i++) {
+  for(unsigned i = 0; i < 16; i++) {
-    joy1 |= (uint16)snes.port_read(0) ? (0x8000 >> i) : 0;
+    joy1 |= (uint16_t)snes.input.port_read(0) ? (0x8000 >> i) : 0;
-    joy2 |= (uint16)snes.port_read(1) ? (0x8000 >> i) : 0;
+    joy2 |= (uint16_t)snes.input.port_read(1) ? (0x8000 >> i) : 0;
  }
  status.joy1l = joy1;
@ -17,3 +19,5 @@ uint16 joy1 = 0, joy2 = 0;
  status.joy4l = 0x00;
  status.joy4h = 0x00;
 }
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/timing/timeshift.cpp
+++ b/src/cpu/scpu/timing/timeshift.cpp
@ -1,22 +0,0 @@
 alwaysinline void sCPU::timeshift_forward(uint clocks, uint &vtime, uint &htime) {
  htime += clocks;
  if(htime >= status.line_clocks) {
    htime -= status.line_clocks;
    if(++vtime >= status.field_lines) {
      vtime = 0;
    }
  }
 }
 alwaysinline void sCPU::timeshift_backward(uint clocks, uint &vtime, uint &htime) {
  if(htime >= clocks) {
    htime -= clocks;
  } else {
    htime += status.prev_line_clocks - clocks;
    if(vtime > 0) {
      vtime--;
    } else {
      vtime = status.prev_field_lines - 1;
    }
  }
 }
--- a/src/cpu/scpu/timing/timing.cpp
+++ b/src/cpu/scpu/timing/timing.cpp
@ -1,31 +1,16 @@
-#define ntsc_color_burst_phase_shift_scanline() \
+#ifdef SCPU_CPP
-  (status.region == SNES::NTSC && status.vcounter == 240 && \
+
-   status.interlace == false && status.interlace_field == 1)
+#define ntsc_color_burst_phase_shift_scanline() ( \
  snes.region() == SNES::NTSC && status.vcounter == 240 && \
  ppu.interlace() == false && ppu.field() == 1 \
 )
 #include "timeshift.cpp"
 #include "irq.cpp"
 #include "joypad.cpp"
 uint16 sCPU::vcounter()  { return status.vcounter; }
-uint16 sCPU::hclock()   { return status.hclock;   }
+uint16 sCPU::hcounter()  { return status.hcounter; }
-
+uint sCPU::dma_counter() { return (status.dma_counter + status.hcounter) & 7; }
 bool   sCPU::interlace()        { return status.interlace;        }
 bool   sCPU::interlace_field()  { return status.interlace_field;  }
 bool   sCPU::overscan()         { return status.overscan;         }
 uint16 sCPU::region_scanlines() { return status.region_scanlines; }
 uint   sCPU::dma_counter() { return (status.dma_counter + status.hclock) & 7; }
 void sCPU::set_interlace(bool r) {
  status.interlace = r;
  update_interrupts();
 }
 void sCPU::set_overscan (bool r) {
  status.overscan = r;
  status.vblstart = (status.overscan == false) ? 225 : 240;
  update_interrupts();
 }
 /*****
 * One PPU dot = 4 CPU clocks
@ -37,16 +22,14 @@ void sCPU::set_overscan (bool r) {
 * Dot 323 range = { 1292, 1294, 1296 }
 * Dot 327 range = { 1310, 1312, 1314 }
 *****/
-uint16 sCPU::hcounter() {
+uint16 sCPU::hdot() {
-  if(ntsc_color_burst_phase_shift_scanline() == true) {
+  if(ntsc_color_burst_phase_shift_scanline() == true) return (status.hcounter >> 2);
-    return (status.hclock >> 2);
+  return (status.hcounter - ((status.hcounter > 1292) << 1) - ((status.hcounter > 1310) << 1)) >> 2;
  }
  return (status.hclock - ((status.hclock > 1292) << 1) - ((status.hclock > 1310) << 1)) >> 2;
 }
 void sCPU::add_clocks(uint clocks) {
  if(status.dram_refreshed == false) {
-    if(status.hclock + clocks >= status.dram_refresh_position) {
+    if(status.hcounter + clocks >= status.dram_refresh_position) {
      status.dram_refreshed = true;
      clocks += 40;
    }
@ -57,24 +40,20 @@ void sCPU::add_clocks(uint clocks) {
  clocks >>= 1;
  while(clocks--) {
-    status.hclock += 2;
+    history.enqueue(status.vcounter, status.hcounter);
-    if(status.hclock >= status.line_clocks) { scanline(); }
+    status.hcounter += 2;
    if(status.hcounter >= status.line_clocks) scanline();
    poll_interrupts();
  }
 }
 void sCPU::scanline() {
-  status.hclock = 0;
+  status.hcounter = 0;
  status.dma_counter = (status.dma_counter + status.line_clocks) & 7;
-
+  if(++status.vcounter >= status.field_lines) frame();
  if(++status.vcounter >= status.field_lines) {
    frame();
  }
  status.prev_line_clocks = status.line_clocks;
  status.line_clocks = (ntsc_color_burst_phase_shift_scanline() == false) ? 1364 : 1360;
-//dram refresh occurs once every scanline
+  //dram refresh occurs once every scanline
  status.dram_refreshed = false;
  if(cpu_version == 2) {
    if(ntsc_color_burst_phase_shift_scanline() == false) {
@ -86,29 +65,30 @@ void sCPU::scanline() {
    }
  }
-//hdma triggers once every visible scanline
+  //hdma triggers once every visible scanline
  status.line_rendered  = false;
-  status.hdma_triggered = (status.vcounter <= (!overscan() ? 224 : 239)) ? false : true;
+  status.hdma_triggered = (status.vcounter <= (ppu.overscan() == false ? 224 : 239)) ? false : true;
  ppu.scanline();
  snes.scanline();
  update_interrupts();
-  if(status.auto_joypad_poll == true && status.vcounter == (!overscan() ? 227 : 242)) {
+  if(status.auto_joypad_poll == true && status.vcounter == (ppu.overscan() == false ? 227 : 242)) {
-    snes.poll_input();
+    snes.input.poll();
    run_auto_joypad_poll();
  }
 }
 void sCPU::frame() {
  ppu.frame();
  snes.frame();
  status.vcounter = 0;
-  status.interlace_field ^= 1;
+  status.field_lines = (snes.region() == SNES::NTSC ? 525 : 625) >> 1;
-  status.prev_field_lines = status.field_lines;
+  //interlaced even fields have one extra scanline
-  status.field_lines = (status.region_scanlines >> 1);
+  //(263+262=525 NTSC, 313+312=625 PAL)
-//interlaced even fields have one extra scanline
+  if(ppu.interlace() == true && ppu.field() == 0) status.field_lines++;
 //(263+262=525 NTSC, 313+312=625 PAL)
  if(status.interlace == true && status.interlace_field == 0)status.field_lines++;
  status.hdmainit_triggered = false;
  if(cpu_version == 1) {
@ -116,9 +96,6 @@ void sCPU::frame() {
  } else {
    status.hdmainit_trigger_position = 12 + dma_counter();
  }
  ppu.frame();
  snes.frame();
 }
 /*****
@ -141,21 +118,20 @@ alwaysinline void sCPU::precycle_edge() {
 *****/
 void sCPU::cycle_edge() {
  if(status.line_rendered == false) {
-    if(status.hclock >= status.line_render_position) {
+    if(status.hcounter >= status.line_render_position) {
      status.line_rendered = true;
      ppu.render_scanline();
    }
  }
  switch(status.dma_state) {
-  case DMASTATE_INACTIVE:
+    case DMASTATE_INACTIVE: break;
    break;
-  case DMASTATE_DMASYNC:
+    case DMASTATE_DMASYNC: {
      status.dma_state = DMASTATE_RUN;
-    break;
+    } break;
-  case DMASTATE_RUN:
+    case DMASTATE_RUN: {
      status.dma_state = DMASTATE_CPUSYNC;
      status.dma_clocks = 8 - dma_counter() + 8;
      add_clocks(status.dma_clocks);
@ -164,11 +140,11 @@ void sCPU::cycle_edge() {
      if(status.hdma_pending)     { hdma_run();  status.hdma_pending     = false; }
      if(status.dma_pending)      { dma_run();   status.dma_pending      = false; }
-    break;
+    } break;
  }
  if(status.hdmainit_triggered == false) {
-    if(status.hclock >= status.hdmainit_trigger_position || status.vcounter) {
+    if(status.hcounter >= status.hdmainit_trigger_position || status.vcounter) {
      status.hdmainit_triggered = true;
      hdma_init_reset();
      if(hdma_enabled_channels()) {
@ -185,7 +161,7 @@ void sCPU::cycle_edge() {
  }
  if(status.hdma_triggered == false) {
-    if(status.hclock >= 1106) {
+    if(status.hcounter >= 1106) {
      status.hdma_triggered = true;
      if(hdma_active_channels()) {
        add_clocks(18);
@ -211,7 +187,7 @@ void sCPU::cycle_edge() {
 * trigger during certain events (immediately after DMA, writes to $4200, etc)
 *****/
 void sCPU::last_cycle() {
-  if(counter.irq_delay) { return; }
+  if(counter.irq_delay) return;
  status.nmi_pending |= nmi_test();
  status.irq_pending |= irq_test();
@ -235,20 +211,10 @@ void sCPU::timing_reset() {
  status.vcounter = 0;
  status.hcounter = 0;
  status.hclock   = 0;
-  status.interlace        = 0;
+  status.field_lines = (snes.region() == SNES::NTSC ? 525 : 625) >> 1;
  status.interlace_field  = 0;
  status.overscan         = false;
  status.region_scanlines = (status.region == SNES::NTSC) ? 525 : 625;
  status.vblstart         = 225;
  status.field_lines = status.region_scanlines >> 1;
  status.line_clocks = 1364;
  status.prev_field_lines = status.region_scanlines >> 1;
  status.prev_line_clocks = 1364;
  status.line_rendered = false;
  status.line_render_position = min(1112U, (uint)config::ppu.hack.render_scanline_position);
@ -280,10 +246,14 @@ void sCPU::timing_reset() {
  status.hdma_pending     = false;
  status.hdmainit_pending = false;
-//initial latch values for $213c/$213d
+  history.reset();
-//[x]0035 : [y]0000 (53.0 -> 212) [lda $2137]
+
-//[x]0038 : [y]0000 (56.5 -> 226) [nop : lda $2137]
+  //initial latch values for $213c/$213d
-//add_clocks(186);
+  //[x]0035 : [y]0000 (53.0 -> 212) [lda $2137]
  //[x]0038 : [y]0000 (56.5 -> 226) [nop : lda $2137]
  add_clocks(186);
 }
 #undef ntsc_color_burst_phase_shift_scanline
 #endif //ifdef SCPU_CPP
--- a/src/cpu/scpu/timing/timing.h
+++ b/src/cpu/scpu/timing/timing.h
@ -1,15 +1,6 @@
  uint16 vcounter();
  uint16 hcounter();
-  uint16 hclock();
+  uint16 hdot();
  bool   interlace();
  bool   interlace_field();
  bool   overscan();
  uint16 region_scanlines();
  void   set_interlace(bool r);
  void   set_overscan(bool r);
  uint dma_counter();
  void add_clocks(uint clocks);
@ -24,12 +15,33 @@
  void timing_power();
  void timing_reset();
-//timeshift.cpp
+  //timeshifting -- needed by NMI and IRQ timing
-  void   timeshift_forward (uint clocks, uint &v, uint &h);
+  struct History {
-  void   timeshift_backward(uint clocks, uint &v, uint &h);
+    struct Time {
      uint16 vcounter;
      uint16 hcounter;
    } time[32];
    unsigned index;
    alwaysinline void enqueue(uint16 vcounter, uint16 hcounter) {
      Time &t = time[index++];
      index &= 31;
      t.vcounter = vcounter;
      t.hcounter = hcounter;
    }
    alwaysinline void query(unsigned offset, uint16 &vcounter, uint16 &hcounter) {
      Time &t = time[(index - (offset >> 1)) & 31];
      vcounter = t.vcounter;
      hcounter = t.hcounter;
    }
    void reset() {
      index = 0;
      for(unsigned i = 0; i < 32; i++) time[i].vcounter = time[i].hcounter = 0;
    }
    History() { reset(); }
  } history;
-//irq.cpp
+  //irq.cpp
-enum { IRQ_TRIGGER_NEVER = 0x3fff };
+  enum { IRQ_TRIGGER_NEVER = 0x3fff };
  void update_interrupts();
  void poll_interrupts();
  void nmitimen_update(uint8 data);
@ -41,5 +53,5 @@ enum { IRQ_TRIGGER_NEVER = 0x3fff };
  bool nmi_test();
  bool irq_test();
-//joypad.cpp
+  //joypad.cpp
  void run_auto_joypad_poll();
--- a/src/data/controller.h
+++ b/src/data/controller.h
--- a/src/data/icon48.h
+++ b/src/data/icon48.h
@ -0,0 +1,40 @@
 static char enc_icon48[] = {
  "_gAB8AHwAfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHw"
  "AfD_AfAB8AHwAfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB"
  "8AHwAfD_AfAB8AHwAfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHw"
  "AfAB8AHwAfD_AfAB8AHwAfAB8AHwAfABgFD_oRYPBAA1BABWVQQAWwQAQQQAGgQA"
  "Av8u8AHwAfAB8AHwAfAB8AHwVbSAAQQALQQAsAQA9FUEAP8EwPsEAM4EAFP9BAAE"
  "QvAB8AHwAfAB8AHwqwHwvOAEBACFBAD5uPDVBOD-BAC9BAAUSvAB8L8B8AHwAfAB"
  "8AHwvGADBACuoqjwBPAEwNsEABZS8H8B8AHwAfAB8AHwAfDAIHuvnPAE8ATwBCDH"
  "BAAFVvC_AfAB8AHwAfAB8LzAIAQA3vaY8ATwBPAEYGZa8AHw3wHwAfAB8AHwwMCX"
  "kPAE8OsE8ASg3wQABl7wAfAB8K8B8AHwAfC8QAYEAOeQ8PcE8ATw0OMvYvAB8AHw"
  "AfDXAfAB8MBAHAQA_JDwBPALBPAE4GRi8AAAPz9U_wEEAA0EAB0EAB59BAAPBABE"
  "9gHwAfDA8BVVBABxBAB3BAChUET9p5zwBPAE8BaGuMALBACqbAQAzgQA9AQA-wQA"
  "qvwEAPYEANYEAHoEAL4SlvAB8AHwAfAEhjIEAF68FEKo8ATwBFCBcIFHtQQA5AQA"
  "_wTwBKDuBAB-XDQQjvAB8AHwAfAQhmhHzPYE8ARgpQ5YwEBor2xBsPAE8AQQ_QQA"
  "hFTyfwHwAfAB8MjA-Bgg8wTQowAQ-_-rACMuNrz_SrzwBPAE8MQgZ4LwbwHwAfAB"
  "8BDJkbTwBMCnAAfLfV-0ETU6fP_mnPAE8ATwBCAkExxfhvAB8AHwAfDEgBEEAO0D"
  "uPAEQKQO_f-tAIBCLDX_cTw-mPA3BPAE8ASAlYLwAUDNAKoBBAAFBAAUBAAiBAB-"
  "JQhAEBAYEETz5PYE8KgABZxKRfIENju8_9eQ8ATwBPAEoOq0wKoDBAAsBACGBADM"
  "BADq7AQA_AQA_gSAEBAYEOrKBACDBAAqBABMo6gAFkC88AQgrvgCBy83wP8VPj7_"
  "-JDwBPCvBPAIs7yAuBDEoED_BPBXBPAEQDAQwAQAKcCAHRf8S7hQMBl_uFk4O_--"
  "KYzwBPAE8ATwvEBhBABe95zwBPAE8ARg9gQAW1HAIJ8XFKwA8uhIkFUEAB-sxhkE"
  "AH0EAJL1BADDBADznPAE8ATwwADozQBIBAD5kPAE8ATwAQTg-ADQACn_nrwYAshD"
  "pPUB8NAQEQQA3nGgRqjwBPDAkOKI8ATw9wTwBPAEIM8UAwHwAfAB8HvIEPQYzKjw"
  "BPAEQDQS0t-I8ATwBPAE8ARAeprwAfB3AfDEYLAZyqzwBPAEAMX1cAAvBADxiPAE"
  "8ATwBOB68AQAGZbwAfAB8MSgHK0EAPGw8ASg_gQAScBDvj4URZTwBPAE8AQw6gQA"
  "RjwN9mwJ__8IBAAT_QQAGgRADBAUEET2xHDgE6u48ARwuwQAA0CFGQQAup0EAPOc"
  "8ATwBIDyBACgmADLABe0gAkEAKpFBACaBADSBADsBABa-QQA-wRADBDtBADTVQQA"
  "nQQASAQACsDAGK0EAPW48AQg3QQAFfbwVcggEQQAUwQAoRxD6b0EAPRcJNwwEBAY"
  "EJ8EAKpRBAAQuIAGBABuBAC66AQA_wTwBPAEgOoEAEpzBAAHSxBBOFgryF-88BQg"
  "LHEB8NDQBgQAC10EAA0IQLj-vDAQBADFr5jwBPAE8ASgywQAFMRA6pm4gOcEAHAE"
  "AOAgAfCvAfAB8AHwvEACBAC1jPAvBPAE8ATwBAC_VBBDMtT_TrAAeQQAPAQAYKLf"
  "AfAB8AHwAfDAQBnYQozw1wTwBPAE8P0EAB1p8AHwrwHwAfAB8MDgGAQA-ojw7wTw"
  "BPAE8AQA_AQA3PsB8N8B8AHwAfDA8CQVsYjwBPD3BPAE8AQAulz1AfAB8AHw1wHw"
  "AfDEQA0EAL2M8ATw9wTwBKAEFBFh8AHwAfAB8FcB8AHwxIAFBABoBADjXQQA_pzw"
  "BPAEgOUEAG3_hCUB8AHwAfAB8AHwAfAB8KvIEFwXPQQAkgQAz8BGXveYQwQQDBAU"
  "ENAEAJT9BABB9CYB8AHwAfAB8AHwrwHwAfAB8NBwBAQADtgl_QQwDxRA5PIB8AHw"
  "AfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHwAfD_AfAB8AHwAfAB"
  "8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHwAfD_AfAB8AHw"
  "AfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHwfwHwAfAB8AHwAfAB8AGA"
 };
--- a/src/dsp/adsp/adsp.cpp
+++ b/src/dsp/adsp/adsp.cpp
@ -1,4 +1,6 @@
 #include "../../base.h"
 #define ADSP_CPP
 #include "adsp_tables.cpp"
 void aDSP::enter() { loop:
@ -579,7 +581,7 @@ int32 fir_samplel, fir_sampler;
  }
  snes.audio_update(msamplel, msampler);
-  scheduler.addclocks_dsp(32 * 3);
+  scheduler.addclocks_dsp(32 * 3 * 8);
 }
 aDSP::aDSP()  {}
--- a/src/dsp/adsp/adsp_tables.cpp
+++ b/src/dsp/adsp/adsp_tables.cpp
@ -1,3 +1,5 @@
 #ifdef ADSP_CPP
 const uint16 aDSP::rate_table[32] = {
  0x0000, 0x000F, 0x0014, 0x0018, 0x001E, 0x0028, 0x0030, 0x003C,
  0x0050, 0x0060, 0x0078, 0x00A0, 0x00C0, 0x00F0, 0x0140, 0x0180,
@ -71,3 +73,5 @@ const int16 aDSP::gaussian_table[512] = {
  0x513, 0x514, 0x514, 0x515, 0x516, 0x516, 0x517, 0x517,
  0x517, 0x518, 0x518, 0x518, 0x518, 0x518, 0x519, 0x519
 };
 #endif //ifdef ADSP_CPP
--- a/src/dsp/bdsp/bdsp.cpp
+++ b/src/dsp/bdsp/bdsp.cpp
@ -469,7 +469,7 @@ void bDSP::enter()
 	{
 		// n is currently ignored
 		#define NEXT_CLOCK( n ) \
-			scheduler.addclocks_dsp( 3 );
+			scheduler.addclocks_dsp( 3 * 8 );
 		// Execute clock for a particular voice
 		#define V( clock, voice )   voice_##clock( &m.voices [voice] );
@ -563,7 +563,7 @@ void bDSP::enter()
 			}
 			// Output sample to DAC
-			snes.audio_update( main_out_l, main_out_r );
+			snes.audio.update( main_out_l, main_out_r );
 			m.t_main_out [0] = 0;
 			m.t_main_out [1] = 0;
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@ -1,7 +1,8 @@
-class DSP { public:
+class DSP {
 public:
  virtual void enter() = 0;
-  virtual uint8  read (uint8 addr) = 0;
+  virtual uint8 read(uint8 addr) = 0;
  virtual void write(uint8 addr, uint8 data) = 0;
  virtual void power() = 0;
--- a/src/lib/hiro/gtk/button.cpp
+++ b/src/lib/hiro/gtk/button.cpp
--- a/src/lib/hiro/gtk/button.h
+++ b/src/lib/hiro/gtk/button.h
--- a/src/lib/hiro/gtk/canvas.cpp
+++ b/src/lib/hiro/gtk/canvas.cpp
@ -1,6 +1,6 @@
 void hiro_pcanvas_expose(pCanvas *p) {
-uint32_t *f = p->fbuffer;
+  uint32_t *f = p->fbuffer;
-uint32_t *r = p->rbuffer;
+  uint32_t *r = p->rbuffer;
  for(uint y = p->canvas->allocation.height; y; y--) {
    for(uint x = p->canvas->allocation.width; x; x--) {
      uint32_t p = *f++;
@ -28,7 +28,7 @@ void pCanvas::create(uint style, uint width, uint height) {
 void pCanvas::redraw() {
  if(!canvas || !canvas->window) return;
-GdkRectangle rect;
+  GdkRectangle rect;
  rect.x = 0;
  rect.y = 0;
  rect.width = canvas->allocation.width;
--- a/src/lib/hiro/gtk/canvas.h
+++ b/src/lib/hiro/gtk/canvas.h
--- a/src/lib/hiro/gtk/checkbox.cpp
+++ b/src/lib/hiro/gtk/checkbox.cpp
--- a/src/lib/hiro/gtk/checkbox.h
+++ b/src/lib/hiro/gtk/checkbox.h
--- a/src/lib/hiro/gtk/combobox.cpp
+++ b/src/lib/hiro/gtk/combobox.cpp
--- a/src/lib/hiro/gtk/combobox.h
+++ b/src/lib/hiro/gtk/combobox.h
--- a/src/lib/hiro/gtk/editbox.cpp
+++ b/src/lib/hiro/gtk/editbox.cpp
--- a/src/lib/hiro/gtk/editbox.h
+++ b/src/lib/hiro/gtk/editbox.h
--- a/src/lib/hiro/gtk/formcontrol.cpp
+++ b/src/lib/hiro/gtk/formcontrol.cpp
--- a/src/lib/hiro/gtk/formcontrol.h
+++ b/src/lib/hiro/gtk/formcontrol.h
--- a/src/lib/hiro/gtk/frame.cpp
+++ b/src/lib/hiro/gtk/frame.cpp
--- a/src/lib/hiro/gtk/frame.h
+++ b/src/lib/hiro/gtk/frame.h
--- a/src/lib/hiro/gtk/hiro.cpp
+++ b/src/lib/hiro/gtk/hiro.cpp
@ -38,12 +38,24 @@ void pHiro::init() {
  gtk_init(&argc, &argv);
  free(argv[0]);
  free(argv);
  is_composited = false;
  screen = gdk_screen_get_default();
  if(gdk_screen_is_composited(screen)) {
    colormap = gdk_screen_get_rgba_colormap(screen);
    if(colormap) is_composited = true;
    else colormap = gdk_screen_get_rgb_colormap(screen); //fallback
  } else {
    colormap = gdk_screen_get_rgb_colormap(screen);
  }
 }
 void pHiro::term() {
  enable_screensaver();
 }
 bool pHiro::run() {
  if(is_screensaver_enabled == false) screensaver_tick();
  gtk_main_iteration_do(false);
  return pending();
 }
@ -52,11 +64,34 @@ bool pHiro::pending() {
  return gtk_events_pending();
 }
-bool pHiro::file_load(Window *focus, char *filename, const char *filter, const char *path) {
+bool pHiro::folder_select(Window *focus, char *filename, const char *path) {
  if(!filename) return false;
  strcpy(filename, "");
-  GtkWidget *dialog = gtk_file_chooser_dialog_new("Load File",
+  GtkWidget *dialog = gtk_file_chooser_dialog_new("Select Folder",
    focus ? GTK_WINDOW(focus->p.gtk_handle()) : (GtkWindow*)0,
    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
    (const gchar*)0);
  if(path && *path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), 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);
    g_free(fn);
  }
  gtk_widget_destroy(dialog);
  return strcmp(filename, ""); //return true if filename exists
 }
 bool pHiro::file_open(Window *focus, char *filename, const char *path, const char *filter) {
  if(!filename) return false;
  strcpy(filename, "");
  GtkWidget *dialog = gtk_file_chooser_dialog_new("Open File",
    focus ? GTK_WINDOW(focus->p.gtk_handle()) : (GtkWindow*)0,
    GTK_FILE_CHOOSER_ACTION_OPEN,
    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@ -75,7 +110,7 @@ bool pHiro::file_load(Window *focus, char *filename, const char *filter, const c
  return strcmp(filename, ""); //return true if filename exists
 }
-bool pHiro::file_save(Window *focus, char *filename, const char *filter, const char *path) {
+bool pHiro::file_save(Window *focus, char *filename, const char *path, const char *filter) {
  if(!filename) return false;
  strcpy(filename, "");
@ -107,15 +142,50 @@ uint pHiro::screen_height() {
  return gdk_screen_height();
 }
 void pHiro::enable_screensaver() {
  if(is_screensaver_enabled == true) return;
  is_screensaver_enabled = true;
  DPMSDisable(GDK_DISPLAY());
 }
 void pHiro::disable_screensaver() {
  if(is_screensaver_enabled == false) return;
  is_screensaver_enabled = false;
  DPMSEnable(GDK_DISPLAY());
 }
 pHiro& pHiro::handle() {
  return hiro().p;
 }
 pHiro::pHiro(Hiro &self_) : self(self_) {
  is_screensaver_enabled = true;
 }
 pHiro& phiro() {
  return pHiro::handle();
 }
 /* internal */
 void pHiro::screensaver_tick() {
  static clock_t delta_x = 0, delta_y = 0;
  delta_y = clock();
  if(delta_y - delta_x < CLOCKS_PER_SEC * 20) return;
  //XSetScreenSaver(timeout = 0) does not work
  //XResetScreenSaver() does not work
  //XScreenSaverSuspend() does not work
  //DPMSDisable() does not work
  //XSendEvent(KeyPressMask) does not work
  //use XTest extension to send fake keypress every ~20 seconds.
  //keycode of 255 does not map to any actual key, but it will block screensaver.
  delta_x = delta_y;
  XTestFakeKeyEvent(GDK_DISPLAY(), 255, True, 0);
  XSync(GDK_DISPLAY(), False);
  XTestFakeKeyEvent(GDK_DISPLAY(), 255, False, 0);
  XSync(GDK_DISPLAY(), False);
 }
 } //namespace libhiro
--- a/src/lib/hiro/gtk/hiro.h
+++ b/src/lib/hiro/gtk/hiro.h
@ -3,7 +3,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <cairo.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/XTest.h>
 namespace libhiro {
@ -36,16 +39,26 @@ public:
  bool run();
  bool pending();
-  bool file_load(Window *focus, char *filename, const char *filter, const char *path);
+  bool folder_select(Window *focus, char *filename, const char *path = "");
-  bool file_save(Window *focus, char *filename, const char *filter, const char *path);
+  bool file_open(Window *focus, char *filename, const char *path = "", const char *filter = "");
  bool file_save(Window *focus, char *filename, const char *path = "", const char *filter = "");
  uint screen_width();
  uint screen_height();
  void enable_screensaver();
  void disable_screensaver();
  static pHiro& handle();
  pHiro(Hiro&);
  /* internal */
  GdkScreen *screen;
  GdkColormap *colormap;
  bool is_composited;
  bool is_screensaver_enabled;
  void screensaver_tick();
  uint16_t translate_key(uint key);
 };
--- a/src/lib/hiro/gtk/keymap.cpp
+++ b/src/lib/hiro/gtk/keymap.cpp
--- a/src/lib/hiro/gtk/label.cpp
+++ b/src/lib/hiro/gtk/label.cpp
--- a/src/lib/hiro/gtk/label.h
+++ b/src/lib/hiro/gtk/label.h
--- a/src/lib/hiro/gtk/listbox.cpp
+++ b/src/lib/hiro/gtk/listbox.cpp
--- a/src/lib/hiro/gtk/listbox.h
+++ b/src/lib/hiro/gtk/listbox.h
--- a/src/lib/hiro/gtk/menucheckitem.cpp
+++ b/src/lib/hiro/gtk/menucheckitem.cpp
--- a/src/lib/hiro/gtk/menucheckitem.h
+++ b/src/lib/hiro/gtk/menucheckitem.h
--- a/src/lib/hiro/gtk/menucontrol.cpp
+++ b/src/lib/hiro/gtk/menucontrol.cpp
--- a/src/lib/hiro/gtk/menucontrol.h
+++ b/src/lib/hiro/gtk/menucontrol.h
--- a/src/lib/hiro/gtk/menugroup.cpp
+++ b/src/lib/hiro/gtk/menugroup.cpp
--- a/src/lib/hiro/gtk/menugroup.h
+++ b/src/lib/hiro/gtk/menugroup.h
--- a/src/lib/hiro/gtk/menuitem.cpp
+++ b/src/lib/hiro/gtk/menuitem.cpp
--- a/src/lib/hiro/gtk/menuitem.h
+++ b/src/lib/hiro/gtk/menuitem.h
--- a/src/lib/hiro/gtk/menuradioitem.cpp
+++ b/src/lib/hiro/gtk/menuradioitem.cpp
--- a/src/lib/hiro/gtk/menuradioitem.h
+++ b/src/lib/hiro/gtk/menuradioitem.h
--- a/src/lib/hiro/gtk/menuseparator.cpp
+++ b/src/lib/hiro/gtk/menuseparator.cpp
--- a/src/lib/hiro/gtk/menuseparator.h
+++ b/src/lib/hiro/gtk/menuseparator.h
--- a/src/lib/hiro/gtk/progressbar.cpp
+++ b/src/lib/hiro/gtk/progressbar.cpp
--- a/src/lib/hiro/gtk/progressbar.h
+++ b/src/lib/hiro/gtk/progressbar.h
--- a/src/lib/hiro/gtk/radiobox.cpp
+++ b/src/lib/hiro/gtk/radiobox.cpp
--- a/src/lib/hiro/gtk/radiobox.h
+++ b/src/lib/hiro/gtk/radiobox.h
--- a/Show More
+++ b/Show More