From 2ad200dea0bef9c59740da341f63289f2488afe3 Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Wed, 29 Oct 2025 08:03:29 +0000
Subject: [PATCH] oopsie

Signed-off-by: lizzie <lizzie@eden-emu.dev>
---
 src/dynarmic/src/dynarmic/common/assert.h                 | 2 +-
 .../src/dynarmic/frontend/A64/translate/impl/impl.cpp     | 3 ++-
 src/dynarmic/tests/A32/testenv.h                          | 8 ++++++--
 src/dynarmic/tests/A64/testenv.h                          | 8 ++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/dynarmic/src/dynarmic/common/assert.h b/src/dynarmic/src/dynarmic/common/assert.h
index 9d4cdf7041..adface269a 100644
--- a/src/dynarmic/src/dynarmic/common/assert.h
+++ b/src/dynarmic/src/dynarmic/common/assert.h
@@ -19,7 +19,7 @@
 #   endif
 #endif
 #ifndef DEBUG_ASSERT
-#   ifdef _DEBUG
+#   ifndef NDEBUG
 #       define DEBUG_ASSERT(_a_) ASSERT(_a_)
 #   else
 #       define DEBUG_ASSERT(_a_)
diff --git a/src/dynarmic/src/dynarmic/frontend/A64/translate/impl/impl.cpp b/src/dynarmic/src/dynarmic/frontend/A64/translate/impl/impl.cpp
index 50e462e581..7ba1e298a3 100644
--- a/src/dynarmic/src/dynarmic/frontend/A64/translate/impl/impl.cpp
+++ b/src/dynarmic/src/dynarmic/frontend/A64/translate/impl/impl.cpp
@@ -123,8 +123,9 @@ void TranslatorVisitor::SP(size_t bitsize, IR::U32U64 value) {
     case 64:
         ir.SetSP(value);
         break;
+    default:
+        UNREACHABLE();
     }
-    UNREACHABLE();
 }
 
 IR::U128 TranslatorVisitor::V(size_t bitsize, Vec vec) {
diff --git a/src/dynarmic/tests/A32/testenv.h b/src/dynarmic/tests/A32/testenv.h
index f558fce4fe..3d0ebd4168 100644
--- a/src/dynarmic/tests/A32/testenv.h
+++ b/src/dynarmic/tests/A32/testenv.h
@@ -97,7 +97,9 @@ public:
         MemoryWrite32(vaddr + 4, static_cast<u32>(value >> 32));
     }
 
-    void InterpreterFallback(u32 pc, size_t num_instructions) override { ASSERT(false, "InterpreterFallback({:08x} && {}) code = {:08x}", pc, num_instructions, *MemoryReadCode(pc)); }
+    void InterpreterFallback(u32 pc, size_t num_instructions) override {
+        UNREACHABLE(); //ASSERT(false && "InterpreterFallback({:08x} && {}) code = {:08x}", pc, num_instructions, *MemoryReadCode(pc));
+    }
 
     void CallSVC(std::uint32_t swi) override {
         UNREACHABLE(); //ASSERT(false && "CallSVC({})", swi);
@@ -188,7 +190,9 @@ public:
         return true;
     }
 
-    void InterpreterFallback(std::uint32_t pc, size_t num_instructions) override { ASSERT(false, "InterpreterFallback({:016x} && {})", pc, num_instructions); }
+    void InterpreterFallback(std::uint32_t pc, size_t num_instructions) override {
+        UNREACHABLE(); //ASSERT(false && "InterpreterFallback({:016x} && {})", pc, num_instructions);
+    }
 
     void CallSVC(std::uint32_t swi) override {
         UNREACHABLE(); //ASSERT(false && "CallSVC({})", swi);
diff --git a/src/dynarmic/tests/A64/testenv.h b/src/dynarmic/tests/A64/testenv.h
index 514b04e041..05eb0e2d39 100644
--- a/src/dynarmic/tests/A64/testenv.h
+++ b/src/dynarmic/tests/A64/testenv.h
@@ -105,7 +105,9 @@ public:
         return true;
     }
 
-    void InterpreterFallback(u64 pc, size_t num_instructions) override { ASSERT(false, "InterpreterFallback({:016x} && {})", pc, num_instructions); }
+    void InterpreterFallback(u64 pc, size_t num_instructions) override {
+        UNREACHABLE(); // ASSERT(false&& "InterpreterFallback({:016x} && {})", pc, num_instructions);
+    }
 
     void CallSVC(std::uint32_t swi) override {
         UNREACHABLE(); //ASSERT(false && "CallSVC({})", swi);
@@ -206,7 +208,9 @@ public:
         return true;
     }
 
-    void InterpreterFallback(u64 pc, size_t num_instructions) override { ASSERT(ignore_invalid_insn, "InterpreterFallback({:016x} && {})", pc, num_instructions); }
+    void InterpreterFallback(u64 pc, size_t num_instructions) override {
+        ASSERT(ignore_invalid_insn && "InterpreterFallback");
+    }
 
     void CallSVC(std::uint32_t swi) override {
         UNREACHABLE(); //ASSERT(false && "CallSVC({})", swi);