From 0f54be93b7cb3fba617308083ce16e26226f016d Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Sun, 18 Mar 2012 23:35:53 +1100 Subject: [PATCH] Update to v087r04 release. byuu says: Changelog: - gameboy/ -> gb/ - GameBoy -> GB - basic memory map for GBA - enough code to execute the first BIOS instruction (b 0x68) I have the code resetting r(15) to 0 on an exception just as a test. Since that flushes the pipeline, that means we're basically executing "b 0x68" at 8MHz, and nothing else. ... and I am getting __6 motherfucking FPS__ at 4.4GHz on an i7. Something is seriously, horribly, unfuckingbelievably wrong here, and I can't figure out what it is. My *fully complete* ARM core on the ST018 is even less efficient and runs at 21.47MHz, and yet I get 60fps even after emulating the SNES CPU+PPU @ 10+MHz each as well. ... I'm stuck. I can't proceed until we figure out what in the holy fuck is going on here. So ... if anyone can help, please do. If we can't fix this, the GBA emulation is dead. I was able to profile on Windows, and I've included that in this WIP under out/log.txt. But it looks normal to me. But yeah, there's NO. FUCKING. WAY. This code should be running this slowly. --- bsnes/gameboy/Makefile | 18 ------------- bsnes/gb/Makefile | 18 +++++++++++++ bsnes/{gameboy => gb}/apu/apu.cpp | 4 +-- bsnes/{gameboy => gb}/apu/apu.hpp | 0 bsnes/{gameboy => gb}/apu/master/master.cpp | 0 bsnes/{gameboy => gb}/apu/master/master.hpp | 0 bsnes/{gameboy => gb}/apu/noise/noise.cpp | 0 bsnes/{gameboy => gb}/apu/noise/noise.hpp | 0 bsnes/{gameboy => gb}/apu/serialization.cpp | 0 bsnes/{gameboy => gb}/apu/square1/square1.cpp | 0 bsnes/{gameboy => gb}/apu/square1/square1.hpp | 0 bsnes/{gameboy => gb}/apu/square2/square2.cpp | 0 bsnes/{gameboy => gb}/apu/square2/square2.hpp | 0 bsnes/{gameboy => gb}/apu/wave/wave.cpp | 0 bsnes/{gameboy => gb}/apu/wave/wave.hpp | 0 bsnes/{gameboy => gb}/cartridge/cartridge.cpp | 4 +-- bsnes/{gameboy => gb}/cartridge/cartridge.hpp | 0 bsnes/{gameboy => gb}/cartridge/huc1/huc1.cpp | 0 bsnes/{gameboy => gb}/cartridge/huc1/huc1.hpp | 0 bsnes/{gameboy => gb}/cartridge/huc3/huc3.cpp | 0 bsnes/{gameboy => gb}/cartridge/huc3/huc3.hpp | 0 bsnes/{gameboy => gb}/cartridge/mbc0/mbc0.cpp | 0 bsnes/{gameboy => gb}/cartridge/mbc0/mbc0.hpp | 0 bsnes/{gameboy => gb}/cartridge/mbc1/mbc1.cpp | 0 bsnes/{gameboy => gb}/cartridge/mbc1/mbc1.hpp | 0 bsnes/{gameboy => gb}/cartridge/mbc2/mbc2.cpp | 0 bsnes/{gameboy => gb}/cartridge/mbc2/mbc2.hpp | 0 bsnes/{gameboy => gb}/cartridge/mbc3/mbc3.cpp | 0 bsnes/{gameboy => gb}/cartridge/mbc3/mbc3.hpp | 0 bsnes/{gameboy => gb}/cartridge/mbc5/mbc5.cpp | 0 bsnes/{gameboy => gb}/cartridge/mbc5/mbc5.hpp | 0 .../{gameboy => gb}/cartridge/mmm01/mmm01.cpp | 0 .../{gameboy => gb}/cartridge/mmm01/mmm01.hpp | 0 .../cartridge/serialization.cpp | 0 bsnes/{gameboy => gb}/cheat/cheat.cpp | 4 +-- bsnes/{gameboy => gb}/cheat/cheat.hpp | 0 bsnes/{gameboy => gb}/cpu/core/core.cpp | 0 bsnes/{gameboy => gb}/cpu/core/core.hpp | 0 .../{gameboy => gb}/cpu/core/disassembler.cpp | 0 bsnes/{gameboy => gb}/cpu/core/registers.hpp | 0 bsnes/{gameboy => gb}/cpu/core/table.cpp | 0 bsnes/{gameboy => gb}/cpu/cpu.cpp | 4 +-- bsnes/{gameboy => gb}/cpu/cpu.hpp | 0 bsnes/{gameboy => gb}/cpu/mmio/mmio.cpp | 0 bsnes/{gameboy => gb}/cpu/mmio/mmio.hpp | 0 bsnes/{gameboy => gb}/cpu/serialization.cpp | 0 bsnes/{gameboy => gb}/cpu/timing/opcode.cpp | 0 bsnes/{gameboy => gb}/cpu/timing/timing.cpp | 0 bsnes/{gameboy => gb}/cpu/timing/timing.hpp | 0 bsnes/{gameboy/gameboy.hpp => gb/gb.hpp} | 26 +++++++++---------- bsnes/{gameboy => gb}/interface/interface.cpp | 4 +-- bsnes/{gameboy => gb}/interface/interface.hpp | 0 bsnes/{gameboy => gb}/lcd/cgb.cpp | 0 bsnes/{gameboy => gb}/lcd/dmg.cpp | 0 bsnes/{gameboy => gb}/lcd/lcd.cpp | 4 +-- bsnes/{gameboy => gb}/lcd/lcd.hpp | 0 bsnes/{gameboy => gb}/lcd/mmio/mmio.cpp | 0 bsnes/{gameboy => gb}/lcd/mmio/mmio.hpp | 0 bsnes/{gameboy => gb}/lcd/serialization.cpp | 0 bsnes/{gameboy => gb}/memory/memory.cpp | 4 +-- bsnes/{gameboy => gb}/memory/memory.hpp | 0 bsnes/{gameboy => gb}/scheduler/scheduler.cpp | 4 +-- bsnes/{gameboy => gb}/scheduler/scheduler.hpp | 0 bsnes/{gameboy => gb}/system/bootrom-cgb.cpp | 0 bsnes/{gameboy => gb}/system/bootrom-dmg.cpp | 0 bsnes/{gameboy => gb}/system/bootrom-sgb.cpp | 0 .../{gameboy => gb}/system/serialization.cpp | 0 bsnes/{gameboy => gb}/system/system.cpp | 4 +-- bsnes/{gameboy => gb}/system/system.hpp | 2 +- bsnes/{gameboy => gb}/video/video.cpp | 4 +-- bsnes/{gameboy => gb}/video/video.hpp | 0 71 files changed, 52 insertions(+), 52 deletions(-) delete mode 100755 bsnes/gameboy/Makefile create mode 100755 bsnes/gb/Makefile rename bsnes/{gameboy => gb}/apu/apu.cpp (98%) rename bsnes/{gameboy => gb}/apu/apu.hpp (100%) rename bsnes/{gameboy => gb}/apu/master/master.cpp (100%) rename bsnes/{gameboy => gb}/apu/master/master.hpp (100%) rename bsnes/{gameboy => gb}/apu/noise/noise.cpp (100%) rename bsnes/{gameboy => gb}/apu/noise/noise.hpp (100%) rename bsnes/{gameboy => gb}/apu/serialization.cpp (100%) rename bsnes/{gameboy => gb}/apu/square1/square1.cpp (100%) rename bsnes/{gameboy => gb}/apu/square1/square1.hpp (100%) rename bsnes/{gameboy => gb}/apu/square2/square2.cpp (100%) rename bsnes/{gameboy => gb}/apu/square2/square2.hpp (100%) rename bsnes/{gameboy => gb}/apu/wave/wave.cpp (100%) rename bsnes/{gameboy => gb}/apu/wave/wave.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/cartridge.cpp (98%) rename bsnes/{gameboy => gb}/cartridge/cartridge.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/huc1/huc1.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/huc1/huc1.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/huc3/huc3.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/huc3/huc3.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc0/mbc0.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc0/mbc0.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc1/mbc1.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc1/mbc1.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc2/mbc2.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc2/mbc2.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc3/mbc3.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc3/mbc3.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc5/mbc5.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mbc5/mbc5.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/mmm01/mmm01.cpp (100%) rename bsnes/{gameboy => gb}/cartridge/mmm01/mmm01.hpp (100%) rename bsnes/{gameboy => gb}/cartridge/serialization.cpp (100%) rename bsnes/{gameboy => gb}/cheat/cheat.cpp (98%) rename bsnes/{gameboy => gb}/cheat/cheat.hpp (100%) rename bsnes/{gameboy => gb}/cpu/core/core.cpp (100%) rename bsnes/{gameboy => gb}/cpu/core/core.hpp (100%) rename bsnes/{gameboy => gb}/cpu/core/disassembler.cpp (100%) rename bsnes/{gameboy => gb}/cpu/core/registers.hpp (100%) rename bsnes/{gameboy => gb}/cpu/core/table.cpp (100%) rename bsnes/{gameboy => gb}/cpu/cpu.cpp (98%) rename bsnes/{gameboy => gb}/cpu/cpu.hpp (100%) rename bsnes/{gameboy => gb}/cpu/mmio/mmio.cpp (100%) rename bsnes/{gameboy => gb}/cpu/mmio/mmio.hpp (100%) rename bsnes/{gameboy => gb}/cpu/serialization.cpp (100%) rename bsnes/{gameboy => gb}/cpu/timing/opcode.cpp (100%) rename bsnes/{gameboy => gb}/cpu/timing/timing.cpp (100%) rename bsnes/{gameboy => gb}/cpu/timing/timing.hpp (100%) rename bsnes/{gameboy/gameboy.hpp => gb/gb.hpp} (62%) rename bsnes/{gameboy => gb}/interface/interface.cpp (88%) rename bsnes/{gameboy => gb}/interface/interface.hpp (100%) rename bsnes/{gameboy => gb}/lcd/cgb.cpp (100%) rename bsnes/{gameboy => gb}/lcd/dmg.cpp (100%) rename bsnes/{gameboy => gb}/lcd/lcd.cpp (98%) rename bsnes/{gameboy => gb}/lcd/lcd.hpp (100%) rename bsnes/{gameboy => gb}/lcd/mmio/mmio.cpp (100%) rename bsnes/{gameboy => gb}/lcd/mmio/mmio.hpp (100%) rename bsnes/{gameboy => gb}/lcd/serialization.cpp (100%) rename bsnes/{gameboy => gb}/memory/memory.cpp (95%) rename bsnes/{gameboy => gb}/memory/memory.hpp (100%) rename bsnes/{gameboy => gb}/scheduler/scheduler.cpp (91%) rename bsnes/{gameboy => gb}/scheduler/scheduler.hpp (100%) rename bsnes/{gameboy => gb}/system/bootrom-cgb.cpp (100%) rename bsnes/{gameboy => gb}/system/bootrom-dmg.cpp (100%) rename bsnes/{gameboy => gb}/system/bootrom-sgb.cpp (100%) rename bsnes/{gameboy => gb}/system/serialization.cpp (100%) rename bsnes/{gameboy => gb}/system/system.cpp (95%) rename bsnes/{gameboy => gb}/system/system.hpp (95%) rename bsnes/{gameboy => gb}/video/video.cpp (97%) rename bsnes/{gameboy => gb}/video/video.hpp (100%) diff --git a/bsnes/gameboy/Makefile b/bsnes/gameboy/Makefile deleted file mode 100755 index 22a77c70..00000000 --- a/bsnes/gameboy/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -options += gameboy - -gameboy_objects := gameboy-interface gameboy-system gameboy-scheduler -gameboy_objects += gameboy-memory gameboy-cartridge -gameboy_objects += gameboy-cpu gameboy-apu gameboy-lcd -gameboy_objects += gameboy-cheat gameboy-video -objects += $(gameboy_objects) - -obj/gameboy-interface.o: $(gameboy)/interface/interface.cpp $(call rwildcard,$(gameboy)/interface/) -obj/gameboy-system.o: $(gameboy)/system/system.cpp $(call rwildcard,$(gameboy)/system/) -obj/gameboy-scheduler.o: $(gameboy)/scheduler/scheduler.cpp $(call rwildcard,$(gameboy)/scheduler/) -obj/gameboy-cartridge.o: $(gameboy)/cartridge/cartridge.cpp $(call rwildcard,$(gameboy)/cartridge/) -obj/gameboy-memory.o: $(gameboy)/memory/memory.cpp $(call rwildcard,$(gameboy)/memory/) -obj/gameboy-cpu.o: $(gameboy)/cpu/cpu.cpp $(call rwildcard,$(gameboy)/cpu/) -obj/gameboy-apu.o: $(gameboy)/apu/apu.cpp $(call rwildcard,$(gameboy)/apu/) -obj/gameboy-lcd.o: $(gameboy)/lcd/lcd.cpp $(call rwildcard,$(gameboy)/lcd/) -obj/gameboy-cheat.o: $(gameboy)/cheat/cheat.cpp $(call rwildcard,$(gameboy)/cheat/) -obj/gameboy-video.o: $(gameboy)/video/video.cpp $(call rwildcard,$(gameboy)/video/) diff --git a/bsnes/gb/Makefile b/bsnes/gb/Makefile new file mode 100755 index 00000000..3a9631b2 --- /dev/null +++ b/bsnes/gb/Makefile @@ -0,0 +1,18 @@ +options += gameboy + +gb_objects := gb-interface gb-system gb-scheduler +gb_objects += gb-memory gb-cartridge +gb_objects += gb-cpu gb-apu gb-lcd +gb_objects += gb-cheat gb-video +objects += $(gb_objects) + +obj/gb-interface.o: $(gb)/interface/interface.cpp $(call rwildcard,$(gb)/interface/) +obj/gb-system.o: $(gb)/system/system.cpp $(call rwildcard,$(gb)/system/) +obj/gb-scheduler.o: $(gb)/scheduler/scheduler.cpp $(call rwildcard,$(gb)/scheduler/) +obj/gb-cartridge.o: $(gb)/cartridge/cartridge.cpp $(call rwildcard,$(gb)/cartridge/) +obj/gb-memory.o: $(gb)/memory/memory.cpp $(call rwildcard,$(gb)/memory/) +obj/gb-cpu.o: $(gb)/cpu/cpu.cpp $(call rwildcard,$(gb)/cpu/) +obj/gb-apu.o: $(gb)/apu/apu.cpp $(call rwildcard,$(gb)/apu/) +obj/gb-lcd.o: $(gb)/lcd/lcd.cpp $(call rwildcard,$(gb)/lcd/) +obj/gb-cheat.o: $(gb)/cheat/cheat.cpp $(call rwildcard,$(gb)/cheat/) +obj/gb-video.o: $(gb)/video/video.cpp $(call rwildcard,$(gb)/video/) diff --git a/bsnes/gameboy/apu/apu.cpp b/bsnes/gb/apu/apu.cpp similarity index 98% rename from bsnes/gameboy/apu/apu.cpp rename to bsnes/gb/apu/apu.cpp index be3a4e77..d235657b 100755 --- a/bsnes/gameboy/apu/apu.cpp +++ b/bsnes/gb/apu/apu.cpp @@ -1,7 +1,7 @@ -#include +#include #define APU_CPP -namespace GameBoy { +namespace GB { #include "square1/square1.cpp" #include "square2/square2.cpp" diff --git a/bsnes/gameboy/apu/apu.hpp b/bsnes/gb/apu/apu.hpp similarity index 100% rename from bsnes/gameboy/apu/apu.hpp rename to bsnes/gb/apu/apu.hpp diff --git a/bsnes/gameboy/apu/master/master.cpp b/bsnes/gb/apu/master/master.cpp similarity index 100% rename from bsnes/gameboy/apu/master/master.cpp rename to bsnes/gb/apu/master/master.cpp diff --git a/bsnes/gameboy/apu/master/master.hpp b/bsnes/gb/apu/master/master.hpp similarity index 100% rename from bsnes/gameboy/apu/master/master.hpp rename to bsnes/gb/apu/master/master.hpp diff --git a/bsnes/gameboy/apu/noise/noise.cpp b/bsnes/gb/apu/noise/noise.cpp similarity index 100% rename from bsnes/gameboy/apu/noise/noise.cpp rename to bsnes/gb/apu/noise/noise.cpp diff --git a/bsnes/gameboy/apu/noise/noise.hpp b/bsnes/gb/apu/noise/noise.hpp similarity index 100% rename from bsnes/gameboy/apu/noise/noise.hpp rename to bsnes/gb/apu/noise/noise.hpp diff --git a/bsnes/gameboy/apu/serialization.cpp b/bsnes/gb/apu/serialization.cpp similarity index 100% rename from bsnes/gameboy/apu/serialization.cpp rename to bsnes/gb/apu/serialization.cpp diff --git a/bsnes/gameboy/apu/square1/square1.cpp b/bsnes/gb/apu/square1/square1.cpp similarity index 100% rename from bsnes/gameboy/apu/square1/square1.cpp rename to bsnes/gb/apu/square1/square1.cpp diff --git a/bsnes/gameboy/apu/square1/square1.hpp b/bsnes/gb/apu/square1/square1.hpp similarity index 100% rename from bsnes/gameboy/apu/square1/square1.hpp rename to bsnes/gb/apu/square1/square1.hpp diff --git a/bsnes/gameboy/apu/square2/square2.cpp b/bsnes/gb/apu/square2/square2.cpp similarity index 100% rename from bsnes/gameboy/apu/square2/square2.cpp rename to bsnes/gb/apu/square2/square2.cpp diff --git a/bsnes/gameboy/apu/square2/square2.hpp b/bsnes/gb/apu/square2/square2.hpp similarity index 100% rename from bsnes/gameboy/apu/square2/square2.hpp rename to bsnes/gb/apu/square2/square2.hpp diff --git a/bsnes/gameboy/apu/wave/wave.cpp b/bsnes/gb/apu/wave/wave.cpp similarity index 100% rename from bsnes/gameboy/apu/wave/wave.cpp rename to bsnes/gb/apu/wave/wave.cpp diff --git a/bsnes/gameboy/apu/wave/wave.hpp b/bsnes/gb/apu/wave/wave.hpp similarity index 100% rename from bsnes/gameboy/apu/wave/wave.hpp rename to bsnes/gb/apu/wave/wave.hpp diff --git a/bsnes/gameboy/cartridge/cartridge.cpp b/bsnes/gb/cartridge/cartridge.cpp similarity index 98% rename from bsnes/gameboy/cartridge/cartridge.cpp rename to bsnes/gb/cartridge/cartridge.cpp index 085f5c5a..0484c162 100755 --- a/bsnes/gameboy/cartridge/cartridge.cpp +++ b/bsnes/gb/cartridge/cartridge.cpp @@ -1,9 +1,9 @@ -#include +#include #include #define CARTRIDGE_CPP -namespace GameBoy { +namespace GB { #include "mbc0/mbc0.cpp" #include "mbc1/mbc1.cpp" diff --git a/bsnes/gameboy/cartridge/cartridge.hpp b/bsnes/gb/cartridge/cartridge.hpp similarity index 100% rename from bsnes/gameboy/cartridge/cartridge.hpp rename to bsnes/gb/cartridge/cartridge.hpp diff --git a/bsnes/gameboy/cartridge/huc1/huc1.cpp b/bsnes/gb/cartridge/huc1/huc1.cpp similarity index 100% rename from bsnes/gameboy/cartridge/huc1/huc1.cpp rename to bsnes/gb/cartridge/huc1/huc1.cpp diff --git a/bsnes/gameboy/cartridge/huc1/huc1.hpp b/bsnes/gb/cartridge/huc1/huc1.hpp similarity index 100% rename from bsnes/gameboy/cartridge/huc1/huc1.hpp rename to bsnes/gb/cartridge/huc1/huc1.hpp diff --git a/bsnes/gameboy/cartridge/huc3/huc3.cpp b/bsnes/gb/cartridge/huc3/huc3.cpp similarity index 100% rename from bsnes/gameboy/cartridge/huc3/huc3.cpp rename to bsnes/gb/cartridge/huc3/huc3.cpp diff --git a/bsnes/gameboy/cartridge/huc3/huc3.hpp b/bsnes/gb/cartridge/huc3/huc3.hpp similarity index 100% rename from bsnes/gameboy/cartridge/huc3/huc3.hpp rename to bsnes/gb/cartridge/huc3/huc3.hpp diff --git a/bsnes/gameboy/cartridge/mbc0/mbc0.cpp b/bsnes/gb/cartridge/mbc0/mbc0.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc0/mbc0.cpp rename to bsnes/gb/cartridge/mbc0/mbc0.cpp diff --git a/bsnes/gameboy/cartridge/mbc0/mbc0.hpp b/bsnes/gb/cartridge/mbc0/mbc0.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc0/mbc0.hpp rename to bsnes/gb/cartridge/mbc0/mbc0.hpp diff --git a/bsnes/gameboy/cartridge/mbc1/mbc1.cpp b/bsnes/gb/cartridge/mbc1/mbc1.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc1/mbc1.cpp rename to bsnes/gb/cartridge/mbc1/mbc1.cpp diff --git a/bsnes/gameboy/cartridge/mbc1/mbc1.hpp b/bsnes/gb/cartridge/mbc1/mbc1.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc1/mbc1.hpp rename to bsnes/gb/cartridge/mbc1/mbc1.hpp diff --git a/bsnes/gameboy/cartridge/mbc2/mbc2.cpp b/bsnes/gb/cartridge/mbc2/mbc2.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc2/mbc2.cpp rename to bsnes/gb/cartridge/mbc2/mbc2.cpp diff --git a/bsnes/gameboy/cartridge/mbc2/mbc2.hpp b/bsnes/gb/cartridge/mbc2/mbc2.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc2/mbc2.hpp rename to bsnes/gb/cartridge/mbc2/mbc2.hpp diff --git a/bsnes/gameboy/cartridge/mbc3/mbc3.cpp b/bsnes/gb/cartridge/mbc3/mbc3.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc3/mbc3.cpp rename to bsnes/gb/cartridge/mbc3/mbc3.cpp diff --git a/bsnes/gameboy/cartridge/mbc3/mbc3.hpp b/bsnes/gb/cartridge/mbc3/mbc3.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc3/mbc3.hpp rename to bsnes/gb/cartridge/mbc3/mbc3.hpp diff --git a/bsnes/gameboy/cartridge/mbc5/mbc5.cpp b/bsnes/gb/cartridge/mbc5/mbc5.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc5/mbc5.cpp rename to bsnes/gb/cartridge/mbc5/mbc5.cpp diff --git a/bsnes/gameboy/cartridge/mbc5/mbc5.hpp b/bsnes/gb/cartridge/mbc5/mbc5.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mbc5/mbc5.hpp rename to bsnes/gb/cartridge/mbc5/mbc5.hpp diff --git a/bsnes/gameboy/cartridge/mmm01/mmm01.cpp b/bsnes/gb/cartridge/mmm01/mmm01.cpp similarity index 100% rename from bsnes/gameboy/cartridge/mmm01/mmm01.cpp rename to bsnes/gb/cartridge/mmm01/mmm01.cpp diff --git a/bsnes/gameboy/cartridge/mmm01/mmm01.hpp b/bsnes/gb/cartridge/mmm01/mmm01.hpp similarity index 100% rename from bsnes/gameboy/cartridge/mmm01/mmm01.hpp rename to bsnes/gb/cartridge/mmm01/mmm01.hpp diff --git a/bsnes/gameboy/cartridge/serialization.cpp b/bsnes/gb/cartridge/serialization.cpp similarity index 100% rename from bsnes/gameboy/cartridge/serialization.cpp rename to bsnes/gb/cartridge/serialization.cpp diff --git a/bsnes/gameboy/cheat/cheat.cpp b/bsnes/gb/cheat/cheat.cpp similarity index 98% rename from bsnes/gameboy/cheat/cheat.cpp rename to bsnes/gb/cheat/cheat.cpp index bd72ef69..e0037d91 100755 --- a/bsnes/gameboy/cheat/cheat.cpp +++ b/bsnes/gb/cheat/cheat.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace GameBoy { +namespace GB { Cheat cheat; diff --git a/bsnes/gameboy/cheat/cheat.hpp b/bsnes/gb/cheat/cheat.hpp similarity index 100% rename from bsnes/gameboy/cheat/cheat.hpp rename to bsnes/gb/cheat/cheat.hpp diff --git a/bsnes/gameboy/cpu/core/core.cpp b/bsnes/gb/cpu/core/core.cpp similarity index 100% rename from bsnes/gameboy/cpu/core/core.cpp rename to bsnes/gb/cpu/core/core.cpp diff --git a/bsnes/gameboy/cpu/core/core.hpp b/bsnes/gb/cpu/core/core.hpp similarity index 100% rename from bsnes/gameboy/cpu/core/core.hpp rename to bsnes/gb/cpu/core/core.hpp diff --git a/bsnes/gameboy/cpu/core/disassembler.cpp b/bsnes/gb/cpu/core/disassembler.cpp similarity index 100% rename from bsnes/gameboy/cpu/core/disassembler.cpp rename to bsnes/gb/cpu/core/disassembler.cpp diff --git a/bsnes/gameboy/cpu/core/registers.hpp b/bsnes/gb/cpu/core/registers.hpp similarity index 100% rename from bsnes/gameboy/cpu/core/registers.hpp rename to bsnes/gb/cpu/core/registers.hpp diff --git a/bsnes/gameboy/cpu/core/table.cpp b/bsnes/gb/cpu/core/table.cpp similarity index 100% rename from bsnes/gameboy/cpu/core/table.cpp rename to bsnes/gb/cpu/core/table.cpp diff --git a/bsnes/gameboy/cpu/cpu.cpp b/bsnes/gb/cpu/cpu.cpp similarity index 98% rename from bsnes/gameboy/cpu/cpu.cpp rename to bsnes/gb/cpu/cpu.cpp index 306e3aa1..b94043e8 100755 --- a/bsnes/gameboy/cpu/cpu.cpp +++ b/bsnes/gb/cpu/cpu.cpp @@ -1,7 +1,7 @@ -#include +#include #define CPU_CPP -namespace GameBoy { +namespace GB { #include "core/core.cpp" #include "mmio/mmio.cpp" diff --git a/bsnes/gameboy/cpu/cpu.hpp b/bsnes/gb/cpu/cpu.hpp similarity index 100% rename from bsnes/gameboy/cpu/cpu.hpp rename to bsnes/gb/cpu/cpu.hpp diff --git a/bsnes/gameboy/cpu/mmio/mmio.cpp b/bsnes/gb/cpu/mmio/mmio.cpp similarity index 100% rename from bsnes/gameboy/cpu/mmio/mmio.cpp rename to bsnes/gb/cpu/mmio/mmio.cpp diff --git a/bsnes/gameboy/cpu/mmio/mmio.hpp b/bsnes/gb/cpu/mmio/mmio.hpp similarity index 100% rename from bsnes/gameboy/cpu/mmio/mmio.hpp rename to bsnes/gb/cpu/mmio/mmio.hpp diff --git a/bsnes/gameboy/cpu/serialization.cpp b/bsnes/gb/cpu/serialization.cpp similarity index 100% rename from bsnes/gameboy/cpu/serialization.cpp rename to bsnes/gb/cpu/serialization.cpp diff --git a/bsnes/gameboy/cpu/timing/opcode.cpp b/bsnes/gb/cpu/timing/opcode.cpp similarity index 100% rename from bsnes/gameboy/cpu/timing/opcode.cpp rename to bsnes/gb/cpu/timing/opcode.cpp diff --git a/bsnes/gameboy/cpu/timing/timing.cpp b/bsnes/gb/cpu/timing/timing.cpp similarity index 100% rename from bsnes/gameboy/cpu/timing/timing.cpp rename to bsnes/gb/cpu/timing/timing.cpp diff --git a/bsnes/gameboy/cpu/timing/timing.hpp b/bsnes/gb/cpu/timing/timing.hpp similarity index 100% rename from bsnes/gameboy/cpu/timing/timing.hpp rename to bsnes/gb/cpu/timing/timing.hpp diff --git a/bsnes/gameboy/gameboy.hpp b/bsnes/gb/gb.hpp similarity index 62% rename from bsnes/gameboy/gameboy.hpp rename to bsnes/gb/gb.hpp index 142fa036..27275900 100755 --- a/bsnes/gameboy/gameboy.hpp +++ b/bsnes/gb/gb.hpp @@ -3,15 +3,15 @@ #include -namespace GameBoy { +namespace GB { namespace Info { - static const char Name[] = "bgameboy"; + static const char Name[] = "bsgbc"; static const unsigned SerializerVersion = 3; } } /* - bgameboy - Game Boy, Super Game Boy, and Game Boy Color emulator + bsgbc - Game Boy, Super Game Boy, and Game Boy Color emulator author: byuu license: GPLv3 project started: 2010-12-27 @@ -20,7 +20,7 @@ namespace GameBoy { #include #include -namespace GameBoy { +namespace GB { struct Processor { cothread_t thread; unsigned frequency; @@ -46,15 +46,15 @@ namespace GameBoy { } }; - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include + #include + #include + #include }; #endif diff --git a/bsnes/gameboy/interface/interface.cpp b/bsnes/gb/interface/interface.cpp similarity index 88% rename from bsnes/gameboy/interface/interface.cpp rename to bsnes/gb/interface/interface.cpp index 0a6d5f2a..21895a61 100755 --- a/bsnes/gameboy/interface/interface.cpp +++ b/bsnes/gb/interface/interface.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace GameBoy { +namespace GB { Interface *interface = nullptr; diff --git a/bsnes/gameboy/interface/interface.hpp b/bsnes/gb/interface/interface.hpp similarity index 100% rename from bsnes/gameboy/interface/interface.hpp rename to bsnes/gb/interface/interface.hpp diff --git a/bsnes/gameboy/lcd/cgb.cpp b/bsnes/gb/lcd/cgb.cpp similarity index 100% rename from bsnes/gameboy/lcd/cgb.cpp rename to bsnes/gb/lcd/cgb.cpp diff --git a/bsnes/gameboy/lcd/dmg.cpp b/bsnes/gb/lcd/dmg.cpp similarity index 100% rename from bsnes/gameboy/lcd/dmg.cpp rename to bsnes/gb/lcd/dmg.cpp diff --git a/bsnes/gameboy/lcd/lcd.cpp b/bsnes/gb/lcd/lcd.cpp similarity index 98% rename from bsnes/gameboy/lcd/lcd.cpp rename to bsnes/gb/lcd/lcd.cpp index 7a3607c6..8eae827f 100755 --- a/bsnes/gameboy/lcd/lcd.cpp +++ b/bsnes/gb/lcd/lcd.cpp @@ -1,4 +1,4 @@ -#include +#include //LY = 0-153 //Raster = 0-143 @@ -7,7 +7,7 @@ //LX = 0-455 #define LCD_CPP -namespace GameBoy { +namespace GB { #include "dmg.cpp" #include "cgb.cpp" diff --git a/bsnes/gameboy/lcd/lcd.hpp b/bsnes/gb/lcd/lcd.hpp similarity index 100% rename from bsnes/gameboy/lcd/lcd.hpp rename to bsnes/gb/lcd/lcd.hpp diff --git a/bsnes/gameboy/lcd/mmio/mmio.cpp b/bsnes/gb/lcd/mmio/mmio.cpp similarity index 100% rename from bsnes/gameboy/lcd/mmio/mmio.cpp rename to bsnes/gb/lcd/mmio/mmio.cpp diff --git a/bsnes/gameboy/lcd/mmio/mmio.hpp b/bsnes/gb/lcd/mmio/mmio.hpp similarity index 100% rename from bsnes/gameboy/lcd/mmio/mmio.hpp rename to bsnes/gb/lcd/mmio/mmio.hpp diff --git a/bsnes/gameboy/lcd/serialization.cpp b/bsnes/gb/lcd/serialization.cpp similarity index 100% rename from bsnes/gameboy/lcd/serialization.cpp rename to bsnes/gb/lcd/serialization.cpp diff --git a/bsnes/gameboy/memory/memory.cpp b/bsnes/gb/memory/memory.cpp similarity index 95% rename from bsnes/gameboy/memory/memory.cpp rename to bsnes/gb/memory/memory.cpp index ad281844..6bd3a0ec 100755 --- a/bsnes/gameboy/memory/memory.cpp +++ b/bsnes/gb/memory/memory.cpp @@ -1,7 +1,7 @@ -#include +#include #define MEMORY_CPP -namespace GameBoy { +namespace GB { Unmapped unmapped; Bus bus; diff --git a/bsnes/gameboy/memory/memory.hpp b/bsnes/gb/memory/memory.hpp similarity index 100% rename from bsnes/gameboy/memory/memory.hpp rename to bsnes/gb/memory/memory.hpp diff --git a/bsnes/gameboy/scheduler/scheduler.cpp b/bsnes/gb/scheduler/scheduler.cpp similarity index 91% rename from bsnes/gameboy/scheduler/scheduler.cpp rename to bsnes/gb/scheduler/scheduler.cpp index 14bd7331..fbce30ad 100755 --- a/bsnes/gameboy/scheduler/scheduler.cpp +++ b/bsnes/gb/scheduler/scheduler.cpp @@ -1,7 +1,7 @@ -#include +#include #define SCHEDULER_CPP -namespace GameBoy { +namespace GB { Scheduler scheduler; diff --git a/bsnes/gameboy/scheduler/scheduler.hpp b/bsnes/gb/scheduler/scheduler.hpp similarity index 100% rename from bsnes/gameboy/scheduler/scheduler.hpp rename to bsnes/gb/scheduler/scheduler.hpp diff --git a/bsnes/gameboy/system/bootrom-cgb.cpp b/bsnes/gb/system/bootrom-cgb.cpp similarity index 100% rename from bsnes/gameboy/system/bootrom-cgb.cpp rename to bsnes/gb/system/bootrom-cgb.cpp diff --git a/bsnes/gameboy/system/bootrom-dmg.cpp b/bsnes/gb/system/bootrom-dmg.cpp similarity index 100% rename from bsnes/gameboy/system/bootrom-dmg.cpp rename to bsnes/gb/system/bootrom-dmg.cpp diff --git a/bsnes/gameboy/system/bootrom-sgb.cpp b/bsnes/gb/system/bootrom-sgb.cpp similarity index 100% rename from bsnes/gameboy/system/bootrom-sgb.cpp rename to bsnes/gb/system/bootrom-sgb.cpp diff --git a/bsnes/gameboy/system/serialization.cpp b/bsnes/gb/system/serialization.cpp similarity index 100% rename from bsnes/gameboy/system/serialization.cpp rename to bsnes/gb/system/serialization.cpp diff --git a/bsnes/gameboy/system/system.cpp b/bsnes/gb/system/system.cpp similarity index 95% rename from bsnes/gameboy/system/system.cpp rename to bsnes/gb/system/system.cpp index 0d6567bd..e324608b 100755 --- a/bsnes/gameboy/system/system.cpp +++ b/bsnes/gb/system/system.cpp @@ -1,7 +1,7 @@ -#include +#include #define SYSTEM_CPP -namespace GameBoy { +namespace GB { #include "bootrom-dmg.cpp" #include "bootrom-sgb.cpp" diff --git a/bsnes/gameboy/system/system.hpp b/bsnes/gb/system/system.hpp similarity index 95% rename from bsnes/gameboy/system/system.hpp rename to bsnes/gb/system/system.hpp index 18ad757f..662ae557 100755 --- a/bsnes/gameboy/system/system.hpp +++ b/bsnes/gb/system/system.hpp @@ -42,6 +42,6 @@ struct System : property { void serialize_init(); }; -#include +#include extern System system; diff --git a/bsnes/gameboy/video/video.cpp b/bsnes/gb/video/video.cpp similarity index 97% rename from bsnes/gameboy/video/video.cpp rename to bsnes/gb/video/video.cpp index 3cbcd249..d35437b8 100755 --- a/bsnes/gameboy/video/video.cpp +++ b/bsnes/gb/video/video.cpp @@ -1,7 +1,7 @@ -#include +#include #define VIDEO_CPP -namespace GameBoy { +namespace GB { Video video; diff --git a/bsnes/gameboy/video/video.hpp b/bsnes/gb/video/video.hpp similarity index 100% rename from bsnes/gameboy/video/video.hpp rename to bsnes/gb/video/video.hpp