Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[nce] avoid cyrilic utf8 strings being interpreted as exclusive store instructions (#4369)

xbzke27650cf4232
diff --git a/src/core/arm/nce/instructions.h b/src/core/arm/nce/instructions.h
index 451778df65..6c71b6acf2 100644
--- a/src/core/arm/nce/instructions.h
+++ b/src/core/arm/nce/instructions.h
@@ -121,7 +121,10 @@ union Exclusive {
constexpr explicit Exclusive(u32 raw_) : raw{raw_} {}
constexpr bool Verify() {
- return this->GetSig() == 0x10;
+ if (this->GetSig() != 0x10) return false;
+ const bool pair = decltype(l)::ExtractValue(raw) & 1;
+ const bool fixed_rt2 = decltype(rt2)::ExtractValue(raw) == 0b11111;
+ return pair || fixed_rt2;
}
constexpr u32 GetSig() {