diff --git a/.github/Dockerfile b/.github/Dockerfile deleted file mode 100644 index 9dc0cbed..00000000 --- a/.github/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -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 - -RUN useradd -m ${USER} \ - && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -WORKDIR /home/${USER}/workspace diff --git a/.github/docker/clang/Dockerfile-debian b/.github/docker/clang/Dockerfile-debian new file mode 100644 index 00000000..68aad7cb --- /dev/null +++ b/.github/docker/clang/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 clang-format \ + 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/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/clang/Dockerfile-ubuntu b/.github/docker/clang/Dockerfile-ubuntu new file mode 100644 index 00000000..0c9744db --- /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-format \ + 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-debian b/.github/docker/gcc/Dockerfile-debian new file mode 100644 index 00000000..f709f3e8 --- /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 clang-format \ + 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..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/docker/gcc/Dockerfile-ubuntu b/.github/docker/gcc/Dockerfile-ubuntu new file mode 100644 index 00000000..36b2a664 --- /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 clang-format \ + 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 01694790..e9162ec4 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:latest + image: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}-${{ matrix.distribution }}:latest options: --init permissions: contents: read @@ -18,6 +18,8 @@ jobs: fail-fast: false matrix: compiler: [gcc, clang] + distribution: [debian, ubuntu] + build-type: [Release, Debug] steps: - name: Checkout code @@ -26,27 +28,24 @@ 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: Install dependencies with Conan + run: sudo -u ci conan profile detect + - 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: 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 - if-no-files-found: error + - 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 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/${{ 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/${{ matrix.build-type }}/tests/Integration/integration-tests + sudo -u ci build/${{ matrix.build-type }}/tests/Modular/modular-tests \ No newline at end of file diff --git a/.github/workflows/mainline-format.yml b/.github/workflows/mainline-format.yml index 78871257..fdc6d75f 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 @@ -16,12 +16,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v5 + with: + submodules: true - name: Fix permissions run: chown -R ci:ci "$GITHUB_WORKSPACE" - name: Run formatters - run: sudo -u ci bazelisk run :format + 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 run: sudo -u ci git diff --quiet diff --git a/.github/workflows/mainline-prepare.yml b/.github/workflows/mainline-prepare.yml index ec6535b6..7b6d63e6 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 ] + steps: - name: Checkout uses: actions/checkout@v5 @@ -24,12 +30,12 @@ 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/${{ matrix.compiler }}/Dockerfile-${{ matrix.distribution }} push: true - tags: ghcr.io/hypercpu-project/hypercpu-builder: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-test.yml b/.github/workflows/mainline-test.yml index 65e33c6b..70f9b402 100644 --- a/.github/workflows/mainline-test.yml +++ b/.github/workflows/mainline-test.yml @@ -33,10 +33,21 @@ jobs: path: artifacts/ - name: Extract and run tarballs + shell: bash run: | + if [[ "${{ matrix.image }}" == "debian:stable" ]]; then + 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 for f in /opt/hcpu/tests/*; do [ -f "$f" ] && [ -x "$f" ] && "$f" done + rm -rf unpacked done 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 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..21fa215d --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,54 @@ +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) +find_package(eternal REQUIRED) +find_package(spdlog REQUIRED) +find_package(fmt REQUIRED) +find_package(re2 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) + +# 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 diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 00000000..6c2ea33b --- /dev/null +++ b/conanfile.py @@ -0,0 +1,21 @@ +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", + "re2/20250722" + ] + generators = ["CMakeToolchain", "CMakeDeps"] + + def layout(self) -> None: + cmake_layout(self) 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 diff --git a/src/Assembler/CMakeLists.txt b/src/Assembler/CMakeLists.txt new file mode 100644 index 00000000..50e52132 --- /dev/null +++ b/src/Assembler/CMakeLists.txt @@ -0,0 +1,22 @@ +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 + argparse::argparse + hcpu-common +) + +add_executable(hcasm + Main.cpp +) +target_link_libraries(hcasm PUBLIC + hcasm-core +) diff --git a/src/Assembler/Core/Compiler.cpp b/src/Assembler/Core/Compiler.cpp index a0bcb9dd..8a959bf9 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("{:<{}} | {:<{}}{}", - "", std::to_string(err_token.line_spec.line).length(), - "", err_token.line_spec.offset, - std::string(err_token.line_spec.length, '^')); + 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, '^'))); HyperCPU::exit(1); } diff --git a/src/Assembler/Main.cpp b/src/Assembler/Main.cpp index 1ad3d217..a393d547 100644 --- a/src/Assembler/Main.cpp +++ b/src/Assembler/Main.cpp @@ -1,3 +1,4 @@ +#include "fmt/format.h" #include #include #include @@ -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/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..32f092c9 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +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/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 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 new file mode 100644 index 00000000..0dbeda55 --- /dev/null +++ b/src/Pog/CMakeLists.txt @@ -0,0 +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..ea91c3ae --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,16 @@ +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) + +if (DEFINED INSTALL_TESTS) + install( + TARGETS + integration-tests + modular-tests + DESTINATION + opt/hcpu/tests + ) +endif() \ No newline at end of file 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/CMakeLists.txt b/tests/Integration/CMakeLists.txt new file mode 100644 index 00000000..747727ee --- /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}) 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/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 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"