From 38e75c0a750014bc5b2842d0c530958cc3a8c360 Mon Sep 17 00:00:00 2001 From: Francesco Rigoni Date: Sun, 4 Mar 2018 20:56:41 +0100 Subject: [PATCH] Move header files to include/ --- CMakeLists.txt | 4 +--- {src => include}/Addressing.hpp | 0 {src => include}/Binary.hpp | 0 {src => include}/BuildConfig.hpp | 0 {src => include}/Cpu65816.hpp | 2 +- {src => include}/Cpu65816Debugger.hpp | 0 {src => include}/CpuStatus.hpp | 0 {src => include}/Interrupt.hpp | 0 {src/opcodes => include}/OpCode.hpp | 2 +- {src => include}/Stack.hpp | 0 {src => include}/SystemBus.hpp | 0 {src => include}/SystemBusDevice.hpp | 0 src/Addressing.cpp | 4 +++- src/opcodes/OpCodeTable.cpp | 2 +- src/opcodes/OpCode_ADC.cpp | 2 +- src/opcodes/OpCode_AND.cpp | 2 +- src/opcodes/OpCode_ASL.cpp | 2 +- src/opcodes/OpCode_BIT.cpp | 4 ++-- src/opcodes/OpCode_Branch.cpp | 2 +- src/opcodes/OpCode_CMP.cpp | 2 +- src/opcodes/OpCode_CPX_CPY.cpp | 2 +- src/opcodes/OpCode_EOR.cpp | 2 +- src/opcodes/OpCode_INC_DEC.cpp | 2 +- src/opcodes/OpCode_Interrupt.cpp | 4 ++-- src/opcodes/OpCode_JumpReturn.cpp | 2 +- src/opcodes/OpCode_LDA.cpp | 2 +- src/opcodes/OpCode_LDX.cpp | 2 +- src/opcodes/OpCode_LDY.cpp | 2 +- src/opcodes/OpCode_LSR.cpp | 2 +- src/opcodes/OpCode_Misc.cpp | 2 +- src/opcodes/OpCode_ORA.cpp | 2 +- src/opcodes/OpCode_ROL.cpp | 2 +- src/opcodes/OpCode_ROR.cpp | 2 +- src/opcodes/OpCode_SBC.cpp | 2 +- src/opcodes/OpCode_STA.cpp | 2 +- src/opcodes/OpCode_STX.cpp | 2 +- src/opcodes/OpCode_STY.cpp | 2 +- src/opcodes/OpCode_STZ.cpp | 2 +- src/opcodes/OpCode_Stack.cpp | 2 +- src/opcodes/OpCode_StatusReg.cpp | 2 +- src/opcodes/OpCode_TSB_TRB.cpp | 4 ++-- src/opcodes/OpCode_Transfer.cpp | 2 +- 42 files changed, 38 insertions(+), 38 deletions(-) rename {src => include}/Addressing.hpp (100%) rename {src => include}/Binary.hpp (100%) rename {src => include}/BuildConfig.hpp (100%) rename {src => include}/Cpu65816.hpp (99%) rename {src => include}/Cpu65816Debugger.hpp (100%) rename {src => include}/CpuStatus.hpp (100%) rename {src => include}/Interrupt.hpp (100%) rename {src/opcodes => include}/OpCode.hpp (98%) rename {src => include}/Stack.hpp (100%) rename {src => include}/SystemBus.hpp (100%) rename {src => include}/SystemBusDevice.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3f1163..23a4462 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,6 @@ else () set (CMAKE_CXX_STANDARD 14) endif () -# Add all include directories -include_directories(include/** ${SIMPLE_LOGGER_SRC}) # Add paths for linker link_directories(${SIMPLE_LOGGER_BIN}) @@ -38,4 +36,4 @@ add_library(65816 ${sources_65816}) add_dependencies(65816 simple-logger) target_link_libraries(65816 simpleLogger) -target_include_directories(65816 INTERFACE include/*) +target_include_directories(65816 PRIVATE ${PROJECT_SOURCE_DIR}/include ${SIMPLE_LOGGER_SRC}) diff --git a/src/Addressing.hpp b/include/Addressing.hpp similarity index 100% rename from src/Addressing.hpp rename to include/Addressing.hpp diff --git a/src/Binary.hpp b/include/Binary.hpp similarity index 100% rename from src/Binary.hpp rename to include/Binary.hpp diff --git a/src/BuildConfig.hpp b/include/BuildConfig.hpp similarity index 100% rename from src/BuildConfig.hpp rename to include/BuildConfig.hpp diff --git a/src/Cpu65816.hpp b/include/Cpu65816.hpp similarity index 99% rename from src/Cpu65816.hpp rename to include/Cpu65816.hpp index 9e2f5cd..a782555 100644 --- a/src/Cpu65816.hpp +++ b/include/Cpu65816.hpp @@ -27,7 +27,7 @@ #include "Addressing.hpp" #include "Stack.hpp" #include "CpuStatus.hpp" -#include "opcodes/OpCode.hpp" +#include "OpCode.hpp" #include "Log.hpp" #include "Binary.hpp" #include "BuildConfig.hpp" diff --git a/src/Cpu65816Debugger.hpp b/include/Cpu65816Debugger.hpp similarity index 100% rename from src/Cpu65816Debugger.hpp rename to include/Cpu65816Debugger.hpp diff --git a/src/CpuStatus.hpp b/include/CpuStatus.hpp similarity index 100% rename from src/CpuStatus.hpp rename to include/CpuStatus.hpp diff --git a/src/Interrupt.hpp b/include/Interrupt.hpp similarity index 100% rename from src/Interrupt.hpp rename to include/Interrupt.hpp diff --git a/src/opcodes/OpCode.hpp b/include/OpCode.hpp similarity index 98% rename from src/opcodes/OpCode.hpp rename to include/OpCode.hpp index c873aca..2d5dcbe 100644 --- a/src/opcodes/OpCode.hpp +++ b/include/OpCode.hpp @@ -22,7 +22,7 @@ #include -#include "../Addressing.hpp" +#include "Addressing.hpp" class Cpu65816; diff --git a/src/Stack.hpp b/include/Stack.hpp similarity index 100% rename from src/Stack.hpp rename to include/Stack.hpp diff --git a/src/SystemBus.hpp b/include/SystemBus.hpp similarity index 100% rename from src/SystemBus.hpp rename to include/SystemBus.hpp diff --git a/src/SystemBusDevice.hpp b/include/SystemBusDevice.hpp similarity index 100% rename from src/SystemBusDevice.hpp rename to include/SystemBusDevice.hpp diff --git a/src/Addressing.cpp b/src/Addressing.cpp index 8647801..a65ce54 100644 --- a/src/Addressing.cpp +++ b/src/Addressing.cpp @@ -17,7 +17,9 @@ * along with this program. If not, see . */ -#include "Cpu65816.hpp" +#include +#include +#include #define LOG_TAG "Addressing" diff --git a/src/opcodes/OpCodeTable.cpp b/src/opcodes/OpCodeTable.cpp index bc85f94..1520ff8 100644 --- a/src/opcodes/OpCodeTable.cpp +++ b/src/opcodes/OpCodeTable.cpp @@ -20,7 +20,7 @@ #ifndef OPCODE_TABLE_HPP #define OPCODE_TABLE_HPP -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" OpCode Cpu65816::OP_CODE_TABLE[] = { OpCode(0x00, "BRK", AddressingMode::Interrupt, &Cpu65816::executeInterrupt), diff --git a/src/opcodes/OpCode_ADC.cpp b/src/opcodes/OpCode_ADC.cpp index 3035e32..0bb8767 100644 --- a/src/opcodes/OpCode_ADC.cpp +++ b/src/opcodes/OpCode_ADC.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeADC" diff --git a/src/opcodes/OpCode_AND.cpp b/src/opcodes/OpCode_AND.cpp index 1db1b5e..1a9fe89 100644 --- a/src/opcodes/OpCode_AND.cpp +++ b/src/opcodes/OpCode_AND.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_ASL.cpp b/src/opcodes/OpCode_ASL.cpp index e921290..3046b45 100644 --- a/src/opcodes/OpCode_ASL.cpp +++ b/src/opcodes/OpCode_ASL.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeASL" diff --git a/src/opcodes/OpCode_BIT.cpp b/src/opcodes/OpCode_BIT.cpp index e9f6023..a54fb3d 100644 --- a/src/opcodes/OpCode_BIT.cpp +++ b/src/opcodes/OpCode_BIT.cpp @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "../Interrupt.hpp" -#include "../Cpu65816.hpp" +#include "Interrupt.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeBIT" diff --git a/src/opcodes/OpCode_Branch.cpp b/src/opcodes/OpCode_Branch.cpp index c265b49..96eb084 100644 --- a/src/opcodes/OpCode_Branch.cpp +++ b/src/opcodes/OpCode_Branch.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_CMP.cpp b/src/opcodes/OpCode_CMP.cpp index d8ce32c..8696891 100644 --- a/src/opcodes/OpCode_CMP.cpp +++ b/src/opcodes/OpCode_CMP.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeCMP" diff --git a/src/opcodes/OpCode_CPX_CPY.cpp b/src/opcodes/OpCode_CPX_CPY.cpp index d7daabe..0eee52d 100644 --- a/src/opcodes/OpCode_CPX_CPY.cpp +++ b/src/opcodes/OpCode_CPX_CPY.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeCPXCPY" diff --git a/src/opcodes/OpCode_EOR.cpp b/src/opcodes/OpCode_EOR.cpp index 727b046..a2371b4 100644 --- a/src/opcodes/OpCode_EOR.cpp +++ b/src/opcodes/OpCode_EOR.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeEOR" diff --git a/src/opcodes/OpCode_INC_DEC.cpp b/src/opcodes/OpCode_INC_DEC.cpp index 7f3c9e2..2cb3fc3 100644 --- a/src/opcodes/OpCode_INC_DEC.cpp +++ b/src/opcodes/OpCode_INC_DEC.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeINCDEC" diff --git a/src/opcodes/OpCode_Interrupt.cpp b/src/opcodes/OpCode_Interrupt.cpp index 168c4b8..b707346 100644 --- a/src/opcodes/OpCode_Interrupt.cpp +++ b/src/opcodes/OpCode_Interrupt.cpp @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "../Interrupt.hpp" -#include "../Cpu65816.hpp" +#include "Interrupt.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeInterrupt" diff --git a/src/opcodes/OpCode_JumpReturn.cpp b/src/opcodes/OpCode_JumpReturn.cpp index 51db81c..bb7cd2f 100644 --- a/src/opcodes/OpCode_JumpReturn.cpp +++ b/src/opcodes/OpCode_JumpReturn.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeJumpReturn" diff --git a/src/opcodes/OpCode_LDA.cpp b/src/opcodes/OpCode_LDA.cpp index 08523d7..517e355 100644 --- a/src/opcodes/OpCode_LDA.cpp +++ b/src/opcodes/OpCode_LDA.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_LDX.cpp b/src/opcodes/OpCode_LDX.cpp index 2a11487..58d6e66 100644 --- a/src/opcodes/OpCode_LDX.cpp +++ b/src/opcodes/OpCode_LDX.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_LDY.cpp b/src/opcodes/OpCode_LDY.cpp index cd0766d..989b668 100644 --- a/src/opcodes/OpCode_LDY.cpp +++ b/src/opcodes/OpCode_LDY.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_LSR.cpp b/src/opcodes/OpCode_LSR.cpp index b98b43d..d90200f 100644 --- a/src/opcodes/OpCode_LSR.cpp +++ b/src/opcodes/OpCode_LSR.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeLSR" diff --git a/src/opcodes/OpCode_Misc.cpp b/src/opcodes/OpCode_Misc.cpp index 4a0c935..c08c242 100644 --- a/src/opcodes/OpCode_Misc.cpp +++ b/src/opcodes/OpCode_Misc.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeMisc" diff --git a/src/opcodes/OpCode_ORA.cpp b/src/opcodes/OpCode_ORA.cpp index 72ae853..dad8e13 100644 --- a/src/opcodes/OpCode_ORA.cpp +++ b/src/opcodes/OpCode_ORA.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #include diff --git a/src/opcodes/OpCode_ROL.cpp b/src/opcodes/OpCode_ROL.cpp index fdeeb26..90c15a4 100644 --- a/src/opcodes/OpCode_ROL.cpp +++ b/src/opcodes/OpCode_ROL.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeROL" diff --git a/src/opcodes/OpCode_ROR.cpp b/src/opcodes/OpCode_ROR.cpp index b61b9bd..1aac1af 100644 --- a/src/opcodes/OpCode_ROR.cpp +++ b/src/opcodes/OpCode_ROR.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeROR" diff --git a/src/opcodes/OpCode_SBC.cpp b/src/opcodes/OpCode_SBC.cpp index 46661d7..31e3518 100644 --- a/src/opcodes/OpCode_SBC.cpp +++ b/src/opcodes/OpCode_SBC.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeSBC" diff --git a/src/opcodes/OpCode_STA.cpp b/src/opcodes/OpCode_STA.cpp index 18155c9..12e680b 100644 --- a/src/opcodes/OpCode_STA.cpp +++ b/src/opcodes/OpCode_STA.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeSTA" diff --git a/src/opcodes/OpCode_STX.cpp b/src/opcodes/OpCode_STX.cpp index aca4eb8..7d40462 100644 --- a/src/opcodes/OpCode_STX.cpp +++ b/src/opcodes/OpCode_STX.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeSTX" diff --git a/src/opcodes/OpCode_STY.cpp b/src/opcodes/OpCode_STY.cpp index 887955b..f85f994 100644 --- a/src/opcodes/OpCode_STY.cpp +++ b/src/opcodes/OpCode_STY.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeSTY" diff --git a/src/opcodes/OpCode_STZ.cpp b/src/opcodes/OpCode_STZ.cpp index c960d04..9b53fa0 100644 --- a/src/opcodes/OpCode_STZ.cpp +++ b/src/opcodes/OpCode_STZ.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeSTZ" diff --git a/src/opcodes/OpCode_Stack.cpp b/src/opcodes/OpCode_Stack.cpp index 6bfbe20..edf9c3d 100644 --- a/src/opcodes/OpCode_Stack.cpp +++ b/src/opcodes/OpCode_Stack.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeStack" diff --git a/src/opcodes/OpCode_StatusReg.cpp b/src/opcodes/OpCode_StatusReg.cpp index dbace82..aa395ee 100644 --- a/src/opcodes/OpCode_StatusReg.cpp +++ b/src/opcodes/OpCode_StatusReg.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeStatusReg" diff --git a/src/opcodes/OpCode_TSB_TRB.cpp b/src/opcodes/OpCode_TSB_TRB.cpp index 6aac3ea..57b8531 100644 --- a/src/opcodes/OpCode_TSB_TRB.cpp +++ b/src/opcodes/OpCode_TSB_TRB.cpp @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "../Interrupt.hpp" -#include "../Cpu65816.hpp" +#include "Interrupt.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeTSBTRB" diff --git a/src/opcodes/OpCode_Transfer.cpp b/src/opcodes/OpCode_Transfer.cpp index 5aba1b3..6d7693a 100644 --- a/src/opcodes/OpCode_Transfer.cpp +++ b/src/opcodes/OpCode_Transfer.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "../Cpu65816.hpp" +#include "Cpu65816.hpp" #define LOG_TAG "Cpu::executeTransfer"