From 7fd7d05838b88e9dd63a7329e29ea355669a5f18 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Fri, 29 May 2020 17:37:37 -0400
Subject: [PATCH] Common/Kernel: Corrections and small bug fixing.
---
src/common/wall_clock.cpp | 7 +------
src/core/hle/kernel/svc.cpp | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp
index a46db6bbf..3afbdb898 100644
--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@@ -68,12 +68,7 @@ std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency,
const auto& caps = GetCPUCaps();
u64 rtsc_frequency = 0;
if (caps.invariant_tsc) {
- if (caps.base_frequency != 0) {
- rtsc_frequency = static_cast<u64>(caps.base_frequency) * 1000000U;
- }
- if (rtsc_frequency == 0) {
- rtsc_frequency = EstimateRDTSCFrequency();
- }
+ rtsc_frequency = EstimateRDTSCFrequency();
}
if (rtsc_frequency == 0) {
return std::make_unique<StandardWallClock>(emulated_cpu_frequency,
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 781032cd1..013ae9e34 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -344,9 +344,9 @@ static ResultCode SendSyncRequest(Core::System& system, Handle handle) {
SchedulerLock lock(system.Kernel());
auto* sync_object = thread->GetHLESyncObject();
sync_object->RemoveWaitingThread(SharedFrom(thread));
-
- thread->InvokeHLECallback(SharedFrom(thread));
}
+
+ thread->InvokeHLECallback(SharedFrom(thread));
}
return thread->GetSignalingResult();