From eb83c9e7f225aa52fbe3f080eba544fa5d27ec8a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 2 Apr 2024 13:26:57 -0400 Subject: [PATCH] Core: use safe CondJump for self-modifying code this ensures we put the StoreNZCV in the right block, which will fix validation fails later in the series. Signed-off-by: Alyssa Rosenzweig --- FEXCore/Source/Interface/Core/Core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp index 47f9fd661..d0ba5a42e 100644 --- a/FEXCore/Source/Interface/Core/Core.cpp +++ b/FEXCore/Source/Interface/Core/Core.cpp @@ -579,7 +579,7 @@ namespace FEXCore::Context { auto CodeChanged = Thread->OpDispatcher->_ValidateCode(ExistingCodePtr[0], ExistingCodePtr[1], (uintptr_t)ExistingCodePtr - GuestRIP, DecodedInfo->InstSize); - auto InvalidateCodeCond = Thread->OpDispatcher->_CondJump(CodeChanged); + auto InvalidateCodeCond = Thread->OpDispatcher->CondJump(CodeChanged); auto CurrentBlock = Thread->OpDispatcher->GetCurrentBlock(); auto CodeWasChangedBlock = Thread->OpDispatcher->CreateNewCodeBlockAtEnd();