From dd01cb0ed032c3b9a14ebde5ca7ac9843e7547d1 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sun, 5 Oct 2025 11:20:41 -0300 Subject: [PATCH 1/4] dynarmic: fix use of undeclared identifier 'ASSERT_FALSE' Signed-off-by: Caio Oliveira --- .../src/dynarmic/backend/arm64/reg_alloc.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h index bde7c8e612..8b6a77cec6 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h +++ b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h @@ -182,7 +182,7 @@ public: } else if constexpr (size == 32) { return ReadW(arg); } else { - ASSERT_FALSE("Invalid size to ReadReg {}", size); + ASSERT_MSG(false, "Invalid size to ReadReg {}", size); } } @@ -199,7 +199,7 @@ public: } else if constexpr (size == 8) { return ReadB(arg); } else { - ASSERT_FALSE("Invalid size to ReadVec {}", size); + ASSERT_MSG(false, "Invalid size to ReadVec {}", size); } } @@ -221,7 +221,7 @@ public: } else if constexpr (size == 32) { return WriteW(inst); } else { - ASSERT_FALSE("Invalid size to WriteReg {}", size); + ASSERT_MSG(false, "Invalid size to WriteReg {}", size); } } @@ -238,7 +238,7 @@ public: } else if constexpr (size == 8) { return WriteB(inst); } else { - ASSERT_FALSE("Invalid size to WriteVec {}", size); + ASSERT_MSG(false, "Invalid size to WriteVec {}", size); } } @@ -258,7 +258,7 @@ public: } else if constexpr (size == 32) { return ReadWriteW(arg, inst); } else { - ASSERT_FALSE("Invalid size to ReadWriteReg {}", size); + ASSERT_MSG(false, "Invalid size to ReadWriteReg {}", size); } } @@ -275,7 +275,7 @@ public: } else if constexpr (size == 8) { return ReadWriteB(arg, inst); } else { - ASSERT_FALSE("Invalid size to ReadWriteVec {}", size); + ASSERT_MSG(false, "Invalid size to ReadWriteVec {}", size); } } @@ -372,7 +372,7 @@ void RAReg::Realize() { reg = T{reg_alloc.RealizeReadWriteImpl(read_value, write_value)}; break; default: - ASSERT_FALSE("Invalid RWType"); + ASSERT_MSG(false, "Invalid RWType"); } } From 91a4f5593777337783fd4d14db77e94f9b25836a Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sun, 5 Oct 2025 11:22:38 -0300 Subject: [PATCH 2/4] dyrnamic: include missing header Signed-off-by: Caio Oliveira --- src/dynarmic/src/dynarmic/common/memory_pool.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dynarmic/src/dynarmic/common/memory_pool.h b/src/dynarmic/src/dynarmic/common/memory_pool.h index c99316e107..0f3971f674 100644 --- a/src/dynarmic/src/dynarmic/common/memory_pool.h +++ b/src/dynarmic/src/dynarmic/common/memory_pool.h @@ -6,6 +6,7 @@ #pragma once #include +#include #include namespace Dynarmic::Common { From 36e966629277074fd6f62751047d850db59f9e6b Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sun, 5 Oct 2025 11:22:38 -0300 Subject: [PATCH 3/4] dynarmic: include missing header Signed-off-by: Caio Oliveira --- src/dynarmic/src/dynarmic/common/memory_pool.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dynarmic/src/dynarmic/common/memory_pool.h b/src/dynarmic/src/dynarmic/common/memory_pool.h index c99316e107..0f3971f674 100644 --- a/src/dynarmic/src/dynarmic/common/memory_pool.h +++ b/src/dynarmic/src/dynarmic/common/memory_pool.h @@ -6,6 +6,7 @@ #pragma once #include +#include #include namespace Dynarmic::Common { From 3ed52f2ae8747cc1f898349909a0e33092c0bdc7 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sun, 5 Oct 2025 11:43:59 -0300 Subject: [PATCH 4/4] dynarmic: Another "Temporary until MCL is fully removed" Signed-off-by: Caio Oliveira --- src/dynarmic/src/dynarmic/common/assert.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dynarmic/src/dynarmic/common/assert.h b/src/dynarmic/src/dynarmic/common/assert.h index 9973b8948d..0a3cb5331d 100644 --- a/src/dynarmic/src/dynarmic/common/assert.h +++ b/src/dynarmic/src/dynarmic/common/assert.h @@ -23,6 +23,12 @@ template } \ }()) #endif +#ifndef ASSERT_FALSE +#define ASSERT_FALSE(...) \ + ([&]() { \ + assert_terminate("false", __VA_ARGS__); \ + }()) +#endif #ifndef ASSERT #define ASSERT(_a_) ASSERT_MSG(_a_, "")