From a8b26937f3e1df068a8b8af0ed5fcd88bdca071b Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 12 Jan 2017 20:24:43 +0100 Subject: [PATCH] JitCache: Clean up GetBlockFromStartAddress. --- Source/Core/Core/PowerPC/JitCommon/JitCache.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index 4be02d1c64..93937f9e32 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -180,14 +180,12 @@ JitBlock* JitBaseBlockCache::GetBlockFromStartAddress(u32 addr, u32 msr) auto map_result = start_block_map.find(translated_addr); if (map_result == start_block_map.end()) return nullptr; - JitBlock& b = *map_result->second; - if (b.invalid) + + JitBlock* b = map_result->second; + if (b->invalid || b->effectiveAddress != addr || + b->msrBits != (msr & JitBlock::JIT_CACHE_MSR_MASK)) return nullptr; - if (b.effectiveAddress != addr) - return nullptr; - if (b.msrBits != (msr & JitBlock::JIT_CACHE_MSR_MASK)) - return nullptr; - return &b; + return b; } const u8* JitBaseBlockCache::Dispatch()