Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

jit: Optimize proxy block lookup from address.

Browse source 
It was really slow before with enough proxy blocks.
This commit is contained in:
Unknown W. Brackets 2014-10-12 17:34:59 -07:00
parent 1064f580e4
commit 4853a1b7a0
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Core/MIPS/JitCommon/JitBlockCache.cpp
View file

@ -123,7 +123,7 @@ void JitBlockCache::Clear() {
DestroyBlock(i, false);
links_to_.clear();
block_map_.clear();
proxyBlockIndices_.clear();
proxyBlockMap_.clear();
num_blocks_ = 0;
blockMemRanges_[JITBLOCK_RANGE_SCRATCH] = std::make_pair(0xFFFFFFFF, 0x00000000);
@ -176,7 +176,7 @@ void JitBlockCache::ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, cons
// instead of creating a new block.
int num = GetBlockNumberFromStartAddress(startAddress, false);
if (num != -1) {
INFO_LOG(HLE, "Adding proxy root %08x to block at %08x", rootAddress, startAddress);
DEBUG_LOG(HLE, "Adding proxy root %08x to block at %08x", rootAddress, startAddress);
if (!blocks_[num].proxyFor) {
blocks_[num].proxyFor = new std::vector<u32>();
}
@ -200,7 +200,7 @@ void JitBlockCache::ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, cons
// Make binary searches and stuff work ok
b.normalEntry = codePtr;
b.checkedEntry = codePtr;
proxyBlockIndices_.push_back(num_blocks_);
proxyBlockMap_.insert(std::make_pair(startAddress, num_blocks_));
AddBlockMap(num_blocks_);
num_blocks_++; //commit the current block
@ -337,9 +337,10 @@ int JitBlockCache::GetBlockNumberFromStartAddress(u32 addr, bool realBlocksOnly)
int bl = GetBlockNumberFromEmuHackOp(inst);
if (bl < 0) {
if (!realBlocksOnly) {
// Wasn't an emu hack op, look through proxyBlockIndices_.
for (size_t i = 0; i < proxyBlockIndices_.size(); i++) {
int blockIndex = proxyBlockIndices_[i];
// Wasn't an emu hack op, look through proxyBlockMap_.
auto range = proxyBlockMap_.equal_range(addr);
for (auto it = range.first; it != range.second; ++it) {
const int blockIndex = it->second;
if (blocks_[blockIndex].originalAddress == addr && !blocks_[blockIndex].proxyFor && !blocks_[blockIndex].invalid)
return blockIndex;
}
@ -513,7 +514,14 @@ void JitBlockCache::DestroyBlock(int block_num, bool invalidate) {
delete b->proxyFor;
b->proxyFor = 0;
}
// TODO: Remove from proxyBlockIndices_.
auto range = proxyBlockMap_.equal_range(b->originalAddress);
for (auto it = range.first; it != range.second; ++it) {
if (it->second == block_num) {
// Found it. Delete and bail.
proxyBlockMap_.erase(it);
break;
}
}
// TODO: Handle the case when there's a proxy block and a regular JIT block at the same location.
// In this case we probably "leak" the proxy block currently (no memory leak but it'll stay enabled).

2
Core/MIPS/JitCommon/JitBlockCache.h
View file

@ -156,7 +156,7 @@ private:
MIPSState *mips_;
CodeBlock *codeBlock_;
JitBlock *blocks_;
std::vector<int> proxyBlockIndices_;
std::multimap<u32, int> proxyBlockMap_;
int num_blocks_;
std::multimap<u32, int> links_to_;