H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fssrv_program_info: Fix random crashes at boot

Browse Source
This commit is contained in:
FearlessTobi 2024-02-25 19:12:47 +01:00
parent 01a28edab5
commit ade3a79bde
1 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/core/file_sys/fssrv/impl/fssrv_program_info.cpp
View File

@ -12,33 +12,7 @@ namespace FileSys::FsSrv::Impl {
namespace { namespace {
constinit std::aligned_storage<0x80>::type g_static_buffer_for_program_info_for_initial_process = constinit bool s_fls_initialized_s_initial_program_info = false;
{};
template <typename T>
class StaticAllocatorForProgramInfoForInitialProcess : public std::allocator<T> {
public:
StaticAllocatorForProgramInfoForInitialProcess() {}
template <typename U>
StaticAllocatorForProgramInfoForInitialProcess(
const StaticAllocatorForProgramInfoForInitialProcess<U>&) {}
template <typename U>
struct rebind {
using other = StaticAllocatorForProgramInfoForInitialProcess<U>;
};
[[nodiscard]] T* allocate(::std::size_t n) {
ASSERT(sizeof(T) * n <= sizeof(g_static_buffer_for_program_info_for_initial_process));
return reinterpret_cast<T*>(
std::addressof(g_static_buffer_for_program_info_for_initial_process));
}
void deallocate([[maybe_unused]] T* p, [[maybe_unused]] std::size_t n) {
// No-op
}
};
constinit bool g_initialized = false; constinit bool g_initialized = false;
@ -82,30 +56,18 @@ std::shared_ptr<ProgramInfo> ProgramInfo::GetProgramInfoForInitialProcess() {
: ProgramInfo(data, data_size, desc, desc_size) {} : ProgramInfo(data, data_size, desc, desc_size) {}
}; };
constexpr const u32 FileAccessControlForInitialProgram[0x1C / sizeof(u32)] = { constexpr const std::array<u32, 0x1C / sizeof(u32)> FileAccessControlForInitialProgram = {
0x00000001, 0x00000000, 0x80000000, 0x0000001C, 0x00000000, 0x0000001C, 0x00000000}; 0x00000001, 0x00000000, 0x80000000, 0x0000001C, 0x00000000, 0x0000001C, 0x00000000};
constexpr const u32 FileAccessControlDescForInitialProgram[0x2C / sizeof(u32)] = { constexpr const std::array<u32, 0x2C / sizeof(u32)> FileAccessControlDescForInitialProgram = {
0x00000001, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0xFFFFFFFF,
0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF}; 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF};
static constinit Common::TypedStorage<std::shared_ptr<ProgramInfo>> // if (!s_fls_initialized_s_initial_program_info) {
s_fls_storage_for_s_initial_program_info{}; std::shared_ptr<ProgramInfo> s_initial_program_info = std::make_shared<ProgramInfoHelper>(
static constinit bool s_fls_initialized_s_initial_program_info = false; FileAccessControlForInitialProgram.data(), sizeof(FileAccessControlForInitialProgram),
static std::mutex s_fls_init_lock_s_initial_program_info{}; FileAccessControlDescForInitialProgram.data(),
if (!(s_fls_initialized_s_initial_program_info)) { sizeof(FileAccessControlDescForInitialProgram));
std::scoped_lock sl_fls_for_s_initial_program_info{s_fls_init_lock_s_initial_program_info}; //}
if (!(s_fls_initialized_s_initial_program_info)) {
new (Common::Impl::GetPointerForConstructAt(s_fls_storage_for_s_initial_program_info))
std::shared_ptr<ProgramInfo>(std::allocate_shared<ProgramInfoHelper>(
StaticAllocatorForProgramInfoForInitialProcess<char>{},
FileAccessControlForInitialProgram, sizeof(FileAccessControlForInitialProgram),
FileAccessControlDescForInitialProgram,
sizeof(FileAccessControlDescForInitialProgram)));
s_fls_initialized_s_initial_program_info = true;
}
}
std::shared_ptr<ProgramInfo>& s_initial_program_info =
Common::GetReference(s_fls_storage_for_s_initial_program_info);
return s_initial_program_info; return s_initial_program_info;
} }