From b1fbe9ddc58696f990e2dcbe2f6af626a3ffcdeb Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sun, 28 Jan 2024 16:02:58 +0100 Subject: [PATCH 1/2] Refactoring for better use in JaffarPlus --- extern/hqn/hqn.h | 2 +- source/logger.hpp | 34 +++++ ...muInstanceBase.hpp => nesInstanceBase.hpp} | 65 ++-------- source/playbackInstance.hpp | 8 +- source/player.cpp | 15 ++- .../{emuInstance.hpp => nesInstance.hpp} | 14 +-- .../{emuInstance.hpp => nesInstance.hpp} | 14 +-- source/tester.cpp | 26 ++-- source/utils.hpp | 117 +++--------------- 9 files changed, 106 insertions(+), 189 deletions(-) create mode 100644 source/logger.hpp rename source/{emuInstanceBase.hpp => nesInstanceBase.hpp} (68%) rename source/quickNES/{emuInstance.hpp => nesInstance.hpp} (87%) rename source/quickerNES/{emuInstance.hpp => nesInstance.hpp} (86%) diff --git a/extern/hqn/hqn.h b/extern/hqn/hqn.h index 32dce68..11ce4ec 100644 --- a/extern/hqn/hqn.h +++ b/extern/hqn/hqn.h @@ -3,7 +3,7 @@ #include #include -#include +#include #define BLIT_SIZE 65536 diff --git a/source/logger.hpp b/source/logger.hpp new file mode 100644 index 0000000..3c19646 --- /dev/null +++ b/source/logger.hpp @@ -0,0 +1,34 @@ +#pragma once + +#include +#include +#include + +// If we use NCurses, we need to use the appropriate printing function +#ifdef NCURSES + #include + #define LOG printw +#else + #define LOG printf +#endif + +#define EXIT_WITH_ERROR(...) exitWithError(__FILE__, __LINE__, __VA_ARGS__) +inline void exitWithError [[noreturn]] (const char *fileName, const int lineNumber, const char *format, ...) +{ + char *outstr = 0; + va_list ap; + va_start(ap, format); + int ret = vasprintf(&outstr, format, ap); + if (ret < 0) exit(-1); + + std::string outString = outstr; + free(outstr); + + char info[1024]; + + snprintf(info, sizeof(info) - 1, " + From %s:%d\n", fileName, lineNumber); + outString += info; + + throw std::runtime_error(outString.c_str()); +} + diff --git a/source/emuInstanceBase.hpp b/source/nesInstanceBase.hpp similarity index 68% rename from source/emuInstanceBase.hpp rename to source/nesInstanceBase.hpp index 713af0c..b071089 100644 --- a/source/emuInstanceBase.hpp +++ b/source/nesInstanceBase.hpp @@ -1,8 +1,7 @@ #pragma once -#include "sha1/sha1.hpp" -#include -#include +#include "logger.hpp" +#include "controller.hpp" #define _LOW_MEM_SIZE 0x800 #define _HIGH_MEM_SIZE 0x2000 @@ -12,12 +11,12 @@ static const uint16_t image_width = 256; static const uint16_t image_height = 240; -class EmuInstanceBase +class NESInstanceBase { public: - EmuInstanceBase() = default; - virtual ~EmuInstanceBase() = default; + NESInstanceBase() = default; + virtual ~NESInstanceBase() = default; inline void advanceState(const std::string &move) { @@ -61,56 +60,19 @@ class EmuInstanceBase if (isTypeRecognized == false) EXIT_WITH_ERROR("Input type not recognized: '%s'\n", type.c_str()); } - inline std::string getRomSHA1() const { return _romSHA1String; } - - inline hash_t getStateHash() const - { - MetroHash128 hash; - - hash.Update(getLowMem(), _LOW_MEM_SIZE); - // hash.Update(getHighMem(), _HIGH_MEM_SIZE); - // hash.Update(getNametableMem(), _NAMETABLES_MEM_SIZE); - // hash.Update(getChrMem(), getChrMemSize()); - - hash_t result; - hash.Finalize(reinterpret_cast(&result)); - return result; - } - inline void enableRendering() { _doRendering = true; }; inline void disableRendering() { _doRendering = false; }; - inline void loadStateFile(const std::string &stateFilePath) + inline bool loadROM(const uint8_t* romData, const size_t romSize) { - std::string stateData; - bool status = loadStringFromFile(stateData, stateFilePath); - if (status == false) EXIT_WITH_ERROR("Could not find/read state file: %s\n", stateFilePath.c_str()); - deserializeState((uint8_t *)stateData.data()); - } - - inline void saveStateFile(const std::string &stateFilePath) const - { - std::string stateData; - stateData.resize(_stateSize); - serializeState((uint8_t *)stateData.data()); - saveStringToFile(stateData, stateFilePath.c_str()); - } - - inline void loadROMFile(const std::string &romFilePath) - { - // Loading ROM data - bool status = loadStringFromFile(_romData, romFilePath); - if (status == false) EXIT_WITH_ERROR("Could not find/read ROM file: %s\n", romFilePath.c_str()); - - // Calculating ROM hash value - _romSHA1String = SHA1::GetHash((uint8_t *)_romData.data(), _romData.size()); - // Actually loading rom file - status = loadROMFileImpl(_romData); - if (status == false) EXIT_WITH_ERROR("Could not process ROM file: %s\n", romFilePath.c_str()); + auto status = loadROMImpl(romData, romSize); // Detecting full state size _stateSize = getStateSize(); + + // Returning status + return status; } void enableStateBlock(const std::string& block) @@ -151,7 +113,7 @@ class EmuInstanceBase virtual void enableStateBlockImpl(const std::string& block) = 0; virtual void disableStateBlockImpl(const std::string& block) = 0; - virtual bool loadROMFileImpl(const std::string &romFilePath) = 0; + virtual bool loadROMImpl(const uint8_t* romData, const size_t romSize) = 0; virtual void advanceStateImpl(const Controller::port_t controller1, const Controller::port_t controller2) = 0; // Storage for the light state size @@ -161,11 +123,6 @@ class EmuInstanceBase bool _doRendering = true; private: - // Storage for the ROM data - std::string _romData; - - // SHA1 rom hash - std::string _romSHA1String; // Controller class for input parsing Controller _controller; diff --git a/source/playbackInstance.hpp b/source/playbackInstance.hpp index 70c1344..b7f1ec8 100644 --- a/source/playbackInstance.hpp +++ b/source/playbackInstance.hpp @@ -1,6 +1,6 @@ #pragma once -#include "emuInstance.hpp" +#include "nesInstance.hpp" #include #include #include @@ -30,14 +30,14 @@ class PlaybackInstance step.input = input; step.stateData = (uint8_t *)malloc(_emu->getStateSize()); _emu->serializeState(step.stateData); - step.hash = _emu->getStateHash(); + step.hash = calculateStateHash(_emu); // Adding the step into the sequence _stepSequence.push_back(step); } // Initializes the playback module instance - PlaybackInstance(EmuInstance *emu, const std::vector &sequence, const std::string &overlayPath = "") : _emu(emu) + PlaybackInstance(NESInstance *emu, const std::vector &sequence, const std::string &overlayPath = "") : _emu(emu) { // Enabling emulation rendering _emu->enableRendering(); @@ -234,7 +234,7 @@ class PlaybackInstance hqn::GUIController *_hqnGUI; // Pointer to the contained emulator instance - EmuInstance *const _emu; + NESInstance *const _emu; // Flag to store whether to use the button overlay bool _useOverlay = false; diff --git a/source/player.cpp b/source/player.cpp index ec1425d..970edeb 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -1,5 +1,5 @@ #include "argparse/argparse.hpp" -#include "emuInstance.hpp" +#include "nesInstance.hpp" #include "playbackInstance.hpp" #include "utils.hpp" #include @@ -91,17 +91,24 @@ int main(int argc, char *argv[]) refreshTerminal(); // Creating emulator instance - EmuInstance e; + NESInstance e; // Setting controller types e.setController1Type(controller1Type); e.setController2Type(controller2Type); // Loading ROM File - e.loadROMFile(romFilePath); + std::string romFileData; + if (loadStringFromFile(romFileData, romFilePath) == false) EXIT_WITH_ERROR("Could not rom file: %s\n", romFilePath.c_str()); + e.loadROM((uint8_t*)romFileData.data(), romFileData.size()); // If an initial state is provided, load it now - if (stateFilePath != "") e.loadStateFile(stateFilePath); + if (stateFilePath != "") + { + std::string stateFileData; + if (loadStringFromFile(stateFileData, stateFilePath) == false) EXIT_WITH_ERROR("Could not initial state file: %s\n", stateFilePath.c_str()); + e.deserializeState((uint8_t*)stateFileData.data()); + } // Creating playback instance auto p = PlaybackInstance(&e, sequence); diff --git a/source/quickNES/emuInstance.hpp b/source/quickNES/nesInstance.hpp similarity index 87% rename from source/quickNES/emuInstance.hpp rename to source/quickNES/nesInstance.hpp index 583fff1..d729dc5 100644 --- a/source/quickNES/emuInstance.hpp +++ b/source/quickNES/nesInstance.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #define _DUMMY_SIZE 65536 @@ -12,10 +12,10 @@ extern void register_misc_mappers(); extern void register_extra_mappers(); extern void register_mapper_70(); -class EmuInstance : public EmuInstanceBase +class NESInstance : public NESInstanceBase { public: - EmuInstance() : EmuInstanceBase() + NESInstance() : NESInstanceBase() { // Creating new emulator _nes = new Nes_Emu; @@ -32,10 +32,10 @@ class EmuInstance : public EmuInstanceBase register_mapper_70(); } - virtual bool loadROMFileImpl(const std::string &romData) override + virtual bool loadROMImpl(const uint8_t* romData, const size_t romSize) override { // Loading rom data - Mem_File_Reader romReader(romData.data(), (int)romData.size()); + Mem_File_Reader romReader(romData, (int)romSize); Auto_File_Reader romFile(romReader); auto result = _nes->load_ines(romFile); return result == 0; diff --git a/source/quickerNES/emuInstance.hpp b/source/quickerNES/nesInstance.hpp similarity index 86% rename from source/quickerNES/emuInstance.hpp rename to source/quickerNES/nesInstance.hpp index 428301b..7da944a 100644 --- a/source/quickerNES/emuInstance.hpp +++ b/source/quickerNES/nesInstance.hpp @@ -1,14 +1,14 @@ #pragma once -#include -#include +#include +#include typedef quickerNES::Emu emulator_t; -class EmuInstance : public EmuInstanceBase +class NESInstance : public NESInstanceBase { public: - EmuInstance() : EmuInstanceBase() + NESInstance() : NESInstanceBase() { // Creating new emulator _nes = new emulator_t; @@ -20,12 +20,12 @@ class EmuInstance : public EmuInstanceBase _nes->set_pixels(video_buffer, image_width + 8); } - ~EmuInstance() = default; + ~NESInstance() = default; - virtual bool loadROMFileImpl(const std::string &romData) override + virtual bool loadROMImpl(const uint8_t* romData, const size_t romSize) override { // Loading rom data - _nes->load_ines((uint8_t *)romData.data()); + _nes->load_ines(romData); return true; } diff --git a/source/tester.cpp b/source/tester.cpp index 7ddb384..f24f971 100644 --- a/source/tester.cpp +++ b/source/tester.cpp @@ -2,7 +2,7 @@ #include "nlohmann/json.hpp" #include "sha1/sha1.hpp" #include "utils.hpp" -#include "emuInstance.hpp" +#include "nesInstance.hpp" #include #include #include @@ -94,18 +94,27 @@ int main(int argc, char *argv[]) std::string controller2Type = scriptJson["Controller 2 Type"].get(); // Creating emulator instance - EmuInstance e; + NESInstance e; // Setting controller types e.setController1Type(controller1Type); e.setController2Type(controller2Type); // Loading ROM File - e.loadROMFile(romFilePath); + std::string romFileData; + if (loadStringFromFile(romFileData, romFilePath) == false) EXIT_WITH_ERROR("Could not rom file: %s\n", romFilePath.c_str()); + e.loadROM((uint8_t*)romFileData.data(), romFileData.size()); + + // Calculating ROM SHA1 + auto romSHA1 = SHA1::GetHash((uint8_t *)romFileData.data(), romFileData.size()); // If an initial state is provided, load it now - if (initialStateFilePath != "") e.loadStateFile(initialStateFilePath); - + if (initialStateFilePath != "") + { + std::string stateFileData; + if (loadStringFromFile(stateFileData, initialStateFilePath) == false) EXIT_WITH_ERROR("Could not initial state file: %s\n", initialStateFilePath.c_str()); + e.deserializeState((uint8_t*)stateFileData.data()); + } // Disabling requested blocks from state serialization for (const auto& block : stateDisabledBlocks) e.disableStateBlock(block); @@ -115,9 +124,6 @@ int main(int argc, char *argv[]) // Getting state size const auto stateSize = e.getStateSize(); - // Getting actual ROM SHA1 - auto romSHA1 = e.getRomSHA1(); - // Checking with the expected SHA1 hash if (romSHA1 != expectedROMSHA1) EXIT_WITH_ERROR("Wrong ROM SHA1. Found: '%s', Expected: '%s'\n", romSHA1.c_str(), expectedROMSHA1.c_str()); @@ -174,11 +180,11 @@ int main(int argc, char *argv[]) double elapsedTimeSeconds = (double)dt * 1.0e-9; // Calculating final state hash - const auto finalStateHash = e.getStateHash(); + auto result = calculateStateHash(&e); // Creating hash string char hashStringBuffer[256]; - sprintf(hashStringBuffer, "0x%lX%lX", finalStateHash.first, finalStateHash.second); + sprintf(hashStringBuffer, "0x%lX%lX", result.first, result.second); // Printing time information printf("[] Elapsed time: %3.3fs\n", (double)dt * 1.0e-9); diff --git a/source/utils.hpp b/source/utils.hpp index fea1793..64e3976 100644 --- a/source/utils.hpp +++ b/source/utils.hpp @@ -2,25 +2,20 @@ #include #include -#include #include #include #include #include #include #include - -// If we use NCurses, we need to use the appropriate printing function -#ifdef NCURSES - #include - #define LOG printw -#else - #define LOG printf -#endif +#include +#include "nesInstance.hpp" // If we use NCurses, define the following useful functions #ifdef NCURSES +#include + // Function to check for keypress taken from https://github.com/ajpaulson/learning-ncurses/blob/master/kbhit.c inline int kbhit() { @@ -84,16 +79,6 @@ inline void refreshTerminal() #endif // NCURSES -typedef _uint128_t hash_t; -inline hash_t calculateMetroHash(uint8_t *data, size_t size) -{ - MetroHash128 hash; - hash.Update(data, size); - hash_t result; - hash.Finalize(reinterpret_cast(&result)); - return result; -} - // Function to split a string into a sub-strings delimited by a character // Taken from stack overflow answer to https://stackoverflow.com/questions/236129/how-do-i-iterate-over-the-words-of-a-string // By Evan Teran @@ -126,26 +111,6 @@ inline std::string slurp(std::ifstream &in) return sstr.str(); } -#define EXIT_WITH_ERROR(...) exitWithError(__FILE__, __LINE__, __VA_ARGS__) -inline void exitWithError [[noreturn]] (const char *fileName, const int lineNumber, const char *format, ...) -{ - char *outstr = 0; - va_list ap; - va_start(ap, format); - int ret = vasprintf(&outstr, format, ap); - if (ret < 0) exit(-1); - - std::string outString = outstr; - free(outstr); - - char info[1024]; - - snprintf(info, sizeof(info) - 1, " + From %s:%d\n", fileName, lineNumber); - outString += info; - - throw std::runtime_error(outString.c_str()); -} - // Loads a string from a given file inline bool loadStringFromFile(std::string &dst, const std::string path) { @@ -191,70 +156,18 @@ inline std::vector splitVector(const T size, const T n) return subSizes; } -inline std::string simplifyMove(const std::string &move) -{ - std::string simpleMove; +typedef _uint128_t hash_t; - bool isEmptyMove = true; - for (size_t i = 0; i < move.size(); i++) - if (move[i] != '.' && move[i] != '|') - { - simpleMove += move[i]; - isEmptyMove = false; - } - if (isEmptyMove) return "."; - return simpleMove; +inline hash_t calculateMetroHash(uint8_t *data, size_t size) +{ + MetroHash128 hash; + hash.Update(data, size); + hash_t result; + hash.Finalize(reinterpret_cast(&result)); + return result; } -inline bool getBitFlag(const uint8_t value, const uint8_t idx) +inline hash_t calculateStateHash(const NESInstance* nes) { - if (((idx == 7) && (value & 0b10000000)) || - ((idx == 6) && (value & 0b01000000)) || - ((idx == 5) && (value & 0b00100000)) || - ((idx == 4) && (value & 0b00010000)) || - ((idx == 3) && (value & 0b00001000)) || - ((idx == 2) && (value & 0b00000100)) || - ((idx == 1) && (value & 0b00000010)) || - ((idx == 0) && (value & 0b00000001))) return true; - return false; -} - -inline size_t countButtonsPressedString(const std::string &input) -{ - size_t count = 0; - for (size_t i = 0; i < input.size(); i++) - if (input[i] != '.') count++; - return count; -}; - -template -inline uint16_t countButtonsPressedNumber(const T &input) -{ - uint16_t count = 0; - if (input & 0b0000000000000001) count++; - if (input & 0b0000000000000010) count++; - if (input & 0b0000000000000100) count++; - if (input & 0b0000000000001000) count++; - if (input & 0b0000000000010000) count++; - if (input & 0b0000000000100000) count++; - if (input & 0b0000000001000000) count++; - if (input & 0b0000000010000000) count++; - if (input & 0b0000000100000000) count++; - if (input & 0b0000001000000000) count++; - if (input & 0b0000010000000000) count++; - if (input & 0b0000100000000000) count++; - if (input & 0b0001000000000000) count++; - if (input & 0b0010000000000000) count++; - if (input & 0b0100000000000000) count++; - if (input & 0b1000000000000000) count++; - return count; -}; - -static auto moveCountComparerString = [](const std::string &a, const std::string &b) -{ - return countButtonsPressedString(a) < countButtonsPressedString(b); -}; -static auto moveCountComparerNumber = [](const uint8_t a, const uint8_t b) -{ - return countButtonsPressedNumber(a) < countButtonsPressedNumber(b); -}; + return calculateMetroHash(nes->getLowMem(), _LOW_MEM_SIZE); +} \ No newline at end of file From b07f5521af043562f20205b6320f4996ed4d845b Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sun, 28 Jan 2024 18:19:23 +0100 Subject: [PATCH 2/2] Making all includes relative --- .../quickerNES/core/apu/NESEffectsBuffer.cpp | 4 +- source/quickerNES/core/apu/buffer.cpp | 4 +- source/quickerNES/core/apu/fme7/apu.cpp | 2 +- source/quickerNES/core/apu/fme7/apu.hpp | 2 +- source/quickerNES/core/apu/namco/apu.cpp | 4 +- source/quickerNES/core/apu/namco/apu.hpp | 2 +- source/quickerNES/core/apu/vrc6/apu.cpp | 2 +- source/quickerNES/core/apu/vrc6/apu.hpp | 4 +- source/quickerNES/core/apu/vrc7/apu.cpp | 4 +- source/quickerNES/core/apu/vrc7/apu.hpp | 4 +- source/quickerNES/core/mappers/mapper.cpp | 114 +++++++++--------- source/quickerNES/core/mappers/mapper.hpp | 4 +- source/quickerNES/core/mappers/mapper000.hpp | 2 +- source/quickerNES/core/mappers/mapper001.hpp | 2 +- source/quickerNES/core/mappers/mapper002.hpp | 2 +- source/quickerNES/core/mappers/mapper003.hpp | 2 +- source/quickerNES/core/mappers/mapper004.hpp | 4 +- source/quickerNES/core/mappers/mapper005.hpp | 4 +- source/quickerNES/core/mappers/mapper007.hpp | 2 +- source/quickerNES/core/mappers/mapper009.hpp | 2 +- source/quickerNES/core/mappers/mapper010.hpp | 2 +- source/quickerNES/core/mappers/mapper011.hpp | 2 +- source/quickerNES/core/mappers/mapper015.hpp | 2 +- source/quickerNES/core/mappers/mapper019.hpp | 4 +- source/quickerNES/core/mappers/mapper021.hpp | 2 +- source/quickerNES/core/mappers/mapper022.hpp | 4 +- source/quickerNES/core/mappers/mapper023.hpp | 2 +- source/quickerNES/core/mappers/mapper024.hpp | 4 +- source/quickerNES/core/mappers/mapper025.hpp | 2 +- source/quickerNES/core/mappers/mapper026.hpp | 2 +- source/quickerNES/core/mappers/mapper030.hpp | 2 +- source/quickerNES/core/mappers/mapper032.hpp | 2 +- source/quickerNES/core/mappers/mapper033.hpp | 2 +- source/quickerNES/core/mappers/mapper034.hpp | 2 +- source/quickerNES/core/mappers/mapper060.hpp | 2 +- source/quickerNES/core/mappers/mapper066.hpp | 2 +- source/quickerNES/core/mappers/mapper069.hpp | 4 +- source/quickerNES/core/mappers/mapper070.hpp | 2 +- source/quickerNES/core/mappers/mapper071.hpp | 2 +- source/quickerNES/core/mappers/mapper073.hpp | 2 +- source/quickerNES/core/mappers/mapper075.hpp | 2 +- source/quickerNES/core/mappers/mapper078.hpp | 2 +- source/quickerNES/core/mappers/mapper079.hpp | 2 +- source/quickerNES/core/mappers/mapper085.hpp | 4 +- source/quickerNES/core/mappers/mapper087.hpp | 2 +- source/quickerNES/core/mappers/mapper088.hpp | 2 +- source/quickerNES/core/mappers/mapper089.hpp | 2 +- source/quickerNES/core/mappers/mapper093.hpp | 2 +- source/quickerNES/core/mappers/mapper094.hpp | 2 +- source/quickerNES/core/mappers/mapper097.hpp | 2 +- source/quickerNES/core/mappers/mapper140.hpp | 2 +- source/quickerNES/core/mappers/mapper156.hpp | 2 +- source/quickerNES/core/mappers/mapper180.hpp | 2 +- source/quickerNES/core/mappers/mapper184.hpp | 2 +- source/quickerNES/core/mappers/mapper190.hpp | 2 +- source/quickerNES/core/mappers/mapper193.hpp | 2 +- source/quickerNES/core/mappers/mapper206.hpp | 2 +- source/quickerNES/core/mappers/mapper207.hpp | 2 +- source/quickerNES/core/mappers/mapper232.hpp | 2 +- source/quickerNES/core/mappers/mapper240.hpp | 2 +- source/quickerNES/core/mappers/mapper241.hpp | 2 +- source/quickerNES/core/mappers/mapper244.hpp | 2 +- source/quickerNES/core/mappers/mapper246.hpp | 2 +- source/quickerNES/core/ppu/ppu.cpp | 2 +- source/quickerNES/meson.build | 2 +- source/tester.cpp | 1 + 66 files changed, 136 insertions(+), 135 deletions(-) diff --git a/source/quickerNES/core/apu/NESEffectsBuffer.cpp b/source/quickerNES/core/apu/NESEffectsBuffer.cpp index 10b3d1b..488c957 100644 --- a/source/quickerNES/core/apu/NESEffectsBuffer.cpp +++ b/source/quickerNES/core/apu/NESEffectsBuffer.cpp @@ -1,8 +1,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "apu/NESEffectsBuffer.hpp" -#include "apu/apu.hpp" +#include "NESEffectsBuffer.hpp" +#include "apu.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/apu/buffer.cpp b/source/quickerNES/core/apu/buffer.cpp index 9bd83a2..3b5088e 100644 --- a/source/quickerNES/core/apu/buffer.cpp +++ b/source/quickerNES/core/apu/buffer.cpp @@ -1,7 +1,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "apu/buffer.hpp" -#include "apu/apu.hpp" +#include "buffer.hpp" +#include "apu.hpp" /* Library Copyright (C) 2003-2006 Shay Green. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/apu/fme7/apu.cpp b/source/quickerNES/core/apu/fme7/apu.cpp index ac4faea..e464d7b 100644 --- a/source/quickerNES/core/apu/fme7/apu.cpp +++ b/source/quickerNES/core/apu/fme7/apu.cpp @@ -1,7 +1,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "apu/fme7/apu.hpp" +#include "apu.hpp" #include /* Copyright (C) 2003-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/apu/fme7/apu.hpp b/source/quickerNES/core/apu/fme7/apu.hpp index b7397ff..b317d20 100644 --- a/source/quickerNES/core/apu/fme7/apu.hpp +++ b/source/quickerNES/core/apu/fme7/apu.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0 #include -#include "apu/blipBuffer.hpp" +#include "../blipBuffer.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/apu/namco/apu.cpp b/source/quickerNES/core/apu/namco/apu.cpp index 5cc6831..5aab85c 100644 --- a/source/quickerNES/core/apu/namco/apu.cpp +++ b/source/quickerNES/core/apu/namco/apu.cpp @@ -1,8 +1,8 @@ // Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu/namco/apu.hpp" -#include "apu/blipBuffer.hpp" +#include "apu.hpp" +#include "../blipBuffer.hpp" /* Copyright (C) 2003-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/apu/namco/apu.hpp b/source/quickerNES/core/apu/namco/apu.hpp index f08b7f9..27c48e2 100644 --- a/source/quickerNES/core/apu/namco/apu.hpp +++ b/source/quickerNES/core/apu/namco/apu.hpp @@ -4,7 +4,7 @@ // Snd_Emu 0.1.7 #include -#include "apu/apu.hpp" +#include "../apu.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/apu/vrc6/apu.cpp b/source/quickerNES/core/apu/vrc6/apu.cpp index 8a2473d..83bde65 100644 --- a/source/quickerNES/core/apu/vrc6/apu.cpp +++ b/source/quickerNES/core/apu/vrc6/apu.cpp @@ -1,7 +1,7 @@ // Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu/vrc6/apu.hpp" +#include "apu.hpp" /* Copyright (C) 2003-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/apu/vrc6/apu.hpp b/source/quickerNES/core/apu/vrc6/apu.hpp index e25e057..e26bfe6 100644 --- a/source/quickerNES/core/apu/vrc6/apu.hpp +++ b/source/quickerNES/core/apu/vrc6/apu.hpp @@ -5,8 +5,8 @@ // Snd_Emu 0.1.7 #include -#include "apu/blipBuffer.hpp" -#include "apu/apu.hpp" +#include "../blipBuffer.hpp" +#include "../apu.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/apu/vrc7/apu.cpp b/source/quickerNES/core/apu/vrc7/apu.cpp index da64901..77076fa 100644 --- a/source/quickerNES/core/apu/vrc7/apu.cpp +++ b/source/quickerNES/core/apu/vrc7/apu.cpp @@ -1,6 +1,6 @@ #include -#include "apu/vrc7/apu.hpp" -#include "apu/vrc7/emu2413.hpp" +#include "apu.hpp" +#include "emu2413.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/apu/vrc7/apu.hpp b/source/quickerNES/core/apu/vrc7/apu.hpp index dae5e37..eac86d9 100644 --- a/source/quickerNES/core/apu/vrc7/apu.hpp +++ b/source/quickerNES/core/apu/vrc7/apu.hpp @@ -5,8 +5,8 @@ // Snd_Emu 0.1.7. Copyright (C) 2003-2005 Shay Green. GNU LGPL license. #include -#include "apu/blipBuffer.hpp" -#include "apu/vrc7/emu2413_state.hpp" +#include "../blipBuffer.hpp" +#include "emu2413_state.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper.cpp b/source/quickerNES/core/mappers/mapper.cpp index 0f721a3..f58cbce 100644 --- a/source/quickerNES/core/mappers/mapper.cpp +++ b/source/quickerNES/core/mappers/mapper.cpp @@ -1,8 +1,8 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" -#include "core.hpp" +#include "mapper.hpp" +#include "../core.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you @@ -20,61 +20,61 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ New mapping distribution by Sergio Martin (eien86) https://github.com/SergioMartin86/jaffarPlus */ -#include "mappers/mapper000.hpp" -#include "mappers/mapper001.hpp" -#include "mappers/mapper002.hpp" -#include "mappers/mapper003.hpp" -#include "mappers/mapper004.hpp" -#include "mappers/mapper005.hpp" -#include "mappers/mapper007.hpp" -#include "mappers/mapper009.hpp" -#include "mappers/mapper010.hpp" -#include "mappers/mapper011.hpp" -#include "mappers/mapper015.hpp" -#include "mappers/mapper019.hpp" -#include "mappers/mapper021.hpp" -#include "mappers/mapper022.hpp" -#include "mappers/mapper023.hpp" -#include "mappers/mapper024.hpp" -#include "mappers/mapper025.hpp" -#include "mappers/mapper026.hpp" -#include "mappers/mapper030.hpp" -#include "mappers/mapper032.hpp" -#include "mappers/mapper033.hpp" -#include "mappers/mapper034.hpp" -#include "mappers/mapper060.hpp" -#include "mappers/mapper066.hpp" -#include "mappers/mapper069.hpp" -#include "mappers/mapper070.hpp" -#include "mappers/mapper071.hpp" -#include "mappers/mapper073.hpp" -#include "mappers/mapper075.hpp" -#include "mappers/mapper078.hpp" -#include "mappers/mapper079.hpp" -#include "mappers/mapper085.hpp" -#include "mappers/mapper086.hpp" -#include "mappers/mapper087.hpp" -#include "mappers/mapper088.hpp" -#include "mappers/mapper089.hpp" -#include "mappers/mapper093.hpp" -#include "mappers/mapper094.hpp" -#include "mappers/mapper097.hpp" -#include "mappers/mapper113.hpp" -#include "mappers/mapper140.hpp" -#include "mappers/mapper152.hpp" -#include "mappers/mapper154.hpp" -#include "mappers/mapper156.hpp" -#include "mappers/mapper180.hpp" -#include "mappers/mapper184.hpp" -#include "mappers/mapper190.hpp" -#include "mappers/mapper193.hpp" -#include "mappers/mapper206.hpp" -#include "mappers/mapper207.hpp" -#include "mappers/mapper232.hpp" -#include "mappers/mapper240.hpp" -#include "mappers/mapper241.hpp" -#include "mappers/mapper244.hpp" -#include "mappers/mapper246.hpp" +#include "mapper000.hpp" +#include "mapper001.hpp" +#include "mapper002.hpp" +#include "mapper003.hpp" +#include "mapper004.hpp" +#include "mapper005.hpp" +#include "mapper007.hpp" +#include "mapper009.hpp" +#include "mapper010.hpp" +#include "mapper011.hpp" +#include "mapper015.hpp" +#include "mapper019.hpp" +#include "mapper021.hpp" +#include "mapper022.hpp" +#include "mapper023.hpp" +#include "mapper024.hpp" +#include "mapper025.hpp" +#include "mapper026.hpp" +#include "mapper030.hpp" +#include "mapper032.hpp" +#include "mapper033.hpp" +#include "mapper034.hpp" +#include "mapper060.hpp" +#include "mapper066.hpp" +#include "mapper069.hpp" +#include "mapper070.hpp" +#include "mapper071.hpp" +#include "mapper073.hpp" +#include "mapper075.hpp" +#include "mapper078.hpp" +#include "mapper079.hpp" +#include "mapper085.hpp" +#include "mapper086.hpp" +#include "mapper087.hpp" +#include "mapper088.hpp" +#include "mapper089.hpp" +#include "mapper093.hpp" +#include "mapper094.hpp" +#include "mapper097.hpp" +#include "mapper113.hpp" +#include "mapper140.hpp" +#include "mapper152.hpp" +#include "mapper154.hpp" +#include "mapper156.hpp" +#include "mapper180.hpp" +#include "mapper184.hpp" +#include "mapper190.hpp" +#include "mapper193.hpp" +#include "mapper206.hpp" +#include "mapper207.hpp" +#include "mapper232.hpp" +#include "mapper240.hpp" +#include "mapper241.hpp" +#include "mapper244.hpp" +#include "mapper246.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper.hpp b/source/quickerNES/core/mappers/mapper.hpp index 9c6e10a..4ab50b2 100644 --- a/source/quickerNES/core/mappers/mapper.hpp +++ b/source/quickerNES/core/mappers/mapper.hpp @@ -4,8 +4,8 @@ // Emu 0.7.0 #include -#include "cart.hpp" -#include "cpu.hpp" +#include "../cart.hpp" +#include "../cpu.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper000.hpp b/source/quickerNES/core/mappers/mapper000.hpp index 192803b..fb94544 100644 --- a/source/quickerNES/core/mappers/mapper000.hpp +++ b/source/quickerNES/core/mappers/mapper000.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper001.hpp b/source/quickerNES/core/mappers/mapper001.hpp index c22f8fa..1ed89bc 100644 --- a/source/quickerNES/core/mappers/mapper001.hpp +++ b/source/quickerNES/core/mappers/mapper001.hpp @@ -2,7 +2,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper002.hpp b/source/quickerNES/core/mappers/mapper002.hpp index 5118c0c..44cdd47 100644 --- a/source/quickerNES/core/mappers/mapper002.hpp +++ b/source/quickerNES/core/mappers/mapper002.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper003.hpp b/source/quickerNES/core/mappers/mapper003.hpp index 5f935d1..c0896da 100644 --- a/source/quickerNES/core/mappers/mapper003.hpp +++ b/source/quickerNES/core/mappers/mapper003.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper004.hpp b/source/quickerNES/core/mappers/mapper004.hpp index 3147a47..1f195c9 100644 --- a/source/quickerNES/core/mappers/mapper004.hpp +++ b/source/quickerNES/core/mappers/mapper004.hpp @@ -2,9 +2,9 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" -#include "core.hpp" +#include "../core.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper005.hpp b/source/quickerNES/core/mappers/mapper005.hpp index a10d49d..41c184d 100644 --- a/source/quickerNES/core/mappers/mapper005.hpp +++ b/source/quickerNES/core/mappers/mapper005.hpp @@ -4,8 +4,8 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "core.hpp" -#include "mappers/mapper.hpp" +#include "../core.hpp" +#include "mapper.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper007.hpp b/source/quickerNES/core/mappers/mapper007.hpp index 3e5a41d..786ae09 100644 --- a/source/quickerNES/core/mappers/mapper007.hpp +++ b/source/quickerNES/core/mappers/mapper007.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper009.hpp b/source/quickerNES/core/mappers/mapper009.hpp index 94fdcd7..2ba6741 100644 --- a/source/quickerNES/core/mappers/mapper009.hpp +++ b/source/quickerNES/core/mappers/mapper009.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.hpp" +#include "mapper.hpp" #include namespace quickerNES diff --git a/source/quickerNES/core/mappers/mapper010.hpp b/source/quickerNES/core/mappers/mapper010.hpp index 98d4559..3764076 100644 --- a/source/quickerNES/core/mappers/mapper010.hpp +++ b/source/quickerNES/core/mappers/mapper010.hpp @@ -1,5 +1,5 @@ #pragma once -#include "mappers/mapper.hpp" +#include "mapper.hpp" #include namespace quickerNES diff --git a/source/quickerNES/core/mappers/mapper011.hpp b/source/quickerNES/core/mappers/mapper011.hpp index 6f51044..b5b0c45 100644 --- a/source/quickerNES/core/mappers/mapper011.hpp +++ b/source/quickerNES/core/mappers/mapper011.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper015.hpp b/source/quickerNES/core/mappers/mapper015.hpp index 6dea4eb..8d65b41 100644 --- a/source/quickerNES/core/mappers/mapper015.hpp +++ b/source/quickerNES/core/mappers/mapper015.hpp @@ -17,7 +17,7 @@ * 100-in-1 Contra Function 16 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper019.hpp b/source/quickerNES/core/mappers/mapper019.hpp index e973b3f..5a28d62 100644 --- a/source/quickerNES/core/mappers/mapper019.hpp +++ b/source/quickerNES/core/mappers/mapper019.hpp @@ -4,8 +4,8 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "apu/namco/apu.hpp" -#include "mappers/mapper.hpp" +#include "../apu/namco/apu.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper021.hpp b/source/quickerNES/core/mappers/mapper021.hpp index be1af01..5b011cb 100644 --- a/source/quickerNES/core/mappers/mapper021.hpp +++ b/source/quickerNES/core/mappers/mapper021.hpp @@ -26,7 +26,7 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper022.hpp b/source/quickerNES/core/mappers/mapper022.hpp index 6f30328..05e350a 100644 --- a/source/quickerNES/core/mappers/mapper022.hpp +++ b/source/quickerNES/core/mappers/mapper022.hpp @@ -26,8 +26,8 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.hpp" -#include "mappers/mapper021.hpp" +#include "mapper.hpp" +#include "mapper021.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper023.hpp b/source/quickerNES/core/mappers/mapper023.hpp index d788fcd..c0cbc22 100644 --- a/source/quickerNES/core/mappers/mapper023.hpp +++ b/source/quickerNES/core/mappers/mapper023.hpp @@ -26,7 +26,7 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper024.hpp b/source/quickerNES/core/mappers/mapper024.hpp index a69c492..40e5f2c 100644 --- a/source/quickerNES/core/mappers/mapper024.hpp +++ b/source/quickerNES/core/mappers/mapper024.hpp @@ -3,8 +3,8 @@ // Konami VRC6 mapper // Emu 0.7.0. http://www.slack.net/~ant/ -#include "apu/vrc6/apu.hpp" -#include "mappers/mapper.hpp" +#include "../apu/vrc6/apu.hpp" +#include "mapper.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper025.hpp b/source/quickerNES/core/mappers/mapper025.hpp index 79ae1d8..bb14d30 100644 --- a/source/quickerNES/core/mappers/mapper025.hpp +++ b/source/quickerNES/core/mappers/mapper025.hpp @@ -26,7 +26,7 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper026.hpp b/source/quickerNES/core/mappers/mapper026.hpp index ba293da..6243432 100644 --- a/source/quickerNES/core/mappers/mapper026.hpp +++ b/source/quickerNES/core/mappers/mapper026.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper030.hpp b/source/quickerNES/core/mappers/mapper030.hpp index 930b83f..09a814b 100644 --- a/source/quickerNES/core/mappers/mapper030.hpp +++ b/source/quickerNES/core/mappers/mapper030.hpp @@ -27,7 +27,7 @@ * Tested only on Troll Burner and Mystic Origins demo. */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Unrom512 diff --git a/source/quickerNES/core/mappers/mapper032.hpp b/source/quickerNES/core/mappers/mapper032.hpp index 7d5aefd..d0bde18 100644 --- a/source/quickerNES/core/mappers/mapper032.hpp +++ b/source/quickerNES/core/mappers/mapper032.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper033.hpp b/source/quickerNES/core/mappers/mapper033.hpp index d7392fd..b78c01a 100644 --- a/source/quickerNES/core/mappers/mapper033.hpp +++ b/source/quickerNES/core/mappers/mapper033.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper034.hpp b/source/quickerNES/core/mappers/mapper034.hpp index 3f8d683..9e20885 100644 --- a/source/quickerNES/core/mappers/mapper034.hpp +++ b/source/quickerNES/core/mappers/mapper034.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper060.hpp b/source/quickerNES/core/mappers/mapper060.hpp index 20718b2..638e5c1 100644 --- a/source/quickerNES/core/mappers/mapper060.hpp +++ b/source/quickerNES/core/mappers/mapper060.hpp @@ -17,7 +17,7 @@ * 4-in-1 Multicart ( Reset-based ) */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // NROM-128 4-in-1 multicart diff --git a/source/quickerNES/core/mappers/mapper066.hpp b/source/quickerNES/core/mappers/mapper066.hpp index ec11693..53bf077 100644 --- a/source/quickerNES/core/mappers/mapper066.hpp +++ b/source/quickerNES/core/mappers/mapper066.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper069.hpp b/source/quickerNES/core/mappers/mapper069.hpp index 9015f37..b2c0944 100644 --- a/source/quickerNES/core/mappers/mapper069.hpp +++ b/source/quickerNES/core/mappers/mapper069.hpp @@ -4,8 +4,8 @@ // Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "apu/fme7/apu.hpp" -#include "mappers/mapper.hpp" +#include "../apu/fme7/apu.hpp" +#include "mapper.hpp" /* Copyright (C) 2005 Chris Moeller */ /* Copyright (C) 2005-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper070.hpp b/source/quickerNES/core/mappers/mapper070.hpp index 005d4ec..e4a2495 100644 --- a/source/quickerNES/core/mappers/mapper070.hpp +++ b/source/quickerNES/core/mappers/mapper070.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Mapper_74x161x162x32 diff --git a/source/quickerNES/core/mappers/mapper071.hpp b/source/quickerNES/core/mappers/mapper071.hpp index 0e89ffb..a80af9d 100644 --- a/source/quickerNES/core/mappers/mapper071.hpp +++ b/source/quickerNES/core/mappers/mapper071.hpp @@ -4,7 +4,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper073.hpp b/source/quickerNES/core/mappers/mapper073.hpp index 7591f86..3543431 100644 --- a/source/quickerNES/core/mappers/mapper073.hpp +++ b/source/quickerNES/core/mappers/mapper073.hpp @@ -23,7 +23,7 @@ * VRC-3 Konami, Salamander */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper075.hpp b/source/quickerNES/core/mappers/mapper075.hpp index 2d17169..84e1b0f 100644 --- a/source/quickerNES/core/mappers/mapper075.hpp +++ b/source/quickerNES/core/mappers/mapper075.hpp @@ -17,7 +17,7 @@ * VRC-1 Konami */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper078.hpp b/source/quickerNES/core/mappers/mapper078.hpp index 4b0d158..757555d 100644 --- a/source/quickerNES/core/mappers/mapper078.hpp +++ b/source/quickerNES/core/mappers/mapper078.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Holy Diver and Uchuusen - Cosmo Carrier. diff --git a/source/quickerNES/core/mappers/mapper079.hpp b/source/quickerNES/core/mappers/mapper079.hpp index c3b9851..e46648e 100644 --- a/source/quickerNES/core/mappers/mapper079.hpp +++ b/source/quickerNES/core/mappers/mapper079.hpp @@ -25,7 +25,7 @@ * Nina-03 / Nina-06 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper085.hpp b/source/quickerNES/core/mappers/mapper085.hpp index 94e80e4..377ade4 100644 --- a/source/quickerNES/core/mappers/mapper085.hpp +++ b/source/quickerNES/core/mappers/mapper085.hpp @@ -2,8 +2,8 @@ // Emu 0.5.4. http://www.slack.net/~ant/ -#include "apu/vrc7/apu.hpp" -#include "mappers/mapper.hpp" +#include "../apu/vrc7/apu.hpp" +#include "mapper.hpp" #include /* Copyright (C) 2004-2005 Shay Green. This module is free software; you diff --git a/source/quickerNES/core/mappers/mapper087.hpp b/source/quickerNES/core/mappers/mapper087.hpp index 64896bb..1e57216 100644 --- a/source/quickerNES/core/mappers/mapper087.hpp +++ b/source/quickerNES/core/mappers/mapper087.hpp @@ -3,7 +3,7 @@ // Optional less-common simple mappers // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper088.hpp b/source/quickerNES/core/mappers/mapper088.hpp index 677a46e..7652074 100644 --- a/source/quickerNES/core/mappers/mapper088.hpp +++ b/source/quickerNES/core/mappers/mapper088.hpp @@ -25,7 +25,7 @@ * Mapper 206 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper089.hpp b/source/quickerNES/core/mappers/mapper089.hpp index 851474a..95576ba 100644 --- a/source/quickerNES/core/mappers/mapper089.hpp +++ b/source/quickerNES/core/mappers/mapper089.hpp @@ -22,7 +22,7 @@ * Mapper 93 - Sunsoft-2 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Sunsoft2b diff --git a/source/quickerNES/core/mappers/mapper093.hpp b/source/quickerNES/core/mappers/mapper093.hpp index df06a3e..445003d 100644 --- a/source/quickerNES/core/mappers/mapper093.hpp +++ b/source/quickerNES/core/mappers/mapper093.hpp @@ -22,7 +22,7 @@ * Mapper 93 - Sunsoft-2 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Sunsoft2a diff --git a/source/quickerNES/core/mappers/mapper094.hpp b/source/quickerNES/core/mappers/mapper094.hpp index 39e39ad..73cc504 100644 --- a/source/quickerNES/core/mappers/mapper094.hpp +++ b/source/quickerNES/core/mappers/mapper094.hpp @@ -24,7 +24,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Un1rom diff --git a/source/quickerNES/core/mappers/mapper097.hpp b/source/quickerNES/core/mappers/mapper097.hpp index 375284d..6554e53 100644 --- a/source/quickerNES/core/mappers/mapper097.hpp +++ b/source/quickerNES/core/mappers/mapper097.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Irem_Tam_S1 diff --git a/source/quickerNES/core/mappers/mapper140.hpp b/source/quickerNES/core/mappers/mapper140.hpp index 66bc113..723d7e1 100644 --- a/source/quickerNES/core/mappers/mapper140.hpp +++ b/source/quickerNES/core/mappers/mapper140.hpp @@ -24,7 +24,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Jaleco_JF11 diff --git a/source/quickerNES/core/mappers/mapper156.hpp b/source/quickerNES/core/mappers/mapper156.hpp index 73e648b..bf43a20 100644 --- a/source/quickerNES/core/mappers/mapper156.hpp +++ b/source/quickerNES/core/mappers/mapper156.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.hpp" +#include "mapper.hpp" // DIS23C01 DAOU ROM CONTROLLER diff --git a/source/quickerNES/core/mappers/mapper180.hpp b/source/quickerNES/core/mappers/mapper180.hpp index 0c9e9f8..dd37ad8 100644 --- a/source/quickerNES/core/mappers/mapper180.hpp +++ b/source/quickerNES/core/mappers/mapper180.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // UxROM (inverted) diff --git a/source/quickerNES/core/mappers/mapper184.hpp b/source/quickerNES/core/mappers/mapper184.hpp index 19ac133..b2a120b 100644 --- a/source/quickerNES/core/mappers/mapper184.hpp +++ b/source/quickerNES/core/mappers/mapper184.hpp @@ -22,7 +22,7 @@ * Mapper 184 - Sunsoft-1 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Sunsoft1 diff --git a/source/quickerNES/core/mappers/mapper190.hpp b/source/quickerNES/core/mappers/mapper190.hpp index 4ca7ec6..87fc53b 100644 --- a/source/quickerNES/core/mappers/mapper190.hpp +++ b/source/quickerNES/core/mappers/mapper190.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.hpp" +#include "mapper.hpp" // Magic Kid Googoo diff --git a/source/quickerNES/core/mappers/mapper193.hpp b/source/quickerNES/core/mappers/mapper193.hpp index f32ca95..b2c0bfa 100644 --- a/source/quickerNES/core/mappers/mapper193.hpp +++ b/source/quickerNES/core/mappers/mapper193.hpp @@ -25,7 +25,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // NTDEC's TC-112 mapper IC. diff --git a/source/quickerNES/core/mappers/mapper206.hpp b/source/quickerNES/core/mappers/mapper206.hpp index c757335..ba6d40b 100644 --- a/source/quickerNES/core/mappers/mapper206.hpp +++ b/source/quickerNES/core/mappers/mapper206.hpp @@ -25,7 +25,7 @@ * Mapper 206 */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper207.hpp b/source/quickerNES/core/mappers/mapper207.hpp index ac2677a..a56fca6 100644 --- a/source/quickerNES/core/mappers/mapper207.hpp +++ b/source/quickerNES/core/mappers/mapper207.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" namespace quickerNES { diff --git a/source/quickerNES/core/mappers/mapper232.hpp b/source/quickerNES/core/mappers/mapper232.hpp index 69a6cd0..1fe5ccb 100644 --- a/source/quickerNES/core/mappers/mapper232.hpp +++ b/source/quickerNES/core/mappers/mapper232.hpp @@ -5,7 +5,7 @@ // Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.hpp" +#include "mapper.hpp" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/core/mappers/mapper240.hpp b/source/quickerNES/core/mappers/mapper240.hpp index 05b4541..29b7a3a 100644 --- a/source/quickerNES/core/mappers/mapper240.hpp +++ b/source/quickerNES/core/mappers/mapper240.hpp @@ -21,7 +21,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper240 diff --git a/source/quickerNES/core/mappers/mapper241.hpp b/source/quickerNES/core/mappers/mapper241.hpp index 628a282..0cca757 100644 --- a/source/quickerNES/core/mappers/mapper241.hpp +++ b/source/quickerNES/core/mappers/mapper241.hpp @@ -21,7 +21,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper241 diff --git a/source/quickerNES/core/mappers/mapper244.hpp b/source/quickerNES/core/mappers/mapper244.hpp index 167288c..d21a743 100644 --- a/source/quickerNES/core/mappers/mapper244.hpp +++ b/source/quickerNES/core/mappers/mapper244.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper244 diff --git a/source/quickerNES/core/mappers/mapper246.hpp b/source/quickerNES/core/mappers/mapper246.hpp index e1678ec..e25fdef 100644 --- a/source/quickerNES/core/mappers/mapper246.hpp +++ b/source/quickerNES/core/mappers/mapper246.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.hpp" +#include "mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper246 diff --git a/source/quickerNES/core/ppu/ppu.cpp b/source/quickerNES/core/ppu/ppu.cpp index 00b32f8..aeb8b40 100644 --- a/source/quickerNES/core/ppu/ppu.cpp +++ b/source/quickerNES/core/ppu/ppu.cpp @@ -5,7 +5,7 @@ #include #include "ppu.hpp" -#include "core.hpp" +#include "../core.hpp" namespace quickerNES { diff --git a/source/quickerNES/meson.build b/source/quickerNES/meson.build index 8e411f7..ac08b31 100644 --- a/source/quickerNES/meson.build +++ b/source/quickerNES/meson.build @@ -32,6 +32,6 @@ quickerNESSrc = quickerNESAPUSrc + quickerNESPPUSrc + [ quickerNESDependency = declare_dependency( compile_args : [ '-D_PAGE_SIZE="' + pageSize.to_string() + '"'], - include_directories : include_directories(['.', 'core']), + include_directories : include_directories(['.']), sources : [ quickerNESSrc ] ) \ No newline at end of file diff --git a/source/tester.cpp b/source/tester.cpp index f24f971..82cda22 100644 --- a/source/tester.cpp +++ b/source/tester.cpp @@ -115,6 +115,7 @@ int main(int argc, char *argv[]) if (loadStringFromFile(stateFileData, initialStateFilePath) == false) EXIT_WITH_ERROR("Could not initial state file: %s\n", initialStateFilePath.c_str()); e.deserializeState((uint8_t*)stateFileData.data()); } + // Disabling requested blocks from state serialization for (const auto& block : stateDisabledBlocks) e.disableStateBlock(block);