diff --git a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h index 8b6a77cec6..bde7c8e612 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_MSG(false, "Invalid size to ReadReg {}", size); + ASSERT_FALSE("Invalid size to ReadReg {}", size); } } @@ -199,7 +199,7 @@ public: } else if constexpr (size == 8) { return ReadB(arg); } else { - ASSERT_MSG(false, "Invalid size to ReadVec {}", size); + ASSERT_FALSE("Invalid size to ReadVec {}", size); } } @@ -221,7 +221,7 @@ public: } else if constexpr (size == 32) { return WriteW(inst); } else { - ASSERT_MSG(false, "Invalid size to WriteReg {}", size); + ASSERT_FALSE("Invalid size to WriteReg {}", size); } } @@ -238,7 +238,7 @@ public: } else if constexpr (size == 8) { return WriteB(inst); } else { - ASSERT_MSG(false, "Invalid size to WriteVec {}", size); + ASSERT_FALSE("Invalid size to WriteVec {}", size); } } @@ -258,7 +258,7 @@ public: } else if constexpr (size == 32) { return ReadWriteW(arg, inst); } else { - ASSERT_MSG(false, "Invalid size to ReadWriteReg {}", size); + ASSERT_FALSE("Invalid size to ReadWriteReg {}", size); } } @@ -275,7 +275,7 @@ public: } else if constexpr (size == 8) { return ReadWriteB(arg, inst); } else { - ASSERT_MSG(false, "Invalid size to ReadWriteVec {}", size); + ASSERT_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_MSG(false, "Invalid RWType"); + ASSERT_FALSE("Invalid RWType"); } } 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_, "")