piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

IOS: Emulate ES boot timings

Browse Source
This commit is contained in:
Léo Lam 2021-02-26 13:59:11 +01:00
parent 688bd6141a
commit 0da5ea86a3
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -18,6 +18,8 @@
#include "Common/StringUtil.h"
#include "Core/CommonTitles.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/Memmap.h"
#include "Core/IOS/ES/Formats.h"
#include "Core/IOS/FS/FileSystem.h"
@ -54,6 +56,25 @@ constexpr std::array<DirectoryToCreate, 9> s_directories_to_create = {{
{"/meta", 0, public_modes, SYSMENU_UID, SYSMENU_GID},
{"/wfs", 0, {FS::Mode::ReadWrite, FS::Mode::None, FS::Mode::None}, PID_UNKNOWN, PID_UNKNOWN},
}};
CoreTiming::EventType* s_finish_init_event;
constexpr SystemTimers::TimeBaseTick GetESBootTicks(u32 ios_version)
{
if (ios_version < 28)
return 22'000'000_tbticks;
// Starting from IOS28, ES needs to load additional modules when it starts
// since the main ELF only contains the kernel and core modules.
if (ios_version < 57)
return 33'000'000_tbticks;
// These versions have extra modules that make them noticeably slower to load.
if (ios_version == 57 || ios_version == 58 || ios_version == 59)
return 39'000'000_tbticks;
return 37'000'000_tbticks;
}
} // namespace
ESDevice::ESDevice(Kernel& ios, const std::string& device_name) : Device(ios, device_name)
@ -77,6 +98,30 @@ ESDevice::ESDevice(Kernel& ios, const std::string& device_name) : Device(ios, de
FinishAllStaleImports();
if (Core::IsRunningAndStarted())
{
CoreTiming::RemoveEvent(s_finish_init_event);
CoreTiming::ScheduleEvent(GetESBootTicks(m_ios.GetVersion()), s_finish_init_event);
}
else
{
FinishInit();
}
}
void ESDevice::InitializeEmulationState()
{
s_finish_init_event = CoreTiming::RegisterEvent(
"IOS-ESFinishInit", [](u64, s64) { GetIOS()->GetES()->FinishInit(); });
}
void ESDevice::FinalizeEmulationState()
{
s_finish_init_event = nullptr;
}
void ESDevice::FinishInit()
{
if (s_title_to_launch != 0)
{
NOTICE_LOG_FMT(IOS, "Re-launching title after IOS reload.");

5
Source/Core/Core/IOS/ES/ES.h
View File

@ -43,6 +43,9 @@ class ESDevice final : public Device
public:
ESDevice(Kernel& ios, const std::string& device_name);
static void InitializeEmulationState();
static void FinalizeEmulationState();
ReturnCode DIVerify(const ES::TMDReader& tmd, const ES::TicketReader& ticket);
bool LaunchTitle(u64 title_id, bool skip_reload = false);
@ -364,6 +367,8 @@ private:
void FinishStaleImport(u64 title_id);
void FinishAllStaleImports();
void FinishInit();
std::string GetContentPath(u64 title_id, const ES::Content& content, Ticks ticks = {}) const;
struct OpenedContent

3
Source/Core/Core/IOS/IOS.cpp
View File

@ -864,6 +864,8 @@ void Init()
device->EventNotify();
});
ESDevice::InitializeEmulationState();
s_event_finish_ppc_bootstrap =
CoreTiming::RegisterEvent("IOSFinishPPCBootstrap", FinishPPCBootstrap);
@ -883,6 +885,7 @@ void Init()
void Shutdown()
{
s_ios.reset();
ESDevice::FinalizeEmulationState();
}
EmulationKernel* GetIOS()