mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

spu: Clean up asmjit - avoid touching the shared db whenever possible

Browse Source 
- Gets around the locking issues when fetching from the shared db
This commit is contained in:
kd-11 2017-07-19 19:35:05 +03:00
parent 2526626646
commit 99828a8f15
3 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rpcs3/Emu/Cell/SPUAnalyser.cpp
View File

@ -12,24 +12,9 @@ std::shared_ptr<spu_function_t> SPUDatabase::find(const be_t<u32>* data, u64 key
const auto& func = found.first->second;
// Compare binary data explicitly (TODO: optimize)
//if (LIKELY(func->size <= max_size) && std::memcmp(func->data.data(), data, func->size) == 0)
if (LIKELY(func->size <= max_size) && std::memcmp(func->data.data(), data, func->size) == 0)
{
const auto dwords = (u32*)(func->data.data());
const auto cast_data = (u32*)(data);
const auto limit = std::min(max_size, func->size) >> 2;
bool failed = false;
for (u32 dword = 0; dword < limit; dword++)
{
if (dwords[dword] != cast_data[dword])
{
failed = true;
break;
}
}
if (!failed)
return func;
return func;
}
}
@ -339,15 +324,6 @@ std::shared_ptr<spu_function_t> SPUDatabase::analyse(const be_t<u32>* ls, u32 en
{
writer_lock lock(m_mutex);
if (0)//funcs_length != m_db.size())
{
// Double-check if something new has been written before we got here
if (auto func = find(base, key, block_sz))
{
return func;
}
}
// Add function to the database
m_db.emplace(key, func);
}

20
rpcs3/Emu/Cell/SPURecompiler.cpp
View File

@ -22,8 +22,23 @@ void spu_recompiler_base::enter(SPUThread& spu)
// Get SPU LS pointer
const auto _ls = vm::ps3::_ptr<u32>(spu.offset);
// Always validate (TODO)
const auto func = spu.spu_db->analyse(_ls, spu.pc);
// Search if cached data matches
bool found = false;
auto func = spu.compiled_cache[spu.pc / 4];
if (func)
{
const be_t<u32>* base = _ls + spu.pc / 4;
if (std::memcmp(base, func->data.data(), func->size) == 0)
found = true;
}
// Check shared db if we dont have a match
if (!found)
{
func = spu.spu_db->analyse(_ls, spu.pc);
spu.compiled_cache[spu.pc / 4] = func;
}
// Reset callstack if necessary
if ((func->does_reset_stack && spu.recursion_level) || spu.recursion_level >= 128)
@ -32,6 +47,7 @@ void spu_recompiler_base::enter(SPUThread& spu)
return;
}
// Compile if needed
if (!func->compiled)
{
if (!spu.spu_rec)

1
rpcs3/Emu/Cell/SPUThread.h
View File

@ -582,6 +582,7 @@ public:
std::exception_ptr pending_exception;
std::array<std::shared_ptr<struct spu_function_t>, 65536> compiled_cache;
std::shared_ptr<class SPUDatabase> spu_db;
std::shared_ptr<class spu_recompiler_base> spu_rec;
u32 recursion_level = 0;