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

fixed_typemap.hpp: make it a bit fool-proof

Browse source 
Require objects to be non-copyable (move is still allowed).
This commit is contained in:
Nekotekina 2021-03-02 19:22:39 +03:00
parent 004ebfdaee
commit 52fe86b56c
19 changed files with 121 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2597,6 +2597,13 @@ extern void ppu_initialize()
}
}
struct ppu_toc_manager
{
std::unordered_map<u32, u32> toc_map;
shared_mutex mutex;
};
bool ppu_initialize(const ppu_module& info, bool check_only)
{
if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm)
@ -2607,7 +2614,7 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
}
// Temporarily
s_ppu_toc = &g_fxo->get<std::unordered_map<u32, u32>>();
s_ppu_toc = &g_fxo->get<ppu_toc_manager>().toc_map;
for (const auto& func : info.funcs)
{
@ -2994,7 +3001,7 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
}
// Keep allocating workload
const auto [obj_name, part] = std::as_const(workload)[i];
const auto& [obj_name, part] = std::as_const(workload)[i];
// Allocate "core"
std::lock_guard jlock(g_fxo->get<jit_core_allocator>().sem);