Update to bsnes v014 release.

This version adds speed regulation, greatly improves PPU rendering, and increases speed by ~30% over the previous version. Changelog: - Rewrote offset-per-tile mode emulation, should be correct now. Fixes Chrono Trigger, Contra III, Tetris Attack, etc. - Fixed a bug with HDMA occuring during interrupts. Fixes Tales of Phantasia souond test screen - Updated compiler to Visual Studio 2005, and enabled profile guided optimizations - Added conditional compilation of debugging functions (faster without them) - Added conditional compilation of core classes as pointers (allowing polymorphism) or objects (allowing inlining). The latter results in a speed increase - Small fixes to BG and OAM rendering routines - Corrected sprite tile bounds wrapping - Corrected sprite rendering in hires video modes - Rewrote color add/sub routines, should be correct now. Fixes Illusion of Gaia menu, etc. - Optimized video blitting routines, will temporarilly break mixed video mode screenshots - Prevented selecting menu options via return key from being recognized as keypresses by the emulator - Added system speed regulation (60hz/NTSC or 50hz/PAL)! Many thanks to kode54, GIGO, and Richard Bannister for their assistance I disabled the debugger and polymorphism, and enabled profile guided optimizations for this build, to maximize speed. The debugger and polymorphism can be re-enabled via uncommenting the respective #defines in src/base.h and recompiling, or bsnes v0.013 can be used. I may start releasing two separate builds in the future... not sure yet.
Update to bsnes v013r02 release.
2026-11-09 01:09:46 -10:00 · 2005-11-12 16:49:26 +00:00 · 2005-10-25 23:25:28 +00:00 · 2005-10-23 23:32:30 +00:00 · 2005-10-02 00:38:34 +00:00 · 2005-08-26 20:38:00 +00:00
1952 changed files with 30957 additions and 283049 deletions
@@ -1,5 +0,0 @@
-purify/*.o
-purify/purify
-purify/analyze-gba
-ananke/ananke.o
-ananke/libananke.so
@@ -1,51 +0,0 @@
-include nall/Makefile
-include phoenix/Makefile
-
-path := /usr/local/lib
-flags := -I. -O3 -fomit-frame-pointer
-ifeq ($(arch),win32)
-  flags := -m32 $(flags)
-endif
-
-all:
-	$(cpp) $(flags) -fPIC -o ananke.o -c ananke.cpp
-ifeq ($(platform),x)
-	$(cpp) $(flags) -shared -Wl,-soname,libananke.so.1 -o libananke.so ananke.o
-else ifeq ($(platform),win)
-	$(cpp) $(flags) -fPIC -o phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
-	$(cpp) $(flags) -shared -o phoenix.dll phoenix.o $(phoenixlink)
-	$(cpp) $(flags) -shared -o ananke.dll ananke.o -L. -lphoenix
-endif
-
-resource: force
-	sourcery resource/resource.bml resource/resource.cpp resource/resource.hpp
-
-clean:
-	-@$(call delete,*.o)
-	-@$(call delete,*.so)
-
-install: uninstall
-ifeq ($(platform),x)
-	if [ ! -d ~/.config/ananke ]; then mkdir ~/.config/ananke; fi
-	sudo cp libananke.so $(path)/libananke.so.1
-	sudo ln -s $(path)/libananke.so.1 $(path)/libananke.so
-endif
-
-uninstall:
-ifeq ($(platform),x)
-	if [ -f $(path)/libananke.so ]; then sudo rm $(path)/libananke.so; fi
-	if [ -f $(path)/libananke.so.1 ]; then sudo rm $(path)/libananke.so.1; fi
-endif
-
-sync:
-ifeq ($(shell id -un),byuu)
-	if [ -d ./nall ]; then rm -r ./nall; fi
-	if [ -d ./phoenix ]; then rm -r ./phoenix; fi
-	cp -r ../nall ./nall
-	cp -r ../phoenix ./phoenix
-	rm -r nall/test
-	rm -r phoenix/nall
-	rm -r phoenix/test
-endif
-
-force:
@@ -1,143 +0,0 @@
-#include <nall/nall.hpp>
-#include <nall/beat/patch.hpp>
-#include "heuristics/famicom.hpp"
-#include "heuristics/super-famicom.hpp"
-#include "heuristics/game-boy.hpp"
-#include "heuristics/game-boy-advance.hpp"
-using namespace nall;
-
-#include <phoenix/phoenix.hpp>
-using namespace phoenix;
-
-namespace Database {
-  #include "database/super-famicom.hpp"
-  #include "database/sufami-turbo.hpp"
-  #include "database/bsx-satellaview.hpp"
-};
-
-struct Ananke {
-  #include "configuration.cpp"
-
-  struct Information {
-    string path;      //path to selected file
-    string name;      //name of selected file (inside of archive if .zip)
-    string archive;   //pathname of archive
-    string manifest;  //manifest from successfully applied patch
-  } information;
-
-  //archive.cpp
-  vector<uint8_t> extractROM();
-  vector<uint8_t> extractFile(const string &filename);
-
-  //patch.cpp
-  void applyBeatPatch(vector<uint8_t> &buffer);
-
-  //famicom.cpp
-  void copyFamicomSaves(const string &pathname);
-  string createFamicomHeuristic(vector<uint8_t> &buffer);
-  string openFamicom(vector<uint8_t> &buffer);
-
-  //super-famicom.cpp
-  void copySuperFamicomSaves(const string &pathname);
-  string createSuperFamicomDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest);
-  string createSuperFamicomHeuristic(vector<uint8_t> &buffer);
-  void createSuperFamicomHeuristicFirmware(vector<uint8_t> &buffer, const string &pathname, bool firmware_appended);
-  string openSuperFamicom(vector<uint8_t> &buffer);
-
-  //sufami-turbo.cpp
-  void copySufamiTurboSaves(const string &pathname);
-  string createSufamiTurboDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest);
-  string createSufamiTurboHeuristic(vector<uint8_t> &buffer);
-  string openSufamiTurbo(vector<uint8_t> &buffer);
-
-  //bsx-satellaview.cpp
-  string createBsxSatellaviewDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest);
-  string createBsxSatellaviewHeuristic(vector<uint8_t> &buffer);
-  string openBsxSatellaview(vector<uint8_t> &buffer);
-
-  //game-boy.cpp
-  void copyGameBoySaves(const string &pathname);
-  string createGameBoyHeuristic(vector<uint8_t> &buffer);
-  string openGameBoy(vector<uint8_t> &buffer);
-
-  //game-boy-advance.cpp
-  void copyGameBoyAdvanceSaves(const string &pathname);
-  string createGameBoyAdvanceHeuristic(vector<uint8_t> &buffer);
-  string openGameBoyAdvance(vector<uint8_t> &buffer);
-
-  static bool supported(const string &filename);
-  string open(string filename = "");
-};
-
-#include "resource/resource.cpp"
-#include "file-dialog.cpp"
-#include "archive.cpp"
-#include "patch.cpp"
-#include "famicom.cpp"
-#include "super-famicom.cpp"
-#include "sufami-turbo.cpp"
-#include "bsx-satellaview.cpp"
-#include "game-boy.cpp"
-#include "game-boy-advance.cpp"
-
-FileDialog *fileDialog = nullptr;
-
-bool Ananke::supported(const string &filename) {
-  string extension = nall::extension(filename);
-
-  if(extension == "fc" ) return true;
-  if(extension == "nes") return true;
-  if(extension == "sfc") return true;
-  if(extension == "smc") return true;
-  if(extension == "st" ) return true;
-  if(extension == "bs" ) return true;
-  if(extension == "gb" ) return true;
-  if(extension == "gbc") return true;
-  if(extension == "gba") return true;
-  if(extension == "zip") return true;
-
-  return false;
-}
-
-string Ananke::open(string filename) {
-  if(filename.empty()) {
-    if(!fileDialog) fileDialog = new FileDialog;
-    fileDialog->setPath(config.path);
-    filename = fileDialog->open();
-  }
-
-  if(filename.empty()) return "";
-
-  information.path = dir(filename);
-  information.name = notdir(filename);
-  config.path = information.path;  //remember last used directory
-
-  vector<uint8_t> buffer;
-  if(filename.endswith(".zip")) {
-    information.archive = filename;
-    buffer = extractROM();
-  } else {
-    buffer = file::read(filename);
-  }
-  if(buffer.size() == 0) return "";  //failed to read file
-
-  applyBeatPatch(buffer);
-
-  if(information.name.endswith(".fc") || information.name.endswith(".nes")) return openFamicom(buffer);
-  if(information.name.endswith(".sfc") || information.name.endswith(".smc")) return openSuperFamicom(buffer);
-  if(information.name.endswith(".st")) return openSufamiTurbo(buffer);
-  if(information.name.endswith(".bs")) return openBsxSatellaview(buffer);
-  if(information.name.endswith(".gb") || information.name.endswith(".gbc")) return openGameBoy(buffer);
-  if(information.name.endswith(".gba")) return openGameBoyAdvance(buffer);
-  return "";
-}
-
-extern "C" string ananke_browse(const string &filename) {
-  Ananke ananke;
-  return ananke.open();
-}
-
-extern "C" string ananke_open(const string &filename) {
-  Ananke ananke;
-  return ananke.open(filename);
-}
@@ -1,29 +0,0 @@
-vector<uint8_t> Ananke::extractROM() {
-  unzip archive;
-  if(archive.open(information.archive)) {
-    for(auto &file : archive.file) {
-      if(
-         file.name.endswith(".fc") || file.name.endswith(".nes")
-      || file.name.endswith(".sfc") || file.name.endswith(".smc")
-      || file.name.endswith(".gb") || file.name.endswith(".gbc")
-      || file.name.endswith(".gba")
-      ) {
-        information.name = notdir(file.name);
-        return archive.extract(file);
-      }
-    }
-  }
-  return vector<uint8_t>();
-}
-
-vector<uint8_t> Ananke::extractFile(const string &filename) {
-  unzip archive;
-  if(archive.open(information.archive)) {
-    for(auto &file : archive.file) {
-      if(notdir(file.name) == filename) {
-        return archive.extract(file);
-      }
-    }
-  }
-  return vector<uint8_t>();
-}
@@ -1,60 +0,0 @@
-string Ananke::createBsxSatellaviewDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest) {
-  string pathname = {
-    userpath(), "Emulation/BS-X Satellaview/",
-    document["release/information/name"].text(),
-    " (", document["release/information/region"].text(), ")",
-    " (", document["release/information/revision"].text(), ")",
-    ".bs/"
-  };
-  directory::create(pathname);
-
-  //strip "release" root node from database entry (since a single game manifest isn't part of a database)
-  string markup = manifest;
-  markup.replace("\n  ", "\n");
-  markup.replace("information", "\ninformation");
-  markup.ltrim<1>("release\n");
-
-  file::write({pathname, "manifest.bml"}, markup);
-  file::write({pathname, "program.rom"}, buffer);
-
-  return "";
-}
-
-string Ananke::createBsxSatellaviewHeuristic(vector<uint8_t> &buffer) {
-  string pathname = {
-    userpath(), "Emulation/BS-X Satellaview/",
-    nall::basename(information.name),
-    " (!).bs/"
-  };
-  directory::create(pathname);
-
-  file::write({pathname, "manifest.bml"}, {
-    "cartridge\n"
-    "  rom name=program.rom size=0x", hex(buffer.size()), " type=FlashROM\n",
-    "\n",
-    "information\n",
-    "  title: ", nall::basename(information.name), "\n"
-  });
-  file::write({pathname, "program.rom"}, buffer);
-
-  return "";
-}
-
-string Ananke::openBsxSatellaview(vector<uint8_t> &buffer) {
-  string sha256 = nall::sha256(buffer.data(), buffer.size());
-
-  string databaseText = string::read({configpath(), "ananke/database/BS-X Satellaview.bml"}).strip();
-  if(databaseText.empty()) databaseText = string{Database::BsxSatellaview}.strip();
-  lstring databaseItem = databaseText.split("\n\n");
-
-  for(auto &item : databaseItem) {
-    item.append("\n");
-    auto document = Markup::Document(item);
-
-    if(document["release/information/sha256"].text() == sha256) {
-      return createBsxSatellaviewDatabase(buffer, document, item);
-    }
-  }
-
-  return createBsxSatellaviewHeuristic(buffer);
-}
@@ -1,13 +0,0 @@
-struct Configuration : configuration {
-  string path;
-
-  Configuration() {
-    append(path = userpath(), "Path");
-    directory::create({configpath(), "ananke/"});
-    load({configpath(), "ananke/settings.cfg"});
-  }
-
-  ~Configuration() {
-    save({configpath(), "ananke/settings.cfg"});
-  }
-} config;
@@ -1,19 +0,0 @@
-string BsxSatellaview = R"(
-
-database revision=2013-01-12
-
-release
-  cartridge
-    rom name=program.rom size=0x80000 type=MaskROM
-  information
-    title:    鮫亀 キャラカセット
-    name:     Same Game - Character Cassette
-    region:   JP
-    revision: 1.0
-    board:    BSMC-CR-01
-    serial:   BSMC-ZS5J-JPN
-    sha256:   80c34b50817d58820bc8c88d2d9fa462550b4a76372e19c6467cbfbc8cf5d9ef
-    configuration
-      rom name=program.rom size=0x80000 type=MaskROM
-
-)";
@@ -1,162 +0,0 @@
-string SufamiTurbo = R"(
-
-database revision=2013-01-12
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x800
-  information
-    title:    SDウルトラバトル ウルトラマン伝説
-    name:     SD Ultra Battle - Ultraman Densetsu
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0101-JPN
-    sha256:   2bb55214fb668ca603d7b944b14f105dfb10b987a8902d420fe4ae1cb69c1d4a
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x800
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x800
-  information
-    title:    SDウルトラバトル セブン伝説
-    name:     SD Ultra Battle - Seven Densetsu
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0102-JPN
-    sha256:   2fec5f2bc7dee010af10569a3d2bc18715a79a126940800c3eade5abbd625e3f
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x800
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x800
-  information
-    title:    ポイポイ忍者ワールド
-    name:     Poi Poi Ninja World
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0103-JPN
-    sha256:   602b20b788640f5743487108a10f3f77bca5ce2d24208b25b1ca498a96eb0d69
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x800
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x2000
-  information
-    title:    SDガンダムジェネレーション 一年戦争記
-    name:     SD Gundam Generation - Ichinen Sensouki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0104-JPN
-    sha256:   3e82215bed08274874b30d461fc4a965c6bca932229da5d46d56e36f484d65eb
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x2000
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x2000
-  information
-    title:    SDガンダムジェネレーション グリプス戦記
-    name:     SD Gundam Generation - Grips Senki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0105-JPN
-    sha256:   8547a08ed11fe408eac282a90ac46654bd2e5f49bda3aec8e5edf166a0a4b9af
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x2000
-      linkable
-
-release
-  cartridge
-    rom name=program.rom size=0x80000
-  information
-    title:    ゲゲゲの鬼太郎 妖怪ドンジャラ
-    name:     Gegege no Kitarou - Youkai Donjara
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0106-JPN
-    sha256:   d93b3a570e7cf343f680ab0768a50b77e3577f9c555007e2de3decd6bc4765c8
-    configuration
-      rom name=program.rom size=0x80000
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x2000
-  information
-    title:    SDガンダムジェネレーション アクシズ戦記
-    name:     SD Gundam Generation - Axis Senki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0107-JPN
-    sha256:   2a9d7c9a61318861028a73ca03e32a48cff162d76cba36fbaab8690b212efe9b
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x2000
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x2000
-  information
-    title:    SDガンダムジェネレーション バビロニア建国戦記
-    name:     SD Gundam Generation - Babylonia Kenkoku Senki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0108-JPN
-    sha256:   60ac017c18f534e8cf24ca7f38e22ce92db95ea6c30b2d59d76f13c4f1c8a6e4
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x2000
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x2000
-  information
-    title:    SDガンダムジェネレーション ザンスカール戦記
-    name:     SD Gundam Generation - Zanscar Senki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0110-JPN
-    sha256:   5951a58a91d8e397d0a237ccc2b1248e17c7312cb9cc11cbc350200a97b4e021
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x2000
-      linkable
-
-release
-  cartridge linkable
-    rom name=program.rom size=0x80000
-    ram name=save.ram size=0x800
-  information
-    title:    SDガンダムジェネレーション コロニー格闘記
-    name:     SD Gundam Generation - Colony Kakutouki
-    region:   JP
-    revision: 1.0
-    serial:   SFT-0111-JPN
-    sha256:   e639b5d5d722432b6809ccc6801dc584e1a3016379f34b335ed2dfa73b1ebf69
-    configuration
-      rom name=program.rom size=0x80000
-      ram name=save.ram size=0x800
-      linkable
-
-)";
@@ -1,32 +0,0 @@
-void Ananke::copyFamicomSaves(const string &pathname) {
-  if(!file::exists({pathname, "save.ram"})) {
-    if(file::exists({information.path, nall::basename(information.name), ".sav"})) {
-      file::copy({information.path, nall::basename(information.name), ".srm"}, {pathname, "save.ram"});
-    }
-  }
-}
-
-string Ananke::createFamicomHeuristic(vector<uint8_t> &buffer) {
-  string pathname = {
-    userpath(), "Emulation/Famicom/",
-    nall::basename(information.name),
-    " (!).fc/"
-  };
-  directory::create(pathname);
-
-  FamicomCartridge info(buffer.data(), buffer.size());
-  string markup = info.markup();
-  markup.append("\ninformation\n  title: ", nall::basename(information.name), "\n");
-  if(!information.manifest.empty()) markup = information.manifest;  //override with embedded beat manifest, if one exists
-
-  file::write({pathname, "manifest.bml"}, markup);
-  file::write({pathname, "program.rom"}, buffer.data() + 16, info.prgrom);
-  if(info.chrrom > 0) file::write({pathname, "character.rom"}, buffer.data() + 16 + info.prgrom, info.chrrom);
-
-  copyFamicomSaves(pathname);
-  return pathname;
-}
-
-string Ananke::openFamicom(vector<uint8_t> &buffer) {
-  return createFamicomHeuristic(buffer);
-}
@@ -1,125 +0,0 @@
-struct FileDialog : Window {
-  VerticalLayout layout;
-    HorizontalLayout pathLayout;
-      LineEdit pathEdit;
-      Button homeButton;
-      Button upButton;
-    ListView fileList;
-    HorizontalLayout controlLayout;
-      Label filterLabel;
-      Button openButton;
-
-  string open() {
-    setModal();
-    setVisible();
-    fileList.setFocused();
-    filename = "";
-    bool backspace = false;
-
-    dialogActive = true;
-    while(dialogActive) {
-      OS::processEvents();
-      if(Keyboard::pressed(Keyboard::Scancode::Escape)) onClose();
-      if(Keyboard::pressed(Keyboard::Scancode::Backspace)) {
-        if(backspace == false) {
-          backspace = true;
-          if(fileList.focused()) upButton.onActivate();
-        }
-      } else {
-        backspace = false;
-      }
-      usleep(20 * 1000);
-    }
-
-    return filename;
-  }
-
-  void setPath(const string &path) {
-    pathname = string{path}.transform("\\", "/");
-    if(pathname.empty()) pathname = userpath();
-    if(pathname.endswith("/") == false) pathname.append("/");
-    pathEdit.setText(pathname);
-
-    fileList.reset();
-    filenameList.reset();
-
-    lstring folders = directory::ifolders(pathname);
-    for(auto &folder : folders) {
-      fileList.append(string{folder}.rtrim<1>("/"));
-      fileList.setImage(filenameList.size(), 0, {resource::folder, sizeof resource::folder});
-      filenameList.append({pathname, folder});
-    }
-
-    lstring files = directory::ifiles(pathname);
-    for(auto &file : files) {
-      if(Ananke::supported(file) == false) continue;  //ignore unsupported extensions
-      fileList.append(file);
-      if(extension(file) == "zip") {
-        fileList.setImage(filenameList.size(), 0, {resource::archive, sizeof resource::archive});
-      } else {
-        fileList.setImage(filenameList.size(), 0, {resource::file, sizeof resource::file});
-      }
-      filenameList.append({pathname, file});
-    }
-
-    fileList.setSelection(0);
-    fileList.setSelected();
-    fileList.setFocused();
-  }
-
-  FileDialog() {
-    setFrameGeometry({64, 64, 480, 600});
-    setTitle("Load Image");
-
-    layout.setMargin(5);
-    homeButton.setImage({resource::home, sizeof resource::home});
-    upButton.setImage({resource::up, sizeof resource::up});
-    filterLabel.setText("Filter: *.fc, *.sfc, *.st, *.bs, *.gb, *.gbc, *.gba, *.nes, *.smc, *.zip");
-    openButton.setText("Open");
-
-    append(layout);
-    layout.append(pathLayout, {~0, 0}, 5);
-      pathLayout.append(pathEdit, {~0, 0}, 5);
-      pathLayout.append(homeButton, {28, 28}, 5);
-      pathLayout.append(upButton, {28, 28});
-    layout.append(fileList, {~0, ~0}, 5);
-    layout.append(controlLayout, {~0, 0});
-      controlLayout.append(filterLabel, {~0, 0}, 5);
-      controlLayout.append(openButton, {80, 0});
-
-    pathEdit.onActivate = [&] {
-      string path = pathEdit.text();
-      setPath(path);
-    };
-
-    homeButton.onActivate = [&] {
-      setPath(userpath());
-    };
-
-    upButton.onActivate = [&] {
-      setPath(parentdir(pathname));
-    };
-
-    fileList.onActivate = openButton.onActivate = [&] {
-      if(fileList.selected() == false) return;
-      string name = filenameList(fileList.selection());
-      if(name.empty()) return;
-
-      if(name.endswith("/")) return setPath(name);
-      filename = name;
-      onClose();
-    };
-
-    onClose = [&] {
-      dialogActive = false;
-      setModal(false);
-      setVisible(false);
-    };
-  }
-
-private:
-  bool dialogActive;
-  string pathname;
-  string filename;
-  lstring filenameList;
-};
@@ -1,37 +0,0 @@
-void Ananke::copyGameBoyAdvanceSaves(const string &pathname) {
-  if(!file::exists({pathname, "save.ram"})) {
-    if(file::exists({information.path, nall::basename(information.name), ".sav"})) {
-      file::copy({information.path, nall::basename(information.name), ".sav"}, {pathname, "save.ram"});
-    }
-  }
-
-  if(!file::exists({pathname, "rtc.ram"})) {
-    if(file::exists({information.path, nall::basename(information.name), ".rtc"})) {
-      file::copy({information.path, nall::basename(information.name), ".rtc"}, {pathname, "rtc.ram"});
-    }
-  }
-}
-
-string Ananke::createGameBoyAdvanceHeuristic(vector<uint8_t> &buffer) {
-  string pathname = {
-    userpath(), "Emulation/Game Boy Advance/",
-    nall::basename(information.name),
-    " (!).gba/"
-  };
-  directory::create(pathname);
-
-  GameBoyAdvanceCartridge info(buffer.data(), buffer.size());
-  string markup = info.markup;
-  markup.append("\ninformation\n  title: ", nall::basename(information.name), "\n");
-  if(!information.manifest.empty()) markup = information.manifest;  //override with embedded beat manifest, if one exists
-
-  file::write({pathname, "manifest.bml"}, markup);
-  file::write({pathname, "program.rom"}, buffer);
-
-  copyGameBoyAdvanceSaves(pathname);
-  return pathname;
-}
-
-string Ananke::openGameBoyAdvance(vector<uint8_t> &buffer) {
-  return createGameBoyAdvanceHeuristic(buffer);
-}
@@ -1,39 +0,0 @@
-void Ananke::copyGameBoySaves(const string &pathname) {
-  if(!file::exists({pathname, "save.ram"})) {
-    if(file::exists({information.path, nall::basename(information.name), ".sav"})) {
-      file::copy({information.path, nall::basename(information.name), ".sav"}, {pathname, "save.ram"});
-    }
-  }
-
-  if(!file::exists({pathname, "rtc.ram"})) {
-    if(file::exists({information.path, nall::basename(information.name), ".rtc"})) {
-      file::copy({information.path, nall::basename(information.name), ".rtc"}, {pathname, "rtc.ram"});
-    }
-  }
-}
-
-string Ananke::createGameBoyHeuristic(vector<uint8_t> &buffer) {
-  GameBoyCartridge info(buffer.data(), buffer.size());
-
-  string pathname = {
-    userpath(),
-    "Emulation/Game Boy", (info.info.cgb ? " Color" : ""), "/",
-    nall::basename(information.name),
-    " (!).", (info.info.cgb ? "gbc" : "gb"), "/"
-  };
-  directory::create(pathname);
-
-  string markup = info.markup;
-  markup.append("\ninformation\n  title: ", nall::basename(information.name), "\n");
-  if(!information.manifest.empty()) markup = information.manifest;  //override with embedded beat manifest, if one exists
-
-  file::write({pathname, "manifest.bml"}, markup);
-  file::write({pathname, "program.rom"}, buffer);
-
-  copyGameBoySaves(pathname);
-  return pathname;
-}
-
-string Ananke::openGameBoy(vector<uint8_t> &buffer) {
-  return createGameBoyHeuristic(buffer);
-}
@@ -1,173 +0,0 @@
-#ifndef NALL_EMULATION_FAMICOM_HPP
-#define NALL_EMULATION_FAMICOM_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct FamicomCartridge {
-  string markup;
-  inline FamicomCartridge(const uint8_t *data, unsigned size);
-
-//private:
-  unsigned mapper;
-  unsigned mirror;
-  unsigned prgrom;
-  unsigned prgram;
-  unsigned chrrom;
-  unsigned chrram;
-};
-
-FamicomCartridge::FamicomCartridge(const uint8_t *data, unsigned size) {
-  markup = "";
-  if(size < 16) return;
-  if(data[0] != 'N') return;
-  if(data[1] != 'E') return;
-  if(data[2] != 'S') return;
-  if(data[3] !=  26) return;
-
-  mapper = ((data[7] >> 4) << 4) | (data[6] >> 4);
-  mirror = ((data[6] & 0x08) >> 2) | (data[6] & 0x01);
-  prgrom = data[4] * 0x4000;
-  chrrom = data[5] * 0x2000;
-  prgram = 0u;
-  chrram = chrrom == 0u ? 8192u : 0u;
-
-  markup.append("cartridge\n");
-
-  switch(mapper) {
-  default:
-    markup.append("  board type=NES-NROM-256\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    break;
-
-  case   1:
-    markup.append("  board type=NES-SXROM\n");
-    markup.append("  chip type=MMC1B2\n");
-    prgram = 8192;
-    break;
-
-  case   2:
-    markup.append("  board type=NES-UOROM\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    break;
-
-  case   3:
-    markup.append("  board type=NES-CNROM\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    break;
-
-  case   4:
-    //MMC3
-    markup.append("  board type=NES-TLROM\n");
-    markup.append("  chip type=MMC3B\n");
-    prgram = 8192;
-    //MMC6
-  //markup.append("  board type=NES-HKROM\n");
-  //markup.append("  chip type=MMC6n");
-  //prgram = 1024;
-    break;
-
-  case   5:
-    markup.append("  board type=NES-ELROM\n");
-    markup.append("  chip type=MMC5\n");
-    prgram = 65536;
-    break;
-
-  case   7:
-    markup.append("  board type=NES-AOROM\n");
-    break;
-
-  case   9:
-    markup.append("  board type=NES-PNROM\n");
-    markup.append("  chip type=MMC2\n");
-    prgram = 8192;
-    break;
-
-  case  10:
-    markup.append("  board type=NES-FKROM\n");
-    markup.append("  chip type=MMC4\n");
-    prgram = 8192;
-    break;
-
-  case  16:
-    markup.append("  board type=BANDAI-FCG\n");
-    markup.append("  chip type=LZ93D50\n");
-    break;
-
-  case  21:
-  case  23:
-  case  25:
-    //VRC4
-    markup.append("  board type=KONAMI-VRC-4\n");
-    markup.append("  chip type=VRC4\n");
-    markup.append("    pinout a0=1 a1=0\n");
-    prgram = 8192;
-    break;
-
-  case  22:
-    //VRC2
-    markup.append("  board type=KONAMI-VRC-2\n");
-    markup.append("  chip type=VRC2\n");
-    markup.append("    pinout a0=0 a1=1\n");
-    break;
-
-  case  24:
-    markup.append("  board type=KONAMI-VRC-6\n");
-    markup.append("  chip type=VRC6\n");
-    break;
-
-  case  26:
-    markup.append("  board type=KONAMI-VRC-6\n");
-    markup.append("  chip type=VRC6\n");
-    prgram = 8192;
-    break;
-
-  case  34:
-    markup.append("  board type=NES-BNROM\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    break;
-
-  case  66:
-    markup.append("  board type=NES-GNROM\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    break;
-
-  case  69:
-    markup.append("  board type=SUNSOFT-5B\n");
-    markup.append("  chip type=5B\n");
-    prgram = 8192;
-    break;
-
-  case  73:
-    markup.append("  board type=KONAMI-VRC-3\n");
-    markup.append("  chip type=VRC3\n");
-    markup.append("  mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
-    prgram = 8192;
-    break;
-
-  case  75:
-    markup.append("  board type=KONAMI-VRC-1\n");
-    markup.append("  chip type=VRC1\n");
-    break;
-
-  case  85:
-    markup.append("  board type=KONAMI-VRC-7\n");
-    markup.append("  chip type=VRC7\n");
-    prgram = 8192;
-    break;
-  }
-
-  markup.append("  prg\n");
-  if(prgrom) markup.append("    rom name=program.rom size=0x", hex(prgrom), "\n");
-  if(prgram) markup.append("    ram name=save.ram size=0x", hex(prgram), "\n");
-
-  markup.append("  chr\n");
-  if(chrrom) markup.append("    rom name=character.rom size=0x", hex(chrrom), "\n");
-  if(chrram) markup.append("    ram size=0x", hex(chrram), "\n");
-}
-
-}
-
-#endif
@@ -1,63 +0,0 @@
-#ifndef NALL_EMULATION_GAME_BOY_ADVANCE_HPP
-#define NALL_EMULATION_GAME_BOY_ADVANCE_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-#include <nall/vector.hpp>
-
-namespace nall {
-
-struct GameBoyAdvanceCartridge {
-  string markup;
-  string identifiers;
-  inline GameBoyAdvanceCartridge(const uint8_t *data, unsigned size);
-};
-
-GameBoyAdvanceCartridge::GameBoyAdvanceCartridge(const uint8_t *data, unsigned size) {
-  struct Identifier {
-    string name;
-    unsigned size;
-  };
-  vector<Identifier> idlist;
-  idlist.append({"SRAM_V",      6});
-  idlist.append({"SRAM_F_V",    8});
-  idlist.append({"EEPROM_V",    8});
-  idlist.append({"FLASH_V",     7});
-  idlist.append({"FLASH512_V", 10});
-  idlist.append({"FLASH1M_V",   9});
-
-  lstring list;
-  for(auto &id : idlist) {
-    for(signed n = 0; n < size - 16; n++) {
-      if(!memcmp(data + n, (const char*)id.name, id.size)) {
-        const char *p = (const char*)data + n + id.size;
-        if(p[0] >= '0' && p[0] <= '9'
-        && p[1] >= '0' && p[1] <= '9'
-        && p[2] >= '0' && p[2] <= '9'
-        ) {
-          char text[16];
-          memcpy(text, data + n, id.size + 3);
-          text[id.size + 3] = 0;
-          list.appendonce(text);
-        }
-      }
-    }
-  }
-  identifiers = list.concatenate(",");
-
-  markup = "";
-  markup.append("cartridge\n");
-  markup.append("  rom name=program.rom size=0x", hex(size), "\n");
-  if(0);
-  else if(identifiers.beginswith("SRAM_V"    )) markup.append("  ram name=save.ram type=SRAM size=0x8000\n");
-  else if(identifiers.beginswith("SRAM_F_V"  )) markup.append("  ram name=save.ram type=FRAM size=0x8000\n");
-  else if(identifiers.beginswith("EEPROM_V"  )) markup.append("  ram name=save.ram type=EEPROM size=0x0\n");
-  else if(identifiers.beginswith("FLASH_V"   )) markup.append("  ram name=save.ram type=FlashROM size=0x10000\n");
-  else if(identifiers.beginswith("FLASH512_V")) markup.append("  ram name=save.ram type=FlashROM size=0x10000\n");
-  else if(identifiers.beginswith("FLASH1M_V" )) markup.append("  ram name=save.ram type=FlashROM size=0x20000\n");
-//if(identifiers.empty() == false) markup.append("  #detected: ", identifiers, "\n");
-}
-
-}
-
-#endif
@@ -1,120 +0,0 @@
-#ifndef NALL_EMULATION_GAME_BOY_HPP
-#define NALL_EMULATION_GAME_BOY_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct GameBoyCartridge {
-  string markup;
-  inline GameBoyCartridge(uint8_t *data, unsigned size);
-
-//private:
-  struct Information {
-    string mapper;
-    bool ram;
-    bool battery;
-    bool rtc;
-    bool rumble;
-
-    unsigned romsize;
-    unsigned ramsize;
-
-    bool cgb;
-    bool cgbonly;
-  } info;
-};
-
-GameBoyCartridge::GameBoyCartridge(uint8_t *romdata, unsigned romsize) {
-  markup = "";
-  if(romsize < 0x4000) return;
-
-  info.mapper = "unknown";
-  info.ram = false;
-  info.battery = false;
-  info.rtc = false;
-  info.rumble = false;
-
-  info.romsize = 0;
-  info.ramsize = 0;
-
-  unsigned base = romsize - 0x8000;
-  if(romdata[base + 0x0104] == 0xce && romdata[base + 0x0105] == 0xed
-  && romdata[base + 0x0106] == 0x66 && romdata[base + 0x0107] == 0x66
-  && romdata[base + 0x0108] == 0xcc && romdata[base + 0x0109] == 0x0d
-  && romdata[base + 0x0147] >= 0x0b && romdata[base + 0x0147] <= 0x0d
-  ) {
-    //MMM01 stores header at bottom of image
-    //flip this around for consistency with all other mappers
-    uint8_t header[0x8000];
-    memcpy(header, romdata + base, 0x8000);
-    memmove(romdata + 0x8000, romdata, romsize - 0x8000);
-    memcpy(romdata, header, 0x8000);
-  }
-
-  info.cgb     = (romdata[0x0143] & 0x80) == 0x80;
-  info.cgbonly = (romdata[0x0143] & 0xc0) == 0xc0;
-
-  switch(romdata[0x0147]) {
-    case 0x00: info.mapper = "none";  break;
-    case 0x01: info.mapper = "MBC1";  break;
-    case 0x02: info.mapper = "MBC1";  info.ram = true; break;
-    case 0x03: info.mapper = "MBC1";  info.ram = true; info.battery = true; break;
-    case 0x05: info.mapper = "MBC2";  info.ram = true; break;
-    case 0x06: info.mapper = "MBC2";  info.ram = true; info.battery = true; break;
-    case 0x08: info.mapper = "none";  info.ram = true; break;
-    case 0x09: info.mapper = "MBC0";  info.ram = true; info.battery = true; break;
-    case 0x0b: info.mapper = "MMM01"; break;
-    case 0x0c: info.mapper = "MMM01"; info.ram = true; break;
-    case 0x0d: info.mapper = "MMM01"; info.ram = true; info.battery = true; break;
-    case 0x0f: info.mapper = "MBC3";  info.rtc = true; info.battery = true; break;
-    case 0x10: info.mapper = "MBC3";  info.rtc = true; info.ram = true; info.battery = true; break;
-    case 0x11: info.mapper = "MBC3";  break;
-    case 0x12: info.mapper = "MBC3";  info.ram = true; break;
-    case 0x13: info.mapper = "MBC3";  info.ram = true; info.battery = true; break;
-    case 0x19: info.mapper = "MBC5";  break;
-    case 0x1a: info.mapper = "MBC5";  info.ram = true; break;
-    case 0x1b: info.mapper = "MBC5";  info.ram = true; info.battery = true; break;
-    case 0x1c: info.mapper = "MBC5";  info.rumble = true; break;
-    case 0x1d: info.mapper = "MBC5";  info.rumble = true; info.ram = true; break;
-    case 0x1e: info.mapper = "MBC5";  info.rumble = true; info.ram = true; info.battery = true; break;
-    case 0xfc: break;  //Pocket Camera
-    case 0xfd: break;  //Bandai TAMA5
-    case 0xfe: info.mapper = "HuC3";  break;
-    case 0xff: info.mapper = "HuC1";  info.ram = true; info.battery = true; break;
-  }
-
-  switch(romdata[0x0148]) { default:
-    case 0x00: info.romsize =   2 * 16 * 1024; break;
-    case 0x01: info.romsize =   4 * 16 * 1024; break;
-    case 0x02: info.romsize =   8 * 16 * 1024; break;
-    case 0x03: info.romsize =  16 * 16 * 1024; break;
-    case 0x04: info.romsize =  32 * 16 * 1024; break;
-    case 0x05: info.romsize =  64 * 16 * 1024; break;
-    case 0x06: info.romsize = 128 * 16 * 1024; break;
-    case 0x07: info.romsize = 256 * 16 * 1024; break;
-    case 0x52: info.romsize =  72 * 16 * 1024; break;
-    case 0x53: info.romsize =  80 * 16 * 1024; break;
-    case 0x54: info.romsize =  96 * 16 * 1024; break;
-  }
-
-  switch(romdata[0x0149]) { default:
-    case 0x00: info.ramsize =  0 * 1024; break;
-    case 0x01: info.ramsize =  2 * 1024; break;
-    case 0x02: info.ramsize =  8 * 1024; break;
-    case 0x03: info.ramsize = 32 * 1024; break;
-  }
-
-  if(info.mapper == "MBC2") info.ramsize = 512;  //512 x 4-bit
-
-  markup = "";
-  markup.append("cartridge\n");
-  markup.append("  board type=", info.mapper, "\n");
-  markup.append("  rom name=program.rom size=0x", hex(romsize), "\n");
-  if(info.ramsize > 0) markup.append("  ram name=save.ram size=0x", hex(info.ramsize), "\n");
-}
-
-}
-
-#endif
@@ -1,26 +0,0 @@
-#ifndef NALL_EMULATION_SATELLAVIEW_HPP
-#define NALL_EMULATION_SATELLAVIEW_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct SatellaviewCartridge {
-  string markup;
-  inline SatellaviewCartridge(const uint8_t *data, unsigned size);
-};
-
-SatellaviewCartridge::SatellaviewCartridge(const uint8_t *data, unsigned size) {
-  markup = "";
-
-  markup.append("<?xml version='1.0' encoding='UTF-8'?>\n");
-  markup.append("<cartridge sha256='", sha256(data, size) ,"'>\n");
-  markup.append("  <rom name='program.rom' size='0x", hex(size), "'/>\n");
-  markup.append("</cartridge>\n");
-  markup.transform("'", "\"");
-}
-
-}
-
-#endif
@@ -1,33 +0,0 @@
-#ifndef NALL_EMULATION_SUFAMI_TURBO_HPP
-#define NALL_EMULATION_SUFAMI_TURBO_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct SufamiTurboCartridge {
-  string markup;
-  inline SufamiTurboCartridge(const uint8_t *data, unsigned size);
-};
-
-SufamiTurboCartridge::SufamiTurboCartridge(const uint8_t *data, unsigned size) {
-  markup = "";
-
-  if(size < 0x20000) return;  //too small to be a valid game?
-  if(memcmp(data, "BANDAI SFC-ADX", 14)) return;  //missing required header?
-  unsigned romsize = data[0x36] * 0x20000;  //128KB
-  unsigned ramsize = data[0x37] *   0x800;    //2KB
-  bool linkable = data[0x35] != 0x00;  //TODO: unconfirmed
-
-  markup.append("<?xml version='1.0' encoding='UTF-8'?>\n");
-  markup.append("<cartridge linkable='", linkable, "' sha256='", sha256(data, size) ,"'>\n");
-  markup.append("  <rom name='program.rom' size='0x", hex(romsize), "'/>\n");
-  markup.append("  <ram name='save.ram' size='0x", hex(ramsize), "'/>\n");
-  markup.append("</cartridge>\n");
-  markup.transform("'", "\"");
-}
-
-}
-
-#endif
@@ -1,814 +0,0 @@
-#ifndef NALL_EMULATION_SUPER_FAMICOM_HPP
-#define NALL_EMULATION_SUPER_FAMICOM_HPP
-
-#include <nall/sha256.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct SuperFamicomCartridge {
-  string markup;
-  inline SuperFamicomCartridge(const uint8_t *data, unsigned size);
-
-//private:
-  inline void read_header(const uint8_t *data, unsigned size);
-  inline unsigned find_header(const uint8_t *data, unsigned size);
-  inline unsigned score_header(const uint8_t *data, unsigned size, unsigned addr);
-
-  enum HeaderField {
-    CartName    = 0x00,
-    Mapper      = 0x15,
-    RomType     = 0x16,
-    RomSize     = 0x17,
-    RamSize     = 0x18,
-    CartRegion  = 0x19,
-    Company     = 0x1a,
-    Version     = 0x1b,
-    Complement  = 0x1c,  //inverse checksum
-    Checksum    = 0x1e,
-    ResetVector = 0x3c,
-  };
-
-  enum Mode {
-    ModeNormal,
-    ModeBsxSlotted,
-    ModeBsx,
-    ModeSufamiTurbo,
-    ModeSuperGameBoy,
-  };
-
-  enum Type {
-    TypeNormal,
-    TypeBsxSlotted,
-    TypeBsxBios,
-    TypeBsx,
-    TypeSufamiTurboBios,
-    TypeSufamiTurbo,
-    TypeSuperGameBoy1Bios,
-    TypeSuperGameBoy2Bios,
-    TypeGameBoy,
-    TypeUnknown,
-  };
-
-  enum Region {
-    NTSC,
-    PAL,
-  };
-
-  enum MemoryMapper {
-    LoROM,
-    HiROM,
-    ExLoROM,
-    ExHiROM,
-    SuperFXROM,
-    SA1ROM,
-    SPC7110ROM,
-    BSCLoROM,
-    BSCHiROM,
-    BSXROM,
-    STROM,
-  };
-
-  enum DSP1MemoryMapper {
-    DSP1Unmapped,
-    DSP1LoROM1MB,
-    DSP1LoROM2MB,
-    DSP1HiROM,
-  };
-
-  bool loaded;             //is a base cartridge inserted?
-  unsigned crc32;          //crc32 of all cartridges (base+slot(s))
-  unsigned rom_size;
-  unsigned ram_size;
-  bool firmware_appended;  //true if firmware is appended to end of ROM data
-
-  Mode mode;
-  Type type;
-  Region region;
-  MemoryMapper mapper;
-  DSP1MemoryMapper dsp1_mapper;
-
-  bool has_bsx_slot;
-  bool has_superfx;
-  bool has_sa1;
-  bool has_srtc;
-  bool has_sdd1;
-  bool has_spc7110;
-  bool has_spc7110rtc;
-  bool has_cx4;
-  bool has_dsp1;
-  bool has_dsp2;
-  bool has_dsp3;
-  bool has_dsp4;
-  bool has_obc1;
-  bool has_st010;
-  bool has_st011;
-  bool has_st018;
-};
-
-SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size) {
-  firmware_appended = false;
-
-  //skip copier header
-  if((size & 0x7fff) == 512) data += 512, size -= 512;
-
-  markup = "";
-  if(size < 0x8000) return;
-
-  read_header(data, size);
-
-  markup = "";
-  if(type == TypeGameBoy) return;
-  if(type == TypeBsx) return;
-  if(type == TypeSufamiTurbo) return;
-
-  const char *range = (rom_size > 0x200000) || (ram_size > 32 * 1024) ? "0000-7fff" : "0000-ffff";
-  markup.append("cartridge region=", region == NTSC ? "NTSC" : "PAL", "\n");
-
-  if(type == TypeSuperGameBoy1Bios || type == TypeSuperGameBoy2Bios) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-      "  map id=rom address=00-7f,80-ff:8000-ffff\n"
-      "  icd2 revision=1\n"
-      "    rom name=boot.rom size=0x100\n"
-      "    map id=io address=00-3f,80-bf:6000-7fff\n"
-    );
-    if((rom_size & 0x7fff) == 0x100) {
-      firmware_appended = true;
-      rom_size -= 0x100;
-    }
-  }
-
-  else if(has_cx4) {
-    markup.append(
-      "  hitachidsp model=HG51B169 frequency=20000000\n"
-      "    rom id=program name=program.rom size=0x", hex(rom_size), "\n"
-      "    rom id=data name=cx4.data.rom size=0xc00\n"
-      "    ram id=data size=0xc00\n"
-      "    map id=io address=00-3f,80-bf:6000-7fff\n"
-      "    map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000\n"
-      "    map id=ram address=70-77:0000-7fff\n"
-    );
-    if((rom_size & 0x7fff) == 0xc00) {
-      firmware_appended = true;
-      rom_size -= 0xc00;
-    }
-  }
-
-  else if(has_spc7110) {
-    markup.append(
-      "  spc7110\n"
-      "    rom id=program name=program.rom size=0x100000\n"
-      "    rom id=data name=data.rom size=0x", hex(rom_size - 0x100000), "\n"
-      "    ram name=save.ram size=0x", hex(ram_size), "\n"
-      "    map id=io address=00-3f,80-bf:4800-483f\n"
-      "    map id=io address=50:0000-ffff\n"
-      "    map id=rom address=00-3f,80-bf:8000-ffff\n"
-      "    map id=rom address=c0-ff:0000-ffff\n"
-      "    map id=ram address=00-3f,80-bf:6000-7fff mask=0xe000\n"
-    );
-  }
-
-  else if(has_sdd1) {
-    markup.append(
-      "  sdd1\n"
-      "    rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "    map id=io address=00-3f,80-bf:4800-4807\n"
-      "    map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000\n"
-      "    map id=rom address=c0-ff:0000-ffff\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    map id=ram address=20-3f,a0-bf:6000-7fff mask=0xe000\n"
-      "    map id=ram address=70-7f:0000-7fff\n"
-    );
-  }
-
-  else if(mapper == LoROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "  map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  map id=ram address=70-7f,f0-ff:", range, "\n"
-    );
-  }
-
-  else if(mapper == HiROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "  map id=rom address=00-3f,80-bf:8000-ffff\n"
-      "  map id=rom address=40-7f,c0-ff:0000-ffff\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  map id=ram address=10-3f,90-bf:6000-7fff mask=0xe000\n"
-    );
-  }
-
-  else if(mapper == ExLoROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "  map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000\n"
-      "  map id=rom address=40-7f:0000-ffff\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  map id=ram address=20-3f,a0-bf:6000-7fff\n"
-      "  map id=ram address=70-7f:0000-7fff\n"
-    );
-  }
-
-  else if(mapper == ExHiROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "  map id=rom address=00-3f:8000-ffff offset=0x400000\n"
-      "  map id=rom address=40-7f:0000-ffff offset=0x400000\n"
-      "  map id=rom address=80-bf:8000-ffff offset=0x000000\n"
-      "  map id=rom address=c0-ff:0000-ffff offset=0x000000\n"
-    );
-    if(ram_size > 0) markup.append(
-      "  map id=ram address=20-3f,a0-bf:6000-7fff mask=0xe000\n"
-      "  map id=ram address=70-7f:", range, "\n"
-    );
-  }
-
-  else if(mapper == SuperFXROM) {
-    markup.append(
-      "  superfx revision=3\n"
-      "    rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    ram name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "    map id=io address=00-3f,80-bf:3000-32ff\n"
-      "    map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000\n"
-      "    map id=rom address=40-5f,c0-df:0000-ffff\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    map id=ram address=00-3f,80-bf:6000-7fff size=0x2000\n"
-      "    map id=ram address=70-71,f0-f1:0000-ffff\n"
-    );
-  }
-
-  else if(mapper == SA1ROM) {
-    markup.append(
-      "  sa1\n"
-      "    rom name=program.rom size=0x", hex(rom_size), "\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    ram id=bitmap name=save.ram size=0x", hex(ram_size), "\n"
-    );
-    markup.append(
-      "    ram id=internal size=0x800\n"
-      "    map id=io address=00-3f,80-bf:2200-23ff\n"
-      "    map id=rom address=00-3f,80-bf:8000-ffff\n"
-      "    map id=rom address=c0-ff:0000-ffff\n"
-    );
-    if(ram_size > 0) markup.append(
-      "    map id=bwram address=00-3f,80-bf:6000-7fff\n"
-      "    map id=bwram address=40-4f:0000-ffff\n"
-    );
-    markup.append(
-      "    map id=iram address=00-3f,80-bf:3000-37ff\n"
-    );
-  }
-
-  else if(mapper == BSCLoROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-      "  map id=rom address=00-1f:8000-ffff offset=0x000000 mask=0x8000\n"
-      "  map id=rom address=20-3f:8000-ffff offset=0x100000 mask=0x8000\n"
-      "  map id=rom address=80-9f:8000-ffff offset=0x200000 mask=0x8000\n"
-      "  map id=rom address=a0-bf:8000-ffff offset=0x100000 mask=0x8000\n"
-      "  map id=ram address=70-7f,f0-ff:0000-7fff\n"
-      "  bsxslot\n"
-      "    map id=rom address=c0-ef:0000-ffff\n"
-    );
-  }
-
-  else if(mapper == BSCHiROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-      "  ram name=save.ram size=0x", hex(ram_size), "\n"
-      "  map id=rom address=00-1f,80-9f:8000-ffff\n"
-      "  map id=rom address=40-5f,c0-df:0000-ffff\n"
-      "  map id=ram address=20-3f,a0-bf:6000-7fff\n"
-      "  bsxslot\n"
-      "    map id=rom address=20-3f,a0-bf:8000-ffff\n"
-      "    map id=rom address=60-7f,e0-ff:0000-ffff\n"
-    );
-  }
-
-  else if(mapper == BSXROM) {
-    markup.append(
-      "  bsx\n"
-      "    rom name=program.rom size=0x", hex(rom_size), "\n"
-      "    ram id=save name=save.ram size=0x", hex(ram_size), "\n"
-      "    ram id=download name=bsx.ram size=0x40000\n"
-      "    map id=io address=00-3f,80-bf:5000-5fff\n"
-      "    map id=rom address=00-3f,80-bf:8000-ffff\n"
-      "    map id=rom address=40-7f,c0-ff:0000-ffff\n"
-      "    map id=ram address=20-3f:6000-7fff\n"
-    );
-  }
-
-  else if(mapper == STROM) {
-    markup.append(
-      "  rom name=program.rom size=0x", hex(rom_size), "\n"
-      "  map id=rom address='00-1f,80-9f:8000-ffff mask=0x8000\n"
-      "  sufamiturbo\n"
-      "    slot id=A\n"
-      "      map id=rom address=20-3f,a0-bf:8000-ffff mask=0x8000\n"
-      "      map id=ram address=60-63,e0-e3:8000-ffff\n"
-      "    slot id=B\n"
-      "      map id=rom address=40-5f,c0-df:8000-ffff mask=0x8000\n"
-      "      map id=ram address=70-73,f0-f3:8000-ffff\n"
-    );
-  }
-
-  if(has_spc7110rtc) {
-    markup.append(
-      "  epsonrtc\n"
-      "    ram name=rtc.ram size=0x10\n"
-      "    map id=io address=00-3f,80-bf:4840-4842\n"
-    );
-  }
-
-  if(has_srtc) {
-    markup.append(
-      "  sharprtc\n"
-      "    ram name=rtc.ram size=0x10\n"
-      "    map id=io address=00-3f,80-bf:2800-2801\n"
-    );
-  }
-
-  if(has_obc1) {
-    markup.append(
-      "  obc1\n"
-      "    ram name=save.ram size=0x2000\n"
-      "    map id=io address=00-3f,80-bf:6000-7fff\n"
-    );
-  }
-
-  if(has_dsp1) {
-    markup.append(
-      "  necdsp model=uPD7725 frequency=8000000\n"
-      "    rom id=program name=dsp1b.program.rom size=0x1800\n"
-      "    rom id=data name=dsp1b.data.rom size=0x800\n"
-      "    ram id=data size=0x200\n"
-    );
-    if(dsp1_mapper == DSP1LoROM1MB) markup.append(
-      "    map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
-    );
-    if(dsp1_mapper == DSP1LoROM2MB) markup.append(
-      "    map id=io address=60-6f,e0-ef:0000-7fff select=0x4000\n"
-    );
-    if(dsp1_mapper == DSP1HiROM) markup.append(
-      "    map id=io address=00-1f,80-9f:6000-7fff select=0x1000\n"
-    );
-    if((size & 0x7fff) == 0x2000) {
-      firmware_appended = true;
-      rom_size -= 0x2000;
-    }
-  }
-
-  if(has_dsp2) {
-    markup.append(
-      "  necdsp model=uPD7725 frequency=8000000\n"
-      "    rom id=program name=dsp2.program.rom size=0x1800\n"
-      "    rom id=data name=dsp2.data.rom size=0x800\n"
-      "    ram id=data size=0x200\n"
-      "    map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
-    );
-    if((size & 0x7fff) == 0x2000) {
-      firmware_appended = true;
-      rom_size -= 0x2000;
-    }
-  }
-
-  if(has_dsp3) {
-    markup.append(
-      "  necdsp model=uPD7725 frequency=8000000\n"
-      "    rom id=program name=dsp3.program.rom size=0x1800\n"
-      "    rom id=data name=dsp3.data.rom size=0x800\n"
-      "    ram id=data size=0x200\n"
-      "    map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
-    );
-    if((size & 0x7fff) == 0x2000) {
-      firmware_appended = true;
-      rom_size -= 0x2000;
-    }
-  }
-
-  if(has_dsp4) {
-    markup.append(
-      "  necdsp model=uPD7725 frequency=8000000\n"
-      "    rom id=program name=dsp4.program.rom size=0x1800\n"
-      "    rom id=data name=dsp4.data.rom size=0x800\n"
-      "    ram id=data size=0x200\n"
-      "    map address=30-3f,b0-bf:8000-ffff select=0x4000\n"
-    );
-    if((size & 0x7fff) == 0x2000) {
-      firmware_appended = true;
-      rom_size -= 0x2000;
-    }
-  }
-
-  if(has_st010) {
-    markup.append(
-      "  necdsp model=uPD96050 frequency=11000000\n"
-      "    rom id=program name=st010.program.rom size=0xc000\n"
-      "    rom id=data name=st010.data.rom size=0x1000\n"
-      "    ram id=data name=save.ram size=0x1000\n"
-      "    map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
-      "    map id=ram address=68-6f,e8-ef:0000-7fff\n"
-    );
-    if((size & 0xffff) == 0xd000) {
-      firmware_appended = true;
-      rom_size -= 0xd000;
-    }
-  }
-
-  if(has_st011) {
-    markup.append(
-      "  necdsp model=uPD96050 frequency=15000000\n"
-      "    rom id=program name=st011.program.rom size=0xc000\n"
-      "    rom id=data name=st011.data.rom size=0x1000\n"
-      "    ram id=data name=save.ram size=0x1000\n"
-      "    map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
-      "    map id=ram address=68-6f,e8-ef:0000-7fff\n"
-    );
-    if((size & 0xffff) == 0xd000) {
-      firmware_appended = true;
-      rom_size -= 0xd000;
-    }
-  }
-
-  if(has_st018) {
-    markup.append(
-      "  armdsp frequency=21477272\n"
-      "    rom id=program name=st018.program.rom size=0x20000\n"
-      "    rom id=data name=st018.data.rom size=0x8000\n"
-      "    ram name=save.ram size=0x4000\n"
-      "    map id=io address=00-3f,80-bf:3800-38ff\n"
-    );
-    if((size & 0x3ffff) == 0x28000) {
-      firmware_appended = true;
-      rom_size -= 0x28000;
-    }
-  }
-}
-
-void SuperFamicomCartridge::read_header(const uint8_t *data, unsigned size) {
-  type        = TypeUnknown;
-  mapper      = LoROM;
-  dsp1_mapper = DSP1Unmapped;
-  region      = NTSC;
-  rom_size    = size;
-  ram_size    = 0;
-
-  has_bsx_slot   = false;
-  has_superfx    = false;
-  has_sa1        = false;
-  has_srtc       = false;
-  has_sdd1       = false;
-  has_spc7110    = false;
-  has_spc7110rtc = false;
-  has_cx4        = false;
-  has_dsp1       = false;
-  has_dsp2       = false;
-  has_dsp3       = false;
-  has_dsp4       = false;
-  has_obc1       = false;
-  has_st010      = false;
-  has_st011      = false;
-  has_st018      = false;
-
-  //=====================
-  //detect Game Boy carts
-  //=====================
-
-  if(size >= 0x0140) {
-    if(data[0x0104] == 0xce && data[0x0105] == 0xed && data[0x0106] == 0x66 && data[0x0107] == 0x66
-    && data[0x0108] == 0xcc && data[0x0109] == 0x0d && data[0x010a] == 0x00 && data[0x010b] == 0x0b) {
-      type = TypeGameBoy;
-      return;
-    }
-  }
-
-  if(size < 32768) {
-    type = TypeUnknown;
-    return;
-  }
-
-  const unsigned index = find_header(data, size);
-  const uint8_t mapperid = data[index + Mapper];
-  const uint8_t rom_type = data[index + RomType];
-  const uint8_t rom_size = data[index + RomSize];
-  const uint8_t company  = data[index + Company];
-  const uint8_t regionid = data[index + CartRegion] & 0x7f;
-
-  ram_size = 1024 << (data[index + RamSize] & 7);
-  if(ram_size == 1024) ram_size = 0;  //no RAM present
-  if(rom_size == 0 && ram_size) ram_size = 0;  //fix for Bazooka Blitzkrieg's malformed header (swapped ROM and RAM sizes)
-
-  //0, 1, 13 = NTSC; 2 - 12 = PAL
-  region = (regionid <= 1 || regionid >= 13) ? NTSC : PAL;
-
-  //=======================
-  //detect BS-X flash carts
-  //=======================
-
-  if(data[index + 0x13] == 0x00 || data[index + 0x13] == 0xff) {
-    if(data[index + 0x14] == 0x00) {
-      const uint8_t n15 = data[index + 0x15];
-      if(n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c || n15 == 0xbc || n15 == 0xfc) {
-        if(data[index + 0x1a] == 0x33 || data[index + 0x1a] == 0xff) {
-          type = TypeBsx;
-          mapper = BSXROM;
-          region = NTSC;  //BS-X only released in Japan
-          return;
-        }
-      }
-    }
-  }
-
-  //=========================
-  //detect Sufami Turbo carts
-  //=========================
-
-  if(!memcmp(data, "BANDAI SFC-ADX", 14)) {
-    if(!memcmp(data + 16, "SFC-ADX BACKUP", 14)) {
-      type = TypeSufamiTurboBios;
-    } else {
-      type = TypeSufamiTurbo;
-    }
-    mapper = STROM;
-    region = NTSC;  //Sufami Turbo only released in Japan
-    return;         //RAM size handled outside this routine
-  }
-
-  //==========================
-  //detect Super Game Boy BIOS
-  //==========================
-
-  if(!memcmp(data + index, "Super GAMEBOY2", 14)) {
-    type = TypeSuperGameBoy2Bios;
-    return;
-  }
-
-  if(!memcmp(data + index, "Super GAMEBOY", 13)) {
-    type = TypeSuperGameBoy1Bios;
-    return;
-  }
-
-  //=====================
-  //detect standard carts
-  //=====================
-
-  //detect presence of BS-X flash cartridge connector (reads extended header information)
-  if(data[index - 14] == 'Z') {
-    if(data[index - 11] == 'J') {
-      uint8_t n13 = data[index - 13];
-      if((n13 >= 'A' && n13 <= 'Z') || (n13 >= '0' && n13 <= '9')) {
-        if(company == 0x33 || (data[index - 10] == 0x00 && data[index - 4] == 0x00)) {
-          has_bsx_slot = true;
-        }
-      }
-    }
-  }
-
-  if(has_bsx_slot) {
-    if(!memcmp(data + index, "Satellaview BS-X     ", 21)) {
-      //BS-X base cart
-      type = TypeBsxBios;
-      mapper = BSXROM;
-      region = NTSC;  //BS-X only released in Japan
-      return;         //RAM size handled internally by load_cart_bsx() -> BSXCart class
-    } else {
-      type = TypeBsxSlotted;
-      mapper = (index == 0x7fc0 ? BSCLoROM : BSCHiROM);
-      region = NTSC;  //BS-X slotted cartridges only released in Japan
-    }
-  } else {
-    //standard cart
-    type = TypeNormal;
-
-    if(index == 0x7fc0 && size >= 0x401000) {
-      mapper = ExLoROM;
-    } else if(index == 0x7fc0 && mapperid == 0x32) {
-      mapper = ExLoROM;
-    } else if(index == 0x7fc0) {
-      mapper = LoROM;
-    } else if(index == 0xffc0) {
-      mapper = HiROM;
-    } else {  //index == 0x40ffc0
-      mapper = ExHiROM;
-    }
-  }
-
-  if(mapperid == 0x20 && (rom_type == 0x13 || rom_type == 0x14 || rom_type == 0x15 || rom_type == 0x1a)) {
-    has_superfx = true;
-    mapper = SuperFXROM;
-    ram_size = 1024 << (data[index - 3] & 7);
-    if(ram_size == 1024) ram_size = 0;
-  }
-
-  if(mapperid == 0x23 && (rom_type == 0x32 || rom_type == 0x34 || rom_type == 0x35)) {
-    has_sa1 = true;
-    mapper = SA1ROM;
-  }
-
-  if(mapperid == 0x35 && rom_type == 0x55) {
-    has_srtc = true;
-  }
-
-  if(mapperid == 0x32 && (rom_type == 0x43 || rom_type == 0x45)) {
-    has_sdd1 = true;
-  }
-
-  if(mapperid == 0x3a && (rom_type == 0xf5 || rom_type == 0xf9)) {
-    has_spc7110 = true;
-    has_spc7110rtc = (rom_type == 0xf9);
-    mapper = SPC7110ROM;
-  }
-
-  if(mapperid == 0x20 && rom_type == 0xf3) {
-    has_cx4 = true;
-  }
-
-  if((mapperid == 0x20 || mapperid == 0x21) && rom_type == 0x03) {
-    has_dsp1 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0x05 && company != 0xb2) {
-    has_dsp1 = true;
-  }
-
-  if(mapperid == 0x31 && (rom_type == 0x03 || rom_type == 0x05)) {
-    has_dsp1 = true;
-  }
-
-  if(has_dsp1 == true) {
-    if((mapperid & 0x2f) == 0x20 && size <= 0x100000) {
-      dsp1_mapper = DSP1LoROM1MB;
-    } else if((mapperid & 0x2f) == 0x20) {
-      dsp1_mapper = DSP1LoROM2MB;
-    } else if((mapperid & 0x2f) == 0x21) {
-      dsp1_mapper = DSP1HiROM;
-    }
-  }
-
-  if(mapperid == 0x20 && rom_type == 0x05) {
-    has_dsp2 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0x05 && company == 0xb2) {
-    has_dsp3 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0x03) {
-    has_dsp4 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0x25) {
-    has_obc1 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0xf6 && rom_size >= 10) {
-    has_st010 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0xf6 && rom_size < 10) {
-    has_st011 = true;
-  }
-
-  if(mapperid == 0x30 && rom_type == 0xf5) {
-    has_st018 = true;
-  }
-}
-
-unsigned SuperFamicomCartridge::find_header(const uint8_t *data, unsigned size) {
-  unsigned score_lo = score_header(data, size, 0x007fc0);
-  unsigned score_hi = score_header(data, size, 0x00ffc0);
-  unsigned score_ex = score_header(data, size, 0x40ffc0);
-  if(score_ex) score_ex += 4;  //favor ExHiROM on images > 32mbits
-
-  if(score_lo >= score_hi && score_lo >= score_ex) {
-    return 0x007fc0;
-  } else if(score_hi >= score_ex) {
-    return 0x00ffc0;
-  } else {
-    return 0x40ffc0;
-  }
-}
-
-unsigned SuperFamicomCartridge::score_header(const uint8_t *data, unsigned size, unsigned addr) {
-  if(size < addr + 64) return 0;  //image too small to contain header at this location?
-  int score = 0;
-
-  uint16_t resetvector = data[addr + ResetVector] | (data[addr + ResetVector + 1] << 8);
-  uint16_t checksum    = data[addr + Checksum   ] | (data[addr + Checksum    + 1] << 8);
-  uint16_t complement  = data[addr + Complement ] | (data[addr + Complement  + 1] << 8);
-
-  uint8_t resetop = data[(addr & ~0x7fff) | (resetvector & 0x7fff)];  //first opcode executed upon reset
-  uint8_t mapper  = data[addr + Mapper] & ~0x10;                      //mask off irrelevent FastROM-capable bit
-
-  //$00:[000-7fff] contains uninitialized RAM and MMIO.
-  //reset vector must point to ROM at $00:[8000-ffff] to be considered valid.
-  if(resetvector < 0x8000) return 0;
-
-  //some images duplicate the header in multiple locations, and others have completely
-  //invalid header information that cannot be relied upon.
-  //below code will analyze the first opcode executed at the specified reset vector to
-  //determine the probability that this is the correct header.
-
-  //most likely opcodes
-  if(resetop == 0x78  //sei
-  || resetop == 0x18  //clc (clc; xce)
-  || resetop == 0x38  //sec (sec; xce)
-  || resetop == 0x9c  //stz $nnnn (stz $4200)
-  || resetop == 0x4c  //jmp $nnnn
-  || resetop == 0x5c  //jml $nnnnnn
-  ) score += 8;
-
-  //plausible opcodes
-  if(resetop == 0xc2  //rep #$nn
-  || resetop == 0xe2  //sep #$nn
-  || resetop == 0xad  //lda $nnnn
-  || resetop == 0xae  //ldx $nnnn
-  || resetop == 0xac  //ldy $nnnn
-  || resetop == 0xaf  //lda $nnnnnn
-  || resetop == 0xa9  //lda #$nn
-  || resetop == 0xa2  //ldx #$nn
-  || resetop == 0xa0  //ldy #$nn
-  || resetop == 0x20  //jsr $nnnn
-  || resetop == 0x22  //jsl $nnnnnn
-  ) score += 4;
-
-  //implausible opcodes
-  if(resetop == 0x40  //rti
-  || resetop == 0x60  //rts
-  || resetop == 0x6b  //rtl
-  || resetop == 0xcd  //cmp $nnnn
-  || resetop == 0xec  //cpx $nnnn
-  || resetop == 0xcc  //cpy $nnnn
-  ) score -= 4;
-
-  //least likely opcodes
-  if(resetop == 0x00  //brk #$nn
-  || resetop == 0x02  //cop #$nn
-  || resetop == 0xdb  //stp
-  || resetop == 0x42  //wdm
-  || resetop == 0xff  //sbc $nnnnnn,x
-  ) score -= 8;
-
-  //at times, both the header and reset vector's first opcode will match ...
-  //fallback and rely on info validity in these cases to determine more likely header.
-
-  //a valid checksum is the biggest indicator of a valid header.
-  if((checksum + complement) == 0xffff && (checksum != 0) && (complement != 0)) score += 4;
-
-  if(addr == 0x007fc0 && mapper == 0x20) score += 2;  //0x20 is usually LoROM
-  if(addr == 0x00ffc0 && mapper == 0x21) score += 2;  //0x21 is usually HiROM
-  if(addr == 0x007fc0 && mapper == 0x22) score += 2;  //0x22 is usually ExLoROM
-  if(addr == 0x40ffc0 && mapper == 0x25) score += 2;  //0x25 is usually ExHiROM
-
-  if(data[addr + Company] == 0x33) score += 2;        //0x33 indicates extended header
-  if(data[addr + RomType] < 0x08) score++;
-  if(data[addr + RomSize] < 0x10) score++;
-  if(data[addr + RamSize] < 0x08) score++;
-  if(data[addr + CartRegion] < 14) score++;
-
-  if(score < 0) score = 0;
-  return score;
-}
-
-}
-
-#endif
@@ -1,118 +0,0 @@
-# Makefile
-# author: byuu
-# license: public domain
-
-[A-Z] = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-[a-z] = a b c d e f g h i j k l m n o p q r s t u v w x y z
-[0-9] = 0 1 2 3 4 5 6 7 8 9
-[markup] = ` ~ ! @ \# $$ % ^ & * ( ) - _ = + [ { ] } \ | ; : ' " , < . > / ?
-[all] = $([A-Z]) $([a-z]) $([0-9]) $([markup])
-[space] :=
-[space] +=
-
-#####
-# platform detection
-#####
-
-ifeq ($(platform),)
-  uname := $(shell uname -a)
-  ifeq ($(uname),)
-    platform := win
-    delete = del $(subst /,\,$1)
-  else ifneq ($(findstring Windows,$(uname)),)
-    platform := win
-    delete = del $(subst /,\,$1)
-  else ifneq ($(findstring CYGWIN,$(uname)),)
-    platform := win
-    delete = del $(subst /,\,$1)
-  else ifneq ($(findstring Darwin,$(uname)),)
-    platform := osx
-    delete = rm -f $1
-  else
-    platform := x
-    delete = rm -f $1
-  endif
-endif
-
-ifeq ($(compiler),)
-  ifeq ($(platform),win)
-    compiler := gcc
-  else ifeq ($(platform),osx)
-    compiler := gcc-mp-4.7
-  else
-    compiler := gcc-4.7
-  endif
-endif
-
-c := $(compiler) -std=gnu99
-cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
-
-ifeq ($(prefix),)
-  prefix := /usr/local
-endif
-
-#####
-# function rwildcard(directory, pattern)
-#####
-rwildcard = \
-  $(strip \
-    $(filter $(if $2,$2,%), \
-      $(foreach f, \
-        $(wildcard $1*), \
-        $(eval t = $(call rwildcard,$f/)) \
-        $(if $t,$t,$f) \
-      ) \
-    ) \
-  )
-
-#####
-# function strtr(source, from, to)
-#####
-strtr = \
-  $(eval __temp := $1) \
-  $(strip \
-    $(foreach c, \
-      $(join $(addsuffix :,$2),$3), \
-      $(eval __temp := \
-        $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),$(__temp)) \
-      ) \
-    ) \
-    $(__temp) \
-  )
-
-#####
-# function strupper(source)
-#####
-strupper = $(call strtr,$1,$([a-z]),$([A-Z]))
-
-#####
-# function strlower(source)
-#####
-strlower = $(call strtr,$1,$([A-Z]),$([a-z]))
-
-#####
-# function strlen(source)
-#####
-strlen = \
-  $(eval __temp := $(subst $([space]),_,$1)) \
-  $(words \
-    $(strip \
-      $(foreach c, \
-        $([all]), \
-        $(eval __temp := \
-          $(subst $c,$c ,$(__temp)) \
-        ) \
-      ) \
-      $(__temp) \
-    ) \
-  )
-
-#####
-# function streq(source)
-#####
-streq = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),,1)
-
-#####
-# function strne(source)
-#####
-strne = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),1,)
@@ -1,17 +0,0 @@
-#ifndef NALL_ALGORITHM_HPP
-#define NALL_ALGORITHM_HPP
-
-#undef min
-#undef max
-
-namespace nall {
-  template<typename T, typename U> T min(const T &t, const U &u) {
-    return t < u ? t : u;
-  }
-
-  template<typename T, typename U> T max(const T &t, const U &u) {
-    return t > u ? t : u;
-  }
-}
-
-#endif
@@ -1,73 +0,0 @@
-#ifndef NALL_ANY_HPP
-#define NALL_ANY_HPP
-
-#include <typeinfo>
-#include <nall/traits.hpp>
-
-namespace nall {
-  struct any {
-    bool empty() const { return container; }
-    const std::type_info& type() const { return container ? container->type() : typeid(void); }
-
-    template<typename T> any& operator=(const T& value_) {
-      typedef typename type_if<
-        std::is_array<T>::value,
-        typename std::remove_extent<typename std::add_const<T>::type>::type*,
-        T
-      >::type auto_t;
-
-      if(type() == typeid(auto_t)) {
-        static_cast<holder<auto_t>*>(container)->value = (auto_t)value_;
-      } else {
-        if(container) delete container;
-        container = new holder<auto_t>((auto_t)value_);
-      }
-
-      return *this;
-    }
-
-    any() : container(nullptr) {}
-    ~any() { if(container) delete container; }
-    template<typename T> any(const T& value_) : container(nullptr) { operator=(value_); }
-
-  private:
-    struct placeholder {
-      virtual const std::type_info& type() const = 0;
-    } *container;
-
-    template<typename T> struct holder : placeholder {
-      T value;
-      const std::type_info& type() const { return typeid(T); }
-      holder(const T& value_) : value(value_) {}
-    };
-
-    template<typename T> friend T any_cast(any&);
-    template<typename T> friend T any_cast(const any&);
-    template<typename T> friend T* any_cast(any*);
-    template<typename T> friend const T* any_cast(const any*);
-  };
-
-  template<typename T> T any_cast(any &value) {
-    typedef typename std::remove_reference<T>::type nonref;
-    if(value.type() != typeid(nonref)) throw;
-    return static_cast<any::holder<nonref>*>(value.container)->value;
-  }
-
-  template<typename T> T any_cast(const any &value) {
-    typedef const typename std::remove_reference<T>::type nonref;
-    if(value.type() != typeid(nonref)) throw;
-    return static_cast<any::holder<nonref>*>(value.container)->value;
-  }
-
-  template<typename T> T* any_cast(any *value) {
-    if(!value || value->type() != typeid(T)) return nullptr;
-    return &static_cast<any::holder<T>*>(value->container)->value;
-  }
-
-  template<typename T> const T* any_cast(const any *value) {
-    if(!value || value->type() != typeid(T)) return nullptr;
-    return &static_cast<any::holder<T>*>(value->container)->value;
-  }
-}
-
-#endif
@@ -1,103 +0,0 @@
-#ifndef NALL_ATOI_HPP
-#define NALL_ATOI_HPP
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-
-//note: this header is intended to form the base for user-defined literals;
-//once they are supported by GCC. eg:
-//unsigned operator "" b(const char *s) { return binary(s); }
-//-> signed data = 1001b;
-//(0b1001 is nicer, but is not part of the C++ standard)
-
-constexpr inline uintmax_t binary_(const char *s, uintmax_t sum = 0) {
-  return (
-    *s == '0' || *s == '1' ? binary_(s + 1, (sum << 1) | *s - '0') :
-    sum
-  );
-}
-
-constexpr inline uintmax_t octal_(const char *s, uintmax_t sum = 0) {
-  return (
-    *s >= '0' && *s <= '7' ? octal_(s + 1, (sum << 3) | *s - '0') :
-    sum
-  );
-}
-
-constexpr inline uintmax_t decimal_(const char *s, uintmax_t sum = 0) {
-  return (
-    *s >= '0' && *s <= '9' ? decimal_(s + 1, (sum * 10) + *s - '0') :
-    sum
-  );
-}
-
-constexpr inline uintmax_t hex_(const char *s, uintmax_t sum = 0) {
-  return (
-    *s >= 'A' && *s <= 'F' ? hex_(s + 1, (sum << 4) | *s - 'A' + 10) :
-    *s >= 'a' && *s <= 'f' ? hex_(s + 1, (sum << 4) | *s - 'a' + 10) :
-    *s >= '0' && *s <= '9' ? hex_(s + 1, (sum << 4) | *s - '0') :
-    sum
-  );
-}
-
-//
-
-constexpr inline uintmax_t binary(const char *s) {
-  return (
-    *s == '0' && *(s + 1) == 'B' ? binary_(s + 2) :
-    *s == '0' && *(s + 1) == 'b' ? binary_(s + 2) :
-    *s == '%' ? binary_(s + 1) :
-    binary_(s)
-  );
-}
-
-constexpr inline uintmax_t octal(const char *s) {
-  return (
-    octal_(s)
-  );
-}
-
-constexpr inline intmax_t integer(const char *s) {
-  return (
-    *s == '+' ? +decimal_(s + 1) :
-    *s == '-' ? -decimal_(s + 1) :
-    decimal_(s)
-  );
-}
-
-constexpr inline uintmax_t decimal(const char *s) {
-  return (
-    decimal_(s)
-  );
-}
-
-constexpr inline uintmax_t hex(const char *s) {
-  return (
-    *s == '0' && *(s + 1) == 'X' ? hex_(s + 2) :
-    *s == '0' && *(s + 1) == 'x' ? hex_(s + 2) :
-    *s == '$' ? hex_(s + 1) :
-    hex_(s)
-  );
-}
-
-constexpr inline intmax_t numeral(const char *s) {
-  return (
-    *s == '0' && *(s + 1) == 'X' ? hex_(s + 2) :
-    *s == '0' && *(s + 1) == 'x' ? hex_(s + 2) :
-    *s == '0' && *(s + 1) == 'B' ? binary_(s + 2) :
-    *s == '0' && *(s + 1) == 'b' ? binary_(s + 2) :
-    *s == '0' ? octal_(s + 1) :
-    *s == '+' ? +decimal_(s + 1) :
-    *s == '-' ? -decimal_(s + 1) :
-    decimal_(s)
-  );
-}
-
-inline double fp(const char *s) {
-  return atof(s);
-}
-
-}
-
-#endif
@@ -1,118 +0,0 @@
-#ifndef NALL_BASE64_HPP
-#define NALL_BASE64_HPP
-
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-  struct base64 {
-    static bool encode(char *&output, const uint8_t* input, unsigned inlength) {
-      output = new char[inlength * 8 / 6 + 8]();
-
-      unsigned i = 0, o = 0;
-      while(i < inlength) {
-        switch(i % 3) {
-
-        case 0: {
-          output[o++] = enc(input[i] >> 2);
-          output[o] = enc((input[i] & 3) << 4);
-          break;
-        }
-
-        case 1: {
-          uint8_t prev = dec(output[o]);
-          output[o++] = enc(prev + (input[i] >> 4));
-          output[o] = enc((input[i] & 15) << 2);
-          break;
-        }
-
-        case 2: {
-          uint8_t prev = dec(output[o]);
-          output[o++] = enc(prev + (input[i] >> 6));
-          output[o++] = enc(input[i] & 63);
-          break;
-        }
-
-        }
-
-        i++;
-      }
-
-      return true;
-    }
-
-    static string encode(const string &data) {
-      char *buffer = nullptr;
-      encode(buffer, (const uint8_t*)(const char*)data, data.length());
-      string result = buffer;
-      delete[] buffer;
-      return result;
-    }
-
-    static bool decode(uint8_t *&output, unsigned &outlength, const char *input) {
-      unsigned inlength = strlen(input), infix = 0;
-      output = new uint8_t[inlength + 1]();
-
-      unsigned i = 0, o = 0;
-      while(i < inlength) {
-        uint8_t x = dec(input[i]);
-
-        switch(i++ & 3) {
-
-        case 0: {
-          output[o] = x << 2;
-          break;
-        }
-
-        case 1: {
-          output[o++] |= x >> 4;
-          output[o] = (x & 15) << 4;
-          break;
-        }
-
-        case 2: {
-          output[o++] |= x >> 2;
-          output[o] = (x & 3) << 6;
-          break;
-        }
-
-        case 3: {
-          output[o++] |= x;
-          break;
-        }
-
-        }
-      }
-
-      outlength = o;
-      return true;
-    }
-
-    static string decode(const string &data) {
-      uint8_t *buffer = nullptr;
-      unsigned size = 0;
-      decode(buffer, size, (const char*)data);
-      string result = (const char*)buffer;
-      delete[] buffer;
-      return result;
-    }
-
-  private:
-    static char enc(uint8_t n) {
-      //base64 for URL encodings (URL = -_, MIME = +/)
-      static char lookup_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-      return lookup_table[n & 63];
-    }
-
-    static uint8_t dec(char n) {
-      if(n >= 'A' && n <= 'Z') return n - 'A';
-      if(n >= 'a' && n <= 'z') return n - 'a' + 26;
-      if(n >= '0' && n <= '9') return n - '0' + 52;
-      if(n == '-') return 62;
-      if(n == '_') return 63;
-      return 0;
-    }
-  };
-}
-
-#endif
@@ -1,84 +0,0 @@
-#ifndef NALL_BEAT_ARCHIVE_HPP
-#define NALL_BEAT_ARCHIVE_HPP
-
-#include <nall/beat/base.hpp>
-
-namespace nall {
-
-struct beatArchive : beatBase {
-  bool create(const string &beatname, string pathname, const string &metadata = "") {
-    if(fp.open(beatname, file::mode::write) == false) return false;
-    if(pathname.endswith("/") == false) pathname.append("/");
-
-    checksum = ~0;
-    writeString("BPA1");
-    writeNumber(metadata.length());
-    writeString(metadata);
-
-    lstring list;
-    ls(list, pathname, pathname);
-    for(auto &name : list) {
-      if(name.endswith("/")) {
-        name.rtrim<1>("/");
-        writeNumber(0 | ((name.length() - 1) << 1));
-        writeString(name);
-      } else {
-        file stream;
-        if(stream.open({pathname, name}, file::mode::read) == false) return false;
-        writeNumber(1 | ((name.length() - 1) << 1));
-        writeString(name);
-        unsigned size = stream.size();
-        writeNumber(size);
-        uint32_t checksum = ~0;
-        while(size--) {
-          uint8_t data = stream.read();
-          write(data);
-          checksum = crc32_adjust(checksum, data);
-        }
-        writeChecksum(~checksum);
-      }
-    }
-
-    writeChecksum(~checksum);
-    fp.close();
-    return true;
-  }
-
-  bool unpack(const string &beatname, string pathname) {
-    if(fp.open(beatname, file::mode::read) == false) return false;
-    if(pathname.endswith("/") == false) pathname.append("/");
-
-    checksum = ~0;
-    if(readString(4) != "BPA1") return false;
-    unsigned length = readNumber();
-    while(length--) read();
-
-    directory::create(pathname);
-    while(fp.offset() < fp.size() - 4) {
-      unsigned data = readNumber();
-      string name = readString((data >> 1) + 1);
-      if(name.position("\\") || name.position("../")) return false;  //block path exploits
-
-      if((data & 1) == 0) {
-        directory::create({pathname, name});
-      } else {
-        file stream;
-        if(stream.open({pathname, name}, file::mode::write) == false) return false;
-        unsigned size = readNumber();
-        uint32_t checksum = ~0;
-        while(size--) {
-          uint8_t data = read();
-          stream.write(data);
-          checksum = crc32_adjust(checksum, data);
-        }
-        if(readChecksum(~checksum) == false) return false;
-      }
-    }
-
-    return readChecksum(~checksum);
-  }
-};
-
-}
-
-#endif
@@ -1,92 +0,0 @@
-#ifndef NALL_BEAT_BASE_HPP
-#define NALL_BEAT_BASE_HPP
-
-namespace nall {
-
-struct beatBase {
-protected:
-  file fp;
-  uint32_t checksum;
-
-  void ls(lstring &list, const string &path, const string &basepath) {
-    lstring paths = directory::folders(path);
-    for(auto &pathname : paths) {
-      list.append(string{path, pathname}.ltrim<1>(basepath));
-      ls(list, {path, pathname}, basepath);
-    }
-
-    lstring files = directory::files(path);
-    for(auto &filename : files) {
-      list.append(string{path, filename}.ltrim<1>(basepath));
-    }
-  }
-
-  void write(uint8_t data) {
-    fp.write(data);
-    checksum = crc32_adjust(checksum, data);
-  }
-
-  void writeNumber(uint64_t data) {
-    while(true) {
-      uint64_t x = data & 0x7f;
-      data >>= 7;
-      if(data == 0) return write(0x80 | x);
-      write(x);
-      data--;
-    }
-  }
-
-  void writeString(const string &text) {
-    unsigned length = text.length();
-    for(unsigned n = 0; n < length; n++) write(text[n]);
-  }
-
-  void writeChecksum(uint32_t checksum) {
-    write(checksum >>  0);
-    write(checksum >>  8);
-    write(checksum >> 16);
-    write(checksum >> 24);
-  }
-
-  uint8_t read() {
-    uint8_t data = fp.read();
-    checksum = crc32_adjust(checksum, data);
-    return data;
-  }
-
-  uint64_t readNumber() {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = read();
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  }
-
-  string readString(unsigned length) {
-    string text;
-    text.reserve(length + 1);
-    for(unsigned n = 0; n < length; n++) {
-      text[n] = fp.read();
-      checksum = crc32_adjust(checksum, text[n]);
-    }
-    text[length] = 0;
-    return text;
-  }
-
-  bool readChecksum(uint32_t source) {
-    uint32_t checksum = 0;
-    checksum |= read() <<  0;
-    checksum |= read() <<  8;
-    checksum |= read() << 16;
-    checksum |= read() << 24;
-    return checksum == source;
-  }
-};
-
-}
-
-#endif
@@ -1,214 +0,0 @@
-#ifndef NALL_BEAT_DELTA_HPP
-#define NALL_BEAT_DELTA_HPP
-
-#include <nall/crc32.hpp>
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct bpsdelta {
-  inline void source(const uint8_t *data, unsigned size);
-  inline void target(const uint8_t *data, unsigned size);
-
-  inline bool source(const string &filename);
-  inline bool target(const string &filename);
-  inline bool create(const string &filename, const string &metadata = "");
-
-protected:
-  enum : unsigned { SourceRead, TargetRead, SourceCopy, TargetCopy };
-  enum : unsigned { Granularity = 1 };
-
-  struct Node {
-    unsigned offset;
-    Node *next;
-    inline Node() : offset(0), next(nullptr) {}
-    inline ~Node() { if(next) delete next; }
-  };
-
-  filemap sourceFile;
-  const uint8_t *sourceData;
-  unsigned sourceSize;
-
-  filemap targetFile;
-  const uint8_t *targetData;
-  unsigned targetSize;
-};
-
-void bpsdelta::source(const uint8_t *data, unsigned size) {
-  sourceData = data;
-  sourceSize = size;
-}
-
-void bpsdelta::target(const uint8_t *data, unsigned size) {
-  targetData = data;
-  targetSize = size;
-}
-
-bool bpsdelta::source(const string &filename) {
-  if(sourceFile.open(filename, filemap::mode::read) == false) return false;
-  source(sourceFile.data(), sourceFile.size());
-  return true;
-}
-
-bool bpsdelta::target(const string &filename) {
-  if(targetFile.open(filename, filemap::mode::read) == false) return false;
-  target(targetFile.data(), targetFile.size());
-  return true;
-}
-
-bool bpsdelta::create(const string &filename, const string &metadata) {
-  file modifyFile;
-  if(modifyFile.open(filename, file::mode::write) == false) return false;
-
-  uint32_t sourceChecksum = ~0, modifyChecksum = ~0;
-  unsigned sourceRelativeOffset = 0, targetRelativeOffset = 0, outputOffset = 0;
-
-  auto write = [&](uint8_t data) {
-    modifyFile.write(data);
-    modifyChecksum = crc32_adjust(modifyChecksum, data);
-  };
-
-  auto encode = [&](uint64_t data) {
-    while(true) {
-      uint64_t x = data & 0x7f;
-      data >>= 7;
-      if(data == 0) {
-        write(0x80 | x);
-        break;
-      }
-      write(x);
-      data--;
-    }
-  };
-
-  write('B');
-  write('P');
-  write('S');
-  write('1');
-
-  encode(sourceSize);
-  encode(targetSize);
-
-  unsigned markupSize = metadata.length();
-  encode(markupSize);
-  for(unsigned n = 0; n < markupSize; n++) write(metadata[n]);
-
-  Node *sourceTree[65536], *targetTree[65536];
-  for(unsigned n = 0; n < 65536; n++) sourceTree[n] = 0, targetTree[n] = 0;
-
-  //source tree creation
-  for(unsigned offset = 0; offset < sourceSize; offset++) {
-    uint16_t symbol = sourceData[offset + 0];
-    sourceChecksum = crc32_adjust(sourceChecksum, symbol);
-    if(offset < sourceSize - 1) symbol |= sourceData[offset + 1] << 8;
-    Node *node = new Node;
-    node->offset = offset;
-    node->next = sourceTree[symbol];
-    sourceTree[symbol] = node;
-  }
-
-  unsigned targetReadLength = 0;
-
-  auto targetReadFlush = [&]() {
-    if(targetReadLength) {
-      encode(TargetRead | ((targetReadLength - 1) << 2));
-      unsigned offset = outputOffset - targetReadLength;
-      while(targetReadLength) write(targetData[offset++]), targetReadLength--;
-    }
-  };
-
-  while(outputOffset < targetSize) {
-    unsigned maxLength = 0, maxOffset = 0, mode = TargetRead;
-
-    uint16_t symbol = targetData[outputOffset + 0];
-    if(outputOffset < targetSize - 1) symbol |= targetData[outputOffset + 1] << 8;
-
-    { //source read
-      unsigned length = 0, offset = outputOffset;
-      while(offset < sourceSize && offset < targetSize && sourceData[offset] == targetData[offset]) {
-        length++;
-        offset++;
-      }
-      if(length > maxLength) maxLength = length, mode = SourceRead;
-    }
-
-    { //source copy
-      Node *node = sourceTree[symbol];
-      while(node) {
-        unsigned length = 0, x = node->offset, y = outputOffset;
-        while(x < sourceSize && y < targetSize && sourceData[x++] == targetData[y++]) length++;
-        if(length > maxLength) maxLength = length, maxOffset = node->offset, mode = SourceCopy;
-        node = node->next;
-      }
-    }
-
-    { //target copy
-      Node *node = targetTree[symbol];
-      while(node) {
-        unsigned length = 0, x = node->offset, y = outputOffset;
-        while(y < targetSize && targetData[x++] == targetData[y++]) length++;
-        if(length > maxLength) maxLength = length, maxOffset = node->offset, mode = TargetCopy;
-        node = node->next;
-      }
-
-      //target tree append
-      node = new Node;
-      node->offset = outputOffset;
-      node->next = targetTree[symbol];
-      targetTree[symbol] = node;
-    }
-
-    { //target read
-      if(maxLength < 4) {
-        maxLength = min((unsigned)Granularity, targetSize - outputOffset);
-        mode = TargetRead;
-      }
-    }
-
-    if(mode != TargetRead) targetReadFlush();
-
-    switch(mode) {
-    case SourceRead:
-      encode(SourceRead | ((maxLength - 1) << 2));
-      break;
-    case TargetRead:
-      //delay write to group sequential TargetRead commands into one
-      targetReadLength += maxLength;
-      break;
-    case SourceCopy:
-    case TargetCopy:
-      encode(mode | ((maxLength - 1) << 2));
-      signed relativeOffset;
-      if(mode == SourceCopy) {
-        relativeOffset = maxOffset - sourceRelativeOffset;
-        sourceRelativeOffset = maxOffset + maxLength;
-      } else {
-        relativeOffset = maxOffset - targetRelativeOffset;
-        targetRelativeOffset = maxOffset + maxLength;
-      }
-      encode((relativeOffset < 0) | (abs(relativeOffset) << 1));
-      break;
-    }
-
-    outputOffset += maxLength;
-  }
-
-  targetReadFlush();
-
-  sourceChecksum = ~sourceChecksum;
-  for(unsigned n = 0; n < 32; n += 8) write(sourceChecksum >> n);
-  uint32_t targetChecksum = crc32_calculate(targetData, targetSize);
-  for(unsigned n = 0; n < 32; n += 8) write(targetChecksum >> n);
-  uint32_t outputChecksum = ~modifyChecksum;
-  for(unsigned n = 0; n < 32; n += 8) write(outputChecksum >> n);
-
-  modifyFile.close();
-  return true;
-}
-
-}
-
-#endif
@@ -1,152 +0,0 @@
-#ifndef NALL_BEAT_LINEAR_HPP
-#define NALL_BEAT_LINEAR_HPP
-
-#include <nall/crc32.hpp>
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct bpslinear {
-  inline void source(const uint8_t *data, unsigned size);
-  inline void target(const uint8_t *data, unsigned size);
-
-  inline bool source(const string &filename);
-  inline bool target(const string &filename);
-  inline bool create(const string &filename, const string &metadata = "");
-
-protected:
-  enum : unsigned { SourceRead, TargetRead, SourceCopy, TargetCopy };
-  enum : unsigned { Granularity = 1 };
-
-  filemap sourceFile;
-  const uint8_t *sourceData;
-  unsigned sourceSize;
-
-  filemap targetFile;
-  const uint8_t *targetData;
-  unsigned targetSize;
-};
-
-void bpslinear::source(const uint8_t *data, unsigned size) {
-  sourceData = data;
-  sourceSize = size;
-}
-
-void bpslinear::target(const uint8_t *data, unsigned size) {
-  targetData = data;
-  targetSize = size;
-}
-
-bool bpslinear::source(const string &filename) {
-  if(sourceFile.open(filename, filemap::mode::read) == false) return false;
-  source(sourceFile.data(), sourceFile.size());
-  return true;
-}
-
-bool bpslinear::target(const string &filename) {
-  if(targetFile.open(filename, filemap::mode::read) == false) return false;
-  target(targetFile.data(), targetFile.size());
-  return true;
-}
-
-bool bpslinear::create(const string &filename, const string &metadata) {
-  file modifyFile;
-  if(modifyFile.open(filename, file::mode::write) == false) return false;
-
-  uint32_t modifyChecksum = ~0;
-  unsigned targetRelativeOffset = 0, outputOffset = 0;
-
-  auto write = [&](uint8_t data) {
-    modifyFile.write(data);
-    modifyChecksum = crc32_adjust(modifyChecksum, data);
-  };
-
-  auto encode = [&](uint64_t data) {
-    while(true) {
-      uint64_t x = data & 0x7f;
-      data >>= 7;
-      if(data == 0) {
-        write(0x80 | x);
-        break;
-      }
-      write(x);
-      data--;
-    }
-  };
-
-  unsigned targetReadLength = 0;
-
-  auto targetReadFlush = [&]() {
-    if(targetReadLength) {
-      encode(TargetRead | ((targetReadLength - 1) << 2));
-      unsigned offset = outputOffset - targetReadLength;
-      while(targetReadLength) write(targetData[offset++]), targetReadLength--;
-    }
-  };
-
-  write('B');
-  write('P');
-  write('S');
-  write('1');
-
-  encode(sourceSize);
-  encode(targetSize);
-
-  unsigned markupSize = metadata.length();
-  encode(markupSize);
-  for(unsigned n = 0; n < markupSize; n++) write(metadata[n]);
-
-  while(outputOffset < targetSize) {
-    unsigned sourceLength = 0;
-    for(unsigned n = 0; outputOffset + n < min(sourceSize, targetSize); n++) {
-      if(sourceData[outputOffset + n] != targetData[outputOffset + n]) break;
-      sourceLength++;
-    }
-
-    unsigned rleLength = 0;
-    for(unsigned n = 1; outputOffset + n < targetSize; n++) {
-      if(targetData[outputOffset] != targetData[outputOffset + n]) break;
-      rleLength++;
-    }
-
-    if(rleLength >= 4) {
-      //write byte to repeat
-      targetReadLength++;
-      outputOffset++;
-      targetReadFlush();
-
-      //copy starting from repetition byte
-      encode(TargetCopy | ((rleLength - 1) << 2));
-      unsigned relativeOffset = (outputOffset - 1) - targetRelativeOffset;
-      encode(relativeOffset << 1);
-      outputOffset += rleLength;
-      targetRelativeOffset = outputOffset - 1;
-    } else if(sourceLength >= 4) {
-      targetReadFlush();
-      encode(SourceRead | ((sourceLength - 1) << 2));
-      outputOffset += sourceLength;
-    } else {
-      targetReadLength += Granularity;
-      outputOffset += Granularity;
-    }
-  }
-
-  targetReadFlush();
-
-  uint32_t sourceChecksum = crc32_calculate(sourceData, sourceSize);
-  for(unsigned n = 0; n < 32; n += 8) write(sourceChecksum >> n);
-  uint32_t targetChecksum = crc32_calculate(targetData, targetSize);
-  for(unsigned n = 0; n < 32; n += 8) write(targetChecksum >> n);
-  uint32_t outputChecksum = ~modifyChecksum;
-  for(unsigned n = 0; n < 32; n += 8) write(outputChecksum >> n);
-
-  modifyFile.close();
-  return true;
-}
-
-}
-
-#endif
@@ -1,121 +0,0 @@
-#ifndef NALL_BEAT_METADATA_HPP
-#define NALL_BEAT_METADATA_HPP
-
-#include <nall/crc32.hpp>
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct bpsmetadata {
-  inline bool load(const string &filename);
-  inline bool save(const string &filename, const string &metadata);
-  inline string metadata() const;
-
-protected:
-  file sourceFile;
-  string metadataString;
-};
-
-bool bpsmetadata::load(const string &filename) {
-  if(sourceFile.open(filename, file::mode::read) == false) return false;
-
-  auto read = [&]() -> uint8_t {
-    return sourceFile.read();
-  };
-
-  auto decode = [&]() -> uint64_t {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = read();
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  };
-
-  if(read() != 'B') return false;
-  if(read() != 'P') return false;
-  if(read() != 'S') return false;
-  if(read() != '1') return false;
-  decode();
-  decode();
-  unsigned metadataSize = decode();
-  char data[metadataSize + 1];
-  for(unsigned n = 0; n < metadataSize; n++) data[n] = read();
-  data[metadataSize] = 0;
-  metadataString = (const char*)data;
-
-  return true;
-}
-
-bool bpsmetadata::save(const string &filename, const string &metadata) {
-  file targetFile;
-  if(targetFile.open(filename, file::mode::write) == false) return false;
-  if(sourceFile.open() == false) return false;
-  sourceFile.seek(0);
-
-  auto read = [&]() -> uint8_t {
-    return sourceFile.read();
-  };
-
-  auto decode = [&]() -> uint64_t {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = read();
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  };
-
-  uint32_t checksum = ~0;
-
-  auto write = [&](uint8_t data) {
-    targetFile.write(data);
-    checksum = crc32_adjust(checksum, data);
-  };
-
-  auto encode = [&](uint64_t data) {
-    while(true) {
-      uint64_t x = data & 0x7f;
-      data >>= 7;
-      if(data == 0) {
-        write(0x80 | x);
-        break;
-      }
-      write(x);
-      data--;
-    }
-  };
-
-  for(unsigned n = 0; n < 4; n++) write(read());
-  encode(decode());
-  encode(decode());
-  unsigned sourceLength = decode();
-  unsigned targetLength = metadata.length();
-  encode(targetLength);
-  sourceFile.seek(sourceLength, file::index::relative);
-  for(unsigned n = 0; n < targetLength; n++) write(metadata[n]);
-  unsigned length = sourceFile.size() - sourceFile.offset() - 4;
-  for(unsigned n = 0; n < length; n++) write(read());
-  uint32_t outputChecksum = ~checksum;
-  for(unsigned n = 0; n < 32; n += 8) write(outputChecksum >> n);
-
-  targetFile.close();
-  return true;
-}
-
-string bpsmetadata::metadata() const {
-  return metadataString;
-}
-
-}
-
-#endif
@@ -1,242 +0,0 @@
-#ifndef NALL_BEAT_MULTI_HPP
-#define NALL_BEAT_MULTI_HPP
-
-#include <nall/beat/patch.hpp>
-#include <nall/beat/linear.hpp>
-#include <nall/beat/delta.hpp>
-
-namespace nall {
-
-struct bpsmulti {
-  enum : unsigned {
-    CreatePath = 0,
-    CreateFile = 1,
-    ModifyFile = 2,
-    MirrorFile = 3,
-  };
-
-  enum : unsigned {
-    OriginSource = 0,
-    OriginTarget = 1,
-  };
-
-  bool create(const string &patchName, const string &sourcePath, const string &targetPath, bool delta = false, const string &metadata = "") {
-    if(fp.open()) fp.close();
-    fp.open(patchName, file::mode::write);
-    checksum = ~0;
-
-    writeString("BPM1");  //signature
-    writeNumber(metadata.length());
-    writeString(metadata);
-
-    lstring sourceList, targetList;
-    ls(sourceList, sourcePath, sourcePath);
-    ls(targetList, targetPath, targetPath);
-
-    for(auto &targetName : targetList) {
-      if(targetName.endswith("/")) {
-        targetName.rtrim<1>("/");
-        writeNumber(CreatePath | ((targetName.length() - 1) << 2));
-        writeString(targetName);
-      } else if(auto position = sourceList.find(targetName)) {  //if sourceName == targetName
-        file sp, dp;
-        sp.open({sourcePath, targetName}, file::mode::read);
-        dp.open({targetPath, targetName}, file::mode::read);
-
-        bool identical = sp.size() == dp.size();
-        uint32_t cksum = ~0;
-
-        for(unsigned n = 0; n < sp.size(); n++) {
-          uint8_t byte = sp.read();
-          if(identical && byte != dp.read()) identical = false;
-          cksum = crc32_adjust(cksum, byte);
-        }
-
-        if(identical) {
-          writeNumber(MirrorFile | ((targetName.length() - 1) << 2));
-          writeString(targetName);
-          writeNumber(OriginSource);
-          writeChecksum(~cksum);
-        } else {
-          writeNumber(ModifyFile | ((targetName.length() - 1) << 2));
-          writeString(targetName);
-          writeNumber(OriginSource);
-
-          if(delta == false) {
-            bpslinear patch;
-            patch.source({sourcePath, targetName});
-            patch.target({targetPath, targetName});
-            patch.create({temppath(), "temp.bps"});
-          } else {
-            bpsdelta patch;
-            patch.source({sourcePath, targetName});
-            patch.target({targetPath, targetName});
-            patch.create({temppath(), "temp.bps"});
-          }
-
-          auto buffer = file::read({temppath(), "temp.bps"});
-          writeNumber(buffer.size());
-          for(auto &byte : buffer) write(byte);
-        }
-      } else {
-        writeNumber(CreateFile | ((targetName.length() - 1) << 2));
-        writeString(targetName);
-        auto buffer = file::read({targetPath, targetName});
-        writeNumber(buffer.size());
-        for(auto &byte : buffer) write(byte);
-        writeChecksum(crc32_calculate(buffer.data(), buffer.size()));
-      }
-    }
-
-    //checksum
-    writeChecksum(~checksum);
-    fp.close();
-    return true;
-  }
-
-  bool apply(const string &patchName, const string &sourcePath, const string &targetPath) {
-    directory::remove(targetPath);  //start with a clean directory
-    directory::create(targetPath);
-
-    if(fp.open()) fp.close();
-    fp.open(patchName, file::mode::read);
-    checksum = ~0;
-
-    if(readString(4) != "BPM1") return false;
-    auto metadataLength = readNumber();
-    while(metadataLength--) read();
-
-    while(fp.offset() < fp.size() - 4) {
-      auto encoding = readNumber();
-      unsigned action = encoding & 3;
-      unsigned targetLength = (encoding >> 2) + 1;
-      string targetName = readString(targetLength);
-
-      if(action == CreatePath) {
-        directory::create({targetPath, targetName, "/"});
-      } else if(action == CreateFile) {
-        file fp;
-        fp.open({targetPath, targetName}, file::mode::write);
-        auto fileSize = readNumber();
-        while(fileSize--) fp.write(read());
-        uint32_t cksum = readChecksum();
-      } else if(action == ModifyFile) {
-        auto encoding = readNumber();
-        string originPath = encoding & 1 ? targetPath : sourcePath;
-        string sourceName = (encoding >> 1) == 0 ? targetName : readString(encoding >> 1);
-        auto patchSize = readNumber();
-        vector<uint8_t> buffer;
-        buffer.resize(patchSize);
-        for(unsigned n = 0; n < patchSize; n++) buffer[n] = read();
-        bpspatch patch;
-        patch.modify(buffer.data(), buffer.size());
-        patch.source({originPath, sourceName});
-        patch.target({targetPath, targetName});
-        if(patch.apply() != bpspatch::result::success) return false;
-      } else if(action == MirrorFile) {
-        auto encoding = readNumber();
-        string originPath = encoding & 1 ? targetPath : sourcePath;
-        string sourceName = (encoding >> 1) == 0 ? targetName : readString(encoding >> 1);
-        file::copy({originPath, sourceName}, {targetPath, targetName});
-        uint32_t cksum = readChecksum();
-      }
-    }
-
-    uint32_t cksum = ~checksum;
-    if(read() != (uint8_t)(cksum >>  0)) return false;
-    if(read() != (uint8_t)(cksum >>  8)) return false;
-    if(read() != (uint8_t)(cksum >> 16)) return false;
-    if(read() != (uint8_t)(cksum >> 24)) return false;
-
-    fp.close();
-    return true;
-  }
-
-protected:
-  file fp;
-  uint32_t checksum;
-
-  //create() functions
-  void ls(lstring &list, const string &path, const string &basepath) {
-    lstring paths = directory::folders(path);
-    for(auto &pathname : paths) {
-      list.append(string{path, pathname}.ltrim<1>(basepath));
-      ls(list, {path, pathname}, basepath);
-    }
-
-    lstring files = directory::files(path);
-    for(auto &filename : files) {
-      list.append(string{path, filename}.ltrim<1>(basepath));
-    }
-  }
-
-  void write(uint8_t data) {
-    fp.write(data);
-    checksum = crc32_adjust(checksum, data);
-  }
-
-  void writeNumber(uint64_t data) {
-    while(true) {
-      uint64_t x = data & 0x7f;
-      data >>= 7;
-      if(data == 0) {
-        write(0x80 | x);
-        break;
-      }
-      write(x);
-      data--;
-    }
-  }
-
-  void writeString(const string &text) {
-    unsigned length = text.length();
-    for(unsigned n = 0; n < length; n++) write(text[n]);
-  }
-
-  void writeChecksum(uint32_t cksum) {
-    write(cksum >>  0);
-    write(cksum >>  8);
-    write(cksum >> 16);
-    write(cksum >> 24);
-  }
-
-  //apply() functions
-  uint8_t read() {
-    uint8_t data = fp.read();
-    checksum = crc32_adjust(checksum, data);
-    return data;
-  }
-
-  uint64_t readNumber() {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = read();
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  }
-
-  string readString(unsigned length) {
-    string text;
-    text.reserve(length + 1);
-    for(unsigned n = 0; n < length; n++) text[n] = read();
-    text[length] = 0;
-    return text;
-  }
-
-  uint32_t readChecksum() {
-    uint32_t checksum = 0;
-    checksum |= read() <<  0;
-    checksum |= read() <<  8;
-    checksum |= read() << 16;
-    checksum |= read() << 24;
-    return checksum;
-  }
-};
-
-}
-
-#endif
@@ -1,219 +0,0 @@
-#ifndef NALL_BEAT_PATCH_HPP
-#define NALL_BEAT_PATCH_HPP
-
-#include <nall/crc32.hpp>
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct bpspatch {
-  inline bool modify(const uint8_t *data, unsigned size);
-  inline void source(const uint8_t *data, unsigned size);
-  inline void target(uint8_t *data, unsigned size);
-
-  inline bool modify(const string &filename);
-  inline bool source(const string &filename);
-  inline bool target(const string &filename);
-
-  inline string metadata() const;
-  inline unsigned size() const;
-
-  enum result : unsigned {
-    unknown,
-    success,
-    patch_too_small,
-    patch_invalid_header,
-    source_too_small,
-    target_too_small,
-    source_checksum_invalid,
-    target_checksum_invalid,
-    patch_checksum_invalid,
-  };
-
-  inline result apply();
-
-protected:
-  enum : unsigned { SourceRead, TargetRead, SourceCopy, TargetCopy };
-
-  filemap modifyFile;
-  const uint8_t *modifyData;
-  unsigned modifySize;
-
-  filemap sourceFile;
-  const uint8_t *sourceData;
-  unsigned sourceSize;
-
-  filemap targetFile;
-  uint8_t *targetData;
-  unsigned targetSize;
-
-  unsigned modifySourceSize;
-  unsigned modifyTargetSize;
-  unsigned modifyMarkupSize;
-  string metadataString;
-};
-
-bool bpspatch::modify(const uint8_t *data, unsigned size) {
-  if(size < 19) return false;
-  modifyData = data;
-  modifySize = size;
-
-  unsigned offset = 4;
-  auto decode = [&]() -> uint64_t {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = modifyData[offset++];
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  };
-
-  modifySourceSize = decode();
-  modifyTargetSize = decode();
-  modifyMarkupSize = decode();
-
-  char buffer[modifyMarkupSize + 1];
-  for(unsigned n = 0; n < modifyMarkupSize; n++) buffer[n] = modifyData[offset++];
-  buffer[modifyMarkupSize] = 0;
-  metadataString = (const char*)buffer;
-
-  return true;
-}
-
-void bpspatch::source(const uint8_t *data, unsigned size) {
-  sourceData = data;
-  sourceSize = size;
-}
-
-void bpspatch::target(uint8_t *data, unsigned size) {
-  targetData = data;
-  targetSize = size;
-}
-
-bool bpspatch::modify(const string &filename) {
-  if(modifyFile.open(filename, filemap::mode::read) == false) return false;
-  return modify(modifyFile.data(), modifyFile.size());
-}
-
-bool bpspatch::source(const string &filename) {
-  if(sourceFile.open(filename, filemap::mode::read) == false) return false;
-  source(sourceFile.data(), sourceFile.size());
-  return true;
-}
-
-bool bpspatch::target(const string &filename) {
-  file fp;
-  if(fp.open(filename, file::mode::write) == false) return false;
-  fp.truncate(modifyTargetSize);
-  fp.close();
-
-  if(targetFile.open(filename, filemap::mode::readwrite) == false) return false;
-  target(targetFile.data(), targetFile.size());
-  return true;
-}
-
-string bpspatch::metadata() const {
-  return metadataString;
-}
-
-unsigned bpspatch::size() const {
-  return modifyTargetSize;
-}
-
-bpspatch::result bpspatch::apply() {
-  if(modifySize < 19) return result::patch_too_small;
-
-  uint32_t modifyChecksum = ~0, targetChecksum = ~0;
-  unsigned modifyOffset = 0, sourceRelativeOffset = 0, targetRelativeOffset = 0, outputOffset = 0;
-
-  auto read = [&]() -> uint8_t {
-    uint8_t data = modifyData[modifyOffset++];
-    modifyChecksum = crc32_adjust(modifyChecksum, data);
-    return data;
-  };
-
-  auto decode = [&]() -> uint64_t {
-    uint64_t data = 0, shift = 1;
-    while(true) {
-      uint8_t x = read();
-      data += (x & 0x7f) * shift;
-      if(x & 0x80) break;
-      shift <<= 7;
-      data += shift;
-    }
-    return data;
-  };
-
-  auto write = [&](uint8_t data) {
-    targetData[outputOffset++] = data;
-    targetChecksum = crc32_adjust(targetChecksum, data);
-  };
-
-  if(read() != 'B') return result::patch_invalid_header;
-  if(read() != 'P') return result::patch_invalid_header;
-  if(read() != 'S') return result::patch_invalid_header;
-  if(read() != '1') return result::patch_invalid_header;
-
-  modifySourceSize = decode();
-  modifyTargetSize = decode();
-  modifyMarkupSize = decode();
-  for(unsigned n = 0; n < modifyMarkupSize; n++) read();
-
-  if(modifySourceSize > sourceSize) return result::source_too_small;
-  if(modifyTargetSize > targetSize) return result::target_too_small;
-
-  while(modifyOffset < modifySize - 12) {
-    unsigned length = decode();
-    unsigned mode = length & 3;
-    length = (length >> 2) + 1;
-
-    switch(mode) {
-    case SourceRead:
-      while(length--) write(sourceData[outputOffset]);
-      break;
-    case TargetRead:
-      while(length--) write(read());
-      break;
-    case SourceCopy:
-    case TargetCopy:
-      signed offset = decode();
-      bool negative = offset & 1;
-      offset >>= 1;
-      if(negative) offset = -offset;
-
-      if(mode == SourceCopy) {
-        sourceRelativeOffset += offset;
-        while(length--) write(sourceData[sourceRelativeOffset++]);
-      } else {
-        targetRelativeOffset += offset;
-        while(length--) write(targetData[targetRelativeOffset++]);
-      }
-      break;
-    }
-  }
-
-  uint32_t modifySourceChecksum = 0, modifyTargetChecksum = 0, modifyModifyChecksum = 0;
-  for(unsigned n = 0; n < 32; n += 8) modifySourceChecksum |= read() << n;
-  for(unsigned n = 0; n < 32; n += 8) modifyTargetChecksum |= read() << n;
-  uint32_t checksum = ~modifyChecksum;
-  for(unsigned n = 0; n < 32; n += 8) modifyModifyChecksum |= read() << n;
-
-  uint32_t sourceChecksum = crc32_calculate(sourceData, modifySourceSize);
-  targetChecksum = ~targetChecksum;
-
-  if(sourceChecksum != modifySourceChecksum) return result::source_checksum_invalid;
-  if(targetChecksum != modifyTargetChecksum) return result::target_checksum_invalid;
-  if(checksum != modifyModifyChecksum) return result::patch_checksum_invalid;
-
-  return result::success;
-}
-
-}
-
-#endif
@@ -1,82 +0,0 @@
-#ifndef NALL_BIT_HPP
-#define NALL_BIT_HPP
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-  template<unsigned bits>
-  inline uintmax_t uclamp(const uintmax_t x) {
-    enum : uintmax_t { b = 1ull << (bits - 1), y = b * 2 - 1 };
-    return y + ((x - y) & -(x < y));  //min(x, y);
-  }
-
-  template<unsigned bits>
-  inline uintmax_t uclip(const uintmax_t x) {
-    enum : uintmax_t { b = 1ull << (bits - 1), m = b * 2 - 1 };
-    return (x & m);
-  }
-
-  template<unsigned bits>
-  inline intmax_t sclamp(const intmax_t x) {
-    enum : intmax_t { b = 1ull << (bits - 1), m = b - 1 };
-    return (x > m) ? m : (x < -b) ? -b : x;
-  }
-
-  template<unsigned bits>
-  inline intmax_t sclip(const intmax_t x) {
-    enum : uintmax_t { b = 1ull << (bits - 1), m = b * 2 - 1 };
-    return ((x & m) ^ b) - b;
-  }
-
-  namespace bit {
-    constexpr inline uintmax_t mask(const char *s, uintmax_t sum = 0) {
-      return (
-        *s == '0' || *s == '1' ? mask(s + 1, (sum << 1) | 1) :
-        *s == ' ' || *s == '_' ? mask(s + 1, sum) :
-        *s ? mask(s + 1, sum << 1) :
-        sum
-      );
-    }
-
-    constexpr inline uintmax_t test(const char *s, uintmax_t sum = 0) {
-      return (
-        *s == '0' || *s == '1' ? test(s + 1, (sum << 1) | (*s - '0')) :
-        *s == ' ' || *s == '_' ? test(s + 1, sum) :
-        *s ? test(s + 1, sum << 1) :
-        sum
-      );
-    }
-
-    //lowest(0b1110) == 0b0010
-    constexpr inline uintmax_t lowest(const uintmax_t x) {
-      return x & -x;
-    }
-
-    //clear_lowest(0b1110) == 0b1100
-    constexpr inline uintmax_t clear_lowest(const uintmax_t x) {
-      return x & (x - 1);
-    }
-
-    //set_lowest(0b0101) == 0b0111
-    constexpr inline uintmax_t set_lowest(const uintmax_t x) {
-      return x | (x + 1);
-    }
-
-    //count number of bits set in a byte
-    inline unsigned count(uintmax_t x) {
-      unsigned count = 0;
-      do count += x & 1; while(x >>= 1);
-      return count;
-    }
-
-    //round up to next highest single bit:
-    //round(15) == 16, round(16) == 16, round(17) == 32
-    inline uintmax_t round(uintmax_t x) {
-      if((x & (x - 1)) == 0) return x;
-      while(x & (x - 1)) x &= x - 1;
-      return x << 1;
-    }
-  }
-}
-
-#endif
@@ -1,101 +0,0 @@
-#ifndef NALL_BMP_HPP
-#define NALL_BMP_HPP
-
-#include <nall/file.hpp>
-
-//BMP reader / writer
-//author: byuu
-//note: only 24-bit RGB and 32-bit ARGB uncompressed images supported
-
-namespace nall {
-
-struct bmp {
-  inline static bool read(const string &filename, uint32_t *&data, unsigned &width, unsigned &height);
-  inline static bool write(const string &filename, const uint32_t *data, unsigned width, unsigned height, unsigned pitch, bool alpha = false);
-};
-
-bool bmp::read(const string &filename, uint32_t *&data, unsigned &width, unsigned &height) {
-  file fp;
-  if(fp.open(filename, file::mode::read) == false) return false;
-  if(fp.size() < 0x36) return false;
-
-  if(fp.readm(2) != 0x424d) return false;
-  fp.seek(0x000a);
-  unsigned offset = fp.readl(4);
-  unsigned dibsize = fp.readl(4);
-  if(dibsize != 40) return false;
-  signed headerWidth = fp.readl(4);
-  if(headerWidth < 0) return false;
-  signed headerHeight = fp.readl(4);
-  fp.readl(2);
-  unsigned bitsPerPixel = fp.readl(2);
-  if(bitsPerPixel != 24 && bitsPerPixel != 32) return false;
-  unsigned compression = fp.readl(4);
-  if(compression != 0) return false;
-  fp.seek(offset);
-
-  bool noFlip = headerHeight < 0;
-  width = headerWidth, height = abs(headerHeight);
-  data = new uint32_t[width * height];
-
-  unsigned bytesPerPixel = bitsPerPixel / 8;
-  unsigned alignedWidth  = width * bytesPerPixel;
-  unsigned paddingLength = 0;
-  while(alignedWidth % 4) alignedWidth++, paddingLength++;
-
-  for(unsigned y = 0; y < height; y++) {
-    uint32_t *p = noFlip ? data + y * width : data + (height - 1 - y) * width;
-    for(unsigned x = 0; x < width; x++, p++) {
-      *p = fp.readl(bytesPerPixel);
-      if(bytesPerPixel == 3) *p |= 255 << 24;
-    }
-    if(paddingLength) fp.readl(paddingLength);
-  }
-
-  fp.close();
-  return true;
-}
-
-bool bmp::write(const string &filename, const uint32_t *data, unsigned width, unsigned height, unsigned pitch, bool alpha) {
-  file fp;
-  if(fp.open(filename, file::mode::write) == false) return false;
-
-  unsigned bitsPerPixel  = alpha ? 32 : 24;
-  unsigned bytesPerPixel = bitsPerPixel / 8;
-  unsigned alignedWidth  = width * bytesPerPixel;
-  unsigned paddingLength = 0;
-  unsigned imageSize     = alignedWidth * height;
-  unsigned fileSize      = 0x36 + imageSize;
-  while(alignedWidth % 4) alignedWidth++, paddingLength++;
-
-  fp.writem(0x424d, 2);        //signature
-  fp.writel(fileSize, 4);      //file size
-  fp.writel(0, 2);             //reserved
-  fp.writel(0, 2);             //reserved
-  fp.writel(0x36, 4);          //offset
-
-  fp.writel(40, 4);            //DIB size
-  fp.writel(width, 4);         //width
-  fp.writel(-height, 4);       //height
-  fp.writel(1, 2);             //color planes
-  fp.writel(bitsPerPixel, 2);  //bits per pixel
-  fp.writel(0, 4);             //compression method (BI_RGB)
-  fp.writel(imageSize, 4);     //image data size
-  fp.writel(3780, 4);          //horizontal resolution
-  fp.writel(3780, 4);          //vertical resolution
-  fp.writel(0, 4);             //palette size
-  fp.writel(0, 4);             //important color count
-
-  for(unsigned y = 0; y < height; y++) {
-    const uint32_t *p = (const uint32_t*)((const uint8_t*)data + y * pitch);
-    for(unsigned x = 0; x < width; x++) fp.writel(*p++, bytesPerPixel);
-    if(paddingLength) fp.writel(0, paddingLength);
-  }
-
-  fp.close();
-  return true;
-}
-
-}
-
-#endif
@@ -1,152 +0,0 @@
-#ifndef NALL_COMPOSITOR_HPP
-#define NALL_COMPOSITOR_HPP
-
-#include <nall/intrinsics.hpp>
-
-namespace nall {
-
-struct compositor {
-  inline static bool enabled();
-  inline static bool enable(bool status);
-
-  #if defined(PLATFORM_X)
-  enum class Compositor : unsigned { Unknown, Metacity, Xfwm4 };
-  inline static Compositor detect();
-
-  inline static bool enabled_metacity();
-  inline static bool enable_metacity(bool status);
-
-  inline static bool enabled_xfwm4();
-  inline static bool enable_xfwm4(bool status);
-  #endif
-};
-
-#if defined(PLATFORM_X)
-
-//Metacity
-
-bool compositor::enabled_metacity() {
-  FILE *fp = popen("gconftool-2 --get /apps/metacity/general/compositing_manager", "r");
-  if(fp == 0) return false;
-
-  char buffer[512];
-  if(fgets(buffer, sizeof buffer, fp) == 0) return false;
-
-  if(!memcmp(buffer, "true", 4)) return true;
-  return false;
-}
-
-bool compositor::enable_metacity(bool status) {
-  FILE *fp;
-  if(status) {
-    fp = popen("gconftool-2 --set --type bool /apps/metacity/general/compositing_manager true", "r");
-  } else {
-    fp = popen("gconftool-2 --set --type bool /apps/metacity/general/compositing_manager false", "r");
-  }
-  if(fp == 0) return false;
-  pclose(fp);
-  return true;
-}
-
-//Xfwm4
-
-bool compositor::enabled_xfwm4() {
-  FILE *fp = popen("xfconf-query -c xfwm4 -p '/general/use_compositing'", "r");
-  if(fp == 0) return false;
-
-  char buffer[512];
-  if(fgets(buffer, sizeof buffer, fp) == 0) return false;
-
-  if(!memcmp(buffer, "true", 4)) return true;
-  return false;
-}
-
-bool compositor::enable_xfwm4(bool status) {
-  FILE *fp;
-  if(status) {
-    fp = popen("xfconf-query -c xfwm4 -p '/general/use_compositing' -t 'bool' -s 'true'", "r");
-  } else {
-    fp = popen("xfconf-query -c xfwm4 -p '/general/use_compositing' -t 'bool' -s 'false'", "r");
-  }
-  if(fp == 0) return false;
-  pclose(fp);
-  return true;
-}
-
-//General
-
-compositor::Compositor compositor::detect() {
-  Compositor result = Compositor::Unknown;
-
-  FILE *fp;
-  char buffer[512];
-
-  fp = popen("pidof metacity", "r");
-  if(fp && fgets(buffer, sizeof buffer, fp)) result = Compositor::Metacity;
-  pclose(fp);
-
-  fp = popen("pidof xfwm4", "r");
-  if(fp && fgets(buffer, sizeof buffer, fp)) result = Compositor::Xfwm4;
-  pclose(fp);
-
-  return result;
-}
-
-bool compositor::enabled() {
-  switch(detect()) {
-  case Compositor::Metacity: return enabled_metacity();
-  case Compositor::Xfwm4: return enabled_xfwm4();
-  default: return false;
-  }
-}
-
-bool compositor::enable(bool status) {
-  switch(detect()) {
-  case Compositor::Metacity: return enable_metacity(status);
-  case Compositor::Xfwm4: return enable_xfwm4(status);
-  default: return false;
-  }
-}
-
-#elif defined(PLATFORM_WINDOWS)
-
-bool compositor::enabled() {
-  HMODULE module = GetModuleHandleW(L"dwmapi");
-  if(module == 0) module = LoadLibraryW(L"dwmapi");
-  if(module == 0) return false;
-
-  auto pDwmIsCompositionEnabled = (HRESULT (WINAPI*)(BOOL*))GetProcAddress(module, "DwmIsCompositionEnabled");
-  if(pDwmIsCompositionEnabled == 0) return false;
-
-  BOOL result;
-  if(pDwmIsCompositionEnabled(&result) != S_OK) return false;
-  return result;
-}
-
-bool compositor::enable(bool status) {
-  HMODULE module = GetModuleHandleW(L"dwmapi");
-  if(module == 0) module = LoadLibraryW(L"dwmapi");
-  if(module == 0) return false;
-
-  auto pDwmEnableComposition = (HRESULT (WINAPI*)(UINT))GetProcAddress(module, "DwmEnableComposition");
-  if(pDwmEnableComposition == 0) return false;
-
-  if(pDwmEnableComposition(status) != S_OK) return false;
-  return true;
-}
-
-#else
-
-bool compositor::enabled() {
-  return false;
-}
-
-bool compositor::enable(bool) {
-  return false;
-}
-
-#endif
-
-}
-
-#endif
@@ -1,126 +0,0 @@
-#ifndef NALL_CONFIG_HPP
-#define NALL_CONFIG_HPP
-
-#include <nall/file.hpp>
-#include <nall/string.hpp>
-#include <nall/vector.hpp>
-
-namespace nall {
-  namespace configuration_traits {
-    template<typename T> struct is_boolean { enum { value = false }; };
-    template<> struct is_boolean<bool> { enum { value = true }; };
-
-    template<typename T> struct is_signed { enum { value = false }; };
-    template<> struct is_signed<signed> { enum { value = true }; };
-
-    template<typename T> struct is_unsigned { enum { value = false }; };
-    template<> struct is_unsigned<unsigned> { enum { value = true }; };
-
-    template<typename T> struct is_double { enum { value = false }; };
-    template<> struct is_double<double> { enum { value = true }; };
-
-    template<typename T> struct is_string { enum { value = false }; };
-    template<> struct is_string<string> { enum { value = true }; };
-  }
-
-  class configuration {
-  public:
-    enum type_t { boolean_t, signed_t, unsigned_t, double_t, string_t, unknown_t };
-    struct item_t {
-      uintptr_t data;
-      string name;
-      string desc;
-      type_t type;
-
-      inline string get() const {
-        switch(type) {
-          case boolean_t:  return { *(bool*)data };
-          case signed_t:   return { *(signed*)data };
-          case unsigned_t: return { *(unsigned*)data };
-          case double_t:   return { *(double*)data };
-          case string_t:   return { "\"", *(string*)data, "\"" };
-        }
-        return "???";
-      }
-
-      inline void set(string s) {
-        switch(type) {
-          case boolean_t:  *(bool*)data = (s == "true");     break;
-          case signed_t:   *(signed*)data = integer(s);      break;
-          case unsigned_t: *(unsigned*)data = decimal(s);    break;
-          case double_t:   *(double*)data = fp(s);           break;
-          case string_t:   s.trim("\""); *(string*)data = s; break;
-        }
-      }
-    };
-    vector<item_t> list;
-
-    template<typename T>
-    inline void append(T &data, const char *name, const char *desc = "") {
-      item_t item = { (uintptr_t)&data, name, desc };
-      if(configuration_traits::is_boolean<T>::value) item.type = boolean_t;
-      else if(configuration_traits::is_signed<T>::value) item.type = signed_t;
-      else if(configuration_traits::is_unsigned<T>::value) item.type = unsigned_t;
-      else if(configuration_traits::is_double<T>::value) item.type = double_t;
-      else if(configuration_traits::is_string<T>::value) item.type = string_t;
-      else item.type = unknown_t;
-      list.append(item);
-    }
-
-    //deprecated
-    template<typename T>
-    inline void attach(T &data, const char *name, const char *desc = "") {
-      append(data, name, desc);
-    }
-
-    inline virtual bool load(const string &filename) {
-      string data;
-      if(data.readfile(filename) == true) {
-        data.replace("\r", "");
-        lstring line;
-        line.split("\n", data);
-
-        for(unsigned i = 0; i < line.size(); i++) {
-          if(auto position = qstrpos(line[i], "#")) line[i][position()] = 0;
-          if(!qstrpos(line[i], " = ")) continue;
-
-          lstring part;
-          part.qsplit(" = ", line[i]);
-          part[0].trim();
-          part[1].trim();
-
-          for(unsigned n = 0; n < list.size(); n++) {
-            if(part[0] == list[n].name) {
-              list[n].set(part[1]);
-              break;
-            }
-          }
-        }
-
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    inline virtual bool save(const string &filename) const {
-      file fp;
-      if(fp.open(filename, file::mode::write)) {
-        for(unsigned i = 0; i < list.size(); i++) {
-          string output;
-          output.append(list[i].name, " = ", list[i].get());
-          if(list[i].desc != "") output.append(" # ", list[i].desc);
-          output.append("\r\n");
-          fp.print(output);
-        }
-
-        fp.close();
-        return true;
-      } else {
-        return false;
-      }
-    }
-  };
-}
-
-#endif
@@ -1,25 +0,0 @@
-#ifndef NALL_CRC16_HPP
-#define NALL_CRC16_HPP
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-  inline uint16_t crc16_adjust(uint16_t crc16, uint8_t data) {
-    for(unsigned n = 0; n < 8; n++) {
-      if((crc16 & 1) ^ (data & 1)) crc16 = (crc16 >> 1) ^ 0x8408;
-      else crc16 >>= 1;
-      data >>= 1;
-    }
-    return crc16;
-  }
-
-  inline uint16_t crc16_calculate(const uint8_t *data, unsigned length) {
-    uint16_t crc16 = ~0;
-    for(unsigned n = 0; n < length; n++) {
-      crc16 = crc16_adjust(crc16, data[n]);
-    }
-    return ~crc16;
-  }
-}
-
-#endif
@@ -1,66 +0,0 @@
-#ifndef NALL_CRC32_HPP
-#define NALL_CRC32_HPP
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-  const uint32_t crc32_table[256] = {
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-  };
-
-  inline uint32_t crc32_adjust(uint32_t crc32, uint8_t input) {
-    return ((crc32 >> 8) & 0x00ffffff) ^ crc32_table[(crc32 ^ input) & 0xff];
-  }
-
-  inline uint32_t crc32_calculate(const uint8_t *data, unsigned length) {
-    uint32_t crc32 = ~0;
-    for(unsigned i = 0; i < length; i++) {
-      crc32 = crc32_adjust(crc32, data[i]);
-    }
-    return ~crc32;
-  }
-}
-
-#endif
@@ -1,224 +0,0 @@
-#ifndef NALL_DIRECTORY_HPP
-#define NALL_DIRECTORY_HPP
-
-#include <nall/file.hpp>
-#include <nall/intrinsics.hpp>
-#include <nall/sort.hpp>
-#include <nall/string.hpp>
-#include <nall/vector.hpp>
-
-#if defined(PLATFORM_WINDOWS)
-  #include <nall/windows/utf8.hpp>
-#else
-  #include <dirent.h>
-  #include <stdio.h>
-  #include <sys/types.h>
-#endif
-
-namespace nall {
-
-struct directory {
-  static bool create(const string &pathname, unsigned permissions = 0755);  //recursive
-  static bool remove(const string &pathname);  //recursive
-  static bool exists(const string &pathname);
-
-  static lstring folders(const string &pathname, const string &pattern = "*") {
-    lstring folders = directory::ufolders(pathname, pattern);
-    folders.sort();
-    return folders;
-  }
-
-  static lstring files(const string &pathname, const string &pattern = "*") {
-    lstring files = directory::ufiles(pathname, pattern);
-    files.sort();
-    return files;
-  }
-
-  static lstring contents(const string &pathname, const string &pattern = "*") {
-    lstring folders = directory::ufolders(pathname);  //pattern search of contents should only filter files
-    lstring files = directory::ufiles(pathname, pattern);
-    folders.sort();
-    files.sort();
-    for(auto &file : files) folders.append(file);
-    return folders;
-  }
-
-  static lstring ifolders(const string &pathname, const string &pattern = "*") {
-    lstring folders = ufolders(pathname, pattern);
-    folders.isort();
-    return folders;
-  }
-
-  static lstring ifiles(const string &pathname, const string &pattern = "*") {
-    lstring files = ufiles(pathname, pattern);
-    files.isort();
-    return files;
-  }
-
-  static lstring icontents(const string &pathname, const string &pattern = "*") {
-    lstring folders = directory::ufolders(pathname);  //pattern search of contents should only filter files
-    lstring files = directory::ufiles(pathname, pattern);
-    folders.isort();
-    files.isort();
-    for(auto &file : files) folders.append(file);
-    return folders;
-  }
-
-private:
-  //internal functions; these return unsorted lists
-  static lstring ufolders(const string &pathname, const string &pattern = "*");
-  static lstring ufiles(const string &pathname, const string &pattern = "*");
-};
-
-#if defined(PLATFORM_WINDOWS)
-  inline bool directory::create(const string &pathname, unsigned permissions) {
-    string path;
-    lstring list = string{pathname}.transform("\\", "/").rtrim<1>("/").split("/");
-    bool result = true;
-    for(auto &part : list) {
-      path.append(part, "/");
-      result &= (_wmkdir(utf16_t(path)) == 0);
-    }
-    return result;
-  }
-
-  inline bool directory::remove(const string &pathname) {
-    lstring list = directory::contents(pathname);
-    for(auto &name : list) {
-      if(name.endswith("/")) directory::remove({pathname, name});
-      else file::remove({pathname, name});
-    }
-    return _wrmdir(utf16_t(pathname)) == 0;
-  }
-
-  inline bool directory::exists(const string &pathname) {
-    string name = pathname;
-    name.trim<1>("\"");
-    DWORD result = GetFileAttributes(utf16_t(name));
-    if(result == INVALID_FILE_ATTRIBUTES) return false;
-    return (result & FILE_ATTRIBUTE_DIRECTORY);
-  }
-
-  inline lstring directory::ufolders(const string &pathname, const string &pattern) {
-    lstring list;
-    string path = pathname;
-    path.transform("/", "\\");
-    if(!strend(path, "\\")) path.append("\\");
-    path.append("*");
-    HANDLE handle;
-    WIN32_FIND_DATA data;
-    handle = FindFirstFile(utf16_t(path), &data);
-    if(handle != INVALID_HANDLE_VALUE) {
-      if(wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) {
-        if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-          string name = (const char*)utf8_t(data.cFileName);
-          if(wildcard(name, pattern)) list.append(name);
-        }
-      }
-      while(FindNextFile(handle, &data) != false) {
-        if(wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) {
-          if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-            string name = (const char*)utf8_t(data.cFileName);
-            if(wildcard(name, pattern)) list.append(name);
-          }
-        }
-      }
-      FindClose(handle);
-    }
-    for(auto &name : list) name.append("/");  //must append after sorting
-    return list;
-  }
-
-  inline lstring directory::ufiles(const string &pathname, const string &pattern) {
-    lstring list;
-    string path = pathname;
-    path.transform("/", "\\");
-    if(!strend(path, "\\")) path.append("\\");
-    path.append("*");
-    HANDLE handle;
-    WIN32_FIND_DATA data;
-    handle = FindFirstFile(utf16_t(path), &data);
-    if(handle != INVALID_HANDLE_VALUE) {
-      if((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-        string name = (const char*)utf8_t(data.cFileName);
-        if(wildcard(name, pattern)) list.append(name);
-      }
-      while(FindNextFile(handle, &data) != false) {
-        if((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-          string name = (const char*)utf8_t(data.cFileName);
-          if(wildcard(name, pattern)) list.append(name);
-        }
-      }
-      FindClose(handle);
-    }
-    return list;
-  }
-#else
-  inline bool directory::create(const string &pathname, unsigned permissions) {
-    string path;
-    lstring list = string{pathname}.rtrim<1>("/").split("/");
-    bool result = true;
-    for(auto &part : list) {
-      path.append(part, "/");
-      result &= (mkdir(path, permissions) == 0);
-    }
-    return result;
-  }
-
-  inline bool directory::remove(const string &pathname) {
-    lstring list = directory::contents(pathname);
-    for(auto &name : list) {
-      if(name.endswith("/")) directory::remove({pathname, name});
-      else file::remove({pathname, name});
-    }
-    return rmdir(pathname) == 0;
-  }
-
-  inline bool directory::exists(const string &pathname) {
-    DIR *dp = opendir(pathname);
-    if(!dp) return false;
-    closedir(dp);
-    return true;
-  }
-
-  inline lstring directory::ufolders(const string &pathname, const string &pattern) {
-    lstring list;
-    DIR *dp;
-    struct dirent *ep;
-    dp = opendir(pathname);
-    if(dp) {
-      while(ep = readdir(dp)) {
-        if(!strcmp(ep->d_name, ".")) continue;
-        if(!strcmp(ep->d_name, "..")) continue;
-        if(ep->d_type & DT_DIR) {
-          if(wildcard(ep->d_name, pattern)) list.append(ep->d_name);
-        }
-      }
-      closedir(dp);
-    }
-    for(auto &name : list) name.append("/");  //must append after sorting
-    return list;
-  }
-
-  inline lstring directory::ufiles(const string &pathname, const string &pattern) {
-    lstring list;
-    DIR *dp;
-    struct dirent *ep;
-    dp = opendir(pathname);
-    if(dp) {
-      while(ep = readdir(dp)) {
-        if(!strcmp(ep->d_name, ".")) continue;
-        if(!strcmp(ep->d_name, "..")) continue;
-        if((ep->d_type & DT_DIR) == 0) {
-          if(wildcard(ep->d_name, pattern)) list.append(ep->d_name);
-        }
-      }
-      closedir(dp);
-    }
-    return list;
-  }
-#endif
-
-}
-
-#endif
@@ -1,115 +0,0 @@
-#ifndef NALL_DL_HPP
-#define NALL_DL_HPP
-
-//dynamic linking support
-
-#include <nall/intrinsics.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-#include <nall/utility.hpp>
-
-#if defined(PLATFORM_X) || defined(PLATFORM_OSX)
-  #include <dlfcn.h>
-#elif defined(PLATFORM_WINDOWS)
-  #include <windows.h>
-  #include <nall/windows/utf8.hpp>
-#endif
-
-namespace nall {
-  struct library {
-    bool opened() const { return handle; }
-    bool open(const char*, const char* = "");
-    bool open_absolute(const char*);
-    void* sym(const char*);
-    void close();
-
-    library() : handle(0) {}
-    ~library() { close(); }
-
-    library& operator=(const library&) = delete;
-    library(const library&) = delete;
-
-  private:
-    uintptr_t handle;
-  };
-
-  #if defined(PLATFORM_X)
-  inline bool library::open(const char *name, const char *path) {
-    if(handle) close();
-    handle = (uintptr_t)dlopen(string(path, *path && !strend(path, "/") ? "/" : "", "lib", name, ".so"), RTLD_LAZY);
-    if(!handle) handle = (uintptr_t)dlopen(string("/usr/local/lib/lib", name, ".so"), RTLD_LAZY);
-    return handle;
-  }
-
-  inline bool library::open_absolute(const char *name) {
-    if(handle) close();
-    handle = (uintptr_t)dlopen(name, RTLD_LAZY);
-    return handle;
-  }
-
-  inline void* library::sym(const char *name) {
-    if(!handle) return 0;
-    return dlsym((void*)handle, name);
-  }
-
-  inline void library::close() {
-    if(!handle) return;
-    dlclose((void*)handle);
-    handle = 0;
-  }
-  #elif defined(PLATFORM_OSX)
-  inline bool library::open(const char *name, const char *path) {
-    if(handle) close();
-    handle = (uintptr_t)dlopen(string(path, *path && !strend(path, "/") ? "/" : "", "lib", name, ".dylib"), RTLD_LAZY);
-    if(!handle) handle = (uintptr_t)dlopen(string("/usr/local/lib/lib", name, ".dylib"), RTLD_LAZY);
-    return handle;
-  }
-
-  inline bool library::open_absolute(const char *name) {
-    if(handle) close();
-    handle = (uintptr_t)dlopen(name, RTLD_LAZY);
-    return handle;
-  }
-
-  inline void* library::sym(const char *name) {
-    if(!handle) return 0;
-    return dlsym((void*)handle, name);
-  }
-
-  inline void library::close() {
-    if(!handle) return;
-    dlclose((void*)handle);
-    handle = 0;
-  }
-  #elif defined(PLATFORM_WINDOWS)
-  inline bool library::open(const char *name, const char *path) {
-    if(handle) close();
-    string filepath(path, *path && !strend(path, "/") && !strend(path, "\\") ? "\\" : "", name, ".dll");
-    handle = (uintptr_t)LoadLibraryW(utf16_t(filepath));
-    return handle;
-  }
-
-  inline bool library::open_absolute(const char *name) {
-    if(handle) close();
-    handle = (uintptr_t)LoadLibraryW(utf16_t(name));
-    return handle;
-  }
-
-  inline void* library::sym(const char *name) {
-    if(!handle) return 0;
-    return (void*)GetProcAddress((HMODULE)handle, name);
-  }
-
-  inline void library::close() {
-    if(!handle) return;
-    FreeLibrary((HMODULE)handle);
-    handle = 0;
-  }
-  #else
-  inline bool library::open(const char*, const char*) { return false; }
-  inline void* library::sym(const char*) { return 0; }
-  inline void library::close() {}
-  #endif
-};
-
-#endif
@@ -1,13 +0,0 @@
-#ifndef NALL_DSP_HPP
-#define NALL_DSP_HPP
-
-#include <algorithm>
-#ifdef __SSE__
-  #include <xmmintrin.h>
-#endif
-
-#define NALL_DSP_INTERNAL_HPP
-#include <nall/dsp/core.hpp>
-#undef NALL_DSP_INTERNAL_HPP
-
-#endif
@@ -1,51 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct Buffer {
-  double **sample;
-  uint16_t rdoffset;
-  uint16_t wroffset;
-  unsigned channels;
-
-  void setChannels(unsigned channels) {
-    for(unsigned c = 0; c < this->channels; c++) {
-      if(sample[c]) delete[] sample[c];
-    }
-    if(sample) delete[] sample;
-
-    this->channels = channels;
-    if(channels == 0) return;
-
-    sample = new double*[channels];
-    for(unsigned c = 0; c < channels; c++) {
-      sample[c] = new double[65536]();
-    }
-  }
-
-  inline double& read(unsigned channel, signed offset = 0) {
-    return sample[channel][(uint16_t)(rdoffset + offset)];
-  }
-
-  inline double& write(unsigned channel, signed offset = 0) {
-    return sample[channel][(uint16_t)(wroffset + offset)];
-  }
-
-  inline void clear() {
-    for(unsigned c = 0; c < channels; c++) {
-      for(unsigned n = 0; n < 65536; n++) {
-        sample[c][n] = 0;
-      }
-    }
-    rdoffset = 0;
-    wroffset = 0;
-  }
-
-  Buffer() {
-    channels = 0;
-  }
-
-  ~Buffer() {
-    setChannels(0);
-  }
-};
-
-#endif
@@ -1,167 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-#include <math.h>
-#include <nall/stdint.hpp>
-
-namespace nall {
-
-//precision: can be float, double or long double
-#define real float
-
-struct DSP;
-
-struct Resampler {
-  DSP &dsp;
-  real frequency;
-
-  virtual void setFrequency() = 0;
-  virtual void clear() = 0;
-  virtual void sample() = 0;
-  Resampler(DSP &dsp) : dsp(dsp) {}
-};
-
-struct DSP {
-  enum class ResampleEngine : unsigned {
-    Nearest,
-    Linear,
-    Cosine,
-    Cubic,
-    Hermite,
-    Average,
-    Sinc,
-  };
-
-  inline void setChannels(unsigned channels);
-  inline void setPrecision(unsigned precision);
-  inline void setFrequency(real frequency);  //inputFrequency
-  inline void setVolume(real volume);
-  inline void setBalance(real balance);
-
-  inline void setResampler(ResampleEngine resamplingEngine);
-  inline void setResamplerFrequency(real frequency);  //outputFrequency
-
-  inline void sample(signed channel[]);
-  inline bool pending();
-  inline void read(signed channel[]);
-
-  inline void clear();
-  inline DSP();
-  inline ~DSP();
-
-protected:
-  friend class ResampleNearest;
-  friend class ResampleLinear;
-  friend class ResampleCosine;
-  friend class ResampleCubic;
-  friend class ResampleAverage;
-  friend class ResampleHermite;
-  friend class ResampleSinc;
-
-  struct Settings {
-    unsigned channels;
-    unsigned precision;
-    real frequency;
-    real volume;
-    real balance;
-
-    //internal
-    real intensity;
-    real intensityInverse;
-  } settings;
-
-  Resampler *resampler;
-  inline void write(real channel[]);
-
-  #include "buffer.hpp"
-  Buffer buffer;
-  Buffer output;
-
-  inline void adjustVolume();
-  inline void adjustBalance();
-  inline signed clamp(const unsigned bits, const signed x);
-};
-
-#include "resample/nearest.hpp"
-#include "resample/linear.hpp"
-#include "resample/cosine.hpp"
-#include "resample/cubic.hpp"
-#include "resample/hermite.hpp"
-#include "resample/average.hpp"
-#include "resample/sinc.hpp"
-#include "settings.hpp"
-
-void DSP::sample(signed channel[]) {
-  for(unsigned c = 0; c < settings.channels; c++) {
-    buffer.write(c) = (real)channel[c] * settings.intensityInverse;
-  }
-  buffer.wroffset++;
-  resampler->sample();
-}
-
-bool DSP::pending() {
-  return output.rdoffset != output.wroffset;
-}
-
-void DSP::read(signed channel[]) {
-  adjustVolume();
-  adjustBalance();
-
-  for(unsigned c = 0; c < settings.channels; c++) {
-    channel[c] = clamp(settings.precision, output.read(c) * settings.intensity);
-  }
-  output.rdoffset++;
-}
-
-void DSP::write(real channel[]) {
-  for(unsigned c = 0; c < settings.channels; c++) {
-    output.write(c) = channel[c];
-  }
-  output.wroffset++;
-}
-
-void DSP::adjustVolume() {
-  for(unsigned c = 0; c < settings.channels; c++) {
-    output.read(c) *= settings.volume;
-  }
-}
-
-void DSP::adjustBalance() {
-  if(settings.channels != 2) return;  //TODO: support > 2 channels
-  if(settings.balance < 0.0) output.read(1) *= 1.0 + settings.balance;
-  if(settings.balance > 0.0) output.read(0) *= 1.0 - settings.balance;
-}
-
-signed DSP::clamp(const unsigned bits, const signed x) {
-  const signed b = 1U << (bits - 1);
-  const signed m = (1U << (bits - 1)) - 1;
-  return (x > m) ? m : (x < -b) ? -b : x;
-}
-
-void DSP::clear() {
-  buffer.clear();
-  output.clear();
-  resampler->clear();
-}
-
-DSP::DSP() {
-  setResampler(ResampleEngine::Hermite);
-  setResamplerFrequency(44100.0);
-
-  setChannels(2);
-  setPrecision(16);
-  setFrequency(44100.0);
-  setVolume(1.0);
-  setBalance(0.0);
-
-  clear();
-}
-
-DSP::~DSP() {
-  if(resampler) delete resampler;
-}
-
-#undef real
-
-}
-
-#endif
@@ -1,72 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleAverage : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  inline void sampleLinear();
-  ResampleAverage(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleAverage::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleAverage::clear() {
-  fraction = 0.0;
-}
-
-void ResampleAverage::sample() {
-  //can only average if input frequency >= output frequency
-  if(step < 1.0) return sampleLinear();
-
-  fraction += 1.0;
-
-  real scalar = 1.0;
-  if(fraction > step) scalar = 1.0 - (fraction - step);
-
-  for(unsigned c = 0; c < dsp.settings.channels; c++) {
-    dsp.output.write(c) += dsp.buffer.read(c) * scalar;
-  }
-
-  if(fraction >= step) {
-    for(unsigned c = 0; c < dsp.settings.channels; c++) {
-      dsp.output.write(c) /= step;
-    }
-    dsp.output.wroffset++;
-
-    fraction -= step;
-    for(unsigned c = 0; c < dsp.settings.channels; c++) {
-      dsp.output.write(c) = dsp.buffer.read(c) * fraction;
-    }
-  }
-
-  dsp.buffer.rdoffset++;
-}
-
-void ResampleAverage::sampleLinear() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -1);
-      real b = dsp.buffer.read(n, -0);
-
-      real mu = fraction;
-
-      channel[n] = a * (1.0 - mu) + b * mu;
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,44 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleCosine : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  ResampleCosine(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleCosine::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleCosine::clear() {
-  fraction = 0.0;
-}
-
-void ResampleCosine::sample() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -1);
-      real b = dsp.buffer.read(n, -0);
-
-      real mu = fraction;
-      mu = (1.0 - cos(mu * 3.14159265)) / 2.0;
-
-      channel[n] = a * (1.0 - mu) + b * mu;
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,50 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleCubic : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  ResampleCubic(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleCubic::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleCubic::clear() {
-  fraction = 0.0;
-}
-
-void ResampleCubic::sample() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -3);
-      real b = dsp.buffer.read(n, -2);
-      real c = dsp.buffer.read(n, -1);
-      real d = dsp.buffer.read(n, -0);
-
-      real mu = fraction;
-
-      real A = d - c - a + b;
-      real B = a - b - A;
-      real C = c - a;
-      real D = b;
-
-      channel[n] = A * (mu * 3) + B * (mu * 2) + C * mu + D;
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,62 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleHermite : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  ResampleHermite(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleHermite::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleHermite::clear() {
-  fraction = 0.0;
-}
-
-void ResampleHermite::sample() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -3);
-      real b = dsp.buffer.read(n, -2);
-      real c = dsp.buffer.read(n, -1);
-      real d = dsp.buffer.read(n, -0);
-
-      const real tension = 0.0;  //-1 = low, 0 = normal, +1 = high
-      const real bias = 0.0;  //-1 = left, 0 = even, +1 = right
-
-      real mu1, mu2, mu3, m0, m1, a0, a1, a2, a3;
-
-      mu1 = fraction;
-      mu2 = mu1 * mu1;
-      mu3 = mu2 * mu1;
-
-      m0  = (b - a) * (1.0 + bias) * (1.0 - tension) / 2.0;
-      m0 += (c - b) * (1.0 - bias) * (1.0 - tension) / 2.0;
-      m1  = (c - b) * (1.0 + bias) * (1.0 - tension) / 2.0;
-      m1 += (d - c) * (1.0 - bias) * (1.0 - tension) / 2.0;
-
-      a0 = +2 * mu3 - 3 * mu2 + 1;
-      a1 =      mu3 - 2 * mu2 + mu1;
-      a2 =      mu3 -     mu2;
-      a3 = -2 * mu3 + 3 * mu2;
-
-      channel[n] = (a0 * b) + (a1 * m0) + (a2 * m1) + (a3 * c);
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,600 +0,0 @@
-// If these types are changed to anything other than "float", you should comment out the SSE detection directives below
-// so that the SSE code is not used.
-
-typedef float resample_coeff_t;	// note: sizeof(resample_coeff_t) must be == to a power of 2, and not larger than 16
-typedef float resample_samp_t;
-
-
-// ...but don't comment this single RESAMPLE_SSEREGPARM define out when disabling SSE.
-#define RESAMPLE_SSEREGPARM	
-
-#if defined(__SSE__)
-  #define SINCRESAMPLE_USE_SSE 1
-  #ifndef __x86_64__
-    #undef RESAMPLE_SSEREGPARM
-    #define RESAMPLE_SSEREGPARM __attribute__((sseregparm))
-  #endif
-#else
-  // TODO: altivec here
-#endif
-
-namespace ResampleUtility
-{
- inline void kaiser_window(double* io, int count, double beta);
- inline void gen_sinc(double* out, int size, double cutoff, double kaiser);
- inline void gen_sinc_os(double* out, int size, double cutoff, double kaiser);
- inline void normalize(double* io, int size, double gain = 1.0);
-
- inline void* make_aligned(void* ptr, unsigned boundary);	// boundary must be a power of 2
-}
-
-class SincResampleHR
-{
- private:
-
- inline void Init(unsigned ratio_arg, double desired_bandwidth, double beta, double d);
-
- inline void write(resample_samp_t sample) RESAMPLE_SSEREGPARM;
- inline resample_samp_t read(void) RESAMPLE_SSEREGPARM;
- inline bool output_avail(void);
-
- private:
-
- inline resample_samp_t mac(const resample_samp_t *wave, const resample_coeff_t *coeff, unsigned count);
-
- unsigned ratio;
- unsigned num_convolutions;
-
- resample_coeff_t *coeffs;
- std::vector<unsigned char> coeffs_mem;
-
- // second half of ringbuffer should be copy of first half.
- resample_samp_t *rb;
- std::vector<unsigned char> rb_mem;
-
- signed rb_readpos;
- signed rb_writepos;
- signed rb_in;
- signed rb_eff_size;
-
- friend class SincResample;
-};
-
-class SincResample
-{
- public:
-
- enum
- {
-  QUALITY_LOW = 0,
-  QUALITY_MEDIUM = 2,
-  QUALITY_HIGH = 4
- };
-
- inline SincResample(double input_rate, double output_rate, double desired_bandwidth, unsigned quality = QUALITY_HIGH);
-
- inline void write(resample_samp_t sample) RESAMPLE_SSEREGPARM;
- inline resample_samp_t read(void) RESAMPLE_SSEREGPARM;
- inline bool output_avail(void);
-
- private:
-
- inline void Init(double input_rate, double output_rate, double desired_bandwidth, double beta, double d, unsigned pn_nume, unsigned phases_min);
-
- inline resample_samp_t mac(const resample_samp_t *wave, const resample_coeff_t *coeffs_a, const resample_coeff_t *coeffs_b, const double ffract, unsigned count) RESAMPLE_SSEREGPARM;
-
- unsigned num_convolutions;
- unsigned num_phases;
-
- unsigned step_int;
- double step_fract;
-
- double input_pos_fract;
-
-
- std::vector<resample_coeff_t *> coeffs;	// Pointers into coeff_mem.
- std::vector<unsigned char> coeff_mem;
-
-
- std::vector<resample_samp_t> rb;	// second half should be copy of first half.
- signed rb_readpos;
- signed rb_writepos;
- signed rb_in;
-
- bool hr_used;
- SincResampleHR hr;
-};
-
-
-//
-// Code:
-//
-//#include "resample.hpp"
-
-#if 0
-namespace bit
-{
-    inline unsigned round(unsigned x) {
-      if((x & (x - 1)) == 0) return x;
-      while(x & (x - 1)) x &= x - 1;
-      return x << 1;
-    }
-}
-#endif
-
-void SincResampleHR::Init(unsigned ratio_arg, double desired_bandwidth, double beta, double d)
-{
- const unsigned align_boundary = 16;
- std::vector<double> coeffs_tmp;
- double cutoff;	// 1.0 = f/2
-
- ratio = ratio_arg;
-
- //num_convolutions = ((unsigned)ceil(d / ((1.0 - desired_bandwidth) / ratio)) + 1) &~ 1;	// round up to be even
- num_convolutions = ((unsigned)ceil(d / ((1.0 - desired_bandwidth) / ratio)) | 1);
-
- cutoff = (1.0 / ratio) - (d / num_convolutions);
-
-//printf("%d %d %.20f\n", ratio, num_convolutions, cutoff);
- assert(num_convolutions > ratio);
-
-
- // Generate windowed sinc of POWER
- coeffs_tmp.resize(num_convolutions);
- //ResampleUtility::gen_sinc(&coeffs_tmp[0], num_convolutions, cutoff, beta);
- ResampleUtility::gen_sinc_os(&coeffs_tmp[0], num_convolutions, cutoff, beta);
- ResampleUtility::normalize(&coeffs_tmp[0], num_convolutions);
-
- // Copy from coeffs_tmp to coeffs~
- // We multiply many coefficients at a time in the mac loop, so make sure the last few that don't really
- // exist are allocated, zero'd mem.
-
- coeffs_mem.resize(((num_convolutions + 7) &~ 7) * sizeof(resample_coeff_t) + (align_boundary - 1));
- coeffs = (resample_coeff_t *)ResampleUtility::make_aligned(&coeffs_mem[0], align_boundary);
-
-
- for(unsigned i = 0; i < num_convolutions; i++)
-  coeffs[i] = coeffs_tmp[i];
-
- rb_eff_size = nall::bit::round(num_convolutions * 2) >> 1;
- rb_readpos = 0;
- rb_writepos = 0;
- rb_in = 0;
-
- rb_mem.resize(rb_eff_size * 2 * sizeof(resample_samp_t) + (align_boundary - 1));
- rb = (resample_samp_t *)ResampleUtility::make_aligned(&rb_mem[0], align_boundary);
-}
-
-
-inline bool SincResampleHR::output_avail(void)
-{
- return(rb_in >= (signed)num_convolutions);
-}
-
-inline void SincResampleHR::write(resample_samp_t sample)
-{
- assert(!output_avail());
-
- rb[rb_writepos] = sample;
- rb[rb_writepos + rb_eff_size] = sample;
- rb_writepos = (rb_writepos + 1) & (rb_eff_size - 1);
- rb_in++;
-}
-
-resample_samp_t SincResampleHR::mac(const resample_samp_t *wave, const resample_coeff_t *coeff, unsigned count)
-{
-#if SINCRESAMPLE_USE_SSE
- __m128 accum_veca[2] = { _mm_set1_ps(0), _mm_set1_ps(0) };
- 
- resample_samp_t accum;
-
- for(unsigned c = 0; c < count; c += 8)
- {
-  for(unsigned i = 0; i < 2; i++)
-  {
-   __m128 co[2];
-   __m128 w[2];
-
-   co[i] = _mm_load_ps(&coeff[c + i * 4]);
-   w[i] = _mm_load_ps(&wave[c + i * 4]);
-
-   w[i] = _mm_mul_ps(w[i], co[i]);
-
-   accum_veca[i] = _mm_add_ps(w[i], accum_veca[i]);
-  }
- }
-
- __m128 accum_vec = _mm_add_ps(accum_veca[0], accum_veca[1]); //_mm_add_ps(_mm_add_ps(accum_veca[0], accum_veca[1]), _mm_add_ps(accum_veca[2], accum_veca[3]));
-
- accum_vec = _mm_add_ps(accum_vec, _mm_shuffle_ps(accum_vec, accum_vec, (3 << 0) | (2 << 2) | (1 << 4) | (0 << 6)));
- accum_vec = _mm_add_ps(accum_vec, _mm_shuffle_ps(accum_vec, accum_vec, (1 << 0) | (0 << 2) | (1 << 4) | (0 << 6)));
-
- _mm_store_ss(&accum, accum_vec);
-
- return accum;
-#else
- resample_samp_t accum[4] = { 0, 0, 0, 0 };
-
- for(unsigned c = 0; c < count; c+= 4)
- {
-  accum[0] += wave[c + 0] * coeff[c + 0];
-  accum[1] += wave[c + 1] * coeff[c + 1];
-  accum[2] += wave[c + 2] * coeff[c + 2];
-  accum[3] += wave[c + 3] * coeff[c + 3];
- }
-
- return (accum[0] + accum[1]) + (accum[2] + accum[3]);	// don't mess with parentheses(assuming compiler doesn't already, which it may...
-
-#endif
-}
-
-
-resample_samp_t SincResampleHR::read(void)
-{
- assert(output_avail());
- resample_samp_t ret;
-
- ret = mac(&rb[rb_readpos], &coeffs[0], num_convolutions);
-
- rb_readpos = (rb_readpos + ratio) & (rb_eff_size - 1);
- rb_in -= ratio;
-
- return ret;
-}
-
-
-SincResample::SincResample(double input_rate, double output_rate, double desired_bandwidth, unsigned quality)
-{
- const struct
- {
-  double beta;
-  double d;
-  unsigned pn_nume;
-  unsigned phases_min;
- } qtab[5] =
- {
-  { 5.658, 3.62, 4096, 4 },
-  { 6.764, 4.32, 8192, 4 },
-  { 7.865, 5.0, 16384, 8 },
-  { 8.960, 5.7, 32768, 16 },
-  { 10.056, 6.4, 65536, 32 }
- };
-
- // Sanity checks
- assert(ceil(input_rate) > 0);
- assert(ceil(output_rate) > 0);
- assert(ceil(input_rate / output_rate) <= 1024);
- assert(ceil(output_rate / input_rate) <= 1024);
-
- // The simplistic number-of-phases calculation code doesn't work well enough for when desired_bandwidth is close to 1.0 and when
- // upsampling.
- assert(desired_bandwidth >= 0.25 && desired_bandwidth < 0.96);
- assert(quality >= 0 && quality <= 4);
-
- hr_used = false;
-
-#if 1
- // Round down to the nearest multiple of 4(so wave buffer remains aligned)
- // It also adjusts the effective intermediate sampling rate up slightly, so that the upper frequencies below f/2
- // aren't overly attenuated so much.  In the future, we might want to do an FFT or something to choose the intermediate rate more accurately
- // to virtually eliminate over-attenuation.
- unsigned ioratio_rd = (unsigned)floor(input_rate / (output_rate * (1.0 + (1.0 - desired_bandwidth) / 2) )) & ~3;
-
- if(ioratio_rd >= 8)
- {
-  hr.Init(ioratio_rd, desired_bandwidth, qtab[quality].beta, qtab[quality].d); //10.056, 6.4); 
-  hr_used = true;
-
-  input_rate /= ioratio_rd;
- }
-#endif
-
- Init(input_rate, output_rate, desired_bandwidth, qtab[quality].beta, qtab[quality].d, qtab[quality].pn_nume, qtab[quality].phases_min);
-}
-
-void SincResample::Init(double input_rate, double output_rate, double desired_bandwidth, double beta, double d, unsigned pn_nume, unsigned phases_min)
-{
- const unsigned max_mult_atatime = 8;	// multiply "granularity".  must be power of 2.
- const unsigned max_mult_minus1 = (max_mult_atatime - 1);
- const unsigned conv_alignment_bytes = 16;	// must be power of 2
- const double input_to_output_ratio = input_rate / output_rate;
- const double output_to_input_ratio = output_rate / input_rate;
- double cutoff;		// 1.0 = input_rate / 2
- std::vector<double> coeff_init_buffer;
-
- // Round up num_convolutions to be even.
- if(output_rate > input_rate)
-  num_convolutions = ((unsigned)ceil(d / (1.0 - desired_bandwidth)) + 1) & ~1;
- else
-  num_convolutions = ((unsigned)ceil(d / (output_to_input_ratio * (1.0 - desired_bandwidth))) + 1) & ~1;
-
- if(output_rate > input_rate)	// Upsampling
-  cutoff = desired_bandwidth;
- else	// Downsampling
-  cutoff = output_to_input_ratio * desired_bandwidth;
-
- // Round up to be even.
- num_phases = (std::max<unsigned>(pn_nume / num_convolutions, phases_min) + 1) &~1;
-
- // Adjust cutoff to account for the multiple phases.
- cutoff = cutoff / num_phases;
-
- assert((num_convolutions & 1) == 0);
- assert((num_phases & 1) == 0);
-
-// fprintf(stderr, "num_convolutions=%u, num_phases=%u, total expected coeff byte size=%lu\n", num_convolutions, num_phases,
-//        (long)((num_phases + 2) * ((num_convolutions + max_mult_minus1) & ~max_mult_minus1) * sizeof(float) + conv_alignment_bytes));
-
- coeff_init_buffer.resize(num_phases * num_convolutions);
-
- coeffs.resize(num_phases + 1 + 1);
-
- coeff_mem.resize((num_phases + 1 + 1) * ((num_convolutions + max_mult_minus1) &~ max_mult_minus1) * sizeof(resample_coeff_t) + conv_alignment_bytes);
-
- // Assign aligned pointers into coeff_mem
- {
-  resample_coeff_t *base_ptr = (resample_coeff_t *)ResampleUtility::make_aligned(&coeff_mem[0], conv_alignment_bytes);
-
-  for(unsigned phase = 0; phase < (num_phases + 1 + 1); phase++)
-  {
-   coeffs[phase] = base_ptr + (((num_convolutions + max_mult_minus1) & ~max_mult_minus1) * phase);
-  }
- }
-
- ResampleUtility::gen_sinc(&coeff_init_buffer[0], num_phases * num_convolutions, cutoff, beta);
- ResampleUtility::normalize(&coeff_init_buffer[0], num_phases * num_convolutions, num_phases);
-
- // Reorder coefficients to allow for more efficient convolution.
- for(int phase = -1; phase < ((int)num_phases + 1); phase++)
- {
-  for(int conv = 0; conv < (int)num_convolutions; conv++)
-  {
-   double coeff;
-
-   if(phase == -1 && conv == 0)
-    coeff = 0;
-   else if(phase == (int)num_phases && conv == ((int)num_convolutions - 1))
-    coeff = 0;
-   else
-    coeff = coeff_init_buffer[conv * num_phases + phase];
-
-   coeffs[phase + 1][conv] = coeff;
-  }
- }
-
- // Free a bit of mem
- coeff_init_buffer.resize(0);
-
- step_int = floor(input_to_output_ratio);
- step_fract = input_to_output_ratio - step_int;
-
- input_pos_fract = 0;
-
- // Do NOT use rb.size() later in the code, since it'll include the padding.
- // We should only need one "max_mult_minus1" here, not two, since it won't matter if it over-reads(due to doing "max_mult_atatime" multiplications at a time
- // rather than just 1, in which case this over-read wouldn't happen), from the first half into the duplicated half,
- // since those corresponding coefficients will be zero anyway; this is just to handle the case of reading off the end of the duplicated half to
- // prevent illegal memory accesses.
- rb.resize(num_convolutions * 2 + max_mult_minus1);
-
- rb_readpos = 0;
- rb_writepos = 0;
- rb_in = 0;
-}
-
-resample_samp_t SincResample::mac(const resample_samp_t *wave, const resample_coeff_t *coeffs_a, const resample_coeff_t *coeffs_b, const double ffract, unsigned count)
-{
- resample_samp_t accum = 0;
-#if SINCRESAMPLE_USE_SSE
- __m128 accum_vec_a[2] = { _mm_set1_ps(0), _mm_set1_ps(0) };
- __m128 accum_vec_b[2] = { _mm_set1_ps(0), _mm_set1_ps(0) };
-
- for(unsigned c = 0; c < count; c += 8) //8) //4)
- {
-  __m128 coeff_a[2];
-  __m128 coeff_b[2];
-  __m128 w[2];
-  __m128 result_a[2], result_b[2];
-
-  for(unsigned i = 0; i < 2; i++)
-  {
-   coeff_a[i] = _mm_load_ps(&coeffs_a[c + (i * 4)]);
-   coeff_b[i] = _mm_load_ps(&coeffs_b[c + (i * 4)]);
-   w[i] = _mm_loadu_ps(&wave[c + (i * 4)]);
-
-   result_a[i] = _mm_mul_ps(coeff_a[i], w[i]);
-   result_b[i] = _mm_mul_ps(coeff_b[i], w[i]);
-
-   accum_vec_a[i] = _mm_add_ps(result_a[i], accum_vec_a[i]);
-   accum_vec_b[i] = _mm_add_ps(result_b[i], accum_vec_b[i]);
-  }
- }
-
- __m128 accum_vec, av_a, av_b;
- __m128 mult_a_vec = _mm_set1_ps(1.0 - ffract);
- __m128 mult_b_vec = _mm_set1_ps(ffract);
-
- av_a = _mm_mul_ps(mult_a_vec, /*accum_vec_a[0]);*/ _mm_add_ps(accum_vec_a[0], accum_vec_a[1]));
- av_b = _mm_mul_ps(mult_b_vec, /*accum_vec_b[0]);*/ _mm_add_ps(accum_vec_b[0], accum_vec_b[1]));
-
- accum_vec = _mm_add_ps(av_a, av_b);
-
- accum_vec = _mm_add_ps(accum_vec, _mm_shuffle_ps(accum_vec, accum_vec, (3 << 0) | (2 << 2) | (1 << 4) | (0 << 6)));
- accum_vec = _mm_add_ps(accum_vec, _mm_shuffle_ps(accum_vec, accum_vec, (1 << 0) | (0 << 2) | (1 << 4) | (0 << 6)));
-
- _mm_store_ss(&accum, accum_vec);
-#else
- resample_coeff_t mult_a = 1.0 - ffract;
- resample_coeff_t mult_b = ffract;
-
- for(unsigned c = 0; c < count; c += 4)
- {
-  accum += wave[c + 0] * (coeffs_a[c + 0] * mult_a + coeffs_b[c + 0] * mult_b);
-  accum += wave[c + 1] * (coeffs_a[c + 1] * mult_a + coeffs_b[c + 1] * mult_b);
-  accum += wave[c + 2] * (coeffs_a[c + 2] * mult_a + coeffs_b[c + 2] * mult_b);
-  accum += wave[c + 3] * (coeffs_a[c + 3] * mult_a + coeffs_b[c + 3] * mult_b);
- }
-#endif
-
- return accum;
-}
-
-inline bool SincResample::output_avail(void)
-{
- return(rb_in >= (int)num_convolutions);
-}
-
-resample_samp_t SincResample::read(void)
-{
- assert(output_avail());
- double phase = input_pos_fract * num_phases - 0.5;
- signed phase_int = (signed)floor(phase);
- double phase_fract = phase - phase_int;
- unsigned phase_a = num_phases - 1 - phase_int;
- unsigned phase_b = phase_a - 1;
- resample_samp_t ret;
-
- ret = mac(&rb[rb_readpos], &coeffs[phase_a + 1][0], &coeffs[phase_b + 1][0], phase_fract, num_convolutions);
-
- unsigned int_increment = step_int;
-
- input_pos_fract += step_fract;
- int_increment += floor(input_pos_fract);
- input_pos_fract -= floor(input_pos_fract);
-
- rb_readpos = (rb_readpos + int_increment) % num_convolutions;
- rb_in -= int_increment;
-
- return ret;
-}
-
-inline void SincResample::write(resample_samp_t sample)
-{
- assert(!output_avail());
-
- if(hr_used)
- {
-  hr.write(sample);
-
-  if(hr.output_avail())
-  {
-   sample = hr.read();
-  }
-  else
-  {
-   return;
-  }
- }
-
- rb[rb_writepos + 0 * num_convolutions] = sample;
- rb[rb_writepos + 1 * num_convolutions] = sample;
- rb_writepos = (rb_writepos + 1) % num_convolutions;
- rb_in++;
-}
-
-void ResampleUtility::kaiser_window( double* io, int count, double beta)
-{
-        int const accuracy = 24; //16; //12;
-
-        double* end = io + count;
-
-        double beta2    = beta * beta * (double) -0.25;
-        double to_fract = beta2 / ((double) count * count);
-        double i        = 0;
-        double rescale = 0; // Doesn't need an initializer, to shut up gcc
-
-        for ( ; io < end; ++io, i += 1 )
-        {
-                double x = i * i * to_fract - beta2;
-                double u = x;
-                double k = x + 1;
-
-                double n = 2;
-                do
-                {
-                        u *= x / (n * n);
-                        n += 1;
-                        k += u;
-                }
-                while ( k <= u * (1 << accuracy) );
-
-                if ( !i )
-                        rescale = 1 / k; // otherwise values get large
-
-                *io *= k * rescale;
-        }
-}
-
-void ResampleUtility::gen_sinc(double* out, int size, double cutoff, double kaiser)
-{
-        assert( size % 2 == 0 ); // size must be even
- 
-        int const half_size = size / 2;
-        double* const mid = &out [half_size];
- 
-        // Generate right half of sinc
-        for ( int i = 0; i < half_size; i++ )
-        {
-                double angle = (i * 2 + 1) * (M_PI / 2);
-                mid [i] = sin( angle * cutoff ) / angle;
-        }
- 
-        kaiser_window( mid, half_size, kaiser );
- 
-        // Mirror for left half
-        for ( int i = 0; i < half_size; i++ )
-                out [i] = mid [half_size - 1 - i];
-}
-
-void ResampleUtility::gen_sinc_os(double* out, int size, double cutoff, double kaiser)
-{
-        assert( size % 2 == 1); // size must be odd
- 
-	for(int i = 0; i < size; i++)
-	{
-         if(i == (size / 2))
-          out[i] = 2 * M_PI * (cutoff / 2); //0.078478; //1.0; //sin(2 * M_PI * (cutoff / 2) * (i - size / 2)) / (i - (size / 2));
-	 else
- 	  out[i] = sin(2 * M_PI * (cutoff / 2) * (i - size / 2)) / (i - (size / 2));
-
-//	 out[i] *= 0.3635819 - 0.4891775 * cos(2 * M_PI * i / (size - 1)) + 0.1365995 * cos(4 * M_PI * i / (size - 1)) - 0.0106411 * cos(6 * M_PI * i / (size - 1));
-//0.42 - 0.5 * cos(2 * M_PI * i / (size - 1)) + 0.08 * cos(4 * M_PI * i / (size - 1));
-
-//         printf("%d %f\n", i, out[i]);
-	}
-
-	kaiser_window(&out[size / 2], size / 2 + 1, kaiser);
-
-        // Mirror for left half
-        for ( int i = 0; i < size / 2; i++ )
-                out [i] = out [size - 1 - i];
-
-}
-
-void ResampleUtility::normalize(double* io, int size, double gain)
-{
-        double sum = 0;
-        for ( int i = 0; i < size; i++ )
-                sum += io [i];
-
-        double scale = gain / sum;
-        for ( int i = 0; i < size; i++ )
-                io [i] *= scale;
-}
-
-void* ResampleUtility::make_aligned(void* ptr, unsigned boundary)
-{
- unsigned char* null_ptr = (unsigned char *)NULL;
- unsigned char* uc_ptr = (unsigned char *)ptr;
-
- uc_ptr += (boundary - ((uc_ptr - null_ptr) & (boundary - 1))) & (boundary - 1);
-
- //while((uc_ptr - null_ptr) & (boundary - 1))
- // uc_ptr++;
-
- //printf("%16llx %16llx\n", (unsigned long long)ptr, (unsigned long long)uc_ptr);
-
- assert((uc_ptr - (unsigned char *)ptr) < boundary && (uc_ptr >= (unsigned char *)ptr));
-
- return uc_ptr;
-}
@@ -1,43 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleLinear : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  ResampleLinear(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleLinear::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleLinear::clear() {
-  fraction = 0.0;
-}
-
-void ResampleLinear::sample() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -1);
-      real b = dsp.buffer.read(n, -0);
-
-      real mu = fraction;
-
-      channel[n] = a * (1.0 - mu) + b * mu;
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,43 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-struct ResampleNearest : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  ResampleNearest(DSP &dsp) : Resampler(dsp) {}
-
-  real fraction;
-  real step;
-};
-
-void ResampleNearest::setFrequency() {
-  fraction = 0.0;
-  step = dsp.settings.frequency / frequency;
-}
-
-void ResampleNearest::clear() {
-  fraction = 0.0;
-}
-
-void ResampleNearest::sample() {
-  while(fraction <= 1.0) {
-    real channel[dsp.settings.channels];
-
-    for(unsigned n = 0; n < dsp.settings.channels; n++) {
-      real a = dsp.buffer.read(n, -1);
-      real b = dsp.buffer.read(n, -0);
-
-      real mu = fraction;
-
-      channel[n] = mu < 0.5 ? a : b;
-    }
-
-    dsp.write(channel);
-    fraction += step;
-  }
-
-  dsp.buffer.rdoffset++;
-  fraction -= 1.0;
-}
-
-#endif
@@ -1,54 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-#include "lib/sinc.hpp"
-
-struct ResampleSinc : Resampler {
-  inline void setFrequency();
-  inline void clear();
-  inline void sample();
-  inline ResampleSinc(DSP &dsp);
-
-private:
-  inline void remakeSinc();
-  SincResample *sinc_resampler[8];
-};
-
-void ResampleSinc::setFrequency() {
-  remakeSinc();
-}
-
-void ResampleSinc::clear() {
-  remakeSinc();
-}
-
-void ResampleSinc::sample() {
-  for(unsigned c = 0; c < dsp.settings.channels; c++) {
-    sinc_resampler[c]->write(dsp.buffer.read(c));
-  }
-
-  if(sinc_resampler[0]->output_avail()) {
-    do {
-      for(unsigned c = 0; c < dsp.settings.channels; c++) {
-        dsp.output.write(c) = sinc_resampler[c]->read();
-      }
-      dsp.output.wroffset++;
-    } while(sinc_resampler[0]->output_avail());
-  }
-
-  dsp.buffer.rdoffset++;
-}
-
-ResampleSinc::ResampleSinc(DSP &dsp) : Resampler(dsp) {
-  for(unsigned n = 0; n < 8; n++) sinc_resampler[n] = 0;
-}
-
-void ResampleSinc::remakeSinc() {
-  assert(dsp.settings.channels < 8);
-
-  for(unsigned c = 0; c < dsp.settings.channels; c++) {
-    if(sinc_resampler[c]) delete sinc_resampler[c];
-    sinc_resampler[c] = new SincResample(dsp.settings.frequency, frequency, 0.85, SincResample::QUALITY_HIGH);
-  }
-}
-
-#endif
@@ -1,50 +0,0 @@
-#ifdef NALL_DSP_INTERNAL_HPP
-
-void DSP::setChannels(unsigned channels) {
-  assert(channels > 0);
-  buffer.setChannels(channels);
-  output.setChannels(channels);
-  settings.channels = channels;
-}
-
-void DSP::setPrecision(unsigned precision) {
-  settings.precision = precision;
-  settings.intensity = 1 << (settings.precision - 1);
-  settings.intensityInverse = 1.0 / settings.intensity;
-}
-
-void DSP::setFrequency(real frequency) {
-  settings.frequency = frequency;
-  resampler->setFrequency();
-}
-
-void DSP::setVolume(real volume) {
-  settings.volume = volume;
-}
-
-void DSP::setBalance(real balance) {
-  settings.balance = balance;
-}
-
-void DSP::setResampler(ResampleEngine engine) {
-  if(resampler) delete resampler;
-
-  switch(engine) {
-  case ResampleEngine::Nearest: resampler = new ResampleNearest(*this); return;
-  case ResampleEngine::Linear:  resampler = new ResampleLinear (*this); return;
-  case ResampleEngine::Cosine:  resampler = new ResampleCosine (*this); return;
-  case ResampleEngine::Cubic:   resampler = new ResampleCubic  (*this); return;
-  case ResampleEngine::Hermite: resampler = new ResampleHermite(*this); return;
-  case ResampleEngine::Average: resampler = new ResampleAverage(*this); return;
-  case ResampleEngine::Sinc:    resampler = new ResampleSinc   (*this); return;
-  }
-
-  throw;
-}
-
-void DSP::setResamplerFrequency(real frequency) {
-  resampler->frequency = frequency;
-  resampler->setFrequency();
-}
-
-#endif
@@ -1,103 +0,0 @@
-#ifndef NALL_EMULATION_SUPER_FAMICOM_USART_HPP
-#define NALL_EMULATION_SUPER_FAMICOM_USART_HPP
-
-#include <nall/platform.hpp>
-#include <nall/function.hpp>
-#include <nall/serial.hpp>
-#include <nall/stdint.hpp>
-
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#define usartproc dllexport
-
-static nall::function<bool ()> usart_quit;
-static nall::function<void (unsigned milliseconds)> usart_usleep;
-static nall::function<bool ()> usart_readable;
-static nall::function<uint8_t ()> usart_read;
-static nall::function<bool ()> usart_writable;
-static nall::function<void (uint8_t data)> usart_write;
-
-extern "C" usartproc void usart_init(
-  nall::function<bool ()> quit,
-  nall::function<void (unsigned milliseconds)> usleep,
-  nall::function<bool ()> readable,
-  nall::function<uint8_t ()> read,
-  nall::function<bool ()> writable,
-  nall::function<void (uint8_t data)> write
-) {
-  usart_quit = quit;
-  usart_usleep = usleep;
-  usart_readable = readable;
-  usart_read = read;
-  usart_writable = writable;
-  usart_write = write;
-}
-
-extern "C" usartproc void usart_main(int, char**);
-
-//
-
-static nall::serial usart;
-static bool usart_is_virtual = true;
-static bool usart_sigint = false;
-
-static bool usart_virtual() {
-  return usart_is_virtual;
-}
-
-//
-
-static bool usarthw_quit() {
-  return usart_sigint;
-}
-
-static void usarthw_usleep(unsigned milliseconds) {
-  usleep(milliseconds);
-}
-
-static bool usarthw_readable() {
-  return usart.readable();
-}
-
-static uint8_t usarthw_read() {
-  while(true) {
-    uint8_t buffer[1];
-    signed length = usart.read((uint8_t*)&buffer, 1);
-    if(length > 0) return buffer[0];
-  }
-}
-
-static bool usarthw_writable() {
-  return usart.writable();
-}
-
-static void usarthw_write(uint8_t data) {
-  uint8_t buffer[1] = { data };
-  usart.write((uint8_t*)&buffer, 1);
-}
-
-static void sigint(int) {
-  signal(SIGINT, SIG_DFL);
-  usart_sigint = true;
-}
-
-int main(int argc, char **argv) {
-  setpriority(PRIO_PROCESS, 0, -20);  //requires superuser privileges; otherwise priority = +0
-  signal(SIGINT, sigint);
-
-  if(usart.open("/dev/ttyACM0", 57600, true) == false) {
-    printf("error: unable to open USART hardware device\n");
-    return 0;
-  }
-
-  usart_is_virtual = false;
-  usart_init(usarthw_quit, usarthw_usleep, usarthw_readable, usarthw_read, usarthw_writable, usarthw_write);
-  usart_main(argc, argv);
-  usart.close();
-
-  return 0;
-}
-
-#endif
@@ -1,42 +0,0 @@
-#ifndef NALL_ENDIAN_HPP
-#define NALL_ENDIAN_HPP
-
-#include <nall/intrinsics.hpp>
-
-#if defined(ENDIAN_LSB)
-  //little-endian: uint8_t[] { 0x01, 0x02, 0x03, 0x04 } == 0x04030201
-  #define order_lsb2(a,b)             a,b
-  #define order_lsb3(a,b,c)           a,b,c
-  #define order_lsb4(a,b,c,d)         a,b,c,d
-  #define order_lsb5(a,b,c,d,e)       a,b,c,d,e
-  #define order_lsb6(a,b,c,d,e,f)     a,b,c,d,e,f
-  #define order_lsb7(a,b,c,d,e,f,g)   a,b,c,d,e,f,g
-  #define order_lsb8(a,b,c,d,e,f,g,h) a,b,c,d,e,f,g,h
-  #define order_msb2(a,b)             b,a
-  #define order_msb3(a,b,c)           c,b,a
-  #define order_msb4(a,b,c,d)         d,c,b,a
-  #define order_msb5(a,b,c,d,e)       e,d,c,b,a
-  #define order_msb6(a,b,c,d,e,f)     f,e,d,c,b,a
-  #define order_msb7(a,b,c,d,e,f,g)   g,f,e,d,c,b,a
-  #define order_msb8(a,b,c,d,e,f,g,h) h,g,f,e,d,c,b,a
-#elif defined(ENDIAN_MSB)
-  //big-endian:    uint8_t[] { 0x01, 0x02, 0x03, 0x04 } == 0x01020304
-  #define order_lsb2(a,b)             b,a
-  #define order_lsb3(a,b,c)           c,b,a
-  #define order_lsb4(a,b,c,d)         d,c,b,a
-  #define order_lsb5(a,b,c,d,e)       e,d,c,b,a
-  #define order_lsb6(a,b,c,d,e,f)     f,e,d,c,b,a
-  #define order_lsb7(a,b,c,d,e,f,g)   g,f,e,d,c,b,a
-  #define order_lsb8(a,b,c,d,e,f,g,h) h,g,f,e,d,c,b,a
-  #define order_msb2(a,b)             a,b
-  #define order_msb3(a,b,c)           a,b,c
-  #define order_msb4(a,b,c,d)         a,b,c,d
-  #define order_msb5(a,b,c,d,e)       a,b,c,d,e
-  #define order_msb6(a,b,c,d,e,f)     a,b,c,d,e,f
-  #define order_msb7(a,b,c,d,e,f,g)   a,b,c,d,e,f,g
-  #define order_msb8(a,b,c,d,e,f,g,h) a,b,c,d,e,f,g,h
-#else
-  #error "Unknown endian. Please specify in nall/intrinsics.hpp"
-#endif
-
-#endif
@@ -1,343 +0,0 @@
-#ifndef NALL_FILE_HPP
-#define NALL_FILE_HPP
-
-#include <nall/platform.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-#include <nall/utility.hpp>
-#include <nall/windows/utf8.hpp>
-#include <nall/stream/memory.hpp>
-
-namespace nall {
-  inline FILE* fopen_utf8(const string &utf8_filename, const char *mode) {
-    #if !defined(_WIN32)
-    return fopen(utf8_filename, mode);
-    #else
-    return _wfopen(utf16_t(utf8_filename), utf16_t(mode));
-    #endif
-  }
-
-  struct file {
-    enum class mode : unsigned { read, write, modify, append, readwrite = modify, writeread = append };
-    enum class index : unsigned { absolute, relative };
-    enum class time : unsigned { create, modify, access };
-
-    static bool copy(const string &sourcename, const string &targetname) {
-      file rd, wr;
-      if(rd.open(sourcename, mode::read) == false) return false;
-      if(wr.open(targetname, mode::write) == false) return false;
-      for(unsigned n = 0; n < rd.size(); n++) wr.write(rd.read());
-      return true;
-    }
-
-    static bool move(const string &sourcename, const string &targetname) {
-      #if !defined(_WIN32)
-      return rename(sourcename, targetname) == 0;
-      #else
-      return _wrename(utf16_t(sourcename), utf16_t(targetname)) == 0;
-      #endif
-    }
-
-    static bool remove(const string &filename) {
-      return unlink(filename) == 0;
-    }
-
-    static bool truncate(const string &filename, unsigned size) {
-      #if !defined(_WIN32)
-      return truncate(filename, size) == 0;
-      #else
-      bool result = false;
-      FILE *fp = fopen(filename, "rb+");
-      if(fp) {
-        result = _chsize(fileno(fp), size) == 0;
-        fclose(fp);
-      }
-      return result;
-      #endif
-    }
-
-    static vector<uint8_t> read(const string &filename) {
-      vector<uint8_t> memory;
-      file fp;
-      if(fp.open(filename, mode::read)) {
-        memory.resize(fp.size());
-        fp.read(memory.data(), memory.size());
-      }
-      return memory;
-    }
-
-    static bool read(const string &filename, uint8_t *data, unsigned size) {
-      file fp;
-      if(fp.open(filename, mode::read) == false) return false;
-      fp.read(data, size);
-      fp.close();
-      return true;
-    }
-
-    static bool write(const string &filename, const string &text) {
-      file fp;
-      if(fp.open(filename, mode::write) == false) return false;
-      fp.print(text);
-      fp.close();
-      return true;
-    }
-
-    static bool write(const string &filename, const vector<uint8_t> &buffer) {
-      file fp;
-      if(fp.open(filename, mode::write) == false) return false;
-      fp.write(buffer.data(), buffer.size());
-      fp.close();
-      return true;
-    }
-
-    static bool write(const string &filename, const uint8_t *data, unsigned size) {
-      file fp;
-      if(fp.open(filename, mode::write) == false) return false;
-      fp.write(data, size);
-      fp.close();
-      return true;
-    }
-
-    static string sha256(const string &filename) {
-      auto buffer = read(filename);
-      return nall::sha256(buffer.data(), buffer.size());
-    }
-
-    uint8_t read() {
-      if(!fp) return 0xff;                       //file not open
-      if(file_mode == mode::write) return 0xff;  //reads not permitted
-      if(file_offset >= file_size) return 0xff;  //cannot read past end of file
-      buffer_sync();
-      return buffer[(file_offset++) & buffer_mask];
-    }
-
-    uintmax_t readl(unsigned length = 1) {
-      uintmax_t data = 0;
-      for(int i = 0; i < length; i++) {
-        data |= (uintmax_t)read() << (i << 3);
-      }
-      return data;
-    }
-
-    uintmax_t readm(unsigned length = 1) {
-      uintmax_t data = 0;
-      while(length--) {
-        data <<= 8;
-        data |= read();
-      }
-      return data;
-    }
-
-    void read(uint8_t *buffer, unsigned length) {
-      while(length--) *buffer++ = read();
-    }
-
-    void write(uint8_t data) {
-      if(!fp) return;                      //file not open
-      if(file_mode == mode::read) return;  //writes not permitted
-      buffer_sync();
-      buffer[(file_offset++) & buffer_mask] = data;
-      buffer_dirty = true;
-      if(file_offset > file_size) file_size = file_offset;
-    }
-
-    void writel(uintmax_t data, unsigned length = 1) {
-      while(length--) {
-        write(data);
-        data >>= 8;
-      }
-    }
-
-    void writem(uintmax_t data, unsigned length = 1) {
-      for(int i = length - 1; i >= 0; i--) {
-        write(data >> (i << 3));
-      }
-    }
-
-    void write(const uint8_t *buffer, unsigned length) {
-      while(length--) write(*buffer++);
-    }
-
-    template<typename... Args> void print(Args... args) {
-      string data(args...);
-      const char *p = data;
-      while(*p) write(*p++);
-    }
-
-    void flush() {
-      buffer_flush();
-      fflush(fp);
-    }
-
-    void seek(int offset, index index_ = index::absolute) {
-      if(!fp) return;  //file not open
-      buffer_flush();
-
-      uintmax_t req_offset = file_offset;
-      switch(index_) {
-        case index::absolute: req_offset  = offset; break;
-        case index::relative: req_offset += offset; break;
-      }
-
-      if(req_offset < 0) req_offset = 0;  //cannot seek before start of file
-      if(req_offset > file_size) {
-        if(file_mode == mode::read) {     //cannot seek past end of file
-          req_offset = file_size;
-        } else {                          //pad file to requested location
-          file_offset = file_size;
-          while(file_size < req_offset) write(0x00);
-        }
-      }
-
-      file_offset = req_offset;
-    }
-
-    unsigned offset() const {
-      if(!fp) return 0;  //file not open
-      return file_offset;
-    }
-
-    unsigned size() const {
-      if(!fp) return 0;  //file not open
-      return file_size;
-    }
-
-    bool truncate(unsigned size) {
-      if(!fp) return false;  //file not open
-      #if !defined(_WIN32)
-      return ftruncate(fileno(fp), size) == 0;
-      #else
-      return _chsize(fileno(fp), size) == 0;
-      #endif
-    }
-
-    bool end() {
-      if(!fp) return true;  //file not open
-      return file_offset >= file_size;
-    }
-
-    static bool exists(const string &filename) {
-      #if !defined(_WIN32)
-      struct stat64 data;
-      return stat64(filename, &data) == 0;
-      #else
-      struct __stat64 data;
-      return _wstat64(utf16_t(filename), &data) == 0;
-      #endif
-    }
-
-    static uintmax_t size(const string &filename) {
-      #if !defined(_WIN32)
-      struct stat64 data;
-      stat64(filename, &data);
-      #else
-      struct __stat64 data;
-      _wstat64(utf16_t(filename), &data);
-      #endif
-      return S_ISREG(data.st_mode) ? data.st_size : 0u;
-    }
-
-    static time_t timestamp(const string &filename, file::time mode = file::time::create) {
-      #if !defined(_WIN32)
-      struct stat64 data;
-      stat64(filename, &data);
-      #else
-      struct __stat64 data;
-      _wstat64(utf16_t(filename), &data);
-      #endif
-      switch(mode) { default:
-        case file::time::create: return data.st_ctime;
-        case file::time::modify: return data.st_mtime;
-        case file::time::access: return data.st_atime;
-      }
-    }
-
-    bool open() const {
-      return fp;
-    }
-
-    bool open(const string &filename, mode mode_) {
-      if(fp) return false;
-
-      switch(file_mode = mode_) {
-        #if !defined(_WIN32)
-        case mode::read:      fp = fopen(filename, "rb" ); break;
-        case mode::write:     fp = fopen(filename, "wb+"); break;  //need read permission for buffering
-        case mode::readwrite: fp = fopen(filename, "rb+"); break;
-        case mode::writeread: fp = fopen(filename, "wb+"); break;
-        #else
-        case mode::read:      fp = _wfopen(utf16_t(filename), L"rb" ); break;
-        case mode::write:     fp = _wfopen(utf16_t(filename), L"wb+"); break;
-        case mode::readwrite: fp = _wfopen(utf16_t(filename), L"rb+"); break;
-        case mode::writeread: fp = _wfopen(utf16_t(filename), L"wb+"); break;
-        #endif
-      }
-      if(!fp) return false;
-      buffer_offset = -1;  //invalidate buffer
-      file_offset = 0;
-      fseek(fp, 0, SEEK_END);
-      file_size = ftell(fp);
-      fseek(fp, 0, SEEK_SET);
-      return true;
-    }
-
-    void close() {
-      if(!fp) return;
-      buffer_flush();
-      fclose(fp);
-      fp = 0;
-    }
-
-    file() {
-      memset(buffer, 0, sizeof buffer);
-      buffer_offset = -1;  //invalidate buffer
-      buffer_dirty = false;
-      fp = 0;
-      file_offset = 0;
-      file_size = 0;
-      file_mode = mode::read;
-    }
-
-    ~file() {
-      close();
-    }
-
-    file& operator=(const file&) = delete;
-    file(const file&) = delete;
-
-  private:
-    enum { buffer_size = 1 << 12, buffer_mask = buffer_size - 1 };
-    char buffer[buffer_size];
-    int buffer_offset;
-    bool buffer_dirty;
-    FILE *fp;
-    unsigned file_offset;
-    unsigned file_size;
-    mode file_mode;
-
-    void buffer_sync() {
-      if(!fp) return;  //file not open
-      if(buffer_offset != (file_offset & ~buffer_mask)) {
-        buffer_flush();
-        buffer_offset = file_offset & ~buffer_mask;
-        fseek(fp, buffer_offset, SEEK_SET);
-        unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
-        if(length) unsigned unused = fread(buffer, 1, length, fp);
-      }
-    }
-
-    void buffer_flush() {
-      if(!fp) return;                      //file not open
-      if(file_mode == mode::read) return;  //buffer cannot be written to
-      if(buffer_offset < 0) return;        //buffer unused
-      if(buffer_dirty == false) return;    //buffer unmodified since read
-      fseek(fp, buffer_offset, SEEK_SET);
-      unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
-      if(length) unsigned unused = fwrite(buffer, 1, length, fp);
-      buffer_offset = -1;                  //invalidate buffer
-      buffer_dirty = false;
-    }
-  };
-}
-
-#endif
@@ -1,213 +0,0 @@
-#ifndef NALL_FILEMAP_HPP
-#define NALL_FILEMAP_HPP
-
-#include <nall/file.hpp>
-#include <nall/stdint.hpp>
-#include <nall/windows/utf8.hpp>
-
-#include <stdio.h>
-#include <stdlib.h>
-#if defined(_WIN32)
-  #include <windows.h>
-#else
-  #include <fcntl.h>
-  #include <unistd.h>
-  #include <sys/mman.h>
-  #include <sys/stat.h>
-  #include <sys/types.h>
-#endif
-
-namespace nall {
-  class filemap {
-  public:
-    enum class mode : unsigned { read, write, readwrite, writeread };
-
-    bool open() const { return p_open(); }
-    bool open(const char *filename, mode mode_) { return p_open(filename, mode_); }
-    void close() { return p_close(); }
-    unsigned size() const { return p_size; }
-    uint8_t* data() { return p_handle; }
-    const uint8_t* data() const { return p_handle; }
-    filemap() : p_size(0), p_handle(0) { p_ctor(); }
-    filemap(const char *filename, mode mode_) : p_size(0), p_handle(0) { p_ctor(); p_open(filename, mode_); }
-    ~filemap() { p_dtor(); }
-
-  private:
-    unsigned p_size;
-    uint8_t *p_handle;
-
-    #if defined(_WIN32)
-    //=============
-    //MapViewOfFile
-    //=============
-
-    HANDLE p_filehandle, p_maphandle;
-
-    bool p_open() const {
-      return p_handle;
-    }
-
-    bool p_open(const char *filename, mode mode_) {
-      if(file::exists(filename) && file::size(filename) == 0) {
-        p_handle = 0;
-        p_size = 0;
-        return true;
-      }
-
-      int desired_access, creation_disposition, flprotect, map_access;
-
-      switch(mode_) {
-        default: return false;
-        case mode::read:
-          desired_access = GENERIC_READ;
-          creation_disposition = OPEN_EXISTING;
-          flprotect = PAGE_READONLY;
-          map_access = FILE_MAP_READ;
-          break;
-        case mode::write:
-          //write access requires read access
-          desired_access = GENERIC_WRITE;
-          creation_disposition = CREATE_ALWAYS;
-          flprotect = PAGE_READWRITE;
-          map_access = FILE_MAP_ALL_ACCESS;
-          break;
-        case mode::readwrite:
-          desired_access = GENERIC_READ | GENERIC_WRITE;
-          creation_disposition = OPEN_EXISTING;
-          flprotect = PAGE_READWRITE;
-          map_access = FILE_MAP_ALL_ACCESS;
-          break;
-        case mode::writeread:
-          desired_access = GENERIC_READ | GENERIC_WRITE;
-          creation_disposition = CREATE_NEW;
-          flprotect = PAGE_READWRITE;
-          map_access = FILE_MAP_ALL_ACCESS;
-          break;
-      }
-
-      p_filehandle = CreateFileW(utf16_t(filename), desired_access, FILE_SHARE_READ, NULL,
-        creation_disposition, FILE_ATTRIBUTE_NORMAL, NULL);
-      if(p_filehandle == INVALID_HANDLE_VALUE) return false;
-
-      p_size = GetFileSize(p_filehandle, NULL);
-
-      p_maphandle = CreateFileMapping(p_filehandle, NULL, flprotect, 0, p_size, NULL);
-      if(p_maphandle == INVALID_HANDLE_VALUE) {
-        CloseHandle(p_filehandle);
-        p_filehandle = INVALID_HANDLE_VALUE;
-        return false;
-      }
-
-      p_handle = (uint8_t*)MapViewOfFile(p_maphandle, map_access, 0, 0, p_size);
-      return p_handle;
-    }
-
-    void p_close() {
-      if(p_handle) {
-        UnmapViewOfFile(p_handle);
-        p_handle = 0;
-      }
-
-      if(p_maphandle != INVALID_HANDLE_VALUE) {
-        CloseHandle(p_maphandle);
-        p_maphandle = INVALID_HANDLE_VALUE;
-      }
-
-      if(p_filehandle != INVALID_HANDLE_VALUE) {
-        CloseHandle(p_filehandle);
-        p_filehandle = INVALID_HANDLE_VALUE;
-      }
-    }
-
-    void p_ctor() {
-      p_filehandle = INVALID_HANDLE_VALUE;
-      p_maphandle  = INVALID_HANDLE_VALUE;
-    }
-
-    void p_dtor() {
-      close();
-    }
-
-    #else
-    //====
-    //mmap
-    //====
-
-    int p_fd;
-
-    bool p_open() const {
-      return p_handle;
-    }
-
-    bool p_open(const char *filename, mode mode_) {
-      if(file::exists(filename) && file::size(filename) == 0) {
-        p_handle = 0;
-        p_size = 0;
-        return true;
-      }
-
-      int open_flags, mmap_flags;
-
-      switch(mode_) {
-        default: return false;
-        case mode::read:
-          open_flags = O_RDONLY;
-          mmap_flags = PROT_READ;
-          break;
-        case mode::write:
-          open_flags = O_RDWR | O_CREAT;  //mmap() requires read access
-          mmap_flags = PROT_WRITE;
-          break;
-        case mode::readwrite:
-          open_flags = O_RDWR;
-          mmap_flags = PROT_READ | PROT_WRITE;
-          break;
-        case mode::writeread:
-          open_flags = O_RDWR | O_CREAT;
-          mmap_flags = PROT_READ | PROT_WRITE;
-          break;
-      }
-
-      p_fd = ::open(filename, open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-      if(p_fd < 0) return false;
-
-      struct stat p_stat;
-      fstat(p_fd, &p_stat);
-      p_size = p_stat.st_size;
-
-      p_handle = (uint8_t*)mmap(0, p_size, mmap_flags, MAP_SHARED, p_fd, 0);
-      if(p_handle == MAP_FAILED) {
-        p_handle = 0;
-        ::close(p_fd);
-        p_fd = -1;
-        return false;
-      }
-
-      return p_handle;
-    }
-
-    void p_close() {
-      if(p_handle) {
-        munmap(p_handle, p_size);
-        p_handle = 0;
-      }
-
-      if(p_fd >= 0) {
-        ::close(p_fd);
-        p_fd = -1;
-      }
-    }
-
-    void p_ctor() {
-      p_fd = -1;
-    }
-
-    void p_dtor() {
-      p_close();
-    }
-
-    #endif
-  };
-}
-
-#endif
@@ -1,60 +0,0 @@
-#ifndef NALL_FUNCTION_HPP
-#define NALL_FUNCTION_HPP
-
-namespace nall {
-  template<typename T> class function;
-
-  template<typename R, typename... P> class function<R (P...)> {
-    struct container {
-      virtual R operator()(P... p) const = 0;
-      virtual container* copy() const = 0;
-      virtual ~container() {}
-    } *callback;
-
-    struct global : container {
-      R (*function)(P...);
-      R operator()(P... p) const { return function(std::forward<P>(p)...); }
-      container* copy() const { return new global(function); }
-      global(R (*function)(P...)) : function(function) {}
-    };
-
-    template<typename C> struct member : container {
-      R (C::*function)(P...);
-      C *object;
-      R operator()(P... p) const { return (object->*function)(std::forward<P>(p)...); }
-      container* copy() const { return new member(function, object); }
-      member(R (C::*function)(P...), C *object) : function(function), object(object) {}
-    };
-
-    template<typename L> struct lambda : container {
-      mutable L object;
-      R operator()(P... p) const { return object(std::forward<P>(p)...); }
-      container* copy() const { return new lambda(object); }
-      lambda(const L& object) : object(object) {}
-    };
-
-  public:
-    operator bool() const { return callback; }
-    R operator()(P... p) const { return (*callback)(std::forward<P>(p)...); }
-    void reset() { if(callback) { delete callback; callback = nullptr; } }
-
-    function& operator=(const function &source) {
-      if(this != &source) {
-        if(callback) { delete callback; callback = nullptr; }
-        if(source.callback) callback = source.callback->copy();
-      }
-      return *this;
-    }
-
-    function(const function &source) : callback(nullptr) { operator=(source); }
-    function() : callback(nullptr) {}
-    function(void *function) : callback(nullptr) { if(function) callback = new global((R (*)(P...))function); }
-    function(R (*function)(P...)) { callback = new global(function); }
-    template<typename C> function(R (C::*function)(P...), C *object) { callback = new member<C>(function, object); }
-    template<typename C> function(R (C::*function)(P...) const, C *object) { callback = new member<C>((R (C::*)(P...))function, object); }
-    template<typename L> function(const L& object) { callback = new lambda<L>(object); }
-    ~function() { if(callback) delete callback; }
-  };
-}
-
-#endif
@@ -1,85 +0,0 @@
-#ifndef NALL_GZIP_HPP
-#define NALL_GZIP_HPP
-
-#include <nall/file.hpp>
-#include <nall/inflate.hpp>
-
-namespace nall {
-
-struct gzip {
-  string filename;
-  uint8_t *data;
-  unsigned size;
-
-  inline bool decompress(const string &filename);
-  inline bool decompress(const uint8_t *data, unsigned size);
-
-  inline gzip();
-  inline ~gzip();
-};
-
-bool gzip::decompress(const string &filename) {
-  if(auto memory = file::read(filename)) {
-    return decompress(memory.data(), memory.size());
-  }
-  return false;
-}
-
-bool gzip::decompress(const uint8_t *data, unsigned size) {
-  if(size < 18) return false;
-  if(data[0] != 0x1f) return false;
-  if(data[1] != 0x8b) return false;
-  unsigned cm = data[2];
-  unsigned flg = data[3];
-  unsigned mtime = data[4];
-  mtime |= data[5] << 8;
-  mtime |= data[6] << 16;
-  mtime |= data[7] << 24;
-  unsigned xfl = data[8];
-  unsigned os = data[9];
-  unsigned p = 10;
-  unsigned isize = data[size - 4];
-  isize |= data[size - 3] << 8;
-  isize |= data[size - 2] << 16;
-  isize |= data[size - 1] << 24;
-  filename = "";
-
-  if(flg & 0x04) {  //FEXTRA
-    unsigned xlen = data[p + 0];
-    xlen |= data[p + 1] << 8;
-    p += 2 + xlen;
-  }
-
-  if(flg & 0x08) {  //FNAME
-    char buffer[PATH_MAX];
-    for(unsigned n = 0; n < PATH_MAX; n++, p++) {
-      buffer[n] = data[p];
-      if(data[p] == 0) break;
-    }
-    if(data[p++]) return false;
-    filename = buffer;
-  }
-
-  if(flg & 0x10) {  //FCOMMENT
-    while(data[p++]);
-  }
-
-  if(flg & 0x02) {  //FHCRC
-    p += 2;
-  }
-
-  this->size = isize;
-  this->data = new uint8_t[this->size];
-  return inflate(this->data, this->size, data + p, size - p - 8);
-}
-
-gzip::gzip() : data(nullptr) {
-}
-
-gzip::~gzip() {
-  if(data) delete[] data;
-}
-
-}
-
-#endif
@@ -1,176 +0,0 @@
-#ifndef NALL_HTTP_HPP
-#define NALL_HTTP_HPP
-
-#if !defined(_WIN32)
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <netdb.h>
-#else
-  #include <winsock2.h>
-  #include <ws2tcpip.h>
-  #include <windows.h>
-#endif
-
-#include <nall/platform.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct http {
-  string hostname;
-  addrinfo *serverinfo;
-  int serversocket;
-  string header;
-
-  inline void download(const string &path, uint8_t *&data, unsigned &size) {
-    data = 0;
-    size = 0;
-
-    send({
-      "GET ", path, " HTTP/1.1\r\n"
-      "Host: ", hostname, "\r\n"
-      "Connection: close\r\n"
-      "\r\n"
-    });
-
-    header = downloadHeader();
-    downloadContent(data, size);
-  }
-
-  inline bool connect(string host, unsigned port) {
-    hostname = host;
-
-    addrinfo hints;
-    memset(&hints, 0, sizeof(addrinfo));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_PASSIVE;
-
-    int status = getaddrinfo(hostname, string(port), &hints, &serverinfo);
-    if(status != 0) return false;
-
-    serversocket = socket(serverinfo->ai_family, serverinfo->ai_socktype, serverinfo->ai_protocol);
-    if(serversocket == -1) return false;
-
-    int result = ::connect(serversocket, serverinfo->ai_addr, serverinfo->ai_addrlen);
-    if(result == -1) return false;
-
-    return true;
-  }
-
-  inline bool send(const string &data) {
-    return send((const uint8_t*)(const char*)data, data.length());
-  }
-
-  inline bool send(const uint8_t *data, unsigned size) {
-    while(size) {
-      int length = ::send(serversocket, (const char*)data, size, 0);
-      if(length == -1) return false;
-      data += length;
-      size -= length;
-    }
-    return true;
-  }
-
-  inline string downloadHeader() {
-    string output;
-    do {
-      char buffer[2];
-      int length = recv(serversocket, buffer, 1, 0);
-      if(length <= 0) return output;
-      buffer[1] = 0;
-      output.append(buffer);
-    } while(output.endswith("\r\n\r\n") == false);
-    return output;
-  }
-
-  inline string downloadChunkLength() {
-    string output;
-    do {
-      char buffer[2];
-      int length = recv(serversocket, buffer, 1, 0);
-      if(length <= 0) return output;
-      buffer[1] = 0;
-      output.append(buffer);
-    } while(output.endswith("\r\n") == false);
-    return output;
-  }
-
-  inline void downloadContent(uint8_t *&data, unsigned &size) {
-    unsigned capacity = 0;
-
-    if(header.iposition("\r\nTransfer-Encoding: chunked\r\n")) {
-      while(true) {
-        unsigned length = hex(downloadChunkLength());
-        if(length == 0) break;
-        capacity += length;
-        data = (uint8_t*)realloc(data, capacity);
-
-        char buffer[length];
-        while(length) {
-          int packetlength = recv(serversocket, buffer, length, 0);
-          if(packetlength <= 0) break;
-          memcpy(data + size, buffer, packetlength);
-          size += packetlength;
-          length -= packetlength;
-        }
-      }
-    } else if(auto position = header.iposition("\r\nContent-Length: ")) {
-      unsigned length = decimal((const char*)header + position() + 18);
-      while(length) {
-        char buffer[256];
-        int packetlength = recv(serversocket, buffer, min(256, length), 0);
-        if(packetlength <= 0) break;
-        capacity += packetlength;
-        data = (uint8_t*)realloc(data, capacity);
-        memcpy(data + size, buffer, packetlength);
-        size += packetlength;
-        length -= packetlength;
-      }
-    } else {
-      while(true) {
-        char buffer[256];
-        int packetlength = recv(serversocket, buffer, 256, 0);
-        if(packetlength <= 0) break;
-        capacity += packetlength;
-        data = (uint8_t*)realloc(data, capacity);
-        memcpy(data + size, buffer, packetlength);
-        size += packetlength;
-      }
-    }
-
-    data = (uint8_t*)realloc(data, capacity + 1);
-    data[capacity] = 0;
-  }
-
-  inline void disconnect() {
-    close(serversocket);
-    freeaddrinfo(serverinfo);
-    serverinfo = 0;
-    serversocket = -1;
-  }
-
-  #ifdef _WIN32
-  inline int close(int sock) {
-    return closesocket(sock);
-  }
-
-  inline http() {
-    int sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if(sock == INVALID_SOCKET && WSAGetLastError() == WSANOTINITIALISED) {
-      WSADATA wsaData;
-      if(WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
-        WSACleanup();
-        return;
-      }
-    } else {
-      close(sock);
-    }
-  }
-  #endif
-};
-
-}
-
-#endif
@@ -1,539 +0,0 @@
-#ifndef NALL_IMAGE_HPP
-#define NALL_IMAGE_HPP
-
-#include <nall/bmp.hpp>
-#include <nall/filemap.hpp>
-#include <nall/interpolation.hpp>
-#include <nall/png.hpp>
-#include <nall/stdint.hpp>
-#include <algorithm>
-
-namespace nall {
-
-struct image {
-  uint8_t *data;
-  unsigned width;
-  unsigned height;
-  unsigned pitch;
-
-  bool endian;  //0 = little, 1 = big
-  unsigned depth;
-  unsigned stride;
-
-  struct Channel {
-    uint64_t mask;
-    unsigned depth;
-    unsigned shift;
-
-    inline bool operator==(const Channel &source) {
-      return mask == source.mask && depth == source.depth && shift == source.shift;
-    }
-
-    inline bool operator!=(const Channel &source) {
-      return !operator==(source);
-    }
-  } alpha, red, green, blue;
-
-  typedef double (*interpolation)(double, double, double, double, double);
-  static inline unsigned bitDepth(uint64_t color);
-  static inline unsigned bitShift(uint64_t color);
-  static inline uint64_t normalize(uint64_t color, unsigned sourceDepth, unsigned targetDepth);
-
-  inline bool operator==(const image &source);
-  inline bool operator!=(const image &source);
-
-  inline image& operator=(const image &source);
-  inline image& operator=(image &&source);
-  inline image(const image &source);
-  inline image(image &&source);
-  inline image(bool endian, unsigned depth, uint64_t alphaMask, uint64_t redMask, uint64_t greenMask, uint64_t blueMask);
-  inline image(const string &filename);
-  inline image(const uint8_t *data, unsigned size);
-  inline image();
-  inline ~image();
-
-  inline uint64_t read(const uint8_t *data) const;
-  inline void write(uint8_t *data, uint64_t value) const;
-
-  inline void free();
-  inline bool empty() const;
-  inline void allocate(unsigned width, unsigned height);
-  inline void clear(uint64_t color);
-  inline bool load(const string &filename);
-//inline bool loadBMP(const uint8_t *data, unsigned size);
-  inline bool loadPNG(const uint8_t *data, unsigned size);
-  inline void scale(unsigned width, unsigned height, interpolation op);
-  inline void transform(bool endian, unsigned depth, uint64_t alphaMask, uint64_t redMask, uint64_t greenMask, uint64_t blueMask);
-  inline void alphaBlend(uint64_t alphaColor);
-
-protected:
-  inline uint64_t interpolate(double mu, const uint64_t *s, interpolation op);
-  inline void scaleX(unsigned width, interpolation op);
-  inline void scaleY(unsigned height, interpolation op);
-  inline bool loadBMP(const string &filename);
-  inline bool loadPNG(const string &filename);
-};
-
-//static
-
-unsigned image::bitDepth(uint64_t color) {
-  unsigned depth = 0;
-  if(color) while((color & 1) == 0) color >>= 1;
-  while((color & 1) == 1) { color >>= 1; depth++; }
-  return depth;
-}
-
-unsigned image::bitShift(uint64_t color) {
-  unsigned shift = 0;
-  if(color) while((color & 1) == 0) { color >>= 1; shift++; }
-  return shift;
-}
-
-uint64_t image::normalize(uint64_t color, unsigned sourceDepth, unsigned targetDepth) {
-  while(sourceDepth < targetDepth) {
-    color = (color << sourceDepth) | color;
-    sourceDepth += sourceDepth;
-  }
-  if(targetDepth < sourceDepth) color >>= (sourceDepth - targetDepth);
-  return color;
-}
-
-//public
-
-bool image::operator==(const image &source) {
-  if(width != source.width) return false;
-  if(height != source.height) return false;
-  if(pitch != source.pitch) return false;
-
-  if(endian != source.endian) return false;
-  if(stride != source.stride) return false;
-
-  if(alpha != source.alpha) return false;
-  if(red != source.red) return false;
-  if(green != source.green) return false;
-  if(blue != source.blue) return false;
-
-  return memcmp(data, source.data, width * height * stride) == 0;
-}
-
-bool image::operator!=(const image &source) {
-  return !operator==(source);
-}
-
-image& image::operator=(const image &source) {
-  free();
-
-  width = source.width;
-  height = source.height;
-  pitch = source.pitch;
-
-  endian = source.endian;
-  stride = source.stride;
-
-  alpha = source.alpha;
-  red = source.red;
-  green = source.green;
-  blue = source.blue;
-
-  data = new uint8_t[width * height * stride];
-  memcpy(data, source.data, width * height * stride);
-  return *this;
-}
-
-image& image::operator=(image &&source) {
-  free();
-
-  width = source.width;
-  height = source.height;
-  pitch = source.pitch;
-
-  endian = source.endian;
-  stride = source.stride;
-
-  alpha = source.alpha;
-  red = source.red;
-  green = source.green;
-  blue = source.blue;
-
-  data = source.data;
-  source.data = nullptr;
-  return *this;
-}
-
-image::image(const image &source) : data(nullptr) {
-  operator=(source);
-}
-
-image::image(image &&source) : data(nullptr) {
-  operator=(std::forward<image>(source));
-}
-
-image::image(bool endian, unsigned depth, uint64_t alphaMask, uint64_t redMask, uint64_t greenMask, uint64_t blueMask) : data(nullptr) {
-  width = 0, height = 0, pitch = 0;
-
-  this->endian = endian;
-  this->depth = depth;
-  this->stride = (depth / 8) + ((depth & 7) > 0);
-
-  alpha.mask = alphaMask, red.mask = redMask, green.mask = greenMask, blue.mask = blueMask;
-  alpha.depth = bitDepth(alpha.mask), alpha.shift = bitShift(alpha.mask);
-  red.depth = bitDepth(red.mask), red.shift = bitShift(red.mask);
-  green.depth = bitDepth(green.mask), green.shift = bitShift(green.mask);
-  blue.depth = bitDepth(blue.mask), blue.shift = bitShift(blue.mask);
-}
-
-image::image(const string &filename) : data(nullptr) {
-  width = 0, height = 0, pitch = 0;
-
-  this->endian = 0;
-  this->depth = 32;
-  this->stride = 4;
-
-  alpha.mask = 255u << 24, red.mask = 255u << 16, green.mask = 255u << 8, blue.mask = 255u << 0;
-  alpha.depth = bitDepth(alpha.mask), alpha.shift = bitShift(alpha.mask);
-  red.depth = bitDepth(red.mask), red.shift = bitShift(red.mask);
-  green.depth = bitDepth(green.mask), green.shift = bitShift(green.mask);
-  blue.depth = bitDepth(blue.mask), blue.shift = bitShift(blue.mask);
-
-  load(filename);
-}
-
-image::image(const uint8_t *data, unsigned size) : data(nullptr) {
-  width = 0, height = 0, pitch = 0;
-
-  this->endian = 0;
-  this->depth = 32;
-  this->stride = 4;
-
-  alpha.mask = 255u << 24, red.mask = 255u << 16, green.mask = 255u << 8, blue.mask = 255u << 0;
-  alpha.depth = bitDepth(alpha.mask), alpha.shift = bitShift(alpha.mask);
-  red.depth = bitDepth(red.mask), red.shift = bitShift(red.mask);
-  green.depth = bitDepth(green.mask), green.shift = bitShift(green.mask);
-  blue.depth = bitDepth(blue.mask), blue.shift = bitShift(blue.mask);
-
-  loadPNG(data, size);
-}
-
-image::image() : data(nullptr) {
-  width = 0, height = 0, pitch = 0;
-
-  this->endian = 0;
-  this->depth = 32;
-  this->stride = 4;
-
-  alpha.mask = 255u << 24, red.mask = 255u << 16, green.mask = 255u << 8, blue.mask = 255u << 0;
-  alpha.depth = bitDepth(alpha.mask), alpha.shift = bitShift(alpha.mask);
-  red.depth = bitDepth(red.mask), red.shift = bitShift(red.mask);
-  green.depth = bitDepth(green.mask), green.shift = bitShift(green.mask);
-  blue.depth = bitDepth(blue.mask), blue.shift = bitShift(blue.mask);
-}
-
-image::~image() {
-  free();
-}
-
-uint64_t image::read(const uint8_t *data) const {
-  uint64_t result = 0;
-  if(endian == 0) {
-    for(signed n = stride - 1; n >= 0; n--) result = (result << 8) | data[n];
-  } else {
-    for(signed n = 0; n < stride; n++) result = (result << 8) | data[n];
-  }
-  return result;
-}
-
-void image::write(uint8_t *data, uint64_t value) const {
-  if(endian == 0) {
-    for(signed n = 0; n < stride; n++) { data[n] = value; value >>= 8; }
-  } else {
-    for(signed n = stride - 1; n >= 0; n--) { data[n] = value; value >>= 8; }
-  }
-}
-
-void image::free() {
-  if(data) delete[] data;
-  data = nullptr;
-}
-
-bool image::empty() const {
-  if(data == nullptr) return true;
-  if(width == 0 || height == 0) return true;
-  return false;
-}
-
-void image::allocate(unsigned width, unsigned height) {
-  if(data != nullptr && this->width == width && this->height == height) return;
-  free();
-  data = new uint8_t[width * height * stride]();
-  pitch = width * stride;
-  this->width = width;
-  this->height = height;
-}
-
-void image::clear(uint64_t color) {
-  uint8_t *dp = data;
-  for(unsigned n = 0; n < width * height; n++) {
-    write(dp, color);
-    dp += stride;
-  }
-}
-
-bool image::load(const string &filename) {
-  if(loadBMP(filename) == true) return true;
-  if(loadPNG(filename) == true) return true;
-  return false;
-}
-
-void image::scale(unsigned outputWidth, unsigned outputHeight, interpolation op) {
-  if(width != outputWidth) scaleX(outputWidth, op);
-  if(height != outputHeight) scaleY(outputHeight, op);
-}
-
-void image::transform(bool outputEndian, unsigned outputDepth, uint64_t outputAlphaMask, uint64_t outputRedMask, uint64_t outputGreenMask, uint64_t outputBlueMask) {
-  image output(outputEndian, outputDepth, outputAlphaMask, outputRedMask, outputGreenMask, outputBlueMask);
-  output.allocate(width, height);
-
-  #pragma omp parallel for
-  for(unsigned y = 0; y < height; y++) {
-    uint8_t *dp = output.data + output.pitch * y;
-    uint8_t *sp = data + pitch * y;
-    for(unsigned x = 0; x < width; x++) {
-      uint64_t color = read(sp);
-      sp += stride;
-
-      uint64_t a = (color & alpha.mask) >> alpha.shift;
-      uint64_t r = (color & red.mask) >> red.shift;
-      uint64_t g = (color & green.mask) >> green.shift;
-      uint64_t b = (color & blue.mask) >> blue.shift;
-
-      a = normalize(a, alpha.depth, output.alpha.depth);
-      r = normalize(r, red.depth, output.red.depth);
-      g = normalize(g, green.depth, output.green.depth);
-      b = normalize(b, blue.depth, output.blue.depth);
-
-      output.write(dp, (a << output.alpha.shift) | (r << output.red.shift) | (g << output.green.shift) | (b << output.blue.shift));
-      dp += output.stride;
-    }
-  }
-
-  operator=(std::move(output));
-}
-
-void image::alphaBlend(uint64_t alphaColor) {
-  uint64_t alphaR = (alphaColor & red.mask) >> red.shift;
-  uint64_t alphaG = (alphaColor & green.mask) >> green.shift;
-  uint64_t alphaB = (alphaColor & blue.mask) >> blue.shift;
-
-  #pragma omp parallel for
-  for(unsigned y = 0; y < height; y++) {
-    uint8_t *dp = data + pitch * y;
-    for(unsigned x = 0; x < width; x++) {
-      uint64_t color = read(dp);
-
-      uint64_t colorA = (color & alpha.mask) >> alpha.shift;
-      uint64_t colorR = (color & red.mask) >> red.shift;
-      uint64_t colorG = (color & green.mask) >> green.shift;
-      uint64_t colorB = (color & blue.mask) >> blue.shift;
-      double alphaScale = (double)colorA / (double)((1 << alpha.depth) - 1);
-
-      colorA = (1 << alpha.depth) - 1;
-      colorR = (colorR * alphaScale) + (alphaR * (1.0 - alphaScale));
-      colorG = (colorG * alphaScale) + (alphaG * (1.0 - alphaScale));
-      colorB = (colorB * alphaScale) + (alphaB * (1.0 - alphaScale));
-
-      write(dp, (colorA << alpha.shift) | (colorR << red.shift) | (colorG << green.shift) | (colorB << blue.shift));
-      dp += stride;
-    }
-  }
-}
-
-//protected
-
-uint64_t image::interpolate(double mu, const uint64_t *s, double (*op)(double, double, double, double, double)) {
-  uint64_t aa = (s[0] & alpha.mask) >> alpha.shift, ar = (s[0] & red.mask) >> red.shift,
-           ag = (s[0] & green.mask) >> green.shift, ab = (s[0] & blue.mask) >> blue.shift;
-  uint64_t ba = (s[1] & alpha.mask) >> alpha.shift, br = (s[1] & red.mask) >> red.shift,
-           bg = (s[1] & green.mask) >> green.shift, bb = (s[1] & blue.mask) >> blue.shift;
-  uint64_t ca = (s[2] & alpha.mask) >> alpha.shift, cr = (s[2] & red.mask) >> red.shift,
-           cg = (s[2] & green.mask) >> green.shift, cb = (s[2] & blue.mask) >> blue.shift;
-  uint64_t da = (s[3] & alpha.mask) >> alpha.shift, dr = (s[3] & red.mask) >> red.shift,
-           dg = (s[3] & green.mask) >> green.shift, db = (s[3] & blue.mask) >> blue.shift;
-
-  int64_t A = op(mu, aa, ba, ca, da);
-  int64_t R = op(mu, ar, br, cr, dr);
-  int64_t G = op(mu, ag, bg, cg, dg);
-  int64_t B = op(mu, ab, bb, cb, db);
-
-  A = max(0, min(A, (1 << alpha.depth) - 1));
-  R = max(0, min(R, (1 << red.depth) - 1));
-  G = max(0, min(G, (1 << green.depth) - 1));
-  B = max(0, min(B, (1 << blue.depth) - 1));
-
-  return (A << alpha.shift) | (R << red.shift) | (G << green.shift) | (B << blue.shift);
-}
-
-void image::scaleX(unsigned outputWidth, interpolation op) {
-  uint8_t *outputData = new uint8_t[outputWidth * height * stride];
-  unsigned outputPitch = outputWidth * stride;
-  double step = (double)width / (double)outputWidth;
-  const uint8_t *terminal = data + pitch * height;
-
-  #pragma omp parallel for
-  for(unsigned y = 0; y < height; y++) {
-    uint8_t *dp = outputData + outputPitch * y;
-    uint8_t *sp = data + pitch * y;
-
-    double fraction = 0.0;
-    uint64_t s[4] = { sp < terminal ? read(sp) : 0 };  //B,C (0,1) = center of kernel { 0, 0, 1, 2 }
-    s[1] = s[0];
-    s[2] = sp + stride < terminal ? read(sp += stride) : s[1];
-    s[3] = sp + stride < terminal ? read(sp += stride) : s[2];
-
-    for(unsigned x = 0; x < width; x++) {
-      while(fraction <= 1.0) {
-        if(dp >= outputData + outputPitch * height) break;
-        write(dp, interpolate(fraction, (const uint64_t*)&s, op));
-        dp += stride;
-        fraction += step;
-      }
-
-      s[0] = s[1]; s[1] = s[2]; s[2] = s[3];
-      if(sp + stride < terminal) s[3] = read(sp += stride);
-      fraction -= 1.0;
-    }
-  }
-
-  free();
-  data = outputData;
-  width = outputWidth;
-  pitch = width * stride;
-}
-
-void image::scaleY(unsigned outputHeight, interpolation op) {
-  uint8_t *outputData = new uint8_t[width * outputHeight * stride];
-  double step = (double)height / (double)outputHeight;
-  const uint8_t *terminal = data + pitch * height;
-
-  #pragma omp parallel for
-  for(unsigned x = 0; x < width; x++) {
-    uint8_t *dp = outputData + stride * x;
-    uint8_t *sp = data + stride * x;
-
-    double fraction = 0.0;
-    uint64_t s[4] = { sp < terminal ? read(sp) : 0 };
-    s[1] = s[0];
-    s[2] = sp + pitch < terminal ? read(sp += pitch) : s[1];
-    s[3] = sp + pitch < terminal ? read(sp += pitch) : s[2];
-
-    for(unsigned y = 0; y < height; y++) {
-      while(fraction <= 1.0) {
-        if(dp >= outputData + pitch * outputHeight) break;
-        write(dp, interpolate(fraction, (const uint64_t*)&s, op));
-        dp += pitch;
-        fraction += step;
-      }
-
-      s[0] = s[1]; s[1] = s[2]; s[2] = s[3];
-      if(sp + pitch < terminal) s[3] = read(sp += pitch);
-      fraction -= 1.0;
-    }
-  }
-
-  free();
-  data = outputData;
-  height = outputHeight;
-}
-
-bool image::loadBMP(const string &filename) {
-  uint32_t *outputData;
-  unsigned outputWidth, outputHeight;
-  if(bmp::read(filename, outputData, outputWidth, outputHeight) == false) return false;
-
-  allocate(outputWidth, outputHeight);
-  const uint32_t *sp = outputData;
-  uint8_t *dp = data;
-
-  for(unsigned y = 0; y < outputHeight; y++) {
-    for(unsigned x = 0; x < outputWidth; x++) {
-      uint32_t color = *sp++;
-      uint64_t a = normalize((uint8_t)(color >> 24), 8, alpha.depth);
-      uint64_t r = normalize((uint8_t)(color >> 16), 8, red.depth);
-      uint64_t g = normalize((uint8_t)(color >>  8), 8, green.depth);
-      uint64_t b = normalize((uint8_t)(color >>  0), 8, blue.depth);
-      write(dp, (a << alpha.shift) | (r << red.shift) | (g << green.shift) | (b << blue.shift));
-      dp += stride;
-    }
-  }
-
-  delete[] outputData;
-  return true;
-}
-
-bool image::loadPNG(const uint8_t *pngData, unsigned pngSize) {
-  png source;
-  if(source.decode(pngData, pngSize) == false) return false;
-
-  allocate(source.info.width, source.info.height);
-  const uint8_t *sp = source.data;
-  uint8_t *dp = data;
-
-  auto decode = [&]() -> uint64_t {
-    uint64_t p, r, g, b, a;
-
-    switch(source.info.colorType) {
-    case 0:  //L
-      r = g = b = source.readbits(sp);
-      a = (1 << source.info.bitDepth) - 1;
-      break;
-    case 2:  //R,G,B
-      r = source.readbits(sp);
-      g = source.readbits(sp);
-      b = source.readbits(sp);
-      a = (1 << source.info.bitDepth) - 1;
-      break;
-    case 3:  //P
-      p = source.readbits(sp);
-      r = source.info.palette[p][0];
-      g = source.info.palette[p][1];
-      b = source.info.palette[p][2];
-      a = (1 << source.info.bitDepth) - 1;
-      break;
-    case 4:  //L,A
-      r = g = b = source.readbits(sp);
-      a = source.readbits(sp);
-      break;
-    case 6:  //R,G,B,A
-      r = source.readbits(sp);
-      g = source.readbits(sp);
-      b = source.readbits(sp);
-      a = source.readbits(sp);
-      break;
-    }
-
-    a = normalize(a, source.info.bitDepth, alpha.depth);
-    r = normalize(r, source.info.bitDepth, red.depth);
-    g = normalize(g, source.info.bitDepth, green.depth);
-    b = normalize(b, source.info.bitDepth, blue.depth);
-
-    return (a << alpha.shift) | (r << red.shift) | (g << green.shift) | (b << blue.shift);
-  };
-
-  for(unsigned y = 0; y < height; y++) {
-    for(unsigned x = 0; x < width; x++) {
-      write(dp, decode());
-      dp += stride;
-    }
-  }
-
-  return true;
-}
-
-bool image::loadPNG(const string &filename) {
-  filemap map;
-  if(map.open(filename, filemap::mode::read) == false) return false;
-  return loadPNG(map.data(), map.size());
-}
-
-}
-
-#endif
@@ -1,358 +0,0 @@
-#ifndef NALL_INFLATE_HPP
-#define NALL_INFLATE_HPP
-
-#include <setjmp.h>
-
-namespace nall {
-
-namespace puff {
-  inline int puff(
-    unsigned char *dest, unsigned long *destlen,
-    unsigned char *source, unsigned long *sourcelen
-  );
-}
-
-inline bool inflate(
-  uint8_t *target, unsigned targetLength,
-  const uint8_t *source, unsigned sourceLength
-) {
-  unsigned long tl = targetLength, sl = sourceLength;
-  int result = puff::puff((unsigned char*)target, &tl, (unsigned char*)source, &sl);
-  return result == 0;
-}
-
-namespace puff {
-
-//zlib/contrib/puff.c
-//version 2.1*
-//author: Mark Adler
-//license: zlib
-//ported by: byuu
-
-//* I have corrected a bug in fixed(), where it was accessing uninitialized
-//  memory: calling construct() with lencode prior to initializing lencode.count
-
-enum {
-  MAXBITS   =  15,
-  MAXLCODES = 286,
-  MAXDCODES =  30,
-  FIXLCODES = 288,
-  MAXCODES  = MAXLCODES + MAXDCODES,
-};
-
-struct state {
-  unsigned char *out;
-  unsigned long outlen;
-  unsigned long outcnt;
-
-  unsigned char *in;
-  unsigned long inlen;
-  unsigned long incnt;
-  int bitbuf;
-  int bitcnt;
-
-  jmp_buf env;
-};
-
-struct huffman {
-  short *count;
-  short *symbol;
-};
-
-inline int bits(state *s, int need) {
-  long val;
-
-  val = s->bitbuf;
-  while(s->bitcnt < need) {
-    if(s->incnt == s->inlen) longjmp(s->env, 1);
-    val |= (long)(s->in[s->incnt++]) << s->bitcnt;
-    s->bitcnt += 8;
-  }
-
-  s->bitbuf = (int)(val >> need);
-  s->bitcnt -= need;
-
-  return (int)(val & ((1L << need) - 1));
-}
-
-inline int stored(state *s) {
-  unsigned len;
-
-  s->bitbuf = 0;
-  s->bitcnt = 0;
-
-  if(s->incnt + 4 > s->inlen) return 2;
-  len  = s->in[s->incnt++];
-  len |= s->in[s->incnt++] << 8;
-  if(s->in[s->incnt++] != (~len & 0xff) ||
-     s->in[s->incnt++] != ((~len >> 8) & 0xff)
-  ) return 2;
-
-  if(s->incnt + len > s->inlen) return 2;
-  if(s->out != 0) {
-    if(s->outcnt + len > s->outlen) return 1;
-    while(len--) s->out[s->outcnt++] = s->in[s->incnt++];
-  } else {
-    s->outcnt += len;
-    s->incnt += len;
-  }
-
-  return 0;
-}
-
-inline int decode(state *s, huffman *h) {
-  int len, code, first, count, index, bitbuf, left;
-  short *next;
-
-  bitbuf = s->bitbuf;
-  left = s->bitcnt;
-  code = first = index = 0;
-  len = 1;
-  next = h->count + 1;
-  while(true) {
-    while(left--) {
-      code |= bitbuf & 1;
-      bitbuf >>= 1;
-      count = *next++;
-      if(code - count < first) {
-        s->bitbuf = bitbuf;
-        s->bitcnt = (s->bitcnt - len) & 7;
-        return h->symbol[index + (code - first)];
-      }
-      index += count;
-      first += count;
-      first <<= 1;
-      code <<= 1;
-      len++;
-    }
-    left = (MAXBITS + 1) - len;
-    if(left == 0) break;
-    if(s->incnt == s->inlen) longjmp(s->env, 1);
-    bitbuf = s->in[s->incnt++];
-    if(left > 8) left = 8;
-  }
-
-  return -10;
-}
-
-inline int construct(huffman *h, short *length, int n) {
-  int symbol, len, left;
-  short offs[MAXBITS + 1];
-
-  for(len = 0; len <= MAXBITS; len++) h->count[len] = 0;
-  for(symbol = 0; symbol < n; symbol++) h->count[length[symbol]]++;
-  if(h->count[0] == n) return 0;
-
-  left = 1;
-  for(len = 1; len <= MAXBITS; len++) {
-    left <<= 1;
-    left -= h->count[len];
-    if(left < 0) return left;
-  }
-
-  offs[1] = 0;
-  for(len = 1; len < MAXBITS; len++) offs[len + 1] = offs[len] + h->count[len];
-
-  for(symbol = 0; symbol < n; symbol++) {
-    if(length[symbol] != 0) h->symbol[offs[length[symbol]]++] = symbol;
-  }
-
-  return left;
-}
-
-inline int codes(state *s, huffman *lencode, huffman *distcode) {
-  int symbol, len;
-  unsigned dist;
-  static const short lens[29] = {
-    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
-  };
-  static const short lext[29] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
-  };
-  static const short dists[30] = {
-    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-    8193, 12289, 16385, 24577
-  };
-  static const short dext[30] = {
-    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-    7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-    12, 12, 13, 13
-  };
-
-  do {
-    symbol = decode(s, lencode);
-    if(symbol < 0) return symbol;
-    if(symbol < 256) {
-      if(s->out != 0) {
-        if(s->outcnt == s->outlen) return 1;
-        s->out[s->outcnt] = symbol;
-      }
-      s->outcnt++;
-    } else if(symbol > 256) {
-      symbol -= 257;
-      if(symbol >= 29) return -10;
-      len = lens[symbol] + bits(s, lext[symbol]);
-
-      symbol = decode(s, distcode);
-      if(symbol < 0) return symbol;
-      dist = dists[symbol] + bits(s, dext[symbol]);
-      #ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOO_FAR
-      if(dist > s->outcnt) return -11;
-      #endif
-
-      if(s->out != 0) {
-        if(s->outcnt + len > s->outlen) return 1;
-        while(len--) {
-          s->out[s->outcnt] =
-          #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOO_FAR
-          dist > s->outcnt ? 0 :
-          #endif
-          s->out[s->outcnt - dist];
-          s->outcnt++;
-        }
-      } else {
-        s->outcnt += len;
-      }
-    }
-  } while(symbol != 256);
-
-  return 0;
-}
-
-inline int fixed(state *s) {
-  static int virgin = 1;
-  static short lencnt[MAXBITS + 1], lensym[FIXLCODES];
-  static short distcnt[MAXBITS + 1], distsym[MAXDCODES];
-  static huffman lencode, distcode;
-
-  if(virgin) {
-    int symbol = 0;
-    short lengths[FIXLCODES];
-
-    lencode.count = lencnt;
-    lencode.symbol = lensym;
-    distcode.count = distcnt;
-    distcode.symbol = distsym;
-
-    for(; symbol <       144; symbol++) lengths[symbol] = 8;
-    for(; symbol <       256; symbol++) lengths[symbol] = 9;
-    for(; symbol <       280; symbol++) lengths[symbol] = 7;
-    for(; symbol < FIXLCODES; symbol++) lengths[symbol] = 8;
-    construct(&lencode, lengths, FIXLCODES);
-
-    for(symbol = 0; symbol < MAXDCODES; symbol++) lengths[symbol] = 5;
-    construct(&distcode, lengths, MAXDCODES);
-
-    virgin = 0;
-  }
-
-  return codes(s, &lencode, &distcode);
-}
-
-inline int dynamic(state *s) {
-  int nlen, ndist, ncode, index, err;
-  short lengths[MAXCODES];
-  short lencnt[MAXBITS + 1], lensym[MAXLCODES];
-  short distcnt[MAXBITS + 1], distsym[MAXDCODES];
-  huffman lencode, distcode;
-  static const short order[19] = {
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-  };
-
-  lencode.count = lencnt;
-  lencode.symbol = lensym;
-  distcode.count = distcnt;
-  distcode.symbol = distsym;
-
-  nlen = bits(s, 5) + 257;
-  ndist = bits(s, 5) + 1;
-  ncode = bits(s, 4) + 4;
-  if(nlen > MAXLCODES || ndist > MAXDCODES) return -3;
-
-  for(index = 0; index < ncode; index++) lengths[order[index]] = bits(s, 3);
-  for(; index < 19; index++) lengths[order[index]] = 0;
-
-  err = construct(&lencode, lengths, 19);
-  if(err != 0) return -4;
-
-  index = 0;
-  while(index < nlen + ndist) {
-    int symbol, len;
-
-    symbol = decode(s, &lencode);
-    if(symbol < 16) {
-      lengths[index++] = symbol;
-    } else {
-      len = 0;
-      if(symbol == 16) {
-        if(index == 0) return -5;
-        len = lengths[index - 1];
-        symbol = 3 + bits(s, 2);
-      } else if(symbol == 17) {
-        symbol = 3 + bits(s, 3);
-      } else {
-        symbol = 11 + bits(s, 7);
-      }
-      if(index + symbol > nlen + ndist) return -6;
-      while(symbol--) lengths[index++] = len;
-    }
-  }
-
-  if(lengths[256] == 0) return -9;
-
-  err = construct(&lencode, lengths, nlen);
-  if(err < 0 || (err > 0 && nlen - lencode.count[0] != 1)) return -7;
-
-  err = construct(&distcode, lengths + nlen, ndist);
-  if(err < 0 || (err > 0 && ndist - distcode.count[0] != 1)) return -8;
-
-  return codes(s, &lencode, &distcode);
-}
-
-inline int puff(
-  unsigned char *dest, unsigned long *destlen,
-  unsigned char *source, unsigned long *sourcelen
-) {
-  state s;
-  int last, type, err;
-
-  s.out = dest;
-  s.outlen = *destlen;
-  s.outcnt = 0;
-
-  s.in = source;
-  s.inlen = *sourcelen;
-  s.incnt = 0;
-  s.bitbuf = 0;
-  s.bitcnt = 0;
-
-  if(setjmp(s.env) != 0) {
-    err = 2;
-  } else {
-    do {
-      last = bits(&s, 1);
-      type = bits(&s, 2);
-      err = type == 0 ? stored(&s)
-          : type == 1 ? fixed(&s)
-          : type == 2 ? dynamic(&s)
-          : -1;
-      if(err != 0) break;
-    } while(!last);
-  }
-
-  if(err <= 0) {
-    *destlen = s.outcnt;
-    *sourcelen = s.incnt;
-  }
-
-  return err;
-}
-
-}
-
-}
-
-#endif
@@ -1,386 +0,0 @@
-#ifndef NALL_INPUT_HPP
-#define NALL_INPUT_HPP
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct Keyboard;
-Keyboard& keyboard(unsigned = 0);
-
-static const char KeyboardScancodeName[][64] = {
-  "Escape", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12",
-  "PrintScreen", "ScrollLock", "Pause", "Tilde",
-  "Num1", "Num2", "Num3", "Num4", "Num5", "Num6", "Num7", "Num8", "Num9", "Num0",
-  "Dash", "Equal", "Backspace",
-  "Insert", "Delete", "Home", "End", "PageUp", "PageDown",
-  "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
-  "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-  "LeftBracket", "RightBracket", "Backslash", "Semicolon", "Apostrophe", "Comma", "Period", "Slash",
-  "Keypad1", "Keypad2", "Keypad3", "Keypad4", "Keypad5", "Keypad6", "Keypad7", "Keypad8", "Keypad9", "Keypad0",
-  "Point", "Enter", "Add", "Subtract", "Multiply", "Divide",
-  "NumLock", "CapsLock",
-  "Up", "Down", "Left", "Right",
-  "Tab", "Return", "Spacebar", "Menu",
-  "Shift", "Control", "Alt", "Super",
-};
-
-struct Keyboard {
-  const unsigned ID;
-  enum { Base = 1 };
-  enum { Count = 8, Size = 128 };
-
-  enum Scancode {
-    Escape, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
-    PrintScreen, ScrollLock, Pause, Tilde,
-    Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8, Num9, Num0,
-    Dash, Equal, Backspace,
-    Insert, Delete, Home, End, PageUp, PageDown,
-    A, B, C, D, E, F, G, H, I, J, K, L, M,
-    N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
-    LeftBracket, RightBracket, Backslash, Semicolon, Apostrophe, Comma, Period, Slash,
-    Keypad1, Keypad2, Keypad3, Keypad4, Keypad5, Keypad6, Keypad7, Keypad8, Keypad9, Keypad0,
-    Point, Enter, Add, Subtract, Multiply, Divide,
-    NumLock, CapsLock,
-    Up, Down, Left, Right,
-    Tab, Return, Spacebar, Menu,
-    Shift, Control, Alt, Super,
-    Limit,
-  };
-
-  static signed numberDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(keyboard(i).belongsTo(scancode)) return i;
-    }
-    return -1;
-  }
-
-  static signed keyDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(keyboard(i).isKey(scancode)) return scancode - keyboard(i).key(Escape);
-    }
-    return -1;
-  }
-
-  static signed modifierDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(keyboard(i).isModifier(scancode)) return scancode - keyboard(i).key(Shift);
-    }
-    return -1;
-  }
-
-  static bool isAnyKey(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(keyboard(i).isKey(scancode)) return true;
-    }
-    return false;
-  }
-
-  static bool isAnyModifier(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(keyboard(i).isModifier(scancode)) return true;
-    }
-    return false;
-  }
-
-  static uint16_t decode(const char *name) {
-    string s(name);
-    if(!strbegin(name, "KB")) return 0;
-    s.ltrim("KB");
-    unsigned id = decimal(s);
-    auto pos = strpos(s, "::");
-    if(!pos) return 0;
-    s = substr(s, pos() + 2);
-    for(unsigned i = 0; i < Limit; i++) {
-      if(s == KeyboardScancodeName[i]) return Base + Size * id + i;
-    }
-    return 0;
-  }
-
-  string encode(uint16_t code) const {
-    unsigned index = 0;
-    for(unsigned i = 0; i < Count; i++) {
-      if(code >= Base + Size * i && code < Base + Size * (i + 1)) {
-        index = code - (Base + Size * i);
-        break;
-      }
-    }
-    return { "KB", ID, "::", KeyboardScancodeName[index] };
-  }
-
-  uint16_t operator[](Scancode code) const { return Base + ID * Size + code; }
-  uint16_t key(unsigned id) const { return Base + Size * ID + id; }
-  bool isKey(unsigned id) const { return id >= key(Escape) && id <= key(Menu); }
-  bool isModifier(unsigned id) const { return id >= key(Shift) && id <= key(Super); }
-  bool belongsTo(uint16_t scancode) const { return isKey(scancode) || isModifier(scancode); }
-
-  Keyboard(unsigned ID_) : ID(ID_) {}
-};
-
-inline Keyboard& keyboard(unsigned id) {
-  static Keyboard kb0(0), kb1(1), kb2(2), kb3(3), kb4(4), kb5(5), kb6(6), kb7(7);
-  switch(id) { default:
-    case 0: return kb0; case 1: return kb1; case 2: return kb2; case 3: return kb3;
-    case 4: return kb4; case 5: return kb5; case 6: return kb6; case 7: return kb7;
-  }
-}
-
-static const char MouseScancodeName[][64] = {
-  "Xaxis", "Yaxis", "Zaxis",
-  "Button0", "Button1", "Button2", "Button3", "Button4", "Button5", "Button6", "Button7",
-};
-
-struct Mouse;
-Mouse& mouse(unsigned = 0);
-
-struct Mouse {
-  const unsigned ID;
-  enum { Base = Keyboard::Base + Keyboard::Size * Keyboard::Count };
-  enum { Count = 8, Size = 16 };
-  enum { Axes = 3, Buttons = 8 };
-
-  enum Scancode {
-    Xaxis, Yaxis, Zaxis,
-    Button0, Button1, Button2, Button3, Button4, Button5, Button6, Button7,
-    Limit,
-  };
-
-  static signed numberDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(mouse(i).belongsTo(scancode)) return i;
-    }
-    return -1;
-  }
-
-  static signed axisDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(mouse(i).isAxis(scancode)) return scancode - mouse(i).axis(0);
-    }
-    return -1;
-  }
-
-  static signed buttonDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(mouse(i).isButton(scancode)) return scancode - mouse(i).button(0);
-    }
-    return -1;
-  }
-
-  static bool isAnyAxis(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(mouse(i).isAxis(scancode)) return true;
-    }
-    return false;
-  }
-
-  static bool isAnyButton(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(mouse(i).isButton(scancode)) return true;
-    }
-    return false;
-  }
-
-  static uint16_t decode(const char *name) {
-    string s(name);
-    if(!strbegin(name, "MS")) return 0;
-    s.ltrim("MS");
-    unsigned id = decimal(s);
-    auto pos = strpos(s, "::");
-    if(!pos) return 0;
-    s = substr(s, pos() + 2);
-    for(unsigned i = 0; i < Limit; i++) {
-      if(s == MouseScancodeName[i]) return Base + Size * id + i;
-    }
-    return 0;
-  }
-
-  string encode(uint16_t code) const {
-    unsigned index = 0;
-    for(unsigned i = 0; i < Count; i++) {
-      if(code >= Base + Size * i && code < Base + Size * (i + 1)) {
-        index = code - (Base + Size * i);
-        break;
-      }
-    }
-    return { "MS", ID, "::", MouseScancodeName[index] };
-  }
-
-  uint16_t operator[](Scancode code) const { return Base + ID * Size + code; }
-  uint16_t axis(unsigned id) const { return Base + Size * ID + Xaxis + id; }
-  uint16_t button(unsigned id) const { return Base + Size * ID + Button0 + id; }
-  bool isAxis(unsigned id) const { return id >= axis(0) && id <= axis(2); }
-  bool isButton(unsigned id) const { return id >= button(0) && id <= button(7); }
-  bool belongsTo(uint16_t scancode) const { return isAxis(scancode) || isButton(scancode); }
-
-  Mouse(unsigned ID_) : ID(ID_) {}
-};
-
-inline Mouse& mouse(unsigned id) {
-  static Mouse ms0(0), ms1(1), ms2(2), ms3(3), ms4(4), ms5(5), ms6(6), ms7(7);
-  switch(id) { default:
-    case 0: return ms0; case 1: return ms1; case 2: return ms2; case 3: return ms3;
-    case 4: return ms4; case 5: return ms5; case 6: return ms6; case 7: return ms7;
-  }
-}
-
-static const char JoypadScancodeName[][64] = {
-  "Hat0", "Hat1", "Hat2", "Hat3", "Hat4", "Hat5", "Hat6", "Hat7",
-  "Axis0", "Axis1", "Axis2", "Axis3", "Axis4", "Axis5", "Axis6", "Axis7",
-  "Axis8", "Axis9", "Axis10", "Axis11", "Axis12", "Axis13", "Axis14", "Axis15",
-  "Button0", "Button1", "Button2", "Button3", "Button4", "Button5", "Button6", "Button7",
-  "Button8", "Button9", "Button10", "Button11", "Button12", "Button13", "Button14", "Button15",
-  "Button16", "Button17", "Button18", "Button19", "Button20", "Button21", "Button22", "Button23",
-  "Button24", "Button25", "Button26", "Button27", "Button28", "Button29", "Button30", "Button31",
-};
-
-struct Joypad;
-Joypad& joypad(unsigned = 0);
-
-struct Joypad {
-  const unsigned ID;
-  enum { Base = Mouse::Base + Mouse::Size * Mouse::Count };
-  enum { Count = 8, Size = 64 };
-  enum { Hats = 8, Axes = 16, Buttons = 32 };
-
-  enum Scancode {
-    Hat0, Hat1, Hat2, Hat3, Hat4, Hat5, Hat6, Hat7,
-    Axis0, Axis1, Axis2, Axis3, Axis4, Axis5, Axis6, Axis7,
-    Axis8, Axis9, Axis10, Axis11, Axis12, Axis13, Axis14, Axis15,
-    Button0, Button1, Button2, Button3, Button4, Button5, Button6, Button7,
-    Button8, Button9, Button10, Button11, Button12, Button13, Button14, Button15,
-    Button16, Button17, Button18, Button19, Button20, Button21, Button22, Button23,
-    Button24, Button25, Button26, Button27, Button28, Button29, Button30, Button31,
-    Limit,
-  };
-
-  enum Hat { HatCenter = 0, HatUp = 1, HatRight = 2, HatDown = 4, HatLeft = 8 };
-
-  static signed numberDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).belongsTo(scancode)) return i;
-    }
-    return -1;
-  }
-
-  static signed hatDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isHat(scancode)) return scancode - joypad(i).hat(0);
-    }
-    return -1;
-  }
-
-  static signed axisDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isAxis(scancode)) return scancode - joypad(i).axis(0);
-    }
-    return -1;
-  }
-
-  static signed buttonDecode(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isButton(scancode)) return scancode - joypad(i).button(0);
-    }
-    return -1;
-  }
-
-  static bool isAnyHat(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isHat(scancode)) return true;
-    }
-    return false;
-  }
-
-  static bool isAnyAxis(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isAxis(scancode)) return true;
-    }
-    return false;
-  }
-
-  static bool isAnyButton(uint16_t scancode) {
-    for(unsigned i = 0; i < Count; i++) {
-      if(joypad(i).isButton(scancode)) return true;
-    }
-    return false;
-  }
-
-  static uint16_t decode(const char *name) {
-    string s(name);
-    if(!strbegin(name, "JP")) return 0;
-    s.ltrim("JP");
-    unsigned id = decimal(s);
-    auto pos = strpos(s, "::");
-    if(!pos) return 0;
-    s = substr(s, pos() + 2);
-    for(unsigned i = 0; i < Limit; i++) {
-      if(s == JoypadScancodeName[i]) return Base + Size * id + i;
-    }
-    return 0;
-  }
-
-  string encode(uint16_t code) const {
-    unsigned index = 0;
-    for(unsigned i = 0; i < Count; i++) {
-      if(code >= Base + Size * i && code < Base + Size * (i + 1)) {
-        index = code - (Base + Size * i);
-      }
-    }
-    return { "JP", ID, "::", JoypadScancodeName[index] };
-  }
-
-  uint16_t operator[](Scancode code) const { return Base + ID * Size + code; }
-  uint16_t hat(unsigned id) const { return Base + Size * ID + Hat0 + id; }
-  uint16_t axis(unsigned id) const { return Base + Size * ID + Axis0 + id; }
-  uint16_t button(unsigned id) const { return Base + Size * ID + Button0 + id; }
-  bool isHat(unsigned id) const { return id >= hat(0) && id <= hat(7); }
-  bool isAxis(unsigned id) const { return id >= axis(0) && id <= axis(15); }
-  bool isButton(unsigned id) const { return id >= button(0) && id <= button(31); }
-  bool belongsTo(uint16_t scancode) const { return isHat(scancode) || isAxis(scancode) || isButton(scancode); }
-
-  Joypad(unsigned ID_) : ID(ID_) {}
-};
-
-inline Joypad& joypad(unsigned id) {
-  static Joypad jp0(0), jp1(1), jp2(2), jp3(3), jp4(4), jp5(5), jp6(6), jp7(7);
-  switch(id) { default:
-    case 0: return jp0; case 1: return jp1; case 2: return jp2; case 3: return jp3;
-    case 4: return jp4; case 5: return jp5; case 6: return jp6; case 7: return jp7;
-  }
-}
-
-struct Scancode {
-  enum { None = 0, Limit = Joypad::Base + Joypad::Size * Joypad::Count };
-
-  static uint16_t decode(const char *name) {
-    uint16_t code;
-    code = Keyboard::decode(name);
-    if(code) return code;
-    code = Mouse::decode(name);
-    if(code) return code;
-    code = Joypad::decode(name);
-    if(code) return code;
-    return None;
-  }
-
-  static string encode(uint16_t code) {
-    for(unsigned i = 0; i < Keyboard::Count; i++) {
-      if(keyboard(i).belongsTo(code)) return keyboard(i).encode(code);
-    }
-    for(unsigned i = 0; i < Mouse::Count; i++) {
-      if(mouse(i).belongsTo(code)) return mouse(i).encode(code);
-    }
-    for(unsigned i = 0; i < Joypad::Count; i++) {
-      if(joypad(i).belongsTo(code)) return joypad(i).encode(code);
-    }
-    return "None";
-  }
-};
-
-}
-
-#endif
@@ -1,59 +0,0 @@
-#ifndef NALL_INTERPOLATION_HPP
-#define NALL_INTERPOLATION_HPP
-
-namespace nall {
-
-struct Interpolation {
-  static inline double Nearest(double mu, double a, double b, double c, double d) {
-    return (mu <= 0.5 ? b : c);
-  }
-
-  static inline double Sublinear(double mu, double a, double b, double c, double d) {
-    mu = ((mu - 0.5) * 2.0) + 0.5;
-    if(mu < 0) mu = 0;
-    if(mu > 1) mu = 1;
-    return b * (1.0 - mu) + c * mu;
-  }
-
-  static inline double Linear(double mu, double a, double b, double c, double d) {
-    return b * (1.0 - mu) + c * mu;
-  }
-
-  static inline double Cosine(double mu, double a, double b, double c, double d) {
-    mu = (1.0 - cos(mu * 3.14159265)) / 2.0;
-    return b * (1.0 - mu) + c * mu;
-  }
-
-  static inline double Cubic(double mu, double a, double b, double c, double d) {
-    double A = d - c - a + b;
-    double B = a - b - A;
-    double C = c - a;
-    double D = b;
-    return A * (mu * mu * mu) + B * (mu * mu) + C * mu + D;
-  }
-
-  static inline double Hermite(double mu1, double a, double b, double c, double d) {
-    const double tension = 0.0;  //-1 = low, 0 = normal, +1 = high
-    const double bias = 0.0;  //-1 = left, 0 = even, +1 = right
-    double mu2, mu3, m0, m1, a0, a1, a2, a3;
-
-    mu2 = mu1 * mu1;
-    mu3 = mu2 * mu1;
-
-    m0  = (b - a) * (1.0 + bias) * (1.0 - tension) / 2.0;
-    m0 += (c - b) * (1.0 - bias) * (1.0 - tension) / 2.0;
-    m1  = (c - b) * (1.0 + bias) * (1.0 - tension) / 2.0;
-    m1 += (d - c) * (1.0 - bias) * (1.0 - tension) / 2.0;
-
-    a0 = +2 * mu3 - 3 * mu2 + 1;
-    a1 =      mu3 - 2 * mu2 + mu1;
-    a2 =      mu3 -     mu2;
-    a3 = -2 * mu3 + 3 * mu2;
-
-    return (a0 * b) + (a1 * m0) + (a2 * m1) + (a3 * c);
-  }
-};
-
-}
-
-#endif
@@ -1,63 +0,0 @@
-#ifndef NALL_INTRINSICS_HPP
-#define NALL_INTRINSICS_HPP
-
-struct Intrinsics {
-  enum class Compiler : unsigned { GCC, VisualC, Unknown };
-  enum class Platform : unsigned { X, OSX, Windows, Unknown };
-  enum class Endian : unsigned { LSB, MSB, Unknown };
-
-  static inline Compiler compiler();
-  static inline Platform platform();
-  static inline Endian endian();
-};
-
-/* Compiler detection */
-
-#if defined(__GNUC__)
-  #define COMPILER_GCC
-  Intrinsics::Compiler Intrinsics::compiler() { return Intrinsics::Compiler::GCC; }
-#elif defined(_MSC_VER)
-  #define COMPILER_VISUALC
-  Intrinsics::Compiler Intrinsics::compiler() { return Intrinsics::Compiler::VisualC; }
-#else
-  #warning "unable to detect compiler"
-  #define COMPILER_UNKNOWN
-  Intrinsics::Compiler Intrinsics::compiler() { return Intrinsics::Compiler::Unknown; }
-#endif
-
-/* Platform detection */
-
-#if defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
-  #define PLATFORM_X
-  Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::X; }
-#elif defined(__APPLE__)
-  #define PLATFORM_OSX
-  Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::OSX; }
-#elif defined(_WIN32)
-  #define PLATFORM_WINDOWS
-  #define PLATFORM_WIN
-  Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::Windows; }
-#else
-  #warning "unable to detect platform"
-  #define PLATFORM_UNKNOWN
-  Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::Unknown; }
-#endif
-
-/* Endian detection */
-
-#if defined(__i386__) || defined(__amd64__) || defined(_M_IX86) || defined(_M_AMD64)
-  #define ENDIAN_LSB
-  #define ARCH_LSB
-  Intrinsics::Endian Intrinsics::endian() { return Intrinsics::Endian::LSB; }
-#elif defined(__powerpc__) || defined(_M_PPC) || defined(__BIG_ENDIAN__)
-  #define ENDIAN_MSB
-  #define ARCH_MSB
-  Intrinsics::Endian Intrinsics::endian() { return Intrinsics::Endian::MSB; }
-#else
-  #warning "unable to detect endian"
-  #define ENDIAN_UNKNOWN
-  #define ARCH_UNKNOWN
-  Intrinsics::Endian Intrinsics::endian() { return Intrinsics::Endian::Unknown; }
-#endif
-
-#endif
@@ -1,52 +0,0 @@
-#ifndef NALL_INVOKE_HPP
-#define NALL_INVOKE_HPP
-
-//void invoke(const string &name, const string& args...);
-//if a program is specified, it is executed with the arguments provided
-//if a file is specified, the file is opened using the program associated with said file type
-//if a folder is specified, the folder is opened using the associated file explorer
-//if a URL is specified, the default web browser is opened and pointed at the URL requested
-//path environment variable is always consulted
-//execution is asynchronous (non-blocking); use system() for synchronous execution
-
-#include <nall/string.hpp>
-#ifdef _WIN32
-  #include <nall/windows/utf8.hpp>
-#endif
-
-namespace nall {
-
-#ifdef _WIN32
-
-template<typename... Args>
-inline void invoke(const string &name, Args&&... args) {
-  lstring argl(std::forward<Args>(args)...);
-  for(auto &arg : argl) if(arg.position(" ")) arg = {"\"", arg, "\""};
-  string arguments = argl.concatenate(" ");
-  ShellExecuteW(NULL, NULL, utf16_t(name), utf16_t(arguments), NULL, SW_SHOWNORMAL);
-}
-
-#else
-
-template<typename... Args>
-inline void invoke(const string &name, Args&&... args) {
-  pid_t pid = fork();
-  if(pid == 0) {
-    const char *argv[1 + sizeof...(args) + 1], **argp = argv;
-    lstring argl(std::forward<Args>(args)...);
-    *argp++ = (const char*)name;
-    for(auto &arg : argl) *argp++ = (const char*)arg;
-    *argp++ = nullptr;
-
-    if(execvp(name, (char* const*)argv) < 0) {
-      execlp("xdg-open", "xdg-open", (const char*)name, nullptr);
-    }
-    exit(0);
-  }
-}
-
-#endif
-
-}
-
-#endif
@@ -1,100 +0,0 @@
-#ifndef NALL_IPS_HPP
-#define NALL_IPS_HPP
-
-#include <nall/file.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct ips {
-  inline bool apply();
-  inline void source(const uint8_t *data, unsigned size);
-  inline void modify(const uint8_t *data, unsigned size);
-  inline ips();
-  inline ~ips();
-
-  uint8_t *data;
-  unsigned size;
-  const uint8_t *sourceData;
-  unsigned sourceSize;
-  const uint8_t *modifyData;
-  unsigned modifySize;
-};
-
-bool ips::apply() {
-  if(modifySize < 8) return false;
-  if(modifyData[0] != 'P') return false;
-  if(modifyData[1] != 'A') return false;
-  if(modifyData[2] != 'T') return false;
-  if(modifyData[3] != 'C') return false;
-  if(modifyData[4] != 'H') return false;
-
-  if(data) delete[] data;
-  data = new uint8_t[16 * 1024 * 1024 + 65536]();  //maximum size of IPS patch + single-tag padding
-  size = sourceSize;
-  memcpy(data, sourceData, sourceSize);
-  unsigned offset = 5;
-
-  while(true) {
-    unsigned address, length;
-
-    if(offset > modifySize - 3) break;
-    address  = modifyData[offset++] << 16;
-    address |= modifyData[offset++] <<  8;
-    address |= modifyData[offset++] <<  0;
-
-    if(address == 0x454f46) {  //EOF
-      if(offset == modifySize) return true;
-      if(offset == modifySize - 3) {
-        size  = modifyData[offset++] << 16;
-        size |= modifyData[offset++] <<  8;
-        size |= modifyData[offset++] <<  0;
-        return true;
-      }
-    }
-
-    if(offset > modifySize - 2) break;
-    length  = modifyData[offset++] << 8;
-    length |= modifyData[offset++] << 0;
-
-    if(length) {  //Copy
-      if(offset > modifySize - length) break;
-      while(length--) data[address++] = modifyData[offset++];
-    } else {  //RLE
-      if(offset > modifySize - 3) break;
-      length  = modifyData[offset++] << 8;
-      length |= modifyData[offset++] << 0;
-      if(length == 0) break;  //illegal
-      while(length--) data[address++] = modifyData[offset];
-      offset++;
-    }
-
-    size = max(size, address);
-  }
-
-  delete[] data;
-  data = nullptr;
-  return false;
-}
-
-void ips::source(const uint8_t *data, unsigned size) {
-  sourceData = data, sourceSize = size;
-}
-
-void ips::modify(const uint8_t *data, unsigned size) {
-  modifyData = data, modifySize = size;
-}
-
-ips::ips() : data(nullptr), sourceData(nullptr), modifyData(nullptr) {
-}
-
-ips::~ips() {
-  if(data) delete[] data;
-  if(sourceData) delete[] sourceData;
-  if(modifyData) delete[] modifyData;
-}
-
-}
-
-#endif
@@ -1,165 +0,0 @@
-#ifndef NALL_LZSS_HPP
-#define NALL_LZSS_HPP
-
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-//19:5 pulldown
-//8:1 marker: d7-d0
-//length: { 4 - 35 }, offset: { 1 - 0x80000 }
-//4-byte file size header
-//little-endian encoding
-struct lzss {
-  inline void source(const uint8_t *data, unsigned size);
-  inline bool source(const string &filename);
-  inline unsigned size() const;
-  inline bool compress(const string &filename);
-  inline bool decompress(uint8_t *targetData, unsigned targetSize);
-  inline bool decompress(const string &filename);
-
-protected:
-  struct Node {
-    unsigned offset;
-    Node *next;
-    inline Node() : offset(0), next(nullptr) {}
-    inline ~Node() { if(next) delete next; }
-  } *tree[65536];
-
-  filemap sourceFile;
-  const uint8_t *sourceData;
-  unsigned sourceSize;
-
-public:
-  inline lzss() : sourceData(nullptr), sourceSize(0) {}
-};
-
-void lzss::source(const uint8_t *data, unsigned size) {
-  sourceData = data;
-  sourceSize = size;
-}
-
-bool lzss::source(const string &filename) {
-  if(sourceFile.open(filename, filemap::mode::read) == false) return false;
-  sourceData = sourceFile.data();
-  sourceSize = sourceFile.size();
-  return true;
-}
-
-unsigned lzss::size() const {
-  unsigned size = 0;
-  if(sourceSize < 4) return size;
-  for(unsigned n = 0; n < 32; n += 8) size |= sourceData[n >> 3] << n;
-  return size;
-}
-
-bool lzss::compress(const string &filename) {
-  file targetFile;
-  if(targetFile.open(filename, file::mode::write) == false) return false;
-
-  for(unsigned n = 0; n < 32; n += 8) targetFile.write(sourceSize >> n);
-  for(unsigned n = 0; n < 65536; n++) tree[n] = 0;
-
-  uint8_t buffer[25];
-  unsigned sourceOffset = 0;
-
-  while(sourceOffset < sourceSize) {
-    uint8_t mask = 0x00;
-    unsigned bufferOffset = 1;
-
-    for(unsigned iteration = 0; iteration < 8; iteration++) {
-      if(sourceOffset >= sourceSize) break;
-
-      uint16_t symbol = sourceData[sourceOffset + 0];
-      if(sourceOffset < sourceSize - 1) symbol |= sourceData[sourceOffset + 1] << 8;
-      Node *node = tree[symbol];
-      unsigned maxLength = 0, maxOffset = 0;
-
-      while(node) {
-        if(node->offset < sourceOffset - 0x80000) {
-          //out-of-range: all subsequent nodes will also be, so free up their memory
-          if(node->next) { delete node->next; node->next = 0; }
-          break;
-        }
-
-        unsigned length = 0, x = sourceOffset, y = node->offset;
-        while(length < 35 && x < sourceSize && sourceData[x++] == sourceData[y++]) length++;
-        if(length > maxLength) maxLength = length, maxOffset = node->offset;
-        if(length == 35) break;
-
-        node = node->next;
-      }
-
-      //attach current symbol to top of tree for subsequent searches
-      node = new Node;
-      node->offset = sourceOffset;
-      node->next = tree[symbol];
-      tree[symbol] = node;
-
-      if(maxLength < 4) {
-        buffer[bufferOffset++] = sourceData[sourceOffset++];
-      } else {
-        unsigned output = ((maxLength - 4) << 19) | (sourceOffset - 1 - maxOffset);
-        for(unsigned n = 0; n < 24; n += 8) buffer[bufferOffset++] = output >> n;
-        mask |= 0x80 >> iteration;
-        sourceOffset += maxLength;
-      }
-    }
-
-    buffer[0] = mask;
-    targetFile.write(buffer, bufferOffset);
-  }
-
-  sourceFile.close();
-  targetFile.close();
-  return true;
-}
-
-bool lzss::decompress(uint8_t *targetData, unsigned targetSize) {
-  if(targetSize < size()) return false;
-
-  unsigned sourceOffset = 4, targetOffset = 0;
-  while(sourceOffset < sourceSize) {
-    uint8_t mask = sourceData[sourceOffset++];
-
-    for(unsigned iteration = 0; iteration < 8; iteration++) {
-      if(sourceOffset >= sourceSize) break;
-
-      if((mask & (0x80 >> iteration)) == 0) {
-        targetData[targetOffset++] = sourceData[sourceOffset++];
-      } else {
-        unsigned code = 0;
-        for(unsigned n = 0; n < 24; n += 8) code |= sourceData[sourceOffset++] << n;
-        unsigned length = (code >> 19) + 4;
-        unsigned offset = targetOffset - 1 - (code & 0x7ffff);
-        while(length--) targetData[targetOffset++] = targetData[offset++];
-      }
-    }
-  }
-}
-
-bool lzss::decompress(const string &filename) {
-  if(sourceSize < 4) return false;
-  unsigned targetSize = size();
-
-  file fp;
-  if(fp.open(filename, file::mode::write) == false) return false;
-  fp.truncate(targetSize);
-  fp.close();
-
-  filemap targetFile;
-  if(targetFile.open(filename, filemap::mode::readwrite) == false) return false;
-  uint8_t *targetData = targetFile.data();
-
-  bool result = decompress(targetData, targetSize);
-  sourceFile.close();
-  targetFile.close();
-  return result;
-}
-
-}
-
-#endif
@@ -1,117 +0,0 @@
-#ifndef NALL_MAP_HPP
-#define NALL_MAP_HPP
-
-#include <nall/vector.hpp>
-
-namespace nall {
-
-template<typename LHS, typename RHS>
-struct map {
-  struct pair {
-    LHS name;
-    RHS data;
-  };
-
-  inline void reset() {
-    list.reset();
-  }
-
-  inline unsigned size() const {
-    return list.size();
-  }
-
-  //O(log n) find
-  inline optional<unsigned> find(const LHS &name) const {
-    signed first = 0, last = size() - 1;
-    while(first <= last) {
-      signed middle = (first + last) / 2;
-           if(name < list[middle].name) last  = middle - 1;  //search lower half
-      else if(list[middle].name < name) first = middle + 1;  //search upper half
-      else return { true, (unsigned)middle };                //match found
-    }
-    return { false, 0u };
-  }
-
-  //O(n) insert + O(log n) find
-  inline RHS& insert(const LHS &name, const RHS &data) {
-    if(auto position = find(name)) {
-      list[position()].data = data;
-      return list[position()].data;
-    }
-    signed offset = size();
-    for(unsigned n = 0; n < size(); n++) {
-      if(name < list[n].name) { offset = n; break; }
-    }
-    list.insert(offset, { name, data });
-    return list[offset].data;
-  }
-
-  //O(log n) find
-  inline void modify(const LHS &name, const RHS &data) {
-    if(auto position = find(name)) list[position()].data = data;
-  }
-
-  //O(n) remove + O(log n) find
-  inline void remove(const LHS &name) {
-    if(auto position = find(name)) list.remove(position());
-  }
-
-  //O(log n) find
-  inline RHS& operator[](const LHS &name) {
-    if(auto position = find(name)) return list[position()].data;
-    throw;
-  }
-
-  inline const RHS& operator[](const LHS &name) const {
-    if(auto position = find(name)) return list[position()].data;
-    throw;
-  }
-
-  inline RHS& operator()(const LHS &name) {
-    if(auto position = find(name)) return list[position()].data;
-    return insert(name, RHS());
-  }
-
-  inline const RHS& operator()(const LHS &name, const RHS &data) const {
-    if(auto position = find(name)) return list[position()].data;
-    return data;
-  }
-
-  inline pair* begin() { return list.begin(); }
-  inline pair* end() { return list.end(); }
-  inline const pair* begin() const { return list.begin(); }
-  inline const pair* end() const { return list.end(); }
-
-protected:
-  vector<pair> list;
-};
-
-template<typename LHS, typename RHS>
-struct bidirectional_map {
-  const map<LHS, RHS> &lhs;
-  const map<RHS, LHS> &rhs;
-
-  inline void reset() {
-    llist.reset();
-    rlist.reset();
-  }
-
-  inline unsigned size() const {
-    return llist.size();
-  }
-
-  inline void insert(const LHS &ldata, const RHS &rdata) {
-    llist.insert(ldata, rdata);
-    rlist.insert(rdata, ldata);
-  }
-
-  inline bidirectional_map() : lhs(llist), rhs(rlist) {}
-
-protected:
-  map<LHS, RHS> llist;
-  map<RHS, LHS> rlist;
-};
-
-}
-
-#endif
@@ -1,10 +0,0 @@
-#ifndef NALL_MOSAIC_HPP
-#define NALL_MOSAIC_HPP
-
-#define NALL_MOSAIC_INTERNAL_HPP
-#include <nall/mosaic/bitstream.hpp>
-#include <nall/mosaic/context.hpp>
-#include <nall/mosaic/parser.hpp>
-#undef NALL_MOSAIC_INTERNAL_HPP
-
-#endif
@@ -1,55 +0,0 @@
-#ifdef NALL_MOSAIC_INTERNAL_HPP
-
-namespace nall {
-namespace mosaic {
-
-struct bitstream {
-  filemap fp;
-  uint8_t *data;
-  unsigned size;
-  bool readonly;
-  bool endian;
-
-  inline bool read(uint64_t addr) const {
-    if(data == nullptr || (addr >> 3) >= size) return 0;
-    unsigned mask = endian == 0 ? (0x01 << (addr & 7)) : (0x80 >> (addr & 7));
-    return data[addr >> 3] & mask;
-  }
-
-  inline void write(uint64_t addr, bool value) {
-    if(data == nullptr || readonly == true || (addr >> 3) >= size) return;
-    unsigned mask = endian == 0 ? (0x01 << (addr & 7)) : (0x80 >> (addr & 7));
-    if(value == 0) data[addr >> 3] &= ~mask;
-    if(value == 1) data[addr >> 3] |=  mask;
-  }
-
-  inline bool open(const string &filename) {
-    readonly = false;
-    if(fp.open(filename, filemap::mode::readwrite) == false) {
-      readonly = true;
-      if(fp.open(filename, filemap::mode::read) == false) {
-        return false;
-      }
-    }
-    data = fp.data();
-    size = fp.size();
-    return true;
-  }
-
-  inline void close() {
-    fp.close();
-    data = nullptr;
-  }
-
-  inline bitstream() : data(nullptr), endian(1) {
-  }
-
-  inline ~bitstream() {
-    close();
-  }
-};
-
-}
-}
-
-#endif
@@ -1,224 +0,0 @@
-#ifdef NALL_MOSAIC_INTERNAL_HPP
-
-namespace nall {
-namespace mosaic {
-
-struct context {
-  unsigned offset;
-  unsigned width;
-  unsigned height;
-  unsigned count;
-
-  bool endian;     //0 = lsb, 1 = msb
-  bool order;      //0 = linear, 1 = planar
-  unsigned depth;  //1 - 24bpp
-
-  unsigned blockWidth;
-  unsigned blockHeight;
-  unsigned blockStride;
-  unsigned blockOffset;
-  vector<unsigned> block;
-
-  unsigned tileWidth;
-  unsigned tileHeight;
-  unsigned tileStride;
-  unsigned tileOffset;
-  vector<unsigned> tile;
-
-  unsigned mosaicWidth;
-  unsigned mosaicHeight;
-  unsigned mosaicStride;
-  unsigned mosaicOffset;
-  vector<unsigned> mosaic;
-
-  unsigned paddingWidth;
-  unsigned paddingHeight;
-  unsigned paddingColor;
-  vector<unsigned> palette;
-
-  inline unsigned objectWidth() const { return blockWidth * tileWidth * mosaicWidth + paddingWidth; }
-  inline unsigned objectHeight() const { return blockHeight * tileHeight * mosaicHeight + paddingHeight; }
-  inline unsigned objectSize() const {
-    unsigned size = blockStride * tileWidth * tileHeight * mosaicWidth * mosaicHeight
-                  + blockOffset * tileHeight * mosaicWidth * mosaicHeight
-                  + tileStride * mosaicWidth * mosaicHeight
-                  + tileOffset * mosaicHeight;
-    return max(1u, size);
-  }
-
-  inline unsigned eval(const string &expression) {
-    intmax_t result;
-    if(fixedpoint::eval(expression, result) == false) return 0u;
-    return result;
-  }
-
-  inline void eval(vector<unsigned> &buffer, const string &expression_) {
-    string expression = expression_;
-    bool function = false;
-    for(auto &c : expression) {
-      if(c == '(') function = true;
-      if(c == ')') function = false;
-      if(c == ',' && function == true) c = ';';
-    }
-
-    lstring list = expression.split(",");
-    for(auto &item : list) {
-      item.trim();
-      if(item.wildcard("f(?*) ?*")) {
-        item.ltrim<1>("f(");
-        lstring part = item.split<1>(") ");
-        lstring args = part[0].split<3>(";");
-        for(auto &item : args) item.trim();
-
-        unsigned length = eval(args(0, "0"));
-        unsigned offset = eval(args(1, "0"));
-        unsigned stride = eval(args(2, "0"));
-        if(args.size() < 2) offset = buffer.size();
-        if(args.size() < 3) stride = 1;
-
-        for(unsigned n = 0; n < length; n++) {
-          string fn = part[1];
-          fn.replace("n", decimal(n));
-          fn.replace("o", decimal(offset));
-          fn.replace("p", decimal(buffer.size()));
-          buffer.resize(offset + 1);
-          buffer[offset] = eval(fn);
-          offset += stride;
-        }
-      } else if(item.wildcard("base64*")) {
-        unsigned offset = 0;
-        item.ltrim<1>("base64");
-        if(item.wildcard("(?*) *")) {
-          item.ltrim<1>("(");
-          lstring part = item.split<1>(") ");
-          offset = eval(part[0]);
-          item = part(1, "");
-        }
-        item.trim();
-        for(auto &c : item) {
-          if(c >= 'A' && c <= 'Z') buffer.append(offset + c - 'A' +  0);
-          if(c >= 'a' && c <= 'z') buffer.append(offset + c - 'a' + 26);
-          if(c >= '0' && c <= '9') buffer.append(offset + c - '0' + 52);
-          if(c == '-') buffer.append(offset + 62);
-          if(c == '_') buffer.append(offset + 63);
-        }
-      } else if(item.wildcard("file *")) {
-        item.ltrim<1>("file ");
-        item.trim();
-        //...
-      } else if(item.empty() == false) {
-        buffer.append(eval(item));
-      }
-    }
-  }
-
-  inline void parse(const string &data) {
-    reset();
-
-    lstring lines = data.split("\n");
-    for(auto &line : lines) {
-      lstring part = line.split<1>(":");
-      if(part.size() != 2) continue;
-      part[0].trim();
-      part[1].trim();
-
-      if(part[0] == "offset") offset = eval(part[1]);
-      if(part[0] == "width") width = eval(part[1]);
-      if(part[0] == "height") height = eval(part[1]);
-      if(part[0] == "count") count = eval(part[1]);
-
-      if(part[0] == "endian") endian = eval(part[1]);
-      if(part[0] == "order") order = eval(part[1]);
-      if(part[0] == "depth") depth = eval(part[1]);
-
-      if(part[0] == "blockWidth") blockWidth = eval(part[1]);
-      if(part[0] == "blockHeight") blockHeight = eval(part[1]);
-      if(part[0] == "blockStride") blockStride = eval(part[1]);
-      if(part[0] == "blockOffset") blockOffset = eval(part[1]);
-      if(part[0] == "block") eval(block, part[1]);
-
-      if(part[0] == "tileWidth") tileWidth = eval(part[1]);
-      if(part[0] == "tileHeight") tileHeight = eval(part[1]);
-      if(part[0] == "tileStride") tileStride = eval(part[1]);
-      if(part[0] == "tileOffset") tileOffset = eval(part[1]);
-      if(part[0] == "tile") eval(tile, part[1]);
-
-      if(part[0] == "mosaicWidth") mosaicWidth = eval(part[1]);
-      if(part[0] == "mosaicHeight") mosaicHeight = eval(part[1]);
-      if(part[0] == "mosaicStride") mosaicStride = eval(part[1]);
-      if(part[0] == "mosaicOffset") mosaicOffset = eval(part[1]);
-      if(part[0] == "mosaic") eval(mosaic, part[1]);
-
-      if(part[0] == "paddingWidth") paddingWidth = eval(part[1]);
-      if(part[0] == "paddingHeight") paddingHeight = eval(part[1]);
-      if(part[0] == "paddingColor") paddingColor = eval(part[1]);
-      if(part[0] == "palette") eval(palette, part[1]);
-    }
-
-    sanitize();
-  }
-
-  inline bool load(const string &filename) {
-    string filedata;
-    if(filedata.readfile(filename) == false) return false;
-    parse(filedata);
-    return true;
-  }
-
-  inline void sanitize() {
-    if(depth < 1) depth = 1;
-    if(depth > 24) depth = 24;
-
-    if(blockWidth < 1) blockWidth = 1;
-    if(blockHeight < 1) blockHeight = 1;
-
-    if(tileWidth < 1) tileWidth = 1;
-    if(tileHeight < 1) tileHeight = 1;
-
-    if(mosaicWidth < 1) mosaicWidth = 1;
-    if(mosaicHeight < 1) mosaicHeight = 1;
-  }
-
-  inline void reset() {
-    offset = 0;
-    width = 0;
-    height = 0;
-    count = 0;
-
-    endian = 1;
-    order = 0;
-    depth = 1;
-
-    blockWidth = 1;
-    blockHeight = 1;
-    blockStride = 0;
-    blockOffset = 0;
-    block.reset();
-
-    tileWidth = 1;
-    tileHeight = 1;
-    tileStride = 0;
-    tileOffset = 0;
-    tile.reset();
-
-    mosaicWidth = 1;
-    mosaicHeight = 1;
-    mosaicStride = 0;
-    mosaicOffset = 0;
-    mosaic.reset();
-
-    paddingWidth = 0;
-    paddingHeight = 0;
-    paddingColor = 0x000000;
-    palette.reset();
-  }
-
-  inline context() {
-    reset();
-  }
-};
-
-}
-}
-
-#endif
@@ -1,126 +0,0 @@
-#ifdef NALL_MOSAIC_INTERNAL_HPP
-
-namespace nall {
-namespace mosaic {
-
-struct parser {
-  image canvas;
-
-  //export from bitstream to canvas
-  inline void load(bitstream &stream, uint64_t offset, context &ctx, unsigned width, unsigned height) {
-    canvas.allocate(width, height);
-    canvas.clear(ctx.paddingColor);
-    parse(1, stream, offset, ctx, width, height);
-  }
-
-  //import from canvas to bitstream
-  inline bool save(bitstream &stream, uint64_t offset, context &ctx) {
-    if(stream.readonly) return false;
-    parse(0, stream, offset, ctx, canvas.width, canvas.height);
-    return true;
-  }
-
-  inline parser() : canvas(0, 32, 0u, 255u << 16, 255u << 8, 255u << 0) {
-  }
-
-private:
-  inline uint32_t read(unsigned x, unsigned y) const {
-    unsigned addr = y * canvas.width + x;
-    if(addr >= canvas.width * canvas.height) return 0u;
-    uint32_t *buffer = (uint32_t*)canvas.data;
-    return buffer[addr];
-  }
-
-  inline void write(unsigned x, unsigned y, uint32_t data) {
-    unsigned addr = y * canvas.width + x;
-    if(addr >= canvas.width * canvas.height) return;
-    uint32_t *buffer = (uint32_t*)canvas.data;
-    buffer[addr] = data;
-  }
-
-  inline void parse(bool load, bitstream &stream, uint64_t offset, context &ctx, unsigned width, unsigned height) {
-    stream.endian = ctx.endian;
-    unsigned canvasWidth = width / (ctx.mosaicWidth * ctx.tileWidth * ctx.blockWidth + ctx.paddingWidth);
-    unsigned canvasHeight = height / (ctx.mosaicHeight * ctx.tileHeight * ctx.blockHeight + ctx.paddingHeight);
-    unsigned bitsPerBlock = ctx.depth * ctx.blockWidth * ctx.blockHeight;
-
-    unsigned objectOffset = 0;
-    for(unsigned objectY = 0; objectY < canvasHeight; objectY++) {
-      for(unsigned objectX = 0; objectX < canvasWidth; objectX++) {
-        if(objectOffset >= ctx.count && ctx.count > 0) break;
-        unsigned objectIX = objectX * ctx.objectWidth();
-        unsigned objectIY = objectY * ctx.objectHeight();
-        objectOffset++;
-
-        unsigned mosaicOffset = 0;
-        for(unsigned mosaicY = 0; mosaicY < ctx.mosaicHeight; mosaicY++) {
-          for(unsigned mosaicX = 0; mosaicX < ctx.mosaicWidth; mosaicX++) {
-            unsigned mosaicData = ctx.mosaic(mosaicOffset, mosaicOffset);
-            unsigned mosaicIX = (mosaicData % ctx.mosaicWidth) * (ctx.tileWidth * ctx.blockWidth);
-            unsigned mosaicIY = (mosaicData / ctx.mosaicWidth) * (ctx.tileHeight * ctx.blockHeight);
-            mosaicOffset++;
-
-            unsigned tileOffset = 0;
-            for(unsigned tileY = 0; tileY < ctx.tileHeight; tileY++) {
-              for(unsigned tileX = 0; tileX < ctx.tileWidth; tileX++) {
-                unsigned tileData = ctx.tile(tileOffset, tileOffset);
-                unsigned tileIX = (tileData % ctx.tileWidth) * ctx.blockWidth;
-                unsigned tileIY = (tileData / ctx.tileWidth) * ctx.blockHeight;
-                tileOffset++;
-
-                unsigned blockOffset = 0;
-                for(unsigned blockY = 0; blockY < ctx.blockHeight; blockY++) {
-                  for(unsigned blockX = 0; blockX < ctx.blockWidth; blockX++) {
-                    if(load) {
-                      unsigned palette = 0;
-                      for(unsigned n = 0; n < ctx.depth; n++) {
-                        unsigned index = blockOffset++;
-                        if(ctx.order == 1) index = (index % ctx.depth) * ctx.blockWidth * ctx.blockHeight + (index / ctx.depth);
-                        palette |= stream.read(offset + ctx.block(index, index)) << n;
-                      }
-
-                      write(
-                        objectIX + mosaicIX + tileIX + blockX,
-                        objectIY + mosaicIY + tileIY + blockY,
-                        ctx.palette(palette, palette)
-                      );
-                    } else /* save */ {
-                      uint32_t palette = read(
-                        objectIX + mosaicIX + tileIX + blockX,
-                        objectIY + mosaicIY + tileIY + blockY
-                      );
-
-                      for(unsigned n = 0; n < ctx.depth; n++) {
-                        unsigned index = blockOffset++;
-                        if(ctx.order == 1) index = (index % ctx.depth) * ctx.blockWidth * ctx.blockHeight + (index / ctx.depth);
-                        stream.write(offset + ctx.block(index, index), palette & 1);
-                        palette >>= 1;
-                      }
-                    }
-                  }  //blockX
-                }  //blockY
-
-                offset += ctx.blockStride;
-              }  //tileX
-
-              offset += ctx.blockOffset;
-            }  //tileY
-
-            offset += ctx.tileStride;
-          }  //mosaicX
-
-          offset += ctx.tileOffset;
-        }  //mosaicY
-
-        offset += ctx.mosaicStride;
-      }  //objectX
-
-      offset += ctx.mosaicOffset;
-    }  //objectY
-  }
-};
-
-}
-}
-
-#endif
@@ -1,58 +0,0 @@
-#ifndef NALL_HPP
-#define NALL_HPP
-
-//include the most common nall headers with one statement
-//does not include the most obscure components with high cost and low usage
-
-#include <nall/platform.hpp>
-
-#include <nall/algorithm.hpp>
-#include <nall/any.hpp>
-#include <nall/atoi.hpp>
-#include <nall/base64.hpp>
-#include <nall/bit.hpp>
-#include <nall/bmp.hpp>
-#include <nall/config.hpp>
-#include <nall/crc16.hpp>
-#include <nall/crc32.hpp>
-#include <nall/directory.hpp>
-#include <nall/dl.hpp>
-#include <nall/endian.hpp>
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/function.hpp>
-#include <nall/gzip.hpp>
-#include <nall/http.hpp>
-#include <nall/image.hpp>
-#include <nall/inflate.hpp>
-#include <nall/interpolation.hpp>
-#include <nall/intrinsics.hpp>
-#include <nall/invoke.hpp>
-#include <nall/map.hpp>
-#include <nall/png.hpp>
-#include <nall/property.hpp>
-#include <nall/random.hpp>
-#include <nall/serializer.hpp>
-#include <nall/set.hpp>
-#include <nall/sha256.hpp>
-#include <nall/sort.hpp>
-#include <nall/stdint.hpp>
-#include <nall/stream.hpp>
-#include <nall/string.hpp>
-#include <nall/traits.hpp>
-#include <nall/unzip.hpp>
-#include <nall/utility.hpp>
-#include <nall/varint.hpp>
-#include <nall/vector.hpp>
-#include <nall/zip.hpp>
-
-#if defined(PLATFORM_WINDOWS)
-  #include <nall/windows/registry.hpp>
-  #include <nall/windows/utf8.hpp>
-#endif
-
-#if defined(PLATFORM_X)
-  #include <nall/serial.hpp>
-#endif
-
-#endif
@@ -1,86 +0,0 @@
-#ifndef NALL_PLATFORM_HPP
-#define NALL_PLATFORM_HPP
-
-#if defined(_WIN32)
-  //minimum version needed for _wstat64, etc
-  #undef  __MSVCRT_VERSION__
-  #define __MSVCRT_VERSION__ 0x0601
-  #include <nall/windows/utf8.hpp>
-#endif
-
-//=========================
-//standard platform headers
-//=========================
-
-#include <limits>
-
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(_WIN32)
-  #include <io.h>
-  #include <direct.h>
-  #include <shlobj.h>
-  #include <wchar.h>
-  #undef interface
-  #define dllexport __declspec(dllexport)
-#else
-  #include <unistd.h>
-  #include <pwd.h>
-  #define dllexport
-#endif
-
-//==================
-//warning supression
-//==================
-
-//Visual C++
-#if defined(_MSC_VER)
-  //disable libc "deprecation" warnings
-  #pragma warning(disable:4996)
-#endif
-
-//================
-//POSIX compliance
-//================
-
-#if defined(_MSC_VER)
-  #define PATH_MAX  _MAX_PATH
-  #define va_copy(dest, src)  ((dest) = (src))
-#endif
-
-#if defined(_WIN32)
-  #define getcwd     _getcwd
-  #define putenv     _putenv
-  #define vsnprintf  _vsnprintf
-  inline void usleep(unsigned milliseconds) { Sleep(milliseconds / 1000); }
-#endif
-
-//================
-//inline expansion
-//================
-
-#if defined(__GNUC__)
-  #define noinline      __attribute__((noinline))
-  #define inline        inline
-  #define alwaysinline  inline __attribute__((always_inline))
-#elif defined(_MSC_VER)
-  #define noinline      __declspec(noinline)
-  #define inline        inline
-  #define alwaysinline  inline __forceinline
-#else
-  #define noinline
-  #define inline        inline
-  #define alwaysinline  inline
-#endif
-
-#endif
@@ -1,337 +0,0 @@
-#ifndef NALL_PNG_HPP
-#define NALL_PNG_HPP
-
-//PNG image decoder
-//author: byuu
-
-#include <nall/inflate.hpp>
-#include <nall/string.hpp>
-
-namespace nall {
-
-struct png {
-  //colorType:
-  //0 = L
-  //2 = R,G,B
-  //3 = P
-  //4 = L,A
-  //6 = R,G,B,A
-  struct Info {
-    unsigned width;
-    unsigned height;
-    unsigned bitDepth;
-    unsigned colorType;
-    unsigned compressionMethod;
-    unsigned filterType;
-    unsigned interlaceMethod;
-
-    unsigned bytesPerPixel;
-    unsigned pitch;
-
-    uint8_t palette[256][3];
-  } info;
-
-  uint8_t *data;
-  unsigned size;
-
-  inline bool decode(const string &filename);
-  inline bool decode(const uint8_t *sourceData, unsigned sourceSize);
-  inline unsigned readbits(const uint8_t *&data);
-  unsigned bitpos;
-
-  inline png();
-  inline ~png();
-
-protected:
-  enum class FourCC : unsigned {
-    IHDR = 0x49484452,
-    PLTE = 0x504c5445,
-    IDAT = 0x49444154,
-    IEND = 0x49454e44,
-  };
-
-  inline unsigned interlace(unsigned pass, unsigned index);
-  inline unsigned inflateSize();
-  inline bool deinterlace(const uint8_t *&inputData, unsigned pass);
-  inline bool filter(uint8_t *outputData, const uint8_t *inputData, unsigned width, unsigned height);
-  inline unsigned read(const uint8_t *data, unsigned length);
-};
-
-bool png::decode(const string &filename) {
-  if(auto memory = file::read(filename)) {
-    return decode(memory.data(), memory.size());
-  }
-  return false;
-}
-
-bool png::decode(const uint8_t *sourceData, unsigned sourceSize) {
-  if(sourceSize < 8) return false;
-  if(read(sourceData + 0, 4) != 0x89504e47) return false;
-  if(read(sourceData + 4, 4) != 0x0d0a1a0a) return false;
-
-  uint8_t *compressedData = 0;
-  unsigned compressedSize = 0;
-
-  unsigned offset = 8;
-  while(offset < sourceSize) {
-    unsigned length   = read(sourceData + offset + 0, 4);
-    unsigned fourCC   = read(sourceData + offset + 4, 4);
-    unsigned checksum = read(sourceData + offset + 8 + length, 4);
-
-    if(fourCC == (unsigned)FourCC::IHDR) {
-      info.width             = read(sourceData + offset +  8, 4);
-      info.height            = read(sourceData + offset + 12, 4);
-      info.bitDepth          = read(sourceData + offset + 16, 1);
-      info.colorType         = read(sourceData + offset + 17, 1);
-      info.compressionMethod = read(sourceData + offset + 18, 1);
-      info.filterType        = read(sourceData + offset + 19, 1);
-      info.interlaceMethod   = read(sourceData + offset + 20, 1);
-
-      if(info.bitDepth == 0 || info.bitDepth > 16) return false;
-      if(info.bitDepth & (info.bitDepth - 1)) return false;  //not a power of two
-      if(info.compressionMethod != 0) return false;
-      if(info.filterType != 0) return false;
-      if(info.interlaceMethod != 0 && info.interlaceMethod != 1) return false;
-
-      switch(info.colorType) {
-      case 0: info.bytesPerPixel = info.bitDepth * 1; break;  //L
-      case 2: info.bytesPerPixel = info.bitDepth * 3; break;  //R,G,B
-      case 3: info.bytesPerPixel = info.bitDepth * 1; break;  //P
-      case 4: info.bytesPerPixel = info.bitDepth * 2; break;  //L,A
-      case 6: info.bytesPerPixel = info.bitDepth * 4; break;  //R,G,B,A
-      default: return false;
-      }
-
-      if(info.colorType == 2 || info.colorType == 4 || info.colorType == 6)
-        if(info.bitDepth != 8 && info.bitDepth != 16) return false;
-      if(info.colorType == 3 && info.bitDepth == 16) return false;
-
-      info.bytesPerPixel = (info.bytesPerPixel + 7) / 8;
-      info.pitch = (int)info.width * info.bytesPerPixel;
-    }
-
-    if(fourCC == (unsigned)FourCC::PLTE) {
-      if(length % 3) return false;
-      for(unsigned n = 0, p = offset + 8; n < length / 3; n++) {
-        info.palette[n][0] = sourceData[p++];
-        info.palette[n][1] = sourceData[p++];
-        info.palette[n][2] = sourceData[p++];
-      }
-    }
-
-    if(fourCC == (unsigned)FourCC::IDAT) {
-      compressedData = (uint8_t*)realloc(compressedData, compressedSize + length);
-      memcpy(compressedData + compressedSize, sourceData + offset + 8, length);
-      compressedSize += length;
-    }
-
-    if(fourCC == (unsigned)FourCC::IEND) {
-      break;
-    }
-
-    offset += 4 + 4 + length + 4;
-  }
-
-  unsigned interlacedSize = inflateSize();
-  uint8_t *interlacedData = new uint8_t[interlacedSize];
-
-  bool result = inflate(interlacedData, interlacedSize, compressedData + 2, compressedSize - 6);
-  delete[] compressedData;
-
-  if(result == false) {
-    delete[] interlacedData;
-    return false;
-  }
-
-  size = info.width * info.height * info.bytesPerPixel;
-  data = new uint8_t[size];
-
-  if(info.interlaceMethod == 0) {
-    if(filter(data, interlacedData, info.width, info.height) == false) {
-      delete[] interlacedData;
-      delete[] data;
-      data = 0;
-      return false;
-    }
-  } else {
-    const uint8_t *passData = interlacedData;
-    for(unsigned pass = 0; pass < 7; pass++) {
-      if(deinterlace(passData, pass) == false) {
-        delete[] interlacedData;
-        delete[] data;
-        data = 0;
-        return false;
-      }
-    }
-  }
-
-  delete[] interlacedData;
-  return true;
-}
-
-unsigned png::interlace(unsigned pass, unsigned index) {
-  static const unsigned data[7][4] = {
-    //x-distance, y-distance, x-origin, y-origin
-    { 8, 8, 0, 0 },
-    { 8, 8, 4, 0 },
-    { 4, 8, 0, 4 },
-    { 4, 4, 2, 0 },
-    { 2, 4, 0, 2 },
-    { 2, 2, 1, 0 },
-    { 1, 2, 0, 1 },
-  };
-  return data[pass][index];
-}
-
-unsigned png::inflateSize() {
-  if(info.interlaceMethod == 0) {
-    return info.width * info.height * info.bytesPerPixel + info.height;
-  }
-
-  unsigned size = 0;
-  for(unsigned pass = 0; pass < 7; pass++) {
-    unsigned xd = interlace(pass, 0), yd = interlace(pass, 1);
-    unsigned xo = interlace(pass, 2), yo = interlace(pass, 3);
-    unsigned width  = (info.width  + (xd - xo - 1)) / xd;
-    unsigned height = (info.height + (yd - yo - 1)) / yd;
-    if(width == 0 || height == 0) continue;
-    size += width * height * info.bytesPerPixel + height;
-  }
-  return size;
-}
-
-bool png::deinterlace(const uint8_t *&inputData, unsigned pass) {
-  unsigned xd = interlace(pass, 0), yd = interlace(pass, 1);
-  unsigned xo = interlace(pass, 2), yo = interlace(pass, 3);
-  unsigned width  = (info.width  + (xd - xo - 1)) / xd;
-  unsigned height = (info.height + (yd - yo - 1)) / yd;
-  if(width == 0 || height == 0) return true;
-
-  unsigned outputSize = width * height * info.bytesPerPixel;
-  uint8_t *outputData = new uint8_t[outputSize];
-  bool result = filter(outputData, inputData, width, height);
-
-  const uint8_t *rd = outputData;
-  for(unsigned y = yo; y < info.height; y += yd) {
-    uint8_t *wr = data + y * info.pitch;
-    for(unsigned x = xo; x < info.width; x += xd) {
-      for(unsigned b = 0; b < info.bytesPerPixel; b++) {
-        wr[x * info.bytesPerPixel + b] = *rd++;
-      }
-    }
-  }
-
-  inputData += outputSize + height;
-  delete[] outputData;
-  return result;
-}
-
-bool png::filter(uint8_t *outputData, const uint8_t *inputData, unsigned width, unsigned height) {
-  uint8_t *wr = outputData;
-  const uint8_t *rd = inputData;
-  int bpp = info.bytesPerPixel, pitch = width * bpp;
-  for(int y = 0; y < height; y++) {
-    uint8_t filter = *rd++;
-
-    switch(filter) {
-    case 0x00:  //None
-      for(int x = 0; x < pitch; x++) {
-        wr[x] = rd[x];
-      }
-      break;
-
-    case 0x01:  //Subtract
-      for(int x = 0; x < pitch; x++) {
-        wr[x] = rd[x] + (x - bpp < 0 ? 0 : wr[x - bpp]);
-      }
-      break;
-
-    case 0x02:  //Above
-      for(int x = 0; x < pitch; x++) {
-        wr[x] = rd[x] + (y - 1 < 0 ? 0 : wr[x - pitch]);
-      }
-      break;
-
-    case 0x03:  //Average
-      for(int x = 0; x < pitch; x++) {
-        short a = x - bpp < 0 ? 0 : wr[x - bpp];
-        short b = y - 1 < 0 ? 0 : wr[x - pitch];
-
-        wr[x] = rd[x] + (uint8_t)((a + b) / 2);
-      }
-      break;
-
-    case 0x04:  //Paeth
-      for(int x = 0; x < pitch; x++) {
-        short a = x - bpp < 0 ? 0 : wr[x - bpp];
-        short b = y - 1 < 0 ? 0 : wr[x - pitch];
-        short c = x - bpp < 0 || y - 1 < 0 ? 0 : wr[x - pitch - bpp];
-
-        short p = a + b - c;
-        short pa = p > a ? p - a : a - p;
-        short pb = p > b ? p - b : b - p;
-        short pc = p > c ? p - c : c - p;
-
-        uint8_t paeth = (uint8_t)((pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c);
-
-        wr[x] = rd[x] + paeth;
-      }
-      break;
-
-    default:  //Invalid
-      return false;
-    }
-
-    rd += pitch;
-    wr += pitch;
-  }
-
-  return true;
-}
-
-unsigned png::read(const uint8_t *data, unsigned length) {
-  unsigned result = 0;
-  while(length--) result = (result << 8) | (*data++);
-  return result;
-}
-
-unsigned png::readbits(const uint8_t *&data) {
-  unsigned result = 0;
-  switch(info.bitDepth) {
-  case 1:
-    result = (*data >> bitpos) & 1;
-    bitpos++;
-    if(bitpos == 8) { data++; bitpos = 0; }
-    break;
-  case 2:
-    result = (*data >> bitpos) & 3;
-    bitpos += 2;
-    if(bitpos == 8) { data++; bitpos = 0; }
-    break;
-  case 4:
-    result = (*data >> bitpos) & 15;
-    bitpos += 4;
-    if(bitpos == 8) { data++; bitpos = 0; }
-    break;
-  case 8:
-    result = *data++;
-    break;
-  case 16:
-    result = (data[0] << 8) | (data[1] << 0);
-    data += 2;
-    break;
-  }
-  return result;
-}
-
-png::png() : data(nullptr) {
-  bitpos = 0;
-}
-
-png::~png() {
-  if(data) delete[] data;
-}
-
-}
-
-#endif
@@ -1,109 +0,0 @@
-#ifndef NALL_PRIORITY_QUEUE_HPP
-#define NALL_PRIORITY_QUEUE_HPP
-
-#include <limits>
-#include <nall/function.hpp>
-#include <nall/serializer.hpp>
-#include <nall/utility.hpp>
-
-namespace nall {
-  template<typename type_t> void priority_queue_nocallback(type_t) {}
-
-  //priority queue implementation using binary min-heap array;
-  //does not require normalize() function.
-  //O(1)     find   (tick)
-  //O(log n) append (enqueue)
-  //O(log n) remove (dequeue)
-  template<typename type_t> class priority_queue {
-  public:
-    inline void tick(unsigned ticks) {
-      basecounter += ticks;
-      while(heapsize && gte(basecounter, heap[0].counter)) callback(dequeue());
-    }
-
-    //counter is relative to current time (eg enqueue(64, ...) fires in 64 ticks);
-    //counter cannot exceed std::numeric_limits<unsigned>::max() >> 1.
-    void enqueue(unsigned counter, type_t event) {
-      unsigned child = heapsize++;
-      counter += basecounter;
-
-      while(child) {
-        unsigned parent = (child - 1) >> 1;
-        if(gte(counter, heap[parent].counter)) break;
-
-        heap[child].counter = heap[parent].counter;
-        heap[child].event = heap[parent].event;
-        child = parent;
-      }
-
-      heap[child].counter = counter;
-      heap[child].event = event;
-    }
-
-    type_t dequeue() {
-      type_t event(heap[0].event);
-      unsigned parent = 0;
-      unsigned counter = heap[--heapsize].counter;
-
-      while(true) {
-        unsigned child = (parent << 1) + 1;
-        if(child >= heapsize) break;
-        if(child + 1 < heapsize && gte(heap[child].counter, heap[child + 1].counter)) child++;
-        if(gte(heap[child].counter, counter)) break;
-
-        heap[parent].counter = heap[child].counter;
-        heap[parent].event = heap[child].event;
-        parent = child;
-      }
-
-      heap[parent].counter = counter;
-      heap[parent].event = heap[heapsize].event;
-      return event;
-    }
-
-    void reset() {
-      basecounter = 0;
-      heapsize = 0;
-    }
-
-    void serialize(serializer &s) {
-      s.integer(basecounter);
-      s.integer(heapsize);
-      for(unsigned n = 0; n < heapcapacity; n++) {
-        s.integer(heap[n].counter);
-        s.integer(heap[n].event);
-      }
-    }
-
-    priority_queue(unsigned size, function<void (type_t)> callback_ = &priority_queue_nocallback<type_t>)
-    : callback(callback_) {
-      heap = new heap_t[size];
-      heapcapacity = size;
-      reset();
-    }
-
-    ~priority_queue() {
-      delete[] heap;
-    }
-
-    priority_queue& operator=(const priority_queue&) = delete;
-    priority_queue(const priority_queue&) = delete;
-
-  private:
-    function<void (type_t)> callback;
-    unsigned basecounter;
-    unsigned heapsize;
-    unsigned heapcapacity;
-    struct heap_t {
-      unsigned counter;
-      type_t event;
-    } *heap;
-
-    //return true if x is greater than or equal to y
-    inline bool gte(unsigned x, unsigned y) {
-      return x - y < (std::numeric_limits<unsigned>::max() >> 1);
-    }
-  };
-}
-
-#endif
@@ -1,91 +0,0 @@
-#ifndef NALL_PROPERTY_HPP
-#define NALL_PROPERTY_HPP
-
-//nall::property implements ownership semantics into container classes
-//example: property<owner>::readonly<type> implies that only owner has full
-//access to type; and all other code has readonly access.
-//
-//this code relies on extended friend semantics from C++0x to work, as it
-//declares a friend class via a template paramter. it also exploits a bug in
-//G++ 4.x to work even in C++98 mode.
-//
-//if compiling elsewhere, simply remove the friend class and private semantics
-
-//property can be used either of two ways:
-//struct foo {
-//  property<foo>::readonly<bool> x;
-//  property<foo>::readwrite<int> y;
-//};
-//-or-
-//struct foo : property<foo> {
-//  readonly<bool> x;
-//  readwrite<int> y;
-//};
-
-//return types are const T& (byref) instead of T (byval) to avoid major speed
-//penalties for objects with expensive copy constructors
-
-//operator-> provides access to underlying object type:
-//readonly<Object> foo;
-//foo->bar();
-//... will call Object::bar();
-
-//operator='s reference is constant so as to avoid leaking a reference handle
-//that could bypass access restrictions
-
-//both constant and non-constant operators are provided, though it may be
-//necessary to cast first, for instance:
-//struct foo : property<foo> { readonly<int> bar; } object;
-//int main() { int value = const_cast<const foo&>(object); }
-
-//writeonly is useful for objects that have non-const reads, but const writes.
-//however, to avoid leaking handles, the interface is very restricted. the only
-//way to write is via operator=, which requires conversion via eg copy
-//constructor. example:
-//struct foo {
-//  foo(bool value) { ... }
-//};
-//writeonly<foo> bar;
-//bar = true;
-
-namespace nall {
-  template<typename C> struct property {
-    template<typename T> struct traits { typedef T type; };
-
-    template<typename T> struct readonly {
-      const T* operator->() const { return &value; }
-      const T& operator()() const { return value; }
-      operator const T&() const { return value; }
-    private:
-      T* operator->() { return &value; }
-      operator T&() { return value; }
-      const T& operator=(const T& value_) { return value = value_; }
-      T value;
-      friend class traits<C>::type;
-    };
-
-    template<typename T> struct writeonly {
-      void operator=(const T& value_) { value = value_; }
-    private:
-      const T* operator->() const { return &value; }
-      const T& operator()() const { return value; }
-      operator const T&() const { return value; }
-      T* operator->() { return &value; }
-      operator T&() { return value; }
-      T value;
-      friend class traits<C>::type;
-    };
-
-    template<typename T> struct readwrite {
-      const T* operator->() const { return &value; }
-      const T& operator()() const { return value; }
-      operator const T&() const { return value; }
-      T* operator->() { return &value; }
-      operator T&() { return value; }
-      const T& operator=(const T& value_) { return value = value_; }
-      T value;
-    };
-  };
-}
-
-#endif
@@ -1,32 +0,0 @@
-#ifndef NALL_PUBLIC_CAST_HPP
-#define NALL_PUBLIC_CAST_HPP
-
-//this is a proof-of-concept-*only* C++ access-privilege elevation exploit.
-//this code is 100% legal C++, per C++98 section 14.7.2 paragraph 8:
-//"access checking rules do not apply to names in explicit instantiations."
-//usage example:
-
-//struct N { typedef void (Class::*)(); };
-//template class public_cast<N, &Class::Reference>;
-//(class.*public_cast<N>::value);
-
-//Class::Reference may be public, protected or private
-//Class::Reference may be a function, object or variable
-
-namespace nall {
-  template<typename T, typename T::type... P> struct public_cast;
-
-  template<typename T> struct public_cast<T> {
-    static typename T::type value;
-  };
-
-  template<typename T> typename T::type public_cast<T>::value;
-
-  template<typename T, typename T::type P> struct public_cast<T, P> {
-    static typename T::type value;
-  };
-
-  template<typename T, typename T::type P> typename T::type public_cast<T, P>::value = public_cast<T>::value = P;
-}
-
-#endif
@@ -1,28 +0,0 @@
-#ifndef NALL_RANDOM_HPP
-#define NALL_RANDOM_HPP
-
-namespace nall {
-  //pseudo-random number generator
-  inline unsigned prng() {
-    static unsigned n = 0;
-    return n = (n >> 1) ^ (((n & 1) - 1) & 0xedb88320);
-  }
-
-  struct random_lfsr {
-    inline void seed(unsigned seed__) {
-      seed_ = seed__;
-    }
-
-    inline unsigned operator()() {
-      return seed_ = (seed_ >> 1) ^ (((seed_ & 1) - 1) & 0xedb88320);
-    }
-
-    random_lfsr() : seed_(0) {
-    }
-
-  private:
-    unsigned seed_;
-  };
-}
-
-#endif
@@ -1,110 +0,0 @@
-#ifndef NALL_SERIAL_HPP
-#define NALL_SERIAL_HPP
-
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-  struct serial {
-    bool readable() {
-      if(port_open == false) return false;
-      fd_set fdset;
-      FD_ZERO(&fdset);
-      FD_SET(port, &fdset);
-      timeval timeout;
-      timeout.tv_sec = 0;
-      timeout.tv_usec = 0;
-      int result = select(FD_SETSIZE, &fdset, nullptr, nullptr, &timeout);
-      if(result < 1) return false;
-      return FD_ISSET(port, &fdset);
-    }
-
-    //-1 on error, otherwise return bytes read
-    int read(uint8_t *data, unsigned length) {
-      if(port_open == false) return -1;
-      return ::read(port, (void*)data, length);
-    }
-
-    bool writable() {
-      if(port_open == false) return false;
-      fd_set fdset;
-      FD_ZERO(&fdset);
-      FD_SET(port, &fdset);
-      timeval timeout;
-      timeout.tv_sec = 0;
-      timeout.tv_usec = 0;
-      int result = select(FD_SETSIZE, nullptr, &fdset, nullptr, &timeout);
-      if(result < 1) return false;
-      return FD_ISSET(port, &fdset);
-    }
-
-    //-1 on error, otherwise return bytes written
-    int write(const uint8_t *data, unsigned length) {
-      if(port_open == false) return -1;
-      return ::write(port, (void*)data, length);
-    }
-
-    bool open(const char *portname, unsigned rate, bool flowcontrol) {
-      close();
-
-      port = ::open(portname, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
-      if(port == -1) return false;
-
-      if(ioctl(port, TIOCEXCL) == -1) { close(); return false; }
-      if(fcntl(port, F_SETFL, 0) == -1) { close(); return false; }
-      if(tcgetattr(port, &original_attr) == -1) { close(); return false; }
-
-      termios attr = original_attr;
-      cfmakeraw(&attr);
-      cfsetspeed(&attr, rate);
-
-      attr.c_lflag &=~ (ECHO | ECHONL | ISIG | ICANON | IEXTEN);
-      attr.c_iflag &=~ (BRKINT | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXOFF | IXANY);
-      attr.c_iflag |=  (IGNBRK | IGNPAR);
-      attr.c_oflag &=~ (OPOST);
-      attr.c_cflag &=~ (CSIZE | CSTOPB | PARENB | CLOCAL);
-      attr.c_cflag |=  (CS8 | CREAD);
-      if(flowcontrol == false) {
-        attr.c_cflag &= ~CRTSCTS;
-      } else {
-        attr.c_cflag |=  CRTSCTS;
-      }
-      attr.c_cc[VTIME] = attr.c_cc[VMIN] = 0;
-
-      if(tcsetattr(port, TCSANOW, &attr) == -1) { close(); return false; }
-      return port_open = true;
-    }
-
-    void close() {
-      if(port != -1) {
-        tcdrain(port);
-        if(port_open == true) {
-          tcsetattr(port, TCSANOW, &original_attr);
-          port_open = false;
-        }
-        ::close(port);
-        port = -1;
-      }
-    }
-
-    serial() {
-      port = -1;
-      port_open = false;
-    }
-
-    ~serial() {
-      close();
-    }
-
-  private:
-    int port;
-    bool port_open;
-    termios original_attr;
-  };
-}
-
-#endif
@@ -1,146 +0,0 @@
-#ifndef NALL_SERIALIZER_HPP
-#define NALL_SERIALIZER_HPP
-
-#include <type_traits>
-#include <utility>
-#include <nall/stdint.hpp>
-#include <nall/utility.hpp>
-
-namespace nall {
-  //serializer: a class designed to save and restore the state of classes.
-  //
-  //benefits:
-  //- data() will be portable in size (it is not necessary to specify type sizes.)
-  //- data() will be portable in endianness (always stored internally as little-endian.)
-  //- one serialize function can both save and restore class states.
-  //
-  //caveats:
-  //- only plain-old-data can be stored. complex classes must provide serialize(serializer&);
-  //- floating-point usage is not portable across platforms
-
-  class serializer {
-  public:
-    enum mode_t { Load, Save, Size };
-
-    mode_t mode() const {
-      return imode;
-    }
-
-    const uint8_t* data() const {
-      return idata;
-    }
-
-    unsigned size() const {
-      return isize;
-    }
-
-    unsigned capacity() const {
-      return icapacity;
-    }
-
-    template<typename T> void floatingpoint(T &value) {
-      enum { size = sizeof(T) };
-      //this is rather dangerous, and not cross-platform safe;
-      //but there is no standardized way to export FP-values
-      uint8_t *p = (uint8_t*)&value;
-      if(imode == Save) {
-        for(unsigned n = 0; n < size; n++) idata[isize++] = p[n];
-      } else if(imode == Load) {
-        for(unsigned n = 0; n < size; n++) p[n] = idata[isize++];
-      } else {
-        isize += size;
-      }
-    }
-
-    template<typename T> void integer(T &value) {
-      enum { size = std::is_same<bool, T>::value ? 1 : sizeof(T) };
-      if(imode == Save) {
-        for(unsigned n = 0; n < size; n++) idata[isize++] = (uintmax_t)value >> (n << 3);
-      } else if(imode == Load) {
-        value = 0;
-        for(unsigned n = 0; n < size; n++) value |= (uintmax_t)idata[isize++] << (n << 3);
-      } else if(imode == Size) {
-        isize += size;
-      }
-    }
-
-    template<typename T> void array(T &array) {
-      enum { size = sizeof(T) / sizeof(typename std::remove_extent<T>::type) };
-      for(unsigned n = 0; n < size; n++) integer(array[n]);
-    }
-
-    template<typename T> void array(T array, unsigned size) {
-      for(unsigned n = 0; n < size; n++) integer(array[n]);
-    }
-
-    //copy
-    serializer& operator=(const serializer &s) {
-      if(idata) delete[] idata;
-
-      imode = s.imode;
-      idata = new uint8_t[s.icapacity];
-      isize = s.isize;
-      icapacity = s.icapacity;
-
-      memcpy(idata, s.idata, s.icapacity);
-      return *this;
-    }
-
-    serializer(const serializer &s) : idata(0) {
-      operator=(s);
-    }
-
-    //move
-    serializer& operator=(serializer &&s) {
-      if(idata) delete[] idata;
-
-      imode = s.imode;
-      idata = s.idata;
-      isize = s.isize;
-      icapacity = s.icapacity;
-
-      s.idata = 0;
-      return *this;
-    }
-
-    serializer(serializer &&s) {
-      operator=(std::move(s));
-    }
-
-    //construction
-    serializer() {
-      imode = Size;
-      idata = 0;
-      isize = 0;
-      icapacity = 0;
-    }
-
-    serializer(unsigned capacity) {
-      imode = Save;
-      idata = new uint8_t[capacity]();
-      isize = 0;
-      icapacity = capacity;
-    }
-
-    serializer(const uint8_t *data, unsigned capacity) {
-      imode = Load;
-      idata = new uint8_t[capacity];
-      isize = 0;
-      icapacity = capacity;
-      memcpy(idata, data, capacity);
-    }
-
-    ~serializer() {
-      if(idata) delete[] idata;
-    }
-
-  private:
-    mode_t imode;
-    uint8_t *idata;
-    unsigned isize;
-    unsigned icapacity;
-  };
-
-};
-
-#endif
@@ -1,158 +0,0 @@
-#ifndef NALL_SET_HPP
-#define NALL_SET_HPP
-
-//set
-//* unordered
-//* intended for unique items
-//* dynamic growth
-//* reference-based variant
-
-#include <stdlib.h>
-#include <algorithm>
-#include <initializer_list>
-#include <utility>
-#include <nall/algorithm.hpp>
-#include <nall/bit.hpp>
-#include <nall/sort.hpp>
-#include <nall/traits.hpp>
-#include <nall/utility.hpp>
-
-namespace nall {
-
-template<typename T, typename Enable = void> struct set;
-
-template<typename T> struct set<T, typename std::enable_if<!std::is_reference<T>::value>::type> {
-  struct exception_out_of_bounds{};
-
-protected:
-  T *pool;
-  unsigned poolsize, objectsize;
-
-public:
-  unsigned size() const { return objectsize; }
-  unsigned capacity() const { return poolsize; }
-};
-
-//reference set
-template<typename TR> struct set<TR, typename std::enable_if<std::is_reference<TR>::value>::type> {
-  struct exception_out_of_bounds{};
-
-protected:
-  typedef typename std::remove_reference<TR>::type T;
-  T **pool;
-  unsigned poolsize, objectsize;
-
-public:
-  unsigned size() const { return objectsize; }
-  unsigned capacity() const { return poolsize; }
-
-  void reset() {
-    if(pool) free(pool);
-    pool = nullptr;
-    poolsize = 0;
-    objectsize = 0;
-  }
-
-  void reserve(unsigned size) {
-    if(size == poolsize) return;
-    pool = (T**)realloc(pool, sizeof(T*) * size);
-    poolsize = size;
-    objectsize = min(objectsize, size);
-  }
-
-  void resize(unsigned size) {
-    if(size > poolsize) reserve(bit::round(size));  //amortize growth
-    objectsize = size;
-  }
-
-  bool append(T& data) {
-    if(find(data)) return false;
-    unsigned offset = objectsize++;
-    if(offset >= poolsize) resize(offset + 1);
-    pool[offset] = &data;
-    return true;
-  }
-
-  template<typename... Args>
-  bool append(T& data, Args&&... args) {
-    bool result = append(data);
-    append(std::forward<Args>(args)...);
-    return result;
-  }
-
-  bool remove(T& data) {
-    if(auto position = find(data)) {
-      for(signed i = position(); i < objectsize - 1; i++) pool[i] = pool[i + 1];
-      resize(objectsize - 1);
-      return true;
-    }
-    return false;
-  }
-
-  optional<unsigned> find(const T& data) {
-    for(unsigned n = 0; n < objectsize; n++) if(pool[n] == &data) return {true, n};
-    return {false, 0u};
-  }
-
-  template<typename... Args> set(Args&&... args) : pool(nullptr), poolsize(0), objectsize(0) {
-    construct(std::forward<Args>(args)...);
-  }
-
-  ~set() {
-    reset();
-  }
-
-  set& operator=(const set &source) {
-    if(&source == this) return *this;
-    if(pool) free(pool);
-    objectsize = source.objectsize;
-    poolsize = source.poolsize;
-    pool = (T**)malloc(sizeof(T*) * poolsize);
-    memcpy(pool, source.pool, sizeof(T*) * objectsize);
-    return *this;
-  }
-
-  set& operator=(const set &&source) {
-    if(&source == this) return *this;
-    if(pool) free(pool);
-    pool = source.pool;
-    poolsize = source.poolsize;
-    objectsize = source.objectsize;
-    source.pool = nullptr;
-    source.reset();
-    return *this;
-  }
-
-  T& operator[](unsigned position) const {
-    if(position >= objectsize) throw exception_out_of_bounds();
-    return *pool[position];
-  }
-
-  struct iterator {
-    bool operator!=(const iterator &source) const { return position != source.position; }
-    T& operator*() { return source.operator[](position); }
-    iterator& operator++() { position++; return *this; }
-    iterator(const set &source, unsigned position) : source(source), position(position) {}
-  private:
-    const set &source;
-    unsigned position;
-  };
-
-  iterator begin() { return iterator(*this, 0); }
-  iterator end() { return iterator(*this, objectsize); }
-  const iterator begin() const { return iterator(*this, 0); }
-  const iterator end() const { return iterator(*this, objectsize); }
-
-private:
-  void construct() {}
-  void construct(const set &source) { operator=(source); }
-  void construct(const set &&source) { operator=(std::move(source)); }
-  template<typename... Args> void construct(T& data, Args&&... args) {
-    append(data);
-    construct(std::forward<Args>(args)...);
-  }
-};
-
-}
-
-#endif
@@ -1,145 +0,0 @@
-#ifndef NALL_SHA256_HPP
-#define NALL_SHA256_HPP
-
-//author: vladitx
-
-#include <nall/stdint.hpp>
-
-namespace nall {
-  #define PTR(t, a) ((t*)(a))
-
-  #define SWAP32(x) ((uint32_t)(           \
-    (((uint32_t)(x) & 0x000000ff) << 24) | \
-    (((uint32_t)(x) & 0x0000ff00) <<  8) | \
-    (((uint32_t)(x) & 0x00ff0000) >>  8) | \
-    (((uint32_t)(x) & 0xff000000) >> 24)   \
-  ))
-
-  #define ST32(a, d) *PTR(uint32_t, a) = (d)
-  #define ST32BE(a, d) ST32(a, SWAP32(d))
-
-  #define LD32(a) *PTR(uint32_t, a)
-  #define LD32BE(a) SWAP32(LD32(a))
-
-  #define LSL32(x, n) ((uint32_t)(x) << (n))
-  #define LSR32(x, n) ((uint32_t)(x) >> (n))
-  #define ROR32(x, n) (LSR32(x, n) | LSL32(x, 32 - (n)))
-
-  //first 32 bits of the fractional parts of the square roots of the first 8 primes 2..19
-  static const uint32_t T_H[8] = {
-    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
-  };
-
-  //first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311
-  static const uint32_t T_K[64] = {
-    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
-  };
-
-  struct sha256_ctx {
-    uint8_t in[64];
-    unsigned inlen;
-
-    uint32_t w[64];
-    uint32_t h[8];
-    uint64_t len;
-  };
-
-  inline void sha256_init(sha256_ctx *p) {
-    memset(p, 0, sizeof(sha256_ctx));
-    memcpy(p->h, T_H, sizeof(T_H));
-  }
-
-  static void sha256_block(sha256_ctx *p) {
-    unsigned i;
-    uint32_t s0, s1;
-    uint32_t a, b, c, d, e, f, g, h;
-    uint32_t t1, t2, maj, ch;
-
-    for(i = 0; i < 16; i++) p->w[i] = LD32BE(p->in + i * 4);
-
-    for(i = 16; i < 64; i++) {
-      s0 = ROR32(p->w[i - 15],  7) ^ ROR32(p->w[i - 15], 18) ^ LSR32(p->w[i - 15],  3);
-      s1 = ROR32(p->w[i -  2], 17) ^ ROR32(p->w[i -  2], 19) ^ LSR32(p->w[i -  2], 10);
-      p->w[i] = p->w[i - 16] + s0 + p->w[i - 7] + s1;
-    }
-
-    a = p->h[0]; b = p->h[1]; c = p->h[2]; d = p->h[3];
-    e = p->h[4]; f = p->h[5]; g = p->h[6]; h = p->h[7];
-
-    for(i = 0; i < 64; i++) {
-      s0 = ROR32(a, 2) ^ ROR32(a, 13) ^ ROR32(a, 22);
-      maj = (a & b) ^ (a & c) ^ (b & c);
-      t2 = s0 + maj;
-      s1 = ROR32(e, 6) ^ ROR32(e, 11) ^ ROR32(e, 25);
-      ch = (e & f) ^ (~e & g);
-      t1 = h + s1 + ch + T_K[i] + p->w[i];
-
-      h = g; g = f; f = e; e = d + t1;
-      d = c; c = b; b = a; a = t1 + t2;
-    }
-
-    p->h[0] += a; p->h[1] += b; p->h[2] += c; p->h[3] += d;
-    p->h[4] += e; p->h[5] += f; p->h[6] += g; p->h[7] += h;
-
-    //next block
-    p->inlen = 0;
-  }
-
-  inline void sha256_chunk(sha256_ctx *p, const uint8_t *s, unsigned len) {
-    unsigned l;
-    p->len += len;
-
-    while(len) {
-      l = 64 - p->inlen;
-      l = (len < l) ? len : l;
-
-      memcpy(p->in + p->inlen, s, l);
-      s += l;
-      p->inlen += l;
-      len -= l;
-
-      if(p->inlen == 64) sha256_block(p);
-    }
-  }
-
-  inline void sha256_final(sha256_ctx *p) {
-    uint64_t len;
-    p->in[p->inlen++] = 0x80;
-
-    if(p->inlen > 56) {
-      memset(p->in + p->inlen, 0, 64 - p->inlen);
-      sha256_block(p);
-    }
-
-    memset(p->in + p->inlen, 0, 56 - p->inlen);
-
-    len = p->len << 3;
-    ST32BE(p->in + 56, len >> 32);
-    ST32BE(p->in + 60, len);
-    sha256_block(p);
-  }
-
-  inline void sha256_hash(sha256_ctx *p, uint8_t *s) {
-    uint32_t *t = (uint32_t*)s;
-    for(unsigned i = 0; i < 8; i++) ST32BE(t++, p->h[i]);
-  }
-
-  #undef PTR
-  #undef SWAP32
-  #undef ST32
-  #undef ST32BE
-  #undef LD32
-  #undef LD32BE
-  #undef LSL32
-  #undef LSR32
-  #undef ROR32
-}
-
-#endif
@@ -1,77 +0,0 @@
-#ifndef NALL_SORT_HPP
-#define NALL_SORT_HPP
-
-#include <algorithm>
-#include <nall/utility.hpp>
-
-//class:   merge sort
-//average: O(n log n)
-//worst:   O(n log n)
-//memory:  O(n)
-//stack:   O(log n)
-//stable?: yes
-
-//note: merge sort was chosen over quick sort, because:
-//* it is a stable sort
-//* it lacks O(n^2) worst-case overhead
-
-#define NALL_SORT_INSERTION
-//#define NALL_SORT_SELECTION
-
-namespace nall {
-  template<typename T, typename Comparator>
-  void sort(T list[], unsigned size, const Comparator &lessthan) {
-    if(size <= 1) return;  //nothing to sort
-
-    //use insertion sort to quickly sort smaller blocks
-    if(size < 64) {
-      #if defined(NALL_SORT_INSERTION)
-      for(signed i = 1, j; i < size; i++) {
-        T copy = std::move(list[i]);
-        for(j = i - 1; j >= 0; j--) {
-          if(!lessthan(copy, list[j])) break;
-          list[j + 1] = std::move(list[j]);
-        }
-        list[j + 1] = std::move(copy);
-      }
-      #elif defined(NALL_SORT_SELECTION)
-      for(unsigned i = 0; i < size; i++) {
-        unsigned min = i;
-        for(unsigned j = i + 1; j < size; j++) {
-          if(lessthan(list[j], list[min])) min = j;
-        }
-        if(min != i) std::swap(list[i], list[min]);
-      }
-      #endif
-      return;
-    }
-
-    //split list in half and recursively sort both
-    unsigned middle = size / 2;
-    sort(list, middle, lessthan);
-    sort(list + middle, size - middle, lessthan);
-
-    //left and right are sorted here; perform merge sort
-    T *buffer = new T[size];
-    unsigned offset = 0, left = 0, right = middle;
-    while(left < middle && right < size) {
-      if(!lessthan(list[right], list[left])) {
-        buffer[offset++] = std::move(list[left++]);
-      } else {
-        buffer[offset++] = std::move(list[right++]);
-      }
-    }
-    while(left < middle) buffer[offset++] = std::move(list[left++]);
-    while(right < size)  buffer[offset++] = std::move(list[right++]);
-
-    for(unsigned i = 0; i < size; i++) list[i] = std::move(buffer[i]);
-    delete[] buffer;
-  }
-
-  template<typename T>
-  void sort(T list[], unsigned size) {
-    return sort(list, size, [](const T &l, const T &r) { return l < r; });
-  }
-}
-
-#endif
@@ -1,42 +0,0 @@
-#ifndef NALL_STDINT_HPP
-#define NALL_STDINT_HPP
-
-#if defined(_MSC_VER)
-  typedef signed char int8_t;
-  typedef signed short int16_t;
-  typedef signed int int32_t;
-  typedef signed long long int64_t;
-  typedef int64_t intmax_t;
-  #if defined(_WIN64)
-  typedef int64_t intptr_t;
-  #else
-  typedef int32_t intptr_t;
-  #endif
-
-  typedef unsigned char uint8_t;
-  typedef unsigned short uint16_t;
-  typedef unsigned int uint32_t;
-  typedef unsigned long long uint64_t;
-  typedef uint64_t uintmax_t;
-  #if defined(_WIN64)
-  typedef uint64_t uintptr_t;
-  #else
-  typedef uint32_t uintptr_t;
-  #endif
-#else
-  #include <stdint.h>
-#endif
-
-namespace nall {
-  static_assert(sizeof(int8_t)   == 1, "int8_t is not of the correct size" );
-  static_assert(sizeof(int16_t)  == 2, "int16_t is not of the correct size");
-  static_assert(sizeof(int32_t)  == 4, "int32_t is not of the correct size");
-  static_assert(sizeof(int64_t)  == 8, "int64_t is not of the correct size");
-
-  static_assert(sizeof(uint8_t)  == 1, "int8_t is not of the correct size" );
-  static_assert(sizeof(uint16_t) == 2, "int16_t is not of the correct size");
-  static_assert(sizeof(uint32_t) == 4, "int32_t is not of the correct size");
-  static_assert(sizeof(uint64_t) == 8, "int64_t is not of the correct size");
-}
-
-#endif
@@ -1,26 +0,0 @@
-#ifndef NALL_STREAM_HPP
-#define NALL_STREAM_HPP
-
-#include <algorithm>
-#include <memory>
-
-#include <nall/file.hpp>
-#include <nall/filemap.hpp>
-#include <nall/gzip.hpp>
-#include <nall/http.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-#include <nall/zip.hpp>
-
-#define NALL_STREAM_INTERNAL_HPP
-#include <nall/stream/stream.hpp>
-#include <nall/stream/memory.hpp>
-#include <nall/stream/mmap.hpp>
-#include <nall/stream/file.hpp>
-#include <nall/stream/http.hpp>
-#include <nall/stream/gzip.hpp>
-#include <nall/stream/zip.hpp>
-#include <nall/stream/auto.hpp>
-#undef NALL_STREAM_INTERNAL_HPP
-
-#endif
@@ -1,25 +0,0 @@
-#ifndef NALL_STREAM_AUTO_HPP
-#define NALL_STREAM_AUTO_HPP
-
-namespace nall {
-
-#define autostream(...) (*makestream(__VA_ARGS__))
-
-inline std::unique_ptr<stream> makestream(const string &path) {
-  if(path.ibeginswith("http://")) return std::unique_ptr<stream>(new httpstream(path, 80));
-  if(path.iendswith(".gz")) return std::unique_ptr<stream>(new gzipstream(filestream{path}));
-  if(path.iendswith(".zip")) return std::unique_ptr<stream>(new zipstream(filestream{path}));
-  return std::unique_ptr<stream>(new mmapstream(path));
-}
-
-inline std::unique_ptr<stream> makestream(uint8_t *data, unsigned size) {
-  return std::unique_ptr<stream>(new memorystream(data, size));
-}
-
-inline std::unique_ptr<stream> makestream(const uint8_t *data, unsigned size) {
-  return std::unique_ptr<stream>(new memorystream(data, size));
-}
-
-}
-
-#endif
@@ -1,42 +0,0 @@
-#ifndef NALL_STREAM_FILE_HPP
-#define NALL_STREAM_FILE_HPP
-
-#include <nall/file.hpp>
-
-namespace nall {
-
-struct filestream : stream {
-  using stream::read;
-  using stream::write;
-
-  bool seekable() const { return true; }
-  bool readable() const { return true; }
-  bool writable() const { return pwritable; }
-  bool randomaccess() const { return false; }
-
-  unsigned size() const { return pfile.size(); }
-  unsigned offset() const { return pfile.offset(); }
-  void seek(unsigned offset) const { pfile.seek(offset); }
-
-  uint8_t read() const { return pfile.read(); }
-  void write(uint8_t data) const { pfile.write(data); }
-
-  filestream(const string &filename) {
-    pfile.open(filename, file::mode::readwrite);
-    pwritable = pfile.open();
-    if(!pwritable) pfile.open(filename, file::mode::read);
-  }
-
-  filestream(const string &filename, file::mode mode) {
-    pfile.open(filename, mode);
-    pwritable = mode == file::mode::write || mode == file::mode::readwrite;
-  }
-
-private:
-  mutable file pfile;
-  bool pwritable;
-};
-
-}
-
-#endif
@@ -1,34 +0,0 @@
-#ifndef NALL_STREAM_GZIP_HPP
-#define NALL_STREAM_GZIP_HPP
-
-#include <nall/gzip.hpp>
-
-namespace nall {
-
-struct gzipstream : memorystream {
-  using stream::read;
-  using stream::write;
-
-  gzipstream(const stream &stream) {
-    unsigned size = stream.size();
-    uint8_t *data = new uint8_t[size];
-    stream.read(data, size);
-
-    gzip archive;
-    bool result = archive.decompress(data, size);
-    delete[] data;
-    if(result == false) return;
-
-    psize = archive.size;
-    pdata = new uint8_t[psize];
-    memcpy(pdata, archive.data, psize);
-  }
-
-  ~gzipstream() {
-    if(pdata) delete[] pdata;
-  }
-};
-
-}
-
-#endif
@@ -1,49 +0,0 @@
-#ifndef NALL_STREAM_HTTP_HPP
-#define NALL_STREAM_HTTP_HPP
-
-#include <nall/http.hpp>
-
-namespace nall {
-
-struct httpstream : stream {
-  using stream::read;
-  using stream::write;
-
-  bool seekable() const { return true; }
-  bool readable() const { return true; }
-  bool writable() const { return true; }
-  bool randomaccess() const { return true; }
-
-  unsigned size() const { return psize; }
-  unsigned offset() const { return poffset; }
-  void seek(unsigned offset) const { poffset = offset; }
-
-  uint8_t read() const { return pdata[poffset++]; }
-  void write(uint8_t data) const { pdata[poffset++] = data; }
-
-  uint8_t read(unsigned offset) const { return pdata[offset]; }
-  void write(unsigned offset, uint8_t data) const { pdata[offset] = data; }
-
-  httpstream(const string &url, unsigned port) : pdata(nullptr), psize(0), poffset(0) {
-    string uri = url;
-    uri.ltrim<1>("http://");
-    lstring part = uri.split<1>("/");
-    part[1] = { "/", part[1] };
-
-    http connection;
-    if(connection.connect(part[0], port) == false) return;
-    connection.download(part[1], pdata, psize);
-  }
-
-  ~httpstream() {
-    if(pdata) delete[] pdata;
-  }
-
-private:
-  mutable uint8_t *pdata;
-  mutable unsigned psize, poffset;
-};
-
-}
-
-#endif
@@ -1,47 +0,0 @@
-#ifndef NALL_STREAM_MEMORY_HPP
-#define NALL_STREAM_MEMORY_HPP
-
-#include <nall/stream/stream.hpp>
-
-namespace nall {
-
-struct memorystream : stream {
-  using stream::read;
-  using stream::write;
-
-  bool seekable() const { return true; }
-  bool readable() const { return true; }
-  bool writable() const { return pwritable; }
-  bool randomaccess() const { return true; }
-
-  uint8_t *data() const { return pdata; }
-  unsigned size() const { return psize; }
-  unsigned offset() const { return poffset; }
-  void seek(unsigned offset) const { poffset = offset; }
-
-  uint8_t read() const { return pdata[poffset++]; }
-  void write(uint8_t data) const { pdata[poffset++] = data; }
-
-  uint8_t read(unsigned offset) const { return pdata[offset]; }
-  void write(unsigned offset, uint8_t data) const { pdata[offset] = data; }
-
-  memorystream() : pdata(nullptr), psize(0), poffset(0), pwritable(true) {}
-
-  memorystream(uint8_t *data, unsigned size) {
-    pdata = data, psize = size, poffset = 0;
-    pwritable = true;
-  }
-
-  memorystream(const uint8_t *data, unsigned size) {
-    pdata = (uint8_t*)data, psize = size, poffset = 0;
-    pwritable = false;
-  }
-
-protected:
-  mutable uint8_t *pdata;
-  mutable unsigned psize, poffset, pwritable;
-};
-
-}
-
-#endif
@@ -1,42 +0,0 @@
-#ifndef NALL_STREAM_MMAP_HPP
-#define NALL_STREAM_MMAP_HPP
-
-#include <nall/filemap.hpp>
-
-namespace nall {
-
-struct mmapstream : stream {
-  using stream::read;
-  using stream::write;
-
-  bool seekable() const { return true; }
-  bool readable() const { return true; }
-  bool writable() const { return pwritable; }
-  bool randomaccess() const { return true; }
-
-  unsigned size() const { return pmmap.size(); }
-  unsigned offset() const { return poffset; }
-  void seek(unsigned offset) const { poffset = offset; }
-
-  uint8_t read() const { return pdata[poffset++]; }
-  void write(uint8_t data) const { pdata[poffset++] = data; }
-
-  uint8_t read(unsigned offset) const { return pdata[offset]; }
-  void write(unsigned offset, uint8_t data) const { pdata[offset] = data; }
-
-  mmapstream(const string &filename) {
-    pmmap.open(filename, filemap::mode::readwrite);
-    pwritable = pmmap.open();
-    if(!pwritable) pmmap.open(filename, filemap::mode::read);
-    pdata = pmmap.data(), poffset = 0;
-  }
-
-private:
-  mutable filemap pmmap;
-  mutable uint8_t *pdata;
-  mutable unsigned pwritable, poffset;
-};
-
-}
-
-#endif
@@ -1,92 +0,0 @@
-#ifndef NALL_STREAM_STREAM_HPP
-#define NALL_STREAM_STREAM_HPP
-
-namespace nall {
-
-struct stream {
-  virtual bool seekable() const = 0;
-  virtual bool readable() const = 0;
-  virtual bool writable() const = 0;
-  virtual bool randomaccess() const = 0;
-
-  virtual uint8_t* data() const { return nullptr; }
-  virtual unsigned size() const = 0;
-  virtual unsigned offset() const = 0;
-  virtual void seek(unsigned offset) const = 0;
-
-  virtual uint8_t read() const = 0;
-  virtual void write(uint8_t data) const = 0;
-
-  virtual uint8_t read(unsigned) const { return 0; }
-  virtual void write(unsigned, uint8_t) const {}
-
-  operator bool() const {
-    return size();
-  }
-
-  bool empty() const {
-    return size() == 0;
-  }
-
-  bool end() const {
-    return offset() >= size();
-  }
-
-  uintmax_t readl(unsigned length = 1) const {
-    uintmax_t data = 0, shift = 0;
-    while(length--) { data |= read() << shift; shift += 8; }
-    return data;
-  }
-
-  uintmax_t readm(unsigned length = 1) const {
-    uintmax_t data = 0;
-    while(length--) data = (data << 8) | read();
-    return data;
-  }
-
-  void read(uint8_t *data, unsigned length) const {
-    while(length--) *data++ = read();
-  }
-
-  void writel(uintmax_t data, unsigned length = 1) const {
-    while(length--) {
-      write(data);
-      data >>= 8;
-    }
-  }
-
-  void writem(uintmax_t data, unsigned length = 1) const {
-    uintmax_t shift = 8 * length;
-    while(length--) {
-      shift -= 8;
-      write(data >> shift);
-    }
-  }
-
-  void write(const uint8_t *data, unsigned length) const {
-    while(length--) write(*data++);
-  }
-
-  struct byte {
-    operator uint8_t() const { return s.read(offset); }
-    byte& operator=(uint8_t data) { s.write(offset, data); return *this; }
-    byte(const stream &s, unsigned offset) : s(s), offset(offset) {}
-
-  private:
-    const stream &s;
-    const unsigned offset;
-  };
-
-  byte operator[](unsigned offset) const {
-    return byte(*this, offset);
-  }
-
-  stream() {}
-  virtual ~stream() {}
-  stream(const stream&) = delete;
-  stream& operator=(const stream&) = delete;
-};
-
-}
-
-#endif
@@ -1,39 +0,0 @@
-#ifndef NALL_STREAM_VECTOR_HPP
-#define NALL_STREAM_VECTOR_HPP
-
-#include <nall/stream/stream.hpp>
-#include <nall/vector.hpp>
-
-namespace nall {
-
-struct vectorstream : stream {
-  using stream::read;
-  using stream::write;
-
-  bool seekable() const { return true; }
-  bool readable() const { return true; }
-  bool writable() const { return pwritable; }
-  bool randomaccess() const { return true; }
-
-  uint8_t* data() const { return memory.data(); }
-  unsigned size() const { return memory.size(); }
-  unsigned offset() const { return poffset; }
-  void seek(unsigned offset) const { poffset = offset; }
-
-  uint8_t read() const { return memory[poffset++]; }
-  void write(uint8_t data) const { memory[poffset++] = data; }
-
-  uint8_t read(unsigned offset) const { return memory[offset]; }
-  void write(unsigned offset, uint8_t data) const { memory[offset] = data; }
-
-  vectorstream(vector<uint8_t> &memory) : memory(memory), poffset(0), pwritable(true) {}
-  vectorstream(const vector<uint8_t> &memory) : memory((vector<uint8_t>&)memory), poffset(0), pwritable(false) {}
-
-protected:
-  vector<uint8_t> &memory;
-  mutable unsigned poffset, pwritable;
-};
-
-}
-
-#endif
@@ -1,38 +0,0 @@
-#ifndef NALL_STREAM_ZIP_HPP
-#define NALL_STREAM_ZIP_HPP
-
-#include <nall/unzip.hpp>
-
-namespace nall {
-
-struct zipstream : memorystream {
-  using stream::read;
-  using stream::write;
-
-  zipstream(const stream &stream, const string &filter = "*") {
-    unsigned size = stream.size();
-    uint8_t *data = new uint8_t[size];
-    stream.read(data, size);
-
-    unzip archive;
-    if(archive.open(data, size) == false) return;
-    delete[] data;
-
-    for(auto &file : archive.file) {
-      if(file.name.wildcard(filter)) {
-        auto buffer = archive.extract(file);
-        psize = buffer.size();
-        pdata = buffer.move();
-        return;
-      }
-    }
-  }
-
-  ~zipstream() {
-    if(pdata) delete[] pdata;
-  }
-};
-
-}
-
-#endif
@@ -1,53 +0,0 @@
-#ifndef NALL_STRING_HPP
-#define NALL_STRING_HPP
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <algorithm>
-#include <initializer_list>
-
-#include <nall/atoi.hpp>
-#include <nall/function.hpp>
-#include <nall/platform.hpp>
-#include <nall/sha256.hpp>
-#include <nall/stdint.hpp>
-#include <nall/utility.hpp>
-#include <nall/varint.hpp>
-#include <nall/vector.hpp>
-
-#include <nall/windows/utf8.hpp>
-
-#define NALL_STRING_INTERNAL_HPP
-#include <nall/string/base.hpp>
-#include <nall/string/bsv.hpp>
-#include <nall/string/cast.hpp>
-#include <nall/string/compare.hpp>
-#include <nall/string/convert.hpp>
-#include <nall/string/core.hpp>
-#include <nall/string/cstring.hpp>
-#include <nall/string/datetime.hpp>
-#include <nall/string/filename.hpp>
-#include <nall/string/math-fixed-point.hpp>
-#include <nall/string/math-floating-point.hpp>
-#include <nall/string/platform.hpp>
-#include <nall/string/strm.hpp>
-#include <nall/string/strpos.hpp>
-#include <nall/string/trim.hpp>
-#include <nall/string/replace.hpp>
-#include <nall/string/split.hpp>
-#include <nall/string/static.hpp>
-#include <nall/string/utf8.hpp>
-#include <nall/string/utility.hpp>
-#include <nall/string/variadic.hpp>
-#include <nall/string/wildcard.hpp>
-#include <nall/string/wrapper.hpp>
-#include <nall/string/markup/node.hpp>
-#include <nall/string/markup/bml.hpp>
-#include <nall/string/markup/xml.hpp>
-#include <nall/string/markup/document.hpp>
-#undef NALL_STRING_INTERNAL_HPP
-
-#endif
@@ -1,220 +0,0 @@
-#ifdef NALL_STRING_INTERNAL_HPP
-
-namespace nall {
-  struct cstring;
-  struct string;
-  struct lstring;
-  template<typename T> inline const char* to_string(T);
-
-  struct cstring {
-    inline operator const char*() const;
-    inline unsigned length() const;
-    inline bool operator==(const char*) const;
-    inline bool operator!=(const char*) const;
-    inline optional<unsigned> position(const char *key) const;
-    inline optional<unsigned> iposition(const char *key) const;
-    inline cstring& operator=(const char *data);
-    inline cstring(const char *data);
-    inline cstring();
-
-  protected:
-    const char *data;
-  };
-
-  struct string {
-    inline static string read(const string &filename);
-    inline static string date();
-    inline static string time();
-    inline static string datetime();
-
-    inline void reserve(unsigned);
-    inline bool empty() const;
-
-    template<typename... Args> inline string& assign(Args&&... args);
-    template<typename... Args> inline string& append(Args&&... args);
-
-    inline bool readfile(const string&);
-
-    template<unsigned Limit = 0> inline string& replace(const char*, const char*);
-    template<unsigned Limit = 0> inline string& ireplace(const char*, const char*);
-    template<unsigned Limit = 0> inline string& qreplace(const char*, const char*);
-    template<unsigned Limit = 0> inline string& iqreplace(const char*, const char*);
-
-    inline unsigned length() const;
-    inline unsigned capacity() const;
-
-    template<unsigned Limit = 0> inline lstring split(const char*) const;
-    template<unsigned Limit = 0> inline lstring isplit(const char*) const;
-    template<unsigned Limit = 0> inline lstring qsplit(const char*) const;
-    template<unsigned Limit = 0> inline lstring iqsplit(const char*) const;
-
-    inline bool equals(const char*) const;
-    inline bool iequals(const char*) const;
-
-    inline bool wildcard(const char*) const;
-    inline bool iwildcard(const char*) const;
-
-    inline bool beginswith(const char*) const;
-    inline bool ibeginswith(const char*) const;
-    inline bool endswith(const char*) const;
-    inline bool iendswith(const char*) const;
-
-    inline string& lower();
-    inline string& upper();
-    inline string& qlower();
-    inline string& qupper();
-    inline string& transform(const char *before, const char *after);
-
-    template<unsigned limit = 0> inline string& ltrim(const char *key = " ");
-    template<unsigned limit = 0> inline string& rtrim(const char *key = " ");
-    template<unsigned limit = 0> inline string& trim(const char *key = " ", const char *rkey = 0);
-    inline string& strip();
-
-    inline optional<unsigned> position(const char *key) const;
-    inline optional<unsigned> iposition(const char *key) const;
-    inline optional<unsigned> qposition(const char *key) const;
-    inline optional<unsigned> iqposition(const char *key) const;
-
-    inline operator const char*() const;
-    inline char* operator()();
-    inline char& operator[](int);
-
-    inline bool operator==(const char*) const;
-    inline bool operator!=(const char*) const;
-    inline bool operator< (const char*) const;
-    inline bool operator<=(const char*) const;
-    inline bool operator> (const char*) const;
-    inline bool operator>=(const char*) const;
-
-    inline string& operator=(const string&);
-    inline string& operator=(string&&);
-
-    template<typename... Args> inline string(Args&&... args);
-    inline string(const string&);
-    inline string(string&&);
-    inline ~string();
-
-    inline char* begin() { return &data[0]; }
-    inline char* end() { return &data[length()]; }
-    inline const char* begin() const { return &data[0]; }
-    inline const char* end() const { return &data[length()]; }
-
-    //internal functions
-    inline string& assign_(const char*);
-    inline string& append_(const char*);
-
-  protected:
-    char *data;
-    unsigned size;
-
-    template<unsigned Limit, bool Insensitive, bool Quoted> inline string& ureplace(const char*, const char*);
-
-  #if defined(QSTRING_H)
-  public:
-    inline operator QString() const;
-  #endif
-  };
-
-  struct lstring : vector<string> {
-    inline optional<unsigned> find(const char*) const;
-    inline string concatenate(const char*) const;
-    inline void append() {}
-    inline void isort();
-    template<typename... Args> inline void append(const string&, Args&&...);
-
-    template<unsigned Limit = 0> inline lstring& split(const char*, const char*);
-    template<unsigned Limit = 0> inline lstring& isplit(const char*, const char*);
-    template<unsigned Limit = 0> inline lstring& qsplit(const char*, const char*);
-    template<unsigned Limit = 0> inline lstring& iqsplit(const char*, const char*);
-
-    inline bool operator==(const lstring&) const;
-    inline bool operator!=(const lstring&) const;
-
-    inline lstring& operator=(const lstring&);
-    inline lstring& operator=(lstring&);
-    inline lstring& operator=(lstring&&);
-
-    template<typename... Args> inline lstring(Args&&... args);
-    inline lstring(const lstring&);
-    inline lstring(lstring&);
-    inline lstring(lstring&&);
-
-  protected:
-    template<unsigned Limit, bool Insensitive, bool Quoted> inline lstring& usplit(const char*, const char*);
-  };
-
-  //compare.hpp
-  inline char chrlower(char c);
-  inline char chrupper(char c);
-  inline int istrcmp(const char *str1, const char *str2);
-  inline bool strbegin(const char *str, const char *key);
-  inline bool istrbegin(const char *str, const char *key);
-  inline bool strend(const char *str, const char *key);
-  inline bool istrend(const char *str, const char *key);
-
-  //convert.hpp
-  inline char* strlower(char *str);
-  inline char* strupper(char *str);
-  inline char* qstrlower(char *str);
-  inline char* qstrupper(char *str);
-  inline char* strtr(char *dest, const char *before, const char *after);
-
-  //math.hpp
-  inline bool strint(const char *str, int &result);
-  inline bool strmath(const char *str, int &result);
-
-  //platform.hpp
-  inline string activepath();
-  inline string realpath(const string &name);
-  inline string userpath();
-  inline string configpath();
-  inline string temppath();
-
-  //strm.hpp
-  inline unsigned strmcpy(char *target, const char *source, unsigned length);
-  inline unsigned strmcat(char *target, const char *source, unsigned length);
-  inline bool strccpy(char *target, const char *source, unsigned length);
-  inline bool strccat(char *target, const char *source, unsigned length);
-  inline void strpcpy(char *&target, const char *source, unsigned &length);
-
-  //strpos.hpp
-  inline optional<unsigned> strpos(const char *str, const char *key);
-  inline optional<unsigned> istrpos(const char *str, const char *key);
-  inline optional<unsigned> qstrpos(const char *str, const char *key);
-  inline optional<unsigned> iqstrpos(const char *str, const char *key);
-  template<bool Insensitive = false, bool Quoted = false> inline optional<unsigned> ustrpos(const char *str, const char *key);
-
-  //trim.hpp
-  template<unsigned limit = 0> inline char* ltrim(char *str, const char *key = " ");
-  template<unsigned limit = 0> inline char* rtrim(char *str, const char *key = " ");
-  template<unsigned limit = 0> inline char* trim(char *str, const char *key = " ", const char *rkey = 0);
-  inline char* strip(char *s);
-
-  //utility.hpp
-  template<bool Insensitive> alwaysinline bool chrequal(char x, char y);
-  template<bool Quoted, typename T> alwaysinline bool quoteskip(T *&p);
-  template<bool Quoted, typename T> alwaysinline bool quotecopy(char *&t, T *&p);
-  inline string substr(const char *src, unsigned start = 0, unsigned length = ~0u);
-  inline string sha256(const uint8_t *data, unsigned size);
-
-  inline char* integer(char *result, intmax_t value);
-  inline char* decimal(char *result, uintmax_t value);
-
-  template<unsigned length = 0, char padding = ' '> inline string integer(intmax_t value);
-  template<unsigned length = 0, char padding = ' '> inline string linteger(intmax_t value);
-  template<unsigned length = 0, char padding = ' '> inline string decimal(uintmax_t value);
-  template<unsigned length = 0, char padding = ' '> inline string ldecimal(uintmax_t value);
-  template<unsigned length = 0, char padding = '0'> inline string hex(uintmax_t value);
-  template<unsigned length = 0, char padding = '0'> inline string binary(uintmax_t value);
-  inline unsigned fp(char *str, long double value);
-  inline string fp(long double value);
-
-  //variadic.hpp
-  template<typename... Args> inline void print(Args&&... args);
-
-  //wildcard.hpp
-  inline bool wildcard(const char *str, const char *pattern);
-  inline bool iwildcard(const char *str, const char *pattern);
-};
-
-#endif
@@ -1,76 +0,0 @@
-#ifdef NALL_STRING_INTERNAL_HPP
-
-//BSV v1.0 parser
-//revision 0.02
-
-namespace nall {
-
-struct BSV {
-  static inline string decode(const char *input) {
-    string output;
-    unsigned offset = 0;
-    while(*input) {
-      //illegal characters
-      if(*input == '}' ) return "";
-      if(*input == '\r') return "";
-      if(*input == '\n') return "";
-
-      //normal characters
-      if(*input != '{') { output[offset++] = *input++;  continue; }
-
-      //entities
-      if(strbegin(input, "{lf}")) { output[offset++] = '\n'; input += 4; continue; }
-      if(strbegin(input, "{lb}")) { output[offset++] = '{';  input += 4; continue; }
-      if(strbegin(input, "{rb}")) { output[offset++] = '}';  input += 4; continue; }
-
-      //illegal entities
-      return "";
-    }
-    output[offset] = 0;
-    return output;
-  }
-
-  static inline string encode(const char *input) {
-    string output;
-    unsigned offset = 0;
-    while(*input) {
-      //illegal characters
-      if(*input == '\r') return "";
-
-      if(*input == '\n') {
-        output[offset++] = '{';
-        output[offset++] = 'l';
-        output[offset++] = 'f';
-        output[offset++] = '}';
-        input++;
-        continue;
-      }
-
-      if(*input == '{') {
-        output[offset++] = '{';
-        output[offset++] = 'l';
-        output[offset++] = 'b';
-        output[offset++] = '}';
-        input++;
-        continue;
-      }
-
-      if(*input == '}') {
-        output[offset++] = '{';
-        output[offset++] = 'r';
-        output[offset++] = 'b';
-        output[offset++] = '}';
-        input++;
-        continue;
-      }
-
-      output[offset++] = *input++;
-    }
-    output[offset] = 0;
-    return output;
-  }
-};
-
-}
-
-#endif
@@ -1,185 +0,0 @@
-#ifdef NALL_STRING_INTERNAL_HPP
-
-namespace nall {
-
-//convert any (supported) type to a const char* without constructing a new nall::string
-//this is used inside istring(...) to build nall::string values
-template<typename T> struct stringify;
-
-// base types
-
-template<> struct stringify<bool> {
-  bool value;
-  operator const char*() const { return value ? "true" : "false"; }
-  stringify(bool value) : value(value) {}
-};
-
-template<> struct stringify<char> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(char value) { integer(data, value); }
-};
-
-// signed integers
-
-template<> struct stringify<signed char> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(signed char value) { integer(data, value); }
-};
-
-template<> struct stringify<signed short> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(signed short value) { integer(data, value); }
-};
-
-template<> struct stringify<signed int> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(signed int value) { integer(data, value); }
-};
-
-template<> struct stringify<signed long> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(signed long value) { integer(data, value); }
-};
-
-template<> struct stringify<signed long long> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(signed long long value) { integer(data, value); }
-};
-
-template<unsigned bits> struct stringify<int_t<bits>> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(int_t<bits> value) { integer(data, value); }
-};
-
-// unsigned integers
-
-template<> struct stringify<unsigned char> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(unsigned char value) { decimal(data, value); }
-};
-
-template<> struct stringify<unsigned short> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(unsigned short value) { decimal(data, value); }
-};
-
-template<> struct stringify<unsigned int> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(unsigned int value) { decimal(data, value); }
-};
-
-template<> struct stringify<unsigned long> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(unsigned long value) { decimal(data, value); }
-};
-
-template<> struct stringify<unsigned long long> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(unsigned long long value) { decimal(data, value); }
-};
-
-template<unsigned bits> struct stringify<uint_t<bits>> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(uint_t<bits> value) { decimal(data, value); }
-};
-
-// floating-point
-
-template<> struct stringify<float> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(float value) { fp(data, value); }
-};
-
-template<> struct stringify<double> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(double value) { fp(data, value); }
-};
-
-template<> struct stringify<long double> {
-  char data[256];
-  operator const char*() const { return data; }
-  stringify(long double value) { fp(data, value); }
-};
-
-// strings
-
-template<> struct stringify<char*> {
-  const char *value;
-  operator const char*() const { return value; }
-  stringify(char *value) : value(value) {}
-};
-
-template<> struct stringify<const char*> {
-  const char *value;
-  operator const char*() const { return value; }
-  stringify(const char *value) : value(value) {}
-};
-
-template<> struct stringify<string> {
-  const string &value;
-  operator const char*() const { return value; }
-  stringify(const string &value) : value(value) {}
-};
-
-template<> struct stringify<const string&> {
-  const string &value;
-  operator const char*() const { return value; }
-  stringify(const string &value) : value(value) {}
-};
-
-template<> struct stringify<cstring> {
-  const char *value;
-  operator const char*() const { return value; }
-  stringify(const cstring &value) : value(value) {}
-};
-
-template<> struct stringify<const cstring&> {
-  const char *value;
-  operator const char*() const { return value; }
-  stringify(const cstring &value) : value(value) {}
-};
-
-#if defined(QSTRING_H)
-
-template<> struct stringify<QString> {
-  const QString &value;
-  operator const char*() const { return value.toUtf8().constData(); }
-  stringify(const QString &value) : value(value) {}
-};
-
-template<> struct stringify<const QString&> {
-  const QString &value;
-  operator const char*() const { return value.toUtf8().constData(); }
-  stringify(const QString &value) : value(value) {}
-};
-
-string::operator QString() const {
-  return QString::fromUtf8(*this);
-}
-
-#endif
-
-//
-
-template<typename T> stringify<T> make_string(T value) {
-  return stringify<T>(std::forward<T>(value));
-}
-
-}
-
-#endif
@@ -1,69 +0,0 @@
-#ifdef NALL_STRING_INTERNAL_HPP
-
-namespace nall {
-
-char chrlower(char c) {
-  return (c >= 'A' && c <= 'Z') ? c + ('a' - 'A') : c;
-}
-
-char chrupper(char c) {
-  return (c >= 'a' && c <= 'z') ? c - ('a' - 'A') : c;
-}
-
-int istrcmp(const char *str1, const char *str2) {
-  while(*str1) {
-    if(chrlower(*str1) != chrlower(*str2)) break;
-    str1++, str2++;
-  }
-  return (int)chrlower(*str1) - (int)chrlower(*str2);
-}
-
-bool strbegin(const char *str, const char *key) {
-  int i, ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return false;
-  return (!memcmp(str, key, ksl));
-}
-
-bool istrbegin(const char *str, const char *key) {
-  int ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return false;
-  for(int i = 0; i < ksl; i++) {
-    if(str[i] >= 'A' && str[i] <= 'Z') {
-      if(str[i] != key[i] && str[i]+0x20 != key[i])return false;
-    } else if(str[i] >= 'a' && str[i] <= 'z') {
-      if(str[i] != key[i] && str[i]-0x20 != key[i])return false;
-    } else {
-      if(str[i] != key[i])return false;
-    }
-  }
-  return true;
-}
-
-bool strend(const char *str, const char *key) {
-  int ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return false;
-  return (!memcmp(str + ssl - ksl, key, ksl));
-}
-
-bool istrend(const char *str, const char *key) {
-  int ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return false;
-  for(int i = ssl - ksl, z = 0; i < ssl; i++, z++) {
-    if(str[i] >= 'A' && str[i] <= 'Z') {
-      if(str[i] != key[z] && str[i]+0x20 != key[z])return false;
-    } else if(str[i] >= 'a' && str[i] <= 'z') {
-      if(str[i] != key[z] && str[i]-0x20 != key[z])return false;
-    } else {
-      if(str[i] != key[z])return false;
-    }
-  }
-  return true;
-}
-
-}
-
-#endif
@@ -1,64 +0,0 @@
-#ifdef NALL_STRING_INTERNAL_HPP
-
-namespace nall {
-
-char* strlower(char *str) {
-  if(!str) return 0;
-  int i = 0;
-  while(str[i]) {
-    str[i] = chrlower(str[i]);
-    i++;
-  }
-  return str;
-}
-
-char* strupper(char *str) {
-  if(!str) return 0;
-  int i = 0;
-  while(str[i]) {
-    str[i] = chrupper(str[i]);
-    i++;
-  }
-  return str;
-}
-
-char* qstrlower(char *s) {
-  if(!s) return 0;
-  bool quoted = false;
-  while(*s) {
-    if(*s == '\"' || *s == '\'') quoted ^= 1;
-    if(quoted == false && *s >= 'A' && *s <= 'Z') *s += 0x20;
-    s++;
-  }
-}
-
-char* qstrupper(char *s) {
-  if(!s) return 0;
-  bool quoted = false;
-  while(*s) {
-    if(*s == '\"' || *s == '\'') quoted ^= 1;
-    if(quoted == false && *s >= 'a' && *s <= 'z') *s -= 0x20;
-    s++;
-  }
-}
-
-char* strtr(char *dest, const char *before, const char *after) {
-  if(!dest || !before || !after) return dest;
-  int sl = strlen(dest), bsl = strlen(before), asl = strlen(after);
-
-  if(bsl != asl || bsl == 0) return dest;  //patterns must be the same length for 1:1 replace
-  for(unsigned i = 0; i < sl; i++) {
-    for(unsigned l = 0; l < bsl; l++) {
-      if(dest[i] == before[l]) {
-        dest[i] = after[l];
-        break;
-      }
-    }
-  }
-
-  return dest;
-}
-
-}
-
-#endif
Author	SHA1	Message	Date
byuu	7dec0b2a3c	Update to bsnes v014 release. This version adds speed regulation, greatly improves PPU rendering, and increases speed by ~30% over the previous version. Changelog: - Rewrote offset-per-tile mode emulation, should be correct now. Fixes Chrono Trigger, Contra III, Tetris Attack, etc. - Fixed a bug with HDMA occuring during interrupts. Fixes Tales of Phantasia souond test screen - Updated compiler to Visual Studio 2005, and enabled profile guided optimizations - Added conditional compilation of debugging functions (faster without them) - Added conditional compilation of core classes as pointers (allowing polymorphism) or objects (allowing inlining). The latter results in a speed increase - Small fixes to BG and OAM rendering routines - Corrected sprite tile bounds wrapping - Corrected sprite rendering in hires video modes - Rewrote color add/sub routines, should be correct now. Fixes Illusion of Gaia menu, etc. - Optimized video blitting routines, will temporarilly break mixed video mode screenshots - Prevented selecting menu options via return key from being recognized as keypresses by the emulator - Added system speed regulation (60hz/NTSC or 50hz/PAL)! Many thanks to kode54, GIGO, and Richard Bannister for their assistance I disabled the debugger and polymorphism, and enabled profile guided optimizations for this build, to maximize speed. The debugger and polymorphism can be re-enabled via uncommenting the respective #defines in src/base.h and recompiling, or bsnes v0.013 can be used. I may start releasing two separate builds in the future... not sure yet.	2005-11-12 16:49:26 +00:00
byuu	f288280ceb	Update to bsnes v013r02 release. [No changelog available]	2005-10-25 23:25:28 +00:00
byuu	c6c5f4669c	Update to bsnes v013 release. - Greatly improved HDMA timing and accuracy with help from anomie and DMV27 -- fixes bugs in Energy Breaker and Street Fighter Alpha 2 - Fixed a problem with color add/sub code -- fixes opening battle in Tales of Phantasia and clouds in Energy Breaker - Temporarily added DMV27's bugfix for the DSP KON register -- fixes sound in Der Langrisser, but this is not a hardware-accurate fix - Disabled VRAM writes outside of vblank -- fixes Hook, but breaks many PD ROMs and fan translations (Roto's BS Zelda hack, Gideon Zhi's Ys 4 translation, etc). I might add an option in the future to toggle this behavior, but for now these games will no longer work. Please keep in mind these games will not run properly on real SNES hardware, either. - Improved frameskipping code thanks to a suggestion from Richard Bannister - Misc. other code cleanups and improvements (notably in the color table generation code) - bsnes is now endian-safe and runs on Mac OS X - Added caching support for window clipping tables resulting in a slight speedup. Please let me know if you spot any errors as a result of this change.	2005-10-23 23:32:30 +00:00
byuu	397b9c4505	Update to bsnes v012 release. Changelog: - Added S-DSP emulation - Added sound output support via DirectSound -- no sound buffering though, so sound is muted by default - Added option to record raw sound output to WAV files - Added multiple color adjustment filters to the video output - Added mode3/4 direct color support - Added mode7 direct color and mosaic support - Greatly improved mode7 rendering algorithm thanks to anomie - Fixed mode7 screen repitition and EXTBG effects - Greatly increased accuracy of NMI and IRQ timing, and emulated many newly discovered hardware quirks involving the two - A few speed improvements courtesy of Nach for profiling the code for me I'm now looking for assistance with sound buffering. Specifically, I need help modifying the DirectSound code to allow the emulator to be ran between 50%-400% normal speed, while keeping the sound output relatively good. If you have experience with this and can help, please get in touch with me (setsunakun0 at hotmail dot com).	2005-10-02 00:38:34 +00:00
byuu	7e2cfb6d40	Update to bsnes v011 release. - Fixed Mode 0 color palette index problem. Fixes ToP, DQ5, etc. - Improved LoROM memory mapper to support 32mbit images. Fixes Tokimeki Memorial, etc. - Added full S-DD1 support, SFA2 and Star Ocean are now playable. Special thanks to Andreas Naive - Updated BGnxOFS / Mode7 registers with anomie's latest findings - Added basic ROM mirroring support. Fixes copy protection issues in MMX, etc. - Rewrote string library to work better on gcc/linux - Cleaned up S-RTC/S-DD1 emulation to make way for future add-on chip emulation - Rewrote DMA code, now runs cycle-by-cycle - Rewrote HDMA code, now allows HDMA to be enabled mid-frame, fixes many games - Fixed a bug in Mode7 vertical screen flip mode. Fixes FF5 title screen, etc. - Greatly improved IRQ triggering. Fixes Der Langrisser, etc. - Added full support for open bus. This includes PPU1 and PPU2 open bus support - Modified CPU core back to cycle-based system. Slower, but improves debugger - Implemented temporary fix for debugger to handle new cycle-based cores - Modified CGRAM to ignore highest bit, since it is not used at all by the SNES, and is impossible to read on real hardware. Lowers memory usage by ~1.2mb - Added mostly accurate PAL timing support. This should increase compatibility by ~30% or so - More stuff I'm forgetting at the moment...	2005-08-26 20:38:00 +00:00
byuu	970dcea0ac	Update to bsnes v010 release. bsnes now supports SPC700 emulation (no DSP or sound support, however), and has greatly improved compatibility. It also now contains a keyboard-only joypad configuration tool.	2005-08-03 21:22:42 +00:00
byuu	402c146a53	Update to bsnes v009 release. - Fixed non-interlaced display modes from not drawing every other frame - Changed OAM halve to skip every other scanline in 224-height modes - Updated renderer to properly support games that switch resolutions mid-frame - Fixed VRAM address remapping modes, fixes DQ3R, FF: MQ - Fixed a bug in main color window clipping affecting BGs - Added video color curve option, thanks to Overload for the idea + color table - Added vblank, FPS counter, and DDraw surface memory options to settings menu - Added fullscreen modes 640x480 and 1024x768 to video modes - Added option to toggle the menubar on and off by pressing the escape key - Mode3 was not rendering sprites - Priorities were wrong for modes 2-4, thanks to anomie for info - Fixed a serious bug in IRQ interrupts. May not be perfect, but helps many games	2005-06-26 11:07:38 +00:00
byuu	a471c150c9	Update to bsnes v008 release. moving the window + main color window clipping into the bg/oam/mode7 rendering routines themselves, I was able to greatly simplify the most complicated part of rendering: the final pass where color add/sub effects are applied. As a result, the new PPU core is not only ~35% faster (on graphics intensive screens, even faster on simpler screens), but more accurate as well. Awesome. In celebration, I´m releasing bsnes v0.008. I can actually run all games I have at >60fps on my Athlon 1.67ghz PC. Probably not something to brag about, though ... Oh, and I also updated the keyboard polling code to only capture keypresses if the main window has focus. I´ve been meaning to do this for the better part of a year now, but never got around to it. If, for some reason, you still want to use the old renderer, you can uncomment the first line in src/ppu/bppu/bppu.h and recompile the emulator yourself. Or you can use v0.007a, I´ll leave it up for a bit.	2005-06-21 09:13:40 +00:00
byuu	ea38ea2537	Update to bsnes v007a release. [No changelog available]	2005-06-13 04:34:10 +00:00
byuu	09b326ae86	Update to bsnes v007 release. I have done quite a bit, so I´ll try my best to recap most of the fixes since the last release... - HDMA was not running during DMA transfers - Emulator did not recognize any filetype other than .smc - Added configuration file support and imported my vector/string/config libraries into bsnes - Added option to use system RAM instead of video RAM for display, this can greatly increase speed on certain video cards - Increased speed by ~15% by adding 256x224 renderer (still very buggy when the SNES mixes video modes mid-frame) - mvn/mvp opcodes were not setting the DB register - Fixed joypad input in many games (Super Mario: All Stars, Dragon Quest III, etc.) - Major speedup with frakeskip option - Fixed default aspect ratio when emulator is first started There´s probably a lot more, but that´s all I remember offhand... this release should be a lot closer to the quality of v0.005a, but still needs a bit more polishing.	2005-06-12 08:15:22 +00:00
byuu	a60f667b25	Update to bsnes v006 release. The rewrite is now complete. I finished adding frameskip, and fixed some crashing issues with loading multiple ROMs. I wrapped all malloc/free calls with memalloc/memfree, which are custom functions that log each call, and let you pass sprintf-style arguments to them to debug memory leaks. Don´t see any, nor have I noticed any in bsnes; but it makes a nice test tool anyway. I found out today that the mvn/mvp instructions actually set the DB register to the destination bank. Weird. This fixed Final Fantasy V, Chrono Trigger, and Dragon Quest III (which now runs as a result) graphics. Not all of them, but quite a few. I had also previously been setting the M/X flags of the P register when xce was executed. I never anticipated a game using xce while in native mode to switch to... native mode... but apparently, Chrono Trigger does. And my code was incorrect. So now Chrono Trigger gets past the name select screen, but dies a few screens after still. The only really major flaw I am aware of that bsnes v0.005 did not have is with the battle screens in Squaresoft games. I get horrible flickering and "crushed scanlines" every other frame on them, for some reason. I´ll try and track that down for the next release, but I didn´t want to hold up a new release any longer. As a result, I´ll leave up v0.005a for the time being until I get this problem fixed.	2005-05-13 12:03:02 +00:00
byuu	6f7cf1bd31	Update to bsnes v005a release. [No changelog available]	2005-02-06 04:04:32 +00:00
byuu	8751bc433f	Update to bsnes v005 release. Released a new version of bsnes today. Version 0.0.005 is up on the main page now. The changes since .004 wip10 include: DRAM timing fix (now occurs mid-opcode), memory address speed fix, added CPU cycle condition 4 to all opcodes that use it, and fixed a bug where DRAM refresh was not changing start positions every other scanline. With the new version, Chrono Trigger should get a little further, and Final Fantasy 5 should get in-game now. The only problem FF5 seems to have is sprite corrution in the menus. I´m too busy with the CPU timing to mess around with the PPU right now, though. Also, the APU is not bridged to the CPU in this release, so compatibility is (still) really low. After I get the APU working fairly well, I´ll (try and) start keeping a what´s new file so that people can know what all changed between public releases of the emulator without having to follow this page. Sorry for the inconvenience in the mean time. [No archive available]	2005-02-05 00:00:00 +00:00
byuu	afbee40bc0	Update to bsnes v004 release. [No changelog available] [No archive available]	2004-12-24 00:00:00 +00:00
byuu	81e9be64d2	Update to bsnes v003r01 release. [No changelog available] [No archive available]	2004-12-13 00:00:00 +00:00
byuu	0cd4972d11	Update to bsnes v002 ir11 release. Doubled the width of sprites when the width of the screen is 512. The SNES Test Program now runs through all of the character test correctly. The windows are off-by-one though. Added the very bizarre 00:4300-00:437f memory region that is unique from 7e:4300-7e:437f. Then I added read support from $2180. This allowed the SNES Test Program to not crash after failing the electronics test, and it also fixed the horrible graphics corruption in Der Langrisser. The fonts were still failing, so I went in with my tracer and found out what was causing it. The following code: gx816->regs.pc += (signed char)(arg + 2); This is the code used to increment the pc counter after relative branches. The problem is that I had parinthesis around the + 2 as well as arg. Therefore, if arg was 0x7e, 0x7f, 0xfe, or 0xff, it would change the sign. This would in turn make the program counter off by 256 bytes. Very bad. Fixing this fixed the font in Der Langrisser, and also fixed Super Mario World, when Yoshi spits a turtle out, the game will no longer crash. Next, via the Der Langrisser world map, I realized that anomie´s description of the BG/mode7 register latches was reversed: the BG registers (may) share a common latch between all of them, but the mode7 registers do not. I removed the common latches from the mode7 regs, but I haven´t added the latch to the BG registers yet. I also realized that clearing the entire screen on a BG mode change would probably not be a good thing for games that change video modes mid-frame. So I tried working on getting the weird single-frame garble that pops up every minute or so to go away, but to no avail. I´m having a difficult time tracking down the exact cause of the error, but I believe it to be a buffer overflow, or something along those lines. [No archive available]	2004-12-11 00:00:00 +00:00
byuu	938609818f	Update to bsnes v002 ir9 release. [No changelog available]	2004-12-07 01:12:32 +00:00
byuu	487491e6f2	Update to bsnes v002 ir7 release. The bug in the Bahamut Lagoon mode7 screens turned out to be that I never added the dividend result to $4216/$4217. It always returned the multiplication of $4202/$4203. This also fixed the sprites in battles for Dai Kaijuu Monogatari. I added a bunch of window stuff, including a double size windowed mode, and a fullscreen mode. Lots of fixes to the interface, as well as code cleanup. It's still pretty buggy, there's a lot of variables to keep up with in the GUI at present... I also added better tile caching, I just cache all tiles when they are rendered, for all 3 color depths (4, 16, 256). Seems to help a little. A portion of the speed gain was lost by fixing the dividend result, though. Very strange, since I wouldn't think much work would go into a simple line of code that's called 20 times a frame probably at best... oh well. [No archive available]	2004-12-05 00:00:00 +00:00
byuu	a6ccc7e5d2	Update to unreleased version. First, I fixed some issues with the mode7 / scroll regs thanks to info from anomie. Qwertie's mode7 demo runs without modification now. Next, I fixed a small glitch with tiles getting cut off on the right edge of the screen, fixes some flickering on the edges in Zelda 3. Finally, I added tile caching to all 4 BG layers. It didn't really increase speed by much (~10%), and upped the RAM requirements by 1.2mb... I left the old code in case I need to fall back on it. My only guess (hope) is that the bottleneck lies somewhere else... [No archive available]	2004-12-04 00:00:00 +00:00
byuu	39dd39cc09	Update to unreleased version. Had a small glitch in the OAM $2102/$2103 register settings, fixed that and now both Zelda 3 and Super Mario World always show sprites perfectly. The only error to my knowledge in the below screenshots is that the large version of the mario sprite in the third pic is not shown at the top left of the screen. Which could be because I have no mosaic support. But at any rate, both games should be completely playable now, albeit very slowly. I tried to speed up things by caching some stuff in the PPU, but I couldn't find a nice way to implement it that would result in a significant speed increase. Oh yeah, Zelda won't follow you in Zelda 3, but you can just go to the throne room and push the picture to the right yourself, and she'll appear when you reach the sanctuary. I also updated the debugger, it uses a smaller font, which is a bit harder to read, but saves a lot of screen space. This will definately be needed when I add in more of the debugging windows in the future, so it's better to get used to it now than later. [No archive available]	2004-11-27 00:00:00 +00:00
byuu	1a017ff697	Update to unreleased version. Added SRAM support. It's compatible with other emulators. It maps both the LoROM SRAM between $700000-$7dffff, and HiROM SRAM between $3n6000-$3n7fff (where n = 0 - f). Modified the screen to redraw at scanline 224, instead of 0. Fixes some flickering between screens in some games. Moved the lighting adjustment code ($2100 bits 0-3) directly into the PPU, rather than outside in the platform-specific code. This is because games have the ability to adjust this value per scanline. Also allowed the games to control the background enable ($2100 bit 7) flag per scanline now. This allowed Bahamut Lagoon's dragon intro to work. I then added mode2 support, so now all that's missing is modes 5 and 6 (interlaced). I also created an easy #define to select between the public domain mode7 code I wrote, and the snes9x mode7 code. I'll go through one of these days and rewrite the snes9x code in a clean environment (e.g. without using the current mode7 file as a reference) to avoid the issue altogether, but for now... the snes9x code is twice as fast, and that's good enough for me. Lastly, I also added in a trace checkbox to enable tracing. As such, the zip file of my work up now has debug mode enabled by default. I really need an overhaul of the gui implementation, and a configuration file. I have a very nice string library system (that I wrote myself) that I would love to take advantage of in this project. Here's some screenshots of the dragon intro. Lots of HDMA here, showing that I pretty much have HDMA down, now. I remember zsnes used to have a problem with these screens, and had to do something with an HDMA hack to get around it. They figured out what the problem was, eventually. I was actually quite surprised my emulator does not suffer from this same problem. Lucky for me, as they never did mention what the problem was to begin with. The HDMA is technically drawing too soon (at the start of the scanline instead of the end) which probably messes things up a bit, and I'm guessing the scroll registers are screwing up in one or two of the below pics. No mosaic support either. [No archive available]	2004-11-21 00:00:00 +00:00
byuu	591adfcb25	Update to unreleased version. Initial release [No archive available]	2004-10-14 00:00:00 +00:00