diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 8cf9b309d3..48ba21e5aa 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -47,12 +47,6 @@ using namespace Gen; #define INVALID_EXIT 0xFFFFFFFF -bool JitBlock::ContainsAddress(u32 em_address) -{ - // WARNING - THIS DOES NOT WORK WITH INLINING ENABLED. - return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize); -} - bool JitBaseBlockCache::IsFull() const { return GetNumBlocks() >= MAX_NUM_BLOCKS - 1; @@ -189,7 +183,6 @@ bool JitBlock::ContainsAddress(u32 em_address) b.exitPtrs[1] = 0; b.linkStatus[0] = false; b.linkStatus[1] = false; - b.blockNum = num_blocks; num_blocks++; //commit the current block return num_blocks - 1; } @@ -273,13 +266,6 @@ bool JitBlock::ContainsAddress(u32 em_address) return inst; } - void JitBaseBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers) - { - for (int i = 0; i < num_blocks; i++) - if (blocks[i].ContainsAddress(em_address)) - block_numbers->push_back(i); - } - CompiledCode JitBaseBlockCache::GetCompiledCodeFromBlock(int block_num) { return (CompiledCode)blockCodePointers[block_num]; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index d5c980a20c..7b84ce0fc5 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -42,12 +42,10 @@ struct JitBlock u32 codeSize; u32 originalSize; int runCount; // for profiling. - int blockNum; int flags; bool invalid; bool linkStatus[2]; - bool ContainsAddress(u32 em_address); #ifdef _WIN32 // we don't really need to save start and stop @@ -115,12 +113,6 @@ public: // Fast way to get a block. Only works on the first ppc instruction of a block. int GetBlockNumberFromStartAddress(u32 em_address); - // slower, but can get numbers from within blocks, not just the first instruction. - // WARNING! WILL NOT WORK WITH INLINING ENABLED (not yet a feature but will be soon) - // Returns a list of block numbers - only one block can start at a particular address, but they CAN overlap. - // This one is slow so should only be used for one-shots from the debugger UI, not for anything during runtime. - void GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers); - u32 GetOriginalFirstOp(int block_num); CompiledCode GetCompiledCodeFromBlock(int block_num);