From f39e856feeb453dd795c6047b623000f6f1b912c Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sat, 18 Mar 2023 18:22:28 -0500 Subject: [PATCH] iR5900: Don't limit block sizes to 16 bits --- pcsx2/x86/BaseblockEx.h | 6 +++--- pcsx2/x86/ix86-32/iR5900-32.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pcsx2/x86/BaseblockEx.h b/pcsx2/x86/BaseblockEx.h index 3acbccafc5..96de0bed23 100644 --- a/pcsx2/x86/BaseblockEx.h +++ b/pcsx2/x86/BaseblockEx.h @@ -32,10 +32,10 @@ struct BASEBLOCK // extra block info (only valid for start of fn) struct BASEBLOCKEX { - u32 startpc; uptr fnptr; - u16 size; // The size in dwords (equivalent to the number of instructions) - u16 x86size; // The size in byte of the translated x86 instructions + u32 startpc; + u32 size; // The size in dwords (equivalent to the number of instructions) + u32 x86size; // The size in byte of the translated x86 instructions #ifdef PCSX2_DEVBUILD // Could be useful to instrument the block diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index d9de5de4b0..53ca7953bc 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -2672,8 +2672,7 @@ StartRecomp: pxAssert(xGetPtr() < recMem->GetPtrEnd()); - pxAssert(xGetPtr() - recPtr < _64kb); - s_pCurBlockEx->x86size = xGetPtr() - recPtr; + s_pCurBlockEx->x86size = static_cast(xGetPtr() - recPtr); #if 0 // Example: Dump both x86/EE code