Update to bsnes v034 release.

For this release: SPC7110 emulation speed has been greatly optimized, massive improvements to HDMA timing have been implemented, Multitap support was added, and the user interface was polished a bit more.
Changelog:
    - SPC7110 decompression code updated to latest version by neviksti and converted to a state machine; SPC7110 overhead is now identical to S-DD1 overhead (eg ~5% speed hit over standard games)
    - Fixed a major bug in SPC7110 data port emulation that was crashing Super Power League 4 [Jonas Quinn]
    - HDMA trigger point corrected to H=1104, bus sync timing corrected
    - All illegal DMA A-bus accesses should now be properly blocked
    - DMA state machine rewritten, greatly simplified
    - Major corrections to HDMA run timing; fixes flickering bugs in Mecarobot Golf and Super Mario Kart
    - Emulator now defaults to 2/1/3 SNES (CPU/PPU1/PPU2 revision numbers)
    - Multitap emulation added, can be attached to either or both controller ports; user interface updated to reflect this
    - Status messages (cartridge loaded / unloaded, UPS patch applied, etc) now appear in status bar
    - Added advanced configuration option, "input.analog_axis_resistance", to control gamepad analog stick sensitivity
Also, the SPC7110 emulator download link below was removed: if you are looking for this, please download the bsnes v034 source code, which has the most up-to-date version in the src/chip/spc7110 folder.

license.txt

@@ -53,21 +53,19 @@ information in the header. The lack of such a header indicates said file falls
 under the bsnes license.
 
 HQ2x filter, author: MaxST, license: LGPL
-JMA decompressor, author: NSRT Team, license: GPL (*)
+JMA decompressor, author: NSRT Team, license: GPL*
 NTSC filter, author: blargg, license: LGPL
 zlib decompressor, license: zlib license
 
-(*) bsnes has received an exemption from the copyright holder to use this work.
+(* bsnes has received an exemption from the copyright holder to use this work.)
 
 The software also includes works which have been released to the public domain,
 which are not bound to any licensing agreements. Below is a complete list of all
 such software.
 
 libco, author: byuu
-libui, author: byuu
-OBC-1 emu, author: byuu
-S-DD1 emu, author: Andreas Naive
-S-RTC emu, author: byuu
+S-DD1 decompressor, author: Andreas Naive
+SPC7110 decompressor, author: neviksti
 
 Any software listed above as exemptions may be relicensed individually from
 bsnes under their respective terms. However, no bsnes licensed portions can be

readme.txt

@@ -1,10 +1,11 @@
 bsnes
-Version: 0.031
+Version: 0.034
 Author: byuu
 
---------
+========
 General:
---------
+========
+
 bsnes is a Super Nintendo / Super Famicom emulator that began on
 October 14th, 2004.
 
@@ -13,11 +14,37 @@ http://byuu.org/
 
 Please see license.txt for important licensing information.
 
-------------------
+==============
+Configuration:
+==============
+
+bsnes has two configuration files: bsnes.cfg, for program settings; and
+locale.cfg, for localization.
+
+For each file, bsnes will start by looking inside the same folder where the
+bsnes executable is located. If said file is not found, it will then check your
+user profile folder. On Windows, this is located at "%APPDATA%/.bsnes". On all
+other operating systems, this is located at "~/.bsnes". If said file is still
+not found, it will automatically be created in your user profile folder.
+
+If you wish to use bsnes in single-user mode, be sure that both files exist
+inside the same folder as the bsnes executable. If they do not, you can simply
+create new blank files and bsnes will use them in the future.
+
+If you wish to use bsnes in multi-user mode, simply delete these two files from
+the bsnes executable directory if they exist.
+
+If you wish to have multiple configuration profiles for the same user, you will
+need to make copies of the bsnes executable, and use each one in single-user
+mode.
+
+==================
 Known Limitations:
-------------------
+==================
+
 S-CPU
 - Multiply / divide register delays not implemented
+- "Glitch" when reading joypad registers during auto polling not implemented
 
 S-PPU
 - Uses scanline-based renderer. This is very inaccurate, but few (if any)
@@ -33,9 +60,10 @@ Hardware Bugs
 - S-CPU.r1 HDMA crashing bug not emulated
 - S-CPU<>S-SMP communication bus conflicts not emulated
 
----------------------
+=====================
 Unsupported Hardware:
----------------------
+=====================
+
 SA-1
 Coprocessor used in many popular games, including:
 - Dragon Ball Z Hyper Dimension
@@ -52,26 +80,27 @@ Coprocessor used in many popular games, including:
 - Star Fox 2 (unreleased beta)
 - Super Mario World 2: Yoshi's Island
 
-SPC7110
-Coprocessor used only by the following games:
-- Far East of Eden Zero
-- Far East of Eden Zero: Shounen Jump no Shou
-- Momotarou Densetsu Happy
-- Super Power League 4
-
 ST-011
-SETA DSP used only by Quick-move Shogi Match with Nidan Rank-holder Morita
+SETA DSP used by Quick-move Shogi Match with Nidan Rank-holder Morita
 
 ST-018
-SETA RISC CPU used only by Quick-move Shogi Match with Nidan Rank-holder Morita 2
+SETA RISC CPU used by Quick-move Shogi Match with Nidan Rank-holder Morita 2
 
 Super Gameboy
 Cartridge passthrough used for playing Gameboy games
 
-------------------------
+========================
 Unsupported Controllers:
-------------------------
+========================
+
 Mouse
 Super Scope
 Justifier
-Multitap (4-port and 5-port)
+
+=============
+Contributors:
+=============
+
+Andreas Naive, anomie, blargg, DMV27, FitzRoy, GIGO, Jonas Quinn, kode54, krom,
+mudlord, Nach, neviksti, Overload, RedDwarf, Richard Bannister, tetsuo55, TRAC,
+zones

src/Makefile

@@ -11,7 +11,7 @@ ifneq ($(findstring gcc,$(compiler)),) # GCC family
   cpp = $(subst cc,++,$(compiler)) $(flags)
   obj = o
   rule = -c $< -o $@
-  link =
+  link = -s
   mkbin = -o$1
   mkdef = -D$1
   mklib = -l$1
@@ -34,7 +34,7 @@ endif
 ##########
 
 ifeq ($(platform),x) # X11
-  ruby = video.glx video.xv video.sdl audio.openal audio.oss audio.ao input.sdl input.x
+  ruby = video.glx video.xv video.sdl audio.openal audio.oss audio.alsa audio.ao input.sdl input.x
   link += `pkg-config --libs gtk+-2.0`
   link += $(call mklib,Xtst)
   delete = rm -f $1
@@ -66,6 +66,7 @@ link += $(if $(findstring video.directdraw,$(ruby)),$(call mklib,ddraw))
 link += $(if $(findstring video.glx,$(ruby)),$(call mklib,GL))
 link += $(if $(findstring video.wgl,$(ruby)),$(call mklib,opengl32))
 link += $(if $(findstring video.xv,$(ruby)),$(call mklib,Xv))
+link += $(if $(findstring audio.alsa,$(ruby)),$(call mklib,asound))
 link += $(if $(findstring audio.ao,$(ruby)),$(call mklib,ao))
 link += $(if $(findstring audio.directsound,$(ruby)),$(call mklib,dsound))
 link += $(if $(findstring audio.openal,$(ruby)),$(if $(call streq,$(platform),x),$(call mklib,openal),$(call mklib,openal32)))
@@ -78,7 +79,7 @@ link += $(if $(findstring input.sdl,$(ruby)),`sdl-config --libs`)
 
 objects = main libco hiro ruby libfilter string reader cart cheat \
   memory smemory cpu scpu smp ssmp sdsp ppu bppu snes \
-  bsx srtc sdd1 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010
+  bsx srtc sdd1 spc7110 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010
 
 ifeq ($(enable_gzip),true)
   objects += adler32 compress crc32 deflate gzio inffast inflate inftrees ioapi trees unzip zip zutil
@@ -195,16 +196,17 @@ obj/snes.$(obj): snes/snes.cpp snes/* snes/scheduler/* snes/video/* snes/audio/*
 ### special chips ###
 #####################
 
-obj/bsx.$(obj)  : chip/bsx/bsx.cpp chip/bsx/*
-obj/srtc.$(obj) : chip/srtc/srtc.cpp chip/srtc/*
-obj/sdd1.$(obj) : chip/sdd1/sdd1.cpp chip/sdd1/*
-obj/cx4.$(obj)  : chip/cx4/cx4.cpp chip/cx4/*
-obj/dsp1.$(obj) : chip/dsp1/dsp1.cpp chip/dsp1/*
-obj/dsp2.$(obj) : chip/dsp2/dsp2.cpp chip/dsp2/*
-obj/dsp3.$(obj) : chip/dsp3/dsp3.cpp chip/dsp3/*
-obj/dsp4.$(obj) : chip/dsp4/dsp4.cpp chip/dsp4/*
-obj/obc1.$(obj) : chip/obc1/obc1.cpp chip/obc1/*
-obj/st010.$(obj): chip/st010/st010.cpp chip/st010/*
+obj/bsx.$(obj)    : chip/bsx/bsx.cpp chip/bsx/*
+obj/srtc.$(obj)   : chip/srtc/srtc.cpp chip/srtc/*
+obj/sdd1.$(obj)   : chip/sdd1/sdd1.cpp chip/sdd1/*
+obj/spc7110.$(obj): chip/spc7110/spc7110.cpp chip/spc7110/*
+obj/cx4.$(obj)    : chip/cx4/cx4.cpp chip/cx4/*
+obj/dsp1.$(obj)   : chip/dsp1/dsp1.cpp chip/dsp1/*
+obj/dsp2.$(obj)   : chip/dsp2/dsp2.cpp chip/dsp2/*
+obj/dsp3.$(obj)   : chip/dsp3/dsp3.cpp chip/dsp3/*
+obj/dsp4.$(obj)   : chip/dsp4/dsp4.cpp chip/dsp4/*
+obj/obc1.$(obj)   : chip/obc1/obc1.cpp chip/obc1/*
+obj/st010.$(obj)  : chip/st010/st010.cpp chip/st010/*
 
 ############
 ### zlib ###

src/base.h

@@ -1,4 +1,4 @@
-#define BSNES_VERSION "0.031"
+#define BSNES_VERSION "0.034"
 #define BSNES_TITLE   "bsnes v" BSNES_VERSION
 
 #define BUSCORE sBus
@@ -39,18 +39,5 @@ using namespace nall;
 //platform-specific global functions
 void alert(const char*, ...);
 void dprintf(const char*, ...);
-void dprintf(uint, const char*, ...);
-
-namespace source {
-  enum {
-    none = 0,
-    debug,
-    cpu,
-    ppu,
-    smp,
-    dsp,
-    bus,
-  };
-};
 
 #include "interface.h"

src/cart/cart.cpp

@@ -13,7 +13,7 @@
 #include "cart_header.cpp"
 
 namespace memory {
-  MappedRAM cartrom, cartram;
+  MappedRAM cartrom, cartram, cartrtc;
   MappedRAM bscram;
   MappedRAM stArom, stAram;
   MappedRAM stBrom, stBram;
@@ -27,37 +27,39 @@ Cartridge::Region Cartridge::region() { return info.region; }
 bool Cartridge::loaded() { return cart.loaded; }
 
 void Cartridge::load_begin(CartridgeType cart_type) {
-  cart.rom = cart.ram = 0;
+  cart.rom = cart.ram = cart.rtc = 0;
   bs.ram   = 0;
   stA.rom  = stA.ram  = 0;
   stB.rom  = stB.ram  = 0;
 
-  cart.rom_size = cart.ram_size = 0;
+  cart.rom_size = cart.ram_size = cart.rtc_size = 0;
   bs.ram_size   = 0;
   stA.rom_size  = stA.ram_size  = 0;
   stB.rom_size  = stB.ram_size  = 0;
 
   info.type = cart_type;
+  info.patched = false;
 
   info.bsxbase  = false;
   info.bsxcart  = false;
   info.bsxflash = false;
   info.st       = false;
 
-  info.superfx = false;
-  info.sa1     = false;
-  info.spc7110 = false;
-  info.srtc    = false;
-  info.sdd1    = false;
-  info.cx4     = false;
-  info.dsp1    = false;
-  info.dsp2    = false;
-  info.dsp3    = false;
-  info.dsp4    = false;
-  info.obc1    = false;
-  info.st010   = false;
-  info.st011   = false;
-  info.st018   = false;
+  info.superfx    = false;
+  info.sa1        = false;
+  info.srtc       = false;
+  info.sdd1       = false;
+  info.spc7110    = false;
+  info.spc7110rtc = false;
+  info.cx4        = false;
+  info.dsp1       = false;
+  info.dsp2       = false;
+  info.dsp3       = false;
+  info.dsp4       = false;
+  info.obc1       = false;
+  info.st010      = false;
+  info.st011      = false;
+  info.st018      = false;
 
   info.dsp1_mapper = DSP1Unmapped;
 
@@ -73,6 +75,7 @@ void Cartridge::load_begin(CartridgeType cart_type) {
 void Cartridge::load_end() {
   memory::cartrom.map(cart.rom, cart.rom_size);
   memory::cartram.map(cart.ram, cart.ram_size);
+  memory::cartrtc.map(cart.rtc, cart.rtc_size);
   memory::bscram.map(bs.ram, bs.ram_size);
   memory::stArom.map(stA.rom, stA.rom_size);
   memory::stAram.map(stA.ram, stA.ram_size);
@@ -102,19 +105,20 @@ bool Cartridge::unload() {
   bus.unload_cart();
 
   switch(info.type) {
-    case CartridgeNormal: unload_cart_normal(); break;
-    case CartridgeBSX: unload_cart_bsx(); break;
-    case CartridgeBSC: unload_cart_bsc(); break;
-    case CartridgeSufamiTurbo: unload_cart_st(); break;
+    case CartridgeNormal:      unload_cart_normal(); break;
+    case CartridgeBSX:         unload_cart_bsx();    break;
+    case CartridgeBSC:         unload_cart_bsc();    break;
+    case CartridgeSufamiTurbo: unload_cart_st();     break;
   }
 
-  safe_free(cart.rom);
-  safe_free(cart.ram);
-  safe_free(bs.ram);
-  safe_free(stA.rom);
-  safe_free(stA.ram);
-  safe_free(stB.rom);
-  safe_free(stB.ram);
+  if(cart.rom) { delete[] cart.rom; cart.rom = 0; }
+  if(cart.ram) { delete[] cart.ram; cart.ram = 0; }
+  if(cart.rtc) { delete[] cart.rtc; cart.rtc = 0; }
+  if(bs.ram)   { delete[] bs.ram;   bs.ram   = 0; }
+  if(stA.rom)  { delete[] stA.rom;  stA.rom  = 0; }
+  if(stA.ram)  { delete[] stA.ram;  stA.ram  = 0; }
+  if(stB.rom)  { delete[] stB.rom;  stB.rom  = 0; }
+  if(stB.ram)  { delete[] stB.ram;  stB.ram  = 0; }
 
   char fn[PATH_MAX];
   strcpy(fn, cart.fn);

src/cart/cart.h

@@ -32,6 +32,7 @@ public:
     HiROM,
     ExLoROM,
     ExHiROM,
+    SPC7110ROM,
     BSXROM,
     BSCLoROM,
     BSCHiROM,
@@ -48,8 +49,8 @@ public:
   struct {
     bool loaded;
     char fn[PATH_MAX];
-    uint8 *rom, *ram;
-    uint rom_size, ram_size;
+    uint8 *rom, *ram, *rtc;
+    uint rom_size, ram_size, rtc_size;
   } cart;
 
   struct {
@@ -70,6 +71,7 @@ public:
     uint32 crc32;
     char filename[PATH_MAX * 4];
     char name[128];
+    bool patched;
 
     Region region;
     MemoryMapper mapper;
@@ -85,6 +87,7 @@ public:
     bool srtc;
     bool sdd1;
     bool spc7110;
+    bool spc7110rtc;
     bool cx4;
     bool dsp1;
     bool dsp2;
@@ -142,12 +145,13 @@ public:
 
 private:
   char patchfn[PATH_MAX];
-  char savefn[PATH_MAX];
+  char savefn[PATH_MAX];
+  char rtcfn[PATH_MAX];
   char cheatfn[PATH_MAX];
 };
 
 namespace memory {
-  extern MappedRAM cartrom, cartram;
+  extern MappedRAM cartrom, cartram, cartrtc;
   extern MappedRAM bscram;
   extern MappedRAM stArom, stAram;
   extern MappedRAM stBrom, stBram;

src/cart/cart_bsc.cpp

@@ -14,7 +14,7 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
 
   if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
     apply_patch(data, size, cart.rom, cart.rom_size);
-    if(data) { free(data); data = 0; }
+    delete[] data;
   }
 
   if(*bs.fn) {
@@ -23,7 +23,7 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
       bs.ram = data, bs.ram_size = size;
       if(load_file(get_patch_filename(bs.fn, "ups"), data, size, CompressionInspect) == true) {
         apply_patch(data, size, bs.ram, bs.ram_size);
-        if(data) { free(data); data = 0; }
+        delete[] data;
       }
     }
   }
@@ -35,12 +35,12 @@ void Cartridge::load_cart_bsc(const char *base, const char *slot) {
   info.region = NTSC;
 
   if(info.ram_size > 0) {
-    cart.ram = (uint8*)malloc(cart.ram_size = info.ram_size);
+    cart.ram = new uint8_t[cart.ram_size = info.ram_size];
     memset(cart.ram, 0xff, cart.ram_size);
 
     if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
       memcpy(cart.ram, data, min(size, cart.ram_size));
-      safe_free(data);
+      delete[] data;
     }
   }
 

src/cart/cart_bsx.cpp

@@ -20,7 +20,7 @@ void Cartridge::load_cart_bsx(const char *base, const char *slot) {
 
   if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
     apply_patch(data, size, cart.rom, cart.rom_size);
-    if(data) { free(data); data = 0; }
+    delete[] data;
   }
 
   memset(bsxcart.sram.handle (), 0x00, bsxcart.sram.size ());
@@ -28,12 +28,12 @@ void Cartridge::load_cart_bsx(const char *base, const char *slot) {
 
   if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
     memcpy(bsxcart.sram.handle (), data, min(bsxcart.sram.size (), size));
-    safe_free(data);
+    delete[] data;
   }
 
   if(load_file(get_save_filename(cart.fn, "psr"), data, size, CompressionNone) == true) {
     memcpy(bsxcart.psram.handle(), data, min(bsxcart.psram.size(), size));
-    safe_free(data);
+    delete[] data;
   }
 
   if(*bs.fn) {
@@ -42,7 +42,7 @@ void Cartridge::load_cart_bsx(const char *base, const char *slot) {
       bs.ram = data, bs.ram_size = size;
       if(load_file(get_patch_filename(bs.fn, "ups"), data, size, CompressionInspect) == true) {
         apply_patch(data, size, bs.ram, bs.ram_size);
-        if(data) { free(data); data = 0; }
+        delete[] data;
       }
     }
   }

src/cart/cart_file.cpp

@@ -87,8 +87,6 @@ char* Cartridge::get_cheat_filename(const char *source, const char *extension) {
 }
 
 bool Cartridge::load_file(const char *fn, uint8 *&data, uint &size, CompressionMode compression) {
-  dprintf("* Loading \"%s\" ...", fn);
-
   if(fexists(fn) == false) return false;
 
   Reader::Type filetype = Reader::Normal;
@@ -158,8 +156,8 @@ bool Cartridge::apply_patch(const uint8_t *pdata, const unsigned psize, uint8_t
   }
 
   if(apply == true) {
-    free(data);
-    data = (uint8_t*)malloc(size = outsize);
+    delete[] data;
+    data = new uint8_t[size = outsize];
     memcpy(data, outdata, outsize);
   } else {
     dprintf("* Warning: patch application failed!");
@@ -168,11 +166,12 @@ bool Cartridge::apply_patch(const uint8_t *pdata, const unsigned psize, uint8_t
   if(outdata) delete[] outdata;
 }
 
-bool Cartridge::save_file(const char *fn, uint8 *data, uint size) {
-  FileWriter ff(fn);
-  if(!ff.ready())return false;
-  ff.write(data, size);
-  return true;
+bool Cartridge::save_file(const char *fn, uint8 *data, uint size) {
+  FILE *fp = fopen(fn, "wb");
+  if(!fp) return false;
+  fwrite(data, 1, size, fp);
+  fclose(fp);
+  return true;
 }
 
 #endif //ifdef CART_CPP

src/cart/cart_header.cpp

@@ -5,6 +5,7 @@ void Cartridge::read_header() {
   uint index = info.header_index;
   uint8 mapper   = rom[index + MAPPER];
   uint8 rom_type = rom[index + ROM_TYPE];
+  uint8 rom_size = rom[index + ROM_SIZE];
   uint8 company  = rom[index + COMPANY];
   uint8 region   = rom[index + REGION] & 0x7f;
 
@@ -52,8 +53,9 @@ void Cartridge::read_header() {
   }
 
   if(mapper == 0x3a && (rom_type == 0xf5 || rom_type == 0xf9)) {
-    //rom_type: 0xf5 = no S-RTC, 0xf9 = S-RTC
     info.spc7110 = true;
+    info.spc7110rtc = (rom_type == 0xf9);
+    info.mapper = SPC7110ROM;
   }
 
   if(mapper == 0x20 && rom_type == 0xf3) {
@@ -98,13 +100,14 @@ void Cartridge::read_header() {
     info.obc1 = true;
   }
 
-  if(mapper == 0x30 && rom_type == 0xf6) {
-    //TODO: both ST010 and ST011 share the same mapper + rom_type.
-    //need way to determine which is which.
-    //for now, default to supported ST010.
+  if(mapper == 0x30 && rom_type == 0xf6 && rom_size >= 10) {
     info.st010 = true;
   }
 
+  if(mapper == 0x30 && rom_type == 0xf6 && rom_size < 10) {
+    info.st011 = true;
+  }
+
   if(mapper == 0x30 && rom_type == 0xf5) {
     info.st018 = true;
   }
@@ -179,7 +182,7 @@ void Cartridge::find_header() {
     score_ex = 0;
   } else {
     if(rom[0x7fc0 + MAPPER] == 0x32) score_lo++;
-    else score_ex += 16;
+    else score_ex += 12;
   }
 
   if(score_lo >= score_hi && score_lo >= score_ex) {

src/cart/cart_normal.cpp

@@ -12,17 +12,18 @@ void Cartridge::load_cart_normal(const char *filename) {
 
   //load ROM data, ignore 512-byte header if detected
   if((size & 0x7fff) != 512) {
-    cart.rom = (uint8*)malloc(cart.rom_size = size);
+    cart.rom = new uint8_t[cart.rom_size = size];
     memcpy(cart.rom, data, size);
   } else {
-    cart.rom = (uint8*)malloc(cart.rom_size = size - 512);
+    cart.rom = new uint8_t[cart.rom_size = size - 512];
     memcpy(cart.rom, data + 512, size - 512);
   }
-  safe_free(data);
+  delete[] data;
 
   if(load_file(get_patch_filename(cart.fn, "ups"), data, size, CompressionInspect) == true) {
     apply_patch(data, size, cart.rom, cart.rom_size);
-    if(data) { free(data); data = 0; }
+    delete[] data;
+    info.patched = true;
   }
 
   info.crc32 = crc32_calculate(cart.rom, cart.rom_size);
@@ -31,12 +32,20 @@ void Cartridge::load_cart_normal(const char *filename) {
   read_header();
 
   if(info.ram_size > 0) {
-    cart.ram = (uint8*)malloc(cart.ram_size = info.ram_size);
+    cart.ram = new uint8_t[cart.ram_size = info.ram_size];
     memset(cart.ram, 0xff, cart.ram_size);
 
     if(load_file(get_save_filename(cart.fn, "srm"), data, size, CompressionNone) == true) {
       memcpy(cart.ram, data, min(size, cart.ram_size));
-      safe_free(data);
+      delete[] data;
+    }
+  }
+
+  if(info.srtc || info.spc7110rtc) {
+    cart.rtc = new(zeromemory) uint8_t[cart.rtc_size = 20];
+    if(load_file(get_save_filename(cart.fn, "rtc"), data, size, CompressionNone) == true) {
+      memcpy(cart.rtc, data, min(size, cart.rtc_size));
+      delete[] data;
     }
   }
 
@@ -49,6 +58,7 @@ void Cartridge::load_cart_normal(const char *filename) {
 
 void Cartridge::unload_cart_normal() {
   if(cart.ram) save_file(get_save_filename(cart.fn, "srm"), cart.ram, cart.ram_size);
+  if(cart.rtc) save_file(get_save_filename(cart.fn, "rtc"), cart.rtc, cart.rtc_size);
 }
 
 #endif //ifdef CART_CPP

src/cart/cart_st.cpp

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

src/cc.bat

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

src/chip/bsx/bsx_cart.cpp

@@ -20,7 +20,7 @@ void BSXCart::reset() {
 }
 
 void BSXCart::update_memory_map() {
-Memory &cart = (regs.r[0x01] & 0x80) == 0x00 ? (Memory&)bsxflash : (Memory&)psram;
+  Memory &cart = (regs.r[0x01] & 0x80) == 0x00 ? (Memory&)bsxflash : (Memory&)psram;
 
   if((regs.r[0x02] & 0x80) == 0x00) { //LoROM mapping
     bus.map(Bus::MapLinear, 0x00, 0x7d, 0x8000, 0xffff, cart);
@@ -59,7 +59,7 @@ Memory &cart = (regs.r[0x01] & 0x80) == 0x00 ? (Memory&)bsxflash : (Memory&)psra
 
 uint8 BSXCart::mmio_read(uint addr) {
   if((addr & 0xf0ffff) == 0x005000) { //$[00-0f]:5000 MMIO
-  uint8 n = (addr >> 16) & 15;
+    uint8 n = (addr >> 16) & 15;
     return regs.r[n];
   }
 
@@ -72,7 +72,7 @@ uint8 BSXCart::mmio_read(uint addr) {
 
 void BSXCart::mmio_write(uint addr, uint8 data) {
   if((addr & 0xf0ffff) == 0x005000) { //$[00-0f]:5000 MMIO
-  uint8 n = (addr >> 16) & 15;
+    uint8 n = (addr >> 16) & 15;
     regs.r[n] = data;
     if(n == 0x0e && data & 0x80) update_memory_map();
     return;
@@ -84,16 +84,16 @@ void BSXCart::mmio_write(uint addr, uint8 data) {
 }
 
 BSXCart::BSXCart() {
-  sram_data  = (uint8*)malloc( 32 * 1024);
-  psram_data = (uint8*)malloc(512 * 1024);
+  sram_data  = new uint8_t[ 32 * 1024];
+  psram_data = new uint8_t[512 * 1024];
 
   sram.map (sram_data,   32 * 1024);
   psram.map(psram_data, 512 * 1024);
 }
 
 BSXCart::~BSXCart() {
-  safe_free(sram_data);
-  safe_free(psram_data);
+  delete[] sram_data;
+  delete[] psram_data;
 }
 
 #endif //ifdef BSX_CPP

src/chip/chip.h

@@ -1,6 +1,7 @@
 #include "bsx/bsx.h"
 #include "srtc/srtc.h"
 #include "sdd1/sdd1.h"
+#include "spc7110/spc7110.h"
 #include "cx4/cx4.h"
 #include "dsp1/dsp1.h"
 #include "dsp2/dsp2.h"

src/chip/spc7110/decomp.cpp

@@ -0,0 +1,511 @@
+#ifdef SPC7110_CPP
+
+uint8 SPC7110Decomp::read() {
+  if(decomp_buffer_length == 0) {
+    //decompress at least (decomp_buffer_size / 2) bytes to the buffer
+    switch(decomp_mode) {
+      case 0: mode0(false); break;
+      case 1: mode1(false); break;
+      case 2: mode2(false); break;
+      default: return 0x00;
+    }
+  }
+
+  uint8 data = decomp_buffer[decomp_buffer_rdoffset++];
+  decomp_buffer_rdoffset &= decomp_buffer_size - 1;
+  decomp_buffer_length--;
+  return data;
+}
+
+void SPC7110Decomp::write(uint8 data) {
+  decomp_buffer[decomp_buffer_wroffset++] = data;
+  decomp_buffer_wroffset &= decomp_buffer_size - 1;
+  decomp_buffer_length++;
+}
+
+uint8 SPC7110Decomp::dataread() {
+  unsigned size = memory::cartrom.size() - 0x100000;
+  while(decomp_offset >= size) decomp_offset -= size;
+  return memory::cartrom.read(0x100000 + decomp_offset++);
+}
+
+void SPC7110Decomp::init(unsigned mode, unsigned offset, unsigned index) {
+  decomp_mode = mode;
+  decomp_offset = offset;
+
+  decomp_buffer_rdoffset = 0;
+  decomp_buffer_wroffset = 0;
+  decomp_buffer_length   = 0;
+
+  //reset context states
+  for(unsigned i = 0; i < 32; i++) {
+    context[i].index  = 0;
+    context[i].invert = 0;
+  }
+
+  switch(decomp_mode) {
+    case 0: mode0(true); break;
+    case 1: mode1(true); break;
+    case 2: mode2(true); break;
+  }
+
+  //decompress up to requested output data index
+  while(index--) read();
+}
+
+//
+
+void SPC7110Decomp::mode0(bool init) {
+  static uint8 val, in, span;
+  static int out, inverts, lps, in_count;
+
+  if(init == true) {
+    out = inverts = lps = 0;
+    span = 0xff;
+    val = dataread();
+    in = dataread();
+    in_count = 8;
+    return;
+  }
+
+  while(decomp_buffer_length < (decomp_buffer_size >> 1)) {
+    for(unsigned bit = 0; bit < 8; bit++) {
+      //get context
+      uint8 mask = (1 << (bit & 3)) - 1;
+      uint8 con = mask + ((inverts & mask) ^ (lps & mask));
+      if(bit > 3) con += 15;
+
+      //get prob and mps
+      unsigned prob = probability(con);
+      unsigned mps = (((out >> 15) & 1) ^ context[con].invert);
+
+      //get bit
+      unsigned flag_lps;
+      if(val <= span - prob) { //mps
+        span = span - prob;
+        out = (out << 1) + mps;
+        flag_lps = 0;
+      } else { //lps
+        val = val - (span - (prob - 1));
+        span = prob - 1;
+        out = (out << 1) + 1 - mps;
+        flag_lps = 1;
+      }
+
+      //renormalize
+      unsigned shift = 0;
+      while(span < 0x7f) {
+        shift++;
+
+        span = (span << 1) + 1;
+        val = (val << 1) + (in >> 7);
+
+        in <<= 1;
+        if(--in_count == 0) {
+          in = dataread();
+          in_count = 8;
+        }
+      }
+
+      //update processing info
+      lps = (lps << 1) + flag_lps;
+      inverts = (inverts << 1) + context[con].invert;
+
+      //update context state
+      if(flag_lps & toggle_invert(con)) context[con].invert ^= 1;
+      if(flag_lps) context[con].index = next_lps(con);
+      else if(shift) context[con].index = next_mps(con);
+    }
+
+    //save byte
+    write(out);
+  }
+}
+
+void SPC7110Decomp::mode1(bool init) {
+  static int pixelorder[4], realorder[4];
+  static uint8 in, val, span;
+  static int out, inverts, lps, in_count;
+
+  if(init == true) {
+    for(unsigned i = 0; i < 4; i++) pixelorder[i] = i;
+    out = inverts = lps = 0;
+    span = 0xff;
+    val = dataread();
+    in = dataread();
+    in_count = 8;
+    return;
+  }
+
+  while(decomp_buffer_length < (decomp_buffer_size >> 1)) {
+    for(unsigned pixel = 0; pixel < 8; pixel++) {
+      //get first symbol context
+      unsigned a = ((out >> (1 * 2)) & 3);
+      unsigned b = ((out >> (7 * 2)) & 3);
+      unsigned c = ((out >> (8 * 2)) & 3);
+      unsigned con = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
+
+      //update pixel order
+      unsigned m, n;
+      for(m = 0; m < 4; m++) if(pixelorder[m] == a) break;
+      for(n = m; n > 0; n--) pixelorder[n] = pixelorder[n - 1];
+      pixelorder[0] = a;
+
+      //calculate the real pixel order
+      for(m = 0; m < 4; m++) realorder[m] = pixelorder[m];
+
+      //rotate reference pixel c value to top
+      for(m = 0; m < 4; m++) if(realorder[m] == c) break;
+      for(n = m; n > 0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = c;
+
+      //rotate reference pixel b value to top
+      for(m = 0; m < 4; m++) if(realorder[m] == b) break;
+      for(n = m; n > 0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = b;
+
+      //rotate reference pixel a value to top
+      for(m = 0; m < 4; m++) if(realorder[m] == a) break;
+      for(n = m; n > 0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = a;
+
+      //get 2 symbols
+      for(unsigned bit = 0; bit < 2; bit++) {
+        //get prob
+        unsigned prob = probability(con);
+
+        //get symbol
+        unsigned flag_lps;
+        if(val <= span - prob) { //mps
+          span = span - prob;
+          flag_lps = 0;
+        } else { //lps
+          val = val - (span - (prob - 1));
+          span = prob - 1;
+          flag_lps = 1;
+        }
+
+        //renormalize
+        unsigned shift = 0;
+        while(span < 0x7f) {
+          shift++;
+
+          span = (span << 1) + 1;
+          val = (val << 1) + (in >> 7);
+
+          in <<= 1;
+          if(--in_count == 0) {
+            in = dataread();
+            in_count = 8;
+          }
+        }
+
+        //update processing info
+        lps = (lps << 1) + flag_lps;
+        inverts = (inverts << 1) + context[con].invert;
+
+        //update context state
+        if(flag_lps & toggle_invert(con)) context[con].invert ^= 1;
+        if(flag_lps) context[con].index = next_lps(con);
+        else if(shift) context[con].index = next_mps(con);
+
+        //get next context
+        con = 5 + (con << 1) + ((lps ^ inverts) & 1);
+      }
+
+      //get pixel
+      b = realorder[(lps ^ inverts) & 3];
+      out = (out << 2) + b;
+    }
+
+    //turn pixel data into bitplanes
+    unsigned data = morton_2x8(out);
+    write(data >> 8);
+    write(data >> 0);
+  }
+}
+
+void SPC7110Decomp::mode2(bool init) {
+  static int pixelorder[16], realorder[16];
+  static uint8 bitplanebuffer[16], buffer_index;
+  static uint8 in, val, span;
+  static int out0, out1, inverts, lps, in_count;
+
+  if(init == true) {
+    for(unsigned i = 0; i < 16; i++) pixelorder[i] = i;
+    buffer_index = 0;
+    out0 = out1 = inverts = lps = 0;
+    span = 0xff;
+    val = dataread();
+    in = dataread();
+    in_count = 8;
+    return;
+  }
+
+  while(decomp_buffer_length < (decomp_buffer_size >> 1)) {
+    for(unsigned pixel = 0; pixel < 8; pixel++) {
+      //get first symbol context
+      unsigned a = ((out0 >> (0 * 4)) & 15);
+      unsigned b = ((out0 >> (7 * 4)) & 15);
+      unsigned c = ((out1 >> (0 * 4)) & 15);
+      unsigned con = 0;
+      unsigned refcon = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
+
+      //update pixel order
+      unsigned m, n;
+      for(m = 0; m < 16; m++) if(pixelorder[m] == a) break;
+      for(n = m; n >  0; n--) pixelorder[n] = pixelorder[n - 1];
+      pixelorder[0] = a;
+
+      //calculate the real pixel order
+      for(m = 0; m < 16; m++) realorder[m] = pixelorder[m];
+
+      //rotate reference pixel c value to top
+      for(m = 0; m < 16; m++) if(realorder[m] == c) break;
+      for(n = m; n >  0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = c;
+
+      //rotate reference pixel b value to top
+      for(m = 0; m < 16; m++) if(realorder[m] == b) break;
+      for(n = m; n >  0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = b;
+
+      //rotate reference pixel a value to top
+      for(m = 0; m < 16; m++) if(realorder[m] == a) break;
+      for(n = m; n >  0; n--) realorder[n] = realorder[n - 1];
+      realorder[0] = a;
+
+      //get 4 symbols
+      for(unsigned bit = 0; bit < 4; bit++) {
+        //get prob
+        unsigned prob = probability(con);
+
+        //get symbol
+        unsigned flag_lps;
+        if(val <= span - prob) { //mps
+          span = span - prob;
+          flag_lps = 0;
+        } else { //lps
+          val = val - (span - (prob - 1));
+          span = prob - 1;
+          flag_lps = 1;
+        }
+
+        //renormalize
+        unsigned shift = 0;
+        while(span < 0x7f) {
+          shift++;
+
+          span = (span << 1) + 1;
+          val = (val << 1) + (in >> 7);
+
+          in <<= 1;
+          if(--in_count == 0) {
+            in = dataread();
+            in_count = 8;
+          }
+        }
+
+        //update processing info
+        lps = (lps << 1) + flag_lps;
+        unsigned invertbit = context[con].invert;
+        inverts = (inverts << 1) + invertbit;
+
+        //update context state
+        if(flag_lps & toggle_invert(con)) context[con].invert ^= 1;
+        if(flag_lps) context[con].index = next_lps(con);
+        else if(shift) context[con].index = next_mps(con);
+
+        //get next context
+        con = mode2_context_table[con][flag_lps ^ invertbit] + (con == 1 ? refcon : 0);
+      }
+
+      //get pixel
+      b = realorder[(lps ^ inverts) & 0x0f];
+      out1 = (out1 << 4) + ((out0 >> 28) & 0x0f);
+      out0 = (out0 << 4) + b;
+    }
+
+    //convert pixel data into bitplanes
+    unsigned data = morton_4x8(out0);
+    write(data >> 24);
+    write(data >> 16);
+    bitplanebuffer[buffer_index++] = data >> 8;
+    bitplanebuffer[buffer_index++] = data >> 0;
+
+    if(buffer_index == 16) {
+      for(unsigned i = 0; i < 16; i++) write(bitplanebuffer[i]);
+      buffer_index = 0;
+    }
+  }
+}
+
+//
+
+const uint8 SPC7110Decomp::evolution_table[53][4] = {
+//{ prob, nextlps, nextmps, toggle invert },
+
+  { 0x5a,  1,  1, 1 },
+  { 0x25,  6,  2, 0 },
+  { 0x11,  8,  3, 0 },
+  { 0x08, 10,  4, 0 },
+  { 0x03, 12,  5, 0 },
+  { 0x01, 15,  5, 0 },
+
+  { 0x5a,  7,  7, 1 },
+  { 0x3f, 19,  8, 0 },
+  { 0x2c, 21,  9, 0 },
+  { 0x20, 22, 10, 0 },
+  { 0x17, 23, 11, 0 },
+  { 0x11, 25, 12, 0 },
+  { 0x0c, 26, 13, 0 },
+  { 0x09, 28, 14, 0 },
+  { 0x07, 29, 15, 0 },
+  { 0x05, 31, 16, 0 },
+  { 0x04, 32, 17, 0 },
+  { 0x03, 34, 18, 0 },
+  { 0x02, 35,  5, 0 },
+
+  { 0x5a, 20, 20, 1 },
+  { 0x48, 39, 21, 0 },
+  { 0x3a, 40, 22, 0 },
+  { 0x2e, 42, 23, 0 },
+  { 0x26, 44, 24, 0 },
+  { 0x1f, 45, 25, 0 },
+  { 0x19, 46, 26, 0 },
+  { 0x15, 25, 27, 0 },
+  { 0x11, 26, 28, 0 },
+  { 0x0e, 26, 29, 0 },
+  { 0x0b, 27, 30, 0 },
+  { 0x09, 28, 31, 0 },
+  { 0x08, 29, 32, 0 },
+  { 0x07, 30, 33, 0 },
+  { 0x05, 31, 34, 0 },
+  { 0x04, 33, 35, 0 },
+  { 0x04, 33, 36, 0 },
+  { 0x03, 34, 37, 0 },
+  { 0x02, 35, 38, 0 },
+  { 0x02, 36,  5, 0 },
+
+  { 0x58, 39, 40, 1 },
+  { 0x4d, 47, 41, 0 },
+  { 0x43, 48, 42, 0 },
+  { 0x3b, 49, 43, 0 },
+  { 0x34, 50, 44, 0 },
+  { 0x2e, 51, 45, 0 },
+  { 0x29, 44, 46, 0 },
+  { 0x25, 45, 24, 0 },
+
+  { 0x56, 47, 48, 1 },
+  { 0x4f, 47, 49, 0 },
+  { 0x47, 48, 50, 0 },
+  { 0x41, 49, 51, 0 },
+  { 0x3c, 50, 52, 0 },
+  { 0x37, 51, 43, 0 },
+};
+
+const uint8 SPC7110Decomp::mode2_context_table[32][2] = {
+//{ next 0, next 1 },
+
+  {  1,  2 },
+
+  {  3,  8 },
+  { 13, 14 },
+
+  { 15, 16 },
+  { 17, 18 },
+  { 19, 20 },
+  { 21, 22 },
+  { 23, 24 },
+  { 25, 26 },
+  { 25, 26 },
+  { 25, 26 },
+  { 25, 26 },
+  { 25, 26 },
+  { 27, 28 },
+  { 29, 30 },
+
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+  { 31, 31 },
+
+  { 31, 31 },
+};
+
+uint8 SPC7110Decomp::probability  (unsigned n) { return evolution_table[context[n].index][0]; }
+uint8 SPC7110Decomp::next_lps     (unsigned n) { return evolution_table[context[n].index][1]; }
+uint8 SPC7110Decomp::next_mps     (unsigned n) { return evolution_table[context[n].index][2]; }
+bool  SPC7110Decomp::toggle_invert(unsigned n) { return evolution_table[context[n].index][3]; }
+
+unsigned SPC7110Decomp::morton_2x8(unsigned data) {
+  //reverse morton lookup: de-interleave two 8-bit values
+  //15, 13, 11,  9,  7,  5,  3,  1 -> 15- 8
+  //14, 12, 10,  8,  6,  4,  2,  0 ->  7- 0
+  return morton16[0][(data >>  0) & 255] + morton16[1][(data >>  8) & 255];
+}
+
+unsigned SPC7110Decomp::morton_4x8(unsigned data) {
+  //reverse morton lookup: de-interleave four 8-bit values
+  //31, 27, 23, 19, 15, 11,  7,  3 -> 31-24
+  //30, 26, 22, 18, 14, 10,  6,  2 -> 23-16
+  //29, 25, 21, 17, 13,  9,  5,  1 -> 15- 8
+  //28, 24, 20, 16, 12,  8,  4,  0 ->  7- 0
+  return morton32[0][(data >>  0) & 255] + morton32[1][(data >>  8) & 255]
+       + morton32[2][(data >> 16) & 255] + morton32[3][(data >> 24) & 255];
+}
+
+//
+
+void SPC7110Decomp::reset() {
+  //mode 3 is invalid; this is treated as a special case to always return 0x00
+  //set to mode 3 so that reading decomp port before starting first decomp will return 0x00
+  decomp_mode = 3;
+
+  decomp_buffer_rdoffset = 0;
+  decomp_buffer_wroffset = 0;
+  decomp_buffer_length   = 0;
+}
+
+SPC7110Decomp::SPC7110Decomp() {
+  decomp_buffer = new uint8_t[decomp_buffer_size];
+  reset();
+
+  //initialize reverse morton lookup tables
+  for(unsigned i = 0; i < 256; i++) {
+    #define map(x, y) (((i >> x) & 1) << y)
+    //2x8-bit
+    morton16[1][i] = map(7, 15) + map(6,  7) + map(5, 14) + map(4,  6)
+                   + map(3, 13) + map(2,  5) + map(1, 12) + map(0,  4);
+    morton16[0][i] = map(7, 11) + map(6,  3) + map(5, 10) + map(4,  2)
+                   + map(3,  9) + map(2,  1) + map(1,  8) + map(0,  0);
+    //4x8-bit
+    morton32[3][i] = map(7, 31) + map(6, 23) + map(5, 15) + map(4,  7)
+                   + map(3, 30) + map(2, 22) + map(1, 14) + map(0,  6);
+    morton32[2][i] = map(7, 29) + map(6, 21) + map(5, 13) + map(4,  5)
+                   + map(3, 28) + map(2, 20) + map(1, 12) + map(0,  4);
+    morton32[1][i] = map(7, 27) + map(6, 19) + map(5, 11) + map(4,  3)
+                   + map(3, 26) + map(2, 18) + map(1, 10) + map(0,  2);
+    morton32[0][i] = map(7, 25) + map(6, 17) + map(5,  9) + map(4,  1)
+                   + map(3, 24) + map(2, 16) + map(1,  8) + map(0,  0);
+    #undef map
+  }
+}
+
+SPC7110Decomp::~SPC7110Decomp() {
+  delete[] decomp_buffer;
+}
+
+#endif

src/chip/spc7110/decomp.h

@@ -0,0 +1,45 @@
+class SPC7110Decomp {
+public:
+  uint8 read();
+  void init(unsigned mode, unsigned offset, unsigned index);
+  void reset();
+
+  SPC7110Decomp();
+  ~SPC7110Decomp();
+
+private:
+  unsigned decomp_mode;
+  unsigned decomp_offset;
+
+  //read() will spool chunks half the size of decomp_buffer_size
+  enum { decomp_buffer_size = 64 }; //must be >= 64, and must be a power of two
+  uint8 *decomp_buffer;
+  unsigned decomp_buffer_rdoffset;
+  unsigned decomp_buffer_wroffset;
+  unsigned decomp_buffer_length;
+
+  void write(uint8 data);
+  uint8 dataread();
+
+  void mode0(bool init);
+  void mode1(bool init);
+  void mode2(bool init);
+
+  static const uint8 evolution_table[53][4];
+  static const uint8 mode2_context_table[32][2];
+
+  struct ContextState {
+    uint8 index;
+    uint8 invert;
+  } context[32];
+
+  uint8 probability(unsigned n);
+  uint8 next_lps(unsigned n);
+  uint8 next_mps(unsigned n);
+  bool toggle_invert(unsigned n);
+
+  unsigned morton16[2][256];
+  unsigned morton32[4][256];
+  unsigned morton_2x8(unsigned data);
+  unsigned morton_4x8(unsigned data);
+};

src/chip/spc7110/spc7110.cpp

@@ -0,0 +1,658 @@
+#include "../../base.h"
+#define SPC7110_CPP
+
+#include "decomp.cpp"
+
+const unsigned SPC7110::months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+void SPC7110::init() {}
+
+void SPC7110::enable() {
+  uint16_t limit = (cartridge.info.spc7110rtc ? 0x4842 : 0x483f);
+  for(uint16_t i = 0x4800; i <= limit; i++) memory::mmio.map(i, *this);
+}
+
+void SPC7110::power() {
+  reset();
+}
+
+void SPC7110::reset() {
+  r4801 = 0x00;
+  r4802 = 0x00;
+  r4803 = 0x00;
+  r4804 = 0x00;
+  r4805 = 0x00;
+  r4806 = 0x00;
+  r4807 = 0x00;
+  r4808 = 0x00;
+  r4809 = 0x00;
+  r480a = 0x00;
+  r480b = 0x00;
+  r480c = 0x00;
+
+  decomp.reset();
+
+  r4811 = 0x00;
+  r4812 = 0x00;
+  r4813 = 0x00;
+  r4814 = 0x00;
+  r4815 = 0x00;
+  r4816 = 0x00;
+  r4817 = 0x00;
+  r4818 = 0x00;
+
+  r481x = 0x00;
+  r4814_latch = false;
+  r4815_latch = false;
+
+  r4820 = 0x00;
+  r4821 = 0x00;
+  r4822 = 0x00;
+  r4823 = 0x00;
+  r4824 = 0x00;
+  r4825 = 0x00;
+  r4826 = 0x00;
+  r4827 = 0x00;
+  r4828 = 0x00;
+  r4829 = 0x00;
+  r482a = 0x00;
+  r482b = 0x00;
+  r482c = 0x00;
+  r482d = 0x00;
+  r482e = 0x00;
+  r482f = 0x00;
+
+  r4830 = 0x00;
+  mmio_write(0x4831, 0);
+  mmio_write(0x4832, 1);
+  mmio_write(0x4833, 2);
+  r4834 = 0x00;
+
+  r4840 = 0x00;
+  r4841 = 0x00;
+  r4842 = 0x00;
+
+  if(cartridge.info.spc7110rtc) {
+    rtc_state = RTCS_Inactive;
+    rtc_mode  = RTCM_Linear;
+    rtc_index = 0;
+  }
+}
+
+unsigned SPC7110::datarom_addr(unsigned addr) {
+  unsigned size = memory::cartrom.size() - 0x100000;
+  while(addr >= size) addr -= size;
+  return addr + 0x100000;
+}
+
+unsigned SPC7110::data_pointer()   { return r4811 + (r4812 << 8) + (r4813 << 16); }
+unsigned SPC7110::data_adjust()    { return r4814 + (r4815 << 8); }
+unsigned SPC7110::data_increment() { return r4816 + (r4817 << 8); }
+void SPC7110::set_data_pointer(unsigned addr) { r4811 = addr; r4812 = addr >> 8; r4813 = addr >> 16; }
+void SPC7110::set_data_adjust(unsigned addr)  { r4814 = addr; r4815 = addr >> 8; }
+
+void SPC7110::update_time(int offset) {
+  time_t rtc_time;
+  rtc_time  = memory::cartrtc.read(16);
+  rtc_time |= memory::cartrtc.read(17) << 8;
+  rtc_time |= memory::cartrtc.read(18) << 16;
+  rtc_time |= memory::cartrtc.read(19) << 24;
+
+  bool update = true;
+  if(memory::cartrtc.read(13) & 1) update = false; //do not update if CR0 timer disable flag is set
+  if(memory::cartrtc.read(15) & 3) update = false; //do not update if CR2 timer disable flags are set
+
+  time_t current_time = time(0) - offset;
+  if(update && current_time > rtc_time) {
+    unsigned second  = memory::cartrtc.read( 0) + memory::cartrtc.read( 1) * 10;
+    unsigned minute  = memory::cartrtc.read( 2) + memory::cartrtc.read( 3) * 10;
+    unsigned hour    = memory::cartrtc.read( 4) + memory::cartrtc.read( 5) * 10;
+    unsigned day     = memory::cartrtc.read( 6) + memory::cartrtc.read( 7) * 10;
+    unsigned month   = memory::cartrtc.read( 8) + memory::cartrtc.read( 9) * 10;
+    unsigned year    = memory::cartrtc.read(10) + memory::cartrtc.read(11) * 10;
+    unsigned weekday = memory::cartrtc.read(12);
+
+    day--;
+    month--;
+    year += (year >= 90) ? 1900 : 2000; //range = 1990-2089
+
+    second += (unsigned)(current_time - rtc_time);
+    while(second >= 60) {
+      second -= 60;
+
+      minute++;
+      if(minute < 60) continue;
+      minute = 0;
+
+      hour++;
+      if(hour < 24) continue;
+      hour = 0;
+
+      day++;
+      weekday = (weekday + 1) % 7;
+      unsigned days = months[month % 12];
+      if(days == 28) {
+        bool leapyear = false;
+        if((year % 4) == 0) {
+          leapyear = true;
+          if((year % 100) == 0 && (year % 400) != 0) leapyear = false;
+        }
+        if(leapyear) days++;
+      }
+      if(day < days) continue;
+      day = 0;
+
+      month++;
+      if(month < 12) continue;
+      month = 0;
+
+      year++;
+    }
+
+    day++;
+    month++;
+    year %= 100;
+
+    memory::cartrtc.write( 0, second % 10);
+    memory::cartrtc.write( 1, second / 10);
+    memory::cartrtc.write( 2, minute % 10);
+    memory::cartrtc.write( 3, minute / 10);
+    memory::cartrtc.write( 4, hour % 10);
+    memory::cartrtc.write( 5, hour / 10);
+    memory::cartrtc.write( 6, day % 10);
+    memory::cartrtc.write( 7, day / 10);
+    memory::cartrtc.write( 8, month % 10);
+    memory::cartrtc.write( 9, month / 10);
+    memory::cartrtc.write(10, year % 10);
+    memory::cartrtc.write(11, (year / 10) % 10);
+    memory::cartrtc.write(12, weekday % 7);
+  }
+
+  memory::cartrtc.write(16, current_time);
+  memory::cartrtc.write(17, current_time >> 8);
+  memory::cartrtc.write(18, current_time >> 16);
+  memory::cartrtc.write(19, current_time >> 24);
+}
+
+uint8 SPC7110::mmio_read(uint addr) {
+  addr &= 0xffff;
+
+  switch(addr) {
+    //==================
+    //decompression unit
+    //==================
+
+    case 0x4800: {
+      uint16 counter = (r4809 + (r480a << 8));
+      counter--;
+      r4809 = counter;
+      r480a = counter >> 8;
+      return decomp.read();
+    }
+    case 0x4801: return r4801;
+    case 0x4802: return r4802;
+    case 0x4803: return r4803;
+    case 0x4804: return r4804;
+    case 0x4805: return r4805;
+    case 0x4806: return r4806;
+    case 0x4807: return r4807;
+    case 0x4808: return r4808;
+    case 0x4809: return r4809;
+    case 0x480a: return r480a;
+    case 0x480b: return r480b;
+    case 0x480c: {
+      uint8 status = r480c;
+      r480c &= 0x7f;
+      return status;
+    }
+
+    //==============
+    //data port unit
+    //==============
+
+    case 0x4810: {
+      if(r481x != 0x07) return 0x00;
+
+      unsigned addr = data_pointer();
+      unsigned adjust = data_adjust();
+      if(r4818 & 8) adjust = (int16)adjust; //16-bit sign extend
+
+      unsigned adjustaddr = addr;
+      if(r4818 & 2) {
+        adjustaddr += adjust;
+        set_data_adjust(adjust + 1);
+      }
+
+      uint8 data = memory::cartrom.read(datarom_addr(adjustaddr));
+      if(!(r4818 & 2)) {
+        unsigned increment = (r4818 & 1) ? data_increment() : 1;
+        if(r4818 & 4) increment = (int16)increment; //16-bit sign extend
+
+        if((r4818 & 16) == 0) {
+          set_data_pointer(addr + increment);
+        } else {
+          set_data_adjust(adjust + increment);
+        }
+      }
+
+      return data;
+    }
+    case 0x4811: return r4811;
+    case 0x4812: return r4812;
+    case 0x4813: return r4813;
+    case 0x4814: return r4814;
+    case 0x4815: return r4815;
+    case 0x4816: return r4816;
+    case 0x4817: return r4817;
+    case 0x4818: return r4818;
+    case 0x481a: {
+      if(r481x != 0x07) return 0x00;
+
+      unsigned addr = data_pointer();
+      unsigned adjust = data_adjust();
+      if(r4818 & 8) adjust = (int16)adjust; //16-bit sign extend
+
+      uint8 data = memory::cartrom.read(datarom_addr(addr + adjust));
+      if((r4818 & 0x60) == 0x60) {
+        if((r4818 & 16) == 0) {
+          set_data_pointer(addr + adjust);
+        } else {
+          set_data_adjust(adjust + adjust);
+        }
+      }
+
+      return data;
+    }
+
+    //=========
+    //math unit
+    //=========
+
+    case 0x4820: return r4820;
+    case 0x4821: return r4821;
+    case 0x4822: return r4822;
+    case 0x4823: return r4823;
+    case 0x4824: return r4824;
+    case 0x4825: return r4825;
+    case 0x4826: return r4826;
+    case 0x4827: return r4827;
+    case 0x4828: return r4828;
+    case 0x4829: return r4829;
+    case 0x482a: return r482a;
+    case 0x482b: return r482b;
+    case 0x482c: return r482c;
+    case 0x482d: return r482d;
+    case 0x482e: return r482e;
+    case 0x482f: {
+      uint8 status = r482f;
+      r482f &= 0x7f;
+      return status;
+    }
+
+    //===================
+    //memory mapping unit
+    //===================
+
+    case 0x4830: return r4830;
+    case 0x4831: return r4831;
+    case 0x4832: return r4832;
+    case 0x4833: return r4833;
+    case 0x4834: return r4834;
+
+    //====================
+    //real-time clock unit
+    //====================
+
+    case 0x4840: return r4840;
+    case 0x4841: {
+      if(rtc_state == RTCS_Inactive || rtc_state == RTCS_ModeSelect) return 0x00;
+
+      r4842 = 0x80;
+      uint8 data = memory::cartrtc.read(rtc_index);
+      rtc_index = (rtc_index + 1) & 15;
+      return data;
+    }
+    case 0x4842: {
+      uint8 status = r4842;
+      r4842 &= 0x7f;
+      return status;
+    }
+  }
+
+  return cpu.regs.mdr;
+}
+
+void SPC7110::mmio_write(uint addr, uint8 data) {
+  addr &= 0xffff;
+
+  switch(addr) {
+    //==================
+    //decompression unit
+    //==================
+
+    case 0x4801: r4801 = data; break;
+    case 0x4802: r4802 = data; break;
+    case 0x4803: r4803 = data; break;
+    case 0x4804: r4804 = data; break;
+    case 0x4805: r4805 = data; break;
+    case 0x4806: {
+      r4806 = data;
+
+      unsigned table   = (r4801 + (r4802 << 8) + (r4803 << 16));
+      unsigned index   = (r4804 << 2);
+      unsigned length  = (r4809 + (r480a << 8));
+      unsigned addr    = datarom_addr(table + index);
+      unsigned mode    = (memory::cartrom.read(addr + 0));
+      unsigned offset  = (memory::cartrom.read(addr + 1) << 16)
+                       + (memory::cartrom.read(addr + 2) <<  8)
+                       + (memory::cartrom.read(addr + 3) <<  0);
+
+      decomp.init(mode, offset, (r4805 + (r4806 << 8)) << mode);
+      r480c = 0x80;
+    } break;
+
+    case 0x4807: r4807 = data; break;
+    case 0x4808: r4808 = data; break;
+    case 0x4809: r4809 = data; break;
+    case 0x480a: r480a = data; break;
+    case 0x480b: r480b = data; break;
+
+    //==============
+    //data port unit
+    //==============
+
+    case 0x4811: r4811 = data; r481x |= 0x01; break;
+    case 0x4812: r4812 = data; r481x |= 0x02; break;
+    case 0x4813: r4813 = data; r481x |= 0x04; break;
+    case 0x4814: {
+      r4814 = data;
+      r4814_latch = true;
+      if(!r4815_latch) break;
+      if(!(r4818 & 2)) break;
+      if(r4818 & 0x10) break;
+
+      if((r4818 & 0x60) == 0x20) {
+        unsigned increment = data_adjust() & 0xff;
+        if(r4818 & 8) increment = (int8)increment; //8-bit sign extend
+        set_data_pointer(data_pointer() + increment);
+      } else if((r4818 & 0x60) == 0x40) {
+        unsigned increment = data_adjust();
+        if(r4818 & 8) increment = (int16)increment; //16-bit sign extend
+        set_data_pointer(data_pointer() + increment);
+      }
+    } break;
+    case 0x4815: {
+      r4815 = data;
+      r4815_latch = true;
+      if(!r4814_latch) break;
+      if(!(r4818 & 2)) break;
+      if(r4818 & 0x10) break;
+
+      if((r4818 & 0x60) == 0x20) {
+        unsigned increment = data_adjust() & 0xff;
+        if(r4818 & 8) increment = (int8)increment; //8-bit sign extend
+        set_data_pointer(data_pointer() + increment);
+      } else if((r4818 & 0x60) == 0x40) {
+        unsigned increment = data_adjust();
+        if(r4818 & 8) increment = (int16)increment; //16-bit sign extend
+        set_data_pointer(data_pointer() + increment);
+      }
+    } break;
+    case 0x4816: r4816 = data; break;
+    case 0x4817: r4817 = data; break;
+    case 0x4818: {
+      if(r481x != 0x07) break;
+
+      r4818 = data;
+      r4814_latch = r4815_latch = false;
+    } break;
+
+    //=========
+    //math unit
+    //=========
+
+    case 0x4820: r4820 = data; break;
+    case 0x4821: r4821 = data; break;
+    case 0x4822: r4822 = data; break;
+    case 0x4823: r4823 = data; break;
+    case 0x4824: r4824 = data; break;
+    case 0x4825: {
+      r4825 = data;
+
+      if(r482e & 1) {
+        //signed 16-bit x 16-bit multiplication
+        int16 r0 = (int16)(r4824 + (r4825 << 8));
+        int16 r1 = (int16)(r4820 + (r4821 << 8));
+
+        signed result = r0 * r1;
+        r4828 = result;
+        r4829 = result >> 8;
+        r482a = result >> 16;
+        r482b = result >> 24;
+      } else {
+        //unsigned 16-bit x 16-bit multiplication
+        uint16 r0 = (uint16)(r4824 + (r4825 << 8));
+        uint16 r1 = (uint16)(r4820 + (r4821 << 8));
+
+        unsigned result = r0 * r1;
+        r4828 = result;
+        r4829 = result >> 8;
+        r482a = result >> 16;
+        r482b = result >> 24;
+      }
+
+      r482f = 0x80;
+    } break;
+    case 0x4826: r4826 = data; break;
+    case 0x4827: {
+      r4827 = data;
+
+      if(r482e & 1) {
+        //signed 32-bit x 16-bit division
+        int32 dividend = (int32)(r4820 + (r4821 << 8) + (r4822 << 16) + (r4823 << 24));
+        int16 divisor  = (int16)(r4826 + (r4827 << 8));
+
+        int32 quotient;
+        int16 remainder;
+
+        if(divisor) {
+          quotient  = (int32)(dividend / divisor);
+          remainder = (int32)(dividend % divisor);
+        } else {
+          //illegal division by zero
+          quotient  = 0;
+          remainder = dividend & 0xffff;
+        }
+
+        r4828 = quotient;
+        r4829 = quotient >> 8;
+        r482a = quotient >> 16;
+        r482b = quotient >> 24;
+
+        r482c = remainder;
+        r482d = remainder >> 8;
+      } else {
+        //unsigned 32-bit x 16-bit division
+        uint32 dividend = (uint32)(r4820 + (r4821 << 8) + (r4822 << 16) + (r4823 << 24));
+        uint16 divisor  = (uint16)(r4826 + (r4827 << 8));
+
+        uint32 quotient;
+        uint16 remainder;
+
+        if(divisor) {
+          quotient  = (uint32)(dividend / divisor);
+          remainder = (uint16)(dividend % divisor);
+        } else {
+          //illegal division by zero
+          quotient  = 0;
+          remainder = dividend & 0xffff;
+        }
+
+        r4828 = quotient;
+        r4829 = quotient >> 8;
+        r482a = quotient >> 16;
+        r482b = quotient >> 24;
+
+        r482c = remainder;
+        r482d = remainder >> 8;
+      }
+
+      r482f = 0x80;
+    } break;
+
+    case 0x482e: {
+      //reset math unit
+      r4820 = r4821 = r4822 = r4823 = 0;
+      r4824 = r4825 = r4826 = r4827 = 0;
+      r4828 = r4829 = r482a = r482b = 0;
+      r482c = r482d = 0;
+
+      r482e = data;
+    } break;
+
+    //===================
+    //memory mapping unit
+    //===================
+
+    case 0x4830: r4830 = data; break;
+
+    case 0x4831: {
+      r4831 = data;
+      dx_offset = datarom_addr((data & 7) * 0x100000);
+    } break;
+
+    case 0x4832: {
+      r4832 = data;
+      ex_offset = datarom_addr((data & 7) * 0x100000);
+    } break;
+
+    case 0x4833: {
+      r4833 = data;
+      fx_offset = datarom_addr((data & 7) * 0x100000);
+    } break;
+
+    case 0x4834: r4834 = data; break;
+
+    //====================
+    //real-time clock unit
+    //====================
+
+    case 0x4840: {
+      r4840 = data;
+      if(!(r4840 & 1)) {
+        //disable RTC
+        rtc_state = RTCS_Inactive;
+        update_time();
+      } else {
+        //enable RTC
+        r4842 = 0x80;
+        rtc_state = RTCS_ModeSelect;
+      }
+    } break;
+
+    case 0x4841: {
+      r4841 = data;
+
+      switch(rtc_state) {
+        case RTCS_ModeSelect: {
+          if(data == RTCM_Linear || data == RTCM_Indexed) {
+            r4842 = 0x80;
+            rtc_state = RTCS_IndexSelect;
+            rtc_mode  = (RTC_Mode)data;
+            rtc_index = 0;
+          }
+        } break;
+
+        case RTCS_IndexSelect: {
+          r4842 = 0x80;
+          rtc_index = data & 15;
+          if(rtc_mode == RTCM_Linear) rtc_state = RTCS_Write;
+        } break;
+
+        case RTCS_Write: {
+          r4842 = 0x80;
+
+          //control register 0
+          if(rtc_index == 13) {
+            //increment second counter
+            if(data & 2) update_time(+1);
+
+            //round minute counter
+            if(data & 8) {
+              update_time();
+
+              unsigned second = memory::cartrtc.read( 0) + memory::cartrtc.read( 1) * 10;
+              //clear seconds
+              memory::cartrtc.write(0, 0);
+              memory::cartrtc.write(1, 0);
+
+              if(second >= 30) update_time(+60);
+            }
+          }
+
+          //control register 2
+          if(rtc_index == 15) {
+            //disable timer and clear second counter
+            if((data & 1) && !(memory::cartrtc.read(15) & 1)) {
+              update_time();
+
+              //clear seconds
+              memory::cartrtc.write(0, 0);
+              memory::cartrtc.write(1, 0);
+            }
+
+            //disable timer
+            if((data & 2) && !(memory::cartrtc.read(15) & 2)) {
+              update_time();
+            }
+          }
+
+          memory::cartrtc.write(rtc_index, data & 15);
+          rtc_index = (rtc_index + 1) & 15;
+        } break;
+      } //switch(rtc_state)
+    } break;
+  }
+}
+
+uint8 SPC7110::read(uint addr) {
+  //$[00-0f|80-8f]:[8000-ffff], $[c0-cf]:[0000-ffff] mapped directly to memory::cartrom
+
+  if((addr & 0xffe000) == 0x006000 || (addr & 0xffe000) == 0x306000) {
+    //$[00|30]:[6000-7fff]
+    return memory::cartram.read(addr & 0x1fff);
+  }
+
+  if((addr & 0xff0000) == 0x500000) {
+    //$[50]:[0000-ffff]
+    return mmio_read(0x4800);
+  }
+
+  if((addr & 0xf00000) == 0xd00000) {
+    //$[d0-df]:[0000-ffff]
+    return memory::cartrom.read(dx_offset + (addr & 0x0fffff));
+  }
+
+  if((addr & 0xf00000) == 0xe00000) {
+    //$[e0-ef]:[0000-ffff]
+    return memory::cartrom.read(ex_offset + (addr & 0x0fffff));
+  }
+
+  if((addr & 0xf00000) == 0xf00000) {
+    //$[f0-ff]:[0000-ffff]
+    return memory::cartrom.read(fx_offset + (addr & 0x0fffff));
+  }
+
+  return cpu.regs.mdr;
+}
+
+void SPC7110::write(uint addr, uint8 data) {
+  if((addr & 0xffe000) == 0x006000 || (addr & 0xffe000) == 0x306000) {
+    //$[00|30]:[6000-7fff]
+    if(r4830 & 0x80) memory::cartram.write(addr & 0x1fff, data);
+    return;
+  }
+}
+
+SPC7110::SPC7110() {
+}

src/chip/spc7110/spc7110.h

@@ -0,0 +1,133 @@
+/*****
+ * SPC7110 emulator - version 0.03 (2008-08-10)
+ * Copyright (c) 2008, byuu and neviksti
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * The software is provided "as is" and the author disclaims all warranties
+ * with regard to this software including all implied warranties of
+ * merchantibility and fitness, in no event shall the author be liable for
+ * any special, direct, indirect, or consequential damages or any damages
+ * whatsoever resulting from loss of use, data or profits, whether in an
+ * action of contract, negligence or other tortious action, arising out of
+ * or in connection with the use or performance of this software.
+ *****/
+
+#include "decomp.h"
+
+class SPC7110 : public MMIO, public Memory {
+public:
+  void init();
+  void enable();
+  void power();
+  void reset();
+
+  unsigned datarom_addr(unsigned addr);
+
+  unsigned data_pointer();
+  unsigned data_adjust();
+  unsigned data_increment();
+  void set_data_pointer(unsigned addr);
+  void set_data_adjust(unsigned addr);
+
+  void update_time(int offset = 0);
+  time_t create_time();
+
+  uint8 mmio_read (uint addr);
+  void  mmio_write(uint addr, uint8 data);
+
+  uint8 read (uint addr);
+  void  write(uint addr, uint8 data);
+
+  //spc7110decomp
+  void decomp_init();
+  uint8 decomp_read();
+
+  SPC7110();
+
+private:
+  //==================
+  //decompression unit
+  //==================
+  uint8 r4801; //compression table low
+  uint8 r4802; //compression table high
+  uint8 r4803; //compression table bank
+  uint8 r4804; //compression table index
+  uint8 r4805; //decompression buffer index low
+  uint8 r4806; //decompression buffer index high
+  uint8 r4807; //???
+  uint8 r4808; //???
+  uint8 r4809; //compression length low
+  uint8 r480a; //compression length high
+  uint8 r480b; //decompression control register
+  uint8 r480c; //decompression status
+
+  SPC7110Decomp decomp;
+
+  //==============
+  //data port unit
+  //==============
+  uint8 r4811; //data pointer low
+  uint8 r4812; //data pointer high
+  uint8 r4813; //data pointer bank
+  uint8 r4814; //data adjust low
+  uint8 r4815; //data adjust high
+  uint8 r4816; //data increment low
+  uint8 r4817; //data increment high
+  uint8 r4818; //data port control register
+
+  uint8 r481x;
+
+  bool r4814_latch;
+  bool r4815_latch;
+
+  //=========
+  //math unit
+  //=========
+  uint8 r4820; //16-bit multiplicand B0, 32-bit dividend B0
+  uint8 r4821; //16-bit multiplicand B1, 32-bit dividend B1
+  uint8 r4822; //32-bit dividend B2
+  uint8 r4823; //32-bit dividend B3
+  uint8 r4824; //16-bit multiplier B0
+  uint8 r4825; //16-bit multiplier B1
+  uint8 r4826; //16-bit divisor B0
+  uint8 r4827; //16-bit divisor B1
+  uint8 r4828; //32-bit product B0, 32-bit quotient B0
+  uint8 r4829; //32-bit product B1, 32-bit quotient B1
+  uint8 r482a; //32-bit product B2, 32-bit quotient B2
+  uint8 r482b; //32-bit product B3, 32-bit quotient B3
+  uint8 r482c; //16-bit remainder B0
+  uint8 r482d; //16-bit remainder B1
+  uint8 r482e; //math control register
+  uint8 r482f; //math status
+
+  //===================
+  //memory mapping unit
+  //===================
+  uint8 r4830; //SRAM write enable
+  uint8 r4831; //$[d0-df]:[0000-ffff] mapping
+  uint8 r4832; //$[e0-ef]:[0000-ffff] mapping
+  uint8 r4833; //$[f0-ff]:[0000-ffff] mapping
+  uint8 r4834; //???
+
+  unsigned dx_offset;
+  unsigned ex_offset;
+  unsigned fx_offset;
+
+  //====================
+  //real-time clock unit
+  //====================
+  uint8 r4840; //RTC latch
+  uint8 r4841; //RTC index/data port
+  uint8 r4842; //RTC status
+
+  enum RTC_State { RTCS_Inactive, RTCS_ModeSelect, RTCS_IndexSelect, RTCS_Write } rtc_state;
+  enum RTC_Mode  { RTCM_Linear = 0x03, RTCM_Indexed = 0x0c } rtc_mode;
+  unsigned rtc_index;
+
+  static const unsigned months[12];
+};
+
+extern SPC7110 spc7110;

src/chip/srtc/srtc.cpp

@@ -1,189 +1,213 @@
-/*
-  S-RTC chip emulation
-  Used by Hudson Soft in Dai Kaijuu Monogatari II and Far East of Eden Zero.
-  Currently, only the former is supported by bsnes.
-
-  Original S-RTC emulation code via John Weidman/SNES9x
-  Rewritten for compatibility with bsnes via byuu
-
-  The S-RTC is a real-time clock chip that was added to the above two carts
-  to allow the games to maintain the current time, even when the game was not
-  powered on. Thus allowing special events at certain times, and on certain
-  dates. Hudson Soft called this the PLG (Player's Life Gameplay System).
-
-  This chip is a special case to the term 'emulation' itself.
-  There are a few different ways to go about emulating this chip, and each
-  result in a different style of emulation.
-
-  The first is to simply return the current PC system time when the S-RTC is
-  read from. This emulates the original S-RTC in the sense that it always
-  returns the true current time, ignoring the speed that the SNES itself is
-  running at. The downside to this method is that you lose the ability to set
-  the time to whatever you choose inside the game itself. It will always return
-  the true time, regardless. This can be overcome by changing the PC system time,
-  which actually adds a greater degree of control over event timing, very useful
-  for emulation. It also has a timeshifting flaw discussed below.
-
-  The second is to run the S-RTC relative to the SNES speed. This means that
-  if the emulator is sped up (via fast forward key, frameskipping, etc), or
-  slowed down (via slowdown key, system bottlenecking, etc); the time increments
-  slower, thus ~60 frames on the SNES equal one second. Without this, timeshifting
-  will occur between the S-RTC and the real SNES.
-
-  The third and final method is to save a copy of the local system time when the
-  S-RTC is initially set, and compare the current system time against this value
-  when setting the S-RTC time. This overcomes the first methods' shortcoming of
-  not allowing the player to set the time in-game, however a new problem arises.
-  You now have to save the time when the RTC was initially set to both savestates
-  and to save-game data. This would require an extra file, or the breaking of
-  perhaps the only standard format (.srm savegame backups) in the entire SNES
-  emulation scene. You also give up the control of being able to override the
-  RTC clock at will via the PC system time outside of emulation.
-  The first method has another advantage over the third: Dai Kaijuu Monogatari II
-  only allows dates in the range of the years 1996-2199. The first method gets
-  around this limitation. But who knows, maybe it will break something in the
-  game if the date exceeds 2199... I guess we'll worry about that in two hundred
-  years from now.
-
-  For my implementation, I chose to go with the first method. Both for simplicity
-  and because I did not wish to create a new method for saving the system time
-  whenever the RTC is set.
-*/
-
-#include "../../base.h"
-
-void SRTC::set_time() {
-time_t rawtime;
-tm *t;
-  ::time(&rawtime);
-  t = localtime(&rawtime);
-
-//see srtc.h for format of srtc.data[]
-  srtc.data[0]  = t->tm_sec % 10;
-  srtc.data[1]  = t->tm_sec / 10;
-  srtc.data[2]  = t->tm_min % 10;
-  srtc.data[3]  = t->tm_min / 10;
-  srtc.data[4]  = t->tm_hour % 10;
-  srtc.data[5]  = t->tm_hour / 10;
-  srtc.data[6]  = t->tm_mday % 10;
-  srtc.data[7]  = t->tm_mday / 10;
-  srtc.data[8]  = t->tm_mon + 1;
-  srtc.data[9]  = t->tm_year % 10;
-  srtc.data[10] = (t->tm_year / 10) % 10;
-  srtc.data[11] = 9 + (t->tm_year / 100);
-  srtc.data[12] = t->tm_wday;
-}
-
-void SRTC::init() {}
-
-void SRTC::enable() {
-  memory::mmio.map(0x2800, *this);
-  memory::mmio.map(0x2801, *this);
-}
-
-void SRTC::power() {
-  memset(&srtc, 0, sizeof(srtc));
-  reset();
-}
-
-void SRTC::reset() {
-  srtc.index = -1;
-  srtc.mode  = SRTC_READ;
-}
-
-uint8 SRTC::mmio_read(uint addr) {
-  switch(addr & 0xffff) {
-
-  case 0x2800: {
-    if(srtc.mode == SRTC_READ) {
-      if(srtc.index < 0) {
-        set_time();
-        srtc.index++;
-        return 0x0f; //send start message
-      } else if(srtc.index > MAX_SRTC_INDEX) {
-        srtc.index = -1;
-        return 0x0f; //send finished message
-      } else {
-        return srtc.data[srtc.index++];
-      }
-    } else {
-      return 0x00;
-    }
-  } break;
-
-  case 0x2801: {
-  } break;
-
-  }
-
-  return cpu.regs.mdr;
-}
-
-//Please see notes above about the implementation of the S-RTC
-//Writes are stored the srtc.data[] array, but they are ignored
-//as reads will refresh the data array with the current system
-//time. The write method is only here for the sake of faux
-//emulation of the real hardware.
-void SRTC::mmio_write(uint addr, uint8 data) {
-  switch(addr & 0xffff) {
-
-  case 0x2800: {
-  } break;
-
-  case 0x2801: {
-    data &= 0x0f; //only the low four bits are used
-
-    if(data >= 0x0d) {
-      switch(data) {
-      case 0x0d:
-        srtc.mode  = SRTC_READ;
-        srtc.index = -1;
-        break;
-      case 0x0e:
-        srtc.mode = SRTC_COMMAND;
-        break;
-      case 0x0f:
-      //unknown behaviour
-        break;
-      }
-      return;
-    }
-
-    if(srtc.mode == SRTC_WRITE) {
-      if(srtc.index >= 0 && srtc.index < MAX_SRTC_INDEX) {
-        srtc.data[srtc.index++] = data;
-
-        if(srtc.index == MAX_SRTC_INDEX) {
-        //all S-RTC data has been loaded by program
-          srtc.data[srtc.index++] = 0x00; //day_of_week
-        }
-      }
-    } else if(srtc.mode == SRTC_COMMAND) {
-      switch(data) {
-      case SRTC_COMMAND_CLEAR:
-        memset(srtc.data, 0, MAX_SRTC_INDEX + 1);
-        srtc.index = -1;
-        srtc.mode  = SRTC_READY;
-        break;
-      case SRTC_COMMAND_WRITE:
-        srtc.index = 0;
-        srtc.mode  = SRTC_WRITE;
-        break;
-      default:
-      //unknown behaviour
-        srtc.mode  = SRTC_READY;
-        break;
-      }
-    } else {
-      if(srtc.mode == SRTC_READ) {
-      //ignore writes while in read mode
-      } else if(srtc.mode == SRTC_READY) {
-      //unknown behaviour
-      }
-    }
-  } break;
-
-  }
-}
-
-SRTC::SRTC() {}
+#include "../../base.h"
+
+const unsigned SRTC::months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+void SRTC::init() {
+}
+
+void SRTC::enable() {
+  memory::mmio.map(0x2800, *this);
+  memory::mmio.map(0x2801, *this);
+}
+
+void SRTC::power() {
+  reset();
+}
+
+void SRTC::reset() {
+  rtc_mode = RTCM_Read;
+  rtc_index = -1;
+  update_time();
+}
+
+void SRTC::update_time() {
+  time_t rtc_time;
+  rtc_time  = memory::cartrtc.read(16);
+  rtc_time |= memory::cartrtc.read(17) << 8;
+  rtc_time |= memory::cartrtc.read(18) << 16;
+  rtc_time |= memory::cartrtc.read(19) << 24;
+
+  time_t current_time = time(0);
+  if(current_time > rtc_time) {
+    unsigned second  = memory::cartrtc.read( 0) + memory::cartrtc.read( 1) * 10;
+    unsigned minute  = memory::cartrtc.read( 2) + memory::cartrtc.read( 3) * 10;
+    unsigned hour    = memory::cartrtc.read( 4) + memory::cartrtc.read( 5) * 10;
+    unsigned day     = memory::cartrtc.read( 6) + memory::cartrtc.read( 7) * 10;
+    unsigned month   = memory::cartrtc.read( 8);
+    unsigned year    = memory::cartrtc.read( 9) + memory::cartrtc.read(10) * 10 + memory::cartrtc.read(11) * 100;
+    unsigned weekday = memory::cartrtc.read(12);
+
+    day--;
+    month--;
+    year += 1000;
+
+    second += (unsigned)(current_time - rtc_time);
+
+    while(second >= 60) {
+      second -= 60;
+
+      minute++;
+      if(minute < 60) continue;
+      minute = 0;
+
+      hour++;
+      if(hour < 24) continue;
+      hour = 0;
+
+      day++;
+      weekday = (weekday + 1) % 7;
+      unsigned days = months[month % 12];
+      if(days == 28) {
+        bool leapyear = false;
+        if((year % 4) == 0) {
+          leapyear = true;
+          if((year % 100) == 0 && (year % 400) != 0) leapyear = false;
+        }
+        if(leapyear) days++;
+      }
+      if(day < days) continue;
+      day = 0;
+
+      month++;
+      if(month < 12) continue;
+      month = 0;
+
+      year++;
+    }
+
+    day++;
+    month++;
+    year -= 1000;
+
+    memory::cartrtc.write( 0, second % 10);
+    memory::cartrtc.write( 1, second / 10);
+    memory::cartrtc.write( 2, minute % 10);
+    memory::cartrtc.write( 3, minute / 10);
+    memory::cartrtc.write( 4, hour % 10);
+    memory::cartrtc.write( 5, hour / 10);
+    memory::cartrtc.write( 6, day % 10);
+    memory::cartrtc.write( 7, day / 10);
+    memory::cartrtc.write( 8, month);
+    memory::cartrtc.write( 9, year % 10);
+    memory::cartrtc.write(10, (year / 10) % 10);
+    memory::cartrtc.write(11, year / 100);
+    memory::cartrtc.write(12, weekday % 7);
+  }
+
+  memory::cartrtc.write(16, current_time);
+  memory::cartrtc.write(17, current_time >> 8);
+  memory::cartrtc.write(18, current_time >> 16);
+  memory::cartrtc.write(19, current_time >> 24);
+}
+
+//returns day of week for specified date
+//eg 0 = Sunday, 1 = Monday, ... 6 = Saturday
+//usage: weekday(2008, 1, 1) returns weekday of January 1st, 2008
+unsigned SRTC::weekday(unsigned year, unsigned month, unsigned day) {
+  unsigned y = 1900, m = 1; //epoch is 1900-01-01
+  unsigned sum = 0; //number of days passed since epoch
+
+  year = max(1900, year);
+  month = max(1, min(12, month));
+  day = max(1, min(31, day));
+
+  while(y < year) {
+    bool leapyear = false;
+    if((y % 4) == 0) {
+      leapyear = true;
+      if((y % 100) == 0 && (y % 400) != 0) leapyear = false;
+    }
+    sum += leapyear ? 366 : 365;
+    y++;
+  }
+
+  while(m < month) {
+    unsigned days = months[m - 1];
+    if(days == 28) {
+      bool leapyear = false;
+      if((y % 4) == 0) {
+        leapyear = true;
+        if((y % 100) == 0 && (y % 400) != 0) leapyear = false;
+      }
+      if(leapyear) days++;
+    }
+    sum += days;
+    m++;
+  }
+
+  sum += day - 1;
+  return (sum + 1) % 7; //1900-01-01 was a Monday
+}
+
+uint8 SRTC::mmio_read(uint addr) {
+  addr &= 0xffff;
+
+  if(addr == 0x2800) {
+    if(rtc_mode != RTCM_Read) return 0x00;
+
+    if(rtc_index < 0) {
+      update_time();
+      rtc_index++;
+      return 0x0f;
+    } else if(rtc_index > 12) {
+      rtc_index = -1;
+      return 0x0f;
+    } else {
+      return memory::cartrtc.read(rtc_index++);
+    }
+  }
+
+  return cpu.regs.mdr;
+}
+
+void SRTC::mmio_write(uint addr, uint8 data) {
+  addr &= 0xffff;
+
+  if(addr == 0x2801) {
+    data &= 0x0f; //only the low four bits are used
+
+    if(data == 0x0d) {
+      rtc_mode = RTCM_Read;
+      rtc_index = -1;
+      return;
+    }
+
+    if(data == 0x0e) {
+      rtc_mode = RTCM_Command;
+      return;
+    }
+
+    if(data == 0x0f) return; //unknown behavior
+
+    if(rtc_mode == RTCM_Write) {
+      if(rtc_index >= 0 && rtc_index < 12) {
+        memory::cartrtc.write(rtc_index++, data);
+
+        if(rtc_index == 12) {
+          //day of week is automatically calculated and written
+          unsigned day   = memory::cartrtc.read( 6) + memory::cartrtc.read( 7) * 10;
+          unsigned month = memory::cartrtc.read( 8);
+          unsigned year  = memory::cartrtc.read( 9) + memory::cartrtc.read(10) * 10 + memory::cartrtc.read(11) * 100;
+          year += 1000;
+
+          memory::cartrtc.write(rtc_index++, weekday(year, month, day));
+        }
+      }
+    } else if(rtc_mode == RTCM_Command) {
+      if(data == 0) {
+        rtc_mode = RTCM_Write;
+        rtc_index = 0;
+      } else if(data == 4) {
+        rtc_mode = RTCM_Ready;
+        rtc_index = -1;
+        for(unsigned i = 0; i < 13; i++) memory::cartrtc.write(i, 0);
+      } else {
+        //unknown behavior
+        rtc_mode = RTCM_Ready;
+      }
+    }
+  }
+}
+
+SRTC::SRTC() {
+}

src/chip/srtc/srtc.h

@@ -1,52 +1,22 @@
-class SRTC : public MMIO {
-public:
-enum { MAX_SRTC_INDEX = 0x0c };
-
-enum {
-  SRTC_READ = 0,
-  SRTC_WRITE,
-  SRTC_COMMAND,
-  SRTC_READY
-};
-
-enum {
-  SRTC_COMMAND_WRITE = 0,
-  SRTC_COMMAND_CLEAR = 4
-};
-
-/******************************
-[srtc.data structure]
-Index  Description   Range
------  -----------   -----
-    0  Seconds low   0-9
-    1  Seconds high  0-5
-    2  Minutes low   0-9
-    3  Minutes high  0-5
-    4  Hour low      0-9
-    5  Hour high     0-2
-    6  Day low       0-9
-    7  Day high      0-3
-    8  Month         1-12
-    9  Year ones     0-9
-   10  Year tens     0-9
-   11  Year hundreds 9-11 (9=19xx, 10=20xx, 11=21xx)
-   12  Day of week   0-6  (0=Sunday, ...)
-******************************/
-struct {
-  int8  index;
-  uint8 mode;
-  uint8 data[MAX_SRTC_INDEX + 1];
-} srtc;
-  void  set_time();
-  void  init();
-  void  enable();
-  void  power();
-  void  reset();
-
-  uint8 mmio_read (uint addr);
-  void  mmio_write(uint addr, uint8 data);
-
-  SRTC();
-};
-
-extern SRTC srtc;
+class SRTC : public MMIO {
+public:
+  void update_time();
+  unsigned weekday(unsigned year, unsigned month, unsigned day);
+
+  void init();
+  void enable();
+  void power();
+  void reset();
+
+  uint8 mmio_read (uint addr);
+  void  mmio_write(uint addr, uint8 data);
+
+  SRTC();
+
+private:
+  static const unsigned months[12];
+  enum RTC_Mode { RTCM_Ready, RTCM_Command, RTCM_Read, RTCM_Write } rtc_mode;
+  signed rtc_index;
+};
+
+extern SRTC srtc;

src/config/config.cpp

@@ -44,8 +44,9 @@ string file_updatepath(const char *req_file, const char *req_path) {
   return path;
 }
 
-string_setting Path::base("path.base",
-  "Path that bsnes resides in", "");
+string_setting Path::base("path.base", "Path that bsnes resides in", "");
+string_setting Path::user("path.user", "Path to user folder", "");
+
 string_setting Path::rom(config(), "path.rom",
   "Default path to look for ROM files in (\"\" = use default directory)", "");
 string_setting Path::patch(config(), "path.patch",
@@ -57,15 +58,15 @@ string_setting Path::cheat(config(), "path.cheat",
 string_setting Path::bsx(config(), "path.bsx", "", "");
 string_setting Path::st(config(), "path.st", "", "");
 
-integral_setting SNES::controller_port0(config(), "snes.controller_port_1",
-  "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::Input::DeviceIDJoypad2);
+integral_setting SNES::controller_port1(config(), "snes.controller_port1",
+  "Controller attached to SNES port 1", integral_setting::decimal, ::SNES::Input::DeviceJoypad);
+integral_setting SNES::controller_port2(config(), "snes.controller_port2",
+  "Controller attached to SNES port 2", integral_setting::decimal, ::SNES::Input::DeviceJoypad);
 
 integral_setting CPU::ntsc_clock_rate(config(), "cpu.ntsc_clock_rate",
   "NTSC S-CPU clock rate (in hz)", integral_setting::decimal, 21477272);
 integral_setting CPU::pal_clock_rate(config(), "cpu.pal_clock_rate",
-  "PAL S-CPU clock rate (in hz)", integral_setting::decimal, 21281370);
+  "PAL S-CPU clock rate (in hz)", integral_setting::decimal,  21281370);
 integral_setting CPU::wram_init_value(config(), "cpu.wram_init_value",
   "Value to initialize 128k WRAM to upon power cycle.\n"
   "Note that on real hardware, this value is undefined; meaning it can vary\n"
@@ -80,13 +81,10 @@ integral_setting CPU::wram_init_value(config(), "cpu.wram_init_value",
   "which do not properly initialize WRAM upon power cycle.\n",
   integral_setting::hex, 0x55);
 
-integral_setting CPU::hdma_enable("cpu.hdma_enable",
-  "Enable HDMA effects", integral_setting::boolean, true);
-
 integral_setting SMP::ntsc_clock_rate(config(), "smp.ntsc_clock_rate",
-  "NTSC S-SMP clock rate (in hz)", integral_setting::decimal, 24606720);
+  "NTSC S-SMP clock rate (in hz)", integral_setting::decimal, 32040 * 768);
 integral_setting SMP::pal_clock_rate(config(), "smp.pal_clock_rate",
-  "PAL S-SMP clock rate (in hz)", integral_setting::decimal, 24606720);
+  "PAL S-SMP clock rate (in hz)", integral_setting::decimal,  32040 * 768);
 
 integral_setting PPU::Hack::render_scanline_position(config(), "ppu.hack.render_scanline_position",
   "Approximate HCLOCK position to render at for scanline-based renderers",

src/config/config.h

@@ -10,19 +10,18 @@ extern struct File {
 } file;
 
 extern struct Path {
-  static string_setting base, rom, patch, save, cheat;
+  static string_setting base, user, rom, patch, save, cheat;
   static string_setting bsx, st;
 } path;
 
 extern struct SNES {
-  static integral_setting controller_port0;
   static integral_setting controller_port1;
+  static integral_setting controller_port2;
 } snes;
 
 extern struct CPU {
   static integral_setting ntsc_clock_rate, pal_clock_rate;
   static integral_setting wram_init_value;
-  static integral_setting hdma_enable;
 } cpu;
 
 extern struct SMP {

src/cpu/cpu.cpp

@@ -4,7 +4,7 @@
 #include "dcpu.cpp"
 
 CPU::CPU() {
-  cpu_version = 1;
+  cpu_version = 2;
 }
 
 CPU::~CPU() {

src/cpu/cpu.h

@@ -15,7 +15,8 @@ public:
   virtual uint16 hcounter() = 0;
   virtual uint16 hdot() = 0;
 
-  virtual uint8 pio_status() = 0;
+  virtual uint8 pio() = 0;
+  virtual bool joylatch() = 0;
   virtual uint8 port_read(uint8 port) = 0;
   virtual void port_write(uint8 port, uint8 value) = 0;
 

src/cpu/cpuregs.h

@@ -1,19 +1,32 @@
+template<int mask>
+struct CPUFlag {
+  uint8 &data;
+
+  inline operator bool() const { return data & mask; }
+  inline CPUFlag& operator=(bool i) { data = (data & ~mask) | (-i & mask); return *this; }
+
+  CPUFlag(uint8 &data_) : data(data_) {}
+};
+
 class CPURegFlags {
-public:
-  union {
-    uint8 data;
-    struct {
-      bool order_msb8(n:1, v:1, m:1, x:1, d:1, i:1, z:1, c:1);
-    };
-  };
+public:
+  uint8 data;
+  CPUFlag<0x80> n;
+  CPUFlag<0x40> v;
+  CPUFlag<0x20> m;
+  CPUFlag<0x10> x;
+  CPUFlag<0x08> d;
+  CPUFlag<0x04> i;
+  CPUFlag<0x02> z;
+  CPUFlag<0x01> c;
 
   inline operator unsigned() const { return data; }
-  template<typename T> inline unsigned operator  = (const T i) { data  = i; return data; }
-  template<typename T> inline unsigned operator |= (const T i) { data |= i; return data; }
-  template<typename T> inline unsigned operator ^= (const T i) { data ^= i; return data; }
-  template<typename T> inline unsigned operator &= (const T i) { data &= i; return data; }
+  inline unsigned operator  = (unsigned i) { data  = i; return data; }
+  inline unsigned operator |= (unsigned i) { data |= i; return data; }
+  inline unsigned operator ^= (unsigned i) { data ^= i; return data; }
+  inline unsigned operator &= (unsigned i) { data &= i; return data; }
 
-  CPURegFlags() : data(0) {}
+  CPURegFlags() : data(0), n(data), v(data), m(data), x(data), d(data), i(data), z(data), c(data) {}
 };
 
 class CPUReg16 {
@@ -24,17 +37,17 @@ public:
   };
 
   inline operator unsigned() const { return w; }
-  template<typename T> inline unsigned operator   = (const T i) { w   = i; return w; }
-  template<typename T> inline unsigned operator  |= (const T i) { w  |= i; return w; }
-  template<typename T> inline unsigned operator  ^= (const T i) { w  ^= i; return w; }
-  template<typename T> inline unsigned operator  &= (const T i) { w  &= i; return w; }
-  template<typename T> inline unsigned operator <<= (const T i) { w <<= i; return w; }
-  template<typename T> inline unsigned operator >>= (const T i) { w >>= i; return w; }
-  template<typename T> inline unsigned operator  += (const T i) { w  += i; return w; }
-  template<typename T> inline unsigned operator  -= (const T i) { w  -= i; return w; }
-  template<typename T> inline unsigned operator  *= (const T i) { w  *= i; return w; }
-  template<typename T> inline unsigned operator  /= (const T i) { w  /= i; return w; }
-  template<typename T> inline unsigned operator  %= (const T i) { w  %= i; return w; }
+  inline unsigned operator   = (unsigned i) { w   = i; return w; }
+  inline unsigned operator  |= (unsigned i) { w  |= i; return w; }
+  inline unsigned operator  ^= (unsigned i) { w  ^= i; return w; }
+  inline unsigned operator  &= (unsigned i) { w  &= i; return w; }
+  inline unsigned operator <<= (unsigned i) { w <<= i; return w; }
+  inline unsigned operator >>= (unsigned i) { w >>= i; return w; }
+  inline unsigned operator  += (unsigned i) { w  += i; return w; }
+  inline unsigned operator  -= (unsigned i) { w  -= i; return w; }
+  inline unsigned operator  *= (unsigned i) { w  *= i; return w; }
+  inline unsigned operator  /= (unsigned i) { w  /= i; return w; }
+  inline unsigned operator  %= (unsigned i) { w  %= i; return w; }
 
   CPUReg16() : w(0) {}
 };
@@ -48,17 +61,17 @@ public:
   };
 
   inline operator unsigned() const { return d; }
-  template<typename T> inline unsigned operator   = (const T i) { d = uclip<24>(i);      return d; }
-  template<typename T> inline unsigned operator  |= (const T i) { d = uclip<24>(d  | i); return d; }
-  template<typename T> inline unsigned operator  ^= (const T i) { d = uclip<24>(d  ^ i); return d; }
-  template<typename T> inline unsigned operator  &= (const T i) { d = uclip<24>(d  & i); return d; }
-  template<typename T> inline unsigned operator <<= (const T i) { d = uclip<24>(d << i); return d; }
-  template<typename T> inline unsigned operator >>= (const T i) { d = uclip<24>(d >> i); return d; }
-  template<typename T> inline unsigned operator  += (const T i) { d = uclip<24>(d  + i); return d; }
-  template<typename T> inline unsigned operator  -= (const T i) { d = uclip<24>(d  - i); return d; }
-  template<typename T> inline unsigned operator  *= (const T i) { d = uclip<24>(d  * i); return d; }
-  template<typename T> inline unsigned operator  /= (const T i) { d = uclip<24>(d  / i); return d; }
-  template<typename T> inline unsigned operator  %= (const T i) { d = uclip<24>(d  % i); return d; }
+  inline unsigned operator   = (unsigned i) { d = uclip<24>(i);      return d; }
+  inline unsigned operator  |= (unsigned i) { d = uclip<24>(d  | i); return d; }
+  inline unsigned operator  ^= (unsigned i) { d = uclip<24>(d  ^ i); return d; }
+  inline unsigned operator  &= (unsigned i) { d = uclip<24>(d  & i); return d; }
+  inline unsigned operator <<= (unsigned i) { d = uclip<24>(d << i); return d; }
+  inline unsigned operator >>= (unsigned i) { d = uclip<24>(d >> i); return d; }
+  inline unsigned operator  += (unsigned i) { d = uclip<24>(d  + i); return d; }
+  inline unsigned operator  -= (unsigned i) { d = uclip<24>(d  - i); return d; }
+  inline unsigned operator  *= (unsigned i) { d = uclip<24>(d  * i); return d; }
+  inline unsigned operator  /= (unsigned i) { d = uclip<24>(d  / i); return d; }
+  inline unsigned operator  %= (unsigned i) { d = uclip<24>(d  % i); return d; }
 
   CPUReg24() : d(0) {}
 };
@@ -70,6 +83,6 @@ public:
   CPURegFlags p;
   uint8 db;
   uint8 mdr;
-  bool  e;
-  CPURegs() : db(0), mdr(0x00), e(false) {}
+  bool e;
+  CPURegs() : db(0), mdr(0), e(false) {}
 };

src/cpu/scpu/core/opfn.cpp

@@ -2,210 +2,204 @@
 
 //op_read
 inline void sCPU::op_adc_b() {
-int32 r = regs.a.l + rd.l + regs.p.c;
+  int r;
   if(regs.p.d) {
-  uint8 n0 = (regs.a.l     ) & 15;
-  uint8 n1 = (regs.a.l >> 4) & 15;
-    n0 += ((rd.l) & 15) + regs.p.c;
+    uint8 n0 = (regs.a.l     ) & 15;
+    uint8 n1 = (regs.a.l >> 4) & 15;
+    n0 += (rd.l & 15) + regs.p.c;
     if(n0 > 9) {
-      n0 -= 10;
-      n0 &= 15;
+      n0 = (n0 - 10) & 15;
       n1++;
     }
     n1 += ((rd.l >> 4) & 15);
     if(n1 > 9) {
-      n1 -= 10;
-      n1 &= 15;
+      n1 = (n1 - 10) & 15;
       regs.p.c = 1;
     } else {
       regs.p.c = 0;
     }
-    r = (n1 << 4) | (n0);
+    r = (n1 << 4) | n0;
   } else {
     r = regs.a.l + rd.l + regs.p.c;
-    regs.p.c = (r > 0xff);
+    regs.p.c = r > 0xff;
   }
-  regs.p.n = !!(r & 0x80);
-  regs.p.v = !!(~(regs.a.l ^ rd.l) & (regs.a.l ^ r) & 0x80);
-  regs.p.z = ((uint8)r == 0);
+  regs.p.n = r & 0x80;
+  regs.p.v = ~(regs.a.l ^ rd.l) & (regs.a.l ^ r) & 0x80;
+  regs.p.z = (uint8)r == 0;
   regs.a.l = r;
 }
 
 inline void sCPU::op_adc_w() {
-int32 r;
+  int r;
   if(regs.p.d) {
-  uint8 n0 = (regs.a.w      ) & 15;
-  uint8 n1 = (regs.a.w >>  4) & 15;
-  uint8 n2 = (regs.a.w >>  8) & 15;
-  uint8 n3 = (regs.a.w >> 12) & 15;
-    n0 += ((rd.w) & 15) + regs.p.c;
+    uint8 n0 = (regs.a.w      ) & 15;
+    uint8 n1 = (regs.a.w >>  4) & 15;
+    uint8 n2 = (regs.a.w >>  8) & 15;
+    uint8 n3 = (regs.a.w >> 12) & 15;
+    n0 += (rd.w & 15) + regs.p.c;
     if(n0 > 9) {
-      n0 -= 10;
-      n0 &= 15;
+      n0 = (n0 - 10) & 15;
       n1++;
     }
     n1 += ((rd.w >> 4) & 15);
     if(n1 > 9) {
-      n1 -= 10;
-      n1 &= 15;
+      n1 = (n1 - 10) & 15;
       n2++;
     }
     n2 += ((rd.w >> 8) & 15);
     if(n2 > 9) {
-      n2 -= 10;
-      n2 &= 15;
+      n2 = (n2 - 10) & 15;
       n3++;
     }
     n3 += ((rd.w >> 12) & 15);
     if(n3 > 9) {
-      n3 -= 10;
-      n3 &= 15;
+      n3 = (n3 - 10) & 15;
       regs.p.c = 1;
     } else {
       regs.p.c = 0;
     }
-    r = (n3 << 12) | (n2 << 8) | (n1 << 4) | (n0);
+    r = (n3 << 12) | (n2 << 8) | (n1 << 4) | n0;
   } else {
     r = regs.a.w + rd.w + regs.p.c;
-    regs.p.c = (r > 0xffff);
+    regs.p.c = r > 0xffff;
   }
-  regs.p.n = !!(r & 0x8000);
-  regs.p.v = !!(~(regs.a.w ^ rd.w) & (regs.a.w ^ r) & 0x8000);
-  regs.p.z = ((uint16)r == 0);
+  regs.p.n = r & 0x8000;
+  regs.p.v = ~(regs.a.w ^ rd.w) & (regs.a.w ^ r) & 0x8000;
+  regs.p.z = (uint16)r == 0;
   regs.a.w = r;
 }
 
 inline void sCPU::op_and_b() {
   regs.a.l &= rd.l;
-  regs.p.n = !!(regs.a.l & 0x80);
-  regs.p.z = (regs.a.l == 0);
+  regs.p.n = regs.a.l & 0x80;
+  regs.p.z = regs.a.l == 0;
 }
 
 inline void sCPU::op_and_w() {
   regs.a.w &= rd.w;
-  regs.p.n = !!(regs.a.w & 0x8000);
-  regs.p.z = (regs.a.w == 0);
+  regs.p.n = regs.a.w & 0x8000;
+  regs.p.z = regs.a.w == 0;
 }
 
 inline void sCPU::op_bit_b() {
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.v = !!(rd.l & 0x40);
-  regs.p.z = ((rd.l & regs.a.l) == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.v = rd.l & 0x40;
+  regs.p.z = (rd.l & regs.a.l) == 0;
 }
 
 inline void sCPU::op_bit_w() {
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.v = !!(rd.w & 0x4000);
-  regs.p.z = ((rd.w & regs.a.w) == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.v = rd.w & 0x4000;
+  regs.p.z = (rd.w & regs.a.w) == 0;
 }
 
 inline void sCPU::op_cmp_b() {
-int32 r = regs.a.l - rd.l;
-  regs.p.n = !!(r & 0x80);
-  regs.p.z = ((uint8)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.a.l - rd.l;
+  regs.p.n = r & 0x80;
+  regs.p.z = (uint8)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_cmp_w() {
-int32 r = regs.a.w - rd.w;
-  regs.p.n = !!(r & 0x8000);
-  regs.p.z = ((uint16)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.a.w - rd.w;
+  regs.p.n = r & 0x8000;
+  regs.p.z = (uint16)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_cpx_b() {
-int32 r = regs.x.l - rd.l;
-  regs.p.n = !!(r & 0x80);
-  regs.p.z = ((uint8)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.x.l - rd.l;
+  regs.p.n = r & 0x80;
+  regs.p.z = (uint8)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_cpx_w() {
-int32 r = regs.x.w - rd.w;
-  regs.p.n = !!(r & 0x8000);
-  regs.p.z = ((uint16)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.x.w - rd.w;
+  regs.p.n = r & 0x8000;
+  regs.p.z = (uint16)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_cpy_b() {
-int32 r = regs.y.l - rd.l;
-  regs.p.n = !!(r & 0x80);
-  regs.p.z = ((uint8)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.y.l - rd.l;
+  regs.p.n = r & 0x80;
+  regs.p.z = (uint8)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_cpy_w() {
-int32 r = regs.y.w - rd.w;
-  regs.p.n = !!(r & 0x8000);
-  regs.p.z = ((uint16)r == 0);
-  regs.p.c = (r >= 0);
+  int r = regs.y.w - rd.w;
+  regs.p.n = r & 0x8000;
+  regs.p.z = (uint16)r == 0;
+  regs.p.c = r >= 0;
 }
 
 inline void sCPU::op_eor_b() {
   regs.a.l ^= rd.l;
-  regs.p.n = !!(regs.a.l & 0x80);
-  regs.p.z = (regs.a.l == 0);
+  regs.p.n = regs.a.l & 0x80;
+  regs.p.z = regs.a.l == 0;
 }
 
 inline void sCPU::op_eor_w() {
   regs.a.w ^= rd.w;
-  regs.p.n = !!(regs.a.w & 0x8000);
-  regs.p.z = (regs.a.w == 0);
+  regs.p.n = regs.a.w & 0x8000;
+  regs.p.z = regs.a.w == 0;
 }
 
 inline void sCPU::op_lda_b() {
   regs.a.l = rd.l;
-  regs.p.n = !!(regs.a.l & 0x80);
-  regs.p.z = (regs.a.l == 0);
+  regs.p.n = regs.a.l & 0x80;
+  regs.p.z = regs.a.l == 0;
 }
 
 inline void sCPU::op_lda_w() {
   regs.a.w = rd.w;
-  regs.p.n = !!(regs.a.w & 0x8000);
-  regs.p.z = (regs.a.w == 0);
+  regs.p.n = regs.a.w & 0x8000;
+  regs.p.z = regs.a.w == 0;
 }
 
 inline void sCPU::op_ldx_b() {
   regs.x.l = rd.l;
-  regs.p.n = !!(regs.x.l & 0x80);
-  regs.p.z = (regs.x.l == 0);
+  regs.p.n = regs.x.l & 0x80;
+  regs.p.z = regs.x.l == 0;
 }
 
 inline void sCPU::op_ldx_w() {
   regs.x.w = rd.w;
-  regs.p.n = !!(regs.x.w & 0x8000);
-  regs.p.z = (regs.x.w == 0);
+  regs.p.n = regs.x.w & 0x8000;
+  regs.p.z = regs.x.w == 0;
 }
 
 inline void sCPU::op_ldy_b() {
   regs.y.l = rd.l;
-  regs.p.n = !!(regs.y.l & 0x80);
-  regs.p.z = (regs.y.l == 0);
+  regs.p.n = regs.y.l & 0x80;
+  regs.p.z = regs.y.l == 0;
 }
 
 inline void sCPU::op_ldy_w() {
   regs.y.w = rd.w;
-  regs.p.n = !!(regs.y.w & 0x8000);
-  regs.p.z = (regs.y.w == 0);
+  regs.p.n = regs.y.w & 0x8000;
+  regs.p.z = regs.y.w == 0;
 }
 
 inline void sCPU::op_ora_b() {
   regs.a.l |= rd.l;
-  regs.p.n = !!(regs.a.l & 0x80);
-  regs.p.z = (regs.a.l == 0);
+  regs.p.n = regs.a.l & 0x80;
+  regs.p.z = regs.a.l == 0;
 }
 
 inline void sCPU::op_ora_w() {
   regs.a.w |= rd.w;
-  regs.p.n = !!(regs.a.w & 0x8000);
-  regs.p.z = (regs.a.w == 0);
+  regs.p.n = regs.a.w & 0x8000;
+  regs.p.z = regs.a.w == 0;
 }
 
 inline void sCPU::op_sbc_b() {
-int32 r;
+  int r;
   if(regs.p.d) {
-  uint8 n0 = (regs.a.l     ) & 15;
-  uint8 n1 = (regs.a.l >> 4) & 15;
+    uint8 n0 = (regs.a.l     ) & 15;
+    uint8 n1 = (regs.a.l >> 4) & 15;
     n0 -= ((rd.l     ) & 15) + !regs.p.c;
     n1 -= ((rd.l >> 4) & 15);
     if(n0 > 9) {
@@ -221,21 +215,21 @@ int32 r;
     r = (n1 << 4) | (n0);
   } else {
     r = regs.a.l - rd.l - !regs.p.c;
-    regs.p.c = (r >= 0);
+    regs.p.c = r >= 0;
   }
-  regs.p.n = !!(r & 0x80);
-  regs.p.v = !!((regs.a.l ^ rd.l) & (regs.a.l ^ r) & 0x80);
-  regs.p.z = ((uint8)r == 0);
+  regs.p.n = r & 0x80;
+  regs.p.v = (regs.a.l ^ rd.l) & (regs.a.l ^ r) & 0x80;
+  regs.p.z = (uint8)r == 0;
   regs.a.l = r;
 }
 
 inline void sCPU::op_sbc_w() {
-int32 r;
+  int r;
   if(regs.p.d) {
-  uint8 n0 = (regs.a.w      ) & 15;
-  uint8 n1 = (regs.a.w >>  4) & 15;
-  uint8 n2 = (regs.a.w >>  8) & 15;
-  uint8 n3 = (regs.a.w >> 12) & 15;
+    uint8 n0 = (regs.a.w      ) & 15;
+    uint8 n1 = (regs.a.w >>  4) & 15;
+    uint8 n2 = (regs.a.w >>  8) & 15;
+    uint8 n3 = (regs.a.w >> 12) & 15;
     n0 -= ((rd.w      ) & 15) + !regs.p.c;
     n1 -= ((rd.w >>  4) & 15);
     n2 -= ((rd.w >>  8) & 15);
@@ -261,116 +255,116 @@ int32 r;
     r = (n3 << 12) | (n2 << 8) | (n1 << 4) | (n0);
   } else {
     r = regs.a.w - rd.w - !regs.p.c;
-    regs.p.c = (r >= 0);
+    regs.p.c = r >= 0;
   }
-  regs.p.n = !!(r & 0x8000);
-  regs.p.v = !!((regs.a.w ^ rd.w) & (regs.a.w ^ r) & 0x8000);
-  regs.p.z = ((uint16)r == 0);
+  regs.p.n = r & 0x8000;
+  regs.p.v = (regs.a.w ^ rd.w) & (regs.a.w ^ r) & 0x8000;
+  regs.p.z = (uint16)r == 0;
   regs.a.w = r;
 }
 
 //op_rmw
 inline void sCPU::op_inc_b() {
   rd.l++;
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_inc_w() {
   rd.w++;
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_dec_b() {
   rd.l--;
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_dec_w() {
   rd.w--;
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_asl_b() {
-  regs.p.c = !!(rd.l & 0x80);
+  regs.p.c = rd.l & 0x80;
   rd.l <<= 1;
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_asl_w() {
-  regs.p.c = !!(rd.w & 0x8000);
+  regs.p.c = rd.w & 0x8000;
   rd.w <<= 1;
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_lsr_b() {
   regs.p.c = rd.l & 1;
   rd.l >>= 1;
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_lsr_w() {
   regs.p.c = rd.w & 1;
   rd.w >>= 1;
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_rol_b() {
-uint16 carry = (uint16)regs.p.c;
-  regs.p.c = !!(rd.l & 0x80);
+  unsigned carry = (unsigned)regs.p.c;
+  regs.p.c = rd.l & 0x80;
   rd.l = (rd.l << 1) | carry;
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_rol_w() {
-uint16 carry = (uint16)regs.p.c;
-  regs.p.c = !!(rd.w & 0x8000);
+  unsigned carry = (unsigned)regs.p.c;
+  regs.p.c = rd.w & 0x8000;
   rd.w = (rd.w << 1) | carry;
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_ror_b() {
-uint16 carry = (uint16)regs.p.c << 7;
+  unsigned carry = (unsigned)regs.p.c << 7;
   regs.p.c = rd.l & 1;
   rd.l = carry | (rd.l >> 1);
-  regs.p.n = !!(rd.l & 0x80);
-  regs.p.z = (rd.l == 0);
+  regs.p.n = rd.l & 0x80;
+  regs.p.z = rd.l == 0;
 }
 
 inline void sCPU::op_ror_w() {
-uint16 carry = (uint16)regs.p.c << 15;
+  unsigned carry = (unsigned)regs.p.c << 15;
   regs.p.c = rd.w & 1;
   rd.w = carry | (rd.w >> 1);
-  regs.p.n = !!(rd.w & 0x8000);
-  regs.p.z = (rd.w == 0);
+  regs.p.n = rd.w & 0x8000;
+  regs.p.z = rd.w == 0;
 }
 
 inline void sCPU::op_trb_b() {
-  regs.p.z = ((rd.l & regs.a.l) == 0);
+  regs.p.z = (rd.l & regs.a.l) == 0;
   rd.l &= ~regs.a.l;
 }
 
 inline void sCPU::op_trb_w() {
-  regs.p.z = ((rd.w & regs.a.w) == 0);
+  regs.p.z = (rd.w & regs.a.w) == 0;
   rd.w &= ~regs.a.w;
 }
 
 inline void sCPU::op_tsb_b() {
-  regs.p.z = ((rd.l & regs.a.l) == 0);
+  regs.p.z = (rd.l & regs.a.l) == 0;
   rd.l |= regs.a.l;
 }
 
 inline void sCPU::op_tsb_w() {
-  regs.p.z = ((rd.w & regs.a.w) == 0);
+  regs.p.z = (rd.w & regs.a.w) == 0;
   rd.w |= regs.a.w;
 }
 

src/cpu/scpu/dma/dma.cpp

@@ -5,52 +5,51 @@ void sCPU::dma_add_clocks(uint clocks) {
   add_clocks(clocks);
 }
 
-/*****
- * used by both DMA and HDMA
- *
- * DMA address bus A cannot read from or write to the following addresses :
- * $[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 are also illegal
- *****/
+bool sCPU::dma_addr_valid(uint32 abus) {
+  //reads from B-bus or S-CPU registers are invalid
+  if((abus & 0x40ff00) == 0x2100) return false; //$[00-3f|80-bf]:[2100-21ff]
+  if((abus & 0x40fe00) == 0x4000) return false; //$[00-3f|80-bf]:[4000-41ff]
+  if((abus & 0x40ffe0) == 0x4200) return false; //$[00-3f|80-bf]:[4200-421f]
+  if((abus & 0x40ff80) == 0x4300) return false; //$[00-3f|80-bf]:[4300-437f]
+  return true;
+}
+
+uint8 sCPU::dma_read(uint32 abus) {
+  if(dma_addr_valid(abus) == false) return 0x00; //does not return S-CPU MDR
+  return bus.read(abus);
+}
 
 void sCPU::dma_transfer(bool direction, uint8 bbus, uint32 abus) {
   if(direction == 0) {
     //a->b transfer (to $21xx)
     if(bbus == 0x80 && ((abus & 0xfe0000) == 0x7e0000 || (abus & 0x40e000) == 0x0000)) {
-      //illegal WRAM->WRAM transfer
+      //illegal WRAM->WRAM transfer (bus conflict)
       //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
+      //read is irrelevent, as it cannot be observed by software
+      dma_add_clocks(8);
     } else {
-      //valid transfer
-      bus.write(0x2100 | bbus, bus.read(abus));
+      dma_add_clocks(4);
+      uint8 data = dma_read(abus);
+      dma_add_clocks(4);
+      bus.write(0x2100 | bbus, data);
     }
   } else {
     //b->a transfer (from $21xx)
     if(bbus == 0x80 && ((abus & 0xfe0000) == 0x7e0000 || (abus & 0x40e000) == 0x0000)) {
-      //illegal WRAM->WRAM transfer
+      //illegal WRAM->WRAM transfer (bus conflict)
       //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
+      dma_add_clocks(8);
+      bus.write(abus, 0x00); //does not write S-CPU MDR
     } else {
-      //valid transfer
-      bus.write(abus, bus.read(0x2100 | bbus));
+      dma_add_clocks(4);
+      uint8 data = bus.read(0x2100 | bbus);
+      dma_add_clocks(4);
+      if(dma_addr_valid(abus) == true) {
+        bus.write(abus, data);
+      }
     }
   }
 
-  //each byte *always* consumes 8 clocks, even if transfer is invalid and no read and/or write occurs
-  dma_add_clocks(8);
   cycle_edge();
 }
 
@@ -120,10 +119,22 @@ inline void sCPU::dma_write(uint8 i, uint8 index) {
   }
 }
 
+uint8 sCPU::dma_enabled_channels() {
+  uint8 r = 0;
+  for(unsigned i = 0; i < 8; i++) {
+    if(channel[i].dma_enabled) r++;
+  }
+  return r;
+}
+
 void sCPU::dma_run() {
-  for(int i = 0; i < 8; i++) {
+  dma_add_clocks(8);
+  cycle_edge();
+
+  for(unsigned i = 0; i < 8; i++) {
     if(channel[i].dma_enabled == false) continue;
     dma_add_clocks(8);
+    cycle_edge();
 
     if(cartridge.info.sdd1 == true) {
       sdd1.dma_begin(i, (channel[i].srcbank << 16) | (channel[i].srcaddr), channel[i].xfersize);
@@ -138,7 +149,7 @@ void sCPU::dma_run() {
         channel[i].xfersize, channel[i].xfersize ? channel[i].xfersize : 65536);
     }
 
-    uint index = 0;
+    unsigned index = 0;
     do {
       dma_write(i, dma_bbus(i, index++));
     } while(channel[i].dma_enabled && channel[i].xfersize);
@@ -158,7 +169,7 @@ inline bool sCPU::hdma_active(uint8 i) {
 }
 
 inline bool sCPU::hdma_active_after(uint8 i) {
-  for(int n = i + 1; n < 8; n++) {
+  for(unsigned n = i + 1; n < 8; n++) {
     if(hdma_active(n) == true) return true;
   }
   return false;
@@ -166,7 +177,7 @@ inline bool sCPU::hdma_active_after(uint8 i) {
 
 inline uint8 sCPU::hdma_enabled_channels() {
   uint8 r = 0;
-  for(int i = 0; i < 8; i++) {
+  for(unsigned i = 0; i < 8; i++) {
     if(channel[i].hdma_enabled) r++;
   }
   return r;
@@ -174,55 +185,57 @@ inline uint8 sCPU::hdma_enabled_channels() {
 
 inline uint8 sCPU::hdma_active_channels() {
   uint8 r = 0;
-  for(int i = 0; i < 8; i++) {
+  for(unsigned i = 0; i < 8; i++) {
     if(hdma_active(i) == true) r++;
   }
   return r;
 }
 
 void sCPU::hdma_update(uint8 i) {
-  channel[i].hdma_line_counter = bus.read(hdma_addr(i));
+  channel[i].hdma_line_counter = dma_read(hdma_addr(i));
   dma_add_clocks(8);
 
   channel[i].hdma_completed   = (channel[i].hdma_line_counter == 0);
   channel[i].hdma_do_transfer = !channel[i].hdma_completed;
 
   if(channel[i].hdma_indirect) {
-    channel[i].hdma_iaddr = bus.read(hdma_addr(i)) << 8;
+    channel[i].hdma_iaddr = dma_read(hdma_addr(i)) << 8;
     dma_add_clocks(8);
 
     if(!channel[i].hdma_completed || hdma_active_after(i)) {
       channel[i].hdma_iaddr >>= 8;
-      channel[i].hdma_iaddr  |= bus.read(hdma_addr(i)) << 8;
+      channel[i].hdma_iaddr  |= dma_read(hdma_addr(i)) << 8;
       dma_add_clocks(8);
     }
   }
 }
 
 void sCPU::hdma_run() {
-  static uint8 hdma_xferlen[8] = { 1, 2, 2, 4, 4, 4, 2, 4 };
-  for(int i = 0; i < 8; i++) {
+  dma_add_clocks(8);
+
+  for(unsigned i = 0; i < 8; i++) {
     if(hdma_active(i) == false) continue;
     channel[i].dma_enabled = false; //HDMA run during DMA will stop DMA mid-transfer
-    dma_add_clocks(8);
 
     if(channel[i].hdma_do_transfer) {
-      int xferlen = hdma_xferlen[channel[i].xfermode];
-      for(int index = 0; index < xferlen; index++) {
-        if(bool(config::cpu.hdma_enable) == true) {
-          dma_transfer(channel[i].direction, dma_bbus(i, index),
-            !channel[i].hdma_indirect ? hdma_addr(i) : hdma_iaddr(i));
-        } else {
-          dma_add_clocks(8);
-          cycle_edge();
-        }
+      static const unsigned transfer_length[8] = { 1, 2, 2, 4, 4, 4, 2, 4 };
+      unsigned length = transfer_length[channel[i].xfermode];
+      for(unsigned index = 0; index < length; index++) {
+        unsigned addr = !channel[i].hdma_indirect ? hdma_addr(i) : hdma_iaddr(i);
+        dma_transfer(channel[i].direction, dma_bbus(i, index), addr);
       }
     }
+  }
+
+  for(unsigned i = 0; i < 8; i++) {
+    if(hdma_active(i) == false) continue;
 
     channel[i].hdma_line_counter--;
     channel[i].hdma_do_transfer = bool(channel[i].hdma_line_counter & 0x80);
     if((channel[i].hdma_line_counter & 0x7f) == 0) {
       hdma_update(i);
+    } else {
+      dma_add_clocks(8);
     }
   }
 
@@ -230,15 +243,17 @@ void sCPU::hdma_run() {
 }
 
 void sCPU::hdma_init_reset() {
-  for(int i = 0; i < 8; i++) {
+  for(unsigned i = 0; i < 8; i++) {
     channel[i].hdma_completed   = false;
     channel[i].hdma_do_transfer = false;
   }
 }
 
 void sCPU::hdma_init() {
-  for(int i = 0; i < 8; i++) {
-    if(!channel[i].hdma_enabled)continue;
+  dma_add_clocks(8);
+
+  for(unsigned i = 0; i < 8; i++) {
+    if(!channel[i].hdma_enabled) continue;
     channel[i].dma_enabled = false; //HDMA init during DMA will stop DMA mid-transfer
 
     channel[i].hdma_addr = channel[i].srcaddr;
@@ -253,7 +268,7 @@ void sCPU::hdma_init() {
  *****/
 
 void sCPU::dma_power() {
-  for(int i = 0; i < 8; i++) {
+  for(unsigned i = 0; i < 8; i++) {
     channel[i].dmap              = 0xff;
     channel[i].direction         = 1;
     channel[i].hdma_indirect     = true;
@@ -277,7 +292,7 @@ void sCPU::dma_power() {
 }
 
 void sCPU::dma_reset() {
-  for(int i = 0; i < 8; i++) {
+  for(unsigned i = 0; i < 8; i++) {
     channel[i].dma_enabled       = false;
     channel[i].hdma_enabled      = false;
 

src/cpu/scpu/dma/dma.h

@@ -46,6 +46,8 @@
   } channel[8];
 
   void dma_add_clocks(uint clocks);
+  bool dma_addr_valid(uint32 abus);
+  uint8 dma_read(uint32 abus);
   void dma_transfer(bool direction, uint8 bbus, uint32 abus);
 
   uint8 dma_bbus(uint8 i, uint8 index);
@@ -56,6 +58,7 @@
   void dma_transfertobusb(uint8 i, uint8 bbus);
   void dma_transfertobusa(uint8 i, uint8 bbus);
   void dma_write(uint8 i, uint8 index);
+  uint8 dma_enabled_channels();
   void dma_run();
 
   bool hdma_active(uint8 i);

src/cpu/scpu/mmio/mmio.cpp

@@ -1,8 +1,7 @@
 #ifdef SCPU_CPP
 
-uint8 sCPU::pio_status() {
-  return status.pio;
-}
+uint8 sCPU::pio() { return status.pio; }
+bool sCPU::joylatch() { return status.joypad_strobe_latch; }
 
 //WMDATA
 uint8 sCPU::mmio_r2180() {
@@ -55,7 +54,7 @@ void sCPU::mmio_w4016(uint8 data) {
 //realtime or buffered status of joypadN.b
 uint8 sCPU::mmio_r4016() {
   uint8 r = regs.mdr & 0xfc;
-  r |= (uint8)snes.input.port_read(0);
+  r |= snes.input.port_read(0) & 3;
   return r;
 }
 
@@ -65,7 +64,7 @@ uint8 sCPU::mmio_r4016() {
 //1-0 = Joypad serial data
 uint8 sCPU::mmio_r4017() {
   uint8 r = (regs.mdr & 0xe0) | 0x1c;
-  r |= (uint8)snes.input.port_read(1);
+  r |= snes.input.port_read(1) & 3;
   return r;
 }
 
@@ -143,19 +142,16 @@ void sCPU::mmio_w420a(uint8 data) {
 
 //DMAEN
 void sCPU::mmio_w420b(uint8 data) {
-  for(int i = 0; i < 8; i++) {
-    channel[i].dma_enabled  = !!(data & (1 << i));
-  }
-  if(data) {
-    status.dma_state = DMASTATE_DMASYNC;
-    status.dma_pending = true;
+  for(unsigned i = 0; i < 8; i++) {
+    channel[i].dma_enabled = data & (1 << i);
   }
+  if(data) status.dma_pending = true;
 }
 
 //HDMAEN
 void sCPU::mmio_w420c(uint8 data) {
-  for(int i = 0; i < 8; i++) {
-    channel[i].hdma_enabled = !!(data & (1 << i));
+  for(unsigned i = 0; i < 8; i++) {
+    channel[i].hdma_enabled = data & (1 << i);
   }
 }
 

src/cpu/scpu/mmio/mmio.h

@@ -3,7 +3,8 @@
   uint8 mmio_read(uint addr);
   void mmio_write(uint addr, uint8 data);
 
-  uint8 pio_status();
+  uint8 pio();
+  bool joylatch();
 
   uint8 mmio_r2180();
   uint8 mmio_r4016();

src/cpu/scpu/scpu.h

@@ -15,13 +15,13 @@ public:
   } event;
 
   struct {
-    uint   nmi_hold;
-    uint   irq_hold;
+    unsigned nmi_hold;
+    unsigned irq_hold;
 
-    uint   nmi_fire;
-    uint   irq_fire;
-    uint   irq_delay;
-    uint   hw_math;
+    unsigned nmi_fire;
+    unsigned irq_fire;
+    unsigned irq_delay;
+    unsigned hw_math;
 
     alwaysinline void set(uint &ctr, uint clocks) {
       if(clocks >= ctr) { ctr = clocks; }
@@ -36,55 +36,50 @@ public:
     }
   } counter;
 
-  enum {
-    DMASTATE_INACTIVE,
-    DMASTATE_DMASYNC,
-    DMASTATE_RUN,
-    DMASTATE_CPUSYNC,
-  };
+  enum DMA_State { DMA_Inactive, DMA_Run, DMA_CPUsync };
 
   struct {
     //core
-    uint8  opcode;
-    bool   in_opcode;
+    uint8 opcode;
+    bool in_opcode;
 
-    uint   clock_count;
+    unsigned clock_count;
 
     //timing
     uint16 vcounter, hcounter;
     uint16 field_lines, line_clocks;
 
-    bool   line_rendered;
+    bool line_rendered;
     uint16 line_render_position;
 
-    bool   dram_refreshed;
+    bool dram_refreshed;
     uint16 dram_refresh_position;
 
-    bool   hdmainit_triggered;
+    bool hdmainit_triggered;
     uint16 hdmainit_trigger_position;
 
-    bool   hdma_triggered;
+    bool hdma_triggered;
 
     uint16 irq_delay;
 
-    bool   nmi_valid;
-    bool   nmi_line;
-    bool   nmi_transition;
-    bool   nmi_pending;
+    bool nmi_valid;
+    bool nmi_line;
+    bool nmi_transition;
+    bool nmi_pending;
 
     uint16 virq_trigger_pos, hirq_trigger_pos;
-    bool   irq_valid;
-    bool   irq_line;
-    bool   irq_transition;
-    bool   irq_pending;
+    bool irq_valid;
+    bool irq_line;
+    bool irq_transition;
+    bool irq_pending;
 
     //dma
-    uint   dma_counter;
-    uint   dma_clocks;
-    uint   dma_state;
-    bool   dma_pending;
-    bool   hdma_pending;
-    bool   hdmainit_pending;
+    unsigned dma_counter;
+    unsigned dma_clocks;
+    bool dma_pending;
+    bool hdma_pending;
+    bool hdma_mode; //0 = init, 1 = run
+    DMA_State dma_state;
 
     //mmio
 
@@ -92,20 +87,20 @@ public:
     uint32 wram_addr;
 
     //$4016-$4017
-    bool   joypad_strobe_latch;
+    bool joypad_strobe_latch;
     uint32 joypad1_bits;
     uint32 joypad2_bits;
 
     //$4200
-    bool   nmi_enabled;
-    bool   hirq_enabled, virq_enabled;
-    bool   auto_joypad_poll;
+    bool nmi_enabled;
+    bool hirq_enabled, virq_enabled;
+    bool auto_joypad_poll;
 
     //$4201
-    uint8  pio;
+    uint8 pio;
 
     //$4202-$4203
-    uint8  mul_a, mul_b;
+    uint8 mul_a, mul_b;
 
     //$4204-$4206
     uint16 div_a;
@@ -119,10 +114,10 @@ public:
     uint16 r4216;
 
     //$4218-$421f
-    uint8  joy1l, joy1h;
-    uint8  joy2l, joy2h;
-    uint8  joy3l, joy3h;
-    uint8  joy4l, joy4h;
+    uint8 joy1l, joy1h;
+    uint8 joy2l, joy2h;
+    uint8 joy3l, joy3h;
+    uint8 joy4l, joy4h;
   } status;
 
   void power();

src/cpu/scpu/timing/joypad.cpp

@@ -1,10 +1,15 @@
 #ifdef SCPU_CPP
 
 void sCPU::run_auto_joypad_poll() {
-  uint16_t joy1 = 0, joy2 = 0;
+  uint16 joy1 = 0, joy2 = 0, joy3 = 0, joy4 = 0;
   for(unsigned i = 0; i < 16; i++) {
-    joy1 |= (uint16_t)snes.input.port_read(0) ? (0x8000 >> i) : 0;
-    joy2 |= (uint16_t)snes.input.port_read(1) ? (0x8000 >> i) : 0;
+    uint8 port0 = snes.input.port_read(0);
+    uint8 port1 = snes.input.port_read(1);
+
+    joy1 |= (port0 & 1) ? (0x8000 >> i) : 0;
+    joy2 |= (port1 & 1) ? (0x8000 >> i) : 0;
+    joy3 |= (port0 & 2) ? (0x8000 >> i) : 0;
+    joy4 |= (port1 & 2) ? (0x8000 >> i) : 0;
   }
 
   status.joy1l = joy1;
@@ -13,11 +18,11 @@ void sCPU::run_auto_joypad_poll() {
   status.joy2l = joy2;
   status.joy2h = joy2 >> 8;
 
-  status.joy3l = 0x00;
-  status.joy3h = 0x00;
+  status.joy3l = joy3;
+  status.joy3h = joy3 >> 8;
 
-  status.joy4l = 0x00;
-  status.joy4h = 0x00;
+  status.joy4l = joy4;
+  status.joy4h = joy4 >> 8;
 }
 
 #endif //ifdef SCPU_CPP

src/cpu/scpu/timing/timing.cpp

@@ -1,9 +1,4 @@
 #ifdef SCPU_CPP
-
-#define ntsc_color_burst_phase_shift_scanline() ( \
-  snes.region() == SNES::NTSC && status.vcounter == 240 && \
-  ppu.interlace() == false && ppu.field() == 1 \
-)
 
 #include "irq.cpp"
 #include "joypad.cpp"
@@ -22,6 +17,12 @@ uint sCPU::dma_counter() { return (status.dma_counter + status.hcounter) & 7; }
  * Dot 323 range = { 1292, 1294, 1296 }
  * Dot 327 range = { 1310, 1312, 1314 }
  *****/
+
+#define ntsc_color_burst_phase_shift_scanline() ( \
+  snes.region() == SNES::NTSC && status.vcounter == 240 && \
+  ppu.interlace() == false && ppu.field() == 1 \
+)
+
 uint16 sCPU::hdot() {
   if(ntsc_color_burst_phase_shift_scanline() == true) return (status.hcounter >> 2);
   return (status.hcounter - ((status.hcounter > 1292) << 1) - ((status.hcounter > 1310) << 1)) >> 2;
@@ -55,15 +56,7 @@ void sCPU::scanline() {
 
   //dram refresh occurs once every scanline
   status.dram_refreshed = false;
-  if(cpu_version == 2) {
-    if(ntsc_color_burst_phase_shift_scanline() == false) {
-      if(status.dram_refresh_position == 534) {
-        status.dram_refresh_position = 538;
-      } else {
-        status.dram_refresh_position = 534;
-      }
-    }
-  }
+  if(cpu_version == 2) status.dram_refresh_position = 530 + 8 - dma_counter();
 
   //hdma triggers once every visible scanline
   status.line_rendered  = false;
@@ -86,8 +79,7 @@ void sCPU::frame() {
 
   status.vcounter = 0;
   status.field_lines = (snes.region() == SNES::NTSC ? 525 : 625) >> 1;
-  //interlaced even fields have one extra scanline
-  //(263+262=525 NTSC, 313+312=625 PAL)
+  //interlaced even fields have one extra scanline (263+262=525 NTSC, 313+312=625 PAL)
   if(ppu.interlace() == true && ppu.field() == 0) status.field_lines++;
 
   status.hdmainit_triggered = false;
@@ -101,20 +93,19 @@ void sCPU::frame() {
 /*****
  * precycle_edge()
  *
- * Used for DMA/HDMA bus synchronization
+ * Used for H/DMA bus synchronization
  *****/
-alwaysinline void sCPU::precycle_edge() {
-  if(status.dma_state == DMASTATE_CPUSYNC) {
-    status.dma_state = DMASTATE_INACTIVE;
-    uint n = status.clock_count - (status.dma_clocks % status.clock_count);
-    add_clocks(n ? n : status.clock_count);
+void sCPU::precycle_edge() {
+  if(status.dma_state == DMA_CPUsync) {
+    add_clocks(status.clock_count - (status.dma_clocks % status.clock_count));
+    status.dma_state = DMA_Inactive;
   }
 }
 
 /*****
  * cycle_edge()
  *
- * Used to test for HDMA, which can trigger on the edge of every opcode cycle.
+ * Used to test for H/DMA, which can trigger on the edge of every opcode cycle.
  *****/
 void sCPU::cycle_edge() {
   if(status.line_rendered == false) {
@@ -129,47 +120,55 @@ void sCPU::cycle_edge() {
       status.hdmainit_triggered = true;
       hdma_init_reset();
       if(hdma_enabled_channels()) {
-        if(status.dma_state == DMASTATE_INACTIVE) {
-          status.dma_state = DMASTATE_DMASYNC;
-          status.hdmainit_pending = true;
-        } else {
-          hdma_init();
-        }
+        status.hdma_pending = true;
+        status.hdma_mode = 0;
       }
     }
   }
 
   if(status.hdma_triggered == false) {
-    if(status.hcounter >= 1106) {
+    if(status.hcounter >= 1104) {
       status.hdma_triggered = true;
       if(hdma_active_channels()) {
-        if(status.dma_state == DMASTATE_INACTIVE) {
-          status.dma_state = DMASTATE_DMASYNC;
-          status.hdma_pending = true;
-        } else {
-          hdma_run();
-        }
+        status.hdma_pending = true;
+        status.hdma_mode = 1;
       }
     }
-  }
-
-  switch(status.dma_state) {
-    case DMASTATE_INACTIVE: break;
-
-    case DMASTATE_DMASYNC: {
-      status.dma_state = DMASTATE_RUN;
-    } break;
-
-    case DMASTATE_RUN: {
-      status.dma_state = DMASTATE_CPUSYNC;
-      status.dma_clocks = 8 - dma_counter() + 8;
-      add_clocks(status.dma_clocks);
-
-      if(status.hdmainit_pending) { hdma_init(); status.hdmainit_pending = false; }
-      if(status.hdma_pending)     { hdma_run();  status.hdma_pending     = false; }
-      if(status.dma_pending)      { dma_run();   status.dma_pending      = false; }
-
-    } break;
+  }
+
+  //H/DMA pending && DMA inactive?
+  //.. Run one full CPU cycle
+  //.. HDMA pending && HDMA enabled ? DMA sync + HDMA run
+  //.. DMA pending && DMA enabled ? DMA sync + DMA run
+  //.... HDMA during DMA && HDMA enabled ? DMA sync + HDMA run
+  //.. Run one bus CPU cycle
+  //.. CPU sync
+
+  if(status.dma_state == DMA_Run) {
+    if(status.hdma_pending) {
+      status.hdma_pending = false;
+      if(hdma_enabled_channels()) {
+        dma_add_clocks(8 - dma_counter()); //DMA sync
+        status.hdma_mode == 0 ? hdma_init() : hdma_run();
+        status.dma_state = DMA_CPUsync;
+      }
+    }
+
+    if(status.dma_pending) {
+      status.dma_pending = false;
+      if(dma_enabled_channels()) {
+        dma_add_clocks(8 - dma_counter()); //DMA sync
+        dma_run();
+        status.dma_state = DMA_CPUsync;
+      }
+    }
+  }
+
+  if(status.dma_state == DMA_Inactive) {
+    if(status.dma_pending || status.hdma_pending) {
+      status.dma_clocks = 0;
+      status.dma_state = DMA_Run;
+    }
   }
 }
 
@@ -212,7 +211,7 @@ void sCPU::timing_reset() {
   status.line_clocks = 1364;
 
   status.line_rendered = false;
-  status.line_render_position = min(1112U, (uint)config::ppu.hack.render_scanline_position);
+  status.line_render_position = min(1112U, (unsigned)config::ppu.hack.render_scanline_position);
 
   status.dram_refreshed = false;
   status.dram_refresh_position = (cpu_version == 1) ? 530 : 538;
@@ -236,11 +235,12 @@ void sCPU::timing_reset() {
 
   update_interrupts();
 
-  status.dma_counter      = 0;
-  status.dma_state        = DMASTATE_INACTIVE;
-  status.dma_pending      = false;
-  status.hdma_pending     = false;
-  status.hdmainit_pending = false;
+  status.dma_counter  = 0;
+  status.dma_clocks   = 0;
+  status.dma_pending  = false;
+  status.hdma_pending = false;
+  status.hdma_mode    = 0;
+  status.dma_state    = DMA_Inactive;
 
   history.reset();
 

src/data/icon48.h

@@ -2,39 +2,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"
+  "AfAB8AHwAfD_AfAB8AHwAfAB8AHwAfABAAD_qgAD_p8VOwD_oRaI_qEWthD-oBbL"
+  "CADE_qEAFaP_oBZm_p38GBU28AHwAfAB8AHwAfBfAfAB8AFQuBCoAMe0AP4twAD_"
+  "BPAEIPAkAIX_-JkZCkLwAfAB8AHwAfBHAfAB8HSB_wABtABvPQQA-7DwBPAEECwA"
+  "0P74oBIbTvAB8AHwAfAB8EcB8AHweEGgFWwkAv0HqPAE8MSwFdX-oRr-E1LwAfAB"
+  "8AHwAfAB8Lzg6KEUMRAC96DwBPAE8P3EIKXAEVrwAfAB8AHwAfDzAfDAsBa3mPAE"
+  "8ATwwED_uAE4E1rwAfAB8AHwAfAB8PG8YKIVJDjyBPAE8ATA-KAWoF7wAfAB8AHw"
+  "AfB7AfD4gmmQ8ATwBPDM4-Z_XvAB8AHwAfAB8AHwwICPH_wSePQE8ATwBMClDxEB"
+  "YNBERP8PPz_-oEw-Pv56CACMCACCgggAXT8__yD2BA808wHwAfDAkKMSDv6AmxwS"
+  "_qQYH8QC6kjIAJTUAOug8ATwhOFDRABYUDw8_hWsAI9QPj7_8KwA_wTw_oL6BAC1"
+  "PT3-MpbwjwHwAfAB8AxmpRkUFAOOkxjzBPAEoJ8PEEAQdZQAOrwA47TwBPAoAPh9"
+  "yAB0hvAB8AHwAfBcsha6XFwC-KzwBPDsAOQ0EHWQAD0EAPSs8ATwBMCAn4LwAfAB"
+  "8AHwXLUVakz4gwTwKACbQkL-F0wBTuac8ATwiPH-_AQATh-C8AHwAfAB8ExifwAC"
+  "DcAAtbTwfKT8_qETejSAAJOc8ATwBPAUY9p9CAAIhvAB8AHwAfCEYZ4MGDWE8YCn"
+  "nEs8_3oRgAD1lPAE8ATwBKBVh4LwAQAUCwDNACQEAKBNAMwAaggAewgAoH8AywBz"
+  "CABbCABgNwDIAA458Nxp2IO88Hwhzf-ZEQ-0A15XjPAE8ATwhOGlfaDOVAA1oACY"
+  "sADhCAD9jQgA_wTwBEDMAPQEAHq7NABjCAAcq2QRvPAW9sUMXHwAiIzwBPAE8MDg"
+  "otZxIMsAGYQArQQATv6s8ATwzPAA4wQAUVcKAGQmYAR9MILpBAB3sP-qKgbgUPwC"
+  "mwQAevuAAP6U8ATwBPDAYO3QANEAHIQA3JjwBPCrBPAEoPwEAGyAQVRwAeCV_qIX"
+  "WPQWZNJ8AKoQgAQbSAI2hABtzAC6xAgA_aDwBPCIxOc4Ab6mjPAE8ATwBPAEAPYE"
+  "AK9YZwHwAfA2QwLAAEgEAK7dqPAE8MCAx8AA5Ijw_wTwBPAE8ExCFPQB8AHwAQDQ"
+  "Q0P-E5QAw6zwBPD1wECLcAC2iPAE8ATwBPD1BAD70AMqmvAB8AHwATDQODj-EpgA"
+  "1LDwxPbFBAAxcCDNAOyM8ATwewTwBOCGkvAB8AHwIOM8t-AzuPC8g66UasQwyJDw"
+  "VwTwBPAEIPHEBG4KAAJBDcYKAP7-LAQAT1UEAGUEAHAEAGoEAFd1BAA5BAASJAAY"
+  "-8Qg_gaytPB8Yeg7O_8eUTGgvwAEyABUUAK3XZAA9aTw6OJsFdgIAIOQAM8AG_11"
+  "_guUAKpgCAC1BADvDAD_BPAxBED-_vgIAEoA_nzDBAD4o0BA_lO88Lwgjuy4FPLw"
+  "AYDPABCYAKpCoABtBACKBACbEACKngQAk4wnzQBXoCd3qBe5plgh4azwBPDM8P76"
+  "9QQAiwwA1CjgGeQSvMD6yAQAKbHwAfAB8AHwvMC9RBH-nPAE8ATwBKDAxCFVVDXu"
+  "sADzCAC9dEgEX3nwAfAB8AHwvMAxBAD8X4zwBPAE8ATwTAB-3Ewh_bQADHHwAfAB"
+  "8AHwAfDAYL50iPAE8ATwBPDAQMRl8L8B8AHwAfAB8AHwcABMiPDvBPAE8ATwwECc"
+  "ZfAB8AHwrwHwAfAB8HQAAnQAsIzw9wTwBPC84OQIABy1AfAB8O8B8AHwAfDs1ZUI"
+  "8wTwBPD1vGDHBAAkXfAB8AHwAfCnAfAB8Mjw_zCEAJ8EAK7rpPAE8CgA9wQAvAQA"
+  "_lQQAJC1AfAB8AHwAfAB8FcB8MjwkBE6BABsBACPVQQApAQArwQAqQQAl_UgAHgI"
+  "AEsEANQsAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHwAfD_AfAB"
+  "8AHwAfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHwAfD_"
+  "AfAB8AHwAfAB8AHwAfAB8P8B8AHwAfAB8AHwAfAB8AHw_wHwAfAB8AHwAfAB8AHw"
+  "AfD_AfAB8AHwAfAB8AHwAfAB8A8B8AHwAfABsA"
 };

src/dsp/sdsp/brr.cpp

@@ -2,7 +2,7 @@
 
 void sDSP::brr_decode(voice_t &v) {
   //state.t_brr_byte = ram[v.brr_addr + v.brr_offset] cached from previous clock cycle
-  int nybbles = (state.t_brr_byte << 8) + ram[(uint16)(v.brr_addr + v.brr_offset + 1)];
+  int nybbles = (state.t_brr_byte << 8) + memory::apuram.read(uint16(v.brr_addr + v.brr_offset + 1));
 
   const int filter = (state.t_brr_header >> 2) & 3;
   const int scale  = (state.t_brr_header >> 4);

src/dsp/sdsp/echo.cpp

@@ -12,17 +12,19 @@ int sDSP::echo_output(bool channel) {
 }
 
 void sDSP::echo_read(bool channel) {
-  uint8 *in = &ram[state.t_echo_ptr + channel * 2];
-  int s = (int16)((in[1] << 8) + in[0]);
+  unsigned addr = state.t_echo_ptr + channel * 2;
+  uint8 lo = memory::apuram.read(uint16(addr + 0));
+  uint8 hi = memory::apuram.read(uint16(addr + 1));
+  int s = (int16)((hi << 8) + lo);
   state.echo_hist[channel].write(state.echo_hist_pos, s >> 1);
 }
 
 void sDSP::echo_write(bool channel) {
   if(!(state.t_echo_disabled & 0x20)) {
-    uint8 *out = &ram[state.t_echo_ptr + channel * 2];
+    unsigned addr = state.t_echo_ptr + channel * 2;
     int s = state.t_echo_out[channel];
-    out[0] = (uint8)(s);
-    out[1] = (uint8)(s >> 8);
+    memory::apuram.write(uint16(addr + 0), (uint8)(s >> 0));
+    memory::apuram.write(uint16(addr + 1), (uint8)(s >> 8));
   }
 
   state.t_echo_out[channel] = 0;

src/dsp/sdsp/sdsp.cpp

@@ -249,8 +249,6 @@ void sDSP::write(uint8 addr, uint8 data) {
 /* initialization */
 
 void sDSP::power() {
-  ram = (uint8*)smp.get_spcram_handle(); //TODO: move to sMemory
-
   memset(&state.regs, 0, sizeof state.regs);
   state.echo_hist_pos = 0;
   state.every_other_sample = false;

src/dsp/sdsp/sdsp.h

@@ -12,9 +12,6 @@ public:
   ~sDSP();
 
 private:
-  //external
-  uint8 *ram;
-
   //USE_STATE_MACHINE variable
   unsigned phase_index;
 

src/dsp/sdsp/voice.cpp

@@ -22,9 +22,11 @@ void sDSP::voice_1(voice_t &v) {
 
 void sDSP::voice_2(voice_t &v) {
   //read sample pointer (ignored if not needed)
-  const uint8 *entry = &ram[state.t_dir_addr];
-  if(!v.kon_delay) entry += 2;
-  state.t_brr_next_addr = (entry[1] << 8) + entry[0];
+  uint16 addr = state.t_dir_addr;
+  if(!v.kon_delay) addr += 2;
+  uint8 lo = memory::apuram.read(uint16(addr + 0));
+  uint8 hi = memory::apuram.read(uint16(addr + 1));
+  state.t_brr_next_addr = ((hi << 8) + lo);
 
   state.t_adsr0 = VREG(adsr0);
 
@@ -43,8 +45,8 @@ void sDSP::voice_3a(voice_t &v) {
 }
 
 void sDSP::voice_3b(voice_t &v) {
-  state.t_brr_byte = ram[(uint16)(v.brr_addr + v.brr_offset)];
-  state.t_brr_header = ram[(uint16)(v.brr_addr)];
+  state.t_brr_byte = memory::apuram.read(uint16(v.brr_addr + v.brr_offset));
+  state.t_brr_header = memory::apuram.read(uint16(v.brr_addr));
 }
 
 void sDSP::voice_3c(voice_t &v) {

src/lib/bbase.h

@@ -1,5 +1,5 @@
 /*
-  bbase : version 0.13 ~byuu (2008-04-02)
+  bbase : version 0.14 ~byuu (2008-04-16)
   license: public domain
 */
 
@@ -99,37 +99,12 @@ static char *userpath(char *output) {
 #else
 static char *userpath(char *output) {
   strcpy(output, "."); //failsafe
-struct passwd *userinfo = getpwuid(getuid());
+  struct passwd *userinfo = getpwuid(getuid());
   if(userinfo) { strcpy(output, userinfo->pw_dir); }
   return output;
 }
 #endif
 
-/*****
- * template functions
- *****/
-
-template<typename T> inline void safe_free(T &handle) {
-  if(handle) {
-    free(handle);
-    handle = 0;
-  }
-}
-
-template<typename T> inline void safe_delete(T &handle) {
-  if(handle) {
-    delete handle;
-    handle = 0;
-  }
-}
-
-template<typename T> inline void safe_release(T &handle) {
-  if(handle) {
-    handle->Release();
-    handle = 0;
-  }
-}
-
 template<int min, int max, typename T> inline T minmax(const T x) {
   return (x < (T)min) ? (T)min : (x > (T)max) ? (T)max : x;
 }
@@ -177,47 +152,47 @@ template<int min, int max, typename T> inline T minmax(const T x) {
  *****/
 
 //pseudo-random number generator
-static uint prng() {
-static uint n = 0;
+static unsigned prng() {
+  static unsigned n = 0;
   return n = (n >> 1) ^ (((n & 1) - 1) & 0xedb88320);
 }
 
-static uint64 fget(FILE *fp, uint length = 1) {
-uint64 data = 0;
-  for(uint i = 0; i < length; i++) {
+static uint64 fget(FILE *fp, unsigned length = 1) {
+  uint64 data = 0;
+  for(unsigned i = 0; i < length; i++) {
     data |= fgetc(fp) << (i << 3);
   }
   return data;
 }
 
-static void fput(FILE *fp, uint64 data, uint length = 1) {
-  for(uint i = 0; i < length; i++) {
+static void fput(FILE *fp, uint64 data, unsigned length = 1) {
+  for(unsigned i = 0; i < length; i++) {
     fputc(data >> (i << 3), fp);
   }
 }
 
 static bool fexists(const char *fn) {
-FILE *fp = fopen(fn, "rb");
-  if(!fp)return false;
+  FILE *fp = fopen(fn, "rb");
+  if(!fp) return false;
   fclose(fp);
   fp = 0;
   return true;
 }
 
-static uint32 fsize(FILE *fp) {
-  if(!fp)return 0;
-uint32 pos = ftell(fp);
+static unsigned fsize(FILE *fp) {
+  if(!fp) return 0;
+  unsigned pos = ftell(fp);
   fseek(fp, 0, SEEK_END);
-uint32 size = ftell(fp);
+  unsigned size = ftell(fp);
   fseek(fp, pos, SEEK_SET);
   return size;
 }
 
-static uint32 fsize(const char *fn) {
-FILE *fp = fopen(fn, "rb");
-  if(!fp)return 0;
+static unsigned fsize(const char *fn) {
+  FILE *fp = fopen(fn, "rb");
+  if(!fp) return 0;
   fseek(fp, 0, SEEK_END);
-uint32 size = ftell(fp);
+  unsigned size = ftell(fp);
   fclose(fp);
   fp = 0;
   return size;

src/lib/hiro/cc.bat

@@ -0,0 +1,6 @@
+mingw32-g++ -c test/test.cpp -I. -I../
+mingw32-g++ -c hiro.cpp -I. -I../
+mingw32-g++ -c ../nall/string.cpp -I. -I../
+mingw32-g++ test.o hiro.o string.o -o test_app.exe -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomctl32 -lcomdlg32
+@pause
+@del *.o

src/lib/hiro/cc.sh

@@ -0,0 +1,6 @@
+clear
+g++ -c test/test.cpp -I. -I../
+g++ -c hiro.cpp `pkg-config --cflags gtk+-2.0` -I. -I../
+g++ -c ../nall/string.cpp -I. -I../
+g++ test.o hiro.o string.o -o test_app `pkg-config --libs gtk+-2.0` -lXtst
+rm *.o

src/lib/hiro/gtk/button.cpp

@@ -4,6 +4,7 @@ void hiro_pbutton_tick(pButton *p) {
 
 void pButton::create(uint style, uint width, uint height, const char *text) {
   button = gtk_button_new_with_label(text ? text : "");
+  set_default_font(button);
   gtk_widget_set_size_request(button, width, height);
   gtk_widget_show(button);
   g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(hiro_pbutton_tick), (gpointer)this);

src/lib/hiro/gtk/checkbox.cpp

@@ -1,9 +1,10 @@
 void hiro_pcheckbox_tick(pCheckbox *p) {
-  if(p->self.on_tick) p->self.on_tick(Event(Event::Tick, p->checked(), &p->self));
+  if(!p->locked && p->self.on_tick) p->self.on_tick(Event(Event::Tick, p->checked(), &p->self));
 }
 
 void pCheckbox::create(uint style, uint width, uint height, const char *text) {
   checkbox = gtk_check_button_new_with_label(text ? text : "");
+  set_default_font(checkbox);
   gtk_widget_set_size_request(checkbox, width, height);
   gtk_widget_show(checkbox);
   g_signal_connect_swapped(G_OBJECT(checkbox), "toggled", G_CALLBACK(hiro_pcheckbox_tick), (gpointer)this);
@@ -15,7 +16,9 @@ void pCheckbox::set_text(const char *text) {
 }
 
 void pCheckbox::check(bool state) {
+  locked = true;
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), state ? TRUE : FALSE);
+  locked = false;
 }
 
 void pCheckbox::uncheck() {
@@ -28,6 +31,7 @@ bool pCheckbox::checked() {
 
 pCheckbox::pCheckbox(Checkbox &self_) : pFormControl(self_), self(self_) {
   checkbox = 0;
+  locked = false;
 }
 
 /* internal */

src/lib/hiro/gtk/checkbox.h

@@ -10,6 +10,7 @@ public:
   pCheckbox(Checkbox&);
 
   /* internal */
-  GtkWidget *checkbox;
   GtkWidget* gtk_handle();
+  GtkWidget *checkbox;
+  bool locked;
 };

src/lib/hiro/gtk/combobox.cpp

@@ -4,6 +4,7 @@ void hiro_pcombobox_change(pCombobox *p) {
 
 void pCombobox::create(uint style, uint width, uint height, const char *text) {
   combobox = gtk_combo_box_new_text();
+  set_default_font(combobox);
   gtk_widget_set_size_request(combobox, width, height);
   gtk_widget_show(combobox);
 

src/lib/hiro/gtk/editbox.cpp

@@ -8,12 +8,12 @@ void pEditbox::create(uint style, uint width, uint height, const char *text) {
     gtk_widget_set_size_request(editbox, width, height);
     gtk_widget_show(editbox);
   } else {
-  GtkPolicyType hscroll = (style & Editbox::HorizontalScrollAlways) ? GTK_POLICY_ALWAYS :
-                          (style & Editbox::HorizontalScrollNever)  ? GTK_POLICY_NEVER  :
-                          GTK_POLICY_AUTOMATIC;
-  GtkPolicyType vscroll = (style & Editbox::VerticalScrollAlways) ? GTK_POLICY_ALWAYS :
-                          (style & Editbox::VerticalScrollNever)  ? GTK_POLICY_NEVER  :
-                          GTK_POLICY_AUTOMATIC;
+    GtkPolicyType hscroll = (style & Editbox::HorizontalScrollAlways) ? GTK_POLICY_ALWAYS :
+                            (style & Editbox::HorizontalScrollNever)  ? GTK_POLICY_NEVER  :
+                            GTK_POLICY_AUTOMATIC;
+    GtkPolicyType vscroll = (style & Editbox::VerticalScrollAlways) ? GTK_POLICY_ALWAYS :
+                            (style & Editbox::VerticalScrollNever)  ? GTK_POLICY_NEVER  :
+                            GTK_POLICY_AUTOMATIC;
     scrollbox = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), hscroll, vscroll);
     gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollbox), GTK_SHADOW_ETCHED_IN);
@@ -26,6 +26,8 @@ void pEditbox::create(uint style, uint width, uint height, const char *text) {
     gtk_widget_show(editbox);
     gtk_widget_show(scrollbox);
   }
+
+  set_default_font(editbox);
 }
 
 void pEditbox::set_text(const char *text) {
@@ -38,10 +40,10 @@ void pEditbox::set_text(const char *text) {
 
 uint pEditbox::get_text(char *text, uint length) {
   if(multiline == false) {
-  const char *temp = gtk_entry_get_text(GTK_ENTRY(editbox));
+    const char *temp = gtk_entry_get_text(GTK_ENTRY(editbox));
     return strlcpy(text, temp ? temp : "", length);
   } else {
-  GtkTextIter start, end;
+    GtkTextIter start, end;
     gtk_text_buffer_get_start_iter(buffer, &start);
     gtk_text_buffer_get_end_iter(buffer, &end);
     return strlcpy(text, gtk_text_buffer_get_text(buffer, &start, &end, true), length);

src/lib/hiro/gtk/frame.cpp

@@ -1,5 +1,6 @@
 void pFrame::create(uint style, uint width, uint height, const char *text) {
   frame = gtk_frame_new(text ? text : "");
+  set_default_font(frame);
   gtk_widget_set_size_request(frame, width, height);
   gtk_widget_show(frame);
 }

src/lib/hiro/gtk/hiro.cpp

@@ -6,6 +6,17 @@ using nall::max;
 
 namespace libhiro {
 
+static void set_font(GtkWidget *widget, gpointer font) {
+  gtk_widget_modify_font(widget, (PangoFontDescription*)font);
+  if(GTK_IS_CONTAINER(widget)) {
+    gtk_container_foreach(GTK_CONTAINER(widget), (GtkCallback)set_font, font);
+  }
+}
+
+static void set_default_font(GtkWidget *widget) {
+  set_font(widget, phiro().font);
+}
+
 #include "keymap.cpp"
 #include "widget.cpp"
   #include "window.cpp"
@@ -49,9 +60,15 @@ void pHiro::init() {
   } else {
     colormap = gdk_screen_get_rgb_colormap(screen);
   }
+
+  font = pango_font_description_new();
+  pango_font_description_set_family(font, "Sans");
+  pango_font_description_set_absolute_size(font, 11.0 * PANGO_SCALE);
+  pango_font_description_set_style(font, PANGO_STYLE_NORMAL);
 }
 
 void pHiro::term() {
+  pango_font_description_free(font);
   enable_screensaver();
 }
 

src/lib/hiro/gtk/hiro.h

@@ -55,6 +55,7 @@ public:
   /* internal */
   GdkScreen *screen;
   GdkColormap *colormap;
+  PangoFontDescription *font;
   bool is_composited;
   char default_path[PATH_MAX];
 

src/lib/hiro/gtk/label.cpp

@@ -1,5 +1,6 @@
 void pLabel::create(uint style, uint width, uint height, const char *text) {
   label = gtk_label_new(text ? text : "");
+  set_default_font(label);
   gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
   gtk_widget_set_size_request(label, width, height);
   gtk_widget_show(label);

src/lib/hiro/gtk/listbox.cpp

@@ -8,22 +8,22 @@ void hiro_plistbox_activate(pListbox *p) {
 }
 
 void pListbox::create(uint style, uint width, uint height, const char *columns, const char *text) {
-bool header = style & Listbox::Header;
-GtkPolicyType hscroll = (style & Listbox::HorizontalScrollAlways) ? GTK_POLICY_ALWAYS :
-                        (style & Listbox::HorizontalScrollNever) ? GTK_POLICY_NEVER :
-                        GTK_POLICY_AUTOMATIC;
-GtkPolicyType vscroll = (style & Listbox::VerticalScrollAlways) ? GTK_POLICY_ALWAYS :
-                        (style & Listbox::VerticalScrollNever) ? GTK_POLICY_NEVER :
-                        GTK_POLICY_AUTOMATIC;
+  bool header = style & Listbox::Header;
+  GtkPolicyType hscroll = (style & Listbox::HorizontalScrollAlways) ? GTK_POLICY_ALWAYS :
+                          (style & Listbox::HorizontalScrollNever) ? GTK_POLICY_NEVER :
+                          GTK_POLICY_AUTOMATIC;
+  GtkPolicyType vscroll = (style & Listbox::VerticalScrollAlways) ? GTK_POLICY_ALWAYS :
+                          (style & Listbox::VerticalScrollNever) ? GTK_POLICY_NEVER :
+                          GTK_POLICY_AUTOMATIC;
 
   scrollbox = gtk_scrolled_window_new(0, 0);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), hscroll, vscroll);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollbox), GTK_SHADOW_ETCHED_IN);
 
-lstring list;
+  lstring list;
   split(list, "\t", columns);
 
-GType *v = (GType*)malloc(count(list) * sizeof(GType));
+  GType *v = (GType*)malloc(count(list) * sizeof(GType));
   for(uint i = 0; i < count(list); i++) v[i] = G_TYPE_STRING;
   store = gtk_list_store_newv(count(list), v);
   free(v);
@@ -35,7 +35,7 @@ GType *v = (GType*)malloc(count(list) * sizeof(GType));
   gtk_widget_show(listbox);
   gtk_widget_show(scrollbox);
 
-//alternate colors for each listbox entry if there are multiple columns ...
+  //alternate colors for each listbox entry if there are multiple columns ...
   gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(listbox), count(list) >= 2 ? true : false);
   for(uint i = 0; i < count(list); i++) {
     renderer = gtk_cell_renderer_text_new();
@@ -54,6 +54,8 @@ GType *v = (GType*)malloc(count(list) * sizeof(GType));
 
   g_signal_connect_swapped(G_OBJECT(listbox), "cursor-changed", G_CALLBACK(hiro_plistbox_change), (gpointer)this);
   g_signal_connect_swapped(G_OBJECT(listbox), "row-activated", G_CALLBACK(hiro_plistbox_activate), (gpointer)this);
+
+  set_default_font(listbox);
 }
 
 void pListbox::autosize_columns() {

src/lib/hiro/gtk/menucheckitem.cpp

@@ -1,15 +1,18 @@
 void hiro_pmenucheckitem_tick(pMenuCheckItem *p) {
-  if(p->self.on_tick) p->self.on_tick(Event(Event::Tick, p->checked(), &p->self));
+  if(!p->locked && p->self.on_tick) p->self.on_tick(Event(Event::Tick, p->checked(), &p->self));
 }
 
 void pMenuCheckItem::create(const char *text) {
   item = gtk_check_menu_item_new_with_label(text ? text : "?");
+  set_default_font(item);
   gtk_widget_show(item);
   g_signal_connect_swapped(G_OBJECT(item), "toggled", G_CALLBACK(hiro_pmenucheckitem_tick), (gpointer)this);
 }
 
 void pMenuCheckItem::check(bool state) {
+  locked = true;
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), state ? TRUE : FALSE);
+  locked = false;
 }
 
 void pMenuCheckItem::uncheck() {
@@ -22,6 +25,7 @@ bool pMenuCheckItem::checked() {
 
 pMenuCheckItem::pMenuCheckItem(MenuCheckItem &self_) : pMenuControl(self_), self(self_) {
   item = 0;
+  locked = true;
 }
 
 /* internal */

src/lib/hiro/gtk/menucheckitem.h

@@ -9,6 +9,7 @@ public:
   pMenuCheckItem(MenuCheckItem&);
 
   /* internal */
-  GtkWidget *item;
   GtkWidget* gtk_handle();
+  GtkWidget *item;
+  bool locked;
 };

src/lib/hiro/gtk/menugroup.cpp

@@ -1,6 +1,7 @@
 void pMenuGroup::create(const char *text) {
   group = gtk_menu_new();
   item = gtk_menu_item_new_with_label(text ? text : "");
+  set_default_font(item);
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), group);
   gtk_widget_show(item);
 }

src/lib/hiro/gtk/menuitem.cpp

@@ -4,6 +4,7 @@ void hiro_pmenuitem_tick(pMenuItem *p) {
 
 void pMenuItem::create(const char *text) {
   item = gtk_menu_item_new_with_label(text ? text : "");
+  set_default_font(item);
   g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(hiro_pmenuitem_tick), (gpointer)this);
   gtk_widget_show(item);
 }

src/lib/hiro/gtk/menuradioitem.cpp

@@ -1,7 +1,7 @@
 void hiro_pmenuradioitem_tick(pMenuRadioItem *p) {
-//GTK+ sends two messages: one for the activated radio item,
-//and one for the deactivated radio item. ignore the latter.
-  if(p->checked() && p->self.on_tick) p->self.on_tick(Event(Event::Tick, 0, &p->self));
+  //GTK+ sends two messages: one for the activated radio item,
+  //and one for the deactivated radio item. ignore the latter.
+  if(!p->locked && p->checked() && p->self.on_tick) p->self.on_tick(Event(Event::Tick, 0, &p->self));
 }
 
 void pMenuRadioItem::create(MenuRadioItemGroup &group, const char *text) {
@@ -10,12 +10,15 @@ void pMenuRadioItem::create(MenuRadioItemGroup &group, const char *text) {
   } else {
     item = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(group[0]->p.gtk_handle()), text ? text : "");
   }
+  set_default_font(item);
   gtk_widget_show(item);
   g_signal_connect_swapped(G_OBJECT(item), "toggled", G_CALLBACK(hiro_pmenuradioitem_tick), (gpointer)this);
 }
 
 void pMenuRadioItem::check() {
+  locked = true;
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
+  locked = false;
 }
 
 bool pMenuRadioItem::checked() {
@@ -24,6 +27,7 @@ bool pMenuRadioItem::checked() {
 
 pMenuRadioItem::pMenuRadioItem(MenuRadioItem &self_) : pMenuControl(self_), self(self_) {
   item = 0;
+  locked = false;
 }
 
 /* internal */

src/lib/hiro/gtk/menuradioitem.h

@@ -8,6 +8,7 @@ public:
   pMenuRadioItem(MenuRadioItem&);
 
   /* internal */
-  GtkWidget *item;
   GtkWidget* gtk_handle();
+  GtkWidget *item;
+  bool locked;
 };

src/lib/hiro/gtk/radiobox.cpp

@@ -1,7 +1,7 @@
 void hiro_pradiobox_tick(pRadiobox *p) {
-//GTK+ sends two messages: one for the activated radiobox,
-//and one for the deactivated radiobox. ignore the latter.
-  if(p->checked() && p->self.on_tick) p->self.on_tick(Event(Event::Tick, 0, &p->self));
+  //GTK+ sends two messages: one for the activated radiobox,
+  //and one for the deactivated radiobox. ignore the latter.
+  if(!p->locked && p->checked() && p->self.on_tick) p->self.on_tick(Event(Event::Tick, 0, &p->self));
 }
 
 void pRadiobox::create(RadioboxGroup &group, uint style, uint width, uint height, const char *text) {
@@ -10,6 +10,7 @@ void pRadiobox::create(RadioboxGroup &group, uint style, uint width, uint height
   } else {
     radiobox = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(group[0]->p.gtk_handle()), text ? text : "");
   }
+  set_default_font(radiobox);
   gtk_widget_set_size_request(radiobox, width, height);
   gtk_widget_show(radiobox);
   g_signal_connect_swapped(G_OBJECT(radiobox), "toggled", G_CALLBACK(hiro_pradiobox_tick), (gpointer)this);
@@ -21,7 +22,9 @@ void pRadiobox::set_text(const char *text) {
 }
 
 void pRadiobox::check() {
+  locked = true;
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobox), TRUE);
+  locked = false;
 }
 
 bool pRadiobox::checked() {
@@ -30,6 +33,7 @@ bool pRadiobox::checked() {
 
 pRadiobox::pRadiobox(Radiobox &self_) : pFormControl(self), self(self_) {
   radiobox = 0;
+  locked = false;
 }
 
 /* internal */

src/lib/hiro/gtk/radiobox.h

@@ -9,6 +9,7 @@ public:
   pRadiobox(Radiobox&);
 
   /* internal */
-  GtkWidget *radiobox;
   GtkWidget* gtk_handle();
+  GtkWidget *radiobox;
+  bool locked;
 };

src/lib/hiro/gtk/window.cpp

@@ -65,6 +65,7 @@ void pWindow::create(uint style, uint width, uint height, const char *text) {
   //without affecting the statusbar color
   statuscontainer = gtk_event_box_new();
   statusbar = gtk_statusbar_new();
+  set_default_font(statusbar);
   gtk_container_add(GTK_CONTAINER(statuscontainer), statusbar);
   gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar), false);
   gtk_box_pack_start(GTK_BOX(menucontainer), statuscontainer, false, false, 0);

src/lib/hiro/hiro.h

@@ -1,6 +1,6 @@
 /*
   hiro
-  version: 0.003 (2008-04-06)
+  version: 0.005 (2008-05-25)
   author: byuu
   license: public domain
 */
@@ -11,6 +11,7 @@
 #include <nall/array.hpp>
 #include <nall/function.hpp>
 #include <nall/input.hpp>
+#include <nall/new.hpp>
 #include <nall/stdint.hpp>
 #include <nall/string.hpp>
 #include <nall/utility.hpp>

src/lib/hiro/test/test.cpp

@@ -0,0 +1,237 @@
+#include "../hiro.h"
+using namespace libhiro;
+
+#include <nall/algorithm.hpp>
+using nall::min;
+using nall::max;
+
+bool kill_ = false;
+
+uint32_t windowicon[16 * 16] = {
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+  0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff000000,
+};
+
+class SubWindow : public Window {
+public:
+  Button button;
+
+  uintptr_t tick(Event) {
+    hide();
+  }
+
+  void setup() {
+    create(0, 595, 80);
+
+    button.create(0, 595, 80, "SubWindow (click to hide)");
+    button.on_tick = bind(&SubWindow::tick, this);
+    attach(button, 0, 0);
+  }
+} subwindow;
+
+class MainWindow : public Window {
+public:
+  MenuGroup menu_file;
+    MenuGroup menu_file_disk;
+      MenuItem menu_file_disk_load;
+      MenuItem menu_file_disk_save;
+    MenuSeparator menu_file_separator;
+    MenuItem menu_file_exit;
+  MenuGroup menu_help;
+    MenuCheckItem menu_help_check1, menu_help_check2;
+    MenuSeparator menu_help_separator1;
+    MenuRadioItem menu_help_radio1, menu_help_radio2, menu_help_radio3;
+    MenuSeparator menu_help_separator2;
+    MenuItem menu_help_about;
+  Label label;
+  Editbox editbox, editbox_multi;
+  Button button_ok;
+  Button button_exit;
+  Checkbox check1, check2;
+  Radiobox radio1, radio2;
+  Progressbar progress;
+  Combobox combobox;
+  Listbox listbox;
+  Slider hslider, vslider;
+  Frame frame;
+  Canvas canvas;
+
+  uintptr_t change(Event e) {
+    printf("change(%d)\n", (uint)e.param);
+  }
+
+  uintptr_t activate(Event e) {
+    printf("activate(%d)\n", (uint)e.param);
+  }
+
+  uintptr_t tick(Event e) {
+    printf("tick(%d)\n", e.param);
+    if(e.widget == &button_ok) {
+      char t[4096];
+      editbox.get_text(t, 4096);
+      printf("'%s'\n", t);
+    }
+    if(e.widget == &menu_file_disk_load) {
+      char t[4096] = "";
+      hiro().file_open(0, t, "", "Source files\t*.cpp,*.h\nAll Files\t*.*");
+      printf("'%s'\n", t);
+    }
+    if(e.widget == &menu_file_disk_save) {
+      char t[4096] = "";
+      hiro().file_save(0, t, "", "Source files\t*.cpp,*.h\nAll Files\t*.*");
+      printf("'%s'\n", t);
+    }
+  }
+
+  uintptr_t keydown(Event e) {
+  static bool fs = false;
+    if(e.param == nall::keyboard::f11) {
+      fs = !fs;
+      fs ? fullscreen() : unfullscreen();
+      printf("%d -> %4d, %4d\n", fs, get_width(), get_height());
+    } else if(e.param == nall::keyboard::escape) {
+      menu.show(!menu.visible());
+    }
+  }
+
+  uintptr_t close(Event) {
+    printf("close()\n");
+    return kill_ = true;
+  }
+
+  void setup() {
+    create(Window::AutoCenter, 605, 320, "hiro test application");
+    //set_opacity(224);
+    //set_background_color(0, 0, 0);
+    set_icon(16, 16, windowicon);
+
+    attach(menu_file.create("File"));
+      menu_file.attach(menu_file_disk.create("Disk"));
+        menu_file_disk.attach(menu_file_disk_load.create("Load ..."));
+        menu_file_disk.attach(menu_file_disk_save.create("Save ..."));
+      menu_file.attach(menu_file_separator.create());
+      menu_file.attach(menu_file_exit.create("Exit"));
+    attach(menu_help.create("Help"));
+      menu_help.attach(menu_help_check1.create("Check 1"));
+      menu_help.attach(menu_help_check2.create("Check 2"));
+      menu_help.attach(menu_help_separator1.create());
+    { MenuRadioItemGroup group;
+      group.add(&menu_help_radio1);
+      group.add(&menu_help_radio2);
+      group.add(&menu_help_radio3);
+      menu_help.attach(menu_help_radio1.create(group, "Radio 1"));
+      menu_help.attach(menu_help_radio2.create(group, "Radio 2"));
+      menu_help.attach(menu_help_radio3.create(group, "Radio 3"));
+    } menu_help.attach(menu_help_separator2.create());
+      menu_help.attach(menu_help_about.create("About ..."));
+      menu_help_about.disable();
+    label.create(0, 200, 35, "hiro test application\n~ byuu");
+    editbox.create(0, 200, 25);
+    button_ok.create(0, 100, 30, "Ok");
+    button_exit.create(0, 100, 30, "Exit");
+    editbox_multi.create(Editbox::Multiline | Editbox::VerticalScrollAlways, 200, 95);
+    check1.create(0, 100, 20, "Check 1");
+    check2.create(0, 100, 20, "Check 2");
+  { RadioboxGroup group;
+    group.add(&radio1);
+    group.add(&radio2);
+    radio1.create(group, 0, 100, 20, "Radio 1");
+    radio2.create(group, 0, 100, 20, "Radio 2");
+  } progress.create(0, 200, 30);
+    progress.set_progress(50);
+    combobox.create(0, 200, 30);
+    combobox.add_item("Option 1");
+    combobox.add_item("Option 2");
+    combobox.add_item("Option 3");
+    listbox.create(Listbox::Header | Listbox::VerticalScrollAlways, 200, 100, "Name\tValue");
+    listbox.add_item("a\ttrue");
+    listbox.add_item("b\tfalse");
+    hslider.create(Slider::Horizontal, 425, 25, 10);
+    vslider.create(Slider::Vertical, 25, 200, 10);
+    frame.create(0, 155, 225, "Canvas:");
+
+    canvas.create(0, 135, 195);
+    for(uint y = 0; y < 195; y++) {
+    uint32_t *p = canvas.buffer() + y * 135;
+      for(uint x = 0; x < 135; x++) {
+      double dx = 128.0 / 135.0 * double(x);
+      double dy = 128.0 / 195.0 * double(y);
+      uint32_t c = uint32_t(dx) + uint32_t(dy);
+        *p++ = (max(0U, min(c, 255U)) ^ 0xff) << 16;
+      }
+    }
+
+    status.show();
+    status.set_text("Statusbar");
+
+    on_close = bind(&MainWindow::close, this);
+    on_keydown = bind(&MainWindow::keydown, this);
+
+    menu_file_disk_load.on_tick =
+    menu_file_disk_save.on_tick = bind(&MainWindow::tick, this);
+    menu_file_exit.on_tick = on_close;
+    menu_help_check1.on_tick = menu_help_check2.on_tick =
+    menu_help_radio1.on_tick = menu_help_radio2.on_tick =
+    menu_help_radio3.on_tick = bind(&MainWindow::tick, this);
+    menu_help_about.on_tick = bind(&MainWindow::tick, this);
+    button_ok.on_tick = bind(&MainWindow::tick, this);
+    button_exit.on_tick = bind(&MainWindow::close, this);
+    check1.on_tick = check2.on_tick =
+    radio1.on_tick = radio2.on_tick = bind(&MainWindow::tick, this);
+    combobox.on_change = bind(&MainWindow::change, this);
+    listbox.on_change = bind(&MainWindow::change, this);
+    listbox.on_activate = bind(&MainWindow::activate, this);
+    hslider.on_change = bind(&MainWindow::change, this);
+    vslider.on_change = bind(&MainWindow::change, this);
+
+    attach(label, 5, 5);
+    attach(editbox, 5, 40);
+    attach(button_ok, 5, 70);
+    attach(button_exit, 105, 70);
+    attach(editbox_multi, 210, 5);
+    attach(check1, 5, 105);
+    attach(check2, 105, 105);
+    attach(radio1, 5, 125);
+    attach(radio2, 105, 125);
+    attach(progress, 5, 145);
+    attach(combobox, 5, 175);
+    attach(listbox, 210, 105);
+    attach(hslider, 5, 205);
+    attach(vslider, 415, 5);
+
+    attach(frame, 445, 5);
+    attach(canvas, 455, 25);
+
+    attach(subwindow, 5, 235);
+  }
+} window;
+
+int main() {
+  hiro().init();
+  hiro().disable_screensaver();
+
+  subwindow.setup();
+  window.setup();
+  window.show();
+
+  window.check1.check();
+
+  while(kill_ == false) hiro().run();
+
+  hiro().term();
+  return 0;
+}

src/lib/hiro/win/button.cpp

@@ -1,5 +1,5 @@
 void pButton::create(uint style, uint width, uint height, const char *text) {
-  hwnd = CreateWindow("BUTTON", text ? text : "", WS_CHILD | WS_TABSTOP | WS_VISIBLE,
+  hwnd = CreateWindow(L"BUTTON", utf16(text), WS_CHILD | WS_TABSTOP | WS_VISIBLE,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this);
@@ -7,7 +7,7 @@ void pButton::create(uint style, uint width, uint height, const char *text) {
 }
 
 void pButton::set_text(const char *text) {
-  SetWindowText(hwnd, text ? text : "");
+  SetWindowText(hwnd, utf16(text));
 }
 
 pButton::pButton(Button &self_) : pFormControl(self_), self(self_) {

src/lib/hiro/win/canvas.cpp

@@ -1,5 +1,5 @@
 void pCanvas::create(uint style, uint width, uint height) {
-  hwnd = CreateWindow("hiro_window", "", WS_CHILD,
+  hwnd = CreateWindow(L"hiro_window", L"", WS_CHILD,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this);
@@ -8,6 +8,11 @@ void pCanvas::create(uint style, uint width, uint height) {
 }
 
 void pCanvas::redraw() {
+  PAINTSTRUCT ps;
+  BeginPaint(hwnd, &ps);
+  SetDIBitsToDevice(ps.hdc, 0, 0, iwidth, iheight, 0, 0, 0, iheight, (void*)ibuffer, &bmi, DIB_RGB_COLORS);
+  EndPaint(hwnd, &ps);
+  InvalidateRect(hwnd, 0, FALSE);
 }
 
 uint32_t* pCanvas::buffer() {
@@ -30,13 +35,6 @@ pCanvas::~pCanvas() {
 
 /* internal */
 
-void pCanvas::blit() {
-  PAINTSTRUCT ps;
-  BeginPaint(hwnd, &ps);
-  SetDIBitsToDevice(ps.hdc, 0, 0, iwidth, iheight, 0, 0, 0, iheight, (void*)ibuffer, &bmi, DIB_RGB_COLORS);
-  EndPaint(hwnd, &ps);
-}
-
 void pCanvas::resize(uint width, uint height) {
   if(ibuffer) free(ibuffer);
 

src/lib/hiro/win/canvas.h

@@ -12,6 +12,5 @@ public:
   BITMAPINFO bmi;
   uint32_t *ibuffer;
   uint ipitch, iwidth, iheight;
-  void blit();
   void resize(uint width, uint height);
 };

src/lib/hiro/win/checkbox.cpp

@@ -1,20 +1,16 @@
 void pCheckbox::create(uint style, uint width, uint height, const char *text) {
-  hwnd = CreateWindow("BUTTON", text ? text : "", WS_CHILD | WS_TABSTOP | WS_VISIBLE | BS_CHECKBOX,
+  hwnd = CreateWindow(L"BUTTON", utf16(text), WS_CHILD | WS_TABSTOP | WS_VISIBLE | BS_CHECKBOX,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SendMessage(hwnd, WM_SETFONT, (WPARAM)phiro().default_font, 0);
 }
 
 void pCheckbox::set_text(const char *text) {
-  SetWindowText(hwnd, text ? text : "");
+  SetWindowText(hwnd, utf16(text));
 }
 
 void pCheckbox::check(bool state) {
-bool prev = checked();
   SendMessage(hwnd, BM_SETCHECK, (WPARAM)(state ? TRUE : FALSE), 0);
-  if(prev != state) {
-    if(self.on_tick) self.on_tick(Event(Event::Tick, state, &self));
-  }
 }
 
 void pCheckbox::uncheck() {

src/lib/hiro/win/combobox.cpp

@@ -1,5 +1,5 @@
 void pCombobox::create(uint style, uint width, uint height, const char *text) {
-  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "COMBOBOX", "",
+  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, L"COMBOBOX", L"",
     WS_CHILD | WS_TABSTOP | WS_VISIBLE | CBS_DROPDOWNLIST | CBS_HASSTRINGS,
     0, 0, width, 200,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
@@ -17,7 +17,7 @@ void pCombobox::create(uint style, uint width, uint height, const char *text) {
 }
 
 void pCombobox::add_item(const char *text) {
-  SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)text);
+  SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)(wchar_t*)utf16(text));
   if(SendMessage(hwnd, CB_GETCOUNT, 0, 0) == 1) set_selection(0);
 }
 

src/lib/hiro/win/editbox.cpp

@@ -8,7 +8,7 @@ void pEditbox::create(uint style, uint width, uint height, const char *text) {
                  (style & Editbox::HorizontalScrollNever) ? 0 :
                  ES_AUTOHSCROLL;
 
-  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "",
+  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, L"EDIT", L"",
     WS_CHILD | WS_VISIBLE | vscroll | hscroll |
     (multiline == true ? ES_MULTILINE | ES_WANTRETURN : WS_TABSTOP) |
     (readonly == true ? ES_READONLY : 0),
@@ -22,14 +22,15 @@ void pEditbox::set_text(const char *text) {
   string temp = text ? text : "";
   replace(temp, "\r", "");
   replace(temp, "\n", "\r\n");
-  SetWindowText(hwnd, temp);
+  SetWindowText(hwnd, utf16(temp));
 }
 
 uint pEditbox::get_text(char *text, uint length) {
-  GetWindowText(hwnd, text, length);
-  string temp = text;
+  wchar_t buffer[length * 2 + 1];
+  GetWindowText(hwnd, buffer, length * 2);
+  string temp = (const char*)utf8(buffer);
   replace(temp, "\r", "");
-  strcpy(text, temp);
+  strlcpy(text, temp, length);
   return strlen(text);
 }
 

src/lib/hiro/win/frame.cpp

@@ -1,12 +1,12 @@
 void pFrame::create(uint style, uint width, uint height, const char *text) {
-  hwnd = CreateWindow("BUTTON", text ? text : "", WS_CHILD | WS_VISIBLE | BS_GROUPBOX,
+  hwnd = CreateWindow(L"BUTTON", utf16(text), WS_CHILD | WS_VISIBLE | BS_GROUPBOX,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SendMessage(hwnd, WM_SETFONT, (WPARAM)phiro().default_font, 0);
 }
 
 void pFrame::set_text(const char *text) {
-  SetWindowText(hwnd, text ? text : "");
+  SetWindowText(hwnd, utf16(text));
 }
 
 pFrame::pFrame(Frame &self_) : pFormControl(self_), self(self_) {

src/lib/hiro/win/hiro.cpp

@@ -8,6 +8,7 @@ namespace libhiro {
 
 LRESULT CALLBACK phiro_wndproc(HWND, UINT, WPARAM, LPARAM);
 
+#include "utf.cpp"
 #include "keymap.cpp"
 #include "widget.cpp"
   #include "window.cpp"
@@ -43,14 +44,14 @@ void pHiro::init() {
   wc.hIcon = LoadIcon(0, IDI_APPLICATION);
   wc.hInstance = GetModuleHandle(0);
   wc.lpfnWndProc = phiro_wndproc;
-  wc.lpszClassName = "hiro_window";
+  wc.lpszClassName = L"hiro_window";
   wc.lpszMenuName = 0;
   wc.style = CS_HREDRAW | CS_VREDRAW;
   RegisterClass(&wc);
 
   InitCommonControls();
-  default_hwnd = CreateWindow("hiro_window", "", WS_POPUP, 0, 0, 640, 480, 0, 0, GetModuleHandle(0), 0);
-  default_font = create_font("Tahoma", 9);
+  default_hwnd = CreateWindow(L"hiro_window", L"", WS_POPUP, 0, 0, 640, 480, 0, 0, GetModuleHandle(0), 0);
+  default_font = create_font("Tahoma", 8);
   black_brush = CreateSolidBrush(RGB(0, 0, 0));
 }
 
@@ -76,12 +77,13 @@ bool pHiro::pending() {
 }
 
 bool pHiro::folder_select(Window *focus, char *filename, const char *path) {
+  wchar_t wfilename[_MAX_PATH] = L"";
   strcpy(filename, "");
   BROWSEINFO bi;
   bi.hwndOwner = focus ? focus->p.hwnd : 0;
   bi.pidlRoot = NULL;
-  bi.pszDisplayName = filename;
-  bi.lpszTitle = "Select Folder";
+  bi.pszDisplayName = wfilename;
+  bi.lpszTitle = L"";
   bi.ulFlags = BIF_NEWDIALOGSTYLE | BIF_RETURNONLYFSDIRS;
   bi.lpfn = NULL;
   bi.lParam = 0;
@@ -89,7 +91,7 @@ bool pHiro::folder_select(Window *focus, char *filename, const char *path) {
   bool result = false;
   LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
   if(pidl) {
-    if(SHGetPathFromIDList(pidl, filename)) {
+    if(SHGetPathFromIDList(pidl, wfilename)) {
       result = true;
       IMalloc *imalloc = 0;
       if(SUCCEEDED(SHGetMalloc(&imalloc))) {
@@ -98,6 +100,7 @@ bool pHiro::folder_select(Window *focus, char *filename, const char *path) {
       }
     }
   }
+  strcpy(filename, utf8(wfilename));
   return result;
 }
 
@@ -108,23 +111,28 @@ bool pHiro::file_open(Window *focus, char *filename, const char *path, const cha
 
   lstring type, part;
   strcpy(f, "");
-  split(type, "|", filter);
+  split(type, "\n", filter);
   for(int i = 0; i < count(type); i++) {
-    split(part, ";", type[i]);
-    if(count(part) != 2)continue;
+    split(part, "\t", type[i]);
+    if(count(part) != 2) continue;
 
     strcat(f, part[0]);
     strcat(f, " (");
     strcat(f, part[1]);
-    strcat(f, ")|");
+    strcat(f, ")\t");
     replace(part[1], ",", ";");
     strcat(f, part[1]);
-    strcat(f, "|");
+    strcat(f, "\t");
   }
 
-  char *pf = f();
-  for(int i = strlen(pf) - 1; i >= 0; i--) {
-    if(pf[i] == '|') pf[i] = '\0';
+  utf16 wfilter(f);
+  utf16 wdir(dir);
+  wchar_t wfilename[_MAX_PATH] = L"";
+
+  wchar_t *p = wfilter;
+  while(*p != L'\0') {
+    if(*p == L'\t') *p = L'\0';
+    p++;
   }
 
   OPENFILENAME ofn;
@@ -132,14 +140,16 @@ bool pHiro::file_open(Window *focus, char *filename, const char *path, const cha
   memset(&ofn, 0, sizeof(ofn));
   ofn.lStructSize     = sizeof(ofn);
   ofn.hwndOwner       = focus ? focus->p.hwnd : 0;
-  ofn.lpstrFilter     = pf;
-  ofn.lpstrInitialDir = dir;
-  ofn.lpstrFile       = filename;
+  ofn.lpstrFilter     = wfilter;
+  ofn.lpstrInitialDir = wdir;
+  ofn.lpstrFile       = wfilename;
   ofn.nMaxFile        = MAX_PATH;
   ofn.Flags           = OFN_EXPLORER | OFN_FILEMUSTEXIST;
-  ofn.lpstrDefExt     = "";
+  ofn.lpstrDefExt     = L"";
 
-  return GetOpenFileName(&ofn);
+  bool result = GetOpenFileName(&ofn);
+  strcpy(filename, utf8(wfilename));
+  return result;
 }
 
 bool pHiro::file_save(Window *focus, char *filename, const char *path, const char *filter) {
@@ -149,23 +159,28 @@ bool pHiro::file_save(Window *focus, char *filename, const char *path, const cha
 
   lstring type, part;
   strcpy(f, "");
-  split(type, "|", filter);
+  split(type, "\n", filter);
   for(int i = 0; i < count(type); i++) {
-    split(part, ";", type[i]);
-    if(count(part) != 2)continue;
+    split(part, "\t", type[i]);
+    if(count(part) != 2) continue;
 
     strcat(f, part[0]);
     strcat(f, " (");
     strcat(f, part[1]);
-    strcat(f, ")|");
+    strcat(f, ")\t");
     replace(part[1], ",", ";");
     strcat(f, part[1]);
-    strcat(f, "|");
+    strcat(f, "\t");
   }
 
-  char *pf = f();
-  for(int i = strlen(pf) - 1; i >= 0; i--) {
-    if(pf[i] == '|') pf[i] = '\0';
+  utf16 wfilter(f);
+  utf16 wdir(dir);
+  wchar_t wfilename[_MAX_PATH] = L"";
+
+  wchar_t *p = wfilter;
+  while(*p != L'\0') {
+    if(*p == L'\t') *p = L'\0';
+    p++;
   }
 
   OPENFILENAME ofn;
@@ -173,14 +188,16 @@ bool pHiro::file_save(Window *focus, char *filename, const char *path, const cha
   memset(&ofn, 0, sizeof(ofn));
   ofn.lStructSize     = sizeof(ofn);
   ofn.hwndOwner       = focus ? focus->p.hwnd : 0;
-  ofn.lpstrFilter     = pf;
-  ofn.lpstrInitialDir = dir;
-  ofn.lpstrFile       = filename;
+  ofn.lpstrFilter     = wfilter;
+  ofn.lpstrInitialDir = wdir;
+  ofn.lpstrFile       = wfilename;
   ofn.nMaxFile        = MAX_PATH;
   ofn.Flags           = OFN_EXPLORER | OFN_FILEMUSTEXIST;
-  ofn.lpstrDefExt     = "";
+  ofn.lpstrDefExt     = L"";
 
-  return GetSaveFileName(&ofn);
+  bool result = GetSaveFileName(&ofn);
+  strcpy(filename, utf8(wfilename));
+  return result;
 }
 
 uint pHiro::screen_width() {
@@ -214,11 +231,11 @@ pHiro& phiro() {
 /* internal */
 
 HFONT pHiro::create_font(const char *name, uint size) {
-  HDC hdc = GetDC(0);
-  HFONT font = CreateFont(-MulDiv(size, GetDeviceCaps(hdc, LOGPIXELSY), 72),
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, name);
-  ReleaseDC(0, hdc);
-  return font;
+  return CreateFont(
+    -(size * 96.0 / 72.0 + 0.5), //96 = DPI
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    utf16(name)
+  );
 }
 
 Widget* pHiro::get_widget(uint instance) {
@@ -256,38 +273,38 @@ LRESULT pHiro::wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
 
     case WM_CLOSE: {
       if(!p || p->self.type != Widget::WindowType) break;
-    Window &w = ((pWindow*)p)->self;
+      Window &w = ((pWindow*)p)->self;
       if(w.on_close) return (bool)w.on_close(Event(Event::Close, 0, &w));
       return TRUE; //true = destroy window
     } break;
 
     case WM_ENTERMENULOOP: {
       if(!p || p->self.type != Widget::WindowType) break;
-    Window &w = ((pWindow*)p)->self;
+      Window &w = ((pWindow*)p)->self;
       if(w.on_block) w.on_block(Event(Event::Block, 0, &w));
     } break;
 
     case WM_KEYDOWN: {
       if(!p || p->self.type != Widget::WindowType) break;
-    Window &w = ((pWindow*)p)->self;
+      Window &w = ((pWindow*)p)->self;
       if(w.on_keydown) w.on_keydown(Event(Event::KeyDown, translate_key(wparam), &w));
     } break;
 
     case WM_KEYUP: {
       if(!p || p->self.type != Widget::WindowType) break;
-    Window &w = ((pWindow*)p)->self;
+      Window &w = ((pWindow*)p)->self;
       if(w.on_keyup) w.on_keyup(Event(Event::KeyUp, translate_key(wparam), &w));
     } break;
 
     case WM_ERASEBKGND: {
       if(!p) break;
-    HBRUSH brush = 0;
+      HBRUSH brush = 0;
       if(p->self.type == Widget::WindowType) brush = ((pWindow*)p)->background;
       if(p->self.type == Widget::CanvasType) brush = phiro().black_brush;
       if(!brush) break;
-    RECT rc;
+      RECT rc;
       GetClientRect(hwnd, &rc);
-    PAINTSTRUCT ps;
+      PAINTSTRUCT ps;
       BeginPaint(hwnd, &ps);
       FillRect(ps.hdc, &rc, brush);
       EndPaint(hwnd, &ps);
@@ -295,40 +312,46 @@ LRESULT pHiro::wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     } break;
 
     case WM_PAINT: {
-      if(p && p->self.type == Widget::CanvasType) ((pCanvas*)p)->blit();
+      if(p && p->self.type == Widget::CanvasType) ((pCanvas*)p)->redraw();
     } break;
 
     case WM_COMMAND: {
-    Widget *widget = get_widget(LOWORD(wparam));
+      Widget *widget = get_widget(LOWORD(wparam));
       if(!widget) break;
 
       switch(widget->type) {
         case Widget::MenuItemType: {
-        MenuItem &w = (MenuItem&)*widget;
+          MenuItem &w = (MenuItem&)*widget;
           if(w.on_tick) w.on_tick(Event(Event::Tick, 0, &w));
         } break;
         case Widget::MenuCheckItemType: {
-        MenuCheckItem &w = (MenuCheckItem&)*widget;
+          MenuCheckItem &w = (MenuCheckItem&)*widget;
           w.check(!w.checked()); //invert check state
+          if(w.on_tick) w.on_tick(Event(Event::Tick, w.checked(), &w));
         } break;
         case Widget::MenuRadioItemType: {
-        MenuRadioItem &w = (MenuRadioItem&)*widget;
+          MenuRadioItem &w = (MenuRadioItem&)*widget;
+          bool checked = w.checked();
           w.check();
+          if(!checked && w.on_tick) w.on_tick(Event(Event::Tick, w.checked(), &w));
         } break;
         case Widget::ButtonType: {
-        Button &w = (Button&)*widget;
+          Button &w = (Button&)*widget;
           if(w.on_tick) w.on_tick(Event(Event::Tick, 0, &w));
         } break;
         case Widget::CheckboxType: {
-        Checkbox &w = (Checkbox&)*widget;
+          Checkbox &w = (Checkbox&)*widget;
           w.check(!w.checked()); //invert check state
+          if(w.on_tick) w.on_tick(Event(Event::Tick, w.checked(), &w));
         } break;
         case Widget::RadioboxType: {
-        Radiobox &w = (Radiobox&)*widget;
+          Radiobox &w = (Radiobox&)*widget;
+          bool checked = w.checked();
           w.check();
+          if(!checked && w.on_tick) w.on_tick(Event(Event::Tick, w.checked(), &w));
         } break;
         case Widget::ComboboxType: {
-        Combobox &combobox = (Combobox&)*widget;
+          Combobox &combobox = (Combobox&)*widget;
           if(HIWORD(wparam) == CBN_SELCHANGE) {
             if(combobox.p.combobox_selection == combobox.get_selection()) break;
             if(combobox.on_change) combobox.on_change(Event(Event::Change, combobox.p.combobox_selection = combobox.get_selection(), &combobox));
@@ -339,12 +362,12 @@ LRESULT pHiro::wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
 
     case WM_HSCROLL:
     case WM_VSCROLL: {
-    Widget *widget = get_widget(GetDlgCtrlID((HWND)lparam));
+      Widget *widget = get_widget(GetDlgCtrlID((HWND)lparam));
       if(!widget) break;
 
       switch(widget->type) {
         case Widget::SliderType: {
-        Slider &slider = (Slider&)*widget;
+          Slider &slider = (Slider&)*widget;
           if(slider.p.slider_position == slider.get_position()) break;
           if(slider.on_change) slider.on_change(Event(Event::Change, slider.p.slider_position = slider.get_position(), &slider));
         } break;
@@ -352,12 +375,12 @@ LRESULT pHiro::wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     } break;
 
     case WM_NOTIFY: {
-    Widget *widget = get_widget(LOWORD(wparam));
+      Widget *widget = get_widget(LOWORD(wparam));
       if(!widget) break;
 
       switch(widget->type) {
         case Widget::ListboxType: {
-        Listbox &listbox = (Listbox&)*widget;
+          Listbox &listbox = (Listbox&)*widget;
           if(((LPNMHDR)lparam)->code == LVN_ITEMCHANGED
             && ((LPNMLISTVIEW)lparam)->uChanged & LVIF_STATE
             && ListView_GetItemState(listbox.p.hwnd, ((LPNMLISTVIEW)lparam)->iItem, LVIS_FOCUSED)

src/lib/hiro/win/hiro.h

@@ -11,6 +11,7 @@
 #define _WIN32_IE 0x0600
 #define NOMINMAX
 
+#define UNICODE
 #include <windows.h>
 #include <commctrl.h>
 #include <shlobj.h>

src/lib/hiro/win/keymap.cpp

@@ -30,6 +30,13 @@ uint16_t pHiro::translate_key(uint key) {
     case '8': return keyboard::num_8;
     case '9': return keyboard::num_9;
 
+    case VK_INSERT: return keyboard::insert;
+    case VK_DELETE: return keyboard::delete_;
+    case VK_HOME:   return keyboard::home;
+    case VK_END:    return keyboard::end;
+    case VK_PRIOR:  return keyboard::page_up;
+    case VK_NEXT:   return keyboard::page_down;
+
     case 'A': return keyboard::a;
     case 'B': return keyboard::b;
     case 'C': return keyboard::c;

src/lib/hiro/win/label.cpp

@@ -1,12 +1,12 @@
 void pLabel::create(uint style, uint width, uint height, const char *text) {
-  hwnd = CreateWindow("STATIC", text ? text : "", WS_CHILD | WS_VISIBLE,
+  hwnd = CreateWindow(L"STATIC", utf16(text), WS_CHILD | WS_VISIBLE,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SendMessage(hwnd, WM_SETFONT, (WPARAM)phiro().default_font, 0);
 }
 
 void pLabel::set_text(const char *text) {
-  SetWindowText(hwnd, text ? text : "");
+  SetWindowText(hwnd, utf16(text));
 }
 
 pLabel::pLabel(Label &self_) : pFormControl(self_), self(self_) {

src/lib/hiro/win/listbox.cpp

@@ -1,12 +1,12 @@
 void pListbox::create(uint style, uint width, uint height, const char *columns, const char *text) {
-bool header = style & Listbox::Header;
-uint hscroll = (style & Listbox::HorizontalScrollAlways) ? WS_HSCROLL :
-               (style & Listbox::HorizontalScrollNever) ? 0 :
-               0;
-uint vscroll = (style & Listbox::VerticalScrollAlways) ? WS_VSCROLL :
-               (style & Listbox::VerticalScrollNever) ? 0 :
-               0;
-  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, "",
+  bool header = style & Listbox::Header;
+  unsigned hscroll = (style & Listbox::HorizontalScrollAlways) ? WS_HSCROLL :
+                     (style & Listbox::HorizontalScrollNever) ? 0 :
+                     0;
+  unsigned vscroll = (style & Listbox::VerticalScrollAlways) ? WS_VSCROLL :
+                     (style & Listbox::VerticalScrollNever) ? 0 :
+                     0;
+  hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, L"",
     WS_CHILD | WS_TABSTOP | WS_VISIBLE |
     LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | vscroll | hscroll |
     (header ? 0 : LVS_NOCOLUMNHEADER),
@@ -15,27 +15,28 @@ uint vscroll = (style & Listbox::VerticalScrollAlways) ? WS_VSCROLL :
   SendMessage(hwnd, WM_SETFONT, (WPARAM)phiro().default_font, 0);
   ListView_SetExtendedListViewStyle(hwnd, LVS_EX_FULLROWSELECT);
 
-lstring list;
+  lstring list;
   split(list, "\t", columns ? columns : "");
   column_count = count(list);
-  for(uint i = 0; i < count(list); i++) {
-  LVCOLUMN column;
+  for(unsigned i = 0; i < count(list); i++) {
+    LVCOLUMN column;
     column.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM;
     column.fmt = LVCFMT_LEFT;
     column.iSubItem = count(list);
-    column.pszText = (LPSTR)list[i]();
+    utf16 ulist(list[i]);
+    column.pszText = ulist;
     ListView_InsertColumn(hwnd, i, &column);
   }
 
   if(text && *text) {
     split(list, "\n", text);
-    for(uint i = 0; i < count(list); i++) add_item(list[i]);
+    for(unsigned i = 0; i < count(list); i++) add_item(list[i]);
   }
   autosize_columns();
 }
 
 void pListbox::autosize_columns() {
-  for(uint i = 0; i < column_count; i++) {
+  for(unsigned i = 0; i < column_count; i++) {
     ListView_SetColumnWidth(hwnd, i, LVSCW_AUTOSIZE_USEHEADER);
   }
 }
@@ -45,40 +46,43 @@ void pListbox::set_column_width(uint column, uint width) {
 }
 
 void pListbox::add_item(const char *text) {
-lstring list;
+  lstring list;
   split(list, "\t", text ? text : "");
-LVITEM item;
-uint pos = ListView_GetItemCount(hwnd);
+  LVITEM item;
+  unsigned pos = ListView_GetItemCount(hwnd);
   item.mask = LVIF_TEXT;
   item.iItem = pos;
   item.iSubItem = 0;
-  item.pszText = (LPSTR)list[0]();
+  utf16 wtext(list[0]);
+  item.pszText = wtext;
   ListView_InsertItem(hwnd, &item);
 
-  for(uint i = 1; i < count(list); i++) {
-    ListView_SetItemText(hwnd, pos, i, (LPSTR)list[i]());
+  for(unsigned i = 1; i < count(list); i++) {
+    utf16 wtext(list[i]);
+    ListView_SetItemText(hwnd, pos, i, wtext);
   }
 }
 
 void pListbox::set_item(uint index, const char *text) {
-lstring list;
+  lstring list;
   split(list, "\t", text ? text : "");
-  for(uint i = 0; i < count(list); i++) {
-    ListView_SetItemText(hwnd, index, i, list[i]());
+  for(unsigned i = 0; i < count(list); i++) {
+    utf16 wtext(list[i]);
+    ListView_SetItemText(hwnd, index, i, wtext);
   }
 }
 
 int pListbox::get_selection() {
-uint count = ListView_GetItemCount(hwnd);
-  for(uint i = 0; i < count; i++) {
+  unsigned count = ListView_GetItemCount(hwnd);
+  for(unsigned i = 0; i < count; i++) {
     if(ListView_GetItemState(hwnd, i, LVIS_SELECTED)) return i;
   }
   return -1;
 }
 
 void pListbox::set_selection(int index) {
-uint count = ListView_GetItemCount(hwnd);
-  for(uint i = 0; i < count; i++) {
+  unsigned count = ListView_GetItemCount(hwnd);
+  for(unsigned i = 0; i < count; i++) {
     ListView_SetItemState(hwnd, i, LVIS_FOCUSED,  (i == index) ? LVIS_FOCUSED  : 0);
     ListView_SetItemState(hwnd, i, LVIS_SELECTED, (i == index) ? LVIS_SELECTED : 0);
   }

src/lib/hiro/win/menucheckitem.cpp

@@ -3,11 +3,7 @@ void pMenuCheckItem::create(const char *text_) {
 }
 
 void pMenuCheckItem::check(bool state) {
-bool prev = checked();
   CheckMenuItem(parent, instance, state ? MF_CHECKED : MF_UNCHECKED);
-  if(prev != state) {
-    if(self.on_tick) self.on_tick(Event(Event::Tick, state, &self));
-  }
 }
 
 void pMenuCheckItem::uncheck() {
@@ -15,7 +11,7 @@ void pMenuCheckItem::uncheck() {
 }
 
 bool pMenuCheckItem::checked() {
-MENUITEMINFO info;
+  MENUITEMINFO info;
   memset(&info, 0, sizeof info);
   info.cbSize = sizeof info;
   info.fMask = MIIM_STATE;

src/lib/hiro/win/menugroup.cpp

@@ -6,20 +6,20 @@ void pMenuGroup::create(const char *text_) {
 void pMenuGroup::attach(MenuControl &menucontrol) {
   switch(menucontrol.type) {
     case Widget::MenuGroupType: {
-      AppendMenu(group, MF_STRING | MF_POPUP, (uint)((MenuGroup&)menucontrol).p.group, menucontrol.p.text);
+      AppendMenu(group, MF_STRING | MF_POPUP, (uint)((MenuGroup&)menucontrol).p.group, utf16(menucontrol.p.text));
     } break;
 
     case Widget::MenuItemType:
     case Widget::MenuCheckItemType:
     case Widget::MenuRadioItemType: {
-      AppendMenu(group, MF_STRING, menucontrol.p.instance, menucontrol.p.text);
+      AppendMenu(group, MF_STRING, menucontrol.p.instance, utf16(menucontrol.p.text));
       if(menucontrol.type == Widget::MenuRadioItemType && ((MenuRadioItem&)menucontrol).p.create_checked) {
         CheckMenuItem(group, menucontrol.p.instance, MF_CHECKED);
       }
     } break;
 
     case Widget::MenuSeparatorType: {
-      AppendMenu(group, MF_SEPARATOR, menucontrol.p.instance, "");
+      AppendMenu(group, MF_SEPARATOR, menucontrol.p.instance, L"");
     } break;
   }
 

src/lib/hiro/win/menuradioitem.cpp

@@ -5,15 +5,13 @@ void pMenuRadioItem::create(MenuRadioItemGroup &group_, const char *text_) {
 }
 
 void pMenuRadioItem::check() {
-bool prev = checked();
   for(uint i = 0; i < group.size(); i++) {
     CheckMenuItem(parent, group[i]->p.instance, (group[i] == &self) ? MF_CHECKED : MF_UNCHECKED);
   }
-  if(prev == false && self.on_tick) self.on_tick(Event(Event::Tick, 0, &self));
 }
 
 bool pMenuRadioItem::checked() {
-MENUITEMINFO info;
+  MENUITEMINFO info;
   memset(&info, 0, sizeof info);
   info.cbSize = sizeof info;
   info.fMask = MIIM_STATE;

src/lib/hiro/win/progressbar.cpp

@@ -1,5 +1,5 @@
 void pProgressbar::create(uint style, uint width, uint height) {
-  hwnd = CreateWindow(PROGRESS_CLASS, "", WS_CHILD | WS_VISIBLE | PBS_SMOOTH,
+  hwnd = CreateWindow(PROGRESS_CLASS, L"", WS_CHILD | WS_VISIBLE | PBS_SMOOTH,
     0, 0, width, height,
     phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SendMessage(hwnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100));

src/lib/hiro/win/radiobox.cpp

@@ -1,21 +1,19 @@
 void pRadiobox::create(RadioboxGroup &group_, uint style, uint width, uint height, const char *text) {
   group = group_;
-  hwnd = CreateWindow("BUTTON", text ? text : "", WS_CHILD | WS_TABSTOP | WS_VISIBLE | BS_RADIOBUTTON,
+  hwnd = CreateWindow(L"BUTTON", utf16(text), WS_CHILD | WS_TABSTOP | WS_VISIBLE | BS_RADIOBUTTON,
     0, 0, width, height, phiro().default_hwnd, (HMENU)instance, GetModuleHandle(0), 0);
   SendMessage(hwnd, WM_SETFONT, (WPARAM)phiro().default_font, 0);
   if(group[0] == &self) check();
 }
 
 void pRadiobox::set_text(const char *text) {
-  SetWindowText(hwnd, text);
+  SetWindowText(hwnd, utf16(text));
 }
 
 void pRadiobox::check() {
-bool prev = checked();
   for(uint i = 0; i < group.size(); i++) {
     SendMessage(group[i]->p.hwnd, BM_SETCHECK, (WPARAM)(group[i] == &self), 0);
   }
-  if(prev == false && self.on_tick) self.on_tick(Event(Event::Tick, 0, &self));
 }
 
 bool pRadiobox::checked() {

src/lib/hiro/win/slider.cpp

@@ -1,7 +1,7 @@
 void pSlider::create(uint style, uint width, uint height, uint length) {
   if(length < 1) length = 1;
 
-  hwnd = CreateWindow(TRACKBAR_CLASS, "",
+  hwnd = CreateWindow(TRACKBAR_CLASS, L"",
     WS_CHILD | WS_VISIBLE | WS_TABSTOP | TBS_NOTICKS | TBS_BOTH |
     (style & Slider::Vertical ? TBS_VERT : TBS_HORZ),
     0, 0, width, height,

src/lib/hiro/win/utf.cpp

@@ -0,0 +1,55 @@
+/*****
+ * UTF-8 to UTF-16
+ *****/
+class utf16 {
+public:
+  operator wchar_t*() {
+    return buffer;
+  }
+
+  operator const wchar_t*() const {
+    return buffer;
+  }
+
+  utf16(const char *s = "") {
+    if(!s) s = "";
+    unsigned length = MultiByteToWideChar(CP_UTF8, 0, s, -1, 0, 0);
+    buffer = new(zeromemory) wchar_t[length + 1];
+    MultiByteToWideChar(CP_UTF8, 0, s, -1, buffer, length);
+  }
+
+  ~utf16() {
+    delete[] buffer;
+  }
+
+private:
+  wchar_t *buffer;
+};
+
+/*****
+ * UTF-16 to UTF-8
+ *****/
+class utf8 {
+public:
+  operator char*() {
+    return buffer;
+  }
+
+  operator const char*() const {
+    return buffer;
+  }
+
+  utf8(const wchar_t *s = L"") {
+    if(!s) s = L"";
+    unsigned length = WideCharToMultiByte(CP_UTF8, 0, s, -1, 0, 0, (const char*)0, (BOOL*)0);
+    buffer = new(zeromemory) char[length + 1];
+    WideCharToMultiByte(CP_UTF8, 0, s, -1, buffer, length, (const char*)0, (BOOL*)0);
+  }
+
+  ~utf8() {
+    delete[] buffer;
+  }
+
+private:
+  char *buffer;
+};

src/lib/hiro/win/window.cpp

@@ -4,16 +4,16 @@ void pWindow::create(uint style, uint width_, uint height_, const char *text) {
   RECT rc;
   SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
 
-  hwnd = CreateWindowEx(0, "hiro_window", text ? text : "",
+  hwnd = CreateWindowEx(0, L"hiro_window", utf16(text),
     WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX,
     rc.left, rc.top, width_, height_,
     0, 0, GetModuleHandle(0), 0);
-  hwndr = CreateWindowEx(0, "hiro_window", text ? text : "",
+  hwndr = CreateWindowEx(0, L"hiro_window", utf16(text),
     WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX,
     rc.left, rc.top, width_, height_,
     0, 0, GetModuleHandle(0), 0);
   hmenu = CreateMenu();
-  hstatus = CreateWindowEx(0, STATUSCLASSNAME, "",
+  hstatus = CreateWindowEx(0, STATUSCLASSNAME, L"",
     WS_CHILD, 0, 0, 0, 0, hwnd, 0, GetModuleHandle(0), 0);
   SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this);
 
@@ -194,7 +194,7 @@ void pWindow::set_icon(unsigned width, unsigned height, const uint32_t *data) {
 }
 
 void pWindow::set_text(const char *text) {
-  SetWindowText(hwnd, text);
+  SetWindowText(hwnd, utf16(text));
 }
 
 void pWindow::attach(Window &window, uint x, uint y) {
@@ -214,7 +214,7 @@ void pWindow::attach(Window &window, uint x, uint y) {
 }
 
 void pWindow::attach(MenuGroup &menugroup) {
-  AppendMenu(hmenu, MF_STRING | MF_POPUP, (uint)menugroup.p.group, menugroup.p.text);
+  AppendMenu(hmenu, MF_STRING | MF_POPUP, (uint)menugroup.p.group, utf16(menugroup.p.text));
   if(menu_visible() == false) menu_show();
 }
 
@@ -317,7 +317,7 @@ bool pWindow::menu_visible() {
 }
 
 void pWindow::status_set_text(const char *text) {
-  SendMessage(hstatus, SB_SETTEXT, 0, (LPARAM)text);
+  SendMessage(hstatus, SB_SETTEXT, 0, (LPARAM)(wchar_t*)utf16(text));
 }
 
 void pWindow::status_show(bool state) {

src/lib/libfilter/hq2x.cpp

@@ -71,15 +71,15 @@ void HQ2xFilter::render(
   uint32_t *out0 = output;
   uint32_t *out1 = output + outpitch;
 
-  #define W1 input[-1 - pitch]
-  #define W2 input[ 0 - pitch]
-  #define W3 input[+1 - pitch]
+  #define W1 input[-1 - (int)pitch]
+  #define W2 input[ 0 - (int)pitch]
+  #define W3 input[+1 - (int)pitch]
   #define W4 input[-1]
   #define W5 input[ 0]
   #define W6 input[+1]
-  #define W7 input[-1 + pitch]
-  #define W8 input[ 0 + pitch]
-  #define W9 input[+1 + pitch]
+  #define W7 input[-1 + (int)pitch]
+  #define W8 input[ 0 + (int)pitch]
+  #define W9 input[+1 + (int)pitch]
 
   input += pitch;
   memset(out0, 0, 2048); out0 += outpitch << 1;

src/lib/nall/dictionary.hpp

@@ -0,0 +1,66 @@
+#ifndef NALL_DICTIONARY_HPP
+#define NALL_DICTIONARY_HPP
+
+#include <nall/array.hpp>
+#include <nall/string.hpp>
+#include <nall/utility.hpp>
+
+namespace nall {
+
+class dictionary : noncopyable {
+public:
+  const char* operator[](const char *input) const {
+    for(unsigned i = 0; i < index_input.size(); i++) {
+      if(!strcmp(input, index_input[i])) return index_output[i];
+    }
+    return input; //no match, return input rather than null string
+  }
+
+  bool import(const char *filename) {
+    string data;
+    if(fread(data, filename) == false) return false;
+    replace(data, "\r", "");
+
+    lstring line;
+    split(line, "\n", data);
+    for(unsigned i = 0; i < count(line); i++) {
+      lstring part;
+      //format: "Input" = "Output"
+      qsplit(part, "=", line[i]);
+      if(count(part) != 2) continue;
+
+      //remove whitespace
+      trim(part[0]);
+      trim(part[1]);
+
+      //remove quotes
+      trim_once(part[0], "\"");
+      trim_once(part[1], "\"");
+
+      unsigned i = index_input.size();
+      index_input[i]  = strdup(part[0]);
+      index_output[i] = strdup(part[1]);
+    }
+  }
+
+  void reset() {
+    for(unsigned i = 0; i < index_input.size(); i++) {
+      free(index_input[i]);
+      free(index_output[i]);
+    }
+    index_input.reset();
+    index_output.reset();
+  }
+
+  ~dictionary() {
+    reset();
+  }
+
+private:
+  array<char*> index_input;
+  array<char*> index_output;
+};
+
+} //namespace nall
+
+#endif //ifndef NALL_DICTIONARY_HPP

src/lib/nall/varint.hpp

@@ -3,6 +3,7 @@
 
 #include <nall/bit.hpp>
 #include <nall/static.hpp>
+#include <nall/traits.hpp>
 
 namespace nall {
 
@@ -27,21 +28,21 @@ private:
 
 public:
   inline operator T() const { return data; }
-  inline T  operator ++(int) { T r = data; data = uclip<bits>(data + 1); return r; }
-  inline T  operator --(int) { T r = data; data = uclip<bits>(data - 1); return r; }
-  inline T& operator ++() { data = uclip<bits>(data + 1); return *this; }
-  inline T& operator --() { data = uclip<bits>(data - 1); return *this; }
-  inline T& operator  =(const T i) { data = uclip<bits>(i); return *this; }
-  inline T& operator |=(const T i) { data = uclip<bits>(data  | i); return *this; }
-  inline T& operator ^=(const T i) { data = uclip<bits>(data  ^ i); return *this; }
-  inline T& operator &=(const T i) { data = uclip<bits>(data  & i); return *this; }
-  inline T& operator<<=(const T i) { data = uclip<bits>(data << i); return *this; }
-  inline T& operator>>=(const T i) { data = uclip<bits>(data >> i); return *this; }
-  inline T& operator +=(const T i) { data = uclip<bits>(data  + i); return *this; }
-  inline T& operator -=(const T i) { data = uclip<bits>(data  - i); return *this; }
-  inline T& operator *=(const T i) { data = uclip<bits>(data  * i); return *this; }
-  inline T& operator /=(const T i) { data = uclip<bits>(data  / i); return *this; }
-  inline T& operator %=(const T i) { data = uclip<bits>(data  % i); return *this; }
+  inline T operator ++(int) { T r = data; data = uclip<bits>(data + 1); return r; }
+  inline T operator --(int) { T r = data; data = uclip<bits>(data - 1); return r; }
+  inline T operator ++() { return data = uclip<bits>(data + 1); }
+  inline T operator --() { return data = uclip<bits>(data - 1); }
+  inline T operator  =(const T i) { return data = uclip<bits>(i); }
+  inline T operator |=(const T i) { return data = uclip<bits>(data  | i); }
+  inline T operator ^=(const T i) { return data = uclip<bits>(data  ^ i); }
+  inline T operator &=(const T i) { return data = uclip<bits>(data  & i); }
+  inline T operator<<=(const T i) { return data = uclip<bits>(data << i); }
+  inline T operator>>=(const T i) { return data = uclip<bits>(data >> i); }
+  inline T operator +=(const T i) { return data = uclip<bits>(data  + i); }
+  inline T operator -=(const T i) { return data = uclip<bits>(data  - i); }
+  inline T operator *=(const T i) { return data = uclip<bits>(data  * i); }
+  inline T operator /=(const T i) { return data = uclip<bits>(data  / i); }
+  inline T operator %=(const T i) { return data = uclip<bits>(data  % i); }
 
   inline uint_t() : data(0) {}
   inline uint_t(const T i) : data(uclip<bits>(i)) {}
@@ -68,36 +69,26 @@ private:
 
 public:
   inline operator T() const { return data; }
-  inline T  operator ++(int) { T r = data; data = sclip<bits>(data + 1); return r; }
-  inline T  operator --(int) { T r = data; data = sclip<bits>(data - 1); return r; }
-  inline T& operator ++() { data = sclip<bits>(data + 1); return *this; }
-  inline T& operator --() { data = sclip<bits>(data - 1); return *this; }
-  inline T& operator  =(const T i) { data = sclip<bits>(i); return *this; }
-  inline T& operator |=(const T i) { data = sclip<bits>(data  | i); return *this; }
-  inline T& operator ^=(const T i) { data = sclip<bits>(data  ^ i); return *this; }
-  inline T& operator &=(const T i) { data = sclip<bits>(data  & i); return *this; }
-  inline T& operator<<=(const T i) { data = sclip<bits>(data << i); return *this; }
-  inline T& operator>>=(const T i) { data = sclip<bits>(data >> i); return *this; }
-  inline T& operator +=(const T i) { data = sclip<bits>(data  + i); return *this; }
-  inline T& operator -=(const T i) { data = sclip<bits>(data  - i); return *this; }
-  inline T& operator *=(const T i) { data = sclip<bits>(data  * i); return *this; }
-  inline T& operator /=(const T i) { data = sclip<bits>(data  / i); return *this; }
-  inline T& operator %=(const T i) { data = sclip<bits>(data  % i); return *this; }
+  inline T operator ++(int) { T r = data; data = sclip<bits>(data + 1); return r; }
+  inline T operator --(int) { T r = data; data = sclip<bits>(data - 1); return r; }
+  inline T operator ++() { return data = sclip<bits>(data + 1); }
+  inline T operator --() { return data = sclip<bits>(data - 1); }
+  inline T operator  =(const T i) { return data = sclip<bits>(i); }
+  inline T operator |=(const T i) { return data = sclip<bits>(data  | i); }
+  inline T operator ^=(const T i) { return data = sclip<bits>(data  ^ i); }
+  inline T operator &=(const T i) { return data = sclip<bits>(data  & i); }
+  inline T operator<<=(const T i) { return data = sclip<bits>(data << i); }
+  inline T operator>>=(const T i) { return data = sclip<bits>(data >> i); }
+  inline T operator +=(const T i) { return data = sclip<bits>(data  + i); }
+  inline T operator -=(const T i) { return data = sclip<bits>(data  - i); }
+  inline T operator *=(const T i) { return data = sclip<bits>(data  * i); }
+  inline T operator /=(const T i) { return data = sclip<bits>(data  / i); }
+  inline T operator %=(const T i) { return data = sclip<bits>(data  % i); }
 
   inline int_t() : data(0) {}
   inline int_t(const T i) : data(sclip<bits>(i)) {}
 };
 
-typedef int_t<24> int24_t;
-typedef uint_t<24> uint24_t;
-typedef int_t<48> int48_t;
-typedef uint_t<48> uint48_t;
-
 } //namespace nall
 
-using nall::int24_t;
-using nall::uint24_t;
-using nall::int48_t;
-using nall::uint48_t;
-
 #endif //ifndef NALL_VARINT_HPP

src/lib/ruby/audio/alsa.cpp

@@ -0,0 +1,138 @@
+#include <alsa/asoundlib.h>
+
+#include <ruby/ruby.h>
+
+namespace ruby {
+
+#include "alsa.h"
+
+class pAudioALSA {
+public:
+  AudioALSA &self;
+
+  struct {
+    snd_pcm_t *handle;
+    snd_pcm_format_t format;
+    snd_pcm_uframes_t buffer_size;
+    snd_pcm_uframes_t period_size;
+    int channels;
+    const char *name;
+    unsigned latency;
+  } device;
+
+  struct {
+    uint32_t *data;
+    unsigned length;
+  } buffer;
+
+  struct {
+    unsigned frequency;
+  } settings;
+
+  bool cap(Audio::Setting setting) {
+    if(setting == Audio::Frequency) return true;
+    return false;
+  }
+
+  uintptr_t get(Audio::Setting setting) {
+    if(setting == Audio::Frequency) return settings.frequency;
+    return false;
+  }
+
+  bool set(Audio::Setting setting, uintptr_t param) {
+    if(setting == Audio::Frequency) {
+      settings.frequency = param;
+      if(device.handle) {
+        term();
+        init();
+      }
+      return true;
+    }
+    return false;
+  }
+
+  void sample(uint16_t left, uint16_t right) {
+    if(!device.handle) return;
+
+    buffer.data[buffer.length++] = left + (right << 16);
+    if(buffer.length < device.period_size) return;
+    uint32_t *buffer_ptr = buffer.data;
+    do {
+      snd_pcm_sframes_t written = snd_pcm_writei(device.handle, buffer_ptr, buffer.length);
+      if(written < 0) {
+        //no samples written
+        snd_pcm_recover(device.handle, written, 1);
+      } else if(written < buffer.length) {
+        //only some samples written
+        buffer.length -= written;
+        buffer_ptr += written;
+      } else {
+        //all samples written
+        buffer.length = 0;
+      }
+    } while(buffer.length > 0);
+  }
+
+  bool init() {
+    if(snd_pcm_open(&device.handle, device.name, SND_PCM_STREAM_PLAYBACK, 0) < 0) {
+      //failed to initialize
+      term();
+      return false;
+    }
+
+    if(snd_pcm_set_params(device.handle, device.format, SND_PCM_ACCESS_RW_INTERLEAVED,
+      device.channels, settings.frequency, 1, device.latency) < 0) {
+      //failed to set device parameters
+      term();
+      return false;
+    }
+
+    if(snd_pcm_get_params(device.handle, &device.buffer_size, &device.period_size) < 0) {
+      device.period_size = device.latency * 1e-6 * settings.frequency / 4;
+    }
+
+    buffer.data = new uint32_t[device.period_size];
+    return true;
+  }
+
+  void term() {
+    if(device.handle) {
+      snd_pcm_drain(device.handle);
+      snd_pcm_close(device.handle);
+      device.handle = 0;
+    }
+
+    if(buffer.data) {
+      delete[] buffer.data;
+      buffer.data = 0;
+	}
+  }
+
+  pAudioALSA(AudioALSA &self_) : self(self_) {
+    device.handle = 0;
+    device.format = SND_PCM_FORMAT_S16_LE;
+    device.channels = 2;
+    device.name = "default";
+    device.latency = 100000;
+
+    buffer.data = 0;
+    buffer.length = 0;
+
+    settings.frequency = 22050;
+  }
+
+  ~pAudioALSA() {
+    term();
+  }
+};
+
+bool AudioALSA::cap(Setting setting) { return p.cap(setting); }
+uintptr_t AudioALSA::get(Setting setting) { return p.get(setting); }
+bool AudioALSA::set(Setting setting, uintptr_t param) { return p.set(setting, param); }
+void AudioALSA::sample(uint16_t left, uint16_t right) { p.sample(left, right); }
+bool AudioALSA::init() { return p.init(); }
+void AudioALSA::term() { p.term(); }
+AudioALSA::AudioALSA() : p(*new pAudioALSA(*this)) {}
+AudioALSA::~AudioALSA() { delete &p; }
+
+} //namespace ruby

src/lib/ruby/audio/alsa.h

@@ -0,0 +1,23 @@
+/*
+  audio.alsa (2008-06-01)
+  authors: Nach, RedDwarf
+*/
+
+class pAudioALSA;
+
+class AudioALSA : public Audio {
+public:
+  bool cap(Setting);
+  uintptr_t get(Setting);
+  bool set(Setting, uintptr_t);
+
+  void sample(uint16_t left, uint16_t right);
+  bool init();
+  void term();
+
+  AudioALSA();
+  ~AudioALSA();
+
+private:
+  pAudioALSA &p;
+};

src/lib/ruby/audio/ao.cpp

@@ -47,16 +47,23 @@ public:
 
   bool init() {
     driver_id = ao_default_driver_id(); //ao_driver_id((const char*)driver)
-    if(driver_id < 0) driver_id = ao_default_driver_id(); //fallback on default if driver doesn't exist
+    if(driver_id < 0) return false;
+
     driver_format.bits = 16;
     driver_format.channels = 2;
     driver_format.rate = settings.frequency;
     driver_format.byte_format = AO_FMT_LITTLE;
 
-    audio_device = ao_open_live(driver_id, &driver_format, 0);
+    ao_option *options = 0;
+    ao_info *di = ao_driver_info(driver_id);
+    if(!di) return false;
+    if(!strcmp(di->short_name, "alsa")) {
+      ao_append_option(&options, "buffer_time", "100000"); //100ms latency (default was 500ms)
+    }
+
+    audio_device = ao_open_live(driver_id, &driver_format, options);
     if(!audio_device) return false;
 
-    ao_info *di = ao_driver_info(driver_id);
     return true;
   }
 

src/lib/ruby/audio/ao.h

@@ -1,6 +1,6 @@
 /*
-  audio.ao (2007-12-26)
-  author: Nach
+  audio.ao (2008-06-01)
+  authors: Nach, RedDwarf
 */
 
 class pAudioAO;

src/lib/ruby/input.h

@@ -2,6 +2,7 @@ class Input {
 public:
   enum Setting {
     Handle,
+    AnalogAxisResistance,
   };
 
   virtual bool cap(Setting) { return false; }

src/lib/ruby/input/directinput.cpp

@@ -25,15 +25,18 @@ public:
 
   struct {
     HWND handle;
+    unsigned analog_axis_resistance;
   } settings;
 
   bool cap(Input::Setting setting) {
     if(setting == Input::Handle) return true;
+    if(setting == Input::AnalogAxisResistance) return true;
     return false;
   }
 
   uintptr_t get(Input::Setting setting) {
     if(setting == Input::Handle) return (uintptr_t)settings.handle;
+    if(setting == Input::AnalogAxisResistance) return settings.analog_axis_resistance;
     return false;
   }
 
@@ -42,6 +45,12 @@ public:
       settings.handle = (HWND)param;
       return true;
     }
+
+    if(setting == Input::AnalogAxisResistance) {
+      settings.analog_axis_resistance = param;
+      return true;
+    }
+
     return false;
   }
 
@@ -79,9 +88,9 @@ public:
       memcpy(keystate + index, js.rgbButtons, 128);
 
       //map d-pad axes
-      int resistance = 75; //config::input.axis_resistance;
+      int resistance = settings.analog_axis_resistance;
       resistance = max(1, min(99, resistance));
-      resistance = int32_t(double(resistance) * 32768.0 / 100.0);
+      resistance = int(double(resistance) * 32768.0 / 100.0);
       int resistance_lo = 0x7fff - resistance;
       int resistance_hi = 0x8000 + resistance;
       keystate[index + 0x80] = (js.lY <= resistance_lo) ? 0x80 : 0x00;
@@ -297,6 +306,9 @@ public:
     di = 0;
     di_key = 0;
     for(int i = 0; i < DIRECTINPUT_JOYMAX; i++) di_joy[i] = 0;
+
+    settings.handle = 0;
+    settings.analog_axis_resistance = 75;
   }
 
   ~pInputDI() { term(); }

src/lib/ruby/input/sdl.cpp

@@ -54,6 +54,29 @@ public:
   Display *display;
   #endif
 
+  struct {
+    unsigned analog_axis_resistance;
+  } settings;
+
+  bool cap(Input::Setting setting) {
+    if(setting == Input::AnalogAxisResistance) return true;
+    return false;
+  }
+
+  uintptr_t get(Input::Setting setting) {
+    if(setting == Input::AnalogAxisResistance) return settings.analog_axis_resistance;
+    return false;
+  }
+
+  bool set(Input::Setting setting, uintptr_t param) {
+    if(setting == Input::AnalogAxisResistance) {
+      settings.analog_axis_resistance = param;
+      return true;
+    }
+
+    return false;
+  }
+
   bool key_down(uint16_t key) {
     #if !defined(_WIN32)
     #define map(i) (keystate[i >> 3] & (1 << (i & 7)))
@@ -220,6 +243,10 @@ public:
       joystate[i][joy_left]  = false;
       joystate[i][joy_right] = false;
 
+      int resistance = settings.analog_axis_resistance;
+      resistance = max(1, min(99, resistance));
+      resistance = int(double(resistance) * 32768.0 / 100.0);
+
       //only poll X,Y axes for D-pad, left analog and right analog.
       //note 1: right analog is swapped on some controllers, this cannot be helped.
       //note 2: some controllers report more axes than physically exist.
@@ -229,11 +256,11 @@ public:
       for(int a = 0; a < min(axes, 6); a++) {
         int value = SDL_JoystickGetAxis(joy[i], a);
         if((a & 1) == 0) { //X axis
-          joystate[i][joy_left]  |= value < -16384;
-          joystate[i][joy_right] |= value > +16384;
+          joystate[i][joy_left]  |= value < -resistance;
+          joystate[i][joy_right] |= value > +resistance;
         } else { //Y axis
-          joystate[i][joy_up]    |= value < -16384;
-          joystate[i][joy_down]  |= value > +16384;
+          joystate[i][joy_up]    |= value < -resistance;
+          joystate[i][joy_down]  |= value > +resistance;
         }
       }
 
@@ -268,10 +295,15 @@ public:
   pInputSDL(InputSDL &self_) : self(self_) {
     for(int i = 0; i < 16; i++) joy[i] = 0;
     clear();
+
+    settings.analog_axis_resistance = 75;
   }
 };
 
 
+bool InputSDL::cap(Setting setting) { return p.cap(setting); }
+uintptr_t InputSDL::get(Setting setting) { return p.get(setting); }
+bool InputSDL::set(Setting setting, uintptr_t param) { return p.set(setting, param); }
 bool InputSDL::key_down(uint16_t key) { return p.key_down(key); }
 void InputSDL::clear() { p.clear(); }
 void InputSDL::poll() { p.poll(); }

src/lib/ruby/input/sdl.h

@@ -2,6 +2,10 @@ class pInputSDL;
 
 class InputSDL : public Input {
 public:
+  bool cap(Setting);
+  uintptr_t get(Setting);
+  bool set(Setting, uintptr_t);
+
   bool key_down(uint16_t key);
 
   void clear();

src/lib/ruby/ruby.cpp

@@ -92,6 +92,10 @@ void AudioInterface::driver(const char *driver) {
 
   if(!strcmp(driver, "none")) p = new Audio();
 
+  #ifdef AUDIO_ALSA
+  else if(!strcmp(driver, "alsa")) p = new AudioALSA();
+  #endif
+
   #ifdef AUDIO_AO
   else if(!strcmp(driver, "ao")) p = new AudioAO();
   #endif
@@ -114,6 +118,8 @@ void AudioInterface::driver(const char *driver) {
   p = new AudioDS();
   #elif defined(AUDIO_AO)
   p = new AudioAO();
+  #elif defined(AUDIO_ALSA)
+  p = new AudioALSA();
   #elif defined(AUDIO_OPENAL)
   p = new AudioOpenAL();
   #elif defined(AUDIO_OSS)

src/lib/ruby/ruby.h

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

src/lib/ruby/ruby_impl.cpp

@@ -30,6 +30,10 @@
 
 /* Audio */
 
+#ifdef AUDIO_ALSA
+  #include <ruby/audio/alsa.cpp>
+#endif
+
 #ifdef AUDIO_AO
   #include <ruby/audio/ao.cpp>
 #endif