From 921412abe98e0e0c64fb2ff462aacaf012ae78f6 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Thu, 3 Apr 2025 20:43:13 +0400 Subject: [PATCH 1/5] Improving error handling --- cmake/Variables.cmake | 2 +- src/Emulator/Core/CPU/CPU.cpp | 4 + src/Emulator/Core/CPU/CPU.hpp | 6 +- src/Emulator/Core/CPU/Util.hpp | 9 +++ src/Emulator/Main/ExceptionHandling.cpp | 10 +++ src/Emulator/Main/ExceptionHandling.hpp | 10 +++ src/Emulator/Main/Main.cpp | 2 +- src/NotImplemented.hpp | 3 +- .../EmulatorCore/MemoryControllers/ST.cpp | 78 ++++++++++--------- 9 files changed, 82 insertions(+), 42 deletions(-) create mode 100644 src/Emulator/Core/CPU/Util.hpp create mode 100644 src/Emulator/Main/ExceptionHandling.cpp create mode 100644 src/Emulator/Main/ExceptionHandling.hpp diff --git a/cmake/Variables.cmake b/cmake/Variables.cmake index 01f0aec8..a6f3b6b3 100644 --- a/cmake/Variables.cmake +++ b/cmake/Variables.cmake @@ -3,5 +3,5 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(LTO_FLAG "-flto") endif() -set(DEBUG_COMPILE_FLAGS -Wall -Wextra -Werror -Wno-pointer-arith -O0 -ggdb3 -Wno-unused-const-variable -Wno-missing-field-initializers -Wno-stringop-overflow -Wno-unknown-warning-option) +set(DEBUG_COMPILE_FLAGS -Wall -Wextra -Werror -Wno-pointer-arith -O0 -ggdb3 -Wno-unused-const-variable -Wno-missing-field-initializers -Wno-stringop-overflow -Wno-unknown-warning-option -D__HCPU_DEBUG) set(FAST_COMPILE_FLAGS -Wall -Wextra -Werror -Wno-pointer-arith -O3 -Wno-unused-const-variable -Wno-missing-field-initializers -Wno-stringop-overflow -Wno-unknown-warning-option) diff --git a/src/Emulator/Core/CPU/CPU.cpp b/src/Emulator/Core/CPU/CPU.cpp index a979e7e5..1e22176e 100644 --- a/src/Emulator/Core/CPU/CPU.cpp +++ b/src/Emulator/Core/CPU/CPU.cpp @@ -278,3 +278,7 @@ bool HyperCPU::CPU::CanExecuteInterrupts() { void HyperCPU::CPU::SetEntryPoint(std::uint32_t entry_point) { *xip = entry_point; } + +const HyperCPU::Logger& HyperCPU::CPU::GetLogger() const noexcept { + return logger; +} \ No newline at end of file diff --git a/src/Emulator/Core/CPU/CPU.hpp b/src/Emulator/Core/CPU/CPU.hpp index 01c30869..4c0f925d 100644 --- a/src/Emulator/Core/CPU/CPU.hpp +++ b/src/Emulator/Core/CPU/CPU.hpp @@ -14,7 +14,6 @@ #include #include - #define DECLARE_INSTR(name) void Exec##name(const IInstruction& instr, void* op1, void* op2) namespace HyperCPU { @@ -34,7 +33,7 @@ namespace HyperCPU { std::unique_ptr m_decoder; // Data - HyperCPU::Logger logger; + const HyperCPU::Logger& logger; std::size_t core_count; std::size_t total_mem; bool halted; @@ -126,12 +125,13 @@ namespace HyperCPU { std::unique_ptr io_ctl; public: - explicit CPU(std::size_t core_count, std::size_t mem_size, char* binary = nullptr, std::uint64_t binary_size = 0); + CPU(std::size_t core_count, std::size_t mem_size, const HyperCPU::Logger& logger, char* binary = nullptr, std::uint64_t binary_size = 0); void Run(); bool CanExecuteInterrupts(); void SetEntryPoint(std::uint32_t entry_point); + const HyperCPU::Logger& GetLogger() const noexcept; ~CPU(); }; diff --git a/src/Emulator/Core/CPU/Util.hpp b/src/Emulator/Core/CPU/Util.hpp new file mode 100644 index 00000000..8c443d77 --- /dev/null +++ b/src/Emulator/Core/CPU/Util.hpp @@ -0,0 +1,9 @@ +#pragma once + +#ifdef __HCPU_DEBUG +# define UNREACHABLE() std::abort() +# define EXIT(code) std::abort() +#else +# define UNREACHABLE() __builtin_unreachable() +# define EXIT(code) std::exit(code) +#endif \ No newline at end of file diff --git a/src/Emulator/Main/ExceptionHandling.cpp b/src/Emulator/Main/ExceptionHandling.cpp new file mode 100644 index 00000000..e57bc395 --- /dev/null +++ b/src/Emulator/Main/ExceptionHandling.cpp @@ -0,0 +1,10 @@ +#include "Logger/Logger.hpp" +#include
+ +#include +#include + +[[noreturn]] void HyperCPU::ThrowError(CPU* cpu, std::string message) { + cpu->GetLogger().Log(HyperCPU::LogLevel::ERROR, message); + EXIT(1); +} \ No newline at end of file diff --git a/src/Emulator/Main/ExceptionHandling.hpp b/src/Emulator/Main/ExceptionHandling.hpp new file mode 100644 index 00000000..3e9e8537 --- /dev/null +++ b/src/Emulator/Main/ExceptionHandling.hpp @@ -0,0 +1,10 @@ +#pragma once + +#include + + +namespace HyperCPU { + class CPU; + + [[noreturn]] void ThrowError(CPU* cpu, std::string message); +} \ No newline at end of file diff --git a/src/Emulator/Main/Main.cpp b/src/Emulator/Main/Main.cpp index bdc13428..19dccf0c 100644 --- a/src/Emulator/Main/Main.cpp +++ b/src/Emulator/Main/Main.cpp @@ -83,7 +83,7 @@ int main(int argc, char** argv) { std::exit(1); } - HyperCPU::CPU cpu{1, memory, buf.get(), static_cast(binarysize )}; + HyperCPU::CPU cpu{1, memory, logger, buf.get(), static_cast(binarysize )}; cpu.SetEntryPoint(header.entry_point); cpu.Run(); diff --git a/src/NotImplemented.hpp b/src/NotImplemented.hpp index 079fd807..8d59d7d5 100644 --- a/src/NotImplemented.hpp +++ b/src/NotImplemented.hpp @@ -1,11 +1,12 @@ #pragma once +#include #include namespace HyperCPU { [[gnu::always_inline]] static inline void PrintUnsupported(std::string msg) { std::cerr << msg << '\n'; - std::exit(1); + EXIT(1); } } diff --git a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp index 600b4af9..d3f45834 100644 --- a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp +++ b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp @@ -11,6 +11,12 @@ static constexpr std::uint16_t WORD = 0x5555; static constexpr std::uint32_t DWORD = 0x55555555; static constexpr std::uint64_t QWORD = 0x5555555555555555; +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) HCPU_HCPU_ASSERT_EXIT(statement, x, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#endif + TEST_F(MC_ST_TEST, LOAD8) { for (std::size_t i = 0; i < MEM_FIXTURE_MEM_SIZE; ++i, ++counter) mcmt.Load8(counter, BYTE); @@ -94,133 +100,133 @@ TEST_F(MC_ST_TEST, READ64) { } TEST_F(MC_ST_FAILTEST, LOAD8) { - ASSERT_EXIT(mcmt.Load8(counter, BYTE), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Load8(counter, BYTE), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, LOAD16) { - ASSERT_EXIT(mcmt.Load16(counter, WORD), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Load16(counter, WORD), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, LOAD32) { - ASSERT_EXIT(mcmt.Load32(counter, DWORD), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Load32(counter, DWORD), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, LOAD64) { - ASSERT_EXIT(mcmt.Load64(counter, QWORD), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Load64(counter, QWORD), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, FETCH8) { - ASSERT_EXIT(mcmt.Fetch8(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Fetch8(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, FETCH16) { - ASSERT_EXIT(mcmt.Fetch16(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Fetch16(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, FETCH32) { - ASSERT_EXIT(mcmt.Fetch32(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Fetch32(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, FETCH64) { - ASSERT_EXIT(mcmt.Fetch64(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Fetch64(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, READ8) { - ASSERT_EXIT(mcmt.Read8(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Read8(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, READ16) { - ASSERT_EXIT(mcmt.Read16(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Read16(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, READ32) { - ASSERT_EXIT(mcmt.Read32(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Read32(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_FAILTEST, READ64) { - ASSERT_EXIT(mcmt.Read64(counter), ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT(mcmt.Read64(counter), ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD8) { counter = 1023; - ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::ExitedWithCode(0), ""); ++counter; - ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD16) { counter = 1022; - ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; - ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD32) { counter = 1020; - ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; - ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD64) { counter = 1016; - ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; - ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH8) { counter = 1023; - ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1024; - ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH16) { counter = 1022; - ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; - ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH32) { counter = 1020; - ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; - ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH64) { counter = 1016; - ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; - ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ8) { counter = 1023; - ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1024; - ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ16) { counter = 1022; - ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; - ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ32) { counter = 1020; - ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; - ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ64) { counter = 1016; - ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + HCPU_ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; - ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); + HCPU_ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } \ No newline at end of file From 094d7d73589fbc4a2b5e6b0ad1057101b28f497e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sun, 6 Apr 2025 21:59:50 +0400 Subject: [PATCH 2/5] Replace all std::exit/std::abort/HyperCPU::unreachable calls with preprocessor magic --- src/Assembler/Core/BinaryTransformer.cpp | 25 +++++++-------- src/Assembler/Core/BinaryTransformer.hpp | 7 ++--- src/Assembler/Core/Compiler.cpp | 31 +++++++++---------- src/Assembler/Core/Compiler.hpp | 7 +++-- src/Assembler/Main/Main.cpp | 13 ++++---- src/Emulator/Core/CPU/Decoders/StdDecoder.cpp | 10 +++--- .../Core/CPU/InstructionsImpl/LOIVT.cpp | 3 +- .../Core/CPU/InstructionsImpl/POP.cpp | 12 +++---- .../Core/CPU/InstructionsImpl/PUSH.cpp | 14 ++++----- .../Core/CPU/InstructionsImpl/READ.cpp | 9 +++--- .../Core/CPU/InstructionsImpl/WRITE.cpp | 8 ++--- .../Core/CPU/Interrupts/InterruptHandler.cpp | 10 +++--- src/Emulator/Core/CPU/OperandsEvaluation.cpp | 7 ++--- src/Emulator/Core/CPU/Util.hpp | 9 ------ .../MemoryController/IMemoryController.hpp | 2 +- src/Emulator/Main/Main.cpp | 23 +++++++------- src/Exit.hpp | 11 +++++++ src/Logger/Logger.hpp | 13 ++++---- test/Modular/EmulatorCore/CPUInit/CPUInit.cpp | 4 ++- .../EmulatorCore/MemoryControllers/ST.cpp | 2 +- test/fixtures.hpp | 15 ++++++--- 21 files changed, 121 insertions(+), 114 deletions(-) create mode 100644 src/Exit.hpp diff --git a/src/Assembler/Core/BinaryTransformer.cpp b/src/Assembler/Core/BinaryTransformer.cpp index 730abe62..55840af9 100644 --- a/src/Assembler/Core/BinaryTransformer.cpp +++ b/src/Assembler/Core/BinaryTransformer.cpp @@ -1,10 +1,9 @@ -#include "Emulator/Core/CPU/Instructions/Opcodes.hpp" -#include "Logger/Logger.hpp" +#include #include #include #include - -#include +#include +#include HyperCPU::OperandTypes HCAsm::BinaryTransformer::DetermineOperandTypes(Operand& op1, Operand& op2) { Op1T tp1; @@ -26,7 +25,7 @@ HyperCPU::OperandTypes HCAsm::BinaryTransformer::DetermineOperandTypes(Operand& case HCAsm::OperandType::none: tp1 = Op1T::NONE; break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } switch (op2.type) { @@ -45,7 +44,7 @@ HyperCPU::OperandTypes HCAsm::BinaryTransformer::DetermineOperandTypes(Operand& case HCAsm::OperandType::none: tp2 = Op2T::NONE; break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } return QuickCast(QuickOR(tp1, tp2)); @@ -69,7 +68,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { if (HasAddressAddition(instr.op1.type) && HasAddressAddition(instr.op2.type)) { logger.Log(HyperCPU::LogLevel::ERROR, "You can't use memory address additions for two operands!"); - std::exit(1); + EXIT(1); } else if (HasAddressAddition(instr.op1.type) || HasAddressAddition(instr.op2.type)) { encoded_operands |= 0b10000000; if (HasAddressAddition(instr.op2.type)) { @@ -107,7 +106,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { case HyperCPU::OperandTypes::RM_IMM: if (instr.op1.mode == HCAsm::Mode::none) { logger.Log(HyperCPU::LogLevel::ERROR, "Ambiguous operand size!"); - std::exit(1); + EXIT(1); } [[fallthrough]]; case HyperCPU::OperandTypes::R_R: @@ -120,7 +119,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { case HyperCPU::OperandTypes::IMM: if (instr.op1.mode == Mode::none) { logger.Log(HyperCPU::LogLevel::ERROR, "Undefined operand size!"); - std::exit(1); + EXIT(1); } md = instr.op1.mode; break; @@ -132,7 +131,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { md = HCAsm::Mode::b8; // Placeholder break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } encoded_operands |= (static_cast(md) << 4); encoded_operands |= static_cast(types); @@ -160,7 +159,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { case HCAsm::Mode::b32: res.push(static_cast(std::get(instr.op2.variant))); break; case HCAsm::Mode::b64: res.push(static_cast(std::get(instr.op2.variant))); break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } break; case HyperCPU::OperandTypes::R: @@ -176,7 +175,7 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { case HCAsm::Mode::b32: res.push(static_cast(std::get(instr.op1.variant))); break; case HCAsm::Mode::b64: res.push(static_cast(std::get(instr.op1.variant))); break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } break; case HyperCPU::OperandTypes::M_R: @@ -186,6 +185,6 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) { case HyperCPU::OperandTypes::NONE: break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/src/Assembler/Core/BinaryTransformer.hpp b/src/Assembler/Core/BinaryTransformer.hpp index ec8d2daa..509e3986 100644 --- a/src/Assembler/Core/BinaryTransformer.hpp +++ b/src/Assembler/Core/BinaryTransformer.hpp @@ -1,9 +1,8 @@ #pragma once -#include - #include #include +#include #include @@ -68,7 +67,7 @@ namespace HCAsm { case OperandTypes::NONE: return HyperCPU::OperandTypes::NONE; default: logger.Log(HyperCPU::LogLevel::ERROR, "Invalid operand types!"); - std::abort(); + EXIT(1); } } @@ -79,7 +78,7 @@ namespace HCAsm { case HCAsm::Mode::b32: return HyperCPU::Mode::b32; case HCAsm::Mode::b64: return HyperCPU::Mode::b64; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/src/Assembler/Core/Compiler.cpp b/src/Assembler/Core/Compiler.cpp index 86d085e1..c571c4ca 100644 --- a/src/Assembler/Core/Compiler.cpp +++ b/src/Assembler/Core/Compiler.cpp @@ -1,15 +1,15 @@ -#include "Emulator/Core/CPU/Instructions/Opcodes.hpp" -#include "pog/line_spec.h" #include #include #include -#include +#include #include +#include #include #include -#include +#include +#include #include @@ -181,8 +181,7 @@ constexpr inline std::uint8_t HCAsm::HCAsmCompiler::OperandSize(HCAsm::OperandTy case HCAsm::OperandType::uint: case HCAsm::OperandType::label: return 8; - default: std::abort(); - //default: std::unreachable(); + default: UNREACHABLE(); } } @@ -200,7 +199,7 @@ std::uint8_t HCAsm::HCAsmCompiler::ModeToSize(const Operand& op) { case Mode::b64: return 8; default: - std::abort(); + ABORT(); } } @@ -216,7 +215,7 @@ std::uint8_t HCAsm::HCAsmCompiler::ModeToSize(Mode md) { case Mode::b64: return 8; default: - std::abort(); + ABORT(); } } @@ -254,7 +253,7 @@ std::uint8_t HCAsm::HCAsmCompiler::InstructionSize(HCAsm::Instruction& instr) { result += 1; break; default: - std::abort(); + ABORT(); } break; case OperandType::mem_reg_add_int: @@ -279,7 +278,7 @@ std::uint8_t HCAsm::HCAsmCompiler::InstructionSize(HCAsm::Instruction& instr) { result += 10; break; default: - std::abort(); + ABORT(); } break; case OperandType::sint: @@ -301,7 +300,7 @@ std::uint8_t HCAsm::HCAsmCompiler::InstructionSize(HCAsm::Instruction& instr) { ++result; break; default: - std::abort(); + ABORT(); } break; case OperandType::label: @@ -310,7 +309,7 @@ std::uint8_t HCAsm::HCAsmCompiler::InstructionSize(HCAsm::Instruction& instr) { case OperandType::none: break; default: - std::abort(); + ABORT(); } return result; @@ -346,7 +345,7 @@ HCAsm::BinaryResult HCAsm::HCAsmCompiler::TransformToBinary(HCAsm::CompilerState case Mode::b64: return 8; default: - std::abort(); + ABORT(); } }(); }); @@ -374,7 +373,7 @@ HCAsm::BinaryResult HCAsm::HCAsmCompiler::TransformToBinary(HCAsm::CompilerState BinaryResult binary = { new unsigned char[ir.code_size] }; if (!binary.binary) { logger.Log(LogLevel::ERROR, "Failed to allocate memory for binary data!"); - std::abort(); + ABORT(); } logger.Log(LogLevel::DEBUG, "Running pass 3 - compiling"); @@ -409,7 +408,7 @@ HCAsm::BinaryResult HCAsm::HCAsmCompiler::TransformToBinary(HCAsm::CompilerState case Mode::b64: binary.push(static_cast(std::get(raw.value.variant))); break; - default: std::abort(); + default: ABORT(); } }, [](Label&){}); @@ -451,7 +450,7 @@ std::string_view HCAsm::FindLine(const pog::LineSpecialization& line_spec, const "", std::to_string(err_token.line_spec.line).length(), "", err_token.line_spec.offset, std::string(err_token.line_spec.length, '^')); - std::exit(1); + EXIT(1); } void HCAsm::WriteResultFile(HyperCPU::FileType type, HCAsm::BinaryResult& result, std::ofstream& output, std::uint32_t code_size, std::uint32_t entry_point) { diff --git a/src/Assembler/Core/Compiler.hpp b/src/Assembler/Core/Compiler.hpp index 4746b59e..1cef95a5 100644 --- a/src/Assembler/Core/Compiler.hpp +++ b/src/Assembler/Core/Compiler.hpp @@ -7,14 +7,15 @@ #include #include -#include #include +#include #include #include #include +#include -#include #include +#include #include @@ -189,7 +190,7 @@ namespace HCAsm { case Registers::XLLL3: return Mode::b8; default: - unreachable(); + UNREACHABLE(); } } diff --git a/src/Assembler/Main/Main.cpp b/src/Assembler/Main/Main.cpp index 36c40863..d2fcba4a 100644 --- a/src/Assembler/Main/Main.cpp +++ b/src/Assembler/Main/Main.cpp @@ -1,12 +1,13 @@ #include #include -#include -#include -#include #include +#include #include #include +#include +#include +#include #include @@ -40,7 +41,7 @@ int main(int argc, char** argv) { program.parse_args(argc, argv); } catch (const std::exception& err) { std::cerr << err.what() << '\n'; - std::exit(1); + EXIT(1); } auto source = program.get("source"); @@ -63,14 +64,14 @@ int main(int argc, char** argv) { // Verify that files are available if (!std::filesystem::is_regular_file(source)) { HCAsm::logger.Log(HyperCPU::LogLevel::ERROR, "Source file \"{}\" is not a regular file!", source); - std::exit(1); + EXIT(1); } std::ifstream src(source); std::ofstream dst(result, std::ios::binary | std::ios::ate); if (!src.is_open()) { HCAsm::logger.Log(HyperCPU::LogLevel::ERROR, "Failed to open source file!"); - std::exit(1); + EXIT(1); } HCAsm::logger.Log(HyperCPU::LogLevel::DEBUG, "Source and destination files handles acquired"); diff --git a/src/Emulator/Core/CPU/Decoders/StdDecoder.cpp b/src/Emulator/Core/CPU/Decoders/StdDecoder.cpp index 2a088798..e85f9bea 100644 --- a/src/Emulator/Core/CPU/Decoders/StdDecoder.cpp +++ b/src/Emulator/Core/CPU/Decoders/StdDecoder.cpp @@ -5,13 +5,13 @@ #include #include #include +#include #include #include -#include +#include #include #include -#include -#include +#include #define dcdr_assert(expr) RaiseException((expr)); if (cpu && cpu->pending_interrupt.has_value()) return {.m_opcode = _CONT, .m_opcode_mode = b64, .m_op_types = NONE, .m_op1 = 0, .m_op2 = 0, .addr_extension_status = HyperCPU::AddrExtensionStatus::Disabled, .extension = 0} @@ -20,7 +20,7 @@ void HyperCPU::Decoder::RaiseException(bool expr) noexcept { if (!(expr)) { if (cpu == nullptr) { std::cerr << "Invalid opcode!\n"; - std::exit(1); + EXIT(1); } else { cpu->TriggerInterrupt(HyperCPU::cpu_exceptions::IO); } @@ -38,7 +38,7 @@ bool HyperCPU::Decoder::CheckSupportedOperandSize(std::uint8_t byte, Mode mode) case b64: return byte & 0b00000011; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/src/Emulator/Core/CPU/InstructionsImpl/LOIVT.cpp b/src/Emulator/Core/CPU/InstructionsImpl/LOIVT.cpp index 28afbc79..dd292c79 100644 --- a/src/Emulator/Core/CPU/InstructionsImpl/LOIVT.cpp +++ b/src/Emulator/Core/CPU/InstructionsImpl/LOIVT.cpp @@ -1,3 +1,4 @@ +#include "Exit.hpp" #include #include @@ -16,7 +17,7 @@ void HyperCPU::CPU::ExecLOIVT(const IInstruction& instr, void* op1, void* op2) { case R: *xivt = HyperCPU::bit_cast_from(op1); break; - default: std::abort(); + default: ABORT(); } ivt_initialized = true; } diff --git a/src/Emulator/Core/CPU/InstructionsImpl/POP.cpp b/src/Emulator/Core/CPU/InstructionsImpl/POP.cpp index 422d20f7..2121566e 100644 --- a/src/Emulator/Core/CPU/InstructionsImpl/POP.cpp +++ b/src/Emulator/Core/CPU/InstructionsImpl/POP.cpp @@ -1,10 +1,8 @@ -#include - -#include "Core/CPU/Instructions/Flags.hpp" +#include +#include #include - #include -#include +#include #pragma GCC diagnostic push @@ -18,11 +16,11 @@ void HyperCPU::CPU::ExecPOP(const IInstruction& instr, void* op1, void* op2) { case HyperCPU::Mode::b16: deref(op1) = StackPop16(); break; case HyperCPU::Mode::b32: deref(op1) = StackPop32(); break; case HyperCPU::Mode::b64: deref(op1) = StackPop64(); break; - default: HyperCPU::unreachable(); + default: UNREACHABLE(); } break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/src/Emulator/Core/CPU/InstructionsImpl/PUSH.cpp b/src/Emulator/Core/CPU/InstructionsImpl/PUSH.cpp index e6c240f5..24e164d5 100644 --- a/src/Emulator/Core/CPU/InstructionsImpl/PUSH.cpp +++ b/src/Emulator/Core/CPU/InstructionsImpl/PUSH.cpp @@ -1,10 +1,10 @@ #include -#include "Core/CPU/Instructions/Flags.hpp" -#include - -#include +#include #include +#include +#include +#include #pragma GCC diagnostic push @@ -18,7 +18,7 @@ void HyperCPU::CPU::ExecPUSH(const IInstruction& instr, void* op1, void* op2) { case HyperCPU::Mode::b16: StackPush16(HyperCPU::bit_cast_from(op1)); break; case HyperCPU::Mode::b32: StackPush32(HyperCPU::bit_cast_from(op1)); break; case HyperCPU::Mode::b64: StackPush64(HyperCPU::bit_cast_from(op1)); break; - default: HyperCPU::unreachable(); + default: UNREACHABLE(); } break; case IMM: @@ -27,11 +27,11 @@ void HyperCPU::CPU::ExecPUSH(const IInstruction& instr, void* op1, void* op2) { case HyperCPU::Mode::b16: StackPush16(HyperCPU::bit_cast(op1)); break; case HyperCPU::Mode::b32: StackPush32(HyperCPU::bit_cast(op1)); break; case HyperCPU::Mode::b64: StackPush64(HyperCPU::bit_cast(op1)); break; - default: HyperCPU::unreachable(); + default: UNREACHABLE(); } break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/src/Emulator/Core/CPU/InstructionsImpl/READ.cpp b/src/Emulator/Core/CPU/InstructionsImpl/READ.cpp index 37ab0e80..058925f6 100644 --- a/src/Emulator/Core/CPU/InstructionsImpl/READ.cpp +++ b/src/Emulator/Core/CPU/InstructionsImpl/READ.cpp @@ -1,9 +1,8 @@ #include -#include - -#include #include -#include +#include +#include +#include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -18,7 +17,7 @@ void HyperCPU::CPU::ExecREAD(const IInstruction& instr, void* op1, void* op2) { handler = &read_io_handlers[HyperCPU::bit_cast_from(op1)]; break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } if (handler) { diff --git a/src/Emulator/Core/CPU/InstructionsImpl/WRITE.cpp b/src/Emulator/Core/CPU/InstructionsImpl/WRITE.cpp index 2b141055..6e1fd529 100644 --- a/src/Emulator/Core/CPU/InstructionsImpl/WRITE.cpp +++ b/src/Emulator/Core/CPU/InstructionsImpl/WRITE.cpp @@ -1,10 +1,10 @@ #include #include -#include - -#include #include +#include +#include +#include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -21,7 +21,7 @@ void HyperCPU::CPU::ExecWRITE(const IInstruction& instr, void* op1, void* op2) { handler(HyperCPU::bit_cast(op2)); break; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } } diff --git a/src/Emulator/Core/CPU/Interrupts/InterruptHandler.cpp b/src/Emulator/Core/CPU/Interrupts/InterruptHandler.cpp index 673ffaa9..61ae1095 100644 --- a/src/Emulator/Core/CPU/Interrupts/InterruptHandler.cpp +++ b/src/Emulator/Core/CPU/Interrupts/InterruptHandler.cpp @@ -1,15 +1,17 @@ -#include "Logger/Logger.hpp" -#include +#include + #include #include +#include +#include #include -#include +#include void HyperCPU::CPU::TriggerInterrupt(HyperCPU::cpu_exceptions exception) { if (!ivt_initialized || pending_interrupt.has_value()) { logger.Log(LogLevel::ERROR, "Interrupt was triggered, but failed to execute handler! XIP: {}", *xip); - std::abort(); + ABORT(); } pending_interrupt = std::make_optional(mem_controller->Read64((*xivt) + (8 * static_cast(exception)))); diff --git a/src/Emulator/Core/CPU/OperandsEvaluation.cpp b/src/Emulator/Core/CPU/OperandsEvaluation.cpp index f8d5a43f..dd08c08d 100644 --- a/src/Emulator/Core/CPU/OperandsEvaluation.cpp +++ b/src/Emulator/Core/CPU/OperandsEvaluation.cpp @@ -1,10 +1,9 @@ -#include - #include #include -#include #include +#include +#include void* HyperCPU::CPU::GetRegister(std::size_t& op1) { @@ -118,7 +117,7 @@ std::pair HyperCPU::CPU::GetOperands(OperandTypes op_types, Mode m case NONE: return std::make_pair(nullptr, nullptr); default: - std::abort(); + ABORT(); } return {}; } diff --git a/src/Emulator/Core/CPU/Util.hpp b/src/Emulator/Core/CPU/Util.hpp index 8c443d77..e69de29b 100644 --- a/src/Emulator/Core/CPU/Util.hpp +++ b/src/Emulator/Core/CPU/Util.hpp @@ -1,9 +0,0 @@ -#pragma once - -#ifdef __HCPU_DEBUG -# define UNREACHABLE() std::abort() -# define EXIT(code) std::abort() -#else -# define UNREACHABLE() __builtin_unreachable() -# define EXIT(code) std::exit(code) -#endif \ No newline at end of file diff --git a/src/Emulator/Core/MemoryController/IMemoryController.hpp b/src/Emulator/Core/MemoryController/IMemoryController.hpp index 448f3d8b..9883c37f 100644 --- a/src/Emulator/Core/MemoryController/IMemoryController.hpp +++ b/src/Emulator/Core/MemoryController/IMemoryController.hpp @@ -10,7 +10,7 @@ do { \ if (!(expr) && (!cpu || !cpu->CanExecuteInterrupts())) [[unlikely]] { \ HyperCPU::println("Assertion failed: {}", #expr); \ - std::abort(); \ + ABORT(); \ } else if (!(expr) && cpu && cpu->CanExecuteInterrupts()) { \ cpu->TriggerInterrupt(HyperCPU::cpu_exceptions::SEGF); \ } else [[likely]] { } \ diff --git a/src/Emulator/Main/Main.cpp b/src/Emulator/Main/Main.cpp index 19dccf0c..019262b5 100644 --- a/src/Emulator/Main/Main.cpp +++ b/src/Emulator/Main/Main.cpp @@ -1,13 +1,14 @@ #include #include +#include #include +#include +#include #include #include -#include -#include -#include #include +#include #include @@ -30,16 +31,16 @@ int main(int argc, char** argv) { program.parse_args(argc, argv); } catch (const std::exception& err) { std::cerr << err.what() << '\n'; - std::exit(1); + EXIT(1); } auto source = program.get("binary"); if (!std::filesystem::exists(source)) { logger.Log(HyperCPU::LogLevel::ERROR, fmt::format("Binary \"{}\" does not exist!", source)); - std::exit(1); + EXIT(1); } else if (!std::filesystem::is_regular_file(source)) { logger.Log(HyperCPU::LogLevel::ERROR, fmt::format("Source path \"{}\" is not a regular file!", source)); - std::exit(1); + EXIT(1); } std::ifstream file(source); @@ -51,7 +52,7 @@ int main(int argc, char** argv) { // Validate header contents if (header.magic != HyperCPU::magic) { logger.Log(HyperCPU::LogLevel::ERROR, "Invalid magic!"); - std::exit(1); + EXIT(1); } switch (header.version) { @@ -60,7 +61,7 @@ int main(int argc, char** argv) { break; default: logger.Log(HyperCPU::LogLevel::ERROR, "Invalid release field!"); - std::exit(1); + EXIT(1); } switch (header.type) { @@ -68,10 +69,10 @@ int main(int argc, char** argv) { break; case HyperCPU::FileType::Object: logger.Log(HyperCPU::LogLevel::ERROR, "Executing object files is not supported, please link it first!"); - std::exit(1); + EXIT(1); default: logger.Log(HyperCPU::LogLevel::ERROR, "Invalid type field!"); - std::exit(1); + EXIT(1); } std::unique_ptr buf(new char[binarysize]); @@ -80,7 +81,7 @@ int main(int argc, char** argv) { auto memory = HyperCPU::ParseMemoryString(program.get("-m")); if (memory == std::numeric_limits::max()) { logger.Log(HyperCPU::LogLevel::ERROR, "Failed to parse memory amount argument."); - std::exit(1); + EXIT(1); } HyperCPU::CPU cpu{1, memory, logger, buf.get(), static_cast(binarysize )}; diff --git a/src/Exit.hpp b/src/Exit.hpp new file mode 100644 index 00000000..6bc260b8 --- /dev/null +++ b/src/Exit.hpp @@ -0,0 +1,11 @@ +#pragma once + +#ifdef __HCPU_DEBUG +# define UNREACHABLE() std::abort() +# define EXIT(code) std::abort() +#else +# define UNREACHABLE() __builtin_unreachable() +# define EXIT(code) std::exit(code) +#endif + +#define ABORT() std::abort() \ No newline at end of file diff --git a/src/Logger/Logger.hpp b/src/Logger/Logger.hpp index 1667258b..8f114047 100644 --- a/src/Logger/Logger.hpp +++ b/src/Logger/Logger.hpp @@ -2,14 +2,13 @@ #include -#include #include #include -#include -#include #include - +#include +#include +#include namespace HyperCPU { enum class LogLevel : std::uint_fast8_t { @@ -30,7 +29,7 @@ namespace HyperCPU { case HyperCPU::LogLevel::WARNING: return '='; case HyperCPU::LogLevel::ERROR: return '!'; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } @@ -41,7 +40,7 @@ namespace HyperCPU { case HyperCPU::LogLevel::WARNING: return B_YELLOW; case HyperCPU::LogLevel::ERROR: return B_RED; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } @@ -52,7 +51,7 @@ namespace HyperCPU { case HyperCPU::LogLevel::WARNING: return YELLOW; case HyperCPU::LogLevel::ERROR: return RED; default: - HyperCPU::unreachable(); + UNREACHABLE(); } } diff --git a/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp b/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp index 0bb68346..db99d6bc 100644 --- a/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp +++ b/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp @@ -1,3 +1,4 @@ +#include "Logger/Logger.hpp" #include #define private public @@ -11,7 +12,8 @@ static constexpr std::uint8_t CONSTLLH = 0x06; static constexpr std::uint8_t CONSTLLL = 0x07; TEST(cpu_init, REGS_ARE_INITIALIZED) { - HyperCPU::CPU cpu{1, 4096}; + HyperCPU::Logger logger{HyperCPU::LogLevel::ERROR}; + HyperCPU::CPU cpu{1, 4096, logger}; for (std::size_t i = 0; i < 13; ++i) cpu.data[i] = FULL_CONST; diff --git a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp index d3f45834..4f5ae763 100644 --- a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp +++ b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp @@ -12,7 +12,7 @@ static constexpr std::uint32_t DWORD = 0x55555555; static constexpr std::uint64_t QWORD = 0x5555555555555555; #ifdef __HCPU_DEBUG -# define HCPU_ASSERT_EXIT(statement, x, regex) HCPU_HCPU_ASSERT_EXIT(statement, x, regex) +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) #else # define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) #endif diff --git a/test/fixtures.hpp b/test/fixtures.hpp index 6bbb1662..fcf85d19 100644 --- a/test/fixtures.hpp +++ b/test/fixtures.hpp @@ -86,24 +86,27 @@ class DECODER_TEST : public ::testing::Test { class CPU_TEST : public ::testing::Test { protected: + HyperCPU::Logger logger; HyperCPU::CPU cpu; - CPU_TEST() : cpu(1, 4096) { } + CPU_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } }; class OPERAND_EVAL_TEST : public ::testing::Test { protected: + HyperCPU::Logger logger; HyperCPU::CPU cpu; std::pair result; - OPERAND_EVAL_TEST() : cpu(1, 4096) { } + OPERAND_EVAL_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } }; class STACK_TEST : public ::testing::Test { protected: + HyperCPU::Logger logger; HyperCPU::CPU cpu; - STACK_TEST() : cpu(1, 4096) { + STACK_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { *cpu.xbp = 1024; *cpu.xsp = 1024; } @@ -111,18 +114,20 @@ class STACK_TEST : public ::testing::Test { class IVT_INIT_TEST : public ::testing::Test { protected: + HyperCPU::Logger logger; HyperCPU::CPU cpu; - IVT_INIT_TEST() : cpu(1, 4096) { + IVT_INIT_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } }; class EXCEPTION_TEST : public ::testing::Test { protected: + HyperCPU::Logger logger; HyperCPU::CPU cpu; - EXCEPTION_TEST() : cpu(1, 4096) { } + EXCEPTION_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } virtual void SetUp() { *cpu.xsp = 512; From a919eafe4eaa5b43735e5159227a94b00464b02e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sat, 12 Apr 2025 17:30:27 +0400 Subject: [PATCH 3/5] Fix tests --- .../EmulatorCore/MemoryControllers/ST.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp index 4f5ae763..dd04f8cc 100644 --- a/test/Modular/EmulatorCore/MemoryControllers/ST.cpp +++ b/test/Modular/EmulatorCore/MemoryControllers/ST.cpp @@ -149,84 +149,84 @@ TEST_F(MC_ST_FAILTEST, READ64) { TEST_F(MC_ST_NEARFAILTEST, LOAD8) { counter = 1023; - HCPU_ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::ExitedWithCode(0), ""); ++counter; HCPU_ASSERT_EXIT({mcmt.Load8(counter, BYTE); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD16) { counter = 1022; - HCPU_ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; HCPU_ASSERT_EXIT({mcmt.Load16(counter, WORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD32) { counter = 1020; - HCPU_ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; HCPU_ASSERT_EXIT({mcmt.Load32(counter, DWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, LOAD64) { counter = 1016; - HCPU_ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; HCPU_ASSERT_EXIT({mcmt.Load64(counter, QWORD); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH8) { counter = 1023; - HCPU_ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1024; HCPU_ASSERT_EXIT({mcmt.Fetch8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH16) { counter = 1022; - HCPU_ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; HCPU_ASSERT_EXIT({mcmt.Fetch16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH32) { counter = 1020; - HCPU_ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; HCPU_ASSERT_EXIT({mcmt.Fetch32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, FETCH64) { counter = 1016; - HCPU_ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; HCPU_ASSERT_EXIT({mcmt.Fetch64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ8) { counter = 1023; - HCPU_ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1024; HCPU_ASSERT_EXIT({mcmt.Read8(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ16) { counter = 1022; - HCPU_ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1023; HCPU_ASSERT_EXIT({mcmt.Read16(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ32) { counter = 1020; - HCPU_ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1021; HCPU_ASSERT_EXIT({mcmt.Read32(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } TEST_F(MC_ST_NEARFAILTEST, READ64) { counter = 1016; - HCPU_ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); + ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::ExitedWithCode(0), ""); counter = 1017; HCPU_ASSERT_EXIT({mcmt.Read64(counter); exit(0); }, ::testing::KilledBySignal(SIGABRT), ""); } \ No newline at end of file From 66f03261227f0429aba988b9156c6b497722a6cb Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sat, 12 Apr 2025 18:02:59 +0400 Subject: [PATCH 4/5] Fix tests --- src/Emulator/Core/CPU/CPU.hpp | 4 ++-- src/Emulator/Main/Main.cpp | 2 +- test/Modular/EmulatorCore/CPUInit/CPUInit.cpp | 2 +- test/fixtures.hpp | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Emulator/Core/CPU/CPU.hpp b/src/Emulator/Core/CPU/CPU.hpp index 4c0f925d..5b3ece74 100644 --- a/src/Emulator/Core/CPU/CPU.hpp +++ b/src/Emulator/Core/CPU/CPU.hpp @@ -33,7 +33,7 @@ namespace HyperCPU { std::unique_ptr m_decoder; // Data - const HyperCPU::Logger& logger; + const HyperCPU::Logger logger; std::size_t core_count; std::size_t total_mem; bool halted; @@ -125,7 +125,7 @@ namespace HyperCPU { std::unique_ptr io_ctl; public: - CPU(std::size_t core_count, std::size_t mem_size, const HyperCPU::Logger& logger, char* binary = nullptr, std::uint64_t binary_size = 0); + CPU(std::size_t core_count, std::size_t mem_size, char* binary = nullptr, std::uint64_t binary_size = 0); void Run(); diff --git a/src/Emulator/Main/Main.cpp b/src/Emulator/Main/Main.cpp index 019262b5..e5f2e8a4 100644 --- a/src/Emulator/Main/Main.cpp +++ b/src/Emulator/Main/Main.cpp @@ -84,7 +84,7 @@ int main(int argc, char** argv) { EXIT(1); } - HyperCPU::CPU cpu{1, memory, logger, buf.get(), static_cast(binarysize )}; + HyperCPU::CPU cpu{1, memory, buf.get(), static_cast(binarysize)}; cpu.SetEntryPoint(header.entry_point); cpu.Run(); diff --git a/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp b/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp index db99d6bc..b629d5ce 100644 --- a/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp +++ b/test/Modular/EmulatorCore/CPUInit/CPUInit.cpp @@ -13,7 +13,7 @@ static constexpr std::uint8_t CONSTLLL = 0x07; TEST(cpu_init, REGS_ARE_INITIALIZED) { HyperCPU::Logger logger{HyperCPU::LogLevel::ERROR}; - HyperCPU::CPU cpu{1, 4096, logger}; + HyperCPU::CPU cpu{1, 4096}; for (std::size_t i = 0; i < 13; ++i) cpu.data[i] = FULL_CONST; diff --git a/test/fixtures.hpp b/test/fixtures.hpp index fcf85d19..bf4b0cd1 100644 --- a/test/fixtures.hpp +++ b/test/fixtures.hpp @@ -89,7 +89,7 @@ class CPU_TEST : public ::testing::Test { HyperCPU::Logger logger; HyperCPU::CPU cpu; - CPU_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } + CPU_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096) { } }; class OPERAND_EVAL_TEST : public ::testing::Test { @@ -98,7 +98,7 @@ class OPERAND_EVAL_TEST : public ::testing::Test { HyperCPU::CPU cpu; std::pair result; - OPERAND_EVAL_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } + OPERAND_EVAL_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096) { } }; class STACK_TEST : public ::testing::Test { @@ -106,7 +106,7 @@ class STACK_TEST : public ::testing::Test { HyperCPU::Logger logger; HyperCPU::CPU cpu; - STACK_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { + STACK_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096) { *cpu.xbp = 1024; *cpu.xsp = 1024; } @@ -117,7 +117,7 @@ class IVT_INIT_TEST : public ::testing::Test { HyperCPU::Logger logger; HyperCPU::CPU cpu; - IVT_INIT_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { + IVT_INIT_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096) { } }; @@ -127,7 +127,7 @@ class EXCEPTION_TEST : public ::testing::Test { HyperCPU::Logger logger; HyperCPU::CPU cpu; - EXCEPTION_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096, logger) { } + EXCEPTION_TEST() : logger(HyperCPU::LogLevel::ERROR), cpu(1, 4096) { } virtual void SetUp() { *cpu.xsp = 512; From 56f003bee354d15a2b07a15797927dd7d14fe811 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Sun, 13 Apr 2025 22:04:17 +0400 Subject: [PATCH 5/5] Fix tests --- .../AssemblerCore/AssemblerFail.cpp | 42 +++++---- .../Decoding/ADCInstr/Unsupported.cpp | 46 +++++----- .../Decoding/ADDInstr/Unsupported.cpp | 46 +++++----- .../Decoding/ANDInstr/Unsupported.cpp | 46 +++++----- .../Decoding/ANDNInstr/Unsupported.cpp | 46 +++++----- .../Decoding/BSWAPInstr/Unsupported.cpp | 76 ++++++++-------- .../CALLEInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../CALLGRInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../CALLInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../CALLLInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../CCRFInstr/test_decoder_unsupported.cpp | 88 ++++++++++--------- .../Decoding/CMPInstr/Unsupported.cpp | 14 ++- .../COVFInstr/test_decoder_unsupported.cpp | 88 ++++++++++--------- .../Decoding/CUDFInstr/Unsupported.cpp | 88 ++++++++++--------- .../Decoding/DECInstr/Unsupported.cpp | 76 ++++++++-------- .../Decoding/DIVInstr/Unsupported.cpp | 82 +++++++++-------- .../Decoding/HALTInstr/Unsupported.cpp | 88 ++++++++++--------- .../Decoding/HIDInstr/Unsupported.cpp | 88 ++++++++++--------- .../Decoding/INCInstr/Unsupported.cpp | 76 ++++++++-------- .../JMEInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../JMGRInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../JMLInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../JMPInstr/test_decoder_unsupported.cpp | 80 +++++++++-------- .../Decoding/MOVInstr/Unsupported.cpp | 14 ++- .../Decoding/MULInstr/Unsupported.cpp | 46 +++++----- .../Decoding/ORInstr/Unsupported.cpp | 46 +++++----- .../Decoding/READInstr/Unsupported.cpp | 74 +++++++++------- .../Decoding/SHFLInstr/Unsupported.cpp | 54 +++++++----- .../Decoding/SHFRInstr/Unsupported.cpp | 54 +++++++----- .../Decoding/SUBInstr/Unsupported.cpp | 46 +++++----- .../Decoding/WRITEInstr/Unsupported.cpp | 74 +++++++++------- 31 files changed, 1112 insertions(+), 926 deletions(-) diff --git a/test/Integration/AssemblerCore/AssemblerFail.cpp b/test/Integration/AssemblerCore/AssemblerFail.cpp index e47f108a..0f66ab8b 100644 --- a/test/Integration/AssemblerCore/AssemblerFail.cpp +++ b/test/Integration/AssemblerCore/AssemblerFail.cpp @@ -3,74 +3,80 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(ASSEMBLER, ASM_INVALID_INSTRUCTION_TWO_OPERANDS) { std::string data = "miv xlll0, xlll1;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, ASM_INVALID_INSTRUCTION_ONE_OPERAND) { std::string data = "miv xlll0;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, ASM_INVALID_INSTRUCTION_NO_OPERANDS) { std::string data = "miv;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, ASM_CANT_USE_RESERVED_IDENT_AS_LABEL) { std::string data = "mov:"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, ASM_LABEL_REDEFINITION) { std::string data = "foo:\nfoo:"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, ASM_ENTRY_LABEL_REDEFINITION) { std::string data = "foo:\n.attr(entry) foo:"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, RAWVALUEb8_CANT_USE_LABEL) { std::string data = ".b8 foo;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, RAWVALUEb16_CANT_USE_LABEL) { std::string data = ".b16 foo;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } TEST_F(ASSEMBLER, RAWVALUEb32_CANT_USE_LABEL) { std::string data = ".b32 foo;"; - EXPECT_EXIT({ + HCPU_ASSERT_EXIT({ auto state(compiler.TransformToIR(data)); auto binary = compiler.TransformToBinary(state); - }, ::testing::ExitedWithCode(1), ""); + }, ::testing::ExitedWithCode(1), ".*"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp index c455d7e1..37f329ea 100644 --- a/test/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/ADCInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, ADC_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::ADC); counter += 2; @@ -13,7 +19,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_M_R_B8) { counter += 8; decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_M_R_B16) { @@ -26,7 +32,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_M_R_B32) { @@ -39,7 +45,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_M_R_B64) { @@ -52,7 +58,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B8) { @@ -65,7 +71,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B16) { @@ -78,7 +84,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B32) { @@ -91,7 +97,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B64) { @@ -104,7 +110,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B8) { @@ -117,7 +123,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B16) { @@ -130,7 +136,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B32) { @@ -143,7 +149,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B64) { @@ -156,7 +162,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B8) { @@ -169,7 +175,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B16) { @@ -182,7 +188,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B32) { @@ -195,7 +201,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B64) { @@ -208,7 +214,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_R) { @@ -221,7 +227,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_M) { @@ -234,7 +240,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_IMM) { @@ -247,7 +253,7 @@ TEST_F(DECODER_TEST, ADC_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADC_INSTR_NONE) { @@ -260,5 +266,5 @@ TEST_F(DECODER_TEST, ADC_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp index 47826bb4..09d87958 100644 --- a/test/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/ADDInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, ADD_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::ADD); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, ADD_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ADD_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, ADD_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp index 9a1efe1d..ce23de62 100644 --- a/test/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/ANDInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, AND_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::AND); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, AND_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, AND_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, AND_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, AND_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, AND_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, AND_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, AND_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, AND_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, AND_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, AND_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp index 14c09cce..4178a427 100644 --- a/test/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/ANDNInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::ANDN); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, ANDN_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, ANDN_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, ANDN_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp index d2660e2e..50d54aff 100644 --- a/test/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/BSWAPInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::BSWAP); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_M) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_IMM) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, BSWAP_INSTR_NONE) { @@ -454,5 +460,5 @@ TEST_F(DECODER_TEST, BSWAP_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp index 7ccee6c4..1da94a84 100644 --- a/test/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CALLEInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CALLE); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CALLE_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLE_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, CALLE_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp index 1a967839..f30d0dfc 100644 --- a/test/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CALLGRInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CALLGR); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLGR_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, CALLGR_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp index 332c4ad7..12cc1c0e 100644 --- a/test/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CALLInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CALL_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CALL); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CALL_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALL_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, CALL_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp index 091532e1..b4b2fd03 100644 --- a/test/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CALLLInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CALLL); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CALLL_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CALLL_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, CALLL_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp index 25098b45..325197ec 100644 --- a/test/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CCRFInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CCRF); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_R_B64) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_B8) { @@ -480,7 +486,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_B16) { @@ -493,7 +499,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_B32) { @@ -506,7 +512,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CCRF_INSTR_M_B64) { @@ -519,7 +525,7 @@ TEST_F(DECODER_TEST, CCRF_INSTR_M_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } @@ -533,5 +539,5 @@ TEST_F(DECODER_TEST, CCRF_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp index 366c39b6..effb939d 100644 --- a/test/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CMPInstr/Unsupported.cpp @@ -5,6 +5,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CMP_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::CMP); counter += 2; @@ -15,7 +21,7 @@ TEST_F(DECODER_TEST, CMP_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CMP_INSTR_M) { @@ -28,7 +34,7 @@ TEST_F(DECODER_TEST, CMP_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CMP_INSTR_IMM) { @@ -41,7 +47,7 @@ TEST_F(DECODER_TEST, CMP_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CMP_INSTR_NONE) { @@ -54,5 +60,5 @@ TEST_F(DECODER_TEST, CMP_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp index 4b730f00..3901d4b7 100644 --- a/test/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/COVFInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, COVF_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::COVF); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_R_B64) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_B8) { @@ -480,7 +486,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_B16) { @@ -493,7 +499,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_B32) { @@ -506,7 +512,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, COVF_INSTR_M_B64) { @@ -519,7 +525,7 @@ TEST_F(DECODER_TEST, COVF_INSTR_M_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } @@ -533,5 +539,5 @@ TEST_F(DECODER_TEST, COVF_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp index ece02a5e..06792fc7 100644 --- a/test/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/CUDFInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::CUDF); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_R_B64) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_B8) { @@ -480,7 +486,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_B16) { @@ -493,7 +499,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_B32) { @@ -506,7 +512,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, CUDF_INSTR_M_B64) { @@ -519,7 +525,7 @@ TEST_F(DECODER_TEST, CUDF_INSTR_M_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } @@ -533,5 +539,5 @@ TEST_F(DECODER_TEST, CUDF_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp index f49f085c..dd3049c7 100644 --- a/test/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/DECInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, DEC_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::DEC); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_M) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_IMM) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, DEC_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DEC_INSTR_NONE) { @@ -454,5 +460,5 @@ TEST_F(DECODER_TEST, DEC_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp index 8ef0e9ff..ba39d651 100644 --- a/test/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/DIVInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, DIV_INSTR_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::DIV); counter += 2; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_IMM_B16) { @@ -23,7 +29,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_IMM_B32) { @@ -34,7 +40,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_IMM_B64) { @@ -45,7 +51,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_R_B8) { @@ -56,7 +62,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_R_B16) { @@ -69,7 +75,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_R_B32) { @@ -82,7 +88,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_R_B64) { @@ -95,7 +101,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B8) { @@ -108,7 +114,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B16) { @@ -121,7 +127,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B32) { @@ -134,7 +140,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B64) { @@ -147,7 +153,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_M_B8) { @@ -160,7 +166,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_M_B16) { @@ -173,7 +179,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_M_B32) { @@ -186,7 +192,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_M_B64) { @@ -199,7 +205,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B8) { @@ -212,7 +218,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B16) { @@ -225,7 +231,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B32) { @@ -238,7 +244,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B64) { @@ -251,7 +257,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_M_R_B8) { @@ -264,7 +270,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_M_R_B16) { @@ -277,7 +283,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_M_R_B32) { @@ -290,7 +296,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_M_R_B64) { @@ -303,7 +309,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B8) { @@ -316,7 +322,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B16) { @@ -329,7 +335,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B32) { @@ -342,7 +348,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B64) { @@ -355,7 +361,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B8) { @@ -368,7 +374,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B16) { @@ -381,7 +387,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B32) { @@ -394,7 +400,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B64) { @@ -407,7 +413,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B8) { @@ -420,7 +426,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B16) { @@ -433,7 +439,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B32) { @@ -446,7 +452,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B64) { @@ -459,7 +465,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_M) { @@ -472,7 +478,7 @@ TEST_F(DECODER_TEST, DIV_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, DIV_INSTR_NONE) { @@ -485,5 +491,5 @@ TEST_F(DECODER_TEST, DIV_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp index 2aa907bf..85a92849 100644 --- a/test/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/HALTInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, HALT_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::HALT); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_R_B64) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_B8) { @@ -480,7 +486,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_B16) { @@ -493,7 +499,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_B32) { @@ -506,7 +512,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HALT_INSTR_M_B64) { @@ -519,7 +525,7 @@ TEST_F(DECODER_TEST, HALT_INSTR_M_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } @@ -533,5 +539,5 @@ TEST_F(DECODER_TEST, HALT_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp index 50c4c7d3..d6deaf85 100644 --- a/test/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/HIDInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, HID_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::HID); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, HID_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_R_B64) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, HID_INSTR_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_B8) { @@ -480,7 +486,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_B16) { @@ -493,7 +499,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_B32) { @@ -506,7 +512,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, HID_INSTR_M_B64) { @@ -519,7 +525,7 @@ TEST_F(DECODER_TEST, HID_INSTR_M_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } @@ -533,5 +539,5 @@ TEST_F(DECODER_TEST, HID_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp index 52ec9486..1c6a4882 100644 --- a/test/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/INCInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, INC_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::INC); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, INC_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, INC_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, INC_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, INC_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, INC_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, INC_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_M) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, INC_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_IMM) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, INC_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, INC_INSTR_NONE) { @@ -454,5 +460,5 @@ TEST_F(DECODER_TEST, INC_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp index 2cfd59b4..ced445f3 100644 --- a/test/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/JMEInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, JME_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::JME); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, JME_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, JME_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, JME_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, JME_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, JME_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, JME_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, JME_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JME_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, JME_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp index 999d3512..4a9f3f98 100644 --- a/test/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/JMGRInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::JMGR); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, JMGR_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMGR_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, JMGR_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp index a51eb2ee..8135e6ba 100644 --- a/test/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/JMLInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, JML_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::JML); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, JML_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, JML_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, JML_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, JML_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, JML_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, JML_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, JML_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JML_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, JML_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp b/test/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp index d4ed19e3..299f5f3b 100644 --- a/test/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/JMPInstr/test_decoder_unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, JMP_INSTR_R_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::JMP); counter += 3; @@ -12,7 +18,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_R_B16) { @@ -25,7 +31,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_R_B32) { @@ -38,7 +44,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_R_B64) { @@ -51,7 +57,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B8) { @@ -64,7 +70,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B16) { @@ -77,7 +83,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B32) { @@ -90,7 +96,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B64) { @@ -103,7 +109,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_M_B8) { @@ -116,7 +122,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_M_B16) { @@ -129,7 +135,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_M_B32) { @@ -142,7 +148,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_M_B64) { @@ -155,7 +161,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B8) { @@ -168,7 +174,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B16) { @@ -181,7 +187,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B32) { @@ -194,7 +200,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B64) { @@ -207,7 +213,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_M_R_B8) { @@ -220,7 +226,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_M_R_B16) { @@ -233,7 +239,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_M_R_B32) { @@ -246,7 +252,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_M_R_B64) { @@ -259,7 +265,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B8) { @@ -272,7 +278,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B16) { @@ -285,7 +291,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B32) { @@ -298,7 +304,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B64) { @@ -311,7 +317,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B8) { @@ -324,7 +330,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B16) { @@ -337,7 +343,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B32) { @@ -350,7 +356,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B64) { @@ -363,7 +369,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B8) { @@ -376,7 +382,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B16) { @@ -389,7 +395,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B32) { @@ -402,7 +408,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B64) { @@ -415,7 +421,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_B8) { @@ -428,7 +434,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_B16) { @@ -441,7 +447,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_R_B32) { @@ -454,7 +460,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_M) { @@ -467,7 +473,7 @@ TEST_F(DECODER_TEST, JMP_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, JMP_INSTR_NONE) { @@ -480,5 +486,5 @@ TEST_F(DECODER_TEST, JMP_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp index 6a299a40..bd67928a 100644 --- a/test/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/MOVInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, MOV_INSTR_R) { decoder.mem_controller->Load16(counter, HyperCPU::MOV); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, MOV_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MOV_INSTR_M) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, MOV_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MOV_INSTR_IMM) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, MOV_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MOV_INSTR_NONE) { @@ -53,5 +59,5 @@ TEST_F(DECODER_TEST, MOV_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp index a746f038..3af5114e 100644 --- a/test/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/MULInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, MUL_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::MUL); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, MUL_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, MUL_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, MUL_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp index 53cf7879..562bc748 100644 --- a/test/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/ORInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, OR_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::OR); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, OR_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, OR_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, OR_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, OR_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, OR_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, OR_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, OR_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, OR_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, OR_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, OR_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp index 493e154d..b8fe8edc 100644 --- a/test/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/READInstr/Unsupported.cpp @@ -1,5 +1,11 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, HyperCPU::READ); counter += 2; @@ -10,7 +16,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B8) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B16) { @@ -23,7 +29,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B32) { @@ -36,7 +42,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B64) { @@ -49,7 +55,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_M_R_B8) { @@ -62,7 +68,7 @@ TEST_F(DECODER_TEST, READ_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_M_R_B16) { @@ -75,7 +81,7 @@ TEST_F(DECODER_TEST, READ_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_M_R_B32) { @@ -88,7 +94,7 @@ TEST_F(DECODER_TEST, READ_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_M_R_B64) { @@ -101,7 +107,7 @@ TEST_F(DECODER_TEST, READ_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_M_B8) { @@ -114,7 +120,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_M_B16) { @@ -127,7 +133,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_M_B32) { @@ -140,7 +146,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_M_B64) { @@ -153,7 +159,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_R_B8) { @@ -164,7 +170,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_R_B16) { @@ -177,7 +183,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_R_B32) { @@ -190,7 +196,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_R_B64) { @@ -203,7 +209,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_RM_B8) { @@ -216,7 +222,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_RM_B16) { @@ -229,7 +235,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_RM_B32) { @@ -242,7 +248,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_R_RM_B64) { @@ -255,7 +261,7 @@ TEST_F(DECODER_TEST, READ_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B8) { @@ -268,7 +274,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B16) { @@ -281,7 +287,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B32) { @@ -294,7 +300,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B64) { @@ -307,7 +313,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_M_B8) { @@ -320,7 +326,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_M_B16) { @@ -333,7 +339,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_M_B32) { @@ -346,7 +352,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_M_B64) { @@ -359,7 +365,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_R_B8) { @@ -372,7 +378,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_R_B16) { @@ -385,7 +391,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_R_B32) { @@ -398,7 +404,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_RM_R_B64) { @@ -411,7 +417,7 @@ TEST_F(DECODER_TEST, READ_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_M) { @@ -424,7 +430,7 @@ TEST_F(DECODER_TEST, READ_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, READ_INSTR_NONE) { @@ -437,5 +443,5 @@ TEST_F(DECODER_TEST, READ_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } diff --git a/test/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp index fbab5ee9..e9d16091 100644 --- a/test/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/SHFLInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::SHFL); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B8) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B16) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B32) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B64) { @@ -261,7 +267,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_R) { @@ -274,7 +280,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_M) { @@ -287,7 +293,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_IMM) { @@ -300,7 +306,7 @@ TEST_F(DECODER_TEST, SHFL_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFL_INSTR_NONE) { @@ -313,5 +319,5 @@ TEST_F(DECODER_TEST, SHFL_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp index 61adecec..7820074f 100644 --- a/test/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/SHFRInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B8) { decoder.mem_controller->Load16(counter, HyperCPU::SHFR); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B8) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B16) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B32) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B64) { @@ -261,7 +267,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_R) { @@ -274,7 +280,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_M) { @@ -287,7 +293,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_IMM) { @@ -300,7 +306,7 @@ TEST_F(DECODER_TEST, SHFR_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SHFR_INSTR_NONE) { @@ -313,5 +319,5 @@ TEST_F(DECODER_TEST, SHFR_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp index d1e3f0f4..a960a8ed 100644 --- a/test/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/SUBInstr/Unsupported.cpp @@ -4,6 +4,12 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, SUB_INSTR_M_R_B8) { decoder.mem_controller->Load16(counter, HyperCPU::SUB); counter += 2; @@ -14,7 +20,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_M_R_B16) { @@ -27,7 +33,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_M_R_B32) { @@ -40,7 +46,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_M_R_B64) { @@ -53,7 +59,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B8) { @@ -66,7 +72,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B16) { @@ -79,7 +85,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B32) { @@ -92,7 +98,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B64) { @@ -105,7 +111,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B8) { @@ -118,7 +124,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B16) { @@ -131,7 +137,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B32) { @@ -144,7 +150,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B64) { @@ -157,7 +163,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B8) { @@ -170,7 +176,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B16) { @@ -183,7 +189,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B32) { @@ -196,7 +202,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B64) { @@ -209,7 +215,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_R) { @@ -222,7 +228,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_M) { @@ -235,7 +241,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_IMM) { @@ -248,7 +254,7 @@ TEST_F(DECODER_TEST, SUB_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, SUB_INSTR_NONE) { @@ -261,5 +267,5 @@ TEST_F(DECODER_TEST, SUB_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } \ No newline at end of file diff --git a/test/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp b/test/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp index 09ee59d9..57748c82 100644 --- a/test/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp +++ b/test/Modular/EmulatorCore/Decoding/WRITEInstr/Unsupported.cpp @@ -1,5 +1,11 @@ #include +#ifdef __HCPU_DEBUG +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_DEATH(statement, regex) +#else +# define HCPU_ASSERT_EXIT(statement, x, regex) ASSERT_EXIT(statement, x, regex) +#endif + TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, HyperCPU::WRITE); counter += 2; @@ -10,7 +16,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B32) { @@ -23,7 +29,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B64) { @@ -36,7 +42,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B8) { @@ -49,7 +55,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B16) { @@ -62,7 +68,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B32) { @@ -75,7 +81,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B64) { @@ -88,7 +94,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_M_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B8) { @@ -101,7 +107,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B16) { @@ -114,7 +120,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B32) { @@ -127,7 +133,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B64) { @@ -140,7 +146,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B16) { @@ -153,7 +159,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B32) { @@ -166,7 +172,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B64) { @@ -179,7 +185,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B8) { @@ -192,7 +198,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B16) { @@ -205,7 +211,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B32) { @@ -218,7 +224,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B64) { @@ -231,7 +237,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R_RM_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B8) { @@ -244,7 +250,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B8) { decoder.mem_controller->Load8(counter, 0x55); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B16) { @@ -257,7 +263,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B16) { decoder.mem_controller->Load16(counter, 0x5555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B32) { @@ -270,7 +276,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B32) { decoder.mem_controller->Load32(counter, 0x55555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B64) { @@ -283,7 +289,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_IMM_B64) { decoder.mem_controller->Load64(counter, 0x5555555555555555); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B8) { @@ -296,7 +302,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B8) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B16) { @@ -309,7 +315,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B16) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B32) { @@ -322,7 +328,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B32) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B64) { @@ -335,7 +341,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_M_B64) { decoder.mem_controller->Load64(counter, MEM_PTR); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B8) { @@ -348,7 +354,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B8) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B16) { @@ -361,7 +367,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B16) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B32) { @@ -374,7 +380,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B32) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B64) { @@ -387,7 +393,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_RM_R_B64) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_R) { @@ -400,7 +406,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_R) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_M) { @@ -413,7 +419,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_M) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_IMM) { @@ -426,7 +432,7 @@ TEST_F(DECODER_TEST, WRITE_INSTR_IMM) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); } TEST_F(DECODER_TEST, WRITE_INSTR_NONE) { @@ -439,5 +445,5 @@ TEST_F(DECODER_TEST, WRITE_INSTR_NONE) { decoder.mem_controller->Load8(counter, HyperCPU::Registers::X7); counter = 0; - ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); + HCPU_ASSERT_EXIT(decoder.FetchAndDecode(), ::testing::ExitedWithCode(1), "Invalid opcode!"); }