Update to v095 release.

byuu says:

After 20 months of development, higan v095 is released at long last!

The most notable feature is vastly improved Game Boy Advance emulation.
With many thanks to endrift, Cydrak, Jonas Quinn and jchadwick, this
release contains substantially improved CPU timings and many bugfixes.
Being one of only two GBA emulators to offer ROM prefetch emulation,
higan is very near mGBA in terms of accuracy, and far ahead of all
others. As a result of these fixes, compatibility is also much higher
than in v094.

There are also several improvements to SNES emulation. Most
significantly is support for mid-scanline changes to the background mode
in the accuracy profile.

Due to substantial changes to the user interface library used by higan,
this release features yet again a brand-new UI. With the exception of
video shaders and NSS DIP switch selection, it is at feature-parity with
the previous UI. It also offers some new features that v094 lacked.

The cheat code database has also been updated to the latest version by
mightymo.

.gitignore

@@ -1,3 +1,2 @@
-purify/*.o
-purify/purify
-purify/analyze-gba
+ananke/libananke.so
+icarus/icarus

GNUmakefile

@@ -0,0 +1,111 @@
+include nall/GNUmakefile
+
+fc  := fc
+sfc := sfc
+gb  := gb
+gba := gba
+
+profile := accuracy
+target := tomoko
+
+# arch := x86
+# console := true
+
+# compiler
+flags += -I. -O3
+objects := libco
+
+# profile-guided optimization mode
+# pgo := instrument
+# pgo := optimize
+
+ifeq ($(pgo),instrument)
+  flags += -fprofile-generate
+  link += -lgcov
+else ifeq ($(pgo),optimize)
+  flags += -fprofile-use
+endif
+
+# platform
+ifeq ($(platform),windows)
+  ifeq ($(arch),x86)
+    flags += -m32
+    link += -m32
+  endif
+  ifeq ($(console),true)
+    link += -mconsole
+  else
+    link += -mwindows
+  endif
+  link += -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32
+  link += -Wl,-enable-auto-import
+  link += -Wl,-enable-runtime-pseudo-reloc
+else ifeq ($(platform),macosx)
+  flags += -march=native
+else ifeq ($(platform),linux)
+  flags += -march=native -fopenmp
+  link += -fopenmp
+  link += -Wl,-export-dynamic
+  link += -lX11 -lXext -ldl
+else ifeq ($(platform),bsd)
+  flags += -march=native -fopenmp
+  link += -fopenmp
+  link += -Wl,-export-dynamic
+  link += -lX11 -lXext
+else
+  $(error unsupported platform.)
+endif
+
+ui := target-$(target)
+
+# implicit rules
+compile = \
+  $(strip \
+    $(if $(filter %.c,$<), \
+      $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
+      $(if $(filter %.cpp,$<), \
+        $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
+      ) \
+    ) \
+  )
+
+%.o: $<; $(call compile)
+
+all: build;
+
+obj/libco.o: libco/libco.c libco/*
+
+include $(ui)/GNUmakefile
+flags := $(flags) $(foreach o,$(call strupper,$(options)),-D$o)
+
+# targets
+clean:
+	-@$(call delete,out/*)
+	-@$(call delete,obj/*.o)
+	-@$(call delete,obj/*.a)
+	-@$(call delete,obj/*.so)
+	-@$(call delete,obj/*.dylib)
+	-@$(call delete,obj/*.dll)
+
+archive:
+	if [ -f higan.tar.xz ]; then rm higan.tar.xz; fi
+	tar -cJf higan.tar.xz `ls`
+
+sync:
+ifeq ($(shell id -un),byuu)
+	if [ -d ./libco ]; then rm -r ./libco; fi
+	if [ -d ./nall ]; then rm -r ./nall; fi
+	if [ -d ./ruby ]; then rm -r ./ruby; fi
+	if [ -d ./hiro ]; then rm -r ./hiro; fi
+	cp -r ../libco ./libco
+	cp -r ../nall ./nall
+	cp -r ../ruby ./ruby
+	cp -r ../hiro ./hiro
+	rm -r libco/doc
+	rm -r libco/-test
+	rm -r nall/-test
+	rm -r ruby/-test
+	rm -r hiro/-test
+endif
+
+help:;

bsnes/Makefile

@@ -1,100 +0,0 @@
-include nall/Makefile
-
-fc  := fc
-sfc := sfc
-gb  := gb
-gba := gba
-
-profile := accuracy
-target  := ethos
-
-# options += console
-
-# compiler
-c       := $(compiler) -std=gnu99
-cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
-flags   := -I. -O3 -fomit-frame-pointer
-link    := -s
-objects := libco
-
-# profile-guided optimization mode
-# pgo := instrument
-# pgo := optimize
-
-ifeq ($(pgo),instrument)
-  flags += -fprofile-generate
-  link += -lgcov
-else ifeq ($(pgo),optimize)
-  flags += -fprofile-use
-endif
-
-# platform
-ifeq ($(platform),x)
-  flags += -march=native
-  link += -ldl -lX11 -lXext
-else ifeq ($(platform),osx)
-else ifeq ($(platform),win)
-  link += $(if $(findstring console,$(options)),-mconsole,-mwindows)
-  link += -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32
-  link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-else
-  unknown_platform: help;
-endif
-
-ui := target-$(target)
-
-# implicit rules
-compile = \
-  $(strip \
-    $(if $(filter %.c,$<), \
-      $(c) $(flags) $1 -c $< -o $@, \
-      $(if $(filter %.cpp,$<), \
-        $(cpp) $(flags) $1 -c $< -o $@ \
-      ) \
-    ) \
-  )
-
-%.o: $<; $(call compile)
-
-all: build;
-
-obj/libco.o: libco/libco.c libco/*
-
-include $(ui)/Makefile
-flags := $(flags) $(foreach o,$(call strupper,$(options)),-D$o)
-
-# targets
-clean:
-	-@$(call delete,obj/*.o)
-	-@$(call delete,obj/*.a)
-	-@$(call delete,obj/*.so)
-	-@$(call delete,obj/*.dylib)
-	-@$(call delete,obj/*.dll)
-	-@$(call delete,*.res)
-	-@$(call delete,*.pgd)
-	-@$(call delete,*.pgc)
-	-@$(call delete,*.ilk)
-	-@$(call delete,*.pdb)
-	-@$(call delete,*.manifest)
-
-sync:
-	if [ -d ./libco ]; then rm -r ./libco; fi
-	if [ -d ./nall ]; then rm -r ./nall; fi
-	if [ -d ./ruby ]; then rm -r ./ruby; fi
-	if [ -d ./phoenix ]; then rm -r ./phoenix; fi
-	cp -r ../libco ./libco
-	cp -r ../nall ./nall
-	cp -r ../ruby ./ruby
-	cp -r ../phoenix ./phoenix
-	rm -r libco/doc
-	rm -r libco/test
-	rm -r nall/test
-	rm -r ruby/_test
-	rm -r phoenix/nall
-	rm -r phoenix/test
-
-archive:
-	if [ -f bsnes.tar.bz2 ]; then rm bsnes.tar.bz2; fi
-	tar -cjf bsnes.tar.bz2 `ls`
-
-help:;

bsnes/cc.bat

@@ -1,2 +0,0 @@
-@mingw32-make -j 8
-@pause

bsnes/data/bsnes.Manifest

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="bsnes" version="1.0.0.0" processorArchitecture="*"/>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-    </dependentAssembly>
-  </dependency>
-</assembly>

bsnes/data/bsnes.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=bsnes
-Comment=SNES emulator
-Exec=bsnes
-Icon=bsnes
-Terminal=false
-Type=Application
-Categories=Game;Emulator;

bsnes/emulator/emulator.hpp

@@ -1,136 +0,0 @@
-#ifndef EMULATOR_HPP
-#define EMULATOR_HPP
-
-namespace Emulator {
-  static const char Name[] = "bsnes";
-  static const char Version[] = "089";
-  static const char Author[] = "byuu";
-  static const char License[] = "GPLv3";
-}
-
-#include <nall/platform.hpp>
-#include <nall/algorithm.hpp>
-#include <nall/dl.hpp>
-#include <nall/dsp.hpp>
-#include <nall/endian.hpp>
-#include <nall/file.hpp>
-#include <nall/function.hpp>
-#include <nall/priorityqueue.hpp>
-#include <nall/property.hpp>
-#include <nall/random.hpp>
-#include <nall/serializer.hpp>
-#include <nall/sha256.hpp>
-#include <nall/stdint.hpp>
-#include <nall/string.hpp>
-#include <nall/utility.hpp>
-#include <nall/varint.hpp>
-#include <nall/vector.hpp>
-#include <nall/stream/memory.hpp>
-#include <nall/stream/vector.hpp>
-using namespace nall;
-
-#include "interface.hpp"
-
-//debugging function hook:
-//no overhead (and no debugger invocation) if not compiled with -DDEBUGGER
-//wraps testing of function to allow invocation without a defined callback
-template<typename T> struct hook;
-template<typename R, typename... P> struct hook<R (P...)> {
-  function<R (P...)> callback;
-
-  R operator()(P... p) const {
-    #if defined(DEBUGGER)
-    if(callback) return callback(std::forward<P>(p)...);
-    #endif
-    return R();
-  }
-
-  hook() {}
-  hook(const hook &hook) { callback = hook.callback; }
-  hook(void *function) { callback = function; }
-  hook(R (*function)(P...)) { callback = function; }
-  template<typename C> hook(R (C::*function)(P...), C *object) { callback = {function, object}; }
-  template<typename C> hook(R (C::*function)(P...) const, C *object) { callback = {function, object}; }
-  template<typename L> hook(const L& function) { callback = function; }
-
-  hook& operator=(const hook& hook) { callback = hook.callback; return *this; }
-};
-
-#if defined(DEBUGGER)
-  #define privileged public
-#else
-  #define privileged private
-#endif
-
-typedef  int1_t  int1;
-typedef  int2_t  int2;
-typedef  int3_t  int3;
-typedef  int4_t  int4;
-typedef  int5_t  int5;
-typedef  int6_t  int6;
-typedef  int7_t  int7;
-typedef  int8_t  int8;
-typedef  int9_t  int9;
-typedef int10_t int10;
-typedef int11_t int11;
-typedef int12_t int12;
-typedef int13_t int13;
-typedef int14_t int14;
-typedef int15_t int15;
-typedef int16_t int16;
-typedef int17_t int17;
-typedef int18_t int18;
-typedef int19_t int19;
-typedef int20_t int20;
-typedef int21_t int21;
-typedef int22_t int22;
-typedef int23_t int23;
-typedef int24_t int24;
-typedef int25_t int25;
-typedef int26_t int26;
-typedef int27_t int27;
-typedef int28_t int28;
-typedef int29_t int29;
-typedef int30_t int30;
-typedef int31_t int31;
-typedef int32_t int32;
-typedef int64_t int64;
-
-typedef  uint1_t  uint1;
-typedef  uint2_t  uint2;
-typedef  uint3_t  uint3;
-typedef  uint4_t  uint4;
-typedef  uint5_t  uint5;
-typedef  uint6_t  uint6;
-typedef  uint7_t  uint7;
-typedef  uint8_t  uint8;
-typedef  uint9_t  uint9;
-typedef uint10_t uint10;
-typedef uint11_t uint11;
-typedef uint12_t uint12;
-typedef uint13_t uint13;
-typedef uint14_t uint14;
-typedef uint15_t uint15;
-typedef uint16_t uint16;
-typedef uint17_t uint17;
-typedef uint18_t uint18;
-typedef uint19_t uint19;
-typedef uint20_t uint20;
-typedef uint21_t uint21;
-typedef uint22_t uint22;
-typedef uint23_t uint23;
-typedef uint24_t uint24;
-typedef uint25_t uint25;
-typedef uint26_t uint26;
-typedef uint27_t uint27;
-typedef uint28_t uint28;
-typedef uint29_t uint29;
-typedef uint30_t uint30;
-typedef uint31_t uint31;
-typedef uint32_t uint32;
-typedef uint_t<33> uint33;
-typedef uint64_t uint64;
-
-typedef varuint_t<unsigned> varuint;
-
-#endif

bsnes/emulator/interface.hpp

@@ -1,108 +0,0 @@
-#ifndef EMULATOR_INTERFACE_HPP
-#define EMULATOR_INTERFACE_HPP
-
-namespace Emulator {
-
-struct Interface {
-  struct Information {
-    string name;
-    unsigned width;
-    unsigned height;
-    bool overscan;
-    double aspectRatio;
-    bool resettable;
-  } information;
-
-  struct Media {
-    unsigned id;
-    string name;
-    string type;
-    string path;
-    string extension;
-  };
-
-  vector<Media> firmware;
-  vector<Media> media;
-
-  struct Memory {
-    unsigned id;
-    string name;
-  };
-  vector<Memory> memory;
-
-  struct Device {
-    unsigned id;
-    unsigned portmask;
-    string name;
-    struct Input {
-      unsigned id;
-      unsigned type;  //0 = digital, 1 = analog
-      string name;
-      unsigned guid;
-    };
-    vector<Input> input;
-    vector<unsigned> order;
-  };
-
-  struct Port {
-    unsigned id;
-    string name;
-    vector<Device> device;
-  };
-  vector<Port> port;
-
-  struct Bind {
-    virtual void loadRequest(unsigned, const string&) {}
-    virtual void loadRequest(unsigned, const string&, const string&, const string&) {}
-    virtual uint32_t videoColor(unsigned, uint16_t, uint16_t, uint16_t) { return 0u; }
-    virtual void videoRefresh(const uint32_t*, unsigned, unsigned, unsigned) {}
-    virtual void audioSample(int16_t, int16_t) {}
-    virtual int16_t inputPoll(unsigned, unsigned, unsigned) { return 0; }
-    virtual unsigned dipSettings(const XML::Node&) { return 0; }
-    virtual string path(unsigned) { return ""; }
-  } *bind;
-
-  //callback bindings (provided by user interface)
-  void loadRequest(unsigned id, const string &path) { return bind->loadRequest(id, path); }
-  void loadRequest(unsigned id, const string &name, const string &type, const string &path) { return bind->loadRequest(id, name, type, path); }
-  uint32_t videoColor(unsigned source, uint16_t red, uint16_t green, uint16_t blue) { return bind->videoColor(source, red, green, blue); }
-  void videoRefresh(const uint32_t *data, unsigned pitch, unsigned width, unsigned height) { return bind->videoRefresh(data, pitch, width, height); }
-  void audioSample(int16_t lsample, int16_t rsample) { return bind->audioSample(lsample, rsample); }
-  int16_t inputPoll(unsigned port, unsigned device, unsigned input) { return bind->inputPoll(port, device, input); }
-  unsigned dipSettings(const XML::Node &node) { return bind->dipSettings(node); }
-  string path(unsigned group) { return bind->path(group); }
-
-  //information
-  virtual double videoFrequency() = 0;
-  virtual double audioFrequency() = 0;
-
-  //media interface
-  virtual bool loaded() { return false; }
-  virtual string sha256() { return ""; }
-  virtual unsigned group(unsigned id) { return 0u; }
-  virtual void load(unsigned id, const stream &memory, const string &markup = "") {}
-  virtual void save(unsigned id, const stream &memory) {}
-  virtual void unload() {}
-
-  //system interface
-  virtual void connect(unsigned port, unsigned device) {}
-  virtual void power() {}
-  virtual void reset() {}
-  virtual void run() {}
-
-  //state functions
-  virtual serializer serialize() = 0;
-  virtual bool unserialize(serializer&) = 0;
-
-  //cheat functions
-  virtual void cheatSet(const lstring& = lstring{}) {}
-
-  //utility functions
-  virtual void updatePalette() {}
-
-  Interface() : bind(nullptr) {}
-};
-
-}
-
-#endif

bsnes/fc/apu/envelope.cpp

@@ -1,39 +0,0 @@
-unsigned APU::Envelope::volume() const {
-  return use_speed_as_volume ? speed : decay_volume;
-}
-
-void APU::Envelope::clock() {
-  if(reload_decay) {
-    reload_decay = false;
-    decay_volume = 0x0f;
-    decay_counter = speed + 1;
-    return;
-  }
-
-  if(--decay_counter == 0) {
-    decay_counter = speed + 1;
-    if(decay_volume || loop_mode) decay_volume--;
-  }
-}
-
-void APU::Envelope::power() {
-}
-
-void APU::Envelope::reset() {
-  speed = 0;
-  use_speed_as_volume = 0;
-  loop_mode = 0;
-  reload_decay = 0;
-  decay_counter = 0;
-  decay_volume = 0;
-}
-
-void APU::Envelope::serialize(serializer &s) {
-  s.integer(speed);
-  s.integer(use_speed_as_volume);
-  s.integer(loop_mode);
-
-  s.integer(reload_decay);
-  s.integer(decay_counter);
-  s.integer(decay_volume);
-}

bsnes/fc/apu/noise.cpp

@@ -1,57 +0,0 @@
-void APU::Noise::clock_length() {
-  if(envelope.loop_mode == 0) {
-    if(length_counter > 0) length_counter--;
-  }
-}
-
-uint8 APU::Noise::clock() {
-  if(length_counter == 0) return 0;
-
-  uint8 result = (lfsr & 1) ? envelope.volume() : 0;
-
-  if(--period_counter == 0) {
-    unsigned feedback;
-
-    if(short_mode) {
-      feedback = ((lfsr >> 0) & 1) ^ ((lfsr >> 6) & 1);
-    } else {
-      feedback = ((lfsr >> 0) & 1) ^ ((lfsr >> 1) & 1);
-    }
-
-    lfsr = (lfsr >> 1) | (feedback << 14);
-    period_counter = apu.ntsc_noise_period_table[period];
-  }
-
-  return result;
-}
-
-void APU::Noise::power() {
-}
-
-void APU::Noise::reset() {
-  length_counter = 0;
-
-  envelope.speed = 0;
-  envelope.use_speed_as_volume = 0;
-  envelope.loop_mode = 0;
-  envelope.reload_decay = 0;
-  envelope.decay_counter = 0;
-  envelope.decay_volume = 0;
-
-  period = 0;
-  period_counter = 1;
-  short_mode = 0;
-  lfsr = 1;
-}
-
-void APU::Noise::serialize(serializer &s) {
-  s.integer(length_counter);
-
-  envelope.serialize(s);
-
-  s.integer(period);
-  s.integer(period_counter);
-
-  s.integer(short_mode);
-  s.integer(lfsr);
-}

bsnes/fc/apu/serialization.cpp

@@ -1,28 +0,0 @@
-void APU::serialize(serializer &s) {
-  Thread::serialize(s);
-
-  filter.serialize(s);
-
-  pulse[0].serialize(s);
-  pulse[1].serialize(s);
-  triangle.serialize(s);
-  dmc.serialize(s);
-  frame.serialize(s);
-
-  s.integer(enabled_channels);
-  s.integer(cartridge_sample);
-}
-
-void APU::Filter::serialize(serializer &s) {
-  s.integer(hipass_strong);
-  s.integer(hipass_weak);
-  s.integer(lopass);
-}
-
-void APU::FrameCounter::serialize(serializer &s) {
-  s.integer(irq_pending);
-
-  s.integer(mode);
-  s.integer(counter);
-  s.integer(divider);
-}

bsnes/fc/cartridge/board/board.cpp

@@ -1,167 +0,0 @@
-#include "bandai-fcg.cpp"
-#include "konami-vrc1.cpp"
-#include "konami-vrc2.cpp"
-#include "konami-vrc3.cpp"
-#include "konami-vrc4.cpp"
-#include "konami-vrc6.cpp"
-#include "konami-vrc7.cpp"
-#include "nes-axrom.cpp"
-#include "nes-bnrom.cpp"
-#include "nes-cnrom.cpp"
-#include "nes-exrom.cpp"
-#include "nes-fxrom.cpp"
-#include "nes-gxrom.cpp"
-#include "nes-hkrom.cpp"
-#include "nes-nrom.cpp"
-#include "nes-pxrom.cpp"
-#include "nes-sxrom.cpp"
-#include "nes-txrom.cpp"
-#include "nes-uxrom.cpp"
-#include "sunsoft-5b.cpp"
-
-uint8 Board::Memory::read(unsigned addr) const {
-  return data[mirror(addr, size)];
-}
-
-void Board::Memory::write(unsigned addr, uint8 byte) {
-  if(writable) data[mirror(addr, size)] = byte;
-}
-
-unsigned Board::mirror(unsigned addr, unsigned size) {
-  unsigned base = 0;
-  if(size) {
-    unsigned mask = 1 << 23;
-    while(addr >= size) {
-      while(!(addr & mask)) mask >>= 1;
-      addr -= mask;
-      if(size > mask) {
-        size -= mask;
-        base += mask;
-      }
-      mask >>= 1;
-    }
-    base += addr;
-  }
-  return base;
-}
-
-void Board::main() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::All) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    cartridge.clock += 12 * 4095;
-    tick();
-  }
-}
-
-void Board::tick() {
-  cartridge.clock += 12;
-  if(cartridge.clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(cpu.thread);
-}
-
-uint8 Board::chr_read(unsigned addr) {
-  if(chrram.size) return chrram.data[mirror(addr, chrram.size)];
-  if(chrrom.size) return chrrom.data[mirror(addr, chrrom.size)];
-  return 0u;
-}
-
-void Board::chr_write(unsigned addr, uint8 data) {
-  if(chrram.size) chrram.data[mirror(addr, chrram.size)] = data;
-}
-
-Board::Memory& Board::memory() {
-  return prgram;
-}
-
-void Board::power() {
-}
-
-void Board::reset() {
-}
-
-void Board::serialize(serializer &s) {
-  if(prgram.size) s.array(prgram.data, prgram.size);
-  if(chrram.size) s.array(chrram.data, chrram.size);
-}
-
-Board::Board(XML::Document &document, const stream &memory) {
-  auto &cartridge = document["cartridge"];
-
-  information.type = cartridge["board"]["type"].data;
-  information.battery = cartridge["prg"]["ram"]["nonvolatile"].data == "true";
-
-  prgrom.size = numeral(cartridge["prg"]["rom"]["size"].data);
-  prgram.size = numeral(cartridge["prg"]["ram"]["size"].data);
-  chrrom.size = numeral(cartridge["chr"]["rom"]["size"].data);
-  chrram.size = numeral(cartridge["chr"]["ram"]["size"].data);
-
-  if(prgrom.size) prgrom.data = new uint8[prgrom.size]();
-  if(prgram.size) prgram.data = new uint8[prgram.size]();
-  if(chrrom.size) chrrom.data = new uint8[chrrom.size]();
-  if(chrram.size) chrram.data = new uint8[chrram.size]();
-
-  if(prgrom.size) memory.read(prgrom.data, prgrom.size);
-  if(chrrom.size) memory.read(chrrom.data, chrrom.size);
-
-  prgram.writable = true;
-  chrram.writable = true;
-}
-
-Board::~Board() {
-}
-
-Board* Board::load(const string &markup, const stream &memory) {
-  XML::Document document(markup);
-  string type = document["cartridge"]["board"]["type"].data;
-
-  if(type == "BANDAI-FCG") return new BandaiFCG(document, memory);
-
-  if(type == "KONAMI-VRC-1") return new KonamiVRC1(document, memory);
-  if(type == "KONAMI-VRC-2") return new KonamiVRC2(document, memory);
-  if(type == "KONAMI-VRC-3") return new KonamiVRC3(document, memory);
-  if(type == "KONAMI-VRC-4") return new KonamiVRC4(document, memory);
-  if(type == "KONAMI-VRC-6") return new KonamiVRC6(document, memory);
-  if(type == "KONAMI-VRC-7") return new KonamiVRC7(document, memory);
-
-  if(type == "NES-AMROM"   ) return new NES_AxROM(document, memory);
-  if(type == "NES-ANROM"   ) return new NES_AxROM(document, memory);
-  if(type == "NES-AN1ROM"  ) return new NES_AxROM(document, memory);
-  if(type == "NES-AOROM"   ) return new NES_AxROM(document, memory);
-
-  if(type == "NES-BNROM"   ) return new NES_BNROM(document, memory);
-
-  if(type == "NES-CNROM"   ) return new NES_CNROM(document, memory);
-
-  if(type == "NES-EKROM"   ) return new NES_ExROM(document, memory);
-  if(type == "NES-ELROM"   ) return new NES_ExROM(document, memory);
-  if(type == "NES-ETROM"   ) return new NES_ExROM(document, memory);
-  if(type == "NES-EWROM"   ) return new NES_ExROM(document, memory);
-
-  if(type == "NES-FJROM"   ) return new NES_FxROM(document, memory);
-  if(type == "NES-FKROM"   ) return new NES_FxROM(document, memory);
-
-  if(type == "NES-GNROM"   ) return new NES_GxROM(document, memory);
-  if(type == "NES-MHROM"   ) return new NES_GxROM(document, memory);
-
-  if(type == "NES-HKROM"   ) return new NES_HKROM(document, memory);
-
-  if(type == "NES-NROM-128") return new NES_NROM(document, memory);
-  if(type == "NES-NROM-256") return new NES_NROM(document, memory);
-
-  if(type == "NES-PEEOROM" ) return new NES_PxROM(document, memory);
-  if(type == "NES-PNROM"   ) return new NES_PxROM(document, memory);
-
-  if(type == "NES-SNROM"   ) return new NES_SxROM(document, memory);
-  if(type == "NES-SXROM"   ) return new NES_SxROM(document, memory);
-
-  if(type == "NES-TLROM"   ) return new NES_TxROM(document, memory);
-
-  if(type == "NES-UNROM"   ) return new NES_UxROM(document, memory);
-  if(type == "NES-UOROM"   ) return new NES_UxROM(document, memory);
-
-  if(type == "SUNSOFT-5B"  ) return new Sunsoft5B(document, memory);
-
-  return nullptr;
-}

bsnes/fc/cartridge/cartridge.cpp

@@ -1,91 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-#include "chip/chip.cpp"
-#include "board/board.cpp"
-Cartridge cartridge;
-
-void Cartridge::Main() {
-  cartridge.main();
-}
-
-void Cartridge::main() {
-  board->main();
-}
-
-void Cartridge::load(const string &markup, const stream &memory) {
-  information.markup = markup;
-
-  board = Board::load(markup, memory);
-  if(board == nullptr) return;
-
-  interface->memory.append({ID::RAM, "save.ram"});
-
-  sha256_ctx sha;
-  uint8_t hash[32];
-  sha256_init(&sha);
-  sha256_chunk(&sha, board->prgrom.data, board->prgrom.size);
-  sha256_chunk(&sha, board->chrrom.data, board->chrrom.size);
-  sha256_final(&sha);
-  sha256_hash(&sha, hash);
-  string result;
-  for(auto &byte : hash) result.append(hex<2>(byte));
-  sha256 = result;
-
-  system.load();
-  loaded = true;
-}
-
-void Cartridge::unload() {
-  if(loaded == false) return;
-  loaded = false;
-}
-
-unsigned Cartridge::ram_size() {
-  return board->memory().size;
-}
-
-uint8* Cartridge::ram_data() {
-  return board->memory().data;
-}
-
-void Cartridge::power() {
-  board->power();
-}
-
-void Cartridge::reset() {
-  create(Cartridge::Main, 21477272);
-  board->reset();
-}
-
-Cartridge::Cartridge() {
-  loaded = false;
-}
-
-uint8 Cartridge::prg_read(unsigned addr) {
-  return board->prg_read(addr);
-}
-
-void Cartridge::prg_write(unsigned addr, uint8 data) {
-  return board->prg_write(addr, data);
-}
-
-uint8 Cartridge::chr_read(unsigned addr) {
-  return board->chr_read(addr);
-}
-
-void Cartridge::chr_write(unsigned addr, uint8 data) {
-  return board->chr_write(addr, data);
-}
-
-void Cartridge::scanline(unsigned y) {
-  return board->scanline(y);
-}
-
-void Cartridge::serialize(serializer &s) {
-  Thread::serialize(s);
-  return board->serialize(s);
-}
-
-}

bsnes/fc/cartridge/cartridge.hpp

@@ -1,41 +0,0 @@
-#include "chip/chip.hpp"
-#include "board/board.hpp"
-
-struct Cartridge : Thread, property<Cartridge> {
-  static void Main();
-  void main();
-
-  void load(const string &markup, const stream &memory);
-  void unload();
-
-  unsigned ram_size();
-  uint8* ram_data();
-
-  void power();
-  void reset();
-
-  readonly<bool> loaded;
-  readonly<string> sha256;
-
-  struct Information {
-    string markup;
-  } information;
-
-  void serialize(serializer&);
-  Cartridge();
-
-//privileged:
-  Board *board;
-
-  uint8 prg_read(unsigned addr);
-  void prg_write(unsigned addr, uint8 data);
-
-  uint8 chr_read(unsigned addr);
-  void chr_write(unsigned addr, uint8 data);
-
-  //scanline() is for debugging purposes only:
-  //boards must detect scanline edges on their own
-  void scanline(unsigned y);
-};
-
-extern Cartridge cartridge;

bsnes/fc/cartridge/chip/chip.hpp

@@ -1,7 +0,0 @@
-struct Board;
-
-struct Chip {
-  Board &board;
-  void tick();
-  Chip(Board &board);
-};

bsnes/fc/cheat/cheat.cpp

@@ -1,88 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-Cheat cheat;
-
-bool Cheat::decode(const string &code_, unsigned &addr, unsigned &data, unsigned &comp) {
-  static bool initialize = false;
-  static uint8 mapProActionReplay[256], mapGameGenie[256];
-
-  if(initialize == false) {
-    initialize = true;
-
-    for(auto &n : mapProActionReplay) n = ~0;
-    mapProActionReplay['0'] =  0; mapProActionReplay['1'] =  1; mapProActionReplay['2'] =  2; mapProActionReplay['3'] =  3;
-    mapProActionReplay['4'] =  4; mapProActionReplay['5'] =  5; mapProActionReplay['6'] =  6; mapProActionReplay['7'] =  7;
-    mapProActionReplay['8'] =  8; mapProActionReplay['9'] =  9; mapProActionReplay['A'] = 10; mapProActionReplay['B'] = 11;
-    mapProActionReplay['C'] = 12; mapProActionReplay['D'] = 13; mapProActionReplay['E'] = 14; mapProActionReplay['F'] = 15;
-
-    for(auto &n : mapGameGenie) n = ~0;
-    mapGameGenie['A'] =  0; mapGameGenie['P'] =  1; mapGameGenie['Z'] =  2; mapGameGenie['L'] =  3;
-    mapGameGenie['G'] =  4; mapGameGenie['I'] =  5; mapGameGenie['T'] =  6; mapGameGenie['Y'] =  7;
-    mapGameGenie['E'] =  8; mapGameGenie['O'] =  9; mapGameGenie['X'] = 10; mapGameGenie['U'] = 11;
-    mapGameGenie['K'] = 12; mapGameGenie['S'] = 13; mapGameGenie['V'] = 14; mapGameGenie['N'] = 15;
-  }
-
-  string code = code_;
-  code.upper();
-  unsigned length = code.length(), bits = 0;
-
-  if(code.wildcard("????:??")) {
-    code = { substr(code, 0, 4), substr(code, 5, 2) };
-    for(unsigned n = 0; n < 6; n++) if(mapProActionReplay[code[n]] > 15) return false;
-    bits = hex(code);
-    addr = (bits >> 8) & 0xffff;
-    data = (bits >> 0) & 0xff;
-    comp = ~0;
-    return true;
-  }
-
-  if(code.wildcard("????:??:??")) {
-    code = { substr(code, 0, 4), substr(code, 5, 2), substr(code, 8, 2) };
-    for(unsigned n = 0; n < 8; n++) if(mapProActionReplay[code[n]] > 15) return false;
-    bits = hex(code);
-    addr = (bits >> 16) & 0xffff;
-    data = (bits >>  8) & 0xff;
-    comp = (bits >>  0) & 0xff;
-    return true;
-  }
-
-  if(length == 6) {
-    for(unsigned n = 0; n < 6; n++) if(mapGameGenie[code[n]] > 15) return false;
-    for(unsigned n = 0; n < 6; n++) bits |= mapGameGenie[code[n]] << (20 - n * 4);
-    unsigned addrTable[] = { 10, 9, 8, 7, 2, 1, 0, 19, 14, 13, 12, 11, 6, 5, 4 };
-    unsigned dataTable[] = { 23, 18, 17, 16, 3, 22, 21, 20 };
-
-    addr = 0x8000, data = 0x00, comp = ~0;
-    for(unsigned n = 0; n < 15; n++) addr |= bits & (1 << addrTable[n]) ? 0x4000 >> n : 0;
-    for(unsigned n = 0; n <  8; n++) data |= bits & (1 << dataTable[n]) ?   0x80 >> n : 0;
-    return true;
-  }
-
-  if(length == 8) {
-    for(unsigned n = 0; n < 8; n++) if(mapGameGenie[code[n]] > 15) return false;
-    for(unsigned n = 0; n < 8; n++) bits |= mapGameGenie[code[n]] << (28 - n * 4);
-    unsigned addrTable[] = { 18, 17, 16, 15, 10, 9, 8, 27, 22, 21, 20, 19, 14, 13, 12 };
-    unsigned dataTable[] = { 31, 26, 25, 24, 3, 30, 29, 28 };
-    unsigned compTable[] = { 7, 2, 1, 0, 11, 6, 5,4 };
-
-    addr = 0x8000, data = 0x00, comp = 0x00;
-    for(unsigned n = 0; n < 15; n++) addr |= bits & (1 << addrTable[n]) ? 0x4000 >> n : 0;
-    for(unsigned n = 0; n <  8; n++) data |= bits & (1 << dataTable[n]) ?   0x80 >> n : 0;
-    for(unsigned n = 0; n <  8; n++) comp |= bits & (1 << compTable[n]) ?   0x80 >> n : 0;
-    return true;
-  }
-
-  return false;
-}
-
-void Cheat::synchronize() {
-  for(auto &n : override) n = false;
-
-  for(unsigned n = 0; n < size(); n++) {
-    override[operator[](n).addr] = true;
-  }
-}
-
-}

bsnes/fc/cheat/cheat.hpp

@@ -1,14 +0,0 @@
-struct CheatCode {
-  unsigned addr;
-  unsigned data;
-  unsigned comp;
-};
-
-struct Cheat : public linear_vector<CheatCode> {
-  static bool decode(const string &code, unsigned &addr, unsigned &data, unsigned &comp);
-
-  void synchronize();
-  bool override[65536];
-};
-
-extern Cheat cheat;

bsnes/fc/cpu/cpu.cpp

@@ -1,110 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-#include "timing.cpp"
-#include "serialization.cpp"
-CPU cpu;
-
-void CPU::Enter() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::All) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    cpu.main();
-  }
-}
-
-void CPU::main() {
-  if(status.interrupt_pending) {
-    interrupt();
-    return;
-  }
-
-  exec();
-}
-
-void CPU::add_clocks(unsigned clocks) {
-  apu.clock -= clocks;
-  if(apu.clock < 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(apu.thread);
-
-  ppu.clock -= clocks;
-  if(ppu.clock < 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(ppu.thread);
-
-  cartridge.clock -= clocks;
-  if(cartridge.clock < 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(cartridge.thread);
-}
-
-void CPU::power() {
-  R6502::power();
-
-  for(unsigned addr = 0; addr < 0x0800; addr++) ram[addr] = 0xff;
-  ram[0x0008] = 0xf7;
-  ram[0x0009] = 0xef;
-  ram[0x000a] = 0xdf;
-  ram[0x000f] = 0xbf;
-}
-
-void CPU::reset() {
-  R6502::reset();
-  create(CPU::Enter, 21477272);
-
-  regs.pc  = bus.read(0xfffc) << 0;
-  regs.pc |= bus.read(0xfffd) << 8;
-
-  status.interrupt_pending = false;
-  status.nmi_pending = false;
-  status.nmi_line = 0;
-  status.irq_line = 0;
-  status.irq_apu_line = 0;
-
-  status.rdy_line = 1;
-  status.rdy_addr = { false, 0x0000 };
-
-  status.oam_dma_pending = false;
-  status.oam_dma_page = 0x00;
-
-  status.controller_latch = false;
-  status.controller_port0 = 0;
-  status.controller_port1 = 0;
-}
-
-uint8 CPU::debugger_read(uint16 addr) {
-  return bus.read(addr);
-}
-
-uint8 CPU::ram_read(uint16 addr) {
-  return ram[addr & 0x07ff];
-}
-
-void CPU::ram_write(uint16 addr, uint8 data) {
-  ram[addr & 0x07ff] = data;
-}
-
-uint8 CPU::read(uint16 addr) {
-  if(addr == 0x4016) {
-    return (mdr() & 0xc0) | input.data(0);
-  }
-
-  if(addr == 0x4017) {
-    return (mdr() & 0xc0) | input.data(1);
-  }
-
-  return apu.read(addr);
-}
-
-void CPU::write(uint16 addr, uint8 data) {
-  if(addr == 0x4014) {
-    status.oam_dma_page = data;
-    status.oam_dma_pending = true;
-  }
-
-  if(addr == 0x4016) {
-    input.latch(data & 0x01);
-  }
-
-  return apu.write(addr, data);
-}
-
-}

bsnes/fc/cpu/cpu.hpp

@@ -1,55 +0,0 @@
-struct CPU : Processor::R6502, Thread {
-  uint8 ram[0x0800];
-
-  struct Status {
-    bool interrupt_pending;
-    bool nmi_pending;
-    bool nmi_line;
-    bool irq_line;
-    bool irq_apu_line;
-
-    bool rdy_line;
-    optional<uint16> rdy_addr;
-
-    bool oam_dma_pending;
-    uint8 oam_dma_page;
-
-    bool controller_latch;
-    unsigned controller_port0;
-    unsigned controller_port1;
-  } status;
-
-  static void Enter();
-  void main();
-  void add_clocks(unsigned clocks);
-
-  void power();
-  void reset();
-
-  uint8 debugger_read(uint16 addr);
-
-  uint8 ram_read(uint16 addr);
-  void ram_write(uint16 addr, uint8 data);
-
-  uint8 read(uint16 addr);
-  void write(uint16 addr, uint8 data);
-
-  void serialize(serializer&);
-
-  //timing.cpp
-  uint8 op_read(uint16 addr);
-  void op_write(uint16 addr, uint8 data);
-  void last_cycle();
-  void nmi(uint16 &vector);
-
-  void oam_dma();
-
-  void set_nmi_line(bool);
-  void set_irq_line(bool);
-  void set_irq_apu_line(bool);
-
-  void set_rdy_line(bool);
-  void set_rdy_addr(optional<uint16>);
-};
-
-extern CPU cpu;

bsnes/fc/cpu/serialization.cpp

@@ -1,23 +0,0 @@
-void CPU::serialize(serializer &s) {
-  R6502::serialize(s);
-  Thread::serialize(s);
-
-  s.array(ram);
-
-  s.integer(status.interrupt_pending);
-  s.integer(status.nmi_pending);
-  s.integer(status.nmi_line);
-  s.integer(status.irq_line);
-  s.integer(status.irq_apu_line);
-
-  s.integer(status.rdy_line);
-  s.integer(status.rdy_addr.valid);
-  s.integer(status.rdy_addr.value);
-
-  s.integer(status.oam_dma_pending);
-  s.integer(status.oam_dma_page);
-
-  s.integer(status.controller_latch);
-  s.integer(status.controller_port0);
-  s.integer(status.controller_port1);
-}

bsnes/fc/cpu/timing.cpp

@@ -1,63 +0,0 @@
-uint8 CPU::op_read(uint16 addr) {
-  if(status.oam_dma_pending) {
-    status.oam_dma_pending = false;
-    op_read(addr);
-    oam_dma();
-  }
-
-  while(status.rdy_line == 0) {
-    regs.mdr = bus.read(status.rdy_addr ? status.rdy_addr() : addr);
-    add_clocks(12);
-  }
-
-  regs.mdr = bus.read(addr);
-  add_clocks(12);
-  return regs.mdr;
-}
-
-void CPU::op_write(uint16 addr, uint8 data) {
-  bus.write(addr, regs.mdr = data);
-  add_clocks(12);
-}
-
-void CPU::last_cycle() {
-  status.interrupt_pending = ((status.irq_line | status.irq_apu_line) & ~regs.p.i) | status.nmi_pending;
-}
-
-void CPU::nmi(uint16 &vector) {
-  if(status.nmi_pending) {
-    status.nmi_pending = false;
-    vector = 0xfffa;
-  }
-}
-
-void CPU::oam_dma() {
-  for(unsigned n = 0; n < 256; n++) {
-    uint8 data = op_read((status.oam_dma_page << 8) + n);
-    op_write(0x2004, data);
-  }
-}
-
-void CPU::set_nmi_line(bool line) {
-  //edge-sensitive (0->1)
-  if(!status.nmi_line && line) status.nmi_pending = true;
-  status.nmi_line = line;
-}
-
-void CPU::set_irq_line(bool line) {
-  //level-sensitive
-  status.irq_line = line;
-}
-
-void CPU::set_irq_apu_line(bool line) {
-  //level-sensitive
-  status.irq_apu_line = line;
-}
-
-void CPU::set_rdy_line(bool line) {
-  status.rdy_line = line;
-}
-
-void CPU::set_rdy_addr(optional<uint16> addr) {
-  status.rdy_addr = addr;
-}

bsnes/fc/input/input.hpp

@@ -1,25 +0,0 @@
-struct Input {
-  enum class Device : unsigned {
-    None,
-    Joypad,
-  };
-
-  void latch(bool data);
-  bool data(bool port);
-  void connect(bool port, Device device);
-
-  void power();
-  void reset();
-
-  void serialize(serializer &s);
-
-private:
-  Device port1;
-  Device port2;
-
-  bool latchdata;
-  unsigned counter1;
-  unsigned counter2;
-};
-
-extern Input input;

bsnes/fc/input/serialization.cpp

@@ -1,8 +0,0 @@
-void Input::serialize(serializer &s) {
-  s.integer((unsigned&)port1);
-  s.integer((unsigned&)port2);
-
-  s.integer(latchdata);
-  s.integer(counter1);
-  s.integer(counter2);
-}

bsnes/fc/interface/interface.cpp

@@ -1,121 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-Interface *interface = nullptr;
-
-double Interface::videoFrequency() {
-  return 21477272.0 / (262.0 * 1364.0 - 4.0);
-}
-
-double Interface::audioFrequency() {
-  return 21477272.0 / 12.0;
-}
-
-bool Interface::loaded() {
-  return cartridge.loaded();
-}
-
-string Interface::sha256() {
-  return cartridge.sha256();
-}
-
-void Interface::load(unsigned id, const stream &stream, const string &markup) {
-  if(id == ID::ROM) {
-    cartridge.load(markup, stream);
-    system.power();
-    input.connect(0, Input::Device::Joypad);
-    input.connect(1, Input::Device::Joypad);
-  }
-
-  if(id == ID::RAM) {
-    stream.read(cartridge.ram_data(), min(stream.size(), cartridge.ram_size()));
-  }
-}
-
-void Interface::save(unsigned id, const stream &stream) {
-  if(id == ID::RAM) {
-    stream.write(cartridge.ram_data(), cartridge.ram_size());
-  }
-}
-
-void Interface::unload() {
-  cartridge.unload();
-}
-
-void Interface::power() {
-  system.power();
-}
-
-void Interface::reset() {
-  system.reset();
-}
-
-void Interface::run() {
-  system.run();
-}
-
-serializer Interface::serialize() {
-  system.runtosave();
-  return system.serialize();
-}
-
-bool Interface::unserialize(serializer &s) {
-  return system.unserialize(s);
-}
-
-void Interface::cheatSet(const lstring &list) {
-  cheat.reset();
-  for(auto &code : list) {
-    lstring codelist = code.split("+");
-    for(auto &part : codelist) {
-      unsigned addr, data, comp;
-      if(Cheat::decode(part, addr, data, comp)) cheat.append({addr, data, comp});
-    }
-  }
-  cheat.synchronize();
-}
-
-void Interface::updatePalette() {
-  video.generate_palette();
-}
-
-Interface::Interface() {
-  interface = this;
-
-  information.name        = "Famicom";
-  information.width       = 256;
-  information.height      = 240;
-  information.overscan    = true;
-  information.aspectRatio = 8.0 / 7.0;
-  information.resettable  = true;
-
-  media.append({ID::ROM, "Famicom", "sys", "program.rom", "fc"});
-
-  {
-    Device device{0, ID::Port1 | ID::Port2, "Controller"};
-    device.input.append({0, 0, "A"     });
-    device.input.append({1, 0, "B"     });
-    device.input.append({2, 0, "Select"});
-    device.input.append({3, 0, "Start" });
-    device.input.append({4, 0, "Up"    });
-    device.input.append({5, 0, "Down"  });
-    device.input.append({6, 0, "Left"  });
-    device.input.append({7, 0, "Right" });
-    device.order = {4, 5, 6, 7, 1, 0, 2, 3};
-    this->device.append(device);
-  }
-
-  port.append({0, "Port 1"});
-  port.append({1, "Port 2"});
-
-  for(auto &device : this->device) {
-    for(auto &port : this->port) {
-      if(device.portmask & (1 << port.id)) {
-        port.device.append(device);
-      }
-    }
-  }
-}
-
-}

bsnes/fc/interface/interface.hpp

@@ -1,48 +0,0 @@
-#ifndef FC_HPP
-namespace Famicom {
-#endif
-
-struct ID {
-  enum : unsigned {
-    ROM,
-    RAM,
-  };
-
-  enum : unsigned {
-    Port1 = 1,
-    Port2 = 2,
-  };
-};
-
-struct Interface : Emulator::Interface {
-  double videoFrequency();
-  double audioFrequency();
-
-  bool loaded();
-  string sha256();
-  void load(unsigned id, const stream &stream, const string &markup = "");
-  void save(unsigned id, const stream &stream);
-  void unload();
-
-  void power();
-  void reset();
-  void run();
-
-  serializer serialize();
-  bool unserialize(serializer&);
-
-  void cheatSet(const lstring&);
-
-  void updatePalette();
-
-  Interface();
-
-private:
-  vector<Device> device;
-};
-
-extern Interface *interface;
-
-#ifndef FC_HPP
-}
-#endif

bsnes/fc/memory/memory.cpp

@@ -1,41 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-Bus bus;
-
-//$0000-07ff = RAM (2KB)
-//$0800-1fff = RAM (mirror)
-//$2000-2007 = PPU
-//$2008-3fff = PPU (mirror)
-//$4000-4017 = APU + I/O
-//$4018-ffff = Cartridge
-
-uint8 Bus::read(uint16 addr) {
-  uint8 data = cartridge.prg_read(addr);
-       if(addr <= 0x1fff) data = cpu.ram_read(addr);
-  else if(addr <= 0x3fff) data = ppu.read(addr);
-  else if(addr <= 0x4017) data = cpu.read(addr);
-
-  if(cheat.override[addr]) {
-    for(unsigned n = 0; n < cheat.size(); n++) {
-      if(cheat[n].addr == addr) {
-        if(cheat[n].comp > 255 || cheat[n].comp == data) {
-          data = cheat[n].data;
-          break;
-        }
-      }
-    }
-  }
-
-  return data;
-}
-
-void Bus::write(uint16 addr, uint8 data) {
-  cartridge.prg_write(addr, data);
-  if(addr <= 0x1fff) return cpu.ram_write(addr, data);
-  if(addr <= 0x3fff) return ppu.write(addr, data);
-  if(addr <= 0x4017) return cpu.write(addr, data);
-}
-
-}

bsnes/fc/ppu/ppu.cpp

@@ -1,487 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-#include "serialization.cpp"
-PPU ppu;
-
-void PPU::Main() {
-  ppu.main();
-}
-
-void PPU::main() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::PPU) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    raster_scanline();
-  }
-}
-
-void PPU::tick() {
-  if(status.ly == 240 && status.lx == 340) status.nmi_hold = 1;
-  if(status.ly == 241 && status.lx ==   0) status.nmi_flag = status.nmi_hold;
-  if(status.ly == 241 && status.lx ==   2) cpu.set_nmi_line(status.nmi_enable && status.nmi_flag);
-
-  if(status.ly == 260 && status.lx == 340) status.sprite_zero_hit = 0, status.sprite_overflow = 0;
-
-  if(status.ly == 260 && status.lx == 340) status.nmi_hold = 0;
-  if(status.ly == 261 && status.lx ==   0) status.nmi_flag = status.nmi_hold;
-  if(status.ly == 261 && status.lx ==   2) cpu.set_nmi_line(status.nmi_enable && status.nmi_flag);
-
-  clock += 4;
-  if(clock >= 0) co_switch(cpu.thread);
-
-  status.lx++;
-}
-
-void PPU::scanline() {
-  status.lx = 0;
-  if(++status.ly == 262) {
-    status.ly = 0;
-    frame();
-  }
-  cartridge.scanline(status.ly);
-}
-
-void PPU::frame() {
-  status.field ^= 1;
-  scheduler.exit(Scheduler::ExitReason::FrameEvent);
-}
-
-void PPU::power() {
-}
-
-void PPU::reset() {
-  create(PPU::Main, 21477272);
-
-  status.mdr = 0x00;
-  status.field = 0;
-  status.ly = 0;
-  status.bus_data = 0x00;
-  status.address_latch = 0;
-
-  status.vaddr = 0x0000;
-  status.taddr = 0x0000;
-  status.xaddr = 0x00;
-
-  status.nmi_hold = 0;
-  status.nmi_flag = 0;
-
-  //$2000
-  status.nmi_enable = false;
-  status.master_select = 0;
-  status.sprite_size = 0;
-  status.bg_addr = 0x0000;
-  status.sprite_addr = 0x0000;
-  status.vram_increment = 1;
-
-  //$2001
-  status.emphasis = 0;
-  status.sprite_enable = false;
-  status.bg_enable = false;
-  status.sprite_edge_enable = false;
-  status.bg_edge_enable = false;
-  status.grayscale = false;
-
-  //$2002
-  status.sprite_zero_hit = false;
-  status.sprite_overflow = false;
-
-  //$2003
-  status.oam_addr = 0x00;
-
-  for(auto &n : buffer) n = 0;
-  for(auto &n : ciram ) n = 0;
-  for(auto &n : cgram ) n = 0;
-  for(auto &n : oam   ) n = 0;
-}
-
-uint8 PPU::read(uint16 addr) {
-  uint8 result = 0x00;
-
-  switch(addr & 7) {
-  case 2:  //PPUSTATUS
-    result |= status.nmi_flag << 7;
-    result |= status.sprite_zero_hit << 6;
-    result |= status.sprite_overflow << 5;
-    result |= status.mdr & 0x1f;
-    status.address_latch = 0;
-    status.nmi_hold = 0;
-    cpu.set_nmi_line(status.nmi_flag = 0);
-    break;
-  case 4:  //OAMDATA
-    result = oam[status.oam_addr];
-    if((status.oam_addr & 3) == 3) result &= 0xe3;
-    break;
-  case 7:  //PPUDATA
-    if(raster_enable() && (status.ly <= 240 || status.ly == 261)) return 0x00;
-
-    addr = status.vaddr & 0x3fff;
-    if(addr <= 0x1fff) {
-      result = status.bus_data;
-      status.bus_data = cartridge.chr_read(addr);
-    } else if(addr <= 0x3eff) {
-      result = status.bus_data;
-      status.bus_data = cartridge.chr_read(addr);
-    } else if(addr <= 0x3fff) {
-      result = cgram_read(addr);
-      status.bus_data = cartridge.chr_read(addr);
-    }
-    status.vaddr += status.vram_increment;
-    break;
-  }
-
-  return result;
-}
-
-void PPU::write(uint16 addr, uint8 data) {
-  status.mdr = data;
-
-  switch(addr & 7) {
-  case 0:  //PPUCTRL
-    status.nmi_enable = data & 0x80;
-    status.master_select = data & 0x40;
-    status.sprite_size = data & 0x20;
-    status.bg_addr = (data & 0x10) ? 0x1000 : 0x0000;
-    status.sprite_addr = (data & 0x08) ? 0x1000 : 0x0000;
-    status.vram_increment = (data & 0x04) ? 32 : 1;
-    status.taddr = (status.taddr & 0x73ff) | ((data & 0x03) << 10);
-    cpu.set_nmi_line(status.nmi_enable && status.nmi_hold && status.nmi_flag);
-    return;
-  case 1:  //PPUMASK
-    status.emphasis = data >> 5;
-    status.sprite_enable = data & 0x10;
-    status.bg_enable = data & 0x08;
-    status.sprite_edge_enable = data & 0x04;
-    status.bg_edge_enable = data & 0x02;
-    status.grayscale = data & 0x01;
-    return;
-  case 2:  //PPUSTATUS
-    return;
-  case 3:  //OAMADDR
-    status.oam_addr = data;
-    return;
-  case 4:  //OAMDATA
-    oam[status.oam_addr++] = data;
-    return;
-  case 5:  //PPUSCROLL
-    if(status.address_latch == 0) {
-      status.xaddr = data & 0x07;
-      status.taddr = (status.taddr & 0x7fe0) | (data >> 3);
-    } else {
-      status.taddr = (status.taddr & 0x0c1f) | ((data & 0x07) << 12) | ((data >> 3) << 5);
-    }
-    status.address_latch ^= 1;
-    return;
-  case 6:  //PPUADDR
-    if(status.address_latch == 0) {
-      status.taddr = (status.taddr & 0x00ff) | ((data & 0x3f) << 8);
-    } else {
-      status.taddr = (status.taddr & 0x7f00) | data;
-      status.vaddr = status.taddr;
-    }
-    status.address_latch ^= 1;
-    return;
-  case 7:  //PPUDATA
-    if(raster_enable() && (status.ly <= 240 || status.ly == 261)) return;
-
-    addr = status.vaddr & 0x3fff;
-    if(addr <= 0x1fff) {
-      cartridge.chr_write(addr, data);
-    } else if(addr <= 0x3eff) {
-      cartridge.chr_write(addr, data);
-    } else if(addr <= 0x3fff) {
-      cgram_write(addr, data);
-    }
-    status.vaddr += status.vram_increment;
-    return;
-  }
-}
-
-uint8 PPU::ciram_read(uint16 addr) {
-  return ciram[addr & 0x07ff];
-}
-
-void PPU::ciram_write(uint16 addr, uint8 data) {
-  ciram[addr & 0x07ff] = data;
-}
-
-uint8 PPU::cgram_read(uint16 addr) {
-  if((addr & 0x13) == 0x10) addr &= ~0x10;
-  uint8 data = cgram[addr & 0x1f];
-  if(status.grayscale) data &= 0x30;
-  return data;
-}
-
-void PPU::cgram_write(uint16 addr, uint8 data) {
-  if((addr & 0x13) == 0x10) addr &= ~0x10;
-  cgram[addr & 0x1f] = data;
-}
-
-//
-
-//vaddr = 0yyy VHYY  YYYX XXXX
-//yyy = fine Yscroll (y:d0-d2)
-//V = V nametable (y:d8)
-//H = H nametable (x:d8)
-//YYYYY = Y nametable (y:d3-d7)
-//XXXXX = X nametable (x:d3-d7)
-
-bool PPU::raster_enable() const {
-  return (status.bg_enable || status.sprite_enable);
-}
-
-unsigned PPU::nametable_addr() const {
-  return 0x2000 + (status.vaddr & 0x0c00);
-}
-
-unsigned PPU::scrollx() const {
-  return ((status.vaddr & 0x1f) << 3) | status.xaddr;
-}
-
-unsigned PPU::scrolly() const {
-  return (((status.vaddr >> 5) & 0x1f) << 3) | ((status.vaddr >> 12) & 7);
-}
-
-unsigned PPU::sprite_height() const {
-  return status.sprite_size == 0 ? 8 : 16;
-}
-
-//
-
-uint8 PPU::chr_load(uint16 addr) {
-  if(raster_enable() == false) return 0x00;
-  return cartridge.chr_read(addr);
-}
-
-//
-
-void PPU::scrollx_increment() {
-  if(raster_enable() == false) return;
-  status.vaddr = (status.vaddr & 0x7fe0) | ((status.vaddr + 0x0001) & 0x001f);
-  if((status.vaddr & 0x001f) == 0x0000) {
-    status.vaddr ^= 0x0400;
-  }
-}
-
-void PPU::scrolly_increment() {
-  if(raster_enable() == false) return;
-  status.vaddr = (status.vaddr & 0x0fff) | ((status.vaddr + 0x1000) & 0x7000);
-  if((status.vaddr & 0x7000) == 0x0000) {
-    status.vaddr = (status.vaddr & 0x7c1f) | ((status.vaddr + 0x0020) & 0x03e0);
-    if((status.vaddr & 0x03e0) == 0x03c0) {  //0x03c0 == 30 << 5; 30 * 8 = 240
-      status.vaddr &= 0x7c1f;
-      status.vaddr ^= 0x0800;
-    }
-  }
-}
-
-//
-
-void PPU::raster_pixel() {
-  uint32 *output = buffer + status.ly * 256;
-
-  unsigned mask = 0x8000 >> (status.xaddr + (status.lx & 7));
-  unsigned palette = 0, object_palette = 0;
-  bool object_priority = 0;
-  palette |= (raster.tiledatalo & mask) ? 1 : 0;
-  palette |= (raster.tiledatahi & mask) ? 2 : 0;
-  if(palette) {
-    unsigned attr = raster.attribute;
-    if(mask >= 256) attr >>= 2;
-    palette |= (attr & 3) << 2;
-  }
-
-  if(status.bg_enable == false) palette = 0;
-  if(status.bg_edge_enable == false && status.lx < 8) palette = 0;
-
-  if(status.sprite_enable == true)
-  for(signed sprite = 7; sprite >= 0; sprite--) {
-    if(status.sprite_edge_enable == false && status.lx < 8) continue;
-    if(raster.oam[sprite].id == 64) continue;
-
-    unsigned spritex = status.lx - raster.oam[sprite].x;
-    if(spritex >= 8) continue;
-
-    if(raster.oam[sprite].attr & 0x40) spritex ^= 7;
-    unsigned mask = 0x80 >> spritex;
-    unsigned sprite_palette = 0;
-    sprite_palette |= (raster.oam[sprite].tiledatalo & mask) ? 1 : 0;
-    sprite_palette |= (raster.oam[sprite].tiledatahi & mask) ? 2 : 0;
-    if(sprite_palette == 0) continue;
-
-    if(raster.oam[sprite].id == 0 && palette && status.lx != 255) status.sprite_zero_hit = 1;
-    sprite_palette |= (raster.oam[sprite].attr & 3) << 2;
-
-    object_priority = raster.oam[sprite].attr & 0x20;
-    object_palette = 16 + sprite_palette;
-  }
-
-  if(object_palette) {
-    if(palette == 0 || object_priority == 0) palette = object_palette;
-  }
-
-  if(raster_enable() == false) palette = 0;
-  output[status.lx] = video.palette[(status.emphasis << 6) | cgram_read(palette)];
-}
-
-void PPU::raster_sprite() {
-  if(raster_enable() == false) return;
-
-  unsigned n = raster.oam_iterator++;
-  signed ly = (status.ly == 261 ? -1 : status.ly);
-  unsigned y = ly - oam[(n * 4) + 0];
-
-  if(y >= sprite_height()) return;
-  if(raster.oam_counter == 8) {
-    status.sprite_overflow = 1;
-    return;
-  }
-
-  raster.soam[raster.oam_counter].id   = n;
-  raster.soam[raster.oam_counter].y    = oam[(n * 4) + 0];
-  raster.soam[raster.oam_counter].tile = oam[(n * 4) + 1];
-  raster.soam[raster.oam_counter].attr = oam[(n * 4) + 2];
-  raster.soam[raster.oam_counter].x    = oam[(n * 4) + 3];
-  raster.oam_counter++;
-}
-
-void PPU::raster_scanline() {
-  if((status.ly >= 240 && status.ly <= 260)) {
-    for(unsigned x = 0; x < 341; x++) tick();
-    return scanline();
-  }
-
-  raster.oam_iterator = 0;
-  raster.oam_counter = 0;
-
-  for(unsigned n = 0; n < 8; n++) {
-    raster.soam[n].id   = 64;
-    raster.soam[n].y    = 0xff;
-    raster.soam[n].tile = 0xff;
-    raster.soam[n].attr = 0xff;
-    raster.soam[n].x    = 0xff;
-    raster.soam[n].tiledatalo = 0;
-    raster.soam[n].tiledatahi = 0;
-  }
-
-  for(unsigned tile = 0; tile < 32; tile++) {  //  0-255
-    unsigned nametable = chr_load(0x2000 | (status.vaddr & 0x0fff));
-    unsigned tileaddr = status.bg_addr + (nametable << 4) + (scrolly() & 7);
-    raster_pixel();
-    tick();
-
-    raster_pixel();
-    tick();
-
-    unsigned attribute = chr_load(0x23c0 | (status.vaddr & 0x0fc0) | ((scrolly() >> 5) << 3) | (scrollx() >> 5));
-    if(scrolly() & 16) attribute >>= 4;
-    if(scrollx() & 16) attribute >>= 2;
-    raster_pixel();
-    tick();
-
-    scrollx_increment();
-    if(tile == 31) scrolly_increment();
-    raster_pixel();
-    raster_sprite();
-    tick();
-
-    unsigned tiledatalo = chr_load(tileaddr + 0);
-    raster_pixel();
-    tick();
-
-    raster_pixel();
-    tick();
-
-    unsigned tiledatahi = chr_load(tileaddr + 8);
-    raster_pixel();
-    tick();
-
-    raster_pixel();
-    raster_sprite();
-    tick();
-
-    raster.nametable = (raster.nametable << 8) | nametable;
-    raster.attribute = (raster.attribute << 2) | (attribute & 3);
-    raster.tiledatalo = (raster.tiledatalo << 8) | tiledatalo;
-    raster.tiledatahi = (raster.tiledatahi << 8) | tiledatahi;
-  }
-
-  for(unsigned n = 0; n < 8; n++) raster.oam[n] = raster.soam[n];
-
-  for(unsigned sprite = 0; sprite < 8; sprite++) {  //256-319
-    unsigned nametable = chr_load(0x2000 | (status.vaddr & 0x0fff));
-    tick();
-
-    if(raster_enable() && sprite == 0) status.vaddr = (status.vaddr & 0x7be0) | (status.taddr & 0x041f);  //257
-    tick();
-
-    unsigned attribute = chr_load(0x23c0 | (status.vaddr & 0x0fc0) | ((scrolly() >> 5) << 3) | (scrollx() >> 5));
-    unsigned tileaddr = (sprite_height() == 8)
-    ? status.sprite_addr + raster.oam[sprite].tile * 16
-    : ((raster.oam[sprite].tile & ~1) * 16) + ((raster.oam[sprite].tile & 1) * 0x1000);
-    tick();
-    tick();
-
-    unsigned spritey = (status.ly - raster.oam[sprite].y) & (sprite_height() - 1);
-    if(raster.oam[sprite].attr & 0x80) spritey ^= (sprite_height() - 1);
-    tileaddr += spritey + (spritey & 8);
-
-    raster.oam[sprite].tiledatalo = chr_load(tileaddr + 0);
-    tick();
-    tick();
-
-    raster.oam[sprite].tiledatahi = chr_load(tileaddr + 8);
-    tick();
-    tick();
-
-    if(raster_enable() && sprite == 6 && status.ly == 261) status.vaddr = status.taddr;  //304
-  }
-
-  for(unsigned tile = 0; tile < 2; tile++) {  //320-335
-    unsigned nametable = chr_load(0x2000 | (status.vaddr & 0x0fff));
-    unsigned tileaddr = status.bg_addr + (nametable << 4) + (scrolly() & 7);
-    tick();
-    tick();
-
-    unsigned attribute = chr_load(0x23c0 | (status.vaddr & 0x0fc0) | ((scrolly() >> 5) << 3) | (scrollx() >> 5));
-    if(scrolly() & 16) attribute >>= 4;
-    if(scrollx() & 16) attribute >>= 2;
-    tick();
-
-    scrollx_increment();
-    tick();
-
-    unsigned tiledatalo = chr_load(tileaddr + 0);
-    tick();
-    tick();
-
-    unsigned tiledatahi = chr_load(tileaddr + 8);
-    tick();
-    tick();
-
-    raster.nametable = (raster.nametable << 8) | nametable;
-    raster.attribute = (raster.attribute << 2) | (attribute & 3);
-    raster.tiledatalo = (raster.tiledatalo << 8) | tiledatalo;
-    raster.tiledatahi = (raster.tiledatahi << 8) | tiledatahi;
-  }
-
-  //336-339
-  chr_load(0x2000 | (status.vaddr & 0x0fff));
-  tick();
-  bool skip = (raster_enable() && status.field == 1 && status.ly == 261);
-  tick();
-
-  chr_load(0x2000 | (status.vaddr & 0x0fff));
-  tick();
-  tick();
-
-  //340
-  if(skip == false) tick();
-
-  return scanline();
-}
-
-}

bsnes/fc/ppu/serialization.cpp

@@ -1,74 +0,0 @@
-void PPU::serialize(serializer &s) {
-  Thread::serialize(s);
-
-  s.integer(status.mdr);
-
-  s.integer(status.field);
-  s.integer(status.lx);
-  s.integer(status.ly);
-
-  s.integer(status.bus_data);
-
-  s.integer(status.address_latch);
-
-  s.integer(status.vaddr);
-  s.integer(status.taddr);
-  s.integer(status.xaddr);
-
-  s.integer(status.nmi_hold);
-  s.integer(status.nmi_flag);
-
-  s.integer(status.nmi_enable);
-  s.integer(status.master_select);
-  s.integer(status.sprite_size);
-  s.integer(status.bg_addr);
-  s.integer(status.sprite_addr);
-  s.integer(status.vram_increment);
-
-  s.integer(status.emphasis);
-  s.integer(status.sprite_enable);
-  s.integer(status.bg_enable);
-  s.integer(status.sprite_edge_enable);
-  s.integer(status.bg_edge_enable);
-  s.integer(status.grayscale);
-
-  s.integer(status.sprite_zero_hit);
-  s.integer(status.sprite_overflow);
-
-  s.integer(status.oam_addr);
-
-  s.integer(raster.nametable);
-  s.integer(raster.attribute);
-  s.integer(raster.tiledatalo);
-  s.integer(raster.tiledatahi);
-
-  s.integer(raster.oam_iterator);
-  s.integer(raster.oam_counter);
-
-  for(unsigned n = 0; n < 8; n++) {
-    s.integer(raster.oam[n].id);
-    s.integer(raster.oam[n].y);
-    s.integer(raster.oam[n].tile);
-    s.integer(raster.oam[n].attr);
-    s.integer(raster.oam[n].x);
-
-    s.integer(raster.oam[n].tiledatalo);
-    s.integer(raster.oam[n].tiledatahi);
-  }
-
-  for(unsigned n = 0; n < 8; n++) {
-    s.integer(raster.soam[n].id);
-    s.integer(raster.soam[n].y);
-    s.integer(raster.soam[n].tile);
-    s.integer(raster.soam[n].attr);
-    s.integer(raster.soam[n].x);
-
-    s.integer(raster.soam[n].tiledatalo);
-    s.integer(raster.soam[n].tiledatahi);
-  }
-
-  s.array(buffer);
-  s.array(ciram);
-  s.array(cgram);
-  s.array(oam);
-}

bsnes/fc/system/serialization.cpp

@@ -1,60 +0,0 @@
-serializer System::serialize() {
-  serializer s(serialize_size);
-
-  unsigned signature = 0x31545342, version = Info::SerializerVersion;
-  char hash[64], description[512];
-  memcpy(&hash, (const char*)cartridge.sha256(), 64);
-  memset(&description, 0, sizeof description);
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  serialize_all(s);
-  return s;
-}
-
-bool System::unserialize(serializer &s) {
-  unsigned signature, version;
-  char hash[64], description[512];
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  if(signature != 0x31545342) return false;
-  if(version != Info::SerializerVersion) return false;
-
-  power();
-  serialize_all(s);
-  return true;
-}
-
-void System::serialize(serializer &s) {
-}
-
-void System::serialize_all(serializer &s) {
-  system.serialize(s);
-  input.serialize(s);
-  cartridge.serialize(s);
-  cpu.serialize(s);
-  apu.serialize(s);
-  ppu.serialize(s);
-}
-
-void System::serialize_init() {
-  serializer s;
-
-  unsigned signature = 0, version = 0;
-  char hash[64], description[512];
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  serialize_all(s);
-  serialize_size = s.size();
-}

bsnes/fc/system/system.cpp

@@ -1,76 +0,0 @@
-#include <fc/fc.hpp>
-
-namespace Famicom {
-
-#include "serialization.cpp"
-System system;
-
-void System::run() {
-  scheduler.enter();
-  if(scheduler.exit_reason() == Scheduler::ExitReason::FrameEvent) {
-    interface->videoRefresh(ppu.buffer, 4 * 256, 256, 240);
-  }
-}
-
-void System::runtosave() {
-  scheduler.sync = Scheduler::SynchronizeMode::PPU;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::All;
-  scheduler.thread = cpu.thread;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::All;
-  scheduler.thread = apu.thread;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::All;
-  scheduler.thread = cartridge.thread;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::None;
-}
-
-void System::runthreadtosave() {
-  while(true) {
-    scheduler.enter();
-    if(scheduler.exit_reason() == Scheduler::ExitReason::SynchronizeEvent) break;
-    if(scheduler.exit_reason() == Scheduler::ExitReason::FrameEvent) {
-      interface->videoRefresh(ppu.buffer, 4 * 256, 256, 240);
-    }
-  }
-}
-
-void System::load() {
-  serialize_init();
-}
-
-void System::power() {
-  cartridge.power();
-  cpu.power();
-  apu.power();
-  ppu.power();
-  input.reset();
-  scheduler.power();
-  reset();
-}
-
-void System::reset() {
-  cartridge.reset();
-  cpu.reset();
-  apu.reset();
-  ppu.reset();
-  input.reset();
-  scheduler.reset();
-}
-
-void System::init() {
-  assert(interface != 0);
-  input.connect(0, Input::Device::Joypad);
-  input.connect(1, Input::Device::None);
-}
-
-void System::term() {
-}
-
-}

bsnes/fc/system/system.hpp

@@ -1,22 +0,0 @@
-struct System {
-  void run();
-  void runtosave();
-  void runthreadtosave();
-
-  void load();
-  void power();
-  void reset();
-
-  void init();
-  void term();
-
-  serializer serialize();
-  bool unserialize(serializer&);
-
-  void serialize(serializer&);
-  void serialize_all(serializer&);
-  void serialize_init();
-  unsigned serialize_size;
-};
-
-extern System system;

bsnes/fc/video/video.cpp

@@ -1,68 +0,0 @@
-#include <fc/fc.hpp>
-
-#define VIDEO_CPP
-namespace Famicom {
-
-Video video;
-
-void Video::generate_palette() {
-  for(unsigned n = 0; n < (1 << 9); n++) palette[n] = generate_color(n, 2.0, 0.0, 1.0, 1.0, 1.8);
-}
-
-Video::Video() {
-  palette = new unsigned[1 << 9];
-}
-
-Video::~Video() {
-  delete[] palette;
-}
-
-uint32_t Video::generate_color(
-  unsigned n, double saturation, double hue,
-  double contrast, double brightness, double gamma
-) {
-  signed color = (n & 0x0f), level = color < 0xe ? (n >> 4) & 3 : 1;
-
-  static const double black = 0.518, white = 1.962, attenuation = 0.746;
-  static const double levels[8] = {
-    0.350, 0.518, 0.962, 1.550,
-    1.094, 1.506, 1.962, 1.962,
-  };
-
-  double lo_and_hi[2] = {
-    levels[level + 4 * (color == 0x0)],
-    levels[level + 4 * (color <  0xd)],
-  };
-
-  double y = 0.0, i = 0.0, q = 0.0;
-  auto wave = [](signed p, signed color) { return (color + p + 8) % 12 < 6; };
-  for(signed p = 0; p < 12; p++) {
-    double spot = lo_and_hi[wave(p, color)];
-
-    if(((n & 0x040) && wave(p, 12))
-    || ((n & 0x080) && wave(p,  4))
-    || ((n & 0x100) && wave(p,  8))
-    ) spot *= attenuation;
-
-    double v = (spot - black) / (white - black);
-
-    v = (v - 0.5) * contrast + 0.5;
-    v *= brightness / 12.0;
-
-    y += v;
-    i += v * std::cos((3.141592653 / 6.0) * (p + hue));
-    q += v * std::sin((3.141592653 / 6.0) * (p + hue));
-  }
-
-  i *= saturation;
-  q *= saturation;
-
-  auto gammaAdjust = [=](double f) { return f < 0.0 ? 0.0 : std::pow(f, 2.2 / gamma); };
-  unsigned r = 65535.0 * gammaAdjust(y +  0.946882 * i +  0.623557 * q);
-  unsigned g = 65535.0 * gammaAdjust(y + -0.274788 * i + -0.635691 * q);
-  unsigned b = 65535.0 * gammaAdjust(y + -1.108545 * i +  1.709007 * q);
-
-  return interface->videoColor(n, uclamp<16>(r), uclamp<16>(g), uclamp<16>(b));
-}
-
-}

bsnes/fc/video/video.hpp

@@ -1,12 +0,0 @@
-struct Video {
-  unsigned *palette;
-  void generate_palette();
-
-  Video();
-  ~Video();
-
-private:
-  uint32_t generate_color(unsigned, double, double, double, double, double);
-};
-
-extern Video video;

bsnes/gb/apu/apu.cpp

@@ -1,107 +0,0 @@
-#include <gb/gb.hpp>
-
-#define APU_CPP
-namespace GameBoy {
-
-#include "square1/square1.cpp"
-#include "square2/square2.cpp"
-#include "wave/wave.cpp"
-#include "noise/noise.cpp"
-#include "master/master.cpp"
-#include "serialization.cpp"
-APU apu;
-
-void APU::Main() {
-  apu.main();
-}
-
-void APU::main() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::All) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    if(sequencer_base == 0) {  //512hz
-      if(sequencer_step == 0 || sequencer_step == 2 || sequencer_step == 4 || sequencer_step == 6) {  //256hz
-        square1.clock_length();
-        square2.clock_length();
-        wave.clock_length();
-        noise.clock_length();
-      }
-      if(sequencer_step == 2 || sequencer_step == 6) {  //128hz
-        square1.clock_sweep();
-      }
-      if(sequencer_step == 7) {  //64hz
-        square1.clock_envelope();
-        square2.clock_envelope();
-        noise.clock_envelope();
-      }
-      sequencer_step++;
-    }
-    sequencer_base++;
-
-    square1.run();
-    square2.run();
-    wave.run();
-    noise.run();
-    master.run();
-
-    interface->audioSample(master.left, master.right);
-
-    clock += cpu.frequency;
-    if(clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(scheduler.active_thread = cpu.thread);
-  }
-}
-
-void APU::power() {
-  create(Main, 4 * 1024 * 1024);
-  for(unsigned n = 0xff10; n <= 0xff3f; n++) bus.mmio[n] = this;
-
-  for(auto &n : mmio_data) n = 0x00;
-  sequencer_base = 0;
-  sequencer_step = 0;
-
-  square1.power();
-  square2.power();
-  wave.power();
-  noise.power();
-  master.power();
-}
-
-uint8 APU::mmio_read(uint16 addr) {
-  static const uint8 table[48] = {
-    0x80, 0x3f, 0x00, 0xff, 0xbf,                          //square1
-    0xff, 0x3f, 0x00, 0xff, 0xbf,                          //square2
-    0x7f, 0xff, 0x9f, 0xff, 0xbf,                          //wave
-    0xff, 0xff, 0x00, 0x00, 0xbf,                          //noise
-    0x00, 0x00, 0x70,                                      //master
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  //unmapped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,        //wave pattern
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,        //wave pattern
-  };
-
-  if(addr == 0xff26) {
-    uint8 data = master.enable << 7;
-    if(square1.enable) data |= 0x01;
-    if(square2.enable) data |= 0x02;
-    if(   wave.enable) data |= 0x04;
-    if(  noise.enable) data |= 0x08;
-    return data | table[addr - 0xff10];
-  }
-
-  if(addr >= 0xff10 && addr <= 0xff3f) return mmio_data[addr - 0xff10] | table[addr - 0xff10];
-  return 0xff;
-}
-
-void APU::mmio_write(uint16 addr, uint8 data) {
-  if(addr >= 0xff10 && addr <= 0xff3f) mmio_data[addr - 0xff10] = data;
-
-  if(addr >= 0xff10 && addr <= 0xff14) return square1.write        (addr - 0xff10, data);
-  if(addr >= 0xff15 && addr <= 0xff19) return square2.write        (addr - 0xff15, data);
-  if(addr >= 0xff1a && addr <= 0xff1e) return    wave.write        (addr - 0xff1a, data);
-  if(addr >= 0xff1f && addr <= 0xff23) return   noise.write        (addr - 0xff1f, data);
-  if(addr >= 0xff24 && addr <= 0xff26) return  master.write        (addr - 0xff24, data);
-  if(addr >= 0xff30 && addr <= 0xff3f) return    wave.write_pattern(addr - 0xff30, data);
-}
-
-}

bsnes/gb/apu/noise/noise.cpp

@@ -1,112 +0,0 @@
-#ifdef APU_CPP
-
-bool APU::Noise::dac_enable() {
-  return (envelope_volume || envelope_direction);
-}
-
-void APU::Noise::run() {
-  if(period && --period == 0) {
-    period = divisor << frequency;
-    if(frequency < 14) {
-      bool bit = (lfsr ^ (lfsr >> 1)) & 1;
-      lfsr = (lfsr >> 1) ^ (bit << (narrow_lfsr ? 6 : 14));
-    }
-  }
-
-  uint4 sample = (lfsr & 1) ? (uint4)0 : volume;
-  if(enable == false) sample = 0;
-
-  output = sample;
-}
-
-void APU::Noise::clock_length() {
-//if(counter && length) {
-//  if(--length == 0) enable = false;
-//}
-  if(enable && counter) {
-    if(++length == 0) enable = false;
-  }
-}
-
-void APU::Noise::clock_envelope() {
-  if(enable && envelope_frequency && --envelope_period == 0) {
-    envelope_period = envelope_frequency;
-    if(envelope_direction == 0 && volume >  0) volume--;
-    if(envelope_direction == 1 && volume < 15) volume++;
-  }
-}
-
-void APU::Noise::write(unsigned r, uint8 data) {
-  if(r == 1) {  //$ff20  NR41
-  //length = 64 - (data & 0x3f);
-    length = data & 0x3f;
-  }
-
-  if(r == 2) {  //$ff21  NR42
-    envelope_volume = data >> 4;
-    envelope_direction = data & 0x08;
-    envelope_frequency = data & 0x07;
-    if(dac_enable() == false) enable = false;
-  }
-
-  if(r == 3) {  //$ff22  NR43
-    frequency = data >> 4;
-    narrow_lfsr = data & 0x08;
-    divisor = (data & 0x07) << 4;
-    if(divisor == 0) divisor = 8;
-    period = divisor << frequency;
-  }
-
-  if(r == 4) {  //$ff34  NR44
-    bool initialize = data & 0x80;
-    counter = data & 0x40;
-
-    if(initialize) {
-      enable = dac_enable();
-      lfsr = ~0U;
-      envelope_period = envelope_frequency;
-      volume = envelope_volume;
-    //if(length == 0) length = 64;
-    }
-  }
-}
-
-void APU::Noise::power() {
-  enable = 0;
-
-  envelope_volume = 0;
-  envelope_direction = 0;
-  envelope_frequency = 0;
-  frequency = 0;
-  narrow_lfsr = 0;
-  divisor = 0;
-  counter = 0;
-
-  output = 0;
-  length = 0;
-  envelope_period = 0;
-  volume = 0;
-  period = 0;
-  lfsr = 0;
-}
-
-void APU::Noise::serialize(serializer &s) {
-  s.integer(enable);
-
-  s.integer(envelope_volume);
-  s.integer(envelope_direction);
-  s.integer(envelope_frequency);
-  s.integer(frequency);
-  s.integer(narrow_lfsr);
-  s.integer(divisor);
-  s.integer(counter);
-
-  s.integer(output);
-  s.integer(length);
-  s.integer(envelope_period);
-  s.integer(volume);
-  s.integer(period);
-  s.integer(lfsr);
-}
-
-#endif

bsnes/gb/apu/serialization.cpp

@@ -1,17 +0,0 @@
-#ifdef APU_CPP
-
-void APU::serialize(serializer &s) {
-  Thread::serialize(s);
-
-  s.array(mmio_data);
-  s.integer(sequencer_base);
-  s.integer(sequencer_step);
-
-  square1.serialize(s);
-  square2.serialize(s);
-  wave.serialize(s);
-  noise.serialize(s);
-  master.serialize(s);
-}
-
-#endif

bsnes/gb/apu/square1/square1.cpp

@@ -1,164 +0,0 @@
-#ifdef APU_CPP
-
-bool APU::Square1::dac_enable() {
-  return (envelope_volume || envelope_direction);
-}
-
-void APU::Square1::run() {
-  if(period && --period == 0) {
-    period = 4 * (2048 - frequency);
-    phase++;
-    switch(duty) {
-      case 0: duty_output = (phase == 6); break;  //______-_
-      case 1: duty_output = (phase >= 6); break;  //______--
-      case 2: duty_output = (phase >= 4); break;  //____----
-      case 3: duty_output = (phase <= 5); break;  //------__
-    }
-  }
-
-  uint4 sample = (duty_output ? volume : (uint4)0);
-  if(enable == false) sample = 0;
-
-  output = sample;
-}
-
-void APU::Square1::sweep(bool update) {
-  if(sweep_enable == false) return;
-
-  sweep_negate = sweep_direction;
-  unsigned delta = frequency_shadow >> sweep_shift;
-  signed freq = frequency_shadow + (sweep_negate ? -delta : delta);
-
-  if(freq > 2047) {
-    enable = false;
-  } else if(sweep_shift && update) {
-    frequency_shadow = freq;
-    frequency = freq & 2047;
-    period = 4 * (2048 - frequency);
-  }
-}
-
-void APU::Square1::clock_length() {
-//if(counter && length) {
-//  if(--length == 0) enable = false;
-//}
-
-  if(counter && enable) {
-    if(++length == 0) enable = false;
-  }
-}
-
-void APU::Square1::clock_sweep() {
-  if(enable && sweep_frequency && --sweep_period == 0) {
-    sweep_period = sweep_frequency;
-    sweep(1);
-    sweep(0);
-  }
-}
-
-void APU::Square1::clock_envelope() {
-  if(enable && envelope_frequency && --envelope_period == 0) {
-    envelope_period = envelope_frequency;
-    if(envelope_direction == 0 && volume >  0) volume--;
-    if(envelope_direction == 1 && volume < 15) volume++;
-  }
-}
-
-void APU::Square1::write(unsigned r, uint8 data) {
-  if(r == 0) {  //$ff10  NR10
-    if(sweep_negate && sweep_direction && !(data & 0x08)) enable = false;
-    sweep_frequency = (data >> 4) & 7;
-    sweep_direction = data & 0x08;
-    sweep_shift = data & 0x07;
-  }
-
-  if(r == 1) {  //$ff11  NR11
-    duty = data >> 6;
-  //length = 64 - (data & 0x3f);
-    length = data & 0x3f;
-  }
-
-  if(r == 2) {  //$ff12  NR12
-    envelope_volume = data >> 4;
-    envelope_direction = data & 0x08;
-    envelope_frequency = data & 0x07;
-    if(dac_enable() == false) enable = false;
-  }
-
-  if(r == 3) {  //$ff13  NR13
-    frequency = (frequency & 0x0700) | data;
-  }
-
-  if(r == 4) {  //$ff14  NR14
-    bool initialize = data & 0x80;
-    counter = data & 0x40;
-    frequency = ((data & 7) << 8) | (frequency & 0x00ff);
-
-    if(initialize) {
-      enable = dac_enable();
-      period = 4 * (2048 - frequency);
-      envelope_period = envelope_frequency;
-      volume = envelope_volume;
-      frequency_shadow = frequency;
-      sweep_period = sweep_frequency;
-      sweep_enable = sweep_period || sweep_shift;
-      sweep_negate = false;
-      if(sweep_shift) sweep(0);
-    //if(length == 0) length = 64;
-    }
-  }
-}
-
-void APU::Square1::power() {
-  enable = 0;
-
-  sweep_frequency = 0;
-  sweep_direction = 0;
-  sweep_shift = 0;
-  sweep_negate = 0;
-  duty = 0;
-  length = 0;
-  envelope_volume = 0;
-  envelope_direction = 0;
-  envelope_frequency = 0;
-  frequency = 0;
-  counter = 0;
-
-  output = 0;
-  duty_output = 0;
-  phase = 0;
-  period = 0;
-  envelope_period = 0;
-  sweep_period = 0;
-  frequency_shadow = 0;
-  sweep_enable = 0;
-  volume = 0;
-}
-
-void APU::Square1::serialize(serializer &s) {
-  s.integer(enable);
-
-  s.integer(sweep_frequency);
-  s.integer(sweep_direction);
-  s.integer(sweep_shift);
-  s.integer(sweep_negate);
-  s.integer(duty);
-  s.integer(length);
-  s.integer(envelope_volume);
-  s.integer(envelope_direction);
-  s.integer(envelope_frequency);
-  s.integer(frequency);
-  s.integer(counter);
-
-  s.integer(output);
-  s.integer(duty_output);
-  s.integer(phase);
-  s.integer(period);
-  s.integer(envelope_period);
-  s.integer(sweep_period);
-  s.integer(frequency_shadow);
-  s.integer(sweep_enable);
-  s.integer(volume);
-}
-
-#endif

bsnes/gb/apu/square2/square2.cpp

@@ -1,114 +0,0 @@
-#ifdef APU_CPP
-
-bool APU::Square2::dac_enable() {
-  return (envelope_volume || envelope_direction);
-}
-
-void APU::Square2::run() {
-  if(period && --period == 0) {
-    period = 4 * (2048 - frequency);
-    phase++;
-    switch(duty) {
-      case 0: duty_output = (phase == 6); break;  //______-_
-      case 1: duty_output = (phase >= 6); break;  //______--
-      case 2: duty_output = (phase >= 4); break;  //____----
-      case 3: duty_output = (phase <= 5); break;  //------__
-    }
-  }
-
-  uint4 sample = (duty_output ? volume : (uint4)0);
-  if(enable == false) sample = 0;
-
-  output = sample;
-}
-
-void APU::Square2::clock_length() {
-//if(counter && length) {
-//  if(--length == 0) enable = false;
-//}
-
-  if(counter && enable) {
-    if(++length == 0) enable = false;
-  }
-}
-
-void APU::Square2::clock_envelope() {
-  if(enable && envelope_frequency && --envelope_period == 0) {
-    envelope_period = envelope_frequency;
-    if(envelope_direction == 0 && volume >  0) volume--;
-    if(envelope_direction == 1 && volume < 15) volume++;
-  }
-}
-
-void APU::Square2::write(unsigned r, uint8 data) {
-  if(r == 1) {  //$ff16  NR21
-    duty = data >> 6;
-  //length = 64 - (data & 0x3f);
-    length = (data & 0x3f);
-  }
-
-  if(r == 2) {  //$ff17  NR22
-    envelope_volume = data >> 4;
-    envelope_direction = data & 0x08;
-    envelope_frequency = data & 0x07;
-    if(dac_enable() == false) enable = false;
-  }
-
-  if(r == 3) {  //$ff18  NR23
-    frequency = (frequency & 0x0700) | data;
-  }
-
-  if(r == 4) {  //$ff19  NR24
-    bool initialize = data & 0x80;
-    counter = data & 0x40;
-    frequency = ((data & 7) << 8) | (frequency & 0x00ff);
-
-    if(initialize) {
-      enable = dac_enable();
-      period = 4 * (2048 - frequency);
-      envelope_period = envelope_frequency;
-      volume = envelope_volume;
-    //if(length == 0) length = 64;
-    }
-  }
-}
-
-void APU::Square2::power() {
-  enable = 0;
-
-  duty = 0;
-  length = 0;
-  envelope_volume = 0;
-  envelope_direction = 0;
-  envelope_frequency = 0;
-  frequency = 0;
-  counter = 0;
-
-  output = 0;
-  duty_output = 0;
-  phase = 0;
-  period = 0;
-  envelope_period = 0;
-  volume = 0;
-}
-
-void APU::Square2::serialize(serializer &s) {
-  s.integer(enable);
-
-  s.integer(duty);
-  s.integer(length);
-  s.integer(envelope_volume);
-  s.integer(envelope_direction);
-  s.integer(envelope_frequency);
-  s.integer(frequency);
-  s.integer(counter);
-
-  s.integer(output);
-  s.integer(duty_output);
-  s.integer(phase);
-  s.integer(period);
-  s.integer(envelope_period);
-  s.integer(volume);
-}
-
-#endif

bsnes/gb/apu/wave/wave.cpp

@@ -1,102 +0,0 @@
-#ifdef APU_CPP
-
-void APU::Wave::run() {
-  if(period && --period == 0) {
-    period = 2 * (2048 - frequency);
-    pattern_sample = pattern[++pattern_offset];
-  }
-
-  uint4 sample = pattern_sample >> volume_shift;
-  if(enable == false) sample = 0;
-
-  output = sample;
-}
-
-void APU::Wave::clock_length() {
-//if(counter && length) {
-//  if(--length == 0) enable = false;
-//}
-  if(enable && counter) {
-    if(++length == 0) enable = false;
-  }
-}
-
-void APU::Wave::write(unsigned r, uint8 data) {
-  if(r == 0) {  //$ff1a  NR30
-    dac_enable = data & 0x80;
-    if(dac_enable == false) enable = false;
-  }
-
-  if(r == 1) {  //$ff1b  NR31
-  //length = 256 - data;
-    length = data;
-  }
-
-  if(r == 2) {  //$ff1c  NR32
-    switch((data >> 5) & 3) {
-      case 0: volume_shift = 4; break;  //  0%
-      case 1: volume_shift = 0; break;  //100%
-      case 2: volume_shift = 1; break;  // 50%
-      case 3: volume_shift = 2; break;  // 25%
-    }
-  }
-
-  if(r == 3) {  //$ff1d  NR33
-    frequency = (frequency & 0x0700) | data;
-  }
-
-  if(r == 4) {  //$ff1e  NR34
-    bool initialize = data & 0x80;
-    counter = data & 0x40;
-    frequency = ((data & 7) << 8) | (frequency & 0x00ff);
-
-    if(initialize) {
-      enable = dac_enable;
-      period = 2 * (2048 - frequency);
-      pattern_offset = 0;
-    //if(length == 0) length = 256;
-    }
-  }
-}
-
-void APU::Wave::write_pattern(unsigned p, uint8 data) {
-  p <<= 1;
-  pattern[p + 0] = (data >> 4) & 15;
-  pattern[p + 1] = (data >> 0) & 15;
-}
-
-void APU::Wave::power() {
-  enable = 0;
-
-  dac_enable = 0;
-  volume_shift = 0;
-  frequency = 0;
-  counter = 0;
-
-  random_lfsr r;
-  for(auto &n : pattern) n = r() & 15;
-
-  output = 0;
-  length = 0;
-  period = 0;
-  pattern_offset = 0;
-  pattern_sample = 0;
-}
-
-void APU::Wave::serialize(serializer &s) {
-  s.integer(enable);
-
-  s.integer(dac_enable);
-  s.integer(volume_shift);
-  s.integer(frequency);
-  s.integer(counter);
-  s.array(pattern);
-
-  s.integer(output);
-  s.integer(length);
-  s.integer(period);
-  s.integer(pattern_offset);
-  s.integer(pattern_sample);
-}
-
-#endif

bsnes/gb/cartridge/cartridge.cpp

@@ -1,153 +0,0 @@
-#include <gb/gb.hpp>
-
-#define CARTRIDGE_CPP
-namespace GameBoy {
-
-#include "mbc0/mbc0.cpp"
-#include "mbc1/mbc1.cpp"
-#include "mbc2/mbc2.cpp"
-#include "mbc3/mbc3.cpp"
-#include "mbc5/mbc5.cpp"
-#include "mmm01/mmm01.cpp"
-#include "huc1/huc1.cpp"
-#include "huc3/huc3.cpp"
-#include "serialization.cpp"
-Cartridge cartridge;
-
-void Cartridge::load(System::Revision revision, const string &markup, const stream &memory) {
-  romsize = memory.size() ? memory.size() : 32768u;
-  romdata = allocate<uint8>(romsize, 0xff);
-  memory.read(romdata, memory.size());
-
-  information.markup = markup;
-  information.mapper = Mapper::Unknown;
-  information.ram = false;
-  information.battery = false;
-  information.rtc = false;
-  information.rumble = false;
-
-  information.romsize = 0;
-  information.ramsize = 0;
-
-  XML::Document document(markup);
-
-  auto &mapperid = document["cartridge"]["mapper"].data;
-  if(mapperid == "none" ) information.mapper = Mapper::MBC0;
-  if(mapperid == "MBC1" ) information.mapper = Mapper::MBC1;
-  if(mapperid == "MBC2" ) information.mapper = Mapper::MBC2;
-  if(mapperid == "MBC3" ) information.mapper = Mapper::MBC3;
-  if(mapperid == "MBC5" ) information.mapper = Mapper::MBC5;
-  if(mapperid == "MMM01") information.mapper = Mapper::MMM01;
-  if(mapperid == "HuC1" ) information.mapper = Mapper::HuC1;
-  if(mapperid == "HuC3" ) information.mapper = Mapper::HuC3;
-
-  information.rtc = document["cartridge"]["rtc"].data == "true";
-  information.rumble = document["cartridge"]["rumble"].data == "true";
-
-  information.romsize = numeral(document["cartridge"]["rom"]["size"].data);
-  information.ramsize = numeral(document["cartridge"]["ram"]["size"].data);
-  information.battery = document["cartridge"]["ram"]["nonvolatile"].data == "true";
-
-  switch(information.mapper) { default:
-  case Mapper::MBC0:  mapper = &mbc0;  break;
-  case Mapper::MBC1:  mapper = &mbc1;  break;
-  case Mapper::MBC2:  mapper = &mbc2;  break;
-  case Mapper::MBC3:  mapper = &mbc3;  break;
-  case Mapper::MBC5:  mapper = &mbc5;  break;
-  case Mapper::MMM01: mapper = &mmm01; break;
-  case Mapper::HuC1:  mapper = &huc1;  break;
-  case Mapper::HuC3:  mapper = &huc3;  break;
-  }
-
-  ramdata = new uint8_t[ramsize = information.ramsize]();
-  system.load(revision);
-
-  loaded = true;
-  sha256 = nall::sha256(romdata, romsize);
-  if(ramsize) interface->memory.append({ID::RAM, "save.ram"});
-}
-
-void Cartridge::unload() {
-  if(loaded == false) return;
-
-  if(romdata) { delete[] romdata; romdata = 0; }
-  if(ramdata) { delete[] ramdata; ramdata = 0; }
-  loaded = false;
-}
-
-uint8 Cartridge::rom_read(unsigned addr) {
-  if(addr >= romsize) addr %= romsize;
-  return romdata[addr];
-}
-
-void Cartridge::rom_write(unsigned addr, uint8 data) {
-  if(addr >= romsize) addr %= romsize;
-  romdata[addr] = data;
-}
-
-uint8 Cartridge::ram_read(unsigned addr) {
-  if(ramsize == 0) return 0x00;
-  if(addr >= ramsize) addr %= ramsize;
-  return ramdata[addr];
-}
-
-void Cartridge::ram_write(unsigned addr, uint8 data) {
-  if(ramsize == 0) return;
-  if(addr >= ramsize) addr %= ramsize;
-  ramdata[addr] = data;
-}
-
-uint8 Cartridge::mmio_read(uint16 addr) {
-  if(addr == 0xff50) return 0x00;
-
-  if(bootrom_enable) {
-    const uint8 *data = nullptr;
-    switch(system.revision()) { default:
-    case System::Revision::GameBoy: data = system.bootROM.dmg; break;
-    case System::Revision::SuperGameBoy: data = system.bootROM.sgb; break;
-    case System::Revision::GameBoyColor: data = system.bootROM.cgb; break;
-    }
-    if(addr >= 0x0000 && addr <= 0x00ff) return data[addr];
-    if(addr >= 0x0200 && addr <= 0x08ff && system.cgb()) return data[addr - 256];
-  }
-
-  return mapper->mmio_read(addr);
-}
-
-void Cartridge::mmio_write(uint16 addr, uint8 data) {
-  if(bootrom_enable && addr == 0xff50) {
-    bootrom_enable = false;
-    return;
-  }
-
-  mapper->mmio_write(addr, data);
-}
-
-void Cartridge::power() {
-  bootrom_enable = true;
-
-  mbc0.power();
-  mbc1.power();
-  mbc2.power();
-  mbc3.power();
-  mbc5.power();
-  mmm01.power();
-  huc1.power();
-  huc3.power();
-
-  for(unsigned n = 0x0000; n <= 0x7fff; n++) bus.mmio[n] = this;
-  for(unsigned n = 0xa000; n <= 0xbfff; n++) bus.mmio[n] = this;
-  bus.mmio[0xff50] = this;
-}
-
-Cartridge::Cartridge() {
-  loaded = false;
-  romdata = nullptr;
-  ramdata = nullptr;
-}
-
-Cartridge::~Cartridge() {
-  unload();
-}
-
-}

bsnes/gb/cartridge/cartridge.hpp

@@ -1,66 +0,0 @@
-struct Cartridge : MMIO, property<Cartridge> {
-  #include "mbc0/mbc0.hpp"
-  #include "mbc1/mbc1.hpp"
-  #include "mbc2/mbc2.hpp"
-  #include "mbc3/mbc3.hpp"
-  #include "mbc5/mbc5.hpp"
-  #include "mmm01/mmm01.hpp"
-  #include "huc1/huc1.hpp"
-  #include "huc3/huc3.hpp"
-
-  enum Mapper : unsigned {
-    MBC0,
-    MBC1,
-    MBC2,
-    MBC3,
-    MBC5,
-    MMM01,
-    HuC1,
-    HuC3,
-    Unknown,
-  };
-
-  struct Information {
-    string markup;
-
-    Mapper mapper;
-    bool ram;
-    bool battery;
-    bool rtc;
-    bool rumble;
-
-    unsigned romsize;
-    unsigned ramsize;
-  } information;
-
-  readonly<bool> loaded;
-  readonly<string> sha256;
-
-  uint8_t *romdata;
-  unsigned romsize;
-
-  uint8_t *ramdata;
-  unsigned ramsize;
-
-  MMIO *mapper;
-  bool bootrom_enable;
-
-  void load(System::Revision revision, const string &markup, const stream &memory);
-  void unload();
-
-  uint8 rom_read(unsigned addr);
-  void rom_write(unsigned addr, uint8 data);
-  uint8 ram_read(unsigned addr);
-  void ram_write(unsigned addr, uint8 data);
-
-  uint8 mmio_read(uint16 addr);
-  void mmio_write(uint16 addr, uint8 data);
-
-  void power();
-
-  void serialize(serializer&);
-  Cartridge();
-  ~Cartridge();
-};
-
-extern Cartridge cartridge;

bsnes/gb/cartridge/serialization.cpp

@@ -1,54 +0,0 @@
-#ifdef CARTRIDGE_CPP
-
-void Cartridge::serialize(serializer &s) {
-  if(information.battery) s.array(ramdata, ramsize);
-  s.integer(bootrom_enable);
-
-  s.integer(mbc1.ram_enable);
-  s.integer(mbc1.rom_select);
-  s.integer(mbc1.ram_select);
-  s.integer(mbc1.mode_select);
-
-  s.integer(mbc2.ram_enable);
-  s.integer(mbc2.rom_select);
-
-  s.integer(mbc3.ram_enable);
-  s.integer(mbc3.rom_select);
-  s.integer(mbc3.ram_select);
-  s.integer(mbc3.rtc_latch);
-
-  s.integer(mbc3.rtc_halt);
-  s.integer(mbc3.rtc_second);
-  s.integer(mbc3.rtc_minute);
-  s.integer(mbc3.rtc_hour);
-  s.integer(mbc3.rtc_day);
-  s.integer(mbc3.rtc_day_carry);
-
-  s.integer(mbc3.rtc_latch_second);
-  s.integer(mbc3.rtc_latch_minute);
-  s.integer(mbc3.rtc_latch_hour);
-  s.integer(mbc3.rtc_latch_day);
-  s.integer(mbc3.rtc_latch_day_carry);
-
-  s.integer(mbc5.ram_enable);
-  s.integer(mbc5.rom_select);
-  s.integer(mbc5.ram_select);
-
-  s.integer(mmm01.rom_mode);
-  s.integer(mmm01.rom_base);
-
-  s.integer(mmm01.ram_enable);
-  s.integer(mmm01.rom_select);
-  s.integer(mmm01.ram_select);
-
-  s.integer(huc1.ram_writable);
-  s.integer(huc1.rom_select);
-  s.integer(huc1.ram_select);
-  s.integer(huc1.model);
-
-  s.integer(huc3.ram_enable);
-  s.integer(huc3.rom_select);
-  s.integer(huc3.ram_select);
-}
-
-#endif

bsnes/gb/cheat/cheat.cpp

@@ -1,91 +0,0 @@
-#include <gb/gb.hpp>
-
-namespace GameBoy {
-
-Cheat cheat;
-
-bool Cheat::decode(const string &code_, unsigned &addr, unsigned &data, unsigned &comp) {
-  static bool initialize = false;
-  static uint8 mapProActionReplay[256], mapGameGenie[256];
-
-  if(initialize == false) {
-    initialize = true;
-
-    for(auto &n : mapProActionReplay) n = ~0;
-    mapProActionReplay['0'] =  0; mapProActionReplay['1'] =  1; mapProActionReplay['2'] =  2; mapProActionReplay['3'] =  3;
-    mapProActionReplay['4'] =  4; mapProActionReplay['5'] =  5; mapProActionReplay['6'] =  6; mapProActionReplay['7'] =  7;
-    mapProActionReplay['8'] =  8; mapProActionReplay['9'] =  9; mapProActionReplay['A'] = 10; mapProActionReplay['B'] = 11;
-    mapProActionReplay['C'] = 12; mapProActionReplay['D'] = 13; mapProActionReplay['E'] = 14; mapProActionReplay['F'] = 15;
-
-    for(auto &n : mapGameGenie) n = ~0;
-    mapGameGenie['0'] =  0; mapGameGenie['1'] =  1; mapGameGenie['2'] =  2; mapGameGenie['3'] =  3;
-    mapGameGenie['4'] =  4; mapGameGenie['5'] =  5; mapGameGenie['6'] =  6; mapGameGenie['7'] =  7;
-    mapGameGenie['8'] =  8; mapGameGenie['9'] =  9; mapGameGenie['A'] = 10; mapGameGenie['B'] = 11;
-    mapGameGenie['C'] = 12; mapGameGenie['D'] = 13; mapGameGenie['E'] = 14; mapGameGenie['F'] = 15;
-  }
-
-  string code = code_;
-  code.upper();
-  unsigned length = code.length(), bits = 0;
-
-  if(code.wildcard("????:??")) {
-    code = { substr(code, 0, 4), substr(code, 5, 2) };
-    for(unsigned n = 0; n < 6; n++) if(mapProActionReplay[code[n]] > 15) return false;
-    bits = hex(code);
-    addr = (bits >> 8) & 0xffff;
-    data = (bits >> 0) & 0xff;
-    comp = ~0;
-    return true;
-  }
-
-  if(code.wildcard("????:??:??")) {
-    code = { substr(code, 0, 4), substr(code, 5, 2), substr(code, 8, 2) };
-    for(unsigned n = 0; n < 8; n++) if(mapProActionReplay[code[n]] > 15) return false;
-    bits = hex(code);
-    addr = (bits >> 16) & 0xffff;
-    data = (bits >>  8) & 0xff;
-    comp = (bits >>  0) & 0xff;
-    return true;
-  }
-
-  if(code.wildcard("???" "-" "???")) {
-    code = { substr(code, 0, 3), substr(code, 4, 3) };
-    for(unsigned n = 0; n < 6; n++) if(mapGameGenie[code[n]] > 15) return false;
-    for(unsigned n = 0; n < 6; n++) bits |= mapGameGenie[code[n]] << (20 - n * 4);
-
-    addr = (bits >>  0) & 0xffff;
-    data = (bits >> 16) & 0xff;
-    comp = ~0;
-
-    addr = (((addr >> 4) | (addr << 12)) & 0xffff) ^ 0xf000;
-
-    return true;
-  }
-
-  if(code.wildcard("???" "-" "???" "-" "???")) {
-    code = { substr(code, 0, 3), substr(code, 4, 3), substr(code, 8, 1), substr(code, 10, 1) };
-    for(unsigned n = 0; n < 8; n++) if(mapGameGenie[code[n]] > 15) return false;
-    for(unsigned n = 0; n < 8; n++) bits |= mapGameGenie[code[n]] << (28 - n * 4);
-
-    addr = (bits >>  8) & 0xffff;
-    data = (bits >> 24) & 0xff;
-    comp = (bits >>  0) & 0xff;
-
-    addr = (((addr >> 4) | (addr << 12)) & 0xffff) ^ 0xf000;
-    comp = (((comp >> 2) | (comp << 6)) & 0xff) ^ 0xba;
-
-    return true;
-  }
-
-  return false;
-}
-
-void Cheat::synchronize() {
-  for(auto &n : override) n = false;
-
-  for(unsigned n = 0; n < size(); n++) {
-    override[operator[](n).addr] = true;
-  }
-}
-
-}

bsnes/gb/cheat/cheat.hpp

@@ -1,14 +0,0 @@
-struct CheatCode {
-  unsigned addr;
-  unsigned data;
-  unsigned comp;
-};
-
-struct Cheat : public linear_vector<CheatCode> {
-  static bool decode(const string &code, unsigned &addr, unsigned &data, unsigned &comp);
-
-  void synchronize();
-  bool override[65536];
-};
-
-extern Cheat cheat;

bsnes/gb/cpu/cpu.cpp

@@ -1,204 +0,0 @@
-#include <gb/gb.hpp>
-
-#define CPU_CPP
-namespace GameBoy {
-
-#include "mmio.cpp"
-#include "memory.cpp"
-#include "timing.cpp"
-#include "serialization.cpp"
-CPU cpu;
-
-void CPU::Main() {
-  cpu.main();
-}
-
-void CPU::main() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::CPU) {
-      scheduler.sync = Scheduler::SynchronizeMode::All;
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    interrupt_test();
-    exec();
-  }
-}
-
-void CPU::interrupt_raise(CPU::Interrupt id) {
-  if(id == Interrupt::Vblank) {
-    status.interrupt_request_vblank = 1;
-    if(status.interrupt_enable_vblank) r.halt = false;
-  }
-
-  if(id == Interrupt::Stat) {
-    status.interrupt_request_stat = 1;
-    if(status.interrupt_enable_stat) r.halt = false;
-  }
-
-  if(id == Interrupt::Timer) {
-    status.interrupt_request_timer = 1;
-    if(status.interrupt_enable_timer) r.halt = false;
-  }
-
-  if(id == Interrupt::Serial) {
-    status.interrupt_request_serial = 1;
-    if(status.interrupt_enable_serial) r.halt = false;
-  }
-
-  if(id == Interrupt::Joypad) {
-    status.interrupt_request_joypad = 1;
-    if(status.interrupt_enable_joypad) r.halt = r.stop = false;
-  }
-}
-
-void CPU::interrupt_test() {
-  if(r.ime) {
-    if(status.interrupt_request_vblank && status.interrupt_enable_vblank) {
-      status.interrupt_request_vblank = 0;
-      return interrupt_exec(0x0040);
-    }
-
-    if(status.interrupt_request_stat && status.interrupt_enable_stat) {
-      status.interrupt_request_stat = 0;
-      return interrupt_exec(0x0048);
-    }
-
-    if(status.interrupt_request_timer && status.interrupt_enable_timer) {
-      status.interrupt_request_timer = 0;
-      return interrupt_exec(0x0050);
-    }
-
-    if(status.interrupt_request_serial && status.interrupt_enable_serial) {
-      status.interrupt_request_serial = 0;
-      return interrupt_exec(0x0058);
-    }
-
-    if(status.interrupt_request_joypad && status.interrupt_enable_joypad) {
-      status.interrupt_request_joypad = 0;
-      return interrupt_exec(0x0060);
-    }
-  }
-}
-
-void CPU::interrupt_exec(uint16 pc) {
-  r.ime = 0;
-  op_write(--r[SP], r[PC] >> 8);
-  op_write(--r[SP], r[PC] >> 0);
-  r[PC] = pc;
-  op_io();
-  op_io();
-  op_io();
-}
-
-bool CPU::stop() {
-  if(status.speed_switch) {
-    status.speed_switch = 0;
-    status.speed_double ^= 1;
-    if(status.speed_double == 0) frequency = 4 * 1024 * 1024;
-    if(status.speed_double == 1) frequency = 8 * 1024 * 1024;
-    return true;
-  }
-  return false;
-}
-
-void CPU::power() {
-  create(Main, 4 * 1024 * 1024);
-  LR35902::power();
-
-  for(unsigned n = 0xc000; n <= 0xdfff; n++) bus.mmio[n] = this;  //WRAM
-  for(unsigned n = 0xe000; n <= 0xfdff; n++) bus.mmio[n] = this;  //WRAM (mirror)
-  for(unsigned n = 0xff80; n <= 0xfffe; n++) bus.mmio[n] = this;  //HRAM
-
-  bus.mmio[0xff00] = this;  //JOYP
-  bus.mmio[0xff01] = this;  //SB
-  bus.mmio[0xff02] = this;  //SC
-  bus.mmio[0xff04] = this;  //DIV
-  bus.mmio[0xff05] = this;  //TIMA
-  bus.mmio[0xff06] = this;  //TMA
-  bus.mmio[0xff07] = this;  //TAC
-  bus.mmio[0xff0f] = this;  //IF
-  bus.mmio[0xff46] = this;  //DMA
-  bus.mmio[0xffff] = this;  //IE
-
-  if(system.cgb()) {
-  bus.mmio[0xff4d] = this;  //KEY1
-  bus.mmio[0xff51] = this;  //HDMA1
-  bus.mmio[0xff52] = this;  //HDMA2
-  bus.mmio[0xff53] = this;  //HDMA3
-  bus.mmio[0xff54] = this;  //HDMA4
-  bus.mmio[0xff55] = this;  //HDMA5
-  bus.mmio[0xff56] = this;  //RP
-  bus.mmio[0xff6c] = this;  //???
-  bus.mmio[0xff70] = this;  //SVBK
-  bus.mmio[0xff72] = this;  //???
-  bus.mmio[0xff73] = this;  //???
-  bus.mmio[0xff74] = this;  //???
-  bus.mmio[0xff75] = this;  //???
-  bus.mmio[0xff76] = this;  //???
-  bus.mmio[0xff77] = this;  //???
-  }
-
-  for(auto &n : wram) n = 0x00;
-  for(auto &n : hram) n = 0x00;
-
-  r[PC] = 0x0000;
-  r[SP] = 0x0000;
-  r[AF] = 0x0000;
-  r[BC] = 0x0000;
-  r[DE] = 0x0000;
-  r[HL] = 0x0000;
-
-  status.clock = 0;
-
-  status.p15 = 0;
-  status.p14 = 0;
-  status.joyp = 0;
-  status.mlt_req = 0;
-
-  status.serial_data = 0;
-  status.serial_bits = 0;
-
-  status.serial_transfer = 0;
-  status.serial_clock = 0;
-
-  status.div = 0;
-
-  status.tima = 0;
-
-  status.tma = 0;
-
-  status.timer_enable = 0;
-  status.timer_clock = 0;
-
-  status.interrupt_request_joypad = 0;
-  status.interrupt_request_serial = 0;
-  status.interrupt_request_timer = 0;
-  status.interrupt_request_stat = 0;
-  status.interrupt_request_vblank = 0;
-
-  status.speed_double = 0;
-  status.speed_switch = 0;
-
-  status.dma_source = 0;
-  status.dma_target = 0;
-
-  status.dma_mode = 0;
-  status.dma_length = 0;
-
-  status.ff6c = 0;
-  status.ff72 = 0;
-  status.ff73 = 0;
-  status.ff74 = 0;
-  status.ff75 = 0;
-
-  status.wram_bank = 1;
-
-  status.interrupt_enable_joypad = 0;
-  status.interrupt_enable_serial = 0;
-  status.interrupt_enable_timer = 0;
-  status.interrupt_enable_stat = 0;
-  status.interrupt_enable_vblank = 0;
-}
-
-}

bsnes/gb/cpu/cpu.hpp

@@ -1,117 +0,0 @@
-struct CPU : Processor::LR35902, Thread, MMIO {
-  enum class Interrupt : unsigned {
-    Vblank,
-    Stat,
-    Timer,
-    Serial,
-    Joypad,
-  };
-
-  struct Status {
-    unsigned clock;
-
-    //$ff00  JOYP
-    bool p15;
-    bool p14;
-    uint8 joyp;
-    uint8 mlt_req;
-
-    //$ff01  SB
-    uint8 serial_data;
-    unsigned serial_bits;
-
-    //$ff02  SC
-    bool serial_transfer;
-    bool serial_clock;
-
-    //$ff04  DIV
-    uint8 div;
-
-    //$ff05  TIMA
-    uint8 tima;
-
-    //$ff06  TMA
-    uint8 tma;
-
-    //$ff07  TAC
-    bool timer_enable;
-    unsigned timer_clock;
-
-    //$ff0f  IF
-    bool interrupt_request_joypad;
-    bool interrupt_request_serial;
-    bool interrupt_request_timer;
-    bool interrupt_request_stat;
-    bool interrupt_request_vblank;
-
-    //$ff4d  KEY1
-    bool speed_double;
-    bool speed_switch;
-
-    //$ff51,$ff52  HDMA1,HDMA2
-    uint16 dma_source;
-
-    //$ff53,$ff54  HDMA3,HDMA4
-    uint16 dma_target;
-
-    //$ff55  HDMA5
-    bool dma_mode;
-    uint16 dma_length;
-
-    //$ff6c  ???
-    uint8 ff6c;
-
-    //$ff70  SVBK
-    uint3 wram_bank;
-
-    //$ff72-$ff75  ???
-    uint8 ff72;
-    uint8 ff73;
-    uint8 ff74;
-    uint8 ff75;
-
-    //$ffff  IE
-    bool interrupt_enable_joypad;
-    bool interrupt_enable_serial;
-    bool interrupt_enable_timer;
-    bool interrupt_enable_stat;
-    bool interrupt_enable_vblank;
-  } status;
-
-  uint8 wram[32768];  //GB=8192, GBC=32768
-  uint8 hram[128];
-
-  static void Main();
-  void main();
-  void interrupt_raise(Interrupt id);
-  void interrupt_test();
-  void interrupt_exec(uint16 pc);
-  bool stop();
-  void power();
-
-  void serialize(serializer&);
-
-  //mmio.cpp
-  unsigned wram_addr(uint16 addr) const;
-  void mmio_joyp_poll();
-  uint8 mmio_read(uint16 addr);
-  void mmio_write(uint16 addr, uint8 data);
-
-  //memory.cpp
-  void op_io();
-  uint8 op_read(uint16 addr);
-  void op_write(uint16 addr, uint8 data);
-  void cycle_edge();
-  uint8 debugger_read(uint16 addr);
-
-  //timing.cpp
-  void add_clocks(unsigned clocks);
-  void timer_262144hz();
-  void timer_65536hz();
-  void timer_16384hz();
-  void timer_8192hz();
-  void timer_4096hz();
-  void hblank();
-};
-
-extern CPU cpu;

bsnes/gb/cpu/memory.cpp

@@ -1,32 +0,0 @@
-#ifdef CPU_CPP
-
-void CPU::op_io() {
-  cycle_edge();
-  add_clocks(4);
-}
-
-uint8 CPU::op_read(uint16 addr) {
-  cycle_edge();
-  uint8 r = bus.read(addr);
-  add_clocks(4);
-  return r;
-}
-
-void CPU::op_write(uint16 addr, uint8 data) {
-  cycle_edge();
-  bus.write(addr, data);
-  add_clocks(4);
-}
-
-void CPU::cycle_edge() {
-  if(r.ei) {
-    r.ei = false;
-    r.ime = 1;
-  }
-}
-
-uint8 CPU::debugger_read(uint16 addr) {
-  return bus.read(addr);
-}
-
-#endif

bsnes/gb/cpu/mmio.cpp

@@ -1,271 +0,0 @@
-#ifdef CPU_CPP
-
-unsigned CPU::wram_addr(uint16 addr) const {
-  addr &= 0x1fff;
-  if(addr < 0x1000) return addr;
-  auto bank = status.wram_bank + (status.wram_bank == 0);
-  return (bank * 0x1000) + (addr & 0x0fff);
-}
-
-void CPU::mmio_joyp_poll() {
-  unsigned button = 0, dpad = 0;
-
-  button |= interface->inputPoll(0, 0, (unsigned)Input::Start) << 3;
-  button |= interface->inputPoll(0, 0, (unsigned)Input::Select) << 2;
-  button |= interface->inputPoll(0, 0, (unsigned)Input::B) << 1;
-  button |= interface->inputPoll(0, 0, (unsigned)Input::A) << 0;
-
-  dpad |= interface->inputPoll(0, 0, (unsigned)Input::Down) << 3;
-  dpad |= interface->inputPoll(0, 0, (unsigned)Input::Up) << 2;
-  dpad |= interface->inputPoll(0, 0, (unsigned)Input::Left) << 1;
-  dpad |= interface->inputPoll(0, 0, (unsigned)Input::Right) << 0;
-
-  status.joyp = 0x0f;
-  if(status.p15 == 1 && status.p14 == 1) status.joyp -= status.mlt_req;
-  if(status.p15 == 0) status.joyp &= button ^ 0x0f;
-  if(status.p14 == 0) status.joyp &= dpad ^ 0x0f;
-  if(status.joyp != 0x0f) interrupt_raise(Interrupt::Joypad);
-}
-
-uint8 CPU::mmio_read(uint16 addr) {
-  if(addr >= 0xc000 && addr <= 0xfdff) return wram[wram_addr(addr)];
-  if(addr >= 0xff80 && addr <= 0xfffe) return hram[addr & 0x7f];
-
-  if(addr == 0xff00) {  //JOYP
-    return (status.p15 << 5)
-         | (status.p14 << 4)
-         | (status.joyp << 0);
-  }
-
-  if(addr == 0xff01) {  //SB
-    return 0xff;
-  }
-
-  if(addr == 0xff02) {  //SC
-    return (status.serial_transfer << 7)
-         | (status.serial_clock << 0);
-  }
-
-  if(addr == 0xff04) {  //DIV
-    return status.div;
-  }
-
-  if(addr == 0xff05) {  //TIMA
-    return status.tima;
-  }
-
-  if(addr == 0xff06) {  //TMA
-    return status.tma;
-  }
-
-  if(addr == 0xff07) {  //TAC
-    return (status.timer_enable << 2)
-         | (status.timer_clock << 0);
-  }
-
-  if(addr == 0xff0f) {  //IF
-    return (status.interrupt_request_joypad << 4)
-         | (status.interrupt_request_serial << 3)
-         | (status.interrupt_request_timer << 2)
-         | (status.interrupt_request_stat << 1)
-         | (status.interrupt_request_vblank << 0);
-  }
-
-  if(addr == 0xff4d) {  //KEY1
-    return (status.speed_double << 7);
-  }
-
-  if(addr == 0xff55) {  //HDMA5
-    return (status.dma_length / 16) - 1;
-  }
-
-  if(addr == 0xff56) {  //RP
-    return 0x02;
-  }
-
-  if(addr == 0xff6c) {  //???
-    return 0xfe | status.ff6c;
-  }
-
-  if(addr == 0xff70) {  //SVBK
-    return status.wram_bank;
-  }
-
-  if(addr == 0xff72) {  //???
-    return status.ff72;
-  }
-
-  if(addr == 0xff73) {  //???
-    return status.ff73;
-  }
-
-  if(addr == 0xff74) {  //???
-    return status.ff74;
-  }
-
-  if(addr == 0xff75) {  //???
-    return 0x8f | status.ff75;
-  }
-
-  if(addr == 0xff76) {  //???
-    return 0x00;
-  }
-
-  if(addr == 0xff77) {  //???
-    return 0x00;
-  }
-
-  if(addr == 0xffff) {  //IE
-    return (status.interrupt_enable_joypad << 4)
-         | (status.interrupt_enable_serial << 3)
-         | (status.interrupt_enable_timer << 2)
-         | (status.interrupt_enable_stat << 1)
-         | (status.interrupt_enable_vblank << 0);
-  }
-
-  return 0x00;
-}
-
-void CPU::mmio_write(uint16 addr, uint8 data) {
-  if(addr >= 0xc000 && addr <= 0xfdff) { wram[wram_addr(addr)] = data; return; }
-  if(addr >= 0xff80 && addr <= 0xfffe) { hram[addr & 0x7f] = data; return; }
-
-  if(addr == 0xff00) {  //JOYP
-    status.p15 = data & 0x20;
-    status.p14 = data & 0x10;
-    interface->joypWrite(status.p15, status.p14);
-    mmio_joyp_poll();
-    return;
-  }
-
-  if(addr == 0xff01) {  //SB
-    status.serial_data = data;
-    return;
-  }
-
-  if(addr == 0xff02) {  //SC
-    status.serial_transfer = data & 0x80;
-    status.serial_clock = data & 0x01;
-    if(status.serial_transfer) status.serial_bits = 8;
-    return;
-  }
-
-  if(addr == 0xff04) {  //DIV
-    status.div = 0;
-    return;
-  }
-
-  if(addr == 0xff05) {  //TIMA
-    status.tima = data;
-    return;
-  }
-
-  if(addr == 0xff06) {  //TMA
-    status.tma = data;
-    return;
-  }
-
-  if(addr == 0xff07) {  //TAC
-    status.timer_enable = data & 0x04;
-    status.timer_clock = data & 0x03;
-    return;
-  }
-
-  if(addr == 0xff0f) {  //IF
-    status.interrupt_request_joypad = data & 0x10;
-    status.interrupt_request_serial = data & 0x08;
-    status.interrupt_request_timer = data & 0x04;
-    status.interrupt_request_stat = data & 0x02;
-    status.interrupt_request_vblank = data & 0x01;
-    return;
-  }
-
-  if(addr == 0xff46) {  //DMA
-    for(unsigned n = 0x00; n <= 0x9f; n++) {
-      bus.write(0xfe00 + n, bus.read((data << 8) + n));
-      add_clocks(4);
-    }
-    return;
-  }
-
-  if(addr == 0xff4d) {  //KEY1
-    status.speed_switch = data & 0x01;
-    return;
-  }
-
-  if(addr == 0xff51) {  //HDMA1
-    status.dma_source = (status.dma_source & 0x00ff) | (data << 8);
-    return;
-  }
-
-  if(addr == 0xff52) {  //HDMA2
-    status.dma_source = (status.dma_source & 0xff00) | (data << 0);
-    return;
-  }
-
-  if(addr == 0xff53) {  //HDMA3
-    status.dma_target = (status.dma_target & 0x00ff) | (data << 8);
-    return;
-  }
-
-  if(addr == 0xff54) {  //HDMA4
-    status.dma_target = (status.dma_target & 0xff00) | (data << 0);
-    return;
-  }
-
-  if(addr == 0xff55) {  //HDMA5
-    status.dma_mode = data & 0x80;
-    status.dma_length = ((data & 0x7f) + 1) * 16;
-
-    if(status.dma_mode == 0) do {
-      bus.write(status.dma_target++, bus.read(status.dma_source++));
-      add_clocks(4 << status.speed_double);
-    } while(--status.dma_length);
-    return;
-  }
-
-  if(addr == 0xff56) {  //RP
-    return;
-  }
-
-  if(addr == 0xff6c) {  //???
-    status.ff6c = data & 0x01;
-    return;
-  }
-
-  if(addr == 0xff72) {  //???
-    status.ff72 = data;
-    return;
-  }
-
-  if(addr == 0xff73) {  //???
-    status.ff73 = data;
-    return;
-  }
-
-  if(addr == 0xff74) {  //???
-    status.ff74 = data;
-    return;
-  }
-
-  if(addr == 0xff75) {  //???
-    status.ff75 = data & 0x70;
-    return;
-  }
-
-  if(addr == 0xff70) {  //SVBK
-    status.wram_bank = data & 0x07;
-    return;
-  }
-
-  if(addr == 0xffff) {  //IE
-    status.interrupt_enable_joypad = data & 0x10;
-    status.interrupt_enable_serial = data & 0x08;
-    status.interrupt_enable_timer = data & 0x04;
-    status.interrupt_enable_stat = data & 0x02;
-    status.interrupt_enable_vblank = data & 0x01;
-    return;
-  }
-}
-
-#endif

bsnes/gb/cpu/serialization.cpp

@@ -1,59 +0,0 @@
-#ifdef CPU_CPP
-
-void CPU::serialize(serializer &s) {
-  LR35902::serialize(s);
-  Thread::serialize(s);
-
-  s.array(wram);
-  s.array(hram);
-
-  s.integer(status.clock);
-
-  s.integer(status.p15);
-  s.integer(status.p14);
-  s.integer(status.joyp);
-  s.integer(status.mlt_req);
-
-  s.integer(status.serial_data);
-  s.integer(status.serial_bits);
-
-  s.integer(status.serial_transfer);
-  s.integer(status.serial_clock);
-
-  s.integer(status.div);
-  s.integer(status.tima);
-  s.integer(status.tma);
-  s.integer(status.timer_enable);
-  s.integer(status.timer_clock);
-
-  s.integer(status.interrupt_request_joypad);
-  s.integer(status.interrupt_request_serial);
-  s.integer(status.interrupt_request_timer);
-  s.integer(status.interrupt_request_stat);
-  s.integer(status.interrupt_request_vblank);
-
-  s.integer(status.speed_double);
-  s.integer(status.speed_switch);
-
-  s.integer(status.dma_source);
-  s.integer(status.dma_target);
-  s.integer(status.dma_mode);
-  s.integer(status.dma_length);
-
-  s.integer(status.ff6c);
-
-  s.integer(status.wram_bank);
-
-  s.integer(status.ff72);
-  s.integer(status.ff73);
-  s.integer(status.ff74);
-  s.integer(status.ff75);
-
-  s.integer(status.interrupt_enable_joypad);
-  s.integer(status.interrupt_enable_serial);
-  s.integer(status.interrupt_enable_timer);
-  s.integer(status.interrupt_enable_stat);
-  s.integer(status.interrupt_enable_vblank);
-}
-
-#endif

bsnes/gb/cpu/timing.cpp

@@ -1,88 +0,0 @@
-//70224 clocks/frame
-//  456 clocks/scanline
-//  154 scanlines/frame
-
-#ifdef CPU_CPP
-
-void CPU::add_clocks(unsigned clocks) {
-  system.clocks_executed += clocks;
-  if(system.sgb()) scheduler.exit(Scheduler::ExitReason::StepEvent);
-
-  status.clock += clocks;
-  if(status.clock >= 4 * 1024 * 1024) {
-    status.clock -= 4 * 1024 * 1024;
-    cartridge.mbc3.second();
-  }
-
-  //4MHz / N(hz) - 1 = mask
-  if((status.clock &   15) == 0) timer_262144hz();
-  if((status.clock &   63) == 0)  timer_65536hz();
-  if((status.clock &  255) == 0)  timer_16384hz();
-  if((status.clock &  511) == 0)   timer_8192hz();
-  if((status.clock & 1023) == 0)   timer_4096hz();
-
-  ppu.clock -= clocks * ppu.frequency;
-  if(ppu.clock < 0) co_switch(scheduler.active_thread = ppu.thread);
-
-  apu.clock -= clocks * apu.frequency;
-  if(apu.clock < 0) co_switch(scheduler.active_thread = apu.thread);
-}
-
-void CPU::timer_262144hz() {
-  if(status.timer_enable && status.timer_clock == 1) {
-    if(++status.tima == 0) {
-      status.tima = status.tma;
-      interrupt_raise(Interrupt::Timer);
-    }
-  }
-}
-
-void CPU::timer_65536hz() {
-  if(status.timer_enable && status.timer_clock == 2) {
-    if(++status.tima == 0) {
-      status.tima = status.tma;
-      interrupt_raise(Interrupt::Timer);
-    }
-  }
-}
-
-void CPU::timer_16384hz() {
-  if(status.timer_enable && status.timer_clock == 3) {
-    if(++status.tima == 0) {
-      status.tima = status.tma;
-      interrupt_raise(Interrupt::Timer);
-    }
-  }
-
-  status.div++;
-}
-
-void CPU::timer_8192hz() {
-  if(status.serial_transfer && status.serial_clock) {
-    if(--status.serial_bits == 0) {
-      status.serial_transfer = 0;
-      interrupt_raise(Interrupt::Serial);
-    }
-  }
-}
-
-void CPU::timer_4096hz() {
-  if(status.timer_enable && status.timer_clock == 0) {
-    if(++status.tima == 0) {
-      status.tima = status.tma;
-      interrupt_raise(Interrupt::Timer);
-    }
-  }
-}
-
-void CPU::hblank() {
-  if(status.dma_mode == 1 && status.dma_length) {
-    for(unsigned n = 0; n < 16; n++) {
-      bus.write(status.dma_target++, bus.read(status.dma_source++));
-      add_clocks(4);
-    }
-    status.dma_length -= 16;
-  }
-}
-
-#endif

bsnes/gb/interface/interface.cpp

@@ -1,141 +0,0 @@
-#include <gb/gb.hpp>
-
-namespace GameBoy {
-
-Interface *interface = nullptr;
-
-void Interface::lcdScanline() {
-  if(hook) hook->lcdScanline();
-}
-
-void Interface::joypWrite(bool p15, bool p14) {
-  if(hook) hook->joypWrite(p15, p14);
-}
-
-double Interface::videoFrequency() {
-  return 4194304.0 / (154.0 * 456.0);
-}
-
-double Interface::audioFrequency() {
-  return 4194304.0;
-}
-
-bool Interface::loaded() {
-  return cartridge.loaded();
-}
-
-string Interface::sha256() {
-  return cartridge.sha256();
-}
-
-void Interface::load(unsigned id, const stream &stream, const string &markup) {
-  if(id == ID::GameBoyBootROM) {
-    stream.read(system.bootROM.dmg, min( 256u, stream.size()));
-  }
-
-  if(id == ID::SuperGameBoyBootROM) {
-    stream.read(system.bootROM.sgb, min( 256u, stream.size()));
-  }
-
-  if(id == ID::GameBoyColorBootROM) {
-    stream.read(system.bootROM.cgb, min(2048u, stream.size()));
-  }
-
-  if(id == ID::GameBoyROM) {
-    cartridge.load(System::Revision::GameBoy, markup, stream);
-    system.power();
-  }
-
-  if(id == ID::GameBoyColorROM) {
-    cartridge.load(System::Revision::GameBoyColor, markup, stream);
-    system.power();
-  }
-
-  if(id == ID::RAM) {
-    stream.read(cartridge.ramdata, min(stream.size(), cartridge.ramsize));
-  }
-}
-
-void Interface::save(unsigned id, const stream &stream) {
-  if(id == ID::RAM) {
-    stream.write(cartridge.ramdata, cartridge.ramsize);
-  }
-}
-
-void Interface::unload() {
-  cartridge.unload();
-}
-
-void Interface::power() {
-  system.power();
-}
-
-void Interface::reset() {
-  system.power();
-}
-
-void Interface::run() {
-  system.run();
-}
-
-serializer Interface::serialize() {
-  system.runtosave();
-  return system.serialize();
-}
-
-bool Interface::unserialize(serializer &s) {
-  return system.unserialize(s);
-}
-
-void Interface::cheatSet(const lstring &list) {
-  cheat.reset();
-  for(auto &code : list) {
-    lstring codelist = code.split("+");
-    for(auto &part : codelist) {
-      unsigned addr, data, comp;
-      if(Cheat::decode(part, addr, data, comp)) cheat.append({addr, data, comp});
-    }
-  }
-  cheat.synchronize();
-}
-
-void Interface::updatePalette() {
-  video.generate_palette();
-}
-
-Interface::Interface() {
-  interface = this;
-  hook = nullptr;
-
-  information.name        = "Game Boy";
-  information.width       = 160;
-  information.height      = 144;
-  information.overscan    = false;
-  information.aspectRatio = 1.0;
-  information.resettable  = false;
-
-  firmware.append({ID::GameBoyBootROM,      "Game Boy",       "sys", "boot.rom"});
-  firmware.append({ID::SuperGameBoyBootROM, "Super Game Boy", "sfc", "boot.rom"});
-  firmware.append({ID::GameBoyColorBootROM, "Game Boy Color", "sys", "boot.rom"});
-
-  media.append({ID::GameBoyROM,      "Game Boy",       "sys", "program.rom", "gb" });
-  media.append({ID::GameBoyColorROM, "Game Boy Color", "sys", "program.rom", "gbc"});
-
-  {
-    Device device{0, ID::Device, "Controller"};
-    device.input.append({0, 0, "Up"    });
-    device.input.append({1, 0, "Down"  });
-    device.input.append({2, 0, "Left"  });
-    device.input.append({3, 0, "Right" });
-    device.input.append({4, 0, "B"     });
-    device.input.append({5, 0, "A"     });
-    device.input.append({6, 0, "Select"});
-    device.input.append({7, 0, "Start" });
-    device.order = {0, 1, 2, 3, 4, 5, 6, 7};
-    this->device.append(device);
-  }
-
-  port.append({0, "Device", {device[0]}});
-}
-
-}

bsnes/gb/interface/interface.hpp

@@ -1,60 +0,0 @@
-#ifndef GB_HPP
-namespace GameBoy {
-#endif
-
-struct ID {
-  enum : unsigned {
-    GameBoyBootROM,
-    SuperGameBoyBootROM,
-    GameBoyColorBootROM,
-    GameBoyROM,
-    GameBoyColorROM,
-    RAM,
-  };
-
-  enum : unsigned {
-    Device = 1,
-  };
-};
-
-struct Interface : Emulator::Interface {
-  //Super Game Boy bindings
-  struct Hook {
-    virtual void lcdScanline() {}
-    virtual void joypWrite(bool p15, bool p14) {}
-  } *hook;
-
-  void lcdScanline();
-  void joypWrite(bool p15, bool p14);
-
-  double videoFrequency();
-  double audioFrequency();
-
-  bool loaded();
-  string sha256();
-  void load(unsigned id, const stream &stream, const string &markup = "");
-  void save(unsigned id, const stream &stream);
-  void unload();
-
-  void power();
-  void reset();
-  void run();
-
-  serializer serialize();
-  bool unserialize(serializer&);
-
-  void cheatSet(const lstring&);
-
-  void updatePalette();
-
-  Interface();
-
-private:
-  vector<Device> device;
-};
-
-extern Interface *interface;
-
-#ifndef GB_HPP
-}
-#endif

bsnes/gb/memory/memory.cpp

@@ -1,69 +0,0 @@
-#include <gb/gb.hpp>
-
-#define MEMORY_CPP
-namespace GameBoy {
-
-Unmapped unmapped;
-Bus bus;
-
-uint8_t& Memory::operator[](unsigned addr) {
-  return data[addr];
-}
-
-void Memory::allocate(unsigned size_) {
-  free();
-  size = size_;
-  data = new uint8_t[size]();
-}
-
-void Memory::copy(const uint8_t *data_, unsigned size_) {
-  free();
-  size = size_;
-  data = new uint8_t[size];
-  memcpy(data, data_, size);
-}
-
-void Memory::free() {
-  if(data) {
-    delete[] data;
-    data = 0;
-  }
-}
-
-Memory::Memory() {
-  data = 0;
-  size = 0;
-}
-
-Memory::~Memory() {
-  free();
-}
-
-//
-
-uint8 Bus::read(uint16 addr) {
-  uint8 data = mmio[addr]->mmio_read(addr);
-
-  if(cheat.override[addr]) {
-    for(unsigned n = 0; n < cheat.size(); n++) {
-      if(cheat[n].addr == addr) {
-        if(cheat[n].comp > 255 || cheat[n].comp == data) {
-          data = cheat[n].data;
-          break;
-        }
-      }
-    }
-  }
-
-  return data;
-}
-
-void Bus::write(uint16 addr, uint8 data) {
-  mmio[addr]->mmio_write(addr, data);
-}
-
-void Bus::power() {
-  for(unsigned n = 0x0000; n <= 0xffff; n++) mmio[n] = &unmapped;
-}
-
-}

bsnes/gb/memory/memory.hpp

@@ -1,32 +0,0 @@
-struct Memory {
-  uint8_t *data;
-  unsigned size;
-
-  uint8_t& operator[](unsigned addr);
-  void allocate(unsigned size);
-  void copy(const uint8_t *data, unsigned size);
-  void free();
-  Memory();
-  ~Memory();
-};
-
-struct MMIO {
-  virtual uint8 mmio_read(uint16 addr) = 0;
-  virtual void mmio_write(uint16 addr, uint8 data) = 0;
-};
-
-struct Unmapped : MMIO {
-  uint8 mmio_read(uint16) { return 0x00; }
-  void mmio_write(uint16, uint8) {}
-};
-
-struct Bus {
-  MMIO *mmio[65536];
-  uint8 read(uint16 addr);
-  void write(uint16 addr, uint8 data);
-
-  void power();
-};
-
-extern Unmapped unmapped;
-extern Bus bus;

bsnes/gb/ppu/cgb.cpp

@@ -1,185 +0,0 @@
-#ifdef PPU_CPP
-
-void PPU::cgb_render() {
-  for(unsigned n = 0; n < 160; n++) {
-    line[n] = 0x7fff;
-    origin[n] = Origin::None;
-  }
-
-  if(status.display_enable) {
-    cgb_render_bg();
-    if(status.window_display_enable) cgb_render_window();
-    if(status.ob_enable) cgb_render_ob();
-  }
-
-  uint32 *output = screen + status.ly * 160;
-  for(unsigned n = 0; n < 160; n++) output[n] = video.palette[line[n]];
-  interface->lcdScanline();
-}
-
-//Attributes:
-//0x80: 0 = OAM priority, 1 = BG priority
-//0x40: vertical flip
-//0x20: horizontal flip
-//0x08: VRAM bank#
-//0x07: palette#
-void PPU::cgb_read_tile(bool select, unsigned x, unsigned y, unsigned &tile, unsigned &attr, unsigned &data) {
-  unsigned tmaddr = 0x1800 + (select << 10);
-  tmaddr += (((y >> 3) << 5) + (x >> 3)) & 0x03ff;
-
-  tile = vram[0x0000 + tmaddr];
-  attr = vram[0x2000 + tmaddr];
-
-  unsigned tdaddr = attr & 0x08 ? 0x2000 : 0x0000;
-  if(status.bg_tiledata_select == 0) {
-    tdaddr += 0x1000 + ((int8)tile << 4);
-  } else {
-    tdaddr += 0x0000 + (tile << 4);
-  }
-
-  y &= 7;
-  if(attr & 0x40) y ^= 7;
-  tdaddr += y << 1;
-
-  data  = vram[tdaddr++] << 0;
-  data |= vram[tdaddr++] << 8;
-  if(attr & 0x20) data = hflip(data);
-}
-
-void PPU::cgb_render_bg() {
-  unsigned iy = (status.ly + status.scy) & 255;
-  unsigned ix = status.scx, tx = ix & 7;
-
-  unsigned tile, attr, data;
-  cgb_read_tile(status.bg_tilemap_select, ix, iy, tile, attr, data);
-
-  for(unsigned ox = 0; ox < 160; ox++) {
-    unsigned index = ((data & (0x0080 >> tx)) ? 1 : 0)
-                   | ((data & (0x8000 >> tx)) ? 2 : 0);
-    unsigned palette_index = ((attr & 0x07) << 3) + (index << 1);
-    unsigned palette = 0;
-    palette |= bgpd[palette_index++] << 0;
-    palette |= bgpd[palette_index++] << 8;
-    palette &= 0x7fff;
-
-    line[ox] = palette;
-    origin[ox] = (attr & 0x80 ? Origin::BGP : Origin::BG);
-
-    ix = (ix + 1) & 255;
-    tx = (tx + 1) & 7;
-    if(tx == 0) cgb_read_tile(status.bg_tilemap_select, ix, iy, tile, attr, data);
-  }
-}
-
-void PPU::cgb_render_window() {
-  if(status.ly - status.wy >= 144u) return;
-  if(status.wx >= 167u) return;
-  unsigned iy = status.wyc++;
-  unsigned ix = (7 - status.wx) & 255, tx = ix & 7;
-
-  unsigned tile, attr, data;
-  cgb_read_tile(status.window_tilemap_select, ix, iy, tile, attr, data);
-
-  for(unsigned ox = 0; ox < 160; ox++) {
-    unsigned index = ((data & (0x0080 >> tx)) ? 1 : 0)
-                   | ((data & (0x8000 >> tx)) ? 2 : 0);
-    unsigned palette_index = ((attr & 0x07) << 3) + (index << 1);
-    unsigned palette = 0;
-    palette |= bgpd[palette_index++] << 0;
-    palette |= bgpd[palette_index++] << 8;
-    palette &= 0x7fff;
-
-    if(ox - (status.wx - 7) < 160u) {
-      line[ox] = palette;
-      origin[ox] = (attr & 0x80 ? Origin::BGP : Origin::BG);
-    }
-
-    ix = (ix + 1) & 255;
-    tx = (tx + 1) & 7;
-    if(tx == 0) cgb_read_tile(status.window_tilemap_select, ix, iy, tile, attr, data);
-  }
-}
-
-//Attributes:
-//0x80: 0 = OBJ above BG, 1 = BG above OBJ
-//0x40: vertical flip
-//0x20: horizontal flip
-//0x08: VRAM bank#
-//0x07: palette#
-void PPU::cgb_render_ob() {
-  const unsigned Height = (status.ob_size == 0 ? 8 : 16);
-  unsigned sprite[10], sprites = 0;
-
-  //find first ten sprites on this scanline
-  for(unsigned s = 0; s < 40; s++) {
-    unsigned sy = oam[(s << 2) + 0] - 16;
-    unsigned sx = oam[(s << 2) + 1] -  8;
-
-    sy = status.ly - sy;
-    if(sy >= Height) continue;
-
-    sprite[sprites++] = s;
-    if(sprites == 10) break;
-  }
-
-  //sort by X-coordinate, when equal, lower address comes first
-  for(unsigned x = 0; x < sprites; x++) {
-    for(unsigned y = x + 1; y < sprites; y++) {
-      signed sx = oam[(sprite[x] << 2) + 1] - 8;
-      signed sy = oam[(sprite[y] << 2) + 1] - 8;
-      if(sy < sx) {
-        sprite[x] ^= sprite[y];
-        sprite[y] ^= sprite[x];
-        sprite[x] ^= sprite[y];
-      }
-    }
-  }
-
-  //render backwards, so that first sprite has highest priority
-  for(signed s = sprites - 1; s >= 0; s--) {
-    unsigned n = sprite[s] << 2;
-    unsigned sy = oam[n + 0] - 16;
-    unsigned sx = oam[n + 1] -  8;
-    unsigned tile = oam[n + 2] & ~status.ob_size;
-    unsigned attr = oam[n + 3];
-
-    sy = status.ly - sy;
-    if(sy >= Height) continue;
-    if(attr & 0x40) sy ^= (Height - 1);
-
-    unsigned tdaddr = (attr & 0x08 ? 0x2000 : 0x0000) + (tile << 4) + (sy << 1), data = 0;
-    data |= vram[tdaddr++] << 0;
-    data |= vram[tdaddr++] << 8;
-    if(attr & 0x20) data = hflip(data);
-
-    for(unsigned tx = 0; tx < 8; tx++) {
-      unsigned index = ((data & (0x0080 >> tx)) ? 1 : 0)
-                     | ((data & (0x8000 >> tx)) ? 2 : 0);
-      if(index == 0) continue;
-
-      unsigned palette_index = ((attr & 0x07) << 3) + (index << 1);
-      unsigned palette = 0;
-      palette |= obpd[palette_index++] << 0;
-      palette |= obpd[palette_index++] << 8;
-      palette &= 0x7fff;
-
-      unsigned ox = sx + tx;
-
-      if(ox < 160) {
-        //When LCDC.D0 (BG enable) is off, OB is always rendered above BG+Window
-        if(status.bg_enable) {
-          if(origin[ox] == Origin::BGP) continue;
-          if(attr & 0x80) {
-            if(origin[ox] == Origin::BG || origin[ox] == Origin::BGP) {
-              if(line[ox] > 0) continue;
-            }
-          }
-        }
-        line[ox] = palette;
-        origin[ox] = Origin::OB;
-      }
-    }
-  }
-}
-
-#endif

bsnes/gb/ppu/dmg.cpp

@@ -1,145 +0,0 @@
-#ifdef PPU_CPP
-
-void PPU::dmg_render() {
-  for(unsigned n = 0; n < 160; n++) {
-    line[n] = 0x00;
-    origin[n] = Origin::None;
-  }
-
-  if(status.display_enable) {
-    if(status.bg_enable) dmg_render_bg();
-    if(status.window_display_enable) dmg_render_window();
-    if(status.ob_enable) dmg_render_ob();
-  }
-
-  uint32 *output = screen + status.ly * 160;
-  for(unsigned n = 0; n < 160; n++) output[n] = video.palette[line[n]];
-  interface->lcdScanline();
-}
-
-uint16 PPU::dmg_read_tile(bool select, unsigned x, unsigned y) {
-  unsigned tmaddr = 0x1800 + (select << 10), tdaddr;
-  tmaddr += (((y >> 3) << 5) + (x >> 3)) & 0x03ff;
-  if(status.bg_tiledata_select == 0) {
-    tdaddr = 0x1000 + ((int8)vram[tmaddr] << 4);
-  } else {
-    tdaddr = 0x0000 + (vram[tmaddr] << 4);
-  }
-  tdaddr += (y & 7) << 1;
-  return (vram[tdaddr + 0] << 0) | (vram[tdaddr + 1] << 8);
-}
-
-void PPU::dmg_render_bg() {
-  unsigned iy = (status.ly + status.scy) & 255;
-  unsigned ix = status.scx, tx = ix & 7;
-  unsigned data = dmg_read_tile(status.bg_tilemap_select, ix, iy);
-
-  for(unsigned ox = 0; ox < 160; ox++) {
-    uint8 palette = ((data & (0x0080 >> tx)) ? 1 : 0)
-                  | ((data & (0x8000 >> tx)) ? 2 : 0);
-
-    line[ox] = bgp[palette];
-    origin[ox] = Origin::BG;
-
-    ix = (ix + 1) & 255;
-    tx = (tx + 1) & 7;
-
-    if(tx == 0) data = dmg_read_tile(status.bg_tilemap_select, ix, iy);
-  }
-}
-
-void PPU::dmg_render_window() {
-  if(status.ly - status.wy >= 144u) return;
-  if(status.wx >= 167u) return;
-  unsigned iy = status.wyc++;
-  unsigned ix = (7 - status.wx) & 255, tx = ix & 7;
-  unsigned data = dmg_read_tile(status.window_tilemap_select, ix, iy);
-
-  for(unsigned ox = 0; ox < 160; ox++) {
-    uint8 palette = ((data & (0x0080 >> tx)) ? 1 : 0)
-                  | ((data & (0x8000 >> tx)) ? 2 : 0);
-    if(ox - (status.wx - 7) < 160u) {
-      line[ox] = bgp[palette];
-      origin[ox] = Origin::BG;
-    }
-
-    ix = (ix + 1) & 255;
-    tx = (tx + 1) & 7;
-
-    if(tx == 0) data = dmg_read_tile(status.window_tilemap_select, ix, iy);
-  }
-}
-
-//Attributes:
-//0x80: 0 = OBJ above BG, 1 = BG above OBJ
-//0x40: vertical flip
-//0x20: horizontal flip
-//0x10: palette#
-void PPU::dmg_render_ob() {
-  const unsigned Height = (status.ob_size == 0 ? 8 : 16);
-  unsigned sprite[10], sprites = 0;
-
-  //find first ten sprites on this scanline
-  for(unsigned s = 0; s < 40; s++) {
-    unsigned sy = oam[(s << 2) + 0] - 16;
-    unsigned sx = oam[(s << 2) + 1] -  8;
-
-    sy = status.ly - sy;
-    if(sy >= Height) continue;
-
-    sprite[sprites++] = s;
-    if(sprites == 10) break;
-  }
-
-  //sort by X-coordinate, when equal, lower address comes first
-  for(unsigned x = 0; x < sprites; x++) {
-    for(unsigned y = x + 1; y < sprites; y++) {
-      signed sx = oam[(sprite[x] << 2) + 1] - 8;
-      signed sy = oam[(sprite[y] << 2) + 1] - 8;
-      if(sy < sx) {
-        sprite[x] ^= sprite[y];
-        sprite[y] ^= sprite[x];
-        sprite[x] ^= sprite[y];
-      }
-    }
-  }
-
-  //render backwards, so that first sprite has highest priority
-  for(signed s = sprites - 1; s >= 0; s--) {
-    unsigned n = sprite[s] << 2;
-    unsigned sy = oam[n + 0] - 16;
-    unsigned sx = oam[n + 1] -  8;
-    unsigned tile = oam[n + 2] & ~status.ob_size;
-    unsigned attr = oam[n + 3];
-
-    sy = status.ly - sy;
-    if(sy >= Height) continue;
-    if(attr & 0x40) sy ^= (Height - 1);
-
-    unsigned tdaddr = (tile << 4) + (sy << 1), data = 0;
-    data |= vram[tdaddr++] << 0;
-    data |= vram[tdaddr++] << 8;
-    if(attr & 0x20) data = hflip(data);
-
-    for(unsigned tx = 0; tx < 8; tx++) {
-      uint8 palette = ((data & (0x0080 >> tx)) ? 1 : 0)
-                    | ((data & (0x8000 >> tx)) ? 2 : 0);
-      if(palette == 0) continue;
-
-      palette = obp[(bool)(attr & 0x10)][palette];
-      unsigned ox = sx + tx;
-
-      if(ox < 160) {
-        if(attr & 0x80) {
-          if(origin[ox] == Origin::BG) {
-            if(line[ox] > 0) continue;
-          }
-        }
-        line[ox] = palette;
-        origin[ox] = Origin::OB;
-      }
-    }
-  }
-}
-
-#endif

bsnes/gb/ppu/ppu.cpp

@@ -1,157 +0,0 @@
-#include <gb/gb.hpp>
-
-//LY     =   0-153
-//Raster =   0-143
-//Vblank = 144-153
-
-//LX     =   0-455
-
-#define PPU_CPP
-namespace GameBoy {
-
-#include "mmio.cpp"
-#include "dmg.cpp"
-#include "cgb.cpp"
-#include "serialization.cpp"
-PPU ppu;
-
-void PPU::Main() {
-  ppu.main();
-}
-
-void PPU::main() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::All) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    add_clocks(4);
-    status.lx += 4;
-    if(status.lx >= 456) scanline();
-
-    if(status.display_enable && status.lx == 0) {
-      if(status.interrupt_oam) cpu.interrupt_raise(CPU::Interrupt::Stat);
-    }
-
-    if(status.display_enable && status.lx == 252) {
-      if(status.interrupt_hblank) cpu.interrupt_raise(CPU::Interrupt::Stat);
-      cpu.hblank();
-    }
-  }
-}
-
-void PPU::add_clocks(unsigned clocks) {
-  clock += clocks * cpu.frequency;
-  if(clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) {
-    co_switch(scheduler.active_thread = cpu.thread);
-  }
-}
-
-void PPU::scanline() {
-  status.lx -= 456;
-  if(++status.ly == 154) frame();
-
-  if(status.display_enable && status.interrupt_lyc == true) {
-    if(status.ly == status.lyc) cpu.interrupt_raise(CPU::Interrupt::Stat);
-  }
-
-  if(status.ly < 144) {
-    system.cgb() == false ? dmg_render() : cgb_render();
-  }
-
-  if(status.display_enable && status.ly == 144) {
-    cpu.interrupt_raise(CPU::Interrupt::Vblank);
-    if(status.interrupt_vblank) cpu.interrupt_raise(CPU::Interrupt::Stat);
-  }
-}
-
-void PPU::frame() {
-  cpu.mmio_joyp_poll();
-
-  status.ly = 0;
-  status.wyc = 0;
-  scheduler.exit(Scheduler::ExitReason::FrameEvent);
-}
-
-unsigned PPU::hflip(unsigned data) const {
-  return ((data & 0x8080) >> 7) | ((data & 0x4040) >> 5)
-       | ((data & 0x2020) >> 3) | ((data & 0x1010) >> 1)
-       | ((data & 0x0808) << 1) | ((data & 0x0404) << 3)
-       | ((data & 0x0202) << 5) | ((data & 0x0101) << 7);
-}
-
-void PPU::power() {
-  create(Main, 4 * 1024 * 1024);
-
-  for(unsigned n = 0x8000; n <= 0x9fff; n++) bus.mmio[n] = this;  //VRAM
-  for(unsigned n = 0xfe00; n <= 0xfe9f; n++) bus.mmio[n] = this;  //OAM
-
-  bus.mmio[0xff40] = this;  //LCDC
-  bus.mmio[0xff41] = this;  //STAT
-  bus.mmio[0xff42] = this;  //SCY
-  bus.mmio[0xff43] = this;  //SCX
-  bus.mmio[0xff44] = this;  //LY
-  bus.mmio[0xff45] = this;  //LYC
-  bus.mmio[0xff47] = this;  //BGP
-  bus.mmio[0xff48] = this;  //OBP0
-  bus.mmio[0xff49] = this;  //OBP1
-  bus.mmio[0xff4a] = this;  //WY
-  bus.mmio[0xff4b] = this;  //WX
-
-  if(system.cgb()) {
-  bus.mmio[0xff4f] = this;  //VBK
-  bus.mmio[0xff68] = this;  //BGPI
-  bus.mmio[0xff69] = this;  //BGPD
-  bus.mmio[0xff6a] = this;  //OBPI
-  bus.mmio[0xff6b] = this;  //OBPD
-  }
-
-  for(auto &n : screen) n = 0x0000;
-  for(auto &n : line) n = 0x0000;
-  for(auto &n : origin) n = Origin::None;
-
-  for(auto &n : vram) n = 0x00;
-  for(auto &n : oam) n = 0x00;
-  for(auto &n : bgp) n = 0x00;
-  for(auto &n : obp[0]) n = 0x00;
-  for(auto &n : obp[1]) n = 0x00;
-  for(auto &n : bgpd) n = 0x0000;
-  for(auto &n : obpd) n = 0x0000;
-
-  status.lx = 0;
-  status.wyc = 0;
-
-  status.display_enable = 0;
-  status.window_tilemap_select = 0;
-  status.window_display_enable = 0;
-  status.bg_tiledata_select = 0;
-  status.bg_tilemap_select = 0;
-  status.ob_size = 0;
-  status.ob_enable = 0;
-  status.bg_enable = 0;
-
-  status.interrupt_lyc = 0;
-  status.interrupt_oam = 0;
-  status.interrupt_vblank = 0;
-  status.interrupt_hblank = 0;
-
-  status.scy = 0;
-  status.scx = 0;
-  status.ly = 0;
-  status.lyc = 0;
-  status.wy = 0;
-  status.wx = 0;
-
-  status.vram_bank = 0;
-
-  status.bgpi_increment = 0;
-  status.bgpi = 0;
-
-  status.obpi_increment = 0;
-  status.obpi = 0;
-}
-
-PPU::PPU() {
-}
-
-}

bsnes/gb/ppu/ppu.hpp

@@ -1,97 +0,0 @@
-struct PPU : Thread, MMIO {
-  struct Status {
-    unsigned lx;
-    unsigned wyc;
-
-    //$ff40  LCDC
-    bool display_enable;
-    bool window_tilemap_select;
-    bool window_display_enable;
-    bool bg_tiledata_select;
-    bool bg_tilemap_select;
-    bool ob_size;
-    bool ob_enable;
-    bool bg_enable;
-
-    //$ff41  STAT
-    bool interrupt_lyc;
-    bool interrupt_oam;
-    bool interrupt_vblank;
-    bool interrupt_hblank;
-
-    //$ff42  SCY
-    uint8 scy;
-
-    //$ff43  SCX
-    uint8 scx;
-
-    //$ff44  LY
-    uint8 ly;
-
-    //$ff45  LYC
-    uint8 lyc;
-
-    //$ff4a  WY
-    uint8 wy;
-
-    //$ff4b  WX
-    uint8 wx;
-
-    //$ff4f  VBK
-    bool vram_bank;
-
-    //$ff68  BGPI
-    bool bgpi_increment;
-    uint6 bgpi;
-
-    //$ff6a  OBPI
-    bool obpi_increment;
-    uint8 obpi;
-  } status;
-
-  uint32 screen[160 * 144];
-  uint16 line[160];
-  struct Origin { enum : unsigned { None, BG, BGP, OB }; };
-  uint8 origin[160];
-
-  uint8 vram[16384];  //GB = 8192, GBC = 16384
-  uint8 oam[160];
-  uint8 bgp[4];
-  uint8 obp[2][4];
-  uint8 bgpd[64];
-  uint8 obpd[64];
-
-  static void Main();
-  void main();
-  void add_clocks(unsigned clocks);
-  void scanline();
-  void frame();
-
-  unsigned hflip(unsigned data) const;
-
-  //mmio.cpp
-  unsigned vram_addr(uint16 addr) const;
-  uint8 mmio_read(uint16 addr);
-  void mmio_write(uint16 addr, uint8 data);
-
-  //dmg.cpp
-  void dmg_render();
-  uint16 dmg_read_tile(bool select, unsigned x, unsigned y);
-  void dmg_render_bg();
-  void dmg_render_window();
-  void dmg_render_ob();
-
-  //cgb.cpp
-  void cgb_render();
-  void cgb_read_tile(bool select, unsigned x, unsigned y, unsigned &tile, unsigned &attr, unsigned &data);
-  void cgb_render_bg();
-  void cgb_render_window();
-  void cgb_render_ob();
-
-  void power();
-
-  void serialize(serializer&);
-  PPU();
-};
-
-extern PPU ppu;

bsnes/gb/ppu/serialization.cpp

@@ -1,53 +0,0 @@
-#ifdef PPU_CPP
-
-void PPU::serialize(serializer &s) {
-  Thread::serialize(s);
-
-  s.array(screen);
-  s.array(line);
-  s.array(origin);
-
-  s.array(vram);
-  s.array(oam);
-  s.array(bgp);
-  s.array(obp[0]);
-  s.array(obp[1]);
-  s.array(bgpd);
-  s.array(obpd);
-
-  s.integer(status.lx);
-  s.integer(status.wyc);
-
-  s.integer(status.display_enable);
-  s.integer(status.window_tilemap_select);
-  s.integer(status.window_display_enable);
-  s.integer(status.bg_tiledata_select);
-  s.integer(status.bg_tilemap_select);
-  s.integer(status.ob_size);
-  s.integer(status.ob_enable);
-  s.integer(status.bg_enable);
-
-  s.integer(status.interrupt_lyc);
-  s.integer(status.interrupt_oam);
-  s.integer(status.interrupt_vblank);
-  s.integer(status.interrupt_hblank);
-
-  s.integer(status.scy);
-  s.integer(status.scx);
-
-  s.integer(status.ly);
-  s.integer(status.lyc);
-
-  s.integer(status.wy);
-  s.integer(status.wx);
-
-  s.integer(status.vram_bank);
-
-  s.integer(status.bgpi_increment);
-  s.integer(status.bgpi);
-
-  s.integer(status.obpi_increment);
-  s.integer(status.obpi);
-}
-
-#endif

bsnes/gb/scheduler/scheduler.cpp

@@ -1,30 +0,0 @@
-#include <gb/gb.hpp>
-
-#define SCHEDULER_CPP
-namespace GameBoy {
-
-Scheduler scheduler;
-
-void Scheduler::enter() {
-  host_thread = co_active();
-  co_switch(active_thread);
-}
-
-void Scheduler::exit(ExitReason reason) {
-  exit_reason = reason;
-  active_thread = co_active();
-  co_switch(host_thread);
-}
-
-void Scheduler::init() {
-  host_thread = co_active();
-  active_thread = cpu.thread;
-}
-
-Scheduler::Scheduler() {
-  exit_reason = ExitReason::UnknownEvent;
-  host_thread = 0;
-  active_thread = 0;
-}
-
-}

bsnes/gb/system/serialization.cpp

@@ -1,64 +0,0 @@
-#ifdef SYSTEM_CPP
-
-serializer System::serialize() {
-  serializer s(serialize_size);
-
-  unsigned signature = 0x31545342, version = Info::SerializerVersion;
-  char hash[64], description[512];
-  memcpy(&hash, (const char*)cartridge.sha256(), 64);
-  memset(&description, 0, sizeof description);
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  serialize_all(s);
-  return s;
-}
-
-bool System::unserialize(serializer &s) {
-  unsigned signature, version;
-  char hash[64], description[512];
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  if(signature != 0x31545342) return false;
-  if(version != Info::SerializerVersion) return false;
-
-  power();
-  serialize_all(s);
-  return true;
-}
-
-void System::serialize(serializer &s) {
-  s.integer(clocks_executed);
-}
-
-void System::serialize_all(serializer &s) {
-  cartridge.serialize(s);
-  system.serialize(s);
-  cpu.serialize(s);
-  ppu.serialize(s);
-  apu.serialize(s);
-}
-
-void System::serialize_init() {
-  serializer s;
-
-  unsigned signature = 0, version = 0, crc32 = 0;
-  char hash[64], description[512];
-
-  s.integer(signature);
-  s.integer(version);
-  s.array(hash);
-  s.array(description);
-
-  serialize_all(s);
-  serialize_size = s.size();
-}
-
-#endif

bsnes/gb/system/system.cpp

@@ -1,69 +0,0 @@
-#include <gb/gb.hpp>
-
-#define SYSTEM_CPP
-namespace GameBoy {
-
-#include "serialization.cpp"
-System system;
-
-void System::run() {
-  scheduler.sync = Scheduler::SynchronizeMode::None;
-
-  scheduler.enter();
-  if(scheduler.exit_reason() == Scheduler::ExitReason::FrameEvent) {
-    interface->videoRefresh(ppu.screen, 4 * 160, 160, 144);
-  }
-}
-
-void System::runtosave() {
-  scheduler.sync = Scheduler::SynchronizeMode::CPU;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::All;
-  scheduler.active_thread = ppu.thread;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::All;
-  scheduler.active_thread = apu.thread;
-  runthreadtosave();
-
-  scheduler.sync = Scheduler::SynchronizeMode::None;
-}
-
-void System::runthreadtosave() {
-  while(true) {
-    scheduler.enter();
-    if(scheduler.exit_reason() == Scheduler::ExitReason::SynchronizeEvent) break;
-    if(scheduler.exit_reason() == Scheduler::ExitReason::FrameEvent) {
-      interface->videoRefresh(ppu.screen, 4 * 160, 160, 144);
-    }
-  }
-}
-
-void System::init() {
-  assert(interface != 0);
-}
-
-void System::load(Revision revision) {
-  this->revision = revision;
-  serialize_init();
-}
-
-void System::power() {
-  bus.power();
-  cartridge.power();
-  cpu.power();
-  ppu.power();
-  apu.power();
-  scheduler.init();
-
-  clocks_executed = 0;
-}
-
-System::System() {
-  for(auto &byte : bootROM.dmg) byte = 0;
-  for(auto &byte : bootROM.sgb) byte = 0;
-  for(auto &byte : bootROM.cgb) byte = 0;
-}
-
-}

bsnes/gb/system/system.hpp

@@ -1,49 +0,0 @@
-class Interface;
-
-enum class Input : unsigned {
-  Up, Down, Left, Right, B, A, Select, Start,
-};
-
-struct System : property<System> {
-  enum class Revision : unsigned {
-    GameBoy,
-    SuperGameBoy,
-    GameBoyColor,
-  };
-  readonly<Revision> revision;
-  inline bool dmg() const { return revision == Revision::GameBoy; }
-  inline bool sgb() const { return revision == Revision::SuperGameBoy; }
-  inline bool cgb() const { return revision == Revision::GameBoyColor; }
-
-  struct BootROM {
-    uint8 dmg[ 256];
-    uint8 sgb[ 256];
-    uint8 cgb[2048];
-  } bootROM;
-
-  void run();
-  void runtosave();
-  void runthreadtosave();
-
-  void init();
-  void load(Revision);
-  void power();
-
-  unsigned clocks_executed;
-
-  //serialization.cpp
-  unsigned serialize_size;
-
-  serializer serialize();
-  bool unserialize(serializer&);
-
-  void serialize(serializer&);
-  void serialize_all(serializer&);
-  void serialize_init();
-
-  System();
-};
-
-#include <gb/interface/interface.hpp>
-
-extern System system;

bsnes/gb/video/video.cpp

@@ -1,65 +0,0 @@
-#include <gb/gb.hpp>
-
-#define VIDEO_CPP
-namespace GameBoy {
-
-Video video;
-
-void Video::generate_palette() {
-  if(system.dmg()) for(unsigned n = 0; n < 4; n++) palette[n] = palette_dmg(n);
-  if(system.sgb()) for(unsigned n = 0; n < 4; n++) palette[n] = palette_sgb(n);
-  if(system.cgb()) for(unsigned n = 0; n < (1 << 15); n++) palette[n] = palette_cgb(n);
-}
-
-Video::Video() {
-  palette = new unsigned[1 << 15]();
-}
-
-Video::~Video() {
-  delete[] palette;
-}
-
-unsigned Video::palette_dmg(unsigned color) const {
-  unsigned R = monochrome[color][0] * 65535.0;
-  unsigned G = monochrome[color][1] * 65535.0;
-  unsigned B = monochrome[color][2] * 65535.0;
-
-  return interface->videoColor(color, R, G, B);
-}
-
-unsigned Video::palette_sgb(unsigned color) const {
-  unsigned R = (3 - color) * 21845;
-  unsigned G = (3 - color) * 21845;
-  unsigned B = (3 - color) * 21845;
-
-  return interface->videoColor(color, R, G, B);
-}
-
-unsigned Video::palette_cgb(unsigned color) const {
-  unsigned r = (color >>  0) & 31;
-  unsigned g = (color >>  5) & 31;
-  unsigned b = (color >> 10) & 31;
-
-  unsigned R = (r * 26 + g *  4 + b *  2);
-  unsigned G = (         g * 24 + b *  8);
-  unsigned B = (r *  6 + g *  4 + b * 22);
-
-  R = min(960, R);
-  G = min(960, G);
-  B = min(960, B);
-
-  R = R << 6 | R >> 4;
-  G = G << 6 | G >> 4;
-  B = B << 6 | B >> 4;
-
-  return interface->videoColor(color, R, G, B);
-}
-
-const double Video::monochrome[4][3] = {
-  { 0.605, 0.734, 0.059 },
-  { 0.543, 0.672, 0.059 },
-  { 0.188, 0.383, 0.188 },
-  { 0.059, 0.219, 0.059 },
-};
-
-}

bsnes/gb/video/video.hpp

@@ -1,15 +0,0 @@
-struct Video {
-  uint32_t *palette;
-  void generate_palette();
-
-  Video();
-  ~Video();
-
-private:
-  static const double monochrome[4][3];
-  uint32_t palette_dmg(unsigned color) const;
-  uint32_t palette_sgb(unsigned color) const;
-  uint32_t palette_cgb(unsigned color) const;
-};
-
-extern Video video;

bsnes/gba/Makefile

@@ -1,14 +0,0 @@
-gba_objects := gba-memory gba-interface gba-scheduler gba-system
-gba_objects += gba-video gba-cartridge
-gba_objects += gba-cpu gba-ppu gba-apu
-objects += $(gba_objects)
-
-obj/gba-memory.o:    $(gba)/memory/memory.cpp $(call rwildcard,$(gba)/memory)
-obj/gba-interface.o: $(gba)/interface/interface.cpp $(call rwildcard,$(gba)/interface)
-obj/gba-scheduler.o: $(gba)/scheduler/scheduler.cpp $(call rwildcard,$(gba)/scheduler)
-obj/gba-system.o:    $(gba)/system/system.cpp $(call rwildcard,$(gba)/system)
-obj/gba-video.o:     $(gba)/video/video.cpp $(call rwildcard,$(gba)/video)
-obj/gba-cartridge.o: $(gba)/cartridge/cartridge.cpp $(call rwildcard,$(gba)/cartridge)
-obj/gba-cpu.o:       $(gba)/cpu/cpu.cpp $(call rwildcard,$(gba)/cpu)
-obj/gba-ppu.o:       $(gba)/ppu/ppu.cpp $(call rwildcard,$(gba)/ppu)
-obj/gba-apu.o:       $(gba)/apu/apu.cpp $(call rwildcard,$(gba)/apu)

bsnes/gba/apu/apu.cpp

@@ -1,98 +0,0 @@
-#include <gba/gba.hpp>
-
-namespace GameBoyAdvance {
-
-#include "registers.cpp"
-#include "mmio.cpp"
-#include "square.cpp"
-#include "square1.cpp"
-#include "square2.cpp"
-#include "wave.cpp"
-#include "noise.cpp"
-#include "sequencer.cpp"
-#include "fifo.cpp"
-#include "serialization.cpp"
-APU apu;
-
-void APU::Enter() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::All) {
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    apu.main();
-  }
-}
-
-void APU::main() {
-  for(unsigned n = 0; n < 128; n++) {
-    runsequencer();
-  }
-
-  signed lsample = regs.bias.level - 0x0200;
-  signed rsample = regs.bias.level - 0x0200;
-
-  //(4-bit x 4 -> 6-bit) + 3-bit volume = 9-bit output
-  if(sequencer.masterenable) {
-    signed lsequence = 0;
-    if(sequencer.lenable[0]) lsequence += square1.output;
-    if(sequencer.lenable[1]) lsequence += square2.output;
-    if(sequencer.lenable[2]) lsequence +=    wave.output;
-    if(sequencer.lenable[3]) lsequence +=   noise.output;
-
-    signed rsequence = 0;
-    if(sequencer.renable[0]) rsequence += square1.output;
-    if(sequencer.renable[1]) rsequence += square2.output;
-    if(sequencer.renable[2]) rsequence +=    wave.output;
-    if(sequencer.renable[3]) rsequence +=   noise.output;
-
-    if(sequencer.volume < 3) {
-      lsample += lsequence * (sequencer.lvolume + 1) >> (2 - sequencer.volume);
-      rsample += rsequence * (sequencer.rvolume + 1) >> (2 - sequencer.volume);
-    }
-  }
-
-  //(8-bit x 2 -> 7-bit) + 1-bit volume = 10-bit output
-  signed fifo0 = fifo[0].output + (1 << fifo[0].volume);
-  signed fifo1 = fifo[1].output + (1 << fifo[1].volume);
-
-  if(fifo[0].lenable) lsample += fifo0;
-  if(fifo[1].lenable) lsample += fifo1;
-
-  if(fifo[0].renable) rsample += fifo0;
-  if(fifo[1].renable) rsample += fifo1;
-
-  lsample = sclamp<10>(lsample);
-  rsample = sclamp<10>(rsample);
-
-  if(regs.bias.amplitude == 1) lsample &=  ~3, rsample &=  ~3;
-  if(regs.bias.amplitude == 2) lsample &=  ~7, rsample &=  ~7;
-  if(regs.bias.amplitude == 3) lsample &= ~15, rsample &= ~15;
-
-  if(cpu.regs.mode == CPU::Registers::Mode::Stop) lsample = 0, rsample = 0;
-  interface->audioSample(sclamp<16>(lsample << 7), sclamp<16>(rsample << 7));  //should be <<5, use <<7 for added volume
-  step(512);
-}
-
-void APU::step(unsigned clocks) {
-  clock += clocks;
-  if(clock >= 0 && scheduler.sync != Scheduler::SynchronizeMode::All) co_switch(cpu.thread);
-}
-
-void APU::power() {
-  create(APU::Enter, 16777216);
-
-  square1.power();
-  square2.power();
-  wave.power();
-  noise.power();
-  sequencer.power();
-  fifo[0].power();
-  fifo[1].power();
-
-  regs.bias = 0x0200;
-
-  for(unsigned n = 0x060; n <= 0x0a7; n++) bus.mmio[n] = this;
-}
-
-}

bsnes/gba/apu/mmio.cpp

@@ -1,209 +0,0 @@
-uint8 APU::read(uint32 addr) {
-  switch(addr) {
-
-  //NR10
-  case 0x04000060: return square1.read(0);
-  case 0x04000061: return 0u;
-
-  //NR11 + NR12
-  case 0x04000062: return square1.read(1);
-  case 0x04000063: return square1.read(2);
-
-  //NR13 + NR14
-  case 0x04000064: return square1.read(3);
-  case 0x04000065: return square1.read(4);
-
-  //NR21 + NR22
-  case 0x04000068: return square2.read(1);
-  case 0x04000069: return square2.read(2);
-
-  //NR23 + NR24
-  case 0x0400006c: return square2.read(3);
-  case 0x0400006d: return square2.read(4);
-
-  //NR30
-  case 0x04000070: return wave.read(0);
-  case 0x04000071: return 0u;
-
-  //NR31 + NR32
-  case 0x04000072: return wave.read(1);
-  case 0x04000073: return wave.read(2);
-
-  //NR33 + NR34
-  case 0x04000074: return wave.read(3);
-  case 0x04000075: return wave.read(4);
-
-  //NR41 + NR42
-  case 0x04000078: return noise.read(1);
-  case 0x04000079: return noise.read(2);
-
-  //NR43 + NR44
-  case 0x0400007c: return noise.read(3);
-  case 0x0400007d: return noise.read(4);
-
-  //NR50 + NR51
-  case 0x04000080: return sequencer.read(0);
-  case 0x04000081: return sequencer.read(1);
-
-  //NR52
-  case 0x04000084: return sequencer.read(2);
-  case 0x04000085: return 0u;
-
-  //SOUNDBIAS
-  case 0x04000088: return regs.bias >> 0;
-  case 0x04000089: return regs.bias >> 8;
-
-  //WAVE_RAM0_L
-  case 0x04000090: return wave.readram( 0);
-  case 0x04000091: return wave.readram( 1);
-
-  //WAVE_RAM0_H
-  case 0x04000092: return wave.readram( 2);
-  case 0x04000093: return wave.readram( 3);
-
-  //WAVE_RAM1_L
-  case 0x04000094: return wave.readram( 4);
-  case 0x04000095: return wave.readram( 5);
-
-  //WAVE_RAM1_H
-  case 0x04000096: return wave.readram( 6);
-  case 0x04000097: return wave.readram( 7);
-
-  //WAVE_RAM2_L
-  case 0x04000098: return wave.readram( 8);
-  case 0x04000099: return wave.readram( 9);
-
-  //WAVE_RAM2_H
-  case 0x0400009a: return wave.readram(10);
-  case 0x0400009b: return wave.readram(11);
-
-  //WAVE_RAM3_L
-  case 0x0400009c: return wave.readram(12);
-  case 0x0400009d: return wave.readram(13);
-
-  //WAVE_RAM3_H
-  case 0x0400009e: return wave.readram(14);
-  case 0x0400009f: return wave.readram(15);
-
-  }
-
-  return 0u;
-}
-
-void APU::write(uint32 addr, uint8 byte) {
-  switch(addr) {
-
-  //NR10
-  case 0x04000060: return square1.write(0, byte);
-  case 0x04000061: return;
-
-  //NR11 + NR12
-  case 0x04000062: return square1.write(1, byte);
-  case 0x04000063: return square1.write(2, byte);
-
-  //NR13 + NR14
-  case 0x04000064: return square1.write(3, byte);
-  case 0x04000065: return square1.write(4, byte);
-
-  //NR21 + NR22
-  case 0x04000068: return square2.write(1, byte);
-  case 0x04000069: return square2.write(2, byte);
-
-  //NR23 + NR24
-  case 0x0400006c: return square2.write(3, byte);
-  case 0x0400006d: return square2.write(4, byte);
-
-  //NR30
-  case 0x04000070: return wave.write(0, byte);
-  case 0x04000071: return;
-
-  //NR31 + NR32
-  case 0x04000072: return wave.write(1, byte);
-  case 0x04000073: return wave.write(2, byte);
-
-  //NR33 + NR34
-  case 0x04000074: return wave.write(3, byte);
-  case 0x04000075: return wave.write(4, byte);
-
-  //NR41 + NR42
-  case 0x04000078: return noise.write(1, byte);
-  case 0x04000079: return noise.write(2, byte);
-
-  //NR43 + NR44
-  case 0x0400007c: return noise.write(3, byte);
-  case 0x0400007d: return noise.write(4, byte);
-
-  //NR50 + NR51
-  case 0x04000080: return sequencer.write(0, byte);
-  case 0x04000081: return sequencer.write(1, byte);
-
-  //SOUND_CNT_H
-  case 0x04000082:
-    sequencer.volume = byte >> 0;
-    fifo[0].volume   = byte >> 2;
-    fifo[1].volume   = byte >> 3;
-    return;
-  case 0x04000083:
-    fifo[0].renable = byte >> 0;
-    fifo[0].lenable = byte >> 1;
-    fifo[0].timer   = byte >> 2;
-    if(byte & 1 << 3) fifo[0].reset();
-    fifo[1].renable = byte >> 4;
-    fifo[1].lenable = byte >> 5;
-    fifo[1].timer   = byte >> 6;
-    if(byte & 1 << 7) fifo[1].reset();
-    return;
-
-  //NR52
-  case 0x04000084: return sequencer.write(2, byte);
-  case 0x04000085: return;
-
-  //SOUNDBIAS
-  case 0x04000088: regs.bias = (regs.bias & 0xff00) | (byte << 0); return;
-  case 0x04000089: regs.bias = (regs.bias & 0x00ff) | (byte << 8); return;
-
-  //WAVE_RAM0_L
-  case 0x04000090: return wave.writeram( 0, byte);
-  case 0x04000091: return wave.writeram( 1, byte);
-
-  //WAVE_RAM0_H
-  case 0x04000092: return wave.writeram( 2, byte);
-  case 0x04000093: return wave.writeram( 3, byte);
-
-  //WAVE_RAM1_L
-  case 0x04000094: return wave.writeram( 4, byte);
-  case 0x04000095: return wave.writeram( 5, byte);
-
-  //WAVE_RAM1_H
-  case 0x04000096: return wave.writeram( 6, byte);
-  case 0x04000097: return wave.writeram( 7, byte);
-
-  //WAVE_RAM2_L
-  case 0x04000098: return wave.writeram( 8, byte);
-  case 0x04000099: return wave.writeram( 9, byte);
-
-  //WAVE_RAM2_H
-  case 0x0400009a: return wave.writeram(10, byte);
-  case 0x0400009b: return wave.writeram(11, byte);
-
-  //WAVE_RAM3_L
-  case 0x0400009c: return wave.writeram(12, byte);
-  case 0x0400009d: return wave.writeram(13, byte);
-
-  //WAVE_RAM3_H
-  case 0x0400009e: return wave.writeram(14, byte);
-  case 0x0400009f: return wave.writeram(15, byte);
-
-  //FIFO_A_L
-  //FIFO_A_H
-  case 0x040000a0: case 0x040000a1:
-  case 0x040000a2: case 0x040000a3:
-    return fifo[0].write(byte);
-
-  //FIFO_B_L
-  //FIFO_B_H
-  case 0x040000a4: case 0x040000a5:
-  case 0x040000a6: case 0x040000a7:
-    return fifo[1].write(byte);
-  }
-}

bsnes/gba/apu/noise.cpp

@@ -1,93 +0,0 @@
-unsigned APU::Noise::divider() const {
-  if(divisor == 0) return 8;
-  return divisor * 16;
-}
-
-void APU::Noise::run() {
-  if(period && --period == 0) {
-    period = divider() << frequency;
-    if(frequency < 14) {
-      bool bit = (lfsr ^ (lfsr >> 1)) & 1;
-      lfsr = (lfsr >> 1) ^ (bit << (narrowlfsr ? 6 : 14));
-    }
-  }
-
-  output = volume;
-  if(enable == false || (lfsr & 1)) output = 0;
-}
-
-void APU::Noise::clocklength() {
-  if(enable && counter) {
-    if(++length == 0) enable = false;
-  }
-}
-
-void APU::Noise::clockenvelope() {
-  if(enable && envelope.frequency && --envelope.period == 0) {
-    envelope.period = envelope.frequency;
-    if(envelope.direction == 0 && volume >  0) volume--;
-    if(envelope.direction == 1 && volume < 15) volume++;
-  }
-}
-
-uint8 APU::Noise::read(unsigned addr) const {
-  switch(addr) {
-  case 1: return (length << 0);
-  case 2: return (envelope.frequency << 0) | (envelope.direction << 3) | (envelope.volume << 4);
-  case 3: return (divisor << 0) | (narrowlfsr << 3) | (frequency << 4);
-  case 4: return (counter << 6) | (initialize << 7);
-  }
-}
-
-void APU::Noise::write(unsigned addr, uint8 byte) {
-  switch(addr) {
-  case 1:  //NR41
-    length = byte >> 0;
-    break;
-
-  case 2:  //NR42
-    envelope.frequency = byte >> 0;
-    envelope.direction = byte >> 3;
-    envelope.volume    = byte >> 4;
-    if(envelope.dacenable() == false) enable = false;
-    break;
-
-  case 3:  //NR43
-    divisor    = byte >> 0;
-    narrowlfsr = byte >> 3;
-    frequency  = byte >> 4;
-    period = divider() << frequency;
-    break;
-
-  case 4:  //NR44
-    counter    = byte >> 6;
-    initialize = byte >> 7;
-
-    if(initialize) {
-      enable = envelope.dacenable();
-      lfsr = ~0u;
-      envelope.period = envelope.frequency;
-      volume = envelope.volume;
-    }
-
-    break;
-  }
-}
-
-void APU::Noise::power() {
-  envelope.frequency = 0;
-  envelope.direction = 0;
-  envelope.volume = 0;
-  envelope.period = 0;
-  length = 0;
-  divisor = 0;
-  narrowlfsr = 0;
-  frequency = 0;
-  counter = 0;
-  initialize = 0;
-  enable = 0;
-  lfsr = 0;
-  output = 0;
-  period = 0;
-  volume = 0;
-}

bsnes/gba/apu/registers.hpp

@@ -1,158 +0,0 @@
-struct Registers {
-  struct SoundBias {
-    uint10 level;
-    uint2 amplitude;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    SoundBias& operator=(const SoundBias&) = delete;
-  } bias;
-
-  unsigned clock;
-} regs;
-
-struct Sweep {
-  uint3 shift;
-  uint1 direction;
-  uint3 frequency;
-
-  uint1 enable;
-  uint1 negate;
-  uint3 period;
-};
-
-struct Envelope {
-  uint3 frequency;
-  uint1 direction;
-  uint4 volume;
-
-  uint3 period;
-
-  inline bool dacenable() const { return volume || direction; }
-};
-
-struct Square {
-  Envelope envelope;
-  uint1 enable;
-  uint6 length;
-  uint2 duty;
-  uint11 frequency;
-  uint1 counter;
-  uint1 initialize;
-
-  signed shadowfrequency;
-  uint1 signal;
-  uint4 output;
-  unsigned period;
-  uint3 phase;
-  uint4 volume;
-
-  void run();
-  void clocklength();
-  void clockenvelope();
-};
-
-struct Square1 : Square {
-  Sweep sweep;
-
-  void runsweep(bool update);
-  void clocksweep();
-  uint8 read(unsigned addr) const;
-  void write(unsigned addr, uint8 byte);
-  void power();
-} square1;
-
-struct Square2 : Square {
-  uint8 read(unsigned addr) const;
-  void write(unsigned addr, uint8 byte);
-  void power();
-} square2;
-
-struct Wave {
-  uint1 mode;
-  uint1 bank;
-  uint1 dacenable;
-  uint8 length;
-  uint3 volume;
-  uint11 frequency;
-  uint1 counter;
-  uint1 initialize;
-  uint4 pattern[32];
-
-  uint1 enable;
-  uint4 output;
-  uint4 patternaddr;
-  uint1 patternbank;
-  uint4 patternsample;
-  unsigned period;
-
-  void run();
-  void clocklength();
-  uint8 read(unsigned addr) const;
-  void write(unsigned addr, uint8 byte);
-  uint8 readram(unsigned addr) const;
-  void writeram(unsigned addr, uint8 byte);
-  void power();
-} wave;
-
-struct Noise {
-  Envelope envelope;
-  uint6 length;
-  uint3 divisor;
-  uint1 narrowlfsr;
-  uint4 frequency;
-  uint1 counter;
-  uint1 initialize;
-
-  uint1 enable;
-  uint15 lfsr;
-  uint4 output;
-  unsigned period;
-  uint4 volume;
-
-  unsigned divider() const;
-  void run();
-  void clocklength();
-  void clockenvelope();
-  uint8 read(unsigned addr) const;
-  void write(unsigned addr, uint8 byte);
-  void power();
-} noise;
-
-struct Sequencer {
-  uint2 volume;
-  uint3 lvolume;
-  uint3 rvolume;
-  uint1 lenable[4];
-  uint1 renable[4];
-  uint1 enable[4];
-  uint1 masterenable;
-
-  uint13 base;
-  uint3 step;
-  int16 lsample;
-  int16 rsample;
-
-  uint8 read(unsigned addr) const;
-  void write(unsigned addr, uint8 byte);
-  void power();
-} sequencer;
-
-struct FIFO {
-  int8 sample[32];
-  int8 output;
-
-  uint5 rdoffset;
-  uint5 wroffset;
-  uint6 size;
-
-  uint1 volume;  //0 = 50%, 1 = 100%
-  uint1 lenable;
-  uint1 renable;
-  uint1 timer;
-
-  void read();
-  void write(int8 byte);
-  void reset();
-  void power();
-} fifo[2];

bsnes/gba/apu/serialization.cpp

@@ -1,107 +0,0 @@
-void APU::serialize(serializer &s) {
-  Thread::serialize(s);
-
-  s.integer(regs.bias.level);
-  s.integer(regs.bias.amplitude);
-  s.integer(regs.clock);
-
-  s.integer(square1.sweep.shift);
-  s.integer(square1.sweep.direction);
-  s.integer(square1.sweep.frequency);
-  s.integer(square1.sweep.enable);
-  s.integer(square1.sweep.negate);
-  s.integer(square1.sweep.period);
-
-  s.integer(square1.envelope.frequency);
-  s.integer(square1.envelope.direction);
-  s.integer(square1.envelope.volume);
-  s.integer(square1.envelope.period);
-
-  s.integer(square1.enable);
-  s.integer(square1.length);
-  s.integer(square1.duty);
-  s.integer(square1.frequency);
-  s.integer(square1.counter);
-  s.integer(square1.initialize);
-  s.integer(square1.shadowfrequency);
-  s.integer(square1.signal);
-  s.integer(square1.output);
-  s.integer(square1.period);
-  s.integer(square1.phase);
-  s.integer(square1.volume);
-
-  s.integer(square2.envelope.frequency);
-  s.integer(square2.envelope.direction);
-  s.integer(square2.envelope.volume);
-  s.integer(square2.envelope.period);
-
-  s.integer(square2.enable);
-  s.integer(square2.length);
-  s.integer(square2.duty);
-  s.integer(square2.frequency);
-  s.integer(square2.counter);
-  s.integer(square2.initialize);
-  s.integer(square2.shadowfrequency);
-  s.integer(square2.signal);
-  s.integer(square2.output);
-  s.integer(square2.period);
-  s.integer(square2.phase);
-  s.integer(square2.volume);
-
-  s.integer(wave.mode);
-  s.integer(wave.bank);
-  s.integer(wave.dacenable);
-  s.integer(wave.length);
-  s.integer(wave.volume);
-  s.integer(wave.frequency);
-  s.integer(wave.counter);
-  s.integer(wave.initialize);
-  for(auto &value : wave.pattern) s.integer(value);
-  s.integer(wave.enable);
-  s.integer(wave.output);
-  s.integer(wave.patternaddr);
-  s.integer(wave.patternbank);
-  s.integer(wave.patternsample);
-  s.integer(wave.period);
-
-  s.integer(noise.envelope.frequency);
-  s.integer(noise.envelope.direction);
-  s.integer(noise.envelope.volume);
-  s.integer(noise.envelope.period);
-
-  s.integer(noise.length);
-  s.integer(noise.divisor);
-  s.integer(noise.narrowlfsr);
-  s.integer(noise.frequency);
-  s.integer(noise.counter);
-  s.integer(noise.initialize);
-  s.integer(noise.enable);
-  s.integer(noise.lfsr);
-  s.integer(noise.output);
-  s.integer(noise.period);
-  s.integer(noise.volume);
-
-  s.integer(sequencer.volume);
-  s.integer(sequencer.lvolume);
-  s.integer(sequencer.rvolume);
-  for(auto &flag : sequencer.lenable) s.integer(flag);
-  for(auto &flag : sequencer.renable) s.integer(flag);
-  for(auto &flag : sequencer.enable) s.integer(flag);
-  s.integer(sequencer.masterenable);
-  s.integer(sequencer.base);
-  s.integer(sequencer.step);
-  s.integer(sequencer.lsample);
-  s.integer(sequencer.rsample);
-
-  for(auto &f : fifo) {
-    for(auto &value : f.sample) s.integer(value);
-    s.integer(f.output);
-    s.integer(f.rdoffset);
-    s.integer(f.wroffset);
-    s.integer(f.size);
-    s.integer(f.volume);
-    s.integer(f.lenable);
-    s.integer(f.renable);
-    s.integer(f.timer);
-  }
-}

bsnes/gba/apu/square1.cpp

@@ -1,104 +0,0 @@
-void APU::Square1::runsweep(bool update) {
-  if(sweep.enable == false) return;
-
-  sweep.negate = sweep.direction;
-  unsigned delta = shadowfrequency >> sweep.shift;
-  signed updatefrequency = shadowfrequency + (sweep.negate ? -delta : delta);
-
-  if(updatefrequency > 2047) {
-    enable = false;
-  } else if(sweep.shift && update) {
-    shadowfrequency = updatefrequency;
-    frequency = updatefrequency;
-    period = 4 * (2048 - frequency);
-  }
-}
-
-void APU::Square1::clocksweep() {
-  if(enable && sweep.frequency && --sweep.period == 0) {
-    sweep.period = sweep.frequency;
-    runsweep(1);
-    runsweep(0);
-  }
-}
-
-uint8 APU::Square1::read(unsigned addr) const {
-  switch(addr) {
-  case 0: return (sweep.shift << 0) | (sweep.direction << 3) | (sweep.frequency << 4);
-  case 1: return (length << 0) | (duty << 6);
-  case 2: return (envelope.frequency << 0) | (envelope.direction << 3) | (envelope.volume << 4);
-  case 3: return (frequency << 0);
-  case 4: return (frequency >> 8) | (counter << 6) | (initialize << 7);
-  }
-}
-
-void APU::Square1::write(unsigned addr, uint8 byte) {
-  switch(addr) {
-  case 0:  //NR10
-    if(sweep.negate && sweep.direction && !(byte & 0x08)) enable = false;
-    sweep.shift     = byte >> 0;
-    sweep.direction = byte >> 3;
-    sweep.frequency = byte >> 4;
-    break;
-
-  case 1:  //NR11
-    length = byte >> 0;
-    duty   = byte >> 6;
-    break;
-
-  case 2:  //NR12
-    envelope.frequency = byte >> 0;
-    envelope.direction = byte >> 3;
-    envelope.volume    = byte >> 4;
-    if(envelope.dacenable() == false) enable = false;
-    break;
-
-  case 3:  //NR13
-    frequency = (frequency & 0xff00) | (byte << 0);
-    break;
-
-  case 4:  //NR14
-    frequency = (frequency & 0x00ff) | (byte << 8);
-    counter    = byte >> 6;
-    initialize = byte >> 7;
-
-    if(initialize) {
-      enable = envelope.dacenable();
-      period = 4 * (2048 - frequency);
-      envelope.period = envelope.frequency;
-      volume = envelope.volume;
-      shadowfrequency = frequency;
-      sweep.period = sweep.frequency;
-      sweep.enable = sweep.period || sweep.shift;
-      sweep.negate = false;
-      if(sweep.shift) runsweep(0);
-    }
-
-    break;
-  }
-}
-
-void APU::Square1::power() {
-  envelope.frequency = 0;
-  envelope.direction = 0;
-  envelope.direction = 0;
-  envelope.period = 0;
-  sweep.shift = 0;
-  sweep.direction = 0;
-  sweep.frequency = 0;
-  sweep.enable = 0;
-  sweep.negate = 0;
-  sweep.period = 0;
-  enable = 0;
-  length = 0;
-  duty = 0;
-  frequency = 0;
-  counter = 0;
-  initialize = 0;
-  shadowfrequency = 0;
-  signal = 0;
-  output = 0;
-  period = 0;
-  phase = 0;
-  volume = 0;
-}

bsnes/gba/apu/square2.cpp

@@ -1,61 +0,0 @@
-uint8 APU::Square2::read(unsigned addr) const {
-  switch(addr) {
-  case 1: return (length << 0) | (duty << 6);
-  case 2: return (envelope.frequency << 0) | (envelope.direction << 3) | (envelope.volume << 4);
-  case 3: return (frequency >> 0);
-  case 4: return (frequency >> 8) | (counter << 6) | (initialize << 7);
-  }
-}
-
-void APU::Square2::write(unsigned addr, uint8 byte) {
-  switch(addr) {
-  case 1:  //NR21
-    length = byte >> 0;
-    duty   = byte >> 6;
-    break;
-
-  case 2:  //NR22
-    envelope.frequency = byte >> 0;
-    envelope.direction = byte >> 3;
-    envelope.volume    = byte >> 4;
-    if(envelope.dacenable() == false) enable = false;
-    break;
-
-  case 3:  //NR23
-    frequency = (frequency & 0xff00) | (byte << 0);
-    break;
-
-  case 4:  //NR24
-    frequency = (frequency & 0x00ff) | (byte << 8);
-    counter    = byte >> 6;
-    initialize = byte >> 7;
-
-    if(initialize) {
-      enable = envelope.dacenable();
-      period = 4 * (2048 - frequency);
-      envelope.period = envelope.frequency;
-      volume = envelope.volume;
-    }
-
-    break;
-  }
-}
-
-void APU::Square2::power() {
-  envelope.frequency = 0;
-  envelope.direction = 0;
-  envelope.direction = 0;
-  envelope.period = 0;
-  enable = 0;
-  length = 0;
-  duty = 0;
-  frequency = 0;
-  counter = 0;
-  initialize = 0;
-  shadowfrequency = 0;
-  signal = 0;
-  output = 0;
-  period = 0;
-  phase = 0;
-  volume = 0;
-}

bsnes/gba/apu/wave.cpp

@@ -1,95 +0,0 @@
-void APU::Wave::run() {
-  if(period && --period == 0) {
-    period = 2 * (2048 - frequency);
-    patternsample = pattern[patternbank * 16 + patternaddr++];
-    if(patternaddr == 0) patternbank ^= mode;
-  }
-
-  output = patternsample;
-  static unsigned multiplier[] = { 0, 4, 2, 1, 3, 3, 3, 3};
-  output = (output * multiplier[volume]) / 4;
-  if(enable == false) output = 0;
-}
-
-void APU::Wave::clocklength() {
-  if(enable && counter) {
-    if(++length == 0) enable = false;
-  }
-}
-
-uint8 APU::Wave::read(unsigned addr) const {
-  switch(addr) {
-  case 0: return (mode << 5) | (bank << 6) | (dacenable << 7);
-  case 1: return (length << 0);
-  case 2: return (volume << 5);
-  case 3: return (frequency >> 0);
-  case 4: return (frequency >> 8) | (counter << 6) | (initialize << 7);
-  }
-}
-
-void APU::Wave::write(unsigned addr, uint8 byte) {
-  switch(addr) {
-  case 0:  //NR30
-    mode      = byte >> 5;
-    bank      = byte >> 6;
-    dacenable = byte >> 7;
-    if(dacenable == false) enable = false;
-    break;
-
-  case 1:  //NR31
-    length = byte >> 0;
-    break;
-
-  case 2:  //NR32
-    volume = byte >> 5;
-    break;
-
-  case 3:  //NR33
-    frequency = (frequency & 0xff00) | (byte << 0);
-    break;
-
-  case 4:  //NR34
-    frequency = (frequency & 0x00ff) | (byte << 8);
-    counter    = byte >> 6;
-    initialize = byte >> 7;
-
-    if(initialize) {
-      enable = dacenable;
-      period = 2 * (2048 - frequency);
-      patternaddr = 0;
-      patternbank = mode ? (uint1)0 : bank;
-    }
-
-    break;
-  }
-}
-
-uint8 APU::Wave::readram(unsigned addr) const {
-  uint8 byte = 0;
-  byte |= pattern[addr * 2 + 0] << 0;
-  byte |= pattern[addr * 2 + 1] << 4;
-  return byte;
-}
-
-void APU::Wave::writeram(unsigned addr, uint8 byte) {
-  pattern[addr * 2 + 0] = byte >> 0;
-  pattern[addr * 2 + 1] = byte >> 4;
-}
-
-void APU::Wave::power() {
-  mode = 0;
-  bank = 0;
-  dacenable = 0;
-  length = 0;
-  volume = 0;
-  frequency = 0;
-  counter = 0;
-  initialize = 0;
-  for(auto &sample : pattern) sample = 0;
-  enable = 0;
-  output = 0;
-  patternaddr = 0;
-  patternbank = 0;
-  patternsample = 0;
-  period = 0;
-}

bsnes/gba/cartridge/cartridge.cpp

@@ -1,162 +0,0 @@
-#include <gba/gba.hpp>
-
-namespace GameBoyAdvance {
-
-#include "eeprom.cpp"
-#include "flashrom.cpp"
-#include "serialization.cpp"
-Cartridge cartridge;
-
-bool Cartridge::load(const string &markup, const stream &memory) {
-  information.markup = markup;
-  XML::Document document(markup);
-
-  unsigned size = memory.size();
-  memory.read(rom.data, min(rom.size, size));
-  for(unsigned addr = size; addr < rom.size; addr++) {
-    rom.data[addr] = rom.data[Bus::mirror(addr, size)];
-  }
-
-  has_sram     = false;
-  has_eeprom   = false;
-  has_flashrom = false;
-
-  if(document["cartridge"]["ram"].exists()) {
-    auto &info = document["cartridge"]["ram"];
-
-    if(info["type"].data == "SRAM" || info["type"].data == "FRAM") {
-      has_sram = true;
-      ram.size = numeral(info["size"].data);
-      ram.mask = ram.size - 1;
-      for(unsigned n = 0; n < ram.size; n++) ram.data[n] = 0xff;
-
-      interface->memory.append({2, "save.ram"});
-    }
-
-    if(info["type"].data == "EEPROM") {
-      has_eeprom = true;
-      eeprom.size = numeral(info["size"].data);
-      eeprom.bits = eeprom.size <= 512 ? 6 : 14;
-      if(eeprom.size == 0) eeprom.size = 8192, eeprom.bits = 0;  //auto-detect size
-      eeprom.mask = size > 16 * 1024 * 1024 ? 0x0fffff00 : 0x0f000000;
-      eeprom.test = size > 16 * 1024 * 1024 ? 0x0dffff00 : 0x0d000000;
-      for(unsigned n = 0; n < eeprom.size; n++) eeprom.data[n] = 0xff;
-
-      interface->memory.append({3, "save.ram"});
-    }
-
-    if(info["type"].data == "FlashROM") {
-      has_flashrom = true;
-      flashrom.id = numeral(info["id"].data);
-      flashrom.size = numeral(info["size"].data);
-      for(unsigned n = 0; n < flashrom.size; n++) flashrom.data[n] = 0xff;
-
-      interface->memory.append({4, "save.ram"});
-    }
-  }
-
-  sha256 = nall::sha256(rom.data, size);
-
-  system.load();
-  return loaded = true;
-}
-
-void Cartridge::unload() {
-  if(loaded == false) return;
-  loaded = false;
-}
-
-void Cartridge::power() {
-  eeprom.power();
-  flashrom.power();
-}
-
-uint8* Cartridge::ram_data() {
-  if(has_sram) return ram.data;
-  if(has_eeprom) return eeprom.data;
-  if(has_flashrom) return flashrom.data;
-  return nullptr;
-}
-
-unsigned Cartridge::ram_size() {
-  if(has_sram) return ram.size;
-  if(has_eeprom) return eeprom.size;
-  if(has_flashrom) return flashrom.size;
-  return 0u;
-}
-
-uint32 Cartridge::read(uint8 *data, uint32 addr, uint32 size) {
-  if(size == Word) addr &= ~3;
-  if(size == Half) addr &= ~1;
-  data += addr;
-  if(size == Word) return data[0] << 0 | data[1] << 8 | data[2] << 16 | data[3] << 24;
-  if(size == Half) return data[0] << 0 | data[1] << 8;
-  return data[0];
-}
-
-void Cartridge::write(uint8 *data, uint32 addr, uint32 size, uint32 word) {
-  if(size == Word) addr &= ~3;
-  if(size == Half) addr &= ~1;
-  data += addr;
-  switch(size) {
-  case Word: data[3] = word >> 24;
-             data[2] = word >> 16;
-  case Half: data[1] = word >>  8;
-  case Byte: data[0] = word >>  0;
-  }
-}
-
-#define RAM_ANALYZE
-
-uint32 Cartridge::read(uint32 addr, uint32 size) {
-  #ifdef RAM_ANALYZE
-  if((addr & 0x0e000000) == 0x0e000000) {
-    static bool once = true;
-    if(once) once = false, print("* SRAM/FlashROM read detected\n");
-  }
-  #endif
-
-  if(has_sram     && (addr & 0x0e000000 ) == 0x0e000000 ) return read(ram.data, addr & ram.mask, size);
-  if(has_eeprom   && (addr & eeprom.mask) == eeprom.test) return eeprom.read();
-  if(has_flashrom && (addr & 0x0e000000 ) == 0x0e000000 ) return flashrom.read(addr);
-  if(addr < 0x0e000000) return read(rom.data, addr & 0x01ffffff, size);
-  return cpu.pipeline.fetch.instruction;
-}
-
-void Cartridge::write(uint32 addr, uint32 size, uint32 word) {
-  #ifdef RAM_ANALYZE
-  if((addr & 0x0e000000) == 0x0e000000) {
-    static bool once = true;
-    if(once) once = false, print("* SRAM/FlashROM write detected\n");
-  }
-  if((addr & 0x0f000000) == 0x0d000000) {
-    static bool once = true;
-    if(once) once = false, print("* EEPROM write detected\n");
-  }
-  if((addr & 0x0e00ffff) == 0x0e005555 && (word & 0xff) == 0xaa) {
-    static bool once = true;
-    if(once) once = false, print("* FlashROM write detected\n");
-  }
-  #endif
-
-  if(has_sram     && (addr & 0x0e000000 ) == 0x0e000000 ) return write(ram.data, addr & ram.mask, size, word);
-  if(has_eeprom   && (addr & eeprom.mask) == eeprom.test) return eeprom.write(word & 1);
-  if(has_flashrom && (addr & 0x0e000000 ) == 0x0e000000 ) return flashrom.write(addr, word);
-}
-
-Cartridge::Cartridge() {
-  loaded = false;
-  rom.data = new uint8[rom.size = 32 * 1024 * 1024];
-  ram.data = new uint8[ram.size = 32 * 1024];
-  eeprom.data = new uint8[eeprom.size = 8 * 1024];
-  flashrom.data = new uint8[flashrom.size = 128 * 1024];
-}
-
-Cartridge::~Cartridge() {
-  delete[] rom.data;
-  delete[] ram.data;
-  delete[] eeprom.data;
-  delete[] flashrom.data;
-}
-
-}

bsnes/gba/cartridge/cartridge.hpp

@@ -1,33 +0,0 @@
-struct Cartridge : property<Cartridge> {
-  #include "memory.hpp"
-
-  readonly<bool> loaded;
-  readonly<string> sha256;
-
-  readonly<bool> has_sram;
-  readonly<bool> has_eeprom;
-  readonly<bool> has_flashrom;
-
-  struct Information {
-    string markup;
-  } information;
-
-  bool load(const string &markup, const stream &memory);
-  void unload();
-  void power();
-
-  uint8* ram_data();
-  unsigned ram_size();
-
-  uint32 read(uint8 *data, uint32 addr, uint32 size);
-  void write(uint8 *data, uint32 addr, uint32 size, uint32 word);
-
-  uint32 read(uint32 addr, uint32 size);
-  void write(uint32 addr, uint32 size, uint32 word);
-
-  void serialize(serializer&);
-  Cartridge();
-  ~Cartridge();
-};
-
-extern Cartridge cartridge;

bsnes/gba/cartridge/memory.hpp

@@ -1,45 +0,0 @@
-struct Memory {
-  uint8 *data;
-  unsigned size;
-  unsigned mask;
-} rom, ram;
-
-struct EEPROM {
-  uint8 *data;
-  unsigned size;
-  unsigned mask;
-  unsigned test;
-  unsigned bits;
-
-  enum class Mode : unsigned { Wait, Command, ReadAddress, ReadValidate, ReadData, WriteAddress, WriteData, WriteValidate } mode;
-  unsigned offset;
-  unsigned address;
-  unsigned addressbits;
-
-  bool read(unsigned addr);
-  void write(unsigned addr, bool bit);
-
-  bool read();
-  void write(bool bit);
-  void power();
-  void serialize(serializer&);
-} eeprom;
-
-struct FlashROM {
-  uint8 *data;
-  unsigned size;
-  uint16 id;
-
-  bool unlockhi;
-  bool unlocklo;
-  bool idmode;
-  bool erasemode;
-  bool bankselect;
-  bool writeselect;
-  bool bank;
-
-  uint8 read(uint16 addr);
-  void write(uint16 addr, uint8 byte);
-  void power();
-  void serialize(serializer&);
-} flashrom;

bsnes/gba/cartridge/serialization.cpp

@@ -1,5 +0,0 @@
-void Cartridge::serialize(serializer &s) {
-  if(has_sram) s.array(ram.data, ram.size);
-  if(has_eeprom) eeprom.serialize(s);
-  if(has_flashrom) flashrom.serialize(s);
-}

bsnes/gba/cpu/cpu.cpp

@@ -1,173 +0,0 @@
-#include <gba/gba.hpp>
-
-namespace GameBoyAdvance {
-
-#include "registers.cpp"
-#include "mmio.cpp"
-#include "memory.cpp"
-#include "dma.cpp"
-#include "timer.cpp"
-#include "serialization.cpp"
-CPU cpu;
-
-void CPU::Enter() {
-  while(true) {
-    if(scheduler.sync == Scheduler::SynchronizeMode::CPU) {
-      scheduler.sync = Scheduler::SynchronizeMode::All;
-      scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
-    }
-
-    cpu.main();
-  }
-}
-
-void CPU::main() {
-  #if defined(DEBUG)
-  if(crash) {
-    print(cpsr().t ? disassemble_thumb_instruction(pipeline.execute.address)
-                     : disassemble_arm_instruction(pipeline.execute.address), "\n");
-    print(disassemble_registers(), "\n");
-    print("Executed: ", instructions, "\n");
-    while(true) step(frequency);
-  }
-  #endif
-
-  processor.irqline = regs.ime && (regs.irq.enable & regs.irq.flag);
-
-  if(regs.mode == Registers::Mode::Stop) {
-    if((regs.irq.enable.keypad & regs.irq.flag.keypad) == 0) {
-      sync_step(16);  //STOP does not advance timers
-    } else {
-      regs.mode = Registers::Mode::Normal;
-    }
-    return;
-  }
-
-  dma_run();
-
-  if(regs.mode == Registers::Mode::Halt) {
-    if((regs.irq.enable & regs.irq.flag) == 0) {
-      step(16);
-    } else {
-      regs.mode = Registers::Mode::Normal;
-    }
-    return;
-  }
-
-  exec();
-}
-
-void CPU::step(unsigned clocks) {
-  timer_step(clocks);
-  sync_step(clocks);
-}
-
-void CPU::sync_step(unsigned clocks) {
-  ppu.clock -= clocks;
-  if(ppu.clock < 0) co_switch(ppu.thread);
-
-  apu.clock -= clocks;
-  if(apu.clock < 0) co_switch(apu.thread);
-}
-
-void CPU::bus_idle(uint32 addr) {
-  step(1);
-  return bus.idle(addr);
-}
-
-uint32 CPU::bus_read(uint32 addr, uint32 size) {
-  step(bus.speed(addr, size));
-  return bus.read(addr, size);
-}
-
-void CPU::bus_write(uint32 addr, uint32 size, uint32 word) {
-  step(bus.speed(addr, size));
-  return bus.write(addr, size, word);
-}
-
-void CPU::keypad_run() {
-  if(regs.keypad.control.enable == false) return;
-
-  bool test = regs.keypad.control.condition;  //0 = OR, 1 = AND
-  for(unsigned n = 0; n < 10; n++) {
-    if(regs.keypad.control.flag[n] == false) continue;
-    bool input = interface->inputPoll(0, 0, n);
-    if(regs.keypad.control.condition == 0) test |= input;
-    if(regs.keypad.control.condition == 1) test &= input;
-  }
-  if(test) regs.irq.flag.keypad = true;
-}
-
-void CPU::power() {
-  create(CPU::Enter, 16777216);
-
-  ARM::power();
-  for(unsigned n = 0; n <  32 * 1024; n++) iwram[n] = 0;
-  for(unsigned n = 0; n < 256 * 1024; n++) ewram[n] = 0;
-
-  for(auto &dma : regs.dma) {
-    dma.source = 0;
-    dma.target = 0;
-    dma.length = 0;
-    dma.control = 0;
-    dma.pending = 0;
-    dma.run.target = 0;
-    dma.run.source = 0;
-    dma.run.length = 0;
-  }
-  for(auto &timer : regs.timer) {
-    timer.period = 0;
-    timer.reload = 0;
-    timer.control = 0;
-  }
-  regs.keypad.control = 0;
-  regs.ime = 0;
-  regs.irq.enable = 0;
-  regs.irq.flag = 0;
-  regs.wait.control = 0;
-  regs.postboot = 0;
-  regs.mode = Registers::Mode::Normal;
-  regs.clock = 0;
-  regs.memory.control = 0x0d000020;
-
-  pending.dma.vblank = 0;
-  pending.dma.hblank = 0;
-  pending.dma.hdma = 0;
-
-  for(unsigned n = 0x0b0; n <= 0x0df; n++) bus.mmio[n] = this;  //DMA
-  for(unsigned n = 0x100; n <= 0x10f; n++) bus.mmio[n] = this;  //Timers
-  for(unsigned n = 0x120; n <= 0x12b; n++) bus.mmio[n] = this;  //Serial
-  for(unsigned n = 0x130; n <= 0x133; n++) bus.mmio[n] = this;  //Keypad
-  for(unsigned n = 0x134; n <= 0x159; n++) bus.mmio[n] = this;  //Serial
-  for(unsigned n = 0x200; n <= 0x209; n++) bus.mmio[n] = this;  //System
-  for(unsigned n = 0x300; n <= 0x301; n++) bus.mmio[n] = this;  //System
-  //0x080-0x083 mirrored via gba/memory/memory.cpp              //System
-}
-
-CPU::CPU() {
-  iwram = new uint8[ 32 * 1024];
-  ewram = new uint8[256 * 1024];
-
-  regs.dma[0].source.bits(27); regs.dma[0].run.source.bits(27);
-  regs.dma[0].target.bits(27); regs.dma[0].run.target.bits(27);
-  regs.dma[0].length.bits(14); regs.dma[0].run.length.bits(14);
-
-  regs.dma[1].source.bits(28); regs.dma[1].run.source.bits(28);
-  regs.dma[1].target.bits(27); regs.dma[1].run.target.bits(27);
-  regs.dma[1].length.bits(14); regs.dma[1].run.length.bits(14);
-
-  regs.dma[2].source.bits(28); regs.dma[2].run.source.bits(28);
-  regs.dma[2].target.bits(27); regs.dma[2].run.target.bits(27);
-  regs.dma[2].length.bits(14); regs.dma[2].run.length.bits(14);
-
-  regs.dma[3].source.bits(28); regs.dma[3].run.source.bits(28);
-  regs.dma[3].target.bits(28); regs.dma[3].run.target.bits(28);
-  regs.dma[3].length.bits(16); regs.dma[3].run.length.bits(16);
-}
-
-CPU::~CPU() {
-  delete[] iwram;
-  delete[] ewram;
-}
-
-}

bsnes/gba/cpu/cpu.hpp

@@ -1,43 +0,0 @@
-struct CPU : Processor::ARM, Thread, MMIO {
-  uint8 *iwram;
-  uint8 *ewram;
-  #include "registers.hpp"
-  #include "state.hpp"
-
-  static void Enter();
-  void main();
-  void step(unsigned clocks);
-  void sync_step(unsigned clocks);
-
-  void bus_idle(uint32 addr);
-  uint32 bus_read(uint32 addr, uint32 size);
-  void bus_write(uint32 addr, uint32 size, uint32 word);
-
-  void keypad_run();
-  void power();
-
-  uint8 read(uint32 addr);
-  void write(uint32 addr, uint8 byte);
-
-  uint32 iwram_read(uint32 addr, uint32 size);
-  void iwram_write(uint32 addr, uint32 size, uint32 word);
-
-  uint32 ewram_read(uint32 addr, uint32 size);
-  void ewram_write(uint32 addr, uint32 size, uint32 word);
-
-  void dma_run();
-  void dma_transfer(Registers::DMA &dma);
-  void dma_vblank();
-  void dma_hblank();
-  void dma_hdma();
-
-  void timer_step(unsigned clocks);
-  void timer_increment(unsigned n);
-  void timer_fifo_run(unsigned n);
-
-  void serialize(serializer&);
-  CPU();
-  ~CPU();
-};
-
-extern CPU cpu;

bsnes/gba/cpu/dma.cpp

@@ -1,60 +0,0 @@
-void CPU::dma_run() {
-  for(unsigned n = 0; n < 4; n++) {
-    auto &dma = regs.dma[n];
-    if(dma.pending) {
-      dma.pending = false;
-      dma_transfer(dma);
-      if(dma.control.irq) regs.irq.flag.dma[n] = 1;
-      if(dma.control.drq && n == 3) regs.irq.flag.cartridge = 1;
-    }
-  }
-}
-
-void CPU::dma_transfer(Registers::DMA &dma) {
-  unsigned size = dma.control.size ? Word : Half;
-  unsigned seek = dma.control.size ? 4 : 2;
-
-  sequential() = false;
-  do {
-    step(bus.speed(dma.run.source, size));
-    uint32 word = bus.read(dma.run.source, size);
-
-    step(bus.speed(dma.run.target, size));
-    bus.write(dma.run.target, size, word);
-
-    sequential() = true;
-
-    switch(dma.control.sourcemode) {
-    case 0: dma.run.source += seek; break;
-    case 1: dma.run.source -= seek; break;
-    }
-
-    switch(dma.control.targetmode) {
-    case 0: dma.run.target += seek; break;
-    case 1: dma.run.target -= seek; break;
-    case 3: dma.run.target += seek; break;
-    }
-  } while(--dma.run.length);
-  sequential() = false;
-
-  if(dma.control.targetmode == 3) dma.run.target = dma.target;
-  if(dma.control.repeat == 1) dma.run.length = dma.length;
-  if(dma.control.repeat == 0) dma.control.enable = false;
-}
-
-void CPU::dma_vblank() {
-  for(auto &dma : regs.dma) {
-    if(dma.control.enable && dma.control.timingmode == 1) dma.pending = true;
-  }
-}
-
-void CPU::dma_hblank() {
-  for(auto &dma : regs.dma) {
-    if(dma.control.enable && dma.control.timingmode == 2) dma.pending = true;
-  }
-}
-
-void CPU::dma_hdma() {
-  auto &dma = regs.dma[3];
-  if(dma.control.enable && dma.control.timingmode == 3) dma.pending = true;
-}

bsnes/gba/cpu/memory.cpp

@@ -1,55 +0,0 @@
-uint32 CPU::iwram_read(uint32 addr, uint32 size) {
-  if(regs.memory.control.disable) return cpu.pipeline.fetch.instruction;
-
-  if(size == Word) return iwram_read(addr &~ 2, Half) << 0 | iwram_read(addr | 2, Half) << 16;
-  if(size == Half) return iwram_read(addr &~ 1, Byte) << 0 | iwram_read(addr | 1, Byte) <<  8;
-
-  return iwram[addr & 0x7fff];
-}
-
-void CPU::iwram_write(uint32 addr, uint32 size, uint32 word) {
-  if(regs.memory.control.disable) return;
-
-  if(size == Word) {
-    iwram_write(addr &~2, Half, word >>  0);
-    iwram_write(addr | 2, Half, word >> 16);
-    return;
-  }
-
-  if(size == Half) {
-    iwram_write(addr &~1, Byte, word >>  0);
-    iwram_write(addr | 1, Byte, word >>  8);
-    return;
-  }
-
-  iwram[addr & 0x7fff] = word;
-}
-
-uint32 CPU::ewram_read(uint32 addr, uint32 size) {
-  if(regs.memory.control.disable) return cpu.pipeline.fetch.instruction;
-  if(regs.memory.control.ewram == false) return iwram_read(addr, size);
-
-  if(size == Word) return ewram_read(addr &~ 2, Half) << 0 | ewram_read(addr | 2, Half) << 16;
-  if(size == Half) return ewram_read(addr &~ 1, Byte) << 0 | ewram_read(addr | 1, Byte) <<  8;
-
-  return ewram[addr & 0x3ffff];
-}
-
-void CPU::ewram_write(uint32 addr, uint32 size, uint32 word) {
-  if(regs.memory.control.disable) return;
-  if(regs.memory.control.ewram == false) return iwram_write(addr, size, word);
-
-  if(size == Word) {
-    ewram_write(addr &~2, Half, word >>  0);
-    ewram_write(addr | 2, Half, word >> 16);
-    return;
-  }
-
-  if(size == Half) {
-    ewram_write(addr &~1, Byte, word >>  0);
-    ewram_write(addr | 1, Byte, word >>  8);
-    return;
-  }
-
-  ewram[addr & 0x3ffff] = word;
-}

bsnes/gba/cpu/mmio.cpp

@@ -1,316 +0,0 @@
-uint8 CPU::read(uint32 addr) {
-  uint8 result = 0;
-
-  switch(addr) {
-
-  //DMA0CNT_H
-  //DMA1CNT_H
-  //DMA2CNT_H
-  //DMA3CNT_H
-  case 0x040000ba: case 0x040000bb:
-  case 0x040000c6: case 0x040000c7:
-  case 0x040000d2: case 0x040000d3:
-  case 0x040000de: case 0x040000df: {
-    auto &dma = regs.dma[(addr - 0x040000ba) / 12];
-    unsigned shift = (addr & 1) * 8;
-    return dma.control >> shift;
-  }
-
-  //TM0CNT_L
-  //TM1CNT_L
-  //TM2CNT_L
-  //TM3CNT_L
-  case 0x04000100: case 0x04000101:
-  case 0x04000104: case 0x04000105:
-  case 0x04000108: case 0x04000109:
-  case 0x0400010c: case 0x0400010d: {
-    auto &timer = regs.timer[(addr >> 2) & 3];
-    unsigned shift = (addr & 1) * 8;
-    return timer.period >> shift;
-  }
-
-  //TIM0CNT_H
-  case 0x04000102: case 0x04000103:
-  case 0x04000106: case 0x04000107:
-  case 0x0400010a: case 0x0400010b:
-  case 0x0400010e: case 0x0400010f: {
-    auto &timer = regs.timer[(addr >> 2) & 3];
-    unsigned shift = (addr & 1) * 8;
-    return timer.control >> shift;
-  }
-
-  //SIOMULTI0 (SIODATA32_L)
-  //SIOMULTI1 (SIODATA32_H)
-  //SIOMULTI2
-  //SIOMULTI3
-  case 0x04000120: case 0x04000121:
-  case 0x04000122: case 0x04000123:
-  case 0x04000124: case 0x04000125:
-  case 0x04000126: case 0x04000127: {
-    auto &data = regs.serial.data[(addr >> 1) & 3];
-    unsigned shift = (addr & 1) * 8;
-    return data >> shift;
-  }
-
-  //SIOCNT
-  case 0x04000128: return regs.serial.control >> 0;
-  case 0x04000129: return regs.serial.control >> 8;
-
-  //SIOMLT_SEND (SIODATA8)
-  case 0x0400012a: return regs.serial.data8;
-  case 0x0400012b: return 0u;
-
-  //KEYINPUT
-  case 0x04000130:
-    for(unsigned n = 0; n < 8; n++) result |= interface->inputPoll(0, 0, n) << n;
-    if((result & 0xc0) == 0xc0) result &= ~0xc0;  //up+down cannot be pressed simultaneously
-    if((result & 0x30) == 0x30) result &= ~0x30;  //left+right cannot be pressed simultaneously
-    return result ^ 0xff;
-  case 0x04000131:
-    result |= interface->inputPoll(0, 0, 8) << 0;
-    result |= interface->inputPoll(0, 0, 9) << 1;
-    return result ^ 0x03;
-
-  //KEYCNT
-  case 0x04000132: return regs.keypad.control >> 0;
-  case 0x04000133: return regs.keypad.control >> 8;
-
-  //RCNT
-  case 0x04000134: return regs.joybus.settings >> 0;
-  case 0x04000135: return regs.joybus.settings >> 8;
-
-  //JOYCNT
-  case 0x04000140: return regs.joybus.control >> 0;
-  case 0x04000141: return regs.joybus.control >> 8;
-
-  //JOY_RECV_L
-  //JOY_RECV_H
-  case 0x04000150: return regs.joybus.receive >>  0;
-  case 0x04000151: return regs.joybus.receive >>  8;
-  case 0x04000152: return regs.joybus.receive >> 16;
-  case 0x04000153: return regs.joybus.receive >> 24;
-
-  //JOY_TRANS_L
-  //JOY_TRANS_H
-  case 0x04000154: return regs.joybus.transmit >>  0;
-  case 0x04000155: return regs.joybus.transmit >>  8;
-  case 0x04000156: return regs.joybus.transmit >> 16;
-  case 0x04000157: return regs.joybus.transmit >> 24;
-
-  //JOYSTAT
-  case 0x04000158: return regs.joybus.status >> 0;
-  case 0x04000159: return regs.joybus.status >> 8;
-
-  //IE
-  case 0x04000200: return regs.irq.enable >> 0;
-  case 0x04000201: return regs.irq.enable >> 8;
-
-  //IF
-  case 0x04000202: return regs.irq.flag >> 0;
-  case 0x04000203: return regs.irq.flag >> 8;
-
-  //WAITCNT
-  case 0x04000204: return regs.wait.control >> 0;
-  case 0x04000205: return regs.wait.control >> 8;
-
-  //IME
-  case 0x04000208: return regs.ime;
-  case 0x04000209: return 0u;
-
-  //POSTFLG + HALTCNT
-  case 0x04000300: return regs.postboot;
-  case 0x04000301: return 0u;
-
-  //MEMCNT_L
-  case 0x04000800: return regs.memory.control >>  0;
-  case 0x04000801: return regs.memory.control >>  8;
-
-  //MEMCNT_H
-  case 0x04000802: return regs.memory.control >> 16;
-  case 0x04000803: return regs.memory.control >> 24;
-
-  }
-
-  return 0u;
-}
-
-void CPU::write(uint32 addr, uint8 byte) {
-  switch(addr) {
-
-  //DMA0SAD
-  //DMA1SAD
-  //DMA2SAD
-  //DMA3SAD
-  case 0x040000b0: case 0x040000b1: case 0x040000b2: case 0x040000b3:
-  case 0x040000bc: case 0x040000bd: case 0x040000be: case 0x040000bf:
-  case 0x040000c8: case 0x040000c9: case 0x040000ca: case 0x040000cb:
-  case 0x040000d4: case 0x040000d5: case 0x040000d6: case 0x040000d7: {
-    auto &dma = regs.dma[(addr - 0x040000b0) / 12];
-    unsigned shift = (addr & 3) * 8;
-    dma.source = (dma.source & ~(255 << shift)) | (byte << shift);
-    return;
-  }
-
-  //DMA0DAD
-  //DMA1DAD
-  //DMA2DAD
-  //DMA3DAD
-  case 0x040000b4: case 0x040000b5: case 0x040000b6: case 0x040000b7:
-  case 0x040000c0: case 0x040000c1: case 0x040000c2: case 0x040000c3:
-  case 0x040000cc: case 0x040000cd: case 0x040000ce: case 0x040000cf:
-  case 0x040000d8: case 0x040000d9: case 0x040000da: case 0x040000db: {
-    auto &dma = regs.dma[(addr - 0x040000b4) / 12];
-    unsigned shift = (addr & 3) * 8;
-    dma.target = (dma.target & ~(255 << shift)) | (byte << shift);
-    return;
-  }
-
-  //DMA0CNT_L
-  //DMA1CNT_L
-  //DMA2CNT_L
-  //DMA3CNT_L
-  case 0x040000b8: case 0x040000b9:
-  case 0x040000c4: case 0x040000c5:
-  case 0x040000d0: case 0x040000d1:
-  case 0x040000dc: case 0x040000dd: {
-    auto &dma = regs.dma[(addr - 0x040000b8) / 12];
-    unsigned shift = (addr & 1) * 8;
-    dma.length = (dma.length & ~(255 << shift)) | (byte << shift);
-    return;
-  }
-
-  //DMA0CNT_H
-  //DMA1CNT_H
-  //DMA2CNT_H
-  //DMA3CNT_H
-  case 0x040000ba: case 0x040000bb:
-  case 0x040000c6: case 0x040000c7:
-  case 0x040000d2: case 0x040000d3:
-  case 0x040000de: case 0x040000df: {
-    auto &dma = regs.dma[(addr - 0x040000ba) / 12];
-    unsigned shift = (addr & 1) * 8;
-    bool enable = dma.control.enable;
-    dma.control = (dma.control & ~(255 << shift)) | (byte << shift);
-    if(enable == 0 && dma.control.enable) {
-      if(dma.control.timingmode == 0) dma.pending = true;  //immediate transfer mode
-      dma.run.target = dma.target;
-      dma.run.source = dma.source;
-      dma.run.length = dma.length;
-    } else if(dma.control.enable == 0) {
-      dma.pending = false;
-    }
-    return;
-  }
-
-  //TM0CNT_L
-  //TM1CNT_L
-  //TM2CNT_L
-  //TM3CNT_L
-  case 0x04000100: case 0x04000101:
-  case 0x04000104: case 0x04000105:
-  case 0x04000108: case 0x04000109:
-  case 0x0400010c: case 0x0400010d: {
-    auto &timer = regs.timer[(addr >> 2) & 3];
-    unsigned shift = (addr & 1) * 8;
-    timer.reload = (timer.reload & ~(255 << shift)) | (byte << shift);
-    return;
-  }
-
-  //TM0CNT_H
-  //TM1CNT_H
-  //TM2CNT_H
-  //TM3CNT_H
-  case 0x04000102:
-  case 0x04000106:
-  case 0x0400010a:
-  case 0x0400010e: {
-    auto &timer = regs.timer[(addr >> 2) & 3];
-    bool enable = timer.control.enable;
-    timer.control = byte;
-    if(enable == 0 && timer.control.enable == 1) {
-      timer.period = timer.reload;
-    }
-    return;
-  }
-
-  //SIOMULTI0 (SIODATA32_L)
-  //SIOMULTI1 (SIODATA32_H)
-  //SIOMULTI2
-  //SIOMULTI3
-  case 0x04000120: case 0x04000121:
-  case 0x04000122: case 0x04000123:
-  case 0x04000124: case 0x04000125:
-  case 0x04000126: case 0x04000127: {
-    auto &data = regs.serial.data[(addr >> 1) & 3];
-    unsigned shift = (addr & 1) * 8;
-    data = (data & ~(255 << shift)) | (byte << shift);
-    return;
-  }
-
-  //SIOCNT
-  case 0x04000128: regs.serial.control = (regs.serial.control & 0xff00) | (byte << 0); return;
-  case 0x04000129: regs.serial.control = (regs.serial.control & 0x00ff) | (byte << 8); return;
-
-  //SIOMLT_SEND (SIODATA8)
-  case 0x0400012a: regs.serial.data8 = byte; return;
-  case 0x0400012b: return;
-
-  //KEYCNT
-  case 0x04000132: regs.keypad.control = (regs.keypad.control & 0xff00) | (byte << 0); return;
-  case 0x04000133: regs.keypad.control = (regs.keypad.control & 0x00ff) | (byte << 8); return;
-
-  //RCNT
-  case 0x04000134: regs.joybus.settings = (regs.joybus.settings & 0xff00) | (byte << 0); return;
-  case 0x04000135: regs.joybus.settings = (regs.joybus.settings & 0x00ff) | (byte << 8); return;
-
-  //JOYCNT
-  case 0x04000140: regs.joybus.control = (regs.joybus.control & 0xff00) | (byte << 0); return;
-  case 0x04000141: regs.joybus.control = (regs.joybus.control & 0x00ff) | (byte << 8); return;
-
-  //JOY_RECV_L
-  //JOY_RECV_H
-  case 0x04000150: regs.joybus.receive = (regs.joybus.receive & 0xffffff00) | (byte <<  0); return;
-  case 0x04000151: regs.joybus.receive = (regs.joybus.receive & 0xffff00ff) | (byte <<  8); return;
-  case 0x04000152: regs.joybus.receive = (regs.joybus.receive & 0xff00ffff) | (byte << 16); return;
-  case 0x04000153: regs.joybus.receive = (regs.joybus.receive & 0x00ffffff) | (byte << 24); return;
-
-  //JOY_TRANS_L
-  //JOY_TRANS_H
-  case 0x04000154: regs.joybus.transmit = (regs.joybus.transmit & 0xffffff00) | (byte <<  0); return;
-  case 0x04000155: regs.joybus.transmit = (regs.joybus.transmit & 0xffff00ff) | (byte <<  8); return;
-  case 0x04000156: regs.joybus.transmit = (regs.joybus.transmit & 0xff00ffff) | (byte << 16); return;
-  case 0x04000157: regs.joybus.transmit = (regs.joybus.transmit & 0x00ffffff) | (byte << 24); return;
-
-  //JOYSTAT
-  case 0x04000158: regs.joybus.status = (regs.joybus.status & 0xff00) | (byte << 0); return;
-  case 0x04000159: regs.joybus.status = (regs.joybus.status & 0x00ff) | (byte << 8); return;
-
-  //IE
-  case 0x04000200: regs.irq.enable = (regs.irq.enable & 0xff00) | (byte << 0); return;
-  case 0x04000201: regs.irq.enable = (regs.irq.enable & 0x00ff) | (byte << 8); return;
-
-  //IF
-  case 0x04000202: regs.irq.flag = regs.irq.flag & ~(byte << 0); return;
-  case 0x04000203: regs.irq.flag = regs.irq.flag & ~(byte << 8); return;
-
-  //WAITCNT
-  case 0x04000204: regs.wait.control = (regs.wait.control & 0xff00) | ((byte & 0xff) << 0); return;
-  case 0x04000205: regs.wait.control = (regs.wait.control & 0x00ff) | ((byte & 0x7f) << 8); return;
-
-  //IME
-  case 0x04000208: regs.ime = byte >> 0; return;
-  case 0x04000209: return;
-
-  //POSTFLG, HALTCNT
-  case 0x04000300: regs.postboot |= byte >> 0; return;
-  case 0x04000301: regs.mode = byte & 0x80 ? Registers::Mode::Stop : Registers::Mode::Halt; return;
-
-  //MEMCNT_L
-  //MEMCNT_H
-  case 0x04000800: regs.memory.control = (regs.memory.control & 0xffffff00) | (byte <<  0); return;
-  case 0x04000801: regs.memory.control = (regs.memory.control & 0xffff00ff) | (byte <<  8); return;
-  case 0x04000802: regs.memory.control = (regs.memory.control & 0xff00ffff) | (byte << 16); return;
-  case 0x04000803: regs.memory.control = (regs.memory.control & 0x00ffffff) | (byte << 24); return;
-
-  }
-}

bsnes/gba/cpu/registers.cpp

@@ -1,244 +0,0 @@
-CPU::Registers::DMAControl::operator uint16() const {
-  return (
-    (targetmode <<  5)
-  | (sourcemode <<  7)
-  | (repeat     <<  9)
-  | (size       << 10)
-  | (drq        << 11)
-  | (timingmode << 12)
-  | (irq        << 14)
-  | (enable     << 15)
-  );
-}
-
-uint16 CPU::Registers::DMAControl::operator=(uint16 source) {
-  targetmode = source >>  5;
-  sourcemode = source >>  7;
-  repeat     = source >>  9;
-  size       = source >> 10;
-  drq        = source >> 11;
-  timingmode = source >> 12;
-  irq        = source >> 14;
-  enable     = source >> 15;
-  return operator uint16();
-}
-
-CPU::Registers::TimerControl::operator uint16() const {
-  return (
-    (frequency << 0)
-  | (cascade   << 2)
-  | (irq       << 6)
-  | (enable    << 7)
-  );
-}
-
-uint16 CPU::Registers::TimerControl::operator=(uint16 source) {
-  frequency = source >> 0;
-  cascade   = source >> 2;
-  irq       = source >> 6;
-  enable    = source >> 7;
-  return operator uint16();
-}
-
-CPU::Registers::SerialControl::operator uint16() const {
-  return (
-    (shiftclockselect      <<  0)
-  | (shiftclockfrequency   <<  1)
-  | (transferenablereceive <<  2)
-  | (transferenablesend    <<  3)
-  | (startbit              <<  7)
-  | (transferlength        << 12)
-  | (irqenable             << 14)
-  );
-}
-
-uint16 CPU::Registers::SerialControl::operator=(uint16 source) {
-  shiftclockselect      = source >>  0;
-  shiftclockfrequency   = source >>  1;
-  transferenablereceive = source >>  2;
-  transferenablesend    = source >>  3;
-  startbit              = source >>  7;
-  transferlength        = source >> 12;
-  irqenable             = source >> 14;
-  return operator uint16();
-}
-
-CPU::Registers::KeypadControl::operator uint16() const {
-  return (
-    (flag[0]   <<  0)
-  | (flag[1]   <<  1)
-  | (flag[2]   <<  2)
-  | (flag[3]   <<  3)
-  | (flag[4]   <<  4)
-  | (flag[5]   <<  5)
-  | (flag[6]   <<  6)
-  | (flag[7]   <<  7)
-  | (flag[8]   <<  8)
-  | (flag[9]   <<  9)
-  | (enable    << 14)
-  | (condition << 15)
-  );
-}
-
-uint16 CPU::Registers::KeypadControl::operator=(uint16 source) {
-  flag[0]   = source >>  0;
-  flag[1]   = source >>  1;
-  flag[2]   = source >>  2;
-  flag[3]   = source >>  3;
-  flag[4]   = source >>  4;
-  flag[5]   = source >>  5;
-  flag[6]   = source >>  6;
-  flag[7]   = source >>  7;
-  flag[8]   = source >>  8;
-  flag[9]   = source >>  9;
-  enable    = source >> 14;
-  condition = source >> 15;
-  return operator uint16();
-}
-
-CPU::Registers::JoybusSettings::operator uint16() const {
-  return (
-    (sc        <<  0)
-  | (sd        <<  1)
-  | (si        <<  2)
-  | (so        <<  3)
-  | (scmode    <<  4)
-  | (sdmode    <<  5)
-  | (simode    <<  6)
-  | (somode    <<  7)
-  | (irqenable <<  8)
-  | (mode      << 14)
-  );
-}
-
-uint16 CPU::Registers::JoybusSettings::operator=(uint16 source) {
-  sc        = source >>  0;
-  sd        = source >>  1;
-  si        = source >>  2;
-  so        = source >>  3;
-  scmode    = source >>  4;
-  sdmode    = source >>  5;
-  simode    = source >>  6;
-  somode    = source >>  7;
-  irqenable = source >>  8;
-  mode      = source >> 14;
-  return operator uint16();
-}
-
-CPU::Registers::JoybusControl::operator uint16() const {
-  return (
-    (resetsignal     << 0)
-  | (receivecomplete << 1)
-  | (sendcomplete    << 2)
-  | (irqenable       << 6)
-  );
-}
-
-uint16 CPU::Registers::JoybusControl::operator=(uint16 source) {
-  resetsignal     = source >> 0;
-  receivecomplete = source >> 1;
-  sendcomplete    = source >> 2;
-  irqenable       = source >> 6;
-  return operator uint16();
-}
-
-CPU::Registers::JoybusStatus::operator uint16() const {
-  return (
-    (receiveflag << 1)
-  | (sendflag    << 3)
-  | (generalflag << 4)
-  );
-}
-
-uint16 CPU::Registers::JoybusStatus::operator=(uint16 source) {
-  receiveflag = source >> 1;
-  sendflag    = source >> 3;
-  generalflag = source >> 4;
-  return operator uint16();
-}
-
-CPU::Registers::Interrupt::operator uint16() const {
-  return (
-    (vblank       <<  0)
-  | (hblank       <<  1)
-  | (vcoincidence <<  2)
-  | (timer[0]     <<  3)
-  | (timer[1]     <<  4)
-  | (timer[2]     <<  5)
-  | (timer[3]     <<  6)
-  | (serial       <<  7)
-  | (dma[0]       <<  8)
-  | (dma[1]       <<  9)
-  | (dma[2]       << 10)
-  | (dma[3]       << 11)
-  | (keypad       << 12)
-  | (cartridge    << 13)
-  );
-}
-
-uint16 CPU::Registers::Interrupt::operator=(uint16 source) {
-  vblank       = source >>  0;
-  hblank       = source >>  1;
-  vcoincidence = source >>  2;
-  timer[0]     = source >>  3;
-  timer[1]     = source >>  4;
-  timer[2]     = source >>  5;
-  timer[3]     = source >>  6;
-  serial       = source >>  7;
-  dma[0]       = source >>  8;
-  dma[1]       = source >>  9;
-  dma[2]       = source >> 10;
-  dma[3]       = source >> 11;
-  keypad       = source >> 12;
-  cartridge    = source >> 13;
-  return operator uint16();
-}
-
-CPU::Registers::WaitControl::operator uint16() const {
-  return (
-    (nwait[3] <<  0)
-  | (nwait[0] <<  2)
-  | (swait[0] <<  4)
-  | (nwait[1] <<  5)
-  | (swait[1] <<  7)
-  | (nwait[2] <<  8)
-  | (swait[2] << 10)
-  | (phi      << 11)
-  | (prefetch << 14)
-  | (gametype << 15)
-  );
-}
-
-uint16 CPU::Registers::WaitControl::operator=(uint16 source) {
-  nwait[3] = (source >>  0) & 3;
-  nwait[0] = (source >>  2) & 3;
-  swait[0] = (source >>  4) & 1;
-  nwait[1] = (source >>  5) & 3;
-  swait[1] = (source >>  7) & 1;
-  nwait[2] = (source >>  8) & 3;
-  swait[2] = (source >> 10) & 1;
-  phi      = (source >> 11) & 3;
-  prefetch = (source >> 14) & 1;
-  gametype = (source >> 15) & 1;
-  swait[3] = nwait[3];
-  return operator uint16();
-}
-
-CPU::Registers::MemoryControl::operator uint32() const {
-  return (
-    (disable   <<  0)
-  | (unknown1  <<  1)
-  | (ewram     <<  5)
-  | (ewramwait << 24)
-  | (unknown2  << 28)
-  );
-}
-
-uint32 CPU::Registers::MemoryControl::operator=(uint32 source) {
-  disable   = source >>  0;
-  unknown1  = source >>  1;
-  ewram     = source >>  5;
-  ewramwait = source >> 24;
-  unknown2  = source >> 28;
-  return operator uint32();
-}

bsnes/gba/cpu/registers.hpp

@@ -1,186 +0,0 @@
-struct Registers {
-  struct DMAControl {
-    uint2 targetmode;
-    uint2 sourcemode;
-    uint1 repeat;
-    uint1 size;
-    uint1 drq;
-    uint2 timingmode;
-    uint1 irq;
-    uint1 enable;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    DMAControl& operator=(const DMAControl&) = delete;
-  };
-
-  struct DMA {
-    varuint source;
-    varuint target;
-    varuint length;
-    DMAControl control;
-
-    //internal
-    bool pending;
-    struct Run {
-      varuint target;
-      varuint source;
-      varuint length;
-    } run;
-  } dma[4];
-
-  struct TimerControl {
-    uint2 frequency;
-    uint1 cascade;
-    uint1 irq;
-    uint1 enable;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    TimerControl& operator=(const TimerControl&) = delete;
-  };
-
-  struct Timer {
-    uint16 period;
-    uint16 reload;
-    TimerControl control;
-  } timer[4];
-
-  struct SerialControl {
-    uint1 shiftclockselect;
-    uint1 shiftclockfrequency;
-    uint1 transferenablereceive;
-    uint1 transferenablesend;
-    uint1 startbit;
-    uint1 transferlength;
-    uint1 irqenable;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    SerialControl& operator=(const SerialControl&) = delete;
-  };
-
-  struct Serial {
-    uint16 data[4];
-    SerialControl control;
-    uint8 data8;
-  } serial;
-
-  struct KeypadControl {
-    uint1 flag[10];
-    uint1 enable;
-    uint1 condition;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    KeypadControl& operator=(const KeypadControl&) = delete;
-  };
-
-  struct Keypad {
-    KeypadControl control;
-  } keypad;
-
-  struct JoybusSettings {
-    uint1 sc;
-    uint1 sd;
-    uint1 si;
-    uint1 so;
-    uint1 scmode;
-    uint1 sdmode;
-    uint1 simode;
-    uint1 somode;
-    uint1 irqenable;
-    uint2 mode;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    JoybusSettings& operator=(const JoybusSettings&) = delete;
-  };
-
-  struct JoybusControl {
-    uint1 resetsignal;
-    uint1 receivecomplete;
-    uint1 sendcomplete;
-    uint1 irqenable;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    JoybusControl& operator=(const JoybusControl&) = delete;
-  };
-
-  struct JoybusStatus {
-    uint1 receiveflag;
-    uint1 sendflag;
-    uint2 generalflag;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    JoybusStatus& operator=(const JoybusStatus&) = delete;
-  };
-
-  struct Joybus {
-    JoybusSettings settings;
-    JoybusControl control;
-    uint32 receive;
-    uint32 transmit;
-    JoybusStatus status;
-  } joybus;
-
-  uint1 ime;
-
-  struct Interrupt {
-    uint1 vblank;
-    uint1 hblank;
-    uint1 vcoincidence;
-    uint1 timer[4];
-    uint1 serial;
-    uint1 dma[4];
-    uint1 keypad;
-    uint1 cartridge;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    Interrupt& operator=(const Interrupt&) = delete;
-  };
-
-  struct IRQ {
-    Interrupt enable;
-    Interrupt flag;
-  } irq;
-
-  struct WaitControl {
-    uint2 nwait[4];
-    uint2 swait[4];
-    uint2 phi;
-    uint1 prefetch;
-    uint1 gametype;
-
-    operator uint16() const;
-    uint16 operator=(uint16 source);
-    WaitControl& operator=(const WaitControl&) = delete;
-  };
-
-  struct Wait {
-    WaitControl control;
-  } wait;
-
-  struct MemoryControl {
-    uint1 disable;
-    uint3 unknown1;
-    uint1 ewram;
-    uint4 ewramwait;
-    uint4 unknown2;
-
-    operator uint32() const;
-    uint32 operator=(uint32 source);
-    MemoryControl& operator=(const MemoryControl&) = delete;
-  };
-
-  struct Memory {
-    MemoryControl control;
-  } memory;
-
-  uint1 postboot;
-  enum class Mode : unsigned { Normal, Halt, Stop } mode;
-  unsigned clock;
-} regs;

bsnes/gba/cpu/serialization.cpp

@@ -1,110 +0,0 @@
-void CPU::serialize(serializer &s) {
-  ARM::serialize(s);
-  Thread::serialize(s);
-
-  s.array(iwram,  32 * 1024);
-  s.array(ewram, 256 * 1024);
-
-  for(auto &dma : regs.dma) {
-    s.integer(dma.source);
-    s.integer(dma.target);
-    s.integer(dma.length);
-    s.integer(dma.control.targetmode);
-    s.integer(dma.control.sourcemode);
-    s.integer(dma.control.repeat);
-    s.integer(dma.control.size);
-    s.integer(dma.control.drq);
-    s.integer(dma.control.timingmode);
-    s.integer(dma.control.irq);
-    s.integer(dma.control.enable);
-    s.integer(dma.run.target);
-    s.integer(dma.run.source);
-    s.integer(dma.run.length);
-  }
-
-  for(auto &timer : regs.timer) {
-    s.integer(timer.period);
-    s.integer(timer.reload);
-    s.integer(timer.control.frequency);
-    s.integer(timer.control.cascade);
-    s.integer(timer.control.irq);
-    s.integer(timer.control.enable);
-  }
-
-  for(auto &value : regs.serial.data) s.integer(value);
-  s.integer(regs.serial.control.shiftclockselect);
-  s.integer(regs.serial.control.shiftclockfrequency);
-  s.integer(regs.serial.control.transferenablereceive);
-  s.integer(regs.serial.control.transferenablesend);
-  s.integer(regs.serial.control.startbit);
-  s.integer(regs.serial.control.transferlength);
-  s.integer(regs.serial.control.irqenable);
-  s.integer(regs.serial.data8);
-
-  for(auto &flag : regs.keypad.control.flag) s.integer(flag);
-  s.integer(regs.keypad.control.enable);
-  s.integer(regs.keypad.control.condition);
-
-  s.integer(regs.joybus.settings.sc);
-  s.integer(regs.joybus.settings.sd);
-  s.integer(regs.joybus.settings.si);
-  s.integer(regs.joybus.settings.so);
-  s.integer(regs.joybus.settings.scmode);
-  s.integer(regs.joybus.settings.sdmode);
-  s.integer(regs.joybus.settings.simode);
-  s.integer(regs.joybus.settings.somode);
-  s.integer(regs.joybus.settings.irqenable);
-  s.integer(regs.joybus.settings.mode);
-
-  s.integer(regs.joybus.control.resetsignal);
-  s.integer(regs.joybus.control.receivecomplete);
-  s.integer(regs.joybus.control.sendcomplete);
-  s.integer(regs.joybus.control.irqenable);
-
-  s.integer(regs.joybus.receive);
-  s.integer(regs.joybus.transmit);
-
-  s.integer(regs.joybus.status.receiveflag);
-  s.integer(regs.joybus.status.sendflag);
-  s.integer(regs.joybus.status.generalflag);
-
-  s.integer(regs.ime);
-
-  s.integer(regs.irq.enable.vblank);
-  s.integer(regs.irq.enable.hblank);
-  s.integer(regs.irq.enable.vcoincidence);
-  for(auto &flag : regs.irq.enable.timer) s.integer(flag);
-  s.integer(regs.irq.enable.serial);
-  for(auto &flag : regs.irq.enable.dma) s.integer(flag);
-  s.integer(regs.irq.enable.keypad);
-  s.integer(regs.irq.enable.cartridge);
-
-  s.integer(regs.irq.flag.vblank);
-  s.integer(regs.irq.flag.hblank);
-  s.integer(regs.irq.flag.vcoincidence);
-  for(auto &flag : regs.irq.flag.timer) s.integer(flag);
-  s.integer(regs.irq.flag.serial);
-  for(auto &flag : regs.irq.flag.dma) s.integer(flag);
-  s.integer(regs.irq.flag.keypad);
-  s.integer(regs.irq.flag.cartridge);
-
-  for(auto &flag : regs.wait.control.nwait) s.integer(flag);
-  for(auto &flag : regs.wait.control.swait) s.integer(flag);
-  s.integer(regs.wait.control.phi);
-  s.integer(regs.wait.control.prefetch);
-  s.integer(regs.wait.control.gametype);
-
-  s.integer(regs.memory.control.disable);
-  s.integer(regs.memory.control.unknown1);
-  s.integer(regs.memory.control.ewram);
-  s.integer(regs.memory.control.ewramwait);
-  s.integer(regs.memory.control.unknown2);
-
-  s.integer(regs.postboot);
-  s.integer((unsigned&)regs.mode);
-  s.integer(regs.clock);
-
-  s.integer(pending.dma.vblank);
-  s.integer(pending.dma.hblank);
-  s.integer(pending.dma.hdma);
-}

bsnes/gba/cpu/state.hpp

@@ -1,7 +0,0 @@
-struct Pending {
-  struct DMA {
-    bool vblank;
-    bool hblank;
-    bool hdma;
-  } dma;
-} pending;

bsnes/gba/cpu/timer.cpp

@@ -1,44 +0,0 @@
-void CPU::timer_step(unsigned clocks) {
-  for(unsigned c = 0; c < clocks; c++) {
-    for(unsigned n = 0; n < 4; n++) {
-      auto &timer = regs.timer[n];
-      if(timer.control.enable == false || timer.control.cascade == true) continue;
-
-      static unsigned mask[] = { 0, 63, 255, 1023 };
-      if((regs.clock & mask[timer.control.frequency]) == 0) {
-        timer_increment(n);
-      }
-    }
-
-    regs.clock++;
-  }
-}
-
-void CPU::timer_increment(unsigned n) {
-  auto &timer = regs.timer[n];
-  if(++timer.period == 0) {
-    timer.period = timer.reload;
-
-    if(timer.control.irq) regs.irq.flag.timer[n] = 1;
-
-    if(apu.fifo[0].timer == n) timer_fifo_run(0);
-    if(apu.fifo[1].timer == n) timer_fifo_run(1);
-
-    if(n < 3 && regs.timer[n + 1].control.enable && regs.timer[n + 1].control.cascade) {
-      timer_increment(n + 1);
-    }
-  }
-}
-
-void CPU::timer_fifo_run(unsigned n) {
-  apu.fifo[n].read();
-  if(apu.fifo[n].size > 16) return;
-
-  auto &dma = regs.dma[1 + n];
-  if(dma.control.enable && dma.control.timingmode == 3) {
-    dma.pending = true;
-    dma.control.targetmode = 2;
-    dma.control.size = 1;
-    dma.run.length = 4;
-  }
-}

bsnes/gba/gba.hpp

@@ -1,62 +0,0 @@
-#ifndef GBA_HPP
-#define GBA_HPP
-
-#include <emulator/emulator.hpp>
-#include <processor/arm/arm.hpp>
-
-namespace GameBoyAdvance {
-  namespace Info {
-    static const char Name[] = "bgba";
-    static const unsigned SerializerVersion = 2;
-  }
-}
-
-/*
-  bgba - Game Boy Advance emulator
-  authors: byuu, Cydrak
-  license: GPLv3
-  project started: 2012-03-19
-*/
-
-#include <libco/libco.h>
-
-namespace GameBoyAdvance {
-  enum : unsigned { Byte = 8, Half = 16, Word = 32 };
-
-  struct Thread {
-    cothread_t thread;
-    unsigned frequency;
-    signed clock;
-
-    inline void create(void (*entrypoint)(), unsigned frequency) {
-      if(thread) co_delete(thread);
-      thread = co_create(65536 * sizeof(void*), entrypoint);
-      this->frequency = frequency;
-      clock = 0;
-    }
-
-    inline void serialize(serializer &s) {
-      s.integer(frequency);
-      s.integer(clock);
-    }
-
-    inline Thread() : thread(nullptr) {
-    }
-
-    inline ~Thread() {
-      if(thread) co_delete(thread);
-    }
-  };
-
-  #include <gba/memory/memory.hpp>
-  #include <gba/interface/interface.hpp>
-  #include <gba/scheduler/scheduler.hpp>
-  #include <gba/system/system.hpp>
-  #include <gba/cartridge/cartridge.hpp>
-  #include <gba/cpu/cpu.hpp>
-  #include <gba/ppu/ppu.hpp>
-  #include <gba/apu/apu.hpp>
-  #include <gba/video/video.hpp>
-}
-
-#endif

bsnes/gba/interface/interface.cpp

@@ -1,119 +0,0 @@
-#include <gba/gba.hpp>
-
-namespace GameBoyAdvance {
-
-Interface *interface = nullptr;
-
-double Interface::videoFrequency() {
-  return 16777216.0 / (228.0 * 1232.0);
-}
-
-double Interface::audioFrequency() {
-  return 16777216.0 / 512.0;
-}
-
-bool Interface::loaded() {
-  return cartridge.loaded();
-}
-
-void Interface::load(unsigned id, const stream &stream, const string &markup) {
-  if(id == ID::BIOS) {
-    stream.read(bios.data, min(bios.size, stream.size()));
-  }
-
-  if(id == ID::ROM) {
-    memory.reset();
-    cartridge.load(markup, stream);
-    system.power();
-  }
-
-  if(id == ID::RAM) {
-    stream.read(cartridge.ram.data, min(cartridge.ram.size, stream.size()));
-  }
-
-  if(id == ID::EEPROM) {
-    stream.read(cartridge.eeprom.data, min(cartridge.eeprom.size, stream.size()));
-  }
-
-  if(id == ID::FlashROM) {
-    stream.read(cartridge.flashrom.data, min(cartridge.flashrom.size, stream.size()));
-  }
-}
-
-void Interface::save(unsigned id, const stream &stream) {
-  if(id == ID::RAM) {
-    stream.write(cartridge.ram.data, cartridge.ram.size);
-  }
-
-  if(id == ID::EEPROM) {
-    stream.write(cartridge.eeprom.data, cartridge.eeprom.size);
-  }
-
-  if(id == ID::FlashROM) {
-    stream.write(cartridge.flashrom.data, cartridge.flashrom.size);
-  }
-}
-
-void Interface::unload() {
-  cartridge.unload();
-}
-
-void Interface::power() {
-  system.power();
-}
-
-void Interface::reset() {
-  system.power();
-}
-
-void Interface::run() {
-  system.run();
-}
-
-serializer Interface::serialize() {
-  system.runtosave();
-  return system.serialize();
-}
-
-bool Interface::unserialize(serializer &s) {
-  return system.unserialize(s);
-}
-
-void Interface::updatePalette() {
-  video.generate_palette();
-}
-
-Interface::Interface() {
-  interface = this;
-
-  information.name        = "Game Boy Advance";
-  information.width       = 240;
-  information.height      = 160;
-  information.overscan    = false;
-  information.aspectRatio = 1.0;
-  information.resettable  = false;
-
-  firmware.append({ID::BIOS, "Game Boy Advance", "sys", "bios.rom"});
-
-  media.append({ID::ROM, "Game Boy Advance", "sys", "program.rom", "gba"});
-
-  {
-    Device device{0, ID::Device, "Controller"};
-    device.input.append({0, 0, "A"     });
-    device.input.append({1, 0, "B"     });
-    device.input.append({2, 0, "Select"});
-    device.input.append({3, 0, "Start" });
-    device.input.append({4, 0, "Right" });
-    device.input.append({5, 0, "Left"  });
-    device.input.append({6, 0, "Up"    });
-    device.input.append({7, 0, "Down"  });
-    device.input.append({8, 0, "R"     });
-    device.input.append({9, 0, "L"     });
-    device.order = {6, 7, 5, 4, 1, 0, 9, 8, 2, 3};
-    this->device.append(device);
-  }
-
-  port.append({0, "Device", {device[0]}});
-}
-
-}

bsnes/gba/interface/interface.hpp

@@ -1,47 +0,0 @@
-#ifndef GBA_HPP
-namespace GameBoyAdvance {
-#endif
-
-struct ID {
-  enum : unsigned {
-    BIOS,
-    ROM,
-    RAM,
-    EEPROM,
-    FlashROM,
-  };
-
-  enum : unsigned {
-    Device = 1,
-  };
-};
-
-struct Interface : Emulator::Interface {
-  double videoFrequency();
-  double audioFrequency();
-
-  bool loaded();
-  void load(unsigned id, const stream &stream, const string &markup = "");
-  void save(unsigned id, const stream &stream);
-  void unload();
-
-  void power();
-  void reset();
-  void run();
-
-  serializer serialize();
-  bool unserialize(serializer&);
-
-  void updatePalette();
-
-  Interface();
-
-private:
-  vector<Device> device;
-};
-
-extern Interface *interface;
-
-#ifndef GBA_HPP
-}
-#endif

bsnes/gba/memory/memory.cpp

@@ -1,116 +0,0 @@
-#include <gba/gba.hpp>
-
-namespace GameBoyAdvance {
-
-#include "mmio.cpp"
-#include "serialization.cpp"
-Bus bus;
-
-struct UnmappedMemory : Memory {
-  uint32 read(uint32 addr, uint32 size) { return 0u; }
-  void write(uint32 addr, uint32 size, uint32 word) {}
-};
-
-static UnmappedMemory unmappedMemory;
-
-uint32 Bus::mirror(uint32 addr, uint32 size) {
-  uint32 base = 0;
-  if(size) {
-    uint32 mask = 1 << 27;  //28-bit bus
-    while(addr >= size) {
-      while(!(addr & mask)) mask >>= 1;
-      addr -= mask;
-      if(size > mask) {
-        size -= mask;
-        base += mask;
-      }
-      mask >>= 1;
-    }
-    base += addr;
-  }
-  return base;
-}
-
-uint32 Bus::speed(uint32 addr, uint32 size) {
-  if(addr & 0x08000000) {
-    static unsigned timing[] = { 5, 4, 3, 9 };
-    unsigned n = cpu.regs.wait.control.nwait[addr >> 25 & 3];
-    unsigned s = cpu.regs.wait.control.swait[addr >> 25 & 3];
-    n = timing[n];
-
-    switch(addr >> 25 & 3) {
-    case 0: s = s ? 3 : 2; break;
-    case 1: s = s ? 5 : 2; break;
-    case 2: s = s ? 9 : 2; break;
-    case 3: s = n; break;
-    }
-
-    bool sequential = cpu.sequential();
-    if((addr & 0xffff << 1) == 0) sequential = false;  //N cycle on 16-bit ROM crossing page boundary (RAM S==N)
-    if(idleflag) sequential = false;  //LDR/LDM interrupts instruction fetches
-
-    if(sequential) return s << (size == Word);  //16-bit bus requires two transfers for words
-    if(size == Word) n += s;
-    return n;
-  }
-
-  switch(addr >> 24 & 7) {
-  case 0: return 1;
-  case 1: return 1;
-  case 2: return (1 + 15 - cpu.regs.memory.control.ewramwait) << (size == Word);
-  case 3: return 1;
-  case 4: return 1;
-  case 5: return 1 << (size == Word);
-  case 6: return 1 << (size == Word);
-  case 7: return 1;
-  }
-}
-
-void Bus::idle(uint32 addr) {
-  if(addr & 0x08000000) idleflag = true;
-}
-
-uint32 Bus::read(uint32 addr, uint32 size) {
-  idleflag = false;
-  if(addr & 0x08000000) return cartridge.read(addr, size);
-
-  switch(addr >> 24 & 7) {
-  case 0: return bios.read(addr, size);
-  case 1: return bios.read(addr, size);
-  case 2: return cpu.ewram_read(addr, size);
-  case 3: return cpu.iwram_read(addr, size);
-  case 4:
-    if((addr & 0xfffffc00) == 0x04000000) return mmio[addr & 0x3ff]->read(addr, size);
-    if((addr & 0xff00ffff) == 0x04000800) return ((MMIO&)cpu).read(0x04000800 | (addr & 3), size);
-    return cpu.pipeline.fetch.instruction;
-  case 5: return ppu.pram_read(addr, size);
-  case 6: return ppu.vram_read(addr, size);
-  case 7: return ppu.oam_read(addr, size);
-  }
-}
-
-void Bus::write(uint32 addr, uint32 size, uint32 word) {
-  idleflag = false;
-  if(addr & 0x08000000) return cartridge.write(addr, size, word);
-
-  switch(addr >> 24 & 7) {
-  case 0: return;
-  case 1: return;
-  case 2: return cpu.ewram_write(addr, size, word);
-  case 3: return cpu.iwram_write(addr, size, word);
-  case 4:
-    if((addr & 0xfffffc00) == 0x04000000) return mmio[addr & 0x3ff]->write(addr, size, word);
-    if((addr & 0xff00ffff) == 0x04000800) return ((MMIO&)cpu).write(0x04000800 | (addr & 3), size, word);
-    return;
-  case 5: return ppu.pram_write(addr, size, word);
-  case 6: return ppu.vram_write(addr, size, word);
-  case 7: return ppu.oam_write(addr, size, word);
-  }
-}
-
-void Bus::power() {
-  for(unsigned n = 0; n < 0x400; n++) mmio[n] = &unmappedMemory;
-  idleflag = false;
-}
-
-}

bsnes/gba/memory/memory.hpp

@@ -1,27 +0,0 @@
-struct Memory {
-  virtual uint32 read(uint32 addr, uint32 size) = 0;
-  virtual void write(uint32 addr, uint32 size, uint32 word) = 0;
-};
-
-struct MMIO : Memory {
-  virtual uint8 read(uint32 addr) = 0;
-  virtual void write(uint32 addr, uint8 data) = 0;
-  uint32 read(uint32 addr, uint32 size);
-  void write(uint32 addr, uint32 size, uint32 word);
-};
-
-struct Bus : Memory {
-  Memory *mmio[0x400];
-  bool idleflag;
-  static uint32 mirror(uint32 addr, uint32 size);
-
-  uint32 speed(uint32 addr, uint32 size);
-  void idle(uint32 addr);
-  uint32 read(uint32 addr, uint32 size);
-  void write(uint32 addr, uint32 size, uint32 word);
-  void power();
-
-  void serialize(serializer&);
-};
-
-extern Bus bus;

bsnes/gba/memory/mmio.cpp

@@ -1,43 +0,0 @@
-uint32 MMIO::read(uint32 addr, uint32 size) {
-  uint32 word = 0;
-
-  switch(size) {
-  case Word:
-    addr &= ~3;
-    word |= read(addr + 0) <<  0;
-    word |= read(addr + 1) <<  8;
-    word |= read(addr + 2) << 16;
-    word |= read(addr + 3) << 24;
-    break;
-  case Half:
-    addr &= ~1;
-    word |= read(addr + 0) <<  0;
-    word |= read(addr + 1) <<  8;
-    break;
-  case Byte:
-    word |= read(addr + 0) <<  0;
-    break;
-  }
-
-  return word;
-}
-
-void MMIO::write(uint32 addr, uint32 size, uint32 word) {
-  switch(size) {
-  case Word:
-    addr &= ~3;
-    write(addr + 0, word >>  0);
-    write(addr + 1, word >>  8);
-    write(addr + 2, word >> 16);
-    write(addr + 3, word >> 24);
-    break;
-  case Half:
-    addr &= ~1;
-    write(addr + 0, word >>  0);
-    write(addr + 1, word >>  8);
-    break;
-  case Byte:
-    write(addr + 0, word >>  0);
-    break;
-  }
-}

bsnes/gba/memory/serialization.cpp

@@ -1,3 +0,0 @@
-void Bus::serialize(serializer &s) {
-  s.integer(idleflag);
-}

bsnes/gba/ppu/background.cpp

@@ -1,156 +0,0 @@
-void PPU::render_backgrounds() {
-  switch(regs.control.bgmode) {
-  case 0:
-    render_background_linear(regs.bg[3]);
-    render_background_linear(regs.bg[2]);
-    render_background_linear(regs.bg[1]);
-    render_background_linear(regs.bg[0]);
-    break;
-  case 1:
-    render_background_affine(regs.bg[2]);
-    render_background_linear(regs.bg[1]);
-    render_background_linear(regs.bg[0]);
-    break;
-  case 2:
-    render_background_affine(regs.bg[3]);
-    render_background_affine(regs.bg[2]);
-    break;
-  case 3: case 4: case 5:
-    render_background_bitmap(regs.bg[2]);
-    break;
-  }
-}
-
-void PPU::render_background_linear(Registers::Background &bg) {
-  if(regs.control.enable[bg.id] == false) return;
-  auto &output = layer[bg.id];
-
-  if(bg.control.mosaic == false || (regs.vcounter % (1 + regs.mosaic.bgvsize)) == 0) {
-    bg.vmosaic = regs.vcounter;
-  }
-
-  uint9 voffset = bg.vmosaic + bg.voffset;
-  uint9 hoffset = bg.hoffset;
-
-  unsigned basemap = bg.control.screenbaseblock    << 11;
-  unsigned basechr = bg.control.characterbaseblock << 14;
-  unsigned px = hoffset & 7, py = voffset & 7;
-
-  Tile tile;
-  uint8 data[8];
-
-  for(unsigned x = 0; x < 240; x++) {
-    if(x == 0 || px & 8) {
-      px &= 7;
-
-      unsigned tx = hoffset / 8, ty = voffset / 8;
-      unsigned offset = (ty & 31) * 32 + (tx & 31);
-      if(bg.control.screensize & 1) if(tx & 32) offset += 32 * 32;
-      if(bg.control.screensize & 2) if(ty & 32) offset += 32 * 32 * (1 + (bg.control.screensize & 1));
-      offset = basemap + offset * 2;
-      uint16 mapdata = vram_read(offset, Half);
-
-      tile.character = mapdata >>  0;
-      tile.hflip     = mapdata >> 10;
-      tile.vflip     = mapdata >> 11;
-      tile.palette   = mapdata >> 12;
-
-      if(bg.control.colormode == 0) {
-        offset = basechr + tile.character * 32 + (py ^ (tile.vflip ? 7 : 0)) * 4;
-        uint32 word = vram_read(offset, Word);
-        for(unsigned n = 0; n < 8; n++) data[n] = (word >> (n * 4)) & 15;
-      } else {
-        offset = basechr + tile.character * 64 + (py ^ (tile.vflip ? 7 : 0)) * 8;
-        uint32 wordlo = vram_read(offset + 0, Word);
-        uint32 wordhi = vram_read(offset + 4, Word);
-        for(unsigned n = 0; n < 4; n++) data[0 + n] = (wordlo >> (n * 8)) & 255;
-        for(unsigned n = 0; n < 4; n++) data[4 + n] = (wordhi >> (n * 8)) & 255;
-      }
-    }
-
-    hoffset++;
-    uint8 color = data[px++ ^ (tile.hflip ? 7 : 0)];
-
-    if(color) {
-      if(bg.control.colormode == 0) output[x].write(true, bg.control.priority, pram[tile.palette * 16 + color]);
-      if(bg.control.colormode == 1) output[x].write(true, bg.control.priority, pram[color]);
-    }
-  }
-}
-
-void PPU::render_background_affine(Registers::Background &bg) {
-  if(regs.control.enable[bg.id] == false) return;
-  auto &output = layer[bg.id];
-
-  unsigned basemap = bg.control.screenbaseblock    << 11;
-  unsigned basechr = bg.control.characterbaseblock << 14;
-  unsigned screensize = 16 << bg.control.screensize;
-  unsigned screenwrap = (1 << (bg.control.affinewrap ? 7 + bg.control.screensize : 20)) - 1;
-
-  if(bg.control.mosaic == false || (regs.vcounter % (1 + regs.mosaic.bgvsize)) == 0) {
-    bg.hmosaic = bg.lx;
-    bg.vmosaic = bg.ly;
-  }
-
-  int28 fx = bg.hmosaic;
-  int28 fy = bg.vmosaic;
-
-  for(unsigned x = 0; x < 240; x++) {
-    unsigned cx = (fx >> 8) & screenwrap, tx = cx / 8, px = cx & 7;
-    unsigned cy = (fy >> 8) & screenwrap, ty = cy / 8, py = cy & 7;
-
-    if(tx < screensize && ty < screensize) {
-      uint8 character = vram[basemap + ty * screensize + tx];
-      uint8 color = vram[basechr + (character * 64) + py * 8 + px];
-      if(color) output[x].write(true, bg.control.priority, pram[color]);
-    }
-
-    fx += bg.pa;
-    fy += bg.pc;
-  }
-
-  bg.lx += bg.pb;
-  bg.ly += bg.pd;
-}
-
-void PPU::render_background_bitmap(Registers::Background &bg) {
-  if(regs.control.enable[bg.id] == false) return;
-  auto &output = layer[bg.id];
-
-  uint1 depth = regs.control.bgmode != 4;  //0 = 8-bit (Mode 4), 1 = 15-bit (Mode 3, Mode 5)
-  unsigned basemap = regs.control.bgmode == 3 ? 0 : 0xa000 * regs.control.frame;
-
-  unsigned width  = regs.control.bgmode == 5 ? 160 : 240;
-  unsigned height = regs.control.bgmode == 5 ? 128 : 160;
-  unsigned size   = depth ? Half : Byte;
-
-  if(bg.control.mosaic == false || (regs.vcounter % (1 + regs.mosaic.bgvsize)) == 0) {
-    bg.hmosaic = bg.lx;
-    bg.vmosaic = bg.ly;
-  }
-
-  int28 fx = bg.hmosaic;
-  int28 fy = bg.vmosaic;
-
-  for(unsigned x = 0; x < 240; x++) {
-    unsigned px = fx >> 8;
-    unsigned py = fy >> 8;
-
-    if(px < width && py < height) {
-      unsigned offset = py * width + px;
-      unsigned color  = vram_read(basemap + (offset << depth), size);
-
-      if(depth || color) {  //8bpp color 0 is transparent; 15bpp color is always opaque
-        if(depth == 0) color = pram[color];
-        if(depth == 1) color = color & 0x7fff;
-        output[x].write(true, bg.control.priority, color);
-      }
-    }
-
-    fx += bg.pa;
-    fy += bg.pc;
-  }
-
-  bg.lx += bg.pb;
-  bg.ly += bg.pd;
-}