ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JIT: JitBaseBlockCache::valid_block is now std::vector<bool> 

This was previously a std::bitset, which resulted in generation of suboptimal code by VS2013 compiler.
See https://gist.github.com/kayru/753db9607d680e26194b
This commit is contained in:
Yuriy O'Donnell 2014-05-23 20:32:00 +02:00
parent b58753bd69
commit de1e2127dc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
View File

@ -108,7 +108,10 @@ using namespace Gen;
}
links_to.clear();
block_map.clear();
valid_block.reset();
valid_block.clear();
valid_block.resize(VALID_BLOCK_MASK_SIZE, false);
num_blocks = 0;
memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS);
}
@ -349,7 +352,7 @@ using namespace Gen;
// Optimize the common case of length == 32 which is used by Interpreter::dcb*
bool destroy_block = true;
if (length == 32)
{
{
if (!valid_block[pAddr / 32])
destroy_block = false;
else
@ -362,7 +365,7 @@ using namespace Gen;
{
std::map<pair<u32,u32>, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1;
while (it2 != block_map.end() && it2->first.second < pAddr + length)
{
{
JitBlock &b = blocks[it2->second];
*GetICachePtr(b.originalAddress) = JIT_ICACHE_INVALID_WORD;
DestroyBlock(it2->second, true);

5
Source/Core/Core/PowerPC/JitCommon/JitCache.h
View File

@ -72,10 +72,11 @@ class JitBaseBlockCache
int num_blocks;
std::multimap<u32, int> links_to;
std::map<std::pair<u32,u32>, u32> block_map; // (end_addr, start_addr) -> number
std::bitset<0x20000000 / 32> valid_block;
std::vector<bool> valid_block;
enum
{
MAX_NUM_BLOCKS = 65536*2
MAX_NUM_BLOCKS = 65536*2,
VALID_BLOCK_MASK_SIZE = 0x20000000 / 32,
};
bool RangeIntersect(int s1, int e1, int s2, int e2) const;