Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix order of static initialization #13386

Merged
merged 2 commits into from
Feb 17, 2023
+14 −12
Merged

fix order of static initialization #13386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e12135
fix order of static initialization
oltolm Feb 11, 2023
c613429
fix order of static initialization: add comment
oltolm Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions rpcs3/Emu/Cell/PPUModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ extern void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr);

extern void sys_initialize_tls(ppu_thread&, u64, u32, u32, u32);

std::unordered_map<std::string, ppu_static_module*>& ppu_module_manager::get()
{
// In C++ the order of static initialization is undefined if it happens in
// separate compilation units, therefore we have to initialize the map on first use.
static std::unordered_map<std::string, ppu_static_module*> s_module_map;
return s_module_map;
}

// HLE function name cache
std::vector<std::string> g_ppu_function_names;

Expand Down Expand Up @@ -82,12 +90,12 @@ void ppu_static_module::initialize()

void ppu_module_manager::register_module(ppu_static_module* _module)
{
ppu_module_manager::s_module_map.emplace(_module->name, _module);
ppu_module_manager::get().emplace(_module->name, _module);
}

ppu_static_function& ppu_module_manager::access_static_function(const char* _module, u32 fnid)
{
auto& res = ::at32(ppu_module_manager::s_module_map, _module)->functions[fnid];
auto& res = ::at32(ppu_module_manager::get(), _module)->functions[fnid];

if (res.name)
{
Expand All @@ -99,7 +107,7 @@ ppu_static_function& ppu_module_manager::access_static_function(const char* _mod

ppu_static_variable& ppu_module_manager::access_static_variable(const char* _module, u32 vnid)
{
auto& res = ::at32(ppu_module_manager::s_module_map, _module)->variables[vnid];
auto& res = ::at32(ppu_module_manager::get(), _module)->variables[vnid];

if (res.name)
{
Expand All @@ -111,14 +119,14 @@ ppu_static_variable& ppu_module_manager::access_static_variable(const char* _mod

const ppu_static_module* ppu_module_manager::get_module(const std::string& name)
{
const auto& map = ppu_module_manager::s_module_map;
const auto& map = ppu_module_manager::get();
const auto found = map.find(name);
return found != map.end() ? found->second : nullptr;
}

void ppu_module_manager::initialize_modules()
{
for (auto& _module : s_module_map)
for (auto& _module : ppu_module_manager::get())
{
_module.second->initialize();
}
Expand Down
8 changes: 1 addition & 7 deletions rpcs3/Emu/Cell/PPUModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,7 @@ class ppu_module_manager final
}

// We need this to deal with the enumeration over all ppu_static_modules that happens in ppu_initialize_modules
static const std::unordered_map<std::string, ppu_static_module*>& get()
{
return s_module_map;
}
static std::unordered_map<std::string, ppu_static_module*>& get();

static const ppu_static_module cellAdec;
static const ppu_static_module cellAtrac;
Expand Down Expand Up @@ -279,9 +276,6 @@ class ppu_module_manager final
static const ppu_static_module sys_lv2dbg;
static const ppu_static_module static_hle;
static const ppu_static_module hle_patches;

private:
inline static std::unordered_map<std::string, ppu_static_module*> s_module_map;
};

template <auto* Func>
Expand Down