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

SPU analyser: minor Safe fix 

Properly handle known indirect branch target as a function call target.
This commit is contained in:
Nekotekina 2019-05-16 15:03:01 +03:00
parent 164a7636bf
commit 2cf139c7a8
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1167,11 +1167,12 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
m_chunks.clear();
m_funcs.clear();
// Value flags (TODO)
// Value flags (TODO: only is_const is implemented)
enum class vf : u32
{
is_const,
is_mask,
is_rel,
__bitset_enum_max
};
@ -1348,29 +1349,11 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
m_targets[pos].push_back(target);
if (!sl)
if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
{
if (sync)
{
LOG_NOTICE(SPU, "[0x%x] At 0x%x: ignoring branch to 0x%x (SYNC)", result[0], pos, target);
if (entry_point < target)
{
limit = std::min<u32>(limit, target);
}
}
else
{
m_entry_info[target / 4] = true;
add_block(target);
}
}
if (sl && g_cfg.core.spu_block_size == spu_block_size_type::giga)
{
if (sync)
{
LOG_NOTICE(SPU, "[0x%x] At 0x%x: ignoring call to 0x%x (SYNC)", result[0], pos, target);
LOG_NOTICE(SPU, "[0x%x] At 0x%x: ignoring %scall to 0x%x (SYNC)", result[0], pos, sl ? "" : "tail ", target);
if (target > entry_point)
{
@ -1383,7 +1366,7 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
add_block(target);
}
}
else if (sl && target > entry_point)
else if (target > entry_point)
{
limit = std::min<u32>(limit, target);
}