yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Common/Kernel: Corrections and small bug fixing.

This commit is contained in:
Fernando Sahmkow 2020-05-29 17:37:37 -04:00
parent 272a87127a
commit 7fd7d05838
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/wall_clock.cpp
View File

@ -68,13 +68,8 @@ std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency,
const auto& caps = GetCPUCaps(); const auto& caps = GetCPUCaps();
u64 rtsc_frequency = 0; u64 rtsc_frequency = 0;
if (caps.invariant_tsc) { 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) { if (rtsc_frequency == 0) {
return std::make_unique<StandardWallClock>(emulated_cpu_frequency, return std::make_unique<StandardWallClock>(emulated_cpu_frequency,
emulated_clock_frequency); emulated_clock_frequency);

2
src/core/hle/kernel/svc.cpp
View File

@ -344,10 +344,10 @@ static ResultCode SendSyncRequest(Core::System& system, Handle handle) {
SchedulerLock lock(system.Kernel()); SchedulerLock lock(system.Kernel());
auto* sync_object = thread->GetHLESyncObject(); auto* sync_object = thread->GetHLESyncObject();
sync_object->RemoveWaitingThread(SharedFrom(thread)); sync_object->RemoveWaitingThread(SharedFrom(thread));
}
thread->InvokeHLECallback(SharedFrom(thread)); thread->InvokeHLECallback(SharedFrom(thread));
} }
}
return thread->GetSignalingResult(); return thread->GetSignalingResult();
} }