From abf4438d0933155180653d57afd94ac11ebaee55 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sat, 11 Oct 2025 12:40:55 +0400 Subject: [PATCH 01/53] Start writing new config --- CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++ conanfile.py | 20 ++++++++++++++++++++ src/Assembler/CMakeLists.txt | 11 +++++++++++ src/CMakeLists.txt | 1 + src/Pog/CMakeLists.txt | 3 +++ 5 files changed, 70 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 conanfile.py create mode 100644 src/Assembler/CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/Pog/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..7470b932 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.28) +project(HyperCPU VERSION 0.5.0 LANGUAGES CXX) + +include(CheckIPOSupported) + +set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) +set(EXPORT_COMPILE_COMMANDS TRUE) +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +find_package(GTest REQUIRED) +find_package(argparse REQUIRED) +find_package(eternal REQUIRED) +find_package(spdlog REQUIRED) +find_package(fmt REQUIRED) +add_subdirectory(foreign/HPool) +include_directories(foreign/HPool) + +check_ipo_supported(RESULT SUPPORTED OUTPUT ERR) + +string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) + +# TODO: Enable UBSan and fix all errors +if ("${CMAKE_BUILD_TYPE}" STREQUAL "debug") + message(STATUS "Enabled debug flags") +elseif("${CMAKE_BUILD_TYPE}" STREQUAL "release") + message(STATUS "Enabled release flags") + + if (SUPPORTED) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) + endif () +endif() + +add_subdirectory(src) +#add_subdirectory(tests) diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 00000000..4adeeab8 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,20 @@ +from conan import ConanFile +from conan.tools.cmake import cmake_layout + + +class HyperCPU(ConanFile): + name = "HyperCPU" + version = "0.5.0" + settings = ["os", "compiler", "build_type", "arch"] + author = "HyperCPU Project" + requires = [ + "gtest/1.14.0", + "spdlog/1.15.0", + "argparse/3.2", + "eternal/1.0.1", + "fmt/11.0.2" + ] + generators = ["CMakeToolchain", "CMakeDeps"] + + def layout(self) -> None: + cmake_layout(self) diff --git a/src/Assembler/CMakeLists.txt b/src/Assembler/CMakeLists.txt new file mode 100644 index 00000000..067bf520 --- /dev/null +++ b/src/Assembler/CMakeLists.txt @@ -0,0 +1,11 @@ +add_executable(hcasm + Main.cpp + Core/BinaryTransformer.cpp + Core/Compiler.cpp + Core/Parsers.cpp + Core/StatementCompilers.cpp + Core/Tokenizers.cpp +) +target_include_directories(hcasm PUBLIC ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(hcasm PUBLIC argparse::argparse eternal::eternal spdlog::spdlog) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..f1b5b260 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(Assembler) diff --git a/src/Pog/CMakeLists.txt b/src/Pog/CMakeLists.txt new file mode 100644 index 00000000..14c82371 --- /dev/null +++ b/src/Pog/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(pog-hpp INTERFACE) +target_include_directories(pog-hpp INTERFACE ${CMAKE_SOURCE_DIR}/src) +target_precompile_headers(pog-hpp INTERFACE Pog.hpp) From e95f0e4c345aef0877cb91532a20e9f15c2b1ed9 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sat, 11 Oct 2025 15:36:24 +0400 Subject: [PATCH 02/53] spdlog fixes --- CMakeLists.txt | 1 + conanfile.py | 4 +++- src/Assembler/CMakeLists.txt | 2 +- src/Assembler/Core/Compiler.cpp | 10 +++++----- src/Assembler/Main.cpp | 3 ++- src/Common/Exit.hpp | 6 +++--- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7470b932..2a546a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ find_package(argparse REQUIRED) find_package(eternal REQUIRED) find_package(spdlog REQUIRED) find_package(fmt REQUIRED) +find_package(re2 REQUIRED) add_subdirectory(foreign/HPool) include_directories(foreign/HPool) diff --git a/conanfile.py b/conanfile.py index 4adeeab8..709b8230 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,11 +8,13 @@ class HyperCPU(ConanFile): settings = ["os", "compiler", "build_type", "arch"] author = "HyperCPU Project" requires = [ + "abseil/20240116.1", "gtest/1.14.0", "spdlog/1.15.0", "argparse/3.2", "eternal/1.0.1", - "fmt/11.0.2" + "fmt/11.0.2", + "re2/20250722" ] generators = ["CMakeToolchain", "CMakeDeps"] diff --git a/src/Assembler/CMakeLists.txt b/src/Assembler/CMakeLists.txt index 067bf520..d501ee35 100644 --- a/src/Assembler/CMakeLists.txt +++ b/src/Assembler/CMakeLists.txt @@ -7,5 +7,5 @@ add_executable(hcasm Core/Tokenizers.cpp ) target_include_directories(hcasm PUBLIC ${CMAKE_SOURCE_DIR}/src) -target_link_libraries(hcasm PUBLIC argparse::argparse eternal::eternal spdlog::spdlog) +target_link_libraries(hcasm PUBLIC argparse::argparse eternal::eternal spdlog::spdlog re2::re2) diff --git a/src/Assembler/Core/Compiler.cpp b/src/Assembler/Core/Compiler.cpp index a0bcb9dd..7cef5bbf 100644 --- a/src/Assembler/Core/Compiler.cpp +++ b/src/Assembler/Core/Compiler.cpp @@ -337,7 +337,7 @@ HCAsm::BinaryResult HCAsm::HCAsmCompiler::TransformToBinary(HCAsm::CompilerState } // Resolve references - pass 2 - spdlog::info("{} label references are waiting for resolve", ir.pending_resolves.size()); + spdlog::info(fmt::format("{} label references are waiting for resolve", ir.pending_resolves.size())); if (!ir.pending_resolves.empty()) { spdlog::info("Resolving label references"); @@ -423,13 +423,13 @@ std::string_view HCAsm::FindLine(const pog::LineSpecialization& line_spec, const } [[noreturn]] void HCAsm::ThrowError(pog::TokenWithLineSpec& err_token, pog::Parser& parser, std::string err_msg) { - spdlog::error("error: {}", err_msg); + spdlog::error(fmt::format("error: {}", err_msg)); auto line = FindLine(err_token.line_spec, parser.get_top_file()); - spdlog::debug("{} | {}", err_token.line_spec.line, line); - spdlog::debug("{:<{}} | {:<{}}{}", + spdlog::debug(fmt::format("{} | {}", err_token.line_spec.line, line)); + spdlog::debug(fmt::format("{:<{}} | {:<{}}{}", "", std::to_string(err_token.line_spec.line).length(), "", err_token.line_spec.offset, - std::string(err_token.line_spec.length, '^')); + std::string(err_token.line_spec.length, '^'))); HyperCPU::exit(1); } diff --git a/src/Assembler/Main.cpp b/src/Assembler/Main.cpp index 1ad3d217..3bc010ce 100644 --- a/src/Assembler/Main.cpp +++ b/src/Assembler/Main.cpp @@ -1,6 +1,7 @@ #include #include #include +#include "fmt/format.h" #include "Assembler/Core/Compiler.hpp" #include "Common/NotImplemented.hpp" @@ -66,7 +67,7 @@ int main(int argc, char** argv) { // Verify that files are available if (!std::filesystem::is_regular_file(source)) { - spdlog::error("Source file \"{}\" is not a regular file!", source); + spdlog::error(fmt::format("Source file \"{}\" is not a regular file!", source)); return 1; } diff --git a/src/Common/Exit.hpp b/src/Common/Exit.hpp index c853c562..d5d2a9f5 100644 --- a/src/Common/Exit.hpp +++ b/src/Common/Exit.hpp @@ -7,7 +7,7 @@ namespace HyperCPU { as using this can cause serious bugs. When we are on release profile - allow these things to behave how they were intented. */ - [[noreturn]] constexpr void exit([[maybe_unused]] int code) { + [[noreturn, gnu::always_inline]] inline void exit([[maybe_unused]] int code) { #ifdef NDEBUG std::abort(); #else @@ -15,11 +15,11 @@ namespace HyperCPU { #endif } - constexpr void unreachable() { + inline void unreachable() { #ifdef NDEBUG std::abort(); #else __builtin_unreachable(); #endif } -} // namespace HyperCPU \ No newline at end of file +} // namespace HyperCPU From 8bcc7b92d68615b17dfc8b399b77b454b6e7ff3e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 22 Oct 2025 16:19:32 +0400 Subject: [PATCH 03/53] Working CMake --- CMakeLists.txt | 2 +- src/Assembler/CMakeLists.txt | 28 +++++--- src/CMakeLists.txt | 3 + src/Common/CMakeLists.txt | 2 + src/Emulator/CMakeLists.txt | 51 ++++++++++++++ src/PCH/CMakeLists.txt | 0 src/Pog/CMakeLists.txt | 1 + tests/CMakeLists.txt | 6 ++ tests/Integration/CMakeLists.txt | 44 ++++++++++++ tests/Modular/CMakeLists.txt | 117 +++++++++++++++++++++++++++++++ 10 files changed, 244 insertions(+), 10 deletions(-) create mode 100644 src/Common/CMakeLists.txt create mode 100644 src/Emulator/CMakeLists.txt create mode 100644 src/PCH/CMakeLists.txt create mode 100644 tests/CMakeLists.txt create mode 100644 tests/Integration/CMakeLists.txt create mode 100644 tests/Modular/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a546a4d..1450e722 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,4 +33,4 @@ elseif("${CMAKE_BUILD_TYPE}" STREQUAL "release") endif() add_subdirectory(src) -#add_subdirectory(tests) +add_subdirectory(tests) diff --git a/src/Assembler/CMakeLists.txt b/src/Assembler/CMakeLists.txt index d501ee35..1830910d 100644 --- a/src/Assembler/CMakeLists.txt +++ b/src/Assembler/CMakeLists.txt @@ -1,11 +1,21 @@ +add_library(hcasm-core + Core/BinaryTransformer.cpp + Core/Compiler.cpp + Core/Parsers.cpp + Core/StatementCompilers.cpp + Core/Tokenizers.cpp +) +target_include_directories(hcasm-core PUBLIC ${PROJECT_SOURCE_DIR}/src) +target_link_libraries(hcasm-core PUBLIC + eternal::eternal + spdlog::spdlog + re2::re2 + hcpu-common +) + add_executable(hcasm Main.cpp - Core/BinaryTransformer.cpp - Core/Compiler.cpp - Core/Parsers.cpp - Core/StatementCompilers.cpp - Core/Tokenizers.cpp -) -target_include_directories(hcasm PUBLIC ${CMAKE_SOURCE_DIR}/src) -target_link_libraries(hcasm PUBLIC argparse::argparse eternal::eternal spdlog::spdlog re2::re2) - +) +target_link_libraries(hcasm PUBLIC + hcasm-core +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1b5b260..32f092c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,4 @@ +add_subdirectory(Common) add_subdirectory(Assembler) +add_subdirectory(Emulator) +add_subdirectory(Pog) \ No newline at end of file diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt new file mode 100644 index 00000000..bace6a86 --- /dev/null +++ b/src/Common/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(hcpu-common INTERFACE) +target_include_directories(hcpu-common INTERFACE ${PROJECT_SOURCE_DIR}/src/Common) \ No newline at end of file diff --git a/src/Emulator/CMakeLists.txt b/src/Emulator/CMakeLists.txt new file mode 100644 index 00000000..5d128d70 --- /dev/null +++ b/src/Emulator/CMakeLists.txt @@ -0,0 +1,51 @@ +add_library(hcpu-core STATIC + Core/CPU/Decoders/StdDecoder.cpp + Core/CPU/InstructionsImpl/CALLGR.cpp + Core/CPU/InstructionsImpl/WRITE.cpp + Core/CPU/InstructionsImpl/OR.cpp + Core/CPU/InstructionsImpl/SHFR.cpp + Core/CPU/InstructionsImpl/JML.cpp + Core/CPU/InstructionsImpl/READ.cpp + Core/CPU/InstructionsImpl/HALT.cpp + Core/CPU/InstructionsImpl/CMP.cpp + Core/CPU/InstructionsImpl/HID.cpp + Core/CPU/InstructionsImpl/CALL.cpp + Core/CPU/InstructionsImpl/PUSH.cpp + Core/CPU/InstructionsImpl/POP.cpp + Core/CPU/InstructionsImpl/INTR.cpp + Core/CPU/InstructionsImpl/MOV.cpp + Core/CPU/InstructionsImpl/ANDN.cpp + Core/CPU/InstructionsImpl/INC.cpp + Core/CPU/InstructionsImpl/CALLL.cpp + Core/CPU/InstructionsImpl/MUL.cpp + Core/CPU/InstructionsImpl/CUDF.cpp + Core/CPU/InstructionsImpl/LOIVT.cpp + Core/CPU/InstructionsImpl/AND.cpp + Core/CPU/InstructionsImpl/DEC.cpp + Core/CPU/InstructionsImpl/DIV.cpp + Core/CPU/InstructionsImpl/COVF.cpp + Core/CPU/InstructionsImpl/CALLE.cpp + Core/CPU/InstructionsImpl/SHFL.cpp + Core/CPU/InstructionsImpl/JMGR.cpp + Core/CPU/InstructionsImpl/CCRF.cpp + Core/CPU/InstructionsImpl/ADD.cpp + Core/CPU/InstructionsImpl/BSWAP.cpp + Core/CPU/InstructionsImpl/JME.cpp + Core/CPU/InstructionsImpl/JMP.cpp + Core/CPU/InstructionsImpl/ADC.cpp + Core/CPU/InstructionsImpl/SUB.cpp + Core/CPU/Interrupts/InterruptHandler.cpp + Core/CPU/IO/Simple.cpp + Core/CPU/CPU.cpp + Core/CPU/OperandsEvaluation.cpp + Core/CPU/Stack.cpp +) +target_include_directories(hcpu-core PUBLIC ${PROJECT_SOURCE_DIR}/src) +target_link_libraries(hcpu-core PUBLIC hcpu-common spdlog::spdlog) + +add_executable(hcemul Main.cpp) +target_link_libraries(hcemul PUBLIC + hcpu-core + argparse::argparse + re2::re2 +) \ No newline at end of file diff --git a/src/PCH/CMakeLists.txt b/src/PCH/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/Pog/CMakeLists.txt b/src/Pog/CMakeLists.txt index 14c82371..0dbeda55 100644 --- a/src/Pog/CMakeLists.txt +++ b/src/Pog/CMakeLists.txt @@ -1,3 +1,4 @@ add_library(pog-hpp INTERFACE) target_include_directories(pog-hpp INTERFACE ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(pog-hpp INTERFACE re2::re2) target_precompile_headers(pog-hpp INTERFACE Pog.hpp) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 00000000..67c694b5 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,6 @@ +add_library(fixtures INTERFACE) +target_include_directories(fixtures INTERFACE ${PROJECT_SOURCE_DIR}/tests) +target_precompile_headers(fixtures INTERFACE fixtures.hpp gtest.hpp) + +add_subdirectory(Integration) +add_subdirectory(Modular) \ No newline at end of file diff --git a/tests/Integration/CMakeLists.txt b/tests/Integration/CMakeLists.txt new file mode 100644 index 00000000..2199fb41 --- /dev/null +++ b/tests/Integration/CMakeLists.txt @@ -0,0 +1,44 @@ +add_executable(integration-tests + AssemblerCore/AssemblerFail.cpp + AssemblerCore/AssemblerSuccess.cpp + AssemblerCore/FullAssembler.cpp + AssemblerCore/TwoOperandsSuccess.cpp + EmulatorCore/CPU/CPU_ADC.cpp + EmulatorCore/CPU/CPU_ADD.cpp + EmulatorCore/CPU/CPU_AND.cpp + EmulatorCore/CPU/CPU_ANDN.cpp + EmulatorCore/CPU/CPU_BSWAP.cpp + EmulatorCore/CPU/CPU_CALL.cpp + EmulatorCore/CPU/CPU_CALLE.cpp + EmulatorCore/CPU/CPU_CALLGR.cpp + EmulatorCore/CPU/CPU_CALLL.cpp + EmulatorCore/CPU/CPU_CCRF.cpp + EmulatorCore/CPU/CPU_CMP.cpp + EmulatorCore/CPU/CPU_COVF.cpp + EmulatorCore/CPU/CPU_CUDF.cpp + EmulatorCore/CPU/CPU_DEC.cpp + EmulatorCore/CPU/CPU_DIV.cpp + EmulatorCore/CPU/CPU_HID.cpp + EmulatorCore/CPU/CPU_INC.cpp + EmulatorCore/CPU/CPU_INTR.cpp + EmulatorCore/CPU/CPU_IRET.cpp + EmulatorCore/CPU/CPU_JME.cpp + EmulatorCore/CPU/CPU_JMGR.cpp + EmulatorCore/CPU/CPU_JML.cpp + EmulatorCore/CPU/CPU_JMP.cpp + EmulatorCore/CPU/CPU_LOIVT.cpp + EmulatorCore/CPU/CPU_MOV.cpp + EmulatorCore/CPU/CPU_MUL.cpp + EmulatorCore/CPU/CPU_OR.cpp + EmulatorCore/CPU/CPU_POP.cpp + EmulatorCore/CPU/CPU_PUSH.cpp + EmulatorCore/CPU/CPU_READ.cpp + EmulatorCore/CPU/CPU_SHFL.cpp + EmulatorCore/CPU/CPU_SHFR.cpp + EmulatorCore/CPU/CPU_SUB.cpp + EmulatorCore/CPU/CPU_WRITE.cpp + EmulatorCore/CPU/OperandsEvaluation.cpp + EmulatorCore/Exceptions/Exceptions.cpp +) +target_link_libraries(integration-tests PUBLIC hcpu-core hcasm-core GTest::gtest GTest::gtest_main pog-hpp fixtures) +target_include_directories(integration-tests PUBLIC ${PROJECT_SOURCE_DIR}) \ No newline at end of file diff --git a/tests/Modular/CMakeLists.txt b/tests/Modular/CMakeLists.txt new file mode 100644 index 00000000..87ec2d02 --- /dev/null +++ b/tests/Modular/CMakeLists.txt @@ -0,0 +1,117 @@ +add_executable(modular-tests + AssemblerCore/Parser/Operands.cpp + AssemblerCore/Parser/Statements.cpp + AssemblerCore/Parser/Tokens.cpp + EmulatorCore/CPUInit/CPUInit.cpp + EmulatorCore/Decoding/ADCInstr/R_IMM.cpp + EmulatorCore/Decoding/ADCInstr/R_M.cpp + EmulatorCore/Decoding/ADCInstr/R_R.cpp + EmulatorCore/Decoding/ADCInstr/R_RM.cpp + EmulatorCore/Decoding/ADCInstr/Unsupported.cpp + EmulatorCore/Decoding/ADDInstr/R_IMM.cpp + EmulatorCore/Decoding/ADDInstr/R_M.cpp + EmulatorCore/Decoding/ADDInstr/R_R.cpp + EmulatorCore/Decoding/ADDInstr/R_RM.cpp + EmulatorCore/Decoding/ADDInstr/Unsupported.cpp + EmulatorCore/Decoding/ANDInstr/R_IMM.cpp + EmulatorCore/Decoding/ANDInstr/R_M.cpp + EmulatorCore/Decoding/ANDInstr/R_R.cpp + EmulatorCore/Decoding/ANDInstr/R_RM.cpp + EmulatorCore/Decoding/ANDInstr/Unsupported.cpp + EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp + EmulatorCore/Decoding/ANDNInstr/R_M.cpp + EmulatorCore/Decoding/ANDNInstr/R_R.cpp + EmulatorCore/Decoding/ANDNInstr/R_RM.cpp + EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp + EmulatorCore/Decoding/BSWAPInstr/R.cpp + EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp + EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp + EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp + EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp + EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp + EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp + EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CMPInstr/M_R.cpp + EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp + EmulatorCore/Decoding/CMPInstr/RM_M.cpp + EmulatorCore/Decoding/CMPInstr/RM_R.cpp + EmulatorCore/Decoding/CMPInstr/R_IMM.cpp + EmulatorCore/Decoding/CMPInstr/R_M.cpp + EmulatorCore/Decoding/CMPInstr/R_R.cpp + EmulatorCore/Decoding/CMPInstr/R_RM.cpp + EmulatorCore/Decoding/CMPInstr/Unsupported.cpp + EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp + EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/CUDFInstr/None.cpp + EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp + EmulatorCore/Decoding/DECInstr/R.cpp + EmulatorCore/Decoding/DECInstr/Unsupported.cpp + EmulatorCore/Decoding/DIVInstr/R.cpp + EmulatorCore/Decoding/DIVInstr/Unsupported.cpp + EmulatorCore/Decoding/Features/AddressAddition.cpp + EmulatorCore/Decoding/HALTInstr/None.cpp + EmulatorCore/Decoding/HALTInstr/Unsupported.cpp + EmulatorCore/Decoding/HIDInstr/None.cpp + EmulatorCore/Decoding/HIDInstr/Unsupported.cpp + EmulatorCore/Decoding/INCInstr/R.cpp + EmulatorCore/Decoding/INCInstr/Unsupported.cpp + EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp + EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp + EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp + EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp + EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp + EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp + EmulatorCore/Decoding/MOVInstr/M_R.cpp + EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp + EmulatorCore/Decoding/MOVInstr/RM_M.cpp + EmulatorCore/Decoding/MOVInstr/RM_R.cpp + EmulatorCore/Decoding/MOVInstr/R_IMM.cpp + EmulatorCore/Decoding/MOVInstr/R_M.cpp + EmulatorCore/Decoding/MOVInstr/R_R.cpp + EmulatorCore/Decoding/MOVInstr/R_RM.cpp + EmulatorCore/Decoding/MOVInstr/Unsupported.cpp + EmulatorCore/Decoding/MULInstr/R_IMM.cpp + EmulatorCore/Decoding/MULInstr/R_M.cpp + EmulatorCore/Decoding/MULInstr/R_R.cpp + EmulatorCore/Decoding/MULInstr/R_RM.cpp + EmulatorCore/Decoding/MULInstr/Unsupported.cpp + EmulatorCore/Decoding/ORInstr/R_IMM.cpp + EmulatorCore/Decoding/ORInstr/R_M.cpp + EmulatorCore/Decoding/ORInstr/R_R.cpp + EmulatorCore/Decoding/ORInstr/R_RM.cpp + EmulatorCore/Decoding/ORInstr/Unsupported.cpp + EmulatorCore/Decoding/READInstr/IMM.cpp + EmulatorCore/Decoding/READInstr/Unsupported.cpp + EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp + EmulatorCore/Decoding/SHFLInstr/R_R.cpp + EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp + EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp + EmulatorCore/Decoding/SHFRInstr/R_R.cpp + EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp + EmulatorCore/Decoding/SUBInstr/R_IMM.cpp + EmulatorCore/Decoding/SUBInstr/R_M.cpp + EmulatorCore/Decoding/SUBInstr/R_R.cpp + EmulatorCore/Decoding/SUBInstr/R_RM.cpp + EmulatorCore/Decoding/SUBInstr/Unsupported.cpp + EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp + EmulatorCore/Decoding/WRITEInstr/R_R.cpp + EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp + EmulatorCore/MemoryControllers/ST.cpp + EmulatorCore/Stack/Stack.cpp +) +target_link_libraries(modular-tests PUBLIC hcpu-core hcasm-core GTest::gtest GTest::gtest_main pog-hpp fixtures) +target_include_directories(modular-tests PUBLIC ${PROJECT_SOURCE_DIR}) \ No newline at end of file From fe26b663d95f35e55dfdc245cf09af17ee1fb0bf Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 22 Oct 2025 16:28:29 +0400 Subject: [PATCH 04/53] Update includes --- tests/Integration/AssemblerCore/AssemblerFail.cpp | 2 +- tests/Integration/AssemblerCore/AssemblerSuccess.cpp | 2 +- tests/Integration/AssemblerCore/FullAssembler.cpp | 2 +- tests/Integration/AssemblerCore/TwoOperandsSuccess.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_ADC.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_ADD.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_AND.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_ANDN.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_BSWAP.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CALL.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CALLE.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CALLGR.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CALLL.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CCRF.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CMP.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_COVF.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_CUDF.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_DEC.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_DIV.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_HID.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_INC.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_INTR.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_IRET.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_JME.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_JMGR.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_JML.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_JMP.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_LOIVT.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_MOV.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_MUL.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_OR.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_POP.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_PUSH.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_READ.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_SHFL.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_SHFR.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_SUB.cpp | 2 +- tests/Integration/EmulatorCore/CPU/CPU_WRITE.cpp | 2 +- tests/Integration/EmulatorCore/CPU/OperandsEvaluation.cpp | 2 +- tests/Integration/EmulatorCore/Exceptions/Exceptions.cpp | 2 +- tests/Modular/AssemblerCore/Parser/Operands.cpp | 2 +- tests/Modular/AssemblerCore/Parser/Statements.cpp | 2 +- tests/Modular/AssemblerCore/Parser/Tokens.cpp | 2 +- tests/Modular/EmulatorCore/CPUInit/CPUInit.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADCInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADCInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADCInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADCInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADDInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADDInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADDInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADDInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/BSWAPInstr/R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp | 2 +- .../EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp | 2 +- .../Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp | 2 +- .../Decoding/CALLEInstr/test_decoder_unsupported.cpp | 2 +- .../EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp | 2 +- .../EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp | 2 +- .../Decoding/CALLGRInstr/test_decoder_unsupported.cpp | 2 +- .../EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp | 2 +- .../Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp | 2 +- .../Decoding/CALLInstr/test_decoder_unsupported.cpp | 2 +- .../EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp | 2 +- .../Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp | 2 +- .../Decoding/CALLLInstr/test_decoder_unsupported.cpp | 2 +- .../EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp | 2 +- .../Decoding/CCRFInstr/test_decoder_unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/M_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp | 2 +- .../EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp | 2 +- .../Decoding/COVFInstr/test_decoder_unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CUDFInstr/None.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/DECInstr/R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/DIVInstr/R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp | 2 +- .../Modular/EmulatorCore/Decoding/Features/AddressAddition.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/HALTInstr/None.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/HIDInstr/None.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/INCInstr/R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp | 2 +- .../Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp | 2 +- .../EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp | 2 +- .../EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp | 2 +- .../Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp | 2 +- .../Decoding/JMGRInstr/test_decoder_unsupported.cpp | 2 +- .../Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp | 2 +- .../EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp | 2 +- .../Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp | 2 +- .../EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/M_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MULInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MULInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MULInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MULInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ORInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ORInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ORInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ORInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/READInstr/IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SUBInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SUBInstr/R_M.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SUBInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SUBInstr/R_RM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_R.cpp | 2 +- tests/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp | 2 +- tests/Modular/EmulatorCore/MemoryControllers/ST.cpp | 2 +- tests/Modular/EmulatorCore/Stack/Stack.cpp | 2 +- tests/Pog/Automaton.cpp | 2 +- tests/Pog/FilterView.cpp | 2 +- tests/Pog/Grammar.cpp | 2 +- tests/Pog/Item.cpp | 2 +- tests/Pog/Parser.cpp | 2 +- tests/Pog/ParsingTable.cpp | 2 +- tests/Pog/Precedence.cpp | 2 +- tests/Pog/Rule.cpp | 2 +- tests/Pog/RuleBuilder.cpp | 2 +- tests/Pog/State.cpp | 2 +- tests/Pog/Symbol.cpp | 2 +- tests/Pog/Token.cpp | 2 +- tests/Pog/TokenBuilder.cpp | 2 +- tests/Pog/Tokenizer.cpp | 2 +- tests/Pog/Utils.cpp | 2 +- tests/fixtures.hpp | 2 +- 169 files changed, 169 insertions(+), 169 deletions(-) diff --git a/tests/Integration/AssemblerCore/AssemblerFail.cpp b/tests/Integration/AssemblerCore/AssemblerFail.cpp index c7a37fab..fe1beedf 100644 --- a/tests/Integration/AssemblerCore/AssemblerFail.cpp +++ b/tests/Integration/AssemblerCore/AssemblerFail.cpp @@ -1,5 +1,5 @@ #include "PCH/CStd.hpp" -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef NDEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Integration/AssemblerCore/AssemblerSuccess.cpp b/tests/Integration/AssemblerCore/AssemblerSuccess.cpp index 151d4160..ceb7f6bb 100644 --- a/tests/Integration/AssemblerCore/AssemblerSuccess.cpp +++ b/tests/Integration/AssemblerCore/AssemblerSuccess.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(ASSEMBLER, ASM_R_R_b8) { std::string data = "mov xlll0, xlll1;"; diff --git a/tests/Integration/AssemblerCore/FullAssembler.cpp b/tests/Integration/AssemblerCore/FullAssembler.cpp index 58b5828b..e0b5e16f 100644 --- a/tests/Integration/AssemblerCore/FullAssembler.cpp +++ b/tests/Integration/AssemblerCore/FullAssembler.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(FULL_ASSEMBLER, MULTUPLE_INSTRUCTIONS) { std::string data = "_start:\n\tmov x0, 0u1;\n\tmov x1, 0u2;\n\tadd x0, x1;"; diff --git a/tests/Integration/AssemblerCore/TwoOperandsSuccess.cpp b/tests/Integration/AssemblerCore/TwoOperandsSuccess.cpp index d820de84..aa3a353b 100644 --- a/tests/Integration/AssemblerCore/TwoOperandsSuccess.cpp +++ b/tests/Integration/AssemblerCore/TwoOperandsSuccess.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(TWO_OPERANDS_SUCCESS, OPERANDS_R_R_b8) { std::string data = "mov xlll0, xlll1;"; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_ADC.cpp b/tests/Integration/EmulatorCore/CPU/CPU_ADC.cpp index 693b63c0..9936ae10 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_ADC.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_ADC.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_ADD.cpp b/tests/Integration/EmulatorCore/CPU/CPU_ADD.cpp index 42461a62..65d2c2b7 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_ADD.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_ADD.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_AND.cpp b/tests/Integration/EmulatorCore/CPU/CPU_AND.cpp index 317374b8..0b088957 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_AND.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_AND.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_ANDN.cpp b/tests/Integration/EmulatorCore/CPU/CPU_ANDN.cpp index abefd4a0..4393be2d 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_ANDN.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_ANDN.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_BSWAP.cpp b/tests/Integration/EmulatorCore/CPU/CPU_BSWAP.cpp index 286985b8..dc87997f 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_BSWAP.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_BSWAP.cpp @@ -4,7 +4,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x12; static constexpr std::uint8_t BYTE_RESULT = BYTE_DATA1; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CALL.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CALL.cpp index 18c856bb..5a61d53f 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CALL.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CALL.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CALL_R) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CALL); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CALLE.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CALLE.cpp index 05bfc830..a873757f 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CALLE.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CALLE.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CALLE_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CALLE); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CALLGR.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CALLGR.cpp index b7037654..73e79f61 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CALLGR.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CALLGR.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CALLGR_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CALLGR); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CALLL.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CALLL.cpp index 695358a8..a4b7ad17 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CALLL.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CALLL.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CALLL_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CALLL); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CCRF.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CCRF.cpp index f5a81b99..e2303ffe 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CCRF.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CCRF.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CCRF_SET) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CCRF); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CMP.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CMP.cpp index 0aefabcf..34f13fdd 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CMP.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CMP.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CMP_R_R_b8_LE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CMP); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_COVF.cpp b/tests/Integration/EmulatorCore/CPU/CPU_COVF.cpp index a707b687..0a6b240a 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_COVF.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_COVF.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_COVF_SET) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::COVF); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_CUDF.cpp b/tests/Integration/EmulatorCore/CPU/CPU_CUDF.cpp index 60ae2432..b09843b7 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_CUDF.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_CUDF.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_CUDF_SET) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::CUDF); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_DEC.cpp b/tests/Integration/EmulatorCore/CPU/CPU_DEC.cpp index ef8b5a02..727edda5 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_DEC.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_DEC.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_RESULT = BYTE_DATA1 - 1; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_DIV.cpp b/tests/Integration/EmulatorCore/CPU/CPU_DIV.cpp index 3e02fff9..42d66634 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_DIV.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_DIV.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DIVIDER = 0x5; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_HID.cpp b/tests/Integration/EmulatorCore/CPU/CPU_HID.cpp index b9e3eca3..317de32f 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_HID.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_HID.cpp @@ -1,6 +1,6 @@ #include "Emulator/Core/CPU/Version.hpp" -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_HID_0) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::HID); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_INC.cpp b/tests/Integration/EmulatorCore/CPU/CPU_INC.cpp index 8bdaaec0..a680cf1e 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_INC.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_INC.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_RESULT = BYTE_DATA1 + 1; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_INTR.cpp b/tests/Integration/EmulatorCore/CPU/CPU_INTR.cpp index 4c1eb166..4fd07d7c 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_INTR.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_INTR.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_INTR_R_b64) { // Setup stack diff --git a/tests/Integration/EmulatorCore/CPU/CPU_IRET.cpp b/tests/Integration/EmulatorCore/CPU/CPU_IRET.cpp index 1c344c4f..2cf48d1c 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_IRET.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_IRET.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_IRET_NONE) { *cpu.xbp = 512; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_JME.cpp b/tests/Integration/EmulatorCore/CPU/CPU_JME.cpp index 54eb5459..a3070ff6 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_JME.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_JME.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_JME_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::JME); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_JMGR.cpp b/tests/Integration/EmulatorCore/CPU/CPU_JMGR.cpp index c4429896..26ffc86c 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_JMGR.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_JMGR.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_JMGR_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::JMGR); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_JML.cpp b/tests/Integration/EmulatorCore/CPU/CPU_JML.cpp index 568255da..062b7b8b 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_JML.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_JML.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_JML_R_TRUE) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::JML); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_JMP.cpp b/tests/Integration/EmulatorCore/CPU/CPU_JMP.cpp index 67a25284..bde8d614 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_JMP.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_JMP.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_JMP_R) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::JMP); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_LOIVT.cpp b/tests/Integration/EmulatorCore/CPU/CPU_LOIVT.cpp index 0418ea31..74ad0c41 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_LOIVT.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_LOIVT.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_LOIVT_R_b64) { cpu.mem_controller->Load16(*cpu.xip, HyperCPU::Opcode::LOIVT); diff --git a/tests/Integration/EmulatorCore/CPU/CPU_MOV.cpp b/tests/Integration/EmulatorCore/CPU/CPU_MOV.cpp index cdda494a..2897755c 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_MOV.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_MOV.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA = 0x55; static constexpr std::uint16_t WORD_DATA = 0x5555; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_MUL.cpp b/tests/Integration/EmulatorCore/CPU/CPU_MUL.cpp index 898372db..d6b28770 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_MUL.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_MUL.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x2; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_OR.cpp b/tests/Integration/EmulatorCore/CPU/CPU_OR.cpp index 840cd780..cfa8a191 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_OR.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_OR.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x60; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_POP.cpp b/tests/Integration/EmulatorCore/CPU/CPU_POP.cpp index 9934b5cb..c92bb33b 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_POP.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_POP.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" // TODO: fix constexpr naming static constexpr std::uint8_t BYTE_DATA1 = 0x55; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_PUSH.cpp b/tests/Integration/EmulatorCore/CPU/CPU_PUSH.cpp index 88230582..713769f6 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_PUSH.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_PUSH.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" // TODO: fix include order // TODO: fix constexpr naming diff --git a/tests/Integration/EmulatorCore/CPU/CPU_READ.cpp b/tests/Integration/EmulatorCore/CPU/CPU_READ.cpp index 75b4df26..8be6e4db 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_READ.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_READ.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_READ) { cpu.read_io_handlers[1] = []() -> std::uint8_t { diff --git a/tests/Integration/EmulatorCore/CPU/CPU_SHFL.cpp b/tests/Integration/EmulatorCore/CPU/CPU_SHFL.cpp index 40601912..5863be42 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_SHFL.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_SHFL.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x4; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_SHFR.cpp b/tests/Integration/EmulatorCore/CPU/CPU_SHFR.cpp index 774046b3..9c66ea52 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_SHFR.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_SHFR.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x55; static constexpr std::uint8_t BYTE_DATA2 = 0x4; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_SUB.cpp b/tests/Integration/EmulatorCore/CPU/CPU_SUB.cpp index 65180c8d..33ff12bc 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_SUB.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_SUB.cpp @@ -1,7 +1,7 @@ #include #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA1 = 0x60; static constexpr std::uint8_t BYTE_DATA2 = 0x55; diff --git a/tests/Integration/EmulatorCore/CPU/CPU_WRITE.cpp b/tests/Integration/EmulatorCore/CPU/CPU_WRITE.cpp index 982582ff..d2e52a81 100644 --- a/tests/Integration/EmulatorCore/CPU/CPU_WRITE.cpp +++ b/tests/Integration/EmulatorCore/CPU/CPU_WRITE.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(CPU_TEST, INSTR_WRITE) { std::uint8_t t = 0; diff --git a/tests/Integration/EmulatorCore/CPU/OperandsEvaluation.cpp b/tests/Integration/EmulatorCore/CPU/OperandsEvaluation.cpp index f60a7c53..e20652f5 100644 --- a/tests/Integration/EmulatorCore/CPU/OperandsEvaluation.cpp +++ b/tests/Integration/EmulatorCore/CPU/OperandsEvaluation.cpp @@ -1,7 +1,7 @@ #include "Emulator/Core/CPU/Decoders/StdDecoder.hpp" #include -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(OPERAND_EVAL_TEST, PROPER_REGISTERS_EVALUATION) { HyperCPU::OperandContainer arg = 0; diff --git a/tests/Integration/EmulatorCore/Exceptions/Exceptions.cpp b/tests/Integration/EmulatorCore/Exceptions/Exceptions.cpp index c3fa62ef..eb243f8a 100644 --- a/tests/Integration/EmulatorCore/Exceptions/Exceptions.cpp +++ b/tests/Integration/EmulatorCore/Exceptions/Exceptions.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(EXCEPTION_TEST, CPU_EXCEPTION_IO) { cpu.mem_controller->Load16(*cpu.xip, 8273); diff --git a/tests/Modular/AssemblerCore/Parser/Operands.cpp b/tests/Modular/AssemblerCore/Parser/Operands.cpp index 53ae4eca..f55ac821 100644 --- a/tests/Modular/AssemblerCore/Parser/Operands.cpp +++ b/tests/Modular/AssemblerCore/Parser/Operands.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(ASM_PARSER_TEST, OPERAND1) { std::string data = "[0x15FA]"; diff --git a/tests/Modular/AssemblerCore/Parser/Statements.cpp b/tests/Modular/AssemblerCore/Parser/Statements.cpp index 17739916..b417304f 100644 --- a/tests/Modular/AssemblerCore/Parser/Statements.cpp +++ b/tests/Modular/AssemblerCore/Parser/Statements.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(ASM_PARSER_STMT_TEST, STMT1) { std::string data = "adc x0, x1;"; diff --git a/tests/Modular/AssemblerCore/Parser/Tokens.cpp b/tests/Modular/AssemblerCore/Parser/Tokens.cpp index 8d689db9..f4c2c00a 100644 --- a/tests/Modular/AssemblerCore/Parser/Tokens.cpp +++ b/tests/Modular/AssemblerCore/Parser/Tokens.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(ASM_PARSER_TEST, TOKEN_STRING) { std::string str = "this is a string to test parser\\n\\r\\\"\\\'\\a\\\\"; diff --git a/tests/Modular/EmulatorCore/CPUInit/CPUInit.cpp b/tests/Modular/EmulatorCore/CPUInit/CPUInit.cpp index 3ac06a43..b447ba1f 100644 --- a/tests/Modular/EmulatorCore/CPUInit/CPUInit.cpp +++ b/tests/Modular/EmulatorCore/CPUInit/CPUInit.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint64_t FULL_CONST = 0x0001020304050607; static constexpr std::uint32_t CONSTH = 0x00010203; diff --git a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_IMM.cpp index e66c3f7b..9bd5fcdc 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADC_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADC); diff --git a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_M.cpp index 07ce2f71..f62e2083 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADC_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADC); diff --git a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_R.cpp index ddbeac6c..9a4523b0 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADC_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADC); diff --git a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_RM.cpp index 1a33f282..72d4d67f 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADCInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADC_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADC); diff --git a/tests/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp index 7bcc5c94..c7a836ed 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_IMM.cpp index 00e41fe5..eff9cdc3 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADD_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADD); diff --git a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_M.cpp index 5623b4f9..b688731d 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADD_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADD); diff --git a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_R.cpp index 4995a828..3dab4e19 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADD_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADD); diff --git a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_RM.cpp index e275cf4c..f80b38f2 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADDInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADD_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ADD); diff --git a/tests/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp index 6f72dd05..56be9247 100644 --- a/tests/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_IMM.cpp index 3b7412ce..1392417a 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, AND_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::AND); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_M.cpp index 150a6b2e..8a836519 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, AND_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::AND); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_R.cpp index 8fe32cbf..af9a57c9 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, AND_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::AND); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_RM.cpp index c2680e7c..407fa015 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, AND_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::AND); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp index 7f37f6ff..7525691d 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp index 789a0d41..008b3e41 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ANDN_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ANDN); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_M.cpp index 143b5b9c..82c398b3 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ANDN_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ANDN); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_R.cpp index 10d5dd2f..81dfda72 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ANDN_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ANDN); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_RM.cpp index e6ae3f31..35527a89 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ANDN_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::ANDN); diff --git a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp index e31f6089..4c70bbb7 100644 --- a/tests/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/R.cpp b/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/R.cpp index 2048a6c0..cf0a1bec 100644 --- a/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, BSWAP_INSTR_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::BSWAP); diff --git a/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp index ccd81fc1..d6781cba 100644 --- a/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp index be76fa77..65bdc304 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLE_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLE); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp index 12eafd0f..adc4b5d6 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLE_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLE); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp index 81328e8a..e9adea06 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp index 254ed4f7..f2f9fae2 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLGR_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLGR); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp index 9d50ad8f..f60c67d2 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLGR_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLGR); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp index bfd1de82..bcf37f72 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp index e7f67323..2c0f44b3 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALL_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALL); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp index eb1e7ce5..39793f30 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALL_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALL); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp index 0dda4486..33825235 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp index a1088c7b..98cc8bd9 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLL_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLL); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp index 8c60ced2..0127bcd0 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CALLL_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CALLL); diff --git a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp index 6904c94d..0c48aa76 100644 --- a/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp b/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp index e5e38717..f8e061d0 100644 --- a/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_none.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CCRF_INSTR_NONE) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CCRF); diff --git a/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp index d2ffdc91..b655f071 100644 --- a/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/M_R.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/M_R.cpp index be3a58d3..91b223c9 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/M_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/M_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp index 9a082fce..43abe813 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_RM_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_M.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_M.cpp index 4385ace3..07eefd55 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_RM_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_R.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_R.cpp index e9eb63f2..6e586ad7 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/RM_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_RM_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_IMM.cpp index 50c50f5e..92192281 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_M.cpp index 6dd431e1..3fdff9b1 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_R.cpp index 90c32118..f5c6da4c 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_RM.cpp index 7d17ee26..f47775f9 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CMP_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CMP); diff --git a/tests/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp index b64d5791..8e1d51b8 100644 --- a/tests/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp b/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp index bb78faaa..fe321ea8 100644 --- a/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp +++ b/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_none.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, COVF_INSTR_NONE) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::COVF); diff --git a/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp index a24c6919..d3ae0cb2 100644 --- a/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/CUDFInstr/None.cpp b/tests/Modular/EmulatorCore/Decoding/CUDFInstr/None.cpp index 4f97cb5f..9d0c90d1 100644 --- a/tests/Modular/EmulatorCore/Decoding/CUDFInstr/None.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CUDFInstr/None.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, CUDF_INSTR_NONE) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::CUDF); diff --git a/tests/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp index de1efe99..96bbccda 100644 --- a/tests/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/DECInstr/R.cpp b/tests/Modular/EmulatorCore/Decoding/DECInstr/R.cpp index 99de76c8..d83a0e0e 100644 --- a/tests/Modular/EmulatorCore/Decoding/DECInstr/R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/DECInstr/R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, DEC_INSTR_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::DEC); diff --git a/tests/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp index fb2fabf0..a0a22b86 100644 --- a/tests/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/DIVInstr/R.cpp b/tests/Modular/EmulatorCore/Decoding/DIVInstr/R.cpp index 1a490561..776763ee 100644 --- a/tests/Modular/EmulatorCore/Decoding/DIVInstr/R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/DIVInstr/R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, DIV_INSTR_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::DIV); diff --git a/tests/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp index b60aa5b9..31ea696c 100644 --- a/tests/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/Features/AddressAddition.cpp b/tests/Modular/EmulatorCore/Decoding/Features/AddressAddition.cpp index bc67c27a..d78b8297 100644 --- a/tests/Modular/EmulatorCore/Decoding/Features/AddressAddition.cpp +++ b/tests/Modular/EmulatorCore/Decoding/Features/AddressAddition.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, ADDR_ADDITION_DISABLED) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/HALTInstr/None.cpp b/tests/Modular/EmulatorCore/Decoding/HALTInstr/None.cpp index dbd207cd..f37391c5 100644 --- a/tests/Modular/EmulatorCore/Decoding/HALTInstr/None.cpp +++ b/tests/Modular/EmulatorCore/Decoding/HALTInstr/None.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, HALT_INSTR_NONE) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::HALT); diff --git a/tests/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp index 4896cdea..4d93e15d 100644 --- a/tests/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/HIDInstr/None.cpp b/tests/Modular/EmulatorCore/Decoding/HIDInstr/None.cpp index 8b1502bb..88fafb71 100644 --- a/tests/Modular/EmulatorCore/Decoding/HIDInstr/None.cpp +++ b/tests/Modular/EmulatorCore/Decoding/HIDInstr/None.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, HID_INSTR_NONE) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::HID); diff --git a/tests/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp index 020d6dac..16832b36 100644 --- a/tests/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/INCInstr/R.cpp b/tests/Modular/EmulatorCore/Decoding/INCInstr/R.cpp index eb776f9a..02641878 100644 --- a/tests/Modular/EmulatorCore/Decoding/INCInstr/R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/INCInstr/R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, INC_INSTR_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::INC); diff --git a/tests/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp index 11a2a8ae..b9747f96 100644 --- a/tests/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp index 9de36623..6a0352f1 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JME_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JME); diff --git a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp index aee5c2c2..fe354028 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JME_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JME); diff --git a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp index 27560a2c..b17cca6e 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp index 049c36a4..0395e1a3 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JMGR_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JMGR); diff --git a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp index 74302d30..2b82fa0b 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JMGR_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JMGR); diff --git a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp index 2b35d0a1..b39f18f2 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp index 199d0132..41760d56 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JML_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JML); diff --git a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp index 6453c330..ce0deef6 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JML_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JML); diff --git a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp index b4127c08..9f1b289d 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp index 5d0b3d26..7f41e8aa 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_imm.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JMP_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JMP); diff --git a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp index 80024964..886488b4 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_r.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, JMP_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::JMP); diff --git a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp index 320340ee..d3f2b913 100644 --- a/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/M_R.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/M_R.cpp index b20aa5ce..53e8b7ce 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/M_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/M_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp index c5b00baa..13fedf09 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_RM_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_M.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_M.cpp index 380adf20..f4091875 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_RM_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_R.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_R.cpp index 2d844417..5d0cad1f 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/RM_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_RM_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_IMM.cpp index 302eb5c6..d08afc04 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_M.cpp index b7a4da9a..23de4e57 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_R.cpp index 9ee4acf6..995e2efa 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_RM.cpp index d094c098..47dfaccf 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MOV_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MOV); diff --git a/tests/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp index a9e9b4a8..17910384 100644 --- a/tests/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_IMM.cpp index 63464007..1e349a58 100644 --- a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MUL_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MUL); diff --git a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_M.cpp index 69ae0184..5b13caa7 100644 --- a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MUL_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MUL); diff --git a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_R.cpp index 35275692..368c35a8 100644 --- a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MUL_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MUL); diff --git a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_RM.cpp index ae37a57e..02bd6a9d 100644 --- a/tests/Modular/EmulatorCore/Decoding/MULInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MULInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, MUL_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::MUL); diff --git a/tests/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp index a3d8e0b5..50f5e571 100644 --- a/tests/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_IMM.cpp index 408d0231..86d1182e 100644 --- a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, OR_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::OR); diff --git a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_M.cpp index af1588da..64133aab 100644 --- a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, OR_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::OR); diff --git a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_R.cpp index 4e32833a..1492e81b 100644 --- a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, OR_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::OR); diff --git a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_RM.cpp index 4878d552..be727ba2 100644 --- a/tests/Modular/EmulatorCore/Decoding/ORInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ORInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, OR_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::OR); diff --git a/tests/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp index a7208a1d..def579e7 100644 --- a/tests/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/READInstr/IMM.cpp b/tests/Modular/EmulatorCore/Decoding/READInstr/IMM.cpp index 4decf89f..459a88c6 100644 --- a/tests/Modular/EmulatorCore/Decoding/READInstr/IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/READInstr/IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, READ_INSTR_IMM) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::READ); diff --git a/tests/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp index c3c8bbdf..a6bd7701 100644 --- a/tests/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) #else diff --git a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp index d63d1ef5..e1f7db1f 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SHFL_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SHFL); diff --git a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_R.cpp index 6ec23cc7..2e58e5c9 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SHFL_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SHFL); diff --git a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp index db0d929f..f9b45fef 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp index 65366534..f1060e2b 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SHFR_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SHFR); diff --git a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_R.cpp index 7d9458df..ce500d84 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SHFR_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SHFR); diff --git a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp index aba3f4ca..1ad3d6ac 100644 --- a/tests/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_IMM.cpp index 01ea83a3..b143e433 100644 --- a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SUB_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SUB); diff --git a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_M.cpp b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_M.cpp index 25fbc85a..ea1bbc70 100644 --- a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_M.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_M.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SUB_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SUB); diff --git a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_R.cpp index fffab53f..794775f4 100644 --- a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SUB_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SUB); diff --git a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_RM.cpp b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_RM.cpp index c8013301..9c321733 100644 --- a/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_RM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SUBInstr/R_RM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, SUB_INSTR_R_RM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::SUB); diff --git a/tests/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp index c2b466eb..a34e7c0c 100644 --- a/tests/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp index 54c46be5..26f9771f 100644 --- a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp +++ b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_IMM.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::WRITE); diff --git a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_R.cpp b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_R.cpp index d9e5cc33..373ec705 100644 --- a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_R.cpp +++ b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/R_R.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::Opcode::WRITE); diff --git a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp index d0ac7039..7ba7cbf1 100644 --- a/tests/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp +++ b/tests/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #ifdef __HCPU_DEBUG #define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) diff --git a/tests/Modular/EmulatorCore/MemoryControllers/ST.cpp b/tests/Modular/EmulatorCore/MemoryControllers/ST.cpp index 456e3ff4..e1ee0edc 100644 --- a/tests/Modular/EmulatorCore/MemoryControllers/ST.cpp +++ b/tests/Modular/EmulatorCore/MemoryControllers/ST.cpp @@ -1,5 +1,5 @@ #include "PCH/CStd.hpp" -#include "tests/fixtures.hpp" +#include "fixtures.hpp" #define private public #include "Emulator/Core/MemoryController/MemoryControllerST.hpp" diff --git a/tests/Modular/EmulatorCore/Stack/Stack.cpp b/tests/Modular/EmulatorCore/Stack/Stack.cpp index 0f55c190..4f1f8bbf 100644 --- a/tests/Modular/EmulatorCore/Stack/Stack.cpp +++ b/tests/Modular/EmulatorCore/Stack/Stack.cpp @@ -1,4 +1,4 @@ -#include "tests/fixtures.hpp" +#include "fixtures.hpp" static constexpr std::uint8_t BYTE_DATA = 0x55; static constexpr std::uint16_t WORD_DATA = 0x5555; diff --git a/tests/Pog/Automaton.cpp b/tests/Pog/Automaton.cpp index 09545241..99be3ad0 100644 --- a/tests/Pog/Automaton.cpp +++ b/tests/Pog/Automaton.cpp @@ -1,7 +1,7 @@ #include "Pog/Automaton.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/FilterView.cpp b/tests/Pog/FilterView.cpp index 90862179..469b5d38 100644 --- a/tests/Pog/FilterView.cpp +++ b/tests/Pog/FilterView.cpp @@ -1,7 +1,7 @@ #include "Pog/FilterView.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" class TestFilterView : public ::testing::Test {}; diff --git a/tests/Pog/Grammar.cpp b/tests/Pog/Grammar.cpp index 7ae97f4a..d686e05b 100644 --- a/tests/Pog/Grammar.cpp +++ b/tests/Pog/Grammar.cpp @@ -1,7 +1,7 @@ #include "Pog/Grammar.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/Item.cpp b/tests/Pog/Item.cpp index 7445eba3..99e7e6e2 100644 --- a/tests/Pog/Item.cpp +++ b/tests/Pog/Item.cpp @@ -1,7 +1,7 @@ #include "Pog/Item.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/Parser.cpp b/tests/Pog/Parser.cpp index 28439dd6..4cd2b589 100644 --- a/tests/Pog/Parser.cpp +++ b/tests/Pog/Parser.cpp @@ -1,7 +1,7 @@ #include "Pog/Parser.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; using namespace ::testing; diff --git a/tests/Pog/ParsingTable.cpp b/tests/Pog/ParsingTable.cpp index ac7f0033..b9f72226 100644 --- a/tests/Pog/ParsingTable.cpp +++ b/tests/Pog/ParsingTable.cpp @@ -1,7 +1,7 @@ #include "Pog/ParsingTable.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/Precedence.cpp b/tests/Pog/Precedence.cpp index d2f81ce4..650b6eb6 100644 --- a/tests/Pog/Precedence.cpp +++ b/tests/Pog/Precedence.cpp @@ -1,7 +1,7 @@ #include "Pog/Precedence.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" class TestPrecedence : public ::testing::Test {}; diff --git a/tests/Pog/Rule.cpp b/tests/Pog/Rule.cpp index 5d175b6d..aa0f9747 100644 --- a/tests/Pog/Rule.cpp +++ b/tests/Pog/Rule.cpp @@ -1,7 +1,7 @@ #include "Pog/Rule.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" class TestRule : public ::testing::Test {}; diff --git a/tests/Pog/RuleBuilder.cpp b/tests/Pog/RuleBuilder.cpp index 49ae793c..0f2f2cfc 100644 --- a/tests/Pog/RuleBuilder.cpp +++ b/tests/Pog/RuleBuilder.cpp @@ -1,7 +1,7 @@ #include "Pog/RuleBuilder.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/State.cpp b/tests/Pog/State.cpp index a1850950..21fcf6dc 100644 --- a/tests/Pog/State.cpp +++ b/tests/Pog/State.cpp @@ -1,7 +1,7 @@ #include "Pog/State.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; using namespace ::testing; diff --git a/tests/Pog/Symbol.cpp b/tests/Pog/Symbol.cpp index a75f9604..117d2a97 100644 --- a/tests/Pog/Symbol.cpp +++ b/tests/Pog/Symbol.cpp @@ -1,7 +1,7 @@ #include "Pog/Symbol.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" class TestSymbol : public ::testing::Test {}; diff --git a/tests/Pog/Token.cpp b/tests/Pog/Token.cpp index 3bc40e5f..1f4bafda 100644 --- a/tests/Pog/Token.cpp +++ b/tests/Pog/Token.cpp @@ -1,7 +1,7 @@ #include "Pog/Token.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; using namespace ::testing; diff --git a/tests/Pog/TokenBuilder.cpp b/tests/Pog/TokenBuilder.cpp index 9895d54f..b0484910 100644 --- a/tests/Pog/TokenBuilder.cpp +++ b/tests/Pog/TokenBuilder.cpp @@ -1,7 +1,7 @@ #include "Pog/TokenBuilder.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/Tokenizer.cpp b/tests/Pog/Tokenizer.cpp index 62e2b865..9bf77c4e 100644 --- a/tests/Pog/Tokenizer.cpp +++ b/tests/Pog/Tokenizer.cpp @@ -1,7 +1,7 @@ #include "Pog/Tokenizer.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" using namespace pog; diff --git a/tests/Pog/Utils.cpp b/tests/Pog/Utils.cpp index 0eaae892..c65d6af7 100644 --- a/tests/Pog/Utils.cpp +++ b/tests/Pog/Utils.cpp @@ -1,7 +1,7 @@ #include "Pog/Utils.hpp" #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" class TestUtils : public ::testing::Test {}; diff --git a/tests/fixtures.hpp b/tests/fixtures.hpp index aa8257b2..5453bc54 100644 --- a/tests/fixtures.hpp +++ b/tests/fixtures.hpp @@ -1,7 +1,7 @@ #pragma once #include "PCH/CStd.hpp" -#include "tests/gtest.hpp" +#include "gtest.hpp" #define private public #include "Assembler/Core/Compiler.hpp" From 7d33aeca856e98fd316c1d271a304ba23498dd39 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 22:57:03 +0400 Subject: [PATCH 05/53] Update workflow --- .github/Dockerfile | 10 ++------- .github/workflows/mainline-compile.yml | 28 +++++++++++++++----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 9dc0cbed..85507c82 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -1,19 +1,13 @@ FROM debian:latest ARG USER=ci -ARG BAZELISK_TAG=v1.19.0 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ build-essential gcc g++ \ clang lld ninja-build sudo \ - python3 \ - && rm -rf /var/lib/apt/lists/* - -RUN curl -fsSL -o /usr/local/bin/bazelisk \ - "https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_TAG}/bazelisk-linux-amd64" \ - && chmod 0755 /usr/local/bin/bazelisk \ - && ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel + python3 cmake \ + && rm -rf /var/lib/apt/lists/* \ RUN useradd -m ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 01694790..7fd86a2d 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -26,21 +26,25 @@ jobs: submodules: true fetch-depth: 0 - - name: Cache Bazel - uses: actions/cache@v4 - with: - path: | - ~/.cache/bazel - key: bazel-${{ runner.os }}-${{ matrix.compiler }}-${{ hashFiles('**/*.bazel', '**/*.bzl') }} - restore-keys: | - bazel-${{ runner.os }}-${{ matrix.compiler }}- - bazel-${{ runner.os }}- - - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" - - name: Bazel build (linux-opt mode, with ${{ matrix.compiler }} compiler) - run: sudo -u ci bazelisk build //... --config=linux-opt --compiler=${{ matrix.compiler }} + - name: Install dependencies with Conan + run: | + sudo -u ci + if [ "${{ matrix.compiler }}" = "clang" ]; then + export CC=clang + export CXX=clang++ + else + export CC=gcc + export CXX=g++ + fi + conan profile detect + + - name: Build project (Release, with ${{ matrix.compiler }} compiler) + run: | + sudo -u ci cmake --preset conan-release + sudo -u ci cmake --build build/Release -j$(nproc) - name: Upload package tarball uses: actions/upload-artifact@v4 From 9ed1a4ebc39143c609e28ac82a95e9390ff7d084 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:05:49 +0400 Subject: [PATCH 06/53] Fix dockerfile --- .github/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 85507c82..3056ae00 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential gcc g++ \ clang lld ninja-build sudo \ python3 cmake \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* RUN useradd -m ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers From 91349afda545d4159a7cc90693d8de307e36a850 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:09:14 +0400 Subject: [PATCH 07/53] Fix workflow --- .github/workflows/mainline-compile.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 7fd86a2d..81b5792e 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -31,7 +31,6 @@ jobs: - name: Install dependencies with Conan run: | - sudo -u ci if [ "${{ matrix.compiler }}" = "clang" ]; then export CC=clang export CXX=clang++ From e6d5b05585966e39335e59a0933c800e1b5b9279 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:11:23 +0400 Subject: [PATCH 08/53] Update dockerfile --- .github/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 3056ae00..5896219d 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -4,11 +4,13 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential gcc g++ \ - clang lld ninja-build sudo \ - python3 cmake \ + build-essential gcc g++ \ + clang lld ninja-build sudo \ + python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* +RUN pip install conan + RUN useradd -m ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers From 998cfe895a557e0b7552df2d6ae9a978ad7cde42 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:13:01 +0400 Subject: [PATCH 09/53] Update dockerfile --- .github/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 5896219d..e28176a6 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* -RUN pip install conan +RUN pip install conan --break-system-packages RUN useradd -m ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers From af6d513da97a3aff288680e938cdc761f6869096 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:17:05 +0400 Subject: [PATCH 10/53] Fix workflow --- .github/workflows/mainline-compile.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 81b5792e..63e6acba 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -42,6 +42,7 @@ jobs: - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | + sudo -u ci conan install . --build=missing sudo -u ci cmake --preset conan-release sudo -u ci cmake --build build/Release -j$(nproc) From e1f6d866cf1f1ee10bd68976d0e0ef02af98ad66 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:19:27 +0400 Subject: [PATCH 11/53] Fix workflow --- .github/workflows/mainline-compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 63e6acba..f6f5036e 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -38,7 +38,7 @@ jobs: export CC=gcc export CXX=g++ fi - conan profile detect + sudo -E -u ci conan profile detect - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | From 4e70e068045bfee8c97db1d76432a0e41371b78f Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:21:23 +0400 Subject: [PATCH 12/53] Fix workflow --- .github/workflows/mainline-compile.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index f6f5036e..4bb05cee 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -26,9 +26,6 @@ jobs: submodules: true fetch-depth: 0 - - name: Fix permissions - run: chown -R ci:ci "$GITHUB_WORKSPACE" - - name: Install dependencies with Conan run: | if [ "${{ matrix.compiler }}" = "clang" ]; then @@ -39,6 +36,9 @@ jobs: export CXX=g++ fi sudo -E -u ci conan profile detect + + - name: Fix permissions + run: chown -R ci:ci "$GITHUB_WORKSPACE" - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | From 8af5b6e4429ad81e23f73d1569ca45c1480780d3 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:24:51 +0400 Subject: [PATCH 13/53] Lets test this shit --- .github/workflows/mainline-compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 4bb05cee..8219c53a 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -35,7 +35,7 @@ jobs: export CC=gcc export CXX=g++ fi - sudo -E -u ci conan profile detect + sudo -u env CC=$CC CXX=$CXX ci conan profile detect - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" From fdfffd67210ed2a5a382520fb727438b2969d9b3 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:26:48 +0400 Subject: [PATCH 14/53] HOW --- .github/workflows/mainline-compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 8219c53a..ec03d93f 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -35,7 +35,7 @@ jobs: export CC=gcc export CXX=g++ fi - sudo -u env CC=$CC CXX=$CXX ci conan profile detect + sudo -u ci env CC=$CC CXX=$CXX ci conan profile detect - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" From b8aa9b3fb767a817f2707095b86a030f1b463e12 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:28:02 +0400 Subject: [PATCH 15/53] DAMN --- .github/workflows/mainline-compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index ec03d93f..acb28388 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -35,7 +35,7 @@ jobs: export CC=gcc export CXX=g++ fi - sudo -u ci env CC=$CC CXX=$CXX ci conan profile detect + sudo -u ci env CC=$CC CXX=$CXX conan profile detect - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" From 791b310b99fd8852fcc85961fb76c2c1401e5071 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:34:55 +0400 Subject: [PATCH 16/53] Prepare for packaging, fix CMake --- .github/workflows/mainline-compile.yml | 4 ++-- .github/workflows/mainline-test.yml | 2 +- CMakeLists.txt | 3 +++ src/Assembler/CMakeLists.txt | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index acb28388..e744e824 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -45,12 +45,12 @@ jobs: sudo -u ci conan install . --build=missing sudo -u ci cmake --preset conan-release sudo -u ci cmake --build build/Release -j$(nproc) + sudo -u ci cmake --build build/Release package - name: Upload package tarball uses: actions/upload-artifact@v4 with: name: hcpu-tarballs-${{ matrix.compiler }} path: | - bazel-bin/tools/packaging/*.tar.gz - !bazel-bin/tools/packaging/hcpu.tar.gz + build/Release/*.tar.gz if-no-files-found: error diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 65e33c6b..ff3a6b96 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -5,7 +5,7 @@ on: inputs: artifact_name: type: string - default: "hcpu-tarballs*" + default: "hypercpu-*" jobs: install-and-test: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1450e722..d95a5d13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,14 @@ cmake_minimum_required(VERSION 3.28) project(HyperCPU VERSION 0.5.0 LANGUAGES CXX) include(CheckIPOSupported) +include(CPack) set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) set(EXPORT_COMPILE_COMMANDS TRUE) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CPACK_GENERATOR "TGZ") +set(CPACK_PACKAGE_FILE_NAME "hypercpu-${CMAKE_BUILD_TYPE}") find_package(GTest REQUIRED) find_package(argparse REQUIRED) diff --git a/src/Assembler/CMakeLists.txt b/src/Assembler/CMakeLists.txt index 1830910d..50e52132 100644 --- a/src/Assembler/CMakeLists.txt +++ b/src/Assembler/CMakeLists.txt @@ -10,6 +10,7 @@ target_link_libraries(hcasm-core PUBLIC eternal::eternal spdlog::spdlog re2::re2 + argparse::argparse hcpu-common ) From 871c96cc7b6cbf506f03b9845d6024abb9d3700a Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 5 Nov 2025 23:41:58 +0400 Subject: [PATCH 17/53] DO IT --- .github/workflows/mainline-compile.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index e744e824..c9ef16fa 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -29,11 +29,11 @@ jobs: - name: Install dependencies with Conan run: | if [ "${{ matrix.compiler }}" = "clang" ]; then - export CC=clang - export CXX=clang++ + export CC=$(which clang) + export CXX=$(which clang++) else - export CC=gcc - export CXX=g++ + export CC=$(which gcc) + export CXX=$(which g++) fi sudo -u ci env CC=$CC CXX=$CXX conan profile detect @@ -45,7 +45,7 @@ jobs: sudo -u ci conan install . --build=missing sudo -u ci cmake --preset conan-release sudo -u ci cmake --build build/Release -j$(nproc) - sudo -u ci cmake --build build/Release package + sudo -u ci cmake --build build/Release --target package - name: Upload package tarball uses: actions/upload-artifact@v4 From e8aee36eb4e70dc183862e01d7a123a16d020375 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 16:23:45 +0400 Subject: [PATCH 18/53] Update workflow --- .github/{ => docker/clang}/Dockerfile | 2 +- .github/docker/gcc/Dockerfile | 17 +++++++++++++++++ .github/workflows/mainline-compile.yml | 12 ++---------- .github/workflows/mainline-prepare.yml | 16 +++++++++++++--- 4 files changed, 33 insertions(+), 14 deletions(-) rename .github/{ => docker/clang}/Dockerfile (91%) create mode 100644 .github/docker/gcc/Dockerfile diff --git a/.github/Dockerfile b/.github/docker/clang/Dockerfile similarity index 91% rename from .github/Dockerfile rename to .github/docker/clang/Dockerfile index e28176a6..e5709891 100644 --- a/.github/Dockerfile +++ b/.github/docker/clang/Dockerfile @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential gcc g++ \ + build-essential \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/docker/gcc/Dockerfile b/.github/docker/gcc/Dockerfile new file mode 100644 index 00000000..ae75b9b3 --- /dev/null +++ b/.github/docker/gcc/Dockerfile @@ -0,0 +1,17 @@ +FROM debian:latest + +ARG USER=ci + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl git \ + build-essential gcc g++ \ + lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/lib/apt/lists/* + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index c9ef16fa..55fc4c47 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -8,7 +8,7 @@ jobs: name: Compile (${{ matrix.compiler }}) runs-on: ubuntu-latest container: - image: ghcr.io/hypercpu-project/hypercpu-builder:latest + image: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}:latest options: --init permissions: contents: read @@ -27,15 +27,7 @@ jobs: fetch-depth: 0 - name: Install dependencies with Conan - run: | - if [ "${{ matrix.compiler }}" = "clang" ]; then - export CC=$(which clang) - export CXX=$(which clang++) - else - export CC=$(which gcc) - export CXX=$(which g++) - fi - sudo -u ci env CC=$CC CXX=$CXX conan profile detect + run: sudo -u ci conan profile detect - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index ec6535b6..549a35da 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -24,12 +24,22 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push + - name: Build and push clang image uses: docker/build-push-action@v6 with: context: . - file: .github/Dockerfile + file: .github/docker/clang/Dockerfile push: true - tags: ghcr.io/hypercpu-project/hypercpu-builder:latest + tags: ghcr.io/hypercpu-project/hypercpu-builder-clang:latest + cache-from: type=gha + cache-to: type=gha,mode=max + + - name: Build and push gcc image + uses: docker/build-push-action@v6 + with: + context: . + file: .github/docker/gcc/Dockerfile + push: true + tags: ghcr.io/hypercpu-project/hypercpu-builder-gcc:latest cache-from: type=gha cache-to: type=gha,mode=max From b62c5933592146414032492de8d19a49c22a2046 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 17:45:36 +0400 Subject: [PATCH 19/53] Update CMake --- .github/workflows/mainline-compile.yml | 2 +- tests/CMakeLists.txt | 12 +++++++++++- tests/Integration/CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 55fc4c47..889fc3fe 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -35,7 +35,7 @@ jobs: - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | sudo -u ci conan install . --build=missing - sudo -u ci cmake --preset conan-release + sudo -u ci cmake --preset conan-release -DINSTALL_TESTS=1 sudo -u ci cmake --build build/Release -j$(nproc) sudo -u ci cmake --build build/Release --target package diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67c694b5..91bca709 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,4 +3,14 @@ target_include_directories(fixtures INTERFACE ${PROJECT_SOURCE_DIR}/tests) target_precompile_headers(fixtures INTERFACE fixtures.hpp gtest.hpp) add_subdirectory(Integration) -add_subdirectory(Modular) \ No newline at end of file +add_subdirectory(Modular) + +if (DEFINED INSTALL_TESTS) + install( + TARGETS + integration-tests + modular-tests + DESTINATION + bin + ) +endif() \ No newline at end of file diff --git a/tests/Integration/CMakeLists.txt b/tests/Integration/CMakeLists.txt index 2199fb41..747727ee 100644 --- a/tests/Integration/CMakeLists.txt +++ b/tests/Integration/CMakeLists.txt @@ -41,4 +41,4 @@ add_executable(integration-tests EmulatorCore/Exceptions/Exceptions.cpp ) target_link_libraries(integration-tests PUBLIC hcpu-core hcasm-core GTest::gtest GTest::gtest_main pog-hpp fixtures) -target_include_directories(integration-tests PUBLIC ${PROJECT_SOURCE_DIR}) \ No newline at end of file +target_include_directories(integration-tests PUBLIC ${PROJECT_SOURCE_DIR}) From fb9150187e61b8d5ea3831520db4752ea4837f9e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 20:02:41 +0400 Subject: [PATCH 20/53] Fix workflow --- .github/workflows/mainline-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index ff3a6b96..65e33c6b 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -5,7 +5,7 @@ on: inputs: artifact_name: type: string - default: "hypercpu-*" + default: "hcpu-tarballs*" jobs: install-and-test: From 8101b3100ba091886f9ae05c4c201560388f0661 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 20:13:35 +0400 Subject: [PATCH 21/53] Fix workflow --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 91bca709..ea91c3ae 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,6 +11,6 @@ if (DEFINED INSTALL_TESTS) integration-tests modular-tests DESTINATION - bin + opt/hcpu/tests ) endif() \ No newline at end of file From 389072b6fdd90e9bc62fda1233a0b873a05c3177 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 20:40:29 +0400 Subject: [PATCH 22/53] Disable repackaging --- .github/workflows/mainline-compile.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 889fc3fe..1cdc9394 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -46,3 +46,4 @@ jobs: path: | build/Release/*.tar.gz if-no-files-found: error + compression-level: '0' From d686fc91a9c1c706c326f37fd83c4bf36151cc75 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 22:16:52 +0400 Subject: [PATCH 23/53] Update workflow --- .github/workflows/mainline-compile.yml | 1 - .github/workflows/mainline-test.yml | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 1cdc9394..889fc3fe 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -46,4 +46,3 @@ jobs: path: | build/Release/*.tar.gz if-no-files-found: error - compression-level: '0' diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 65e33c6b..265d4a87 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -35,8 +35,11 @@ jobs: - name: Extract and run tarballs run: | for archive in artifacts/*.tar.gz; do - tar -xpf "$archive" -C / --overwrite + mkdir unpacked + unzip -q "$archive" -d unpacked + tar -xpf "unpacked/$archive" -C / --overwrite for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done + rm -rf unpacked done From 08b6bd293b5b00457ea64fef7db250b1fb936f96 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 22:27:04 +0400 Subject: [PATCH 24/53] Include unzip --- .github/docker/clang/Dockerfile | 2 +- .github/docker/gcc/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile b/.github/docker/clang/Dockerfile index e5709891..7e1aa0c1 100644 --- a/.github/docker/clang/Dockerfile +++ b/.github/docker/clang/Dockerfile @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential \ + build-essential unzip \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/docker/gcc/Dockerfile b/.github/docker/gcc/Dockerfile index ae75b9b3..91c13dd8 100644 --- a/.github/docker/gcc/Dockerfile +++ b/.github/docker/gcc/Dockerfile @@ -5,7 +5,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ build-essential gcc g++ \ - lld ninja-build sudo \ + lld ninja-build sudo unzip \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* From 94ffff64f60891dd395bcbcf13278fc0454ddb8e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 22:42:26 +0400 Subject: [PATCH 25/53] Fix workflow --- .github/workflows/mainline-test.yml | 7 +++++++ foreign/HPool | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 265d4a87..957d7be8 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -34,6 +34,13 @@ jobs: - name: Extract and run tarballs run: | + if [ "${{ matrix.image }}" == "debian:stable" ]; then + apt update && apt install unzip -y + elif [ "${{ matrix.image }}" == "fedora:latest" ]; then + dnf update -y && dnf install unzip -y + else + pacman -Sy --noconfirm && pacman -S unzip --noconfirm + fi for archive in artifacts/*.tar.gz; do mkdir unpacked unzip -q "$archive" -d unpacked diff --git a/foreign/HPool b/foreign/HPool index 6b165437..088d061a 160000 --- a/foreign/HPool +++ b/foreign/HPool @@ -1 +1 @@ -Subproject commit 6b1654378a084f4e7cc7324670543df86d03b7fa +Subproject commit 088d061abad93e31d17d102abf3720d678904f37 From e55807bddf7a7ad819dc7d03aac83eea76ec5f11 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 22:55:58 +0400 Subject: [PATCH 26/53] Fix workflow --- .github/workflows/mainline-test.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 957d7be8..71e3d71a 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -33,18 +33,21 @@ jobs: path: artifacts/ - name: Extract and run tarballs + shell: bash run: | - if [ "${{ matrix.image }}" == "debian:stable" ]; then + if [[ "${{ matrix.image }}" == "debian:stable" ]]; then apt update && apt install unzip -y - elif [ "${{ matrix.image }}" == "fedora:latest" ]; then + elif [[ "${{ matrix.image }}" == "fedora:latest" ]]; then dnf update -y && dnf install unzip -y else pacman -Sy --noconfirm && pacman -S unzip --noconfirm fi - for archive in artifacts/*.tar.gz; do - mkdir unpacked + for archive in artifacts/*.zip; do + mkdir -p unpacked unzip -q "$archive" -d unpacked - tar -xpf "unpacked/$archive" -C / --overwrite + for subarchive in unpacked/*; do + tar -xpf "$subarchive" -C / --overwrite + done for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done From 2d5e111931b2ded410707a0860200806775a7967 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 23:05:07 +0400 Subject: [PATCH 27/53] Fix workflow --- .github/workflows/mainline-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 71e3d71a..fdbc5c2c 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -42,6 +42,7 @@ jobs: else pacman -Sy --noconfirm && pacman -S unzip --noconfirm fi + ls -la artifacts for archive in artifacts/*.zip; do mkdir -p unpacked unzip -q "$archive" -d unpacked From 78930aabfb429053a5cb1ba2d3ae831cee25c0e6 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 23:14:34 +0400 Subject: [PATCH 28/53] Fix workflow --- .github/workflows/mainline-test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index fdbc5c2c..31895e2e 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -43,14 +43,9 @@ jobs: pacman -Sy --noconfirm && pacman -S unzip --noconfirm fi ls -la artifacts - for archive in artifacts/*.zip; do - mkdir -p unpacked - unzip -q "$archive" -d unpacked - for subarchive in unpacked/*; do - tar -xpf "$subarchive" -C / --overwrite - done + for archive in artifacts/*.tar.gz; do + tar -xpf "$archive" -C / --overwrite for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done - rm -rf unpacked done From 02d7796d90dd71ae69dd03bf9771d29a71b25e38 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 23:35:33 +0400 Subject: [PATCH 29/53] Fix workflow --- .github/workflows/mainline-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 31895e2e..408ec558 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -36,16 +36,18 @@ jobs: shell: bash run: | if [[ "${{ matrix.image }}" == "debian:stable" ]]; then - apt update && apt install unzip -y + apt update && apt install unzip file -y elif [[ "${{ matrix.image }}" == "fedora:latest" ]]; then dnf update -y && dnf install unzip -y else pacman -Sy --noconfirm && pacman -S unzip --noconfirm fi ls -la artifacts + file artifacts/*.tar.gz for archive in artifacts/*.tar.gz; do - tar -xpf "$archive" -C / --overwrite + tar -xpf "$subarchive" -C / --overwrite for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done + rm -rf unpacked done From 9166f7c957f57a089c99aabd29be12a4172d7599 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 6 Nov 2025 23:48:05 +0400 Subject: [PATCH 30/53] Fix workflow --- .github/workflows/mainline-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-test.yml b/.github/workflows/mainline-test.yml index 408ec558..70f9b402 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -45,7 +45,7 @@ jobs: ls -la artifacts file artifacts/*.tar.gz for archive in artifacts/*.tar.gz; do - tar -xpf "$subarchive" -C / --overwrite + tar -xpf "$archive" -C / --overwrite for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done From 6e66ac1507e5d1ba08f8051a47f66f121448d4af Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 13:12:35 +0400 Subject: [PATCH 31/53] Update workflow --- .github/docker/clang/Dockerfile-arch | 17 ++++++++++++++++ .../clang/{Dockerfile => Dockerfile-debian} | 0 .github/docker/clang/Dockerfile-fedora | 18 +++++++++++++++++ .github/docker/clang/Dockerfile-ubuntu | 17 ++++++++++++++++ .github/docker/gcc/Dockerfile-arch | 17 ++++++++++++++++ .github/docker/gcc/Dockerfile-debian | 17 ++++++++++++++++ .github/docker/gcc/Dockerfile-fedora | 18 +++++++++++++++++ .github/docker/gcc/Dockerfile-ubuntu | 17 ++++++++++++++++ .github/workflows/mainline-compile.yml | 16 +++++++-------- .github/workflows/mainline-prepare.yml | 20 ++++++++----------- .github/workflows/mainline.yml | 8 ++------ 11 files changed, 138 insertions(+), 27 deletions(-) create mode 100644 .github/docker/clang/Dockerfile-arch rename .github/docker/clang/{Dockerfile => Dockerfile-debian} (100%) create mode 100644 .github/docker/clang/Dockerfile-fedora create mode 100644 .github/docker/clang/Dockerfile-ubuntu create mode 100644 .github/docker/gcc/Dockerfile-arch create mode 100644 .github/docker/gcc/Dockerfile-debian create mode 100644 .github/docker/gcc/Dockerfile-fedora create mode 100644 .github/docker/gcc/Dockerfile-ubuntu diff --git a/.github/docker/clang/Dockerfile-arch b/.github/docker/clang/Dockerfile-arch new file mode 100644 index 00000000..3fde026c --- /dev/null +++ b/.github/docker/clang/Dockerfile-arch @@ -0,0 +1,17 @@ +FROM archlinux:latest + +ARG USER=ci + +RUN pacman -Syu --noconfirm \ + ca-certificates curl git \ + clang make unzip \ # Equivalent to build-essential, clang, etc. + ninja sudo python3 cmake \ + && rm -rf /var/cache/pacman/pkg/ + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/clang/Dockerfile b/.github/docker/clang/Dockerfile-debian similarity index 100% rename from .github/docker/clang/Dockerfile rename to .github/docker/clang/Dockerfile-debian diff --git a/.github/docker/clang/Dockerfile-fedora b/.github/docker/clang/Dockerfile-fedora new file mode 100644 index 00000000..a9a7a0c5 --- /dev/null +++ b/.github/docker/clang/Dockerfile-fedora @@ -0,0 +1,18 @@ +FROM fedora:latest + +ARG USER=ci + +RUN dnf update -y && dnf -y install \ + ca-certificates curl git \ + make g++ unzip \ + clang lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/cache/dnf/* + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/clang/Dockerfile-ubuntu b/.github/docker/clang/Dockerfile-ubuntu new file mode 100644 index 00000000..bd12ec03 --- /dev/null +++ b/.github/docker/clang/Dockerfile-ubuntu @@ -0,0 +1,17 @@ +FROM ubuntu:latest + +ARG USER=ci + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl git \ + build-essential unzip \ + clang lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/lib/apt/lists/* + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch new file mode 100644 index 00000000..96334c2d --- /dev/null +++ b/.github/docker/gcc/Dockerfile-arch @@ -0,0 +1,17 @@ +FROM archlinux:latest + +ARG USER=ci + +RUN pacman -Syu --noconfirm \ + ca-certificates curl git \ + gcc make unzip \ # Equivalent to build-essential, clang, etc. + ninja sudo python3 cmake \ + && rm -rf /var/cache/pacman/pkg/ + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-debian b/.github/docker/gcc/Dockerfile-debian new file mode 100644 index 00000000..5596561f --- /dev/null +++ b/.github/docker/gcc/Dockerfile-debian @@ -0,0 +1,17 @@ +FROM debian:latest + +ARG USER=ci + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl git \ + build-essential unzip \ + gcc lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/lib/apt/lists/* + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora new file mode 100644 index 00000000..a84f119e --- /dev/null +++ b/.github/docker/gcc/Dockerfile-fedora @@ -0,0 +1,18 @@ +FROM fedora:latest + +ARG USER=ci + +RUN dnf update -y && dnf -y install \ + ca-certificates curl git \ + make g++ unzip \ + gcc lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/cache/dnf/* + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-ubuntu b/.github/docker/gcc/Dockerfile-ubuntu new file mode 100644 index 00000000..92028400 --- /dev/null +++ b/.github/docker/gcc/Dockerfile-ubuntu @@ -0,0 +1,17 @@ +FROM ubuntu:latest + +ARG USER=ci + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl git \ + build-essential unzip \ + gcc lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/lib/apt/lists/* + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 889fc3fe..f42b4e6d 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -5,10 +5,10 @@ on: jobs: testing: - name: Compile (${{ matrix.compiler }}) + name: Compile (${{ matrix.compiler }} on ${{ matrix.distribution }}) runs-on: ubuntu-latest container: - image: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}:latest + image: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}-${{ matrix.distribution }}:latest options: --init permissions: contents: read @@ -18,6 +18,7 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] + distribution: [debian, ubuntu, fedora, arch] steps: - name: Checkout code @@ -39,10 +40,7 @@ jobs: sudo -u ci cmake --build build/Release -j$(nproc) sudo -u ci cmake --build build/Release --target package - - name: Upload package tarball - uses: actions/upload-artifact@v4 - with: - name: hcpu-tarballs-${{ matrix.compiler }} - path: | - build/Release/*.tar.gz - if-no-files-found: error + - name: Run all tests + run: | + sudo -u ci build/Release/tests/Integration/integration-tests + sudo -u ci build/Release/tests/Modular/modular-tests \ No newline at end of file diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index 549a35da..c4c032f1 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -10,6 +10,12 @@ jobs: contents: read packages: write + strategy: + fail-fast: false + matrix: + compiler: [ gcc, clang ] + distribution: [ ubuntu, debian, fedora, arch ] + steps: - name: Checkout uses: actions/checkout@v5 @@ -28,18 +34,8 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: .github/docker/clang/Dockerfile - push: true - tags: ghcr.io/hypercpu-project/hypercpu-builder-clang:latest - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Build and push gcc image - uses: docker/build-push-action@v6 - with: - context: . - file: .github/docker/gcc/Dockerfile + file: .github/docker/${{ matrix.compiler }}/Dockerfile-${{ matrix.distribution }} push: true - tags: ghcr.io/hypercpu-project/hypercpu-builder-gcc:latest + tags: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}-${{ matrix.distribution }}:latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/mainline.yml b/.github/workflows/mainline.yml index ababaf32..fe1f6cd5 100644 --- a/.github/workflows/mainline.yml +++ b/.github/workflows/mainline.yml @@ -11,7 +11,7 @@ jobs: prepare: uses: ./.github/workflows/mainline-prepare.yml - package: + compile: needs: prepare uses: ./.github/workflows/mainline-compile.yml @@ -21,8 +21,4 @@ jobs: lint: needs: prepare - uses: ./.github/workflows/mainline-lint.yml - - tests: - needs: package - uses: ./.github/workflows/mainline-test.yml \ No newline at end of file + uses: ./.github/workflows/mainline-lint.yml \ No newline at end of file From 5610af0482ca901020fede6fc55c8955d2755a5e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 14:59:35 +0400 Subject: [PATCH 32/53] Fix workflow --- .github/docker/clang/Dockerfile-arch | 2 +- .github/docker/gcc/Dockerfile-arch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile-arch b/.github/docker/clang/Dockerfile-arch index 3fde026c..541706af 100644 --- a/.github/docker/clang/Dockerfile-arch +++ b/.github/docker/clang/Dockerfile-arch @@ -4,7 +4,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ - clang make unzip \ # Equivalent to build-essential, clang, etc. + clang make unzip \ ninja sudo python3 cmake \ && rm -rf /var/cache/pacman/pkg/ diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index 96334c2d..1343c357 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -4,7 +4,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ - gcc make unzip \ # Equivalent to build-essential, clang, etc. + gcc make unzip \ ninja sudo python3 cmake \ && rm -rf /var/cache/pacman/pkg/ From 35421cfd358833eecc67a2bce89f8a24a93472ae Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 15:02:29 +0400 Subject: [PATCH 33/53] Add pip --- .github/docker/clang/Dockerfile-arch | 2 +- .github/docker/gcc/Dockerfile-arch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile-arch b/.github/docker/clang/Dockerfile-arch index 541706af..efc320c9 100644 --- a/.github/docker/clang/Dockerfile-arch +++ b/.github/docker/clang/Dockerfile-arch @@ -5,7 +5,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ clang make unzip \ - ninja sudo python3 cmake \ + ninja sudo python3 python3-pip cmake \ && rm -rf /var/cache/pacman/pkg/ diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index 1343c357..e2dad1b6 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -5,7 +5,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ gcc make unzip \ - ninja sudo python3 cmake \ + ninja sudo python3 python3-pip cmake \ && rm -rf /var/cache/pacman/pkg/ From 75e72e10d5c94d9b761df0320fffec55b7f83af9 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 15:05:16 +0400 Subject: [PATCH 34/53] Add pip --- .github/docker/clang/Dockerfile-arch | 2 +- .github/docker/gcc/Dockerfile | 17 ----------------- .github/docker/gcc/Dockerfile-arch | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 .github/docker/gcc/Dockerfile diff --git a/.github/docker/clang/Dockerfile-arch b/.github/docker/clang/Dockerfile-arch index efc320c9..16f1694d 100644 --- a/.github/docker/clang/Dockerfile-arch +++ b/.github/docker/clang/Dockerfile-arch @@ -5,7 +5,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ clang make unzip \ - ninja sudo python3 python3-pip cmake \ + ninja sudo python3 python-pip cmake \ && rm -rf /var/cache/pacman/pkg/ diff --git a/.github/docker/gcc/Dockerfile b/.github/docker/gcc/Dockerfile deleted file mode 100644 index 91c13dd8..00000000 --- a/.github/docker/gcc/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM debian:latest - -ARG USER=ci - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl git \ - build-essential gcc g++ \ - lld ninja-build sudo unzip \ - python3 python3-pip cmake \ - && rm -rf /var/lib/apt/lists/* - -RUN pip install conan --break-system-packages - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index e2dad1b6..f8e28b3a 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -5,7 +5,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ gcc make unzip \ - ninja sudo python3 python3-pip cmake \ + ninja sudo python3 python-pip cmake \ && rm -rf /var/cache/pacman/pkg/ From a8a66f7075aead13df5c513e8d7d36f151fa83a4 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 15:11:33 +0400 Subject: [PATCH 35/53] Add libasan --- .github/docker/clang/Dockerfile-fedora | 2 +- .github/docker/gcc/Dockerfile-fedora | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile-fedora b/.github/docker/clang/Dockerfile-fedora index a9a7a0c5..e7f500f2 100644 --- a/.github/docker/clang/Dockerfile-fedora +++ b/.github/docker/clang/Dockerfile-fedora @@ -4,7 +4,7 @@ ARG USER=ci RUN dnf update -y && dnf -y install \ ca-certificates curl git \ - make g++ unzip \ + make g++ unzip libasan \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/cache/dnf/* diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora index a84f119e..baa99a6c 100644 --- a/.github/docker/gcc/Dockerfile-fedora +++ b/.github/docker/gcc/Dockerfile-fedora @@ -4,7 +4,7 @@ ARG USER=ci RUN dnf update -y && dnf -y install \ ca-certificates curl git \ - make g++ unzip \ + make g++ unzip libasan \ gcc lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/cache/dnf/* From 1017791bd1659b4e93c39cc90cbaf4befe42d340 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 15:17:22 +0400 Subject: [PATCH 36/53] Add libubsan --- .github/docker/clang/Dockerfile-fedora | 2 +- .github/docker/gcc/Dockerfile-fedora | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile-fedora b/.github/docker/clang/Dockerfile-fedora index e7f500f2..7872598a 100644 --- a/.github/docker/clang/Dockerfile-fedora +++ b/.github/docker/clang/Dockerfile-fedora @@ -4,7 +4,7 @@ ARG USER=ci RUN dnf update -y && dnf -y install \ ca-certificates curl git \ - make g++ unzip libasan \ + make g++ unzip libasan libubsan \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/cache/dnf/* diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora index baa99a6c..9ecfe8ef 100644 --- a/.github/docker/gcc/Dockerfile-fedora +++ b/.github/docker/gcc/Dockerfile-fedora @@ -4,7 +4,7 @@ ARG USER=ci RUN dnf update -y && dnf -y install \ ca-certificates curl git \ - make g++ unzip libasan \ + make g++ unzip libasan libubsan \ gcc lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/cache/dnf/* From 5687957b99abcae66212ff2bfd8b51e578cb01d3 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 15:41:24 +0400 Subject: [PATCH 37/53] Update workflow --- .github/docker/gcc/Dockerfile-arch | 2 +- .github/docker/gcc/Dockerfile-debian | 2 +- .github/docker/gcc/Dockerfile-fedora | 2 +- .github/docker/gcc/Dockerfile-ubuntu | 2 +- .github/workflows/mainline-compile.yml | 9 +++++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index f8e28b3a..16b6826c 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -4,7 +4,7 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ - gcc make unzip \ + gcc make unzip clang-format \ ninja sudo python3 python-pip cmake \ && rm -rf /var/cache/pacman/pkg/ diff --git a/.github/docker/gcc/Dockerfile-debian b/.github/docker/gcc/Dockerfile-debian index 5596561f..f709f3e8 100644 --- a/.github/docker/gcc/Dockerfile-debian +++ b/.github/docker/gcc/Dockerfile-debian @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential unzip \ + build-essential unzip clang-format \ gcc lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora index 9ecfe8ef..23674e3b 100644 --- a/.github/docker/gcc/Dockerfile-fedora +++ b/.github/docker/gcc/Dockerfile-fedora @@ -5,7 +5,7 @@ ARG USER=ci RUN dnf update -y && dnf -y install \ ca-certificates curl git \ make g++ unzip libasan libubsan \ - gcc lld ninja-build sudo \ + gcc lld ninja-build sudo clang-format \ python3 python3-pip cmake \ && rm -rf /var/cache/dnf/* diff --git a/.github/docker/gcc/Dockerfile-ubuntu b/.github/docker/gcc/Dockerfile-ubuntu index 92028400..36b2a664 100644 --- a/.github/docker/gcc/Dockerfile-ubuntu +++ b/.github/docker/gcc/Dockerfile-ubuntu @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential unzip \ + build-essential unzip clang-format \ gcc lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index f42b4e6d..7e5df305 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -19,6 +19,7 @@ jobs: matrix: compiler: [gcc, clang] distribution: [debian, ubuntu, fedora, arch] + build-type: [Release, Debug] steps: - name: Checkout code @@ -35,8 +36,12 @@ jobs: - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | - sudo -u ci conan install . --build=missing - sudo -u ci cmake --preset conan-release -DINSTALL_TESTS=1 + sudo -u ci conan install . --build=missing -s build_type=${{ matrix.build_type }} + if [[ "${{ matrix.build_type }}" = "Release" ]]; then + sudo -u ci cmake --preset conan-release -DINSTALL_TESTS=1 + else + sudo -u ci cmake --preset conan-debug -DINSTALL_TESTS=1 + fi sudo -u ci cmake --build build/Release -j$(nproc) sudo -u ci cmake --build build/Release --target package From 84bafae3be4403015484c0f0da4d3d430cf36db5 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 17:49:16 +0400 Subject: [PATCH 38/53] Fix workflow --- .github/docker/gcc/Dockerfile-arch | 5 ++++- CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index 16b6826c..607fe23e 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -4,10 +4,13 @@ ARG USER=ci RUN pacman -Syu --noconfirm \ ca-certificates curl git \ - gcc make unzip clang-format \ + base-devel make unzip \ ninja sudo python3 python-pip cmake \ && rm -rf /var/cache/pacman/pkg/ +RUN git clone https://aur.archlinux.org/clang-format-static-bin.git \ + cd clang-format-static-bin \ + makepkg -si --noconfirm RUN pip install conan --break-system-packages diff --git a/CMakeLists.txt b/CMakeLists.txt index d95a5d13..21fa215d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,3 +37,18 @@ endif() add_subdirectory(src) add_subdirectory(tests) + +# Find formatters +find_program(CLANG_FORMAT NAMES clang-format REQUIRED) + +# Collect source files (customize as needed) +file(GLOB_RECURSE CPP_SOURCES CONFIGURE_DEPENDS + src/**.cpp src/**.hpp tests/**.cpp tests/**.hpp +) + +# Create formatting target +add_custom_target(format + COMMAND ${CLANG_FORMAT} -i ${CPP_SOURCES} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Formatting code with clang-format and cmake-format" +) \ No newline at end of file From 22ea4f470f8a19912f5882ce1edd2de242670221 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 19:55:43 +0400 Subject: [PATCH 39/53] Fix workflow --- .github/docker/gcc/Dockerfile-arch | 4 ++-- .github/workflows/mainline-format.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch index 607fe23e..9bb02352 100644 --- a/.github/docker/gcc/Dockerfile-arch +++ b/.github/docker/gcc/Dockerfile-arch @@ -9,8 +9,8 @@ RUN pacman -Syu --noconfirm \ && rm -rf /var/cache/pacman/pkg/ RUN git clone https://aur.archlinux.org/clang-format-static-bin.git \ - cd clang-format-static-bin \ - makepkg -si --noconfirm + && cd clang-format-static-bin \ + && makepkg -si --noconfirm RUN pip install conan --break-system-packages diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index 78871257..cb37c506 100644 --- a/.github/workflows/mainline-format.yml +++ b/.github/workflows/mainline-format.yml @@ -21,7 +21,7 @@ jobs: run: chown -R ci:ci "$GITHUB_WORKSPACE" - name: Run formatters - run: sudo -u ci bazelisk run :format + run: sudo -u ci cmake --build - name: Check diff run: sudo -u ci git diff --quiet From cad4b818352f520155b72950f56b0d160fc93d86 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 19:59:09 +0400 Subject: [PATCH 40/53] Fix workflow --- .github/docker/clang/Dockerfile-arch | 17 ----------------- .github/docker/gcc/Dockerfile-arch | 20 -------------------- .github/workflows/mainline-compile.yml | 2 +- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 .github/docker/clang/Dockerfile-arch delete mode 100644 .github/docker/gcc/Dockerfile-arch diff --git a/.github/docker/clang/Dockerfile-arch b/.github/docker/clang/Dockerfile-arch deleted file mode 100644 index 16f1694d..00000000 --- a/.github/docker/clang/Dockerfile-arch +++ /dev/null @@ -1,17 +0,0 @@ -FROM archlinux:latest - -ARG USER=ci - -RUN pacman -Syu --noconfirm \ - ca-certificates curl git \ - clang make unzip \ - ninja sudo python3 python-pip cmake \ - && rm -rf /var/cache/pacman/pkg/ - - -RUN pip install conan --break-system-packages - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-arch b/.github/docker/gcc/Dockerfile-arch deleted file mode 100644 index 9bb02352..00000000 --- a/.github/docker/gcc/Dockerfile-arch +++ /dev/null @@ -1,20 +0,0 @@ -FROM archlinux:latest - -ARG USER=ci - -RUN pacman -Syu --noconfirm \ - ca-certificates curl git \ - base-devel make unzip \ - ninja sudo python3 python-pip cmake \ - && rm -rf /var/cache/pacman/pkg/ - -RUN git clone https://aur.archlinux.org/clang-format-static-bin.git \ - && cd clang-format-static-bin \ - && makepkg -si --noconfirm - -RUN pip install conan --break-system-packages - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 7e5df305..f1cc15e2 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] - distribution: [debian, ubuntu, fedora, arch] + distribution: [debian, ubuntu, fedora] build-type: [Release, Debug] steps: From 3d2c849588adc185296096ce8fc352b72a481a7d Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 21:59:36 +0400 Subject: [PATCH 41/53] Fix workflow --- .github/workflows/mainline-prepare.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index c4c032f1..0ca79bbe 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: compiler: [ gcc, clang ] - distribution: [ ubuntu, debian, fedora, arch ] + distribution: [ ubuntu, debian, fedora ] steps: - name: Checkout From 6dbc131ef8b6847329a702e8bfa3a96a829e9fa0 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 22:03:04 +0400 Subject: [PATCH 42/53] Fix workflow --- .github/workflows/mainline-compile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index f1cc15e2..c7b55f91 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -36,8 +36,8 @@ jobs: - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | - sudo -u ci conan install . --build=missing -s build_type=${{ matrix.build_type }} - if [[ "${{ matrix.build_type }}" = "Release" ]]; then + sudo -u ci conan install . --build=missing -s build_type=${{ matrix.build-type }} + if [[ "${{ matrix.build-type }}" = "Release" ]]; then sudo -u ci cmake --preset conan-release -DINSTALL_TESTS=1 else sudo -u ci cmake --preset conan-debug -DINSTALL_TESTS=1 From 02ede640a10ec6307cf33460055b029bc9f95b82 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 23:20:20 +0400 Subject: [PATCH 43/53] Fix workflow --- .github/workflows/mainline-compile.yml | 2 +- .github/workflows/mainline-format.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index c7b55f91..7c34afb7 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -37,7 +37,7 @@ jobs: - name: Build project (Release, with ${{ matrix.compiler }} compiler) run: | sudo -u ci conan install . --build=missing -s build_type=${{ matrix.build-type }} - if [[ "${{ matrix.build-type }}" = "Release" ]]; then + if [ "${{ matrix.build-type }}" = "Release" ]; then sudo -u ci cmake --preset conan-release -DINSTALL_TESTS=1 else sudo -u ci cmake --preset conan-debug -DINSTALL_TESTS=1 diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index cb37c506..1862046b 100644 --- a/.github/workflows/mainline-format.yml +++ b/.github/workflows/mainline-format.yml @@ -21,7 +21,7 @@ jobs: run: chown -R ci:ci "$GITHUB_WORKSPACE" - name: Run formatters - run: sudo -u ci cmake --build + run: sudo -u ci cmake --build build/* --target format - name: Check diff run: sudo -u ci git diff --quiet From 6cc50eef369ac672ff3b49b41f7be8e58e60ca48 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 23:24:58 +0400 Subject: [PATCH 44/53] Fix workflow --- .github/workflows/mainline-compile.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 7c34afb7..32731572 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -42,10 +42,10 @@ jobs: else sudo -u ci cmake --preset conan-debug -DINSTALL_TESTS=1 fi - sudo -u ci cmake --build build/Release -j$(nproc) - sudo -u ci cmake --build build/Release --target package + sudo -u ci cmake --build build/${{ matrix.build-type }} -j$(nproc) + sudo -u ci cmake --build build/${{ matrix.build-type }} --target package - name: Run all tests run: | - sudo -u ci build/Release/tests/Integration/integration-tests - sudo -u ci build/Release/tests/Modular/modular-tests \ No newline at end of file + sudo -u ci build/${{ matrix.build-type }}/tests/Integration/integration-tests + sudo -u ci build/${{ matrix.build-type }}/tests/Modular/modular-tests \ No newline at end of file From 8b1a38cf793e867b575e6455b5613a1a3b9fe9bb Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 11 Nov 2025 23:26:29 +0400 Subject: [PATCH 45/53] Fix workflow --- .github/docker/clang/Dockerfile-fedora | 18 ------------------ .github/docker/gcc/Dockerfile-fedora | 18 ------------------ .github/workflows/mainline-compile.yml | 2 +- .github/workflows/mainline-prepare.yml | 2 +- 4 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 .github/docker/clang/Dockerfile-fedora delete mode 100644 .github/docker/gcc/Dockerfile-fedora diff --git a/.github/docker/clang/Dockerfile-fedora b/.github/docker/clang/Dockerfile-fedora deleted file mode 100644 index 7872598a..00000000 --- a/.github/docker/clang/Dockerfile-fedora +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:latest - -ARG USER=ci - -RUN dnf update -y && dnf -y install \ - ca-certificates curl git \ - make g++ unzip libasan libubsan \ - clang lld ninja-build sudo \ - python3 python3-pip cmake \ - && rm -rf /var/cache/dnf/* - - -RUN pip install conan --break-system-packages - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora deleted file mode 100644 index 23674e3b..00000000 --- a/.github/docker/gcc/Dockerfile-fedora +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:latest - -ARG USER=ci - -RUN dnf update -y && dnf -y install \ - ca-certificates curl git \ - make g++ unzip libasan libubsan \ - gcc lld ninja-build sudo clang-format \ - python3 python3-pip cmake \ - && rm -rf /var/cache/dnf/* - - -RUN pip install conan --break-system-packages - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 32731572..e9162ec4 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] - distribution: [debian, ubuntu, fedora] + distribution: [debian, ubuntu] build-type: [Release, Debug] steps: diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index 0ca79bbe..7b6d63e6 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: compiler: [ gcc, clang ] - distribution: [ ubuntu, debian, fedora ] + distribution: [ ubuntu, debian ] steps: - name: Checkout From 84993978165e5ed9388f216474cc4c8fceeea6f1 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 15:02:04 +0400 Subject: [PATCH 46/53] Revert "Fix workflow" This reverts commit 8b1a38cf793e867b575e6455b5613a1a3b9fe9bb. --- .github/docker/clang/Dockerfile-fedora | 18 ++++++++++++++++++ .github/docker/gcc/Dockerfile-fedora | 18 ++++++++++++++++++ .github/workflows/mainline-compile.yml | 2 +- .github/workflows/mainline-prepare.yml | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .github/docker/clang/Dockerfile-fedora create mode 100644 .github/docker/gcc/Dockerfile-fedora diff --git a/.github/docker/clang/Dockerfile-fedora b/.github/docker/clang/Dockerfile-fedora new file mode 100644 index 00000000..7872598a --- /dev/null +++ b/.github/docker/clang/Dockerfile-fedora @@ -0,0 +1,18 @@ +FROM fedora:latest + +ARG USER=ci + +RUN dnf update -y && dnf -y install \ + ca-certificates curl git \ + make g++ unzip libasan libubsan \ + clang lld ninja-build sudo \ + python3 python3-pip cmake \ + && rm -rf /var/cache/dnf/* + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/docker/gcc/Dockerfile-fedora b/.github/docker/gcc/Dockerfile-fedora new file mode 100644 index 00000000..23674e3b --- /dev/null +++ b/.github/docker/gcc/Dockerfile-fedora @@ -0,0 +1,18 @@ +FROM fedora:latest + +ARG USER=ci + +RUN dnf update -y && dnf -y install \ + ca-certificates curl git \ + make g++ unzip libasan libubsan \ + gcc lld ninja-build sudo clang-format \ + python3 python3-pip cmake \ + && rm -rf /var/cache/dnf/* + + +RUN pip install conan --break-system-packages + +RUN useradd -m ${USER} \ + && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers + +WORKDIR /home/${USER}/workspace diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index e9162ec4..32731572 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] - distribution: [debian, ubuntu] + distribution: [debian, ubuntu, fedora] build-type: [Release, Debug] steps: diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index 7b6d63e6..0ca79bbe 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: compiler: [ gcc, clang ] - distribution: [ ubuntu, debian ] + distribution: [ ubuntu, debian, fedora ] steps: - name: Checkout From 38e27a903b7c0174434f09ce2ba9483801de62ea Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 15:02:52 +0400 Subject: [PATCH 47/53] Update dependencies --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 709b8230..6c2ea33b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,7 +8,6 @@ class HyperCPU(ConanFile): settings = ["os", "compiler", "build_type", "arch"] author = "HyperCPU Project" requires = [ - "abseil/20240116.1", "gtest/1.14.0", "spdlog/1.15.0", "argparse/3.2", From 3272cd35373dbe13dc22ae192a1b7ca03becb3b1 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 15:23:54 +0400 Subject: [PATCH 48/53] Fix workflow --- .github/docker/clang/Dockerfile-debian | 2 +- .github/docker/clang/Dockerfile-ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker/clang/Dockerfile-debian b/.github/docker/clang/Dockerfile-debian index 7e1aa0c1..68aad7cb 100644 --- a/.github/docker/clang/Dockerfile-debian +++ b/.github/docker/clang/Dockerfile-debian @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential unzip \ + build-essential unzip clang-format \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/docker/clang/Dockerfile-ubuntu b/.github/docker/clang/Dockerfile-ubuntu index bd12ec03..0c9744db 100644 --- a/.github/docker/clang/Dockerfile-ubuntu +++ b/.github/docker/clang/Dockerfile-ubuntu @@ -4,7 +4,7 @@ ARG USER=ci RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl git \ - build-essential unzip \ + build-essential unzip clang-format \ clang lld ninja-build sudo \ python3 python3-pip cmake \ && rm -rf /var/lib/apt/lists/* From f2ed4d1fcdf72c94badb04e50099d9a92075ba90 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 16:42:30 +0400 Subject: [PATCH 49/53] Disable fedora --- .github/workflows/mainline-compile.yml | 2 +- .github/workflows/mainline-prepare.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-compile.yml b/.github/workflows/mainline-compile.yml index 32731572..e9162ec4 100644 --- a/.github/workflows/mainline-compile.yml +++ b/.github/workflows/mainline-compile.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] - distribution: [debian, ubuntu, fedora] + distribution: [debian, ubuntu] build-type: [Release, Debug] steps: diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index 0ca79bbe..7b6d63e6 100644 --- a/.github/workflows/mainline-prepare.yml +++ b/.github/workflows/mainline-prepare.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: compiler: [ gcc, clang ] - distribution: [ ubuntu, debian, fedora ] + distribution: [ ubuntu, debian ] steps: - name: Checkout From 6e230aca34f17ae8bf0074a972876c30f596d091 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 17:59:42 +0400 Subject: [PATCH 50/53] Fix workflow --- .github/workflows/mainline-format.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index 1862046b..5a674700 100644 --- a/.github/workflows/mainline-format.yml +++ b/.github/workflows/mainline-format.yml @@ -7,7 +7,7 @@ jobs: format: runs-on: ubuntu-latest container: - image: ghcr.io/hypercpu-project/hypercpu-builder:latest + image: ghcr.io/hypercpu-project/hypercpu-builder-gcc-debian:latest options: --init permissions: contents: read @@ -21,7 +21,10 @@ jobs: run: chown -R ci:ci "$GITHUB_WORKSPACE" - name: Run formatters - run: sudo -u ci cmake --build build/* --target format + run: | + sudo -u ci conan profile detect + sudo -u ci conan install . --build=missing + sudo -u ci cmake --build build/Release --target format - name: Check diff run: sudo -u ci git diff --quiet From 822abb9c774328e510996f40733baa7d0ad15b6e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 18:03:59 +0400 Subject: [PATCH 51/53] Fix workflow --- .github/workflows/mainline-format.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index 5a674700..f5cc1328 100644 --- a/.github/workflows/mainline-format.yml +++ b/.github/workflows/mainline-format.yml @@ -24,6 +24,7 @@ jobs: run: | sudo -u ci conan profile detect sudo -u ci conan install . --build=missing + sudo -u ci cmake --preset conan-release sudo -u ci cmake --build build/Release --target format - name: Check diff From 8257387ef61c84b492f4efe3a60a981924363a20 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 18:08:40 +0400 Subject: [PATCH 52/53] Fix workflow --- .github/workflows/mainline-format.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index f5cc1328..fdc6d75f 100644 --- a/.github/workflows/mainline-format.yml +++ b/.github/workflows/mainline-format.yml @@ -16,6 +16,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v5 + with: + submodules: true - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" From c94e196ae4f5d735b88f60b649caad901022ae89 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 12 Nov 2025 18:18:29 +0400 Subject: [PATCH 53/53] Apply formatting --- src/Assembler/Core/Compiler.cpp | 6 +++--- src/Assembler/Main.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Assembler/Core/Compiler.cpp b/src/Assembler/Core/Compiler.cpp index 7cef5bbf..8a959bf9 100644 --- a/src/Assembler/Core/Compiler.cpp +++ b/src/Assembler/Core/Compiler.cpp @@ -427,9 +427,9 @@ std::string_view HCAsm::FindLine(const pog::LineSpecialization& line_spec, const auto line = FindLine(err_token.line_spec, parser.get_top_file()); spdlog::debug(fmt::format("{} | {}", err_token.line_spec.line, line)); spdlog::debug(fmt::format("{:<{}} | {:<{}}{}", - "", std::to_string(err_token.line_spec.line).length(), - "", err_token.line_spec.offset, - std::string(err_token.line_spec.length, '^'))); + "", std::to_string(err_token.line_spec.line).length(), + "", err_token.line_spec.offset, + std::string(err_token.line_spec.length, '^'))); HyperCPU::exit(1); } diff --git a/src/Assembler/Main.cpp b/src/Assembler/Main.cpp index 3bc010ce..a393d547 100644 --- a/src/Assembler/Main.cpp +++ b/src/Assembler/Main.cpp @@ -1,7 +1,7 @@ +#include "fmt/format.h" #include #include #include -#include "fmt/format.h" #include "Assembler/Core/Compiler.hpp" #include "Common/NotImplemented.hpp"