From a4d11f4427859cbe82fc825f8493844e17bb668f Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 10 Sep 2022 01:48:15 -0700 Subject: core: Partially persist emulation state across game boots. --- src/core/core_timing.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/core/core_timing.h') diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 3259397b2..7996b529f 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -61,8 +61,8 @@ public: /// required to end slice - 1 and start slice 0 before the first cycle of code is executed. void Initialize(std::function&& on_thread_init_); - /// Tears down all timing related functionality. - void Shutdown(); + /// Clear all pending events. This should ONLY be done on exit. + void ClearPendingEvents(); /// Sets if emulation is multicore or single core, must be set before Initialize void SetMulticore(bool is_multicore_) { @@ -136,9 +136,6 @@ public: private: struct Event; - /// Clear all pending events. This should ONLY be done on exit. - void ClearPendingEvents(); - static void ThreadEntry(CoreTiming& instance); void ThreadLoop(); -- cgit v1.2.3 From 11f85ea7130a5245bd8d2090f0dd76ba65f15d23 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 14 Oct 2022 23:37:02 -0700 Subject: core: core_timing: Remove unused IsHostTiming. --- src/core/core_timing.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/core/core_timing.h') diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 7996b529f..bd21dd904 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -69,11 +69,6 @@ public: is_multicore = is_multicore_; } - /// Check if it's using host timing. - bool IsHostTiming() const { - return is_multicore; - } - /// Pauses/Unpauses the execution of the timer thread. void Pause(bool is_paused); -- cgit v1.2.3 From 638fa6170a8a4c36ffa644055e683a7e50aa7ae5 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 15 Oct 2022 00:48:28 -0700 Subject: core: core_timing: Re-initialize if single/multicore state changes. --- src/core/core_timing.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/core_timing.h') diff --git a/src/core/core_timing.h b/src/core/core_timing.h index bd21dd904..b5925193c 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -134,6 +134,8 @@ private: static void ThreadEntry(CoreTiming& instance); void ThreadLoop(); + void Reset(); + std::unique_ptr clock; s64 global_timer = 0; -- cgit v1.2.3