archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor UB fix

Browse source
This commit is contained in:
Eladash 2019-06-16 20:52:37 +03:00 • committed by Ivan
parent 0fe26f8293
commit d52953fca6
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -169,9 +169,10 @@ static void ppu_initialize2(class jit_compiler& jit, const ppu_module& module_pa
extern void ppu_execute_syscall(ppu_thread& ppu, u64 code); extern void ppu_execute_syscall(ppu_thread& ppu, u64 code);
// Get pointer to executable cache // Get pointer to executable cache
static u64& ppu_ref(u32 addr) template<typename T = u64>
static T& ppu_ref(u32 addr)
{ {
return *reinterpret_cast<u64*>(vm::g_exec_addr + (u64)addr * 2); return *reinterpret_cast<T*>(vm::g_exec_addr + (u64)addr * 2);
} }
// Get interpreter cache value // Get interpreter cache value
@ -288,7 +289,7 @@ extern void ppu_register_function_at(u32 addr, u32 size, ppu_function_t ptr)
// Initialize specific function // Initialize specific function
if (ptr) if (ptr)
{ {
*reinterpret_cast<u32*>(&ppu_ref(addr)) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(ptr)); ppu_ref<u32>(addr) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(ptr));
return; return;
} }
@ -312,7 +313,7 @@ extern void ppu_register_function_at(u32 addr, u32 size, ppu_function_t ptr)
while (size) while (size)
{ {
if ((u32)ppu_ref(addr) == fallback) if (ppu_ref<u32>(addr) == fallback)
{ {
ppu_ref(addr) = ppu_cache(addr); ppu_ref(addr) = ppu_cache(addr);
} }
@ -357,7 +358,7 @@ extern void ppu_breakpoint(u32 addr, bool isAdding)
if (isAdding) if (isAdding)
{ {
// Set breakpoint // Set breakpoint
*reinterpret_cast<u32*>(&ppu_ref(addr)) = _break; ppu_ref<u32>(addr) = _break;
} }
else else
{ {
@ -376,9 +377,9 @@ extern void ppu_set_breakpoint(u32 addr)
const auto _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break)); const auto _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break));
if ((u32)ppu_ref(addr) != _break) if (ppu_ref<u32>(addr) != _break)
{ {
*reinterpret_cast<u32*>(&ppu_ref(addr)) = _break; ppu_ref<u32>(addr) = _break;
} }
} }
@ -392,7 +393,7 @@ extern void ppu_remove_breakpoint(u32 addr)
const auto _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break)); const auto _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break));
if ((u32)ppu_ref(addr) == _break) if (ppu_ref<u32>(addr) == _break)
{ {
ppu_ref(addr) = ppu_cache(addr); ppu_ref(addr) = ppu_cache(addr);
} }
@ -420,7 +421,7 @@ extern bool ppu_patch(u32 addr, u32 value)
const u32 _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break)); const u32 _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break));
const u32 fallback = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_fallback)); const u32 fallback = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_fallback));
if ((u32)ppu_ref(addr) != _break && (u32)ppu_ref(addr) != fallback) if (ppu_ref<u32>(addr) != _break && ppu_ref<u32>(addr) != fallback)
{ {
ppu_ref(addr) = ppu_cache(addr); ppu_ref(addr) = ppu_cache(addr);
} }
@ -622,7 +623,7 @@ void ppu_thread::exec_task()
{ {
while (!(state & (cpu_flag::ret + cpu_flag::exit + cpu_flag::stop + cpu_flag::dbg_global_stop))) while (!(state & (cpu_flag::ret + cpu_flag::exit + cpu_flag::stop + cpu_flag::dbg_global_stop)))
{ {
reinterpret_cast<ppu_function_t>(static_cast<std::uintptr_t>((u32)ppu_ref(cia)))(*this); reinterpret_cast<ppu_function_t>(static_cast<std::uintptr_t>(ppu_ref<u32>(cia)))(*this);
} }
return; return;
@ -1339,7 +1340,7 @@ extern void ppu_initialize(const ppu_module& info)
if (g_cfg.core.ppu_debug && func.size && func.toc != -1) if (g_cfg.core.ppu_debug && func.size && func.toc != -1)
{ {
s_ppu_toc->emplace(func.addr, func.toc); s_ppu_toc->emplace(func.addr, func.toc);
*reinterpret_cast<u32*>(&ppu_ref(func.addr)) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_check_toc)); ppu_ref<u32>(func.addr) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_check_toc));
} }
} }
@ -1695,7 +1696,7 @@ extern void ppu_initialize(const ppu_module& info)
{ {
const u64 addr = jit->get(fmt::format("__0x%x", block.first - reloc)); const u64 addr = jit->get(fmt::format("__0x%x", block.first - reloc));
jit_mod.funcs.emplace_back(reinterpret_cast<ppu_function_t>(addr)); jit_mod.funcs.emplace_back(reinterpret_cast<ppu_function_t>(addr));
*reinterpret_cast<u32*>(&ppu_ref(block.first)) = ::narrow<u32>(addr); ppu_ref<u32>(block.first) = ::narrow<u32>(addr);
} }
} }
} }
@ -1726,7 +1727,7 @@ extern void ppu_initialize(const ppu_module& info)
{ {
if (block.second) if (block.second)
{ {
*reinterpret_cast<u32*>(&ppu_ref(block.first)) = ::narrow<u32>(reinterpret_cast<uptr>(jit_mod.funcs[index++])); ppu_ref<u32>(block.first) = ::narrow<u32>(reinterpret_cast<uptr>(jit_mod.funcs[index++]));
} }
} }
} }