From 5450e63bb9a3340f24e288662be73c9e520a1227 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 26 Jul 2025 21:07:50 +0100 Subject: [PATCH] [dynarmic] fix unreachable macro and unicorn tests --- externals/dynarmic/src/dynarmic/common/assert.h | 2 +- externals/dynarmic/tests/unicorn_emu/a64_unicorn.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/dynarmic/src/dynarmic/common/assert.h b/externals/dynarmic/src/dynarmic/common/assert.h index 48482275ff..36177c302f 100644 --- a/externals/dynarmic/src/dynarmic/common/assert.h +++ b/externals/dynarmic/src/dynarmic/common/assert.h @@ -22,7 +22,7 @@ template }()) #define ASSERT(_a_) ASSERT_MSG(_a_, "") -#define UNREACHABLE() ASSERT(false, "unreachable") +#define UNREACHABLE() ASSERT_MSG(false, "unreachable") #ifdef _DEBUG #define DEBUG_ASSERT(_a_) ASSERT(_a_) #define DEBUG_ASSERT_MSG(_a_, ...) ASSERT_MSG(_a_, __VA_ARGS__) diff --git a/externals/dynarmic/tests/unicorn_emu/a64_unicorn.cpp b/externals/dynarmic/tests/unicorn_emu/a64_unicorn.cpp index 42b72bdb91..38bf81e565 100644 --- a/externals/dynarmic/tests/unicorn_emu/a64_unicorn.cpp +++ b/externals/dynarmic/tests/unicorn_emu/a64_unicorn.cpp @@ -173,7 +173,7 @@ void A64Unicorn::InterruptHook(uc_engine* uc, u32 int_number, void* user_data) { auto* this_ = static_cast(user_data); u32 esr; - CHECKED(uc_reg_read(uc, UC_ARM64_REG_ESR, &esr)); + CHECKED(uc_reg_read(uc, UC_ARM64_REG_ESR_EL0, &esr)); auto ec = esr >> 26; auto iss = esr & 0xFFFFFF;