VERY experimental Nintendo Switch 2 emulator
C++
[dynarmic] fix tests builds (#2601)
lizziecc50571275cd
diff --git a/src/dynarmic/tests/A32/fuzz_arm.cpp b/src/dynarmic/tests/A32/fuzz_arm.cppindex 087ce54813..bef473a491 100644--- a/src/dynarmic/tests/A32/fuzz_arm.cpp+++ b/src/dynarmic/tests/A32/fuzz_arm.cpp@@ -24,6 +24,7 @@#include "../rand_int.h"#include "../unicorn_emu/a32_unicorn.h"#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/common/fp/fpcr.h"#include "dynarmic/common/fp/fpsr.h"#include "dynarmic/common/llvm_disassemble.h"@@ -46,7 +47,7 @@ using namespace Dynarmic;template<typename Fn>bool AnyLocationDescriptorForTerminalHas(IR::Terminal terminal, Fn fn) {- return Common::VisitVariant<bool>(terminal, [&](auto t) -> bool {+ return boost::apply_visitor([&](auto t) -> bool {using T = std::decay_t<decltype(t)>;if constexpr (std::is_same_v<T, IR::Term::Invalid>) {return false;@@ -72,7 +73,7 @@ bool AnyLocationDescriptorForTerminalHas(IR::Terminal terminal, Fn fn) {ASSERT_MSG(false, "Invalid terminal type");return false;}- });+ }, terminal);}bool ShouldTestInst(u32 instruction, u32 pc, bool is_thumb, bool is_last_inst, A32::ITState it_state = {}) {diff --git a/src/dynarmic/tests/A32/fuzz_thumb.cpp b/src/dynarmic/tests/A32/fuzz_thumb.cppindex ad01e5718b..7f64cb0ccb 100644--- a/src/dynarmic/tests/A32/fuzz_thumb.cpp+++ b/src/dynarmic/tests/A32/fuzz_thumb.cpp@@ -22,6 +22,7 @@#include "../rand_int.h"#include "../unicorn_emu/a32_unicorn.h"#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/frontend/A32/FPSCR.h"#include "dynarmic/frontend/A32/PSR.h"#include "dynarmic/frontend/A32/a32_location_descriptor.h"diff --git a/src/dynarmic/tests/A32/test_arm_instructions.cpp b/src/dynarmic/tests/A32/test_arm_instructions.cppindex 0411877823..2e7e7dc5d8 100644--- a/src/dynarmic/tests/A32/test_arm_instructions.cpp+++ b/src/dynarmic/tests/A32/test_arm_instructions.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2016 MerryMage* SPDX-License-Identifier: 0BSD@@ -6,6 +9,7 @@#include <catch2/catch_test_macros.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/frontend/A32/a32_location_descriptor.h"#include "dynarmic/interface/A32/a32.h"diff --git a/src/dynarmic/tests/A32/test_coprocessor.cpp b/src/dynarmic/tests/A32/test_coprocessor.cppindex 98da0e5d34..3888d2c68b 100644--- a/src/dynarmic/tests/A32/test_coprocessor.cpp+++ b/src/dynarmic/tests/A32/test_coprocessor.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2022 MerryMage* SPDX-License-Identifier: 0BSD@@ -8,6 +11,7 @@#include <catch2/catch_test_macros.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/frontend/A32/a32_location_descriptor.h"#include "dynarmic/interface/A32/a32.h"#include "dynarmic/interface/A32/coprocessor.h"diff --git a/src/dynarmic/tests/A32/test_svc.cpp b/src/dynarmic/tests/A32/test_svc.cppindex 8b55d6537c..0be2432c7b 100644--- a/src/dynarmic/tests/A32/test_svc.cpp+++ b/src/dynarmic/tests/A32/test_svc.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2022 MerryMage* SPDX-License-Identifier: 0BSD@@ -8,6 +11,7 @@#include <catch2/catch_test_macros.hpp>#include "./testenv.h"+#include "../native/testenv.h"using namespace Dynarmic;diff --git a/src/dynarmic/tests/A32/test_thumb_instructions.cpp b/src/dynarmic/tests/A32/test_thumb_instructions.cppindex 3501d5419f..d509acdd8d 100644--- a/src/dynarmic/tests/A32/test_thumb_instructions.cpp+++ b/src/dynarmic/tests/A32/test_thumb_instructions.cpp@@ -10,6 +10,7 @@#include "dynarmic/common/common_types.h"#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/interface/A32/a32.h"static Dynarmic::A32::UserConfig GetUserConfig(ThumbTestEnv* testenv) {diff --git a/src/dynarmic/tests/A32/testenv.h b/src/dynarmic/tests/A32/testenv.hindex a6df2017ce..72eaafce14 100644--- a/src/dynarmic/tests/A32/testenv.h+++ b/src/dynarmic/tests/A32/testenv.h@@ -17,7 +17,6 @@#include "dynarmic/common/assert.h"#include "dynarmic/common/common_types.h"#include "dynarmic/interface/A32/a32.h"-#include "../native/testenv.h"template<typename InstructionType_, u32 infinite_loop_u32>class A32TestEnv : public Dynarmic::A32::UserCallbacks {diff --git a/src/dynarmic/tests/A64/a64.cpp b/src/dynarmic/tests/A64/a64.cppindex 40eff1f071..bc51eca164 100644--- a/src/dynarmic/tests/A64/a64.cpp+++ b/src/dynarmic/tests/A64/a64.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2018 MerryMage* SPDX-License-Identifier: 0BSD@@ -7,6 +10,7 @@#include <oaknut/oaknut.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/common/fp/fpsr.h"#include "dynarmic/interface/exclusive_monitor.h"diff --git a/src/dynarmic/tests/A64/fp_min_max.cpp b/src/dynarmic/tests/A64/fp_min_max.cppindex d8b45db807..1669b63071 100644--- a/src/dynarmic/tests/A64/fp_min_max.cpp+++ b/src/dynarmic/tests/A64/fp_min_max.cpp@@ -12,6 +12,7 @@#include "dynarmic/common/common_types.h"#include "./testenv.h"+#include "../native/testenv.h"using namespace Dynarmic;diff --git a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp b/src/dynarmic/tests/A64/fuzz_with_unicorn.cppindex 1c3531ebc5..2fb5a7b35e 100644--- a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp+++ b/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp@@ -19,6 +19,7 @@#include "../rand_int.h"#include "../unicorn_emu/a64_unicorn.h"#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/common/fp/fpcr.h"#include "dynarmic/common/fp/fpsr.h"#include "dynarmic/common/llvm_disassemble.h"diff --git a/src/dynarmic/tests/A64/misaligned_page_table.cpp b/src/dynarmic/tests/A64/misaligned_page_table.cppindex 8235e14a67..fc0bc77428 100644--- a/src/dynarmic/tests/A64/misaligned_page_table.cpp+++ b/src/dynarmic/tests/A64/misaligned_page_table.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2018 MerryMage* SPDX-License-Identifier: 0BSD@@ -6,6 +9,7 @@#include <catch2/catch_test_macros.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/interface/A64/a64.h"TEST_CASE("misaligned load/store do not use page_table when detect_misaligned_access_via_page_table is set", "[a64]") {diff --git a/src/dynarmic/tests/A64/real_world.cpp b/src/dynarmic/tests/A64/real_world.cppindex 07532d95af..a083f16d61 100644--- a/src/dynarmic/tests/A64/real_world.cpp+++ b/src/dynarmic/tests/A64/real_world.cpp@@ -5,6 +5,7 @@#include <oaknut/oaknut.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/interface/A64/a64.h"using namespace Dynarmic;diff --git a/src/dynarmic/tests/A64/test_invalidation.cpp b/src/dynarmic/tests/A64/test_invalidation.cppindex 168043c1cb..0c92f5f606 100644--- a/src/dynarmic/tests/A64/test_invalidation.cpp+++ b/src/dynarmic/tests/A64/test_invalidation.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2018 MerryMage* SPDX-License-Identifier: 0BSD@@ -6,6 +9,7 @@#include <catch2/catch_test_macros.hpp>#include "./testenv.h"+#include "../native/testenv.h"#include "dynarmic/interface/A64/a64.h"using namespace Dynarmic;diff --git a/src/dynarmic/tests/A64/testenv.h b/src/dynarmic/tests/A64/testenv.hindex 31e338b138..fcdadb23e6 100644--- a/src/dynarmic/tests/A64/testenv.h+++ b/src/dynarmic/tests/A64/testenv.h@@ -12,7 +12,6 @@#include "dynarmic/common/assert.h"#include "dynarmic/common/common_types.h"#include "dynarmic/interface/A64/a64.h"-#include "../native/testenv.h"using Vector = Dynarmic::A64::Vector;diff --git a/src/dynarmic/tests/decoder_tests.cpp b/src/dynarmic/tests/decoder_tests.cppindex e545309960..cdd2c70cd9 100644--- a/src/dynarmic/tests/decoder_tests.cpp+++ b/src/dynarmic/tests/decoder_tests.cpp@@ -36,22 +36,12 @@ TEST_CASE("ASIMD Decoder: Ensure table order correctness", "[decode][a32][.]") {const auto is_decode_error = [&get_ir](const A32::ASIMDMatcher<A32::TranslatorVisitor>& matcher, u32 instruction) {const auto block = get_ir(matcher, instruction);-- for (const auto& ir_inst : block) {- if (ir_inst.GetOpcode() == IR::Opcode::A32ExceptionRaised) {- if (static_cast<A32::Exception>(ir_inst.GetArg(1).GetU64()) == A32::Exception::DecodeError) {- return true;- }- }- }- return false;+ return std::find_if(block.cbegin(), block.cend(), [](auto const& e) {+ return e.GetOpcode() == IR::Opcode::A32ExceptionRaised && A32::Exception(e.GetArg(1).GetU64()) == A32::Exception::DecodeError;+ }) != block.cend();};for (auto iter = table.cbegin(); iter != table.cend(); ++iter) {- if (std::strncmp(iter->GetName(), "UNALLOCATED", 11) == 0) {- continue;- }-const u32 expect = iter->GetExpected();const u32 mask = iter->GetMask();u32 x = 0;@@ -59,15 +49,17 @@ TEST_CASE("ASIMD Decoder: Ensure table order correctness", "[decode][a32][.]") {const u32 instruction = expect | x;const bool iserr = is_decode_error(*iter, instruction);- const auto alternative = std::find_if(table.cbegin(), iter, [instruction](const auto& m) { return m.Matches(instruction); });+ const auto alternative = std::find_if(table.cbegin(), iter, [instruction](const auto& m) {+ return m.Matches(instruction);+ });const bool altiserr = is_decode_error(*alternative, instruction);INFO("Instruction: " << std::hex << std::setfill('0') << std::setw(8) << instruction);INFO("Expect: " << std::hex << std::setfill('0') << std::setw(8) << expect);INFO("Fill: " << std::hex << std::setfill('0') << std::setw(8) << x);- INFO("Name: " << iter->GetName());+ //INFO("Name: " << *A32::GetNameASIMD<A32::TranslatorVisitor>(instruction));INFO("iserr: " << iserr);- INFO("alternative: " << alternative->GetName());+ //INFO("alternative: " << alternative->GetName());INFO("altiserr: " << altiserr);REQUIRE(((!iserr && alternative == iter) || (iserr && alternative != iter && !altiserr)));@@ -75,4 +67,4 @@ TEST_CASE("ASIMD Decoder: Ensure table order correctness", "[decode][a32][.]") {x = ((x | mask) + 1) & ~mask;} while (x != 0);}-}+}\ No newline at end of filediff --git a/src/dynarmic/tests/native/preserve_xmm.cpp b/src/dynarmic/tests/native/preserve_xmm.cppindex 0f69697b7a..7421252063 100644--- a/src/dynarmic/tests/native/preserve_xmm.cpp+++ b/src/dynarmic/tests/native/preserve_xmm.cpp@@ -6,6 +6,7 @@#include <immintrin.h>#include "../A64/testenv.h"+#include "../native/testenv.h"#include "dynarmic/common/fp/fpsr.h"#include "dynarmic/interface/exclusive_monitor.h"diff --git a/src/dynarmic/tests/print_info.cpp b/src/dynarmic/tests/print_info.cppindex 4b6c951c03..3d1268f467 100644--- a/src/dynarmic/tests/print_info.cpp+++ b/src/dynarmic/tests/print_info.cpp@@ -32,27 +32,26 @@#include "dynarmic/frontend/A64/translate/a64_translate.h"#include "dynarmic/frontend/A64/translate/impl/impl.h"#include "dynarmic/interface/A32/a32.h"+#include "dynarmic/interface/A32/config.h"#include "dynarmic/interface/A32/disassembler.h"#include "dynarmic/ir/basic_block.h"#include "dynarmic/ir/opt_passes.h"using namespace Dynarmic;-const char* GetNameOfA32Instruction(u32 instruction) {- if (auto vfp_decoder = A32::DecodeVFP<A32::TranslatorVisitor>(instruction)) {- return vfp_decoder->get().GetName();- } else if (auto asimd_decoder = A32::DecodeASIMD<A32::TranslatorVisitor>(instruction)) {- return asimd_decoder->get().GetName();- } else if (auto decoder = A32::DecodeArm<A32::TranslatorVisitor>(instruction)) {- return decoder->get().GetName();- }+std::string_view GetNameOfA32Instruction(u32 instruction) {+ //if (auto const vfp_decoder = A32::DecodeVFP<A32::TranslatorVisitor>(instruction))+ // return *A32::GetNameVFP<A32::TranslatorVisitor>(instruction);+ //else if (auto const asimd_decoder = A32::DecodeASIMD<A32::TranslatorVisitor>(instruction))+ // return *A32::GetNameASIMD<A32::TranslatorVisitor>(instruction);+ //else if (auto const decoder = A32::DecodeArm<A32::TranslatorVisitor>(instruction))+ // return *A32::GetNameARM<A32::TranslatorVisitor>(instruction);return "<null>";}-const char* GetNameOfA64Instruction(u32 instruction) {- if (auto decoder = A64::Decode<A64::TranslatorVisitor>(instruction)) {- return decoder->get().GetName();- }+std::string_view GetNameOfA64Instruction(u32 instruction) {+ //if (auto const decoder = A64::Decode<A64::TranslatorVisitor>(instruction))+ // return *A64::GetName<A64::TranslatorVisitor>(instruction);return "<null>";}@@ -66,7 +65,7 @@ void PrintA32Instruction(u32 instruction) {fmt::print("should_continue: {}\n\n", should_continue);fmt::print("IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));- Optimization::Optimize(ir_block, conf, {});+ Optimization::Optimize(ir_block, A32::UserConfig{}, {});fmt::print("Optimized IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));}@@ -81,7 +80,7 @@ void PrintA64Instruction(u32 instruction) {fmt::print("should_continue: {}\n\n", should_continue);fmt::print("IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));- Optimization::Optimize(ir_block, conf, {});+ Optimization::Optimize(ir_block, A64::UserConfig{}, {});fmt::print("Optimized IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));}@@ -99,7 +98,7 @@ void PrintThumbInstruction(u32 instruction) {fmt::print("should_continue: {}\n\n", should_continue);fmt::print("IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));- Optimization::Optimize(ir_block, conf, {});+ Optimization::Optimize(ir_block, A32::UserConfig{}, {});fmt::print("Optimized IR:\n");fmt::print("{}\n", IR::DumpBlock(ir_block));}