notenergydrinks/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

Revert "core: Fix clang build"

Browse source
This commit is contained in:
bunnei 2020-10-20 19:07:39 -07:00 • committed by GitHub
parent fdd9154069
commit 3d592972dc
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 667 additions and 906 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/core_timing.cpp
View file

@ -140,8 +140,7 @@ void CoreTiming::AddTicks(u64 ticks) {
void CoreTiming::Idle() {
if (!event_queue.empty()) {
const u64 next_event_time = event_queue.front().time;
const u64 next_ticks =
static_cast<u64>(nsToCycles(std::chrono::nanoseconds(next_event_time))) + 10;
const u64 next_ticks = nsToCycles(std::chrono::nanoseconds(next_event_time)) + 10U;
if (next_ticks > ticks) {
ticks = next_ticks;
}
@ -188,7 +187,7 @@ void CoreTiming::RemoveEvent(const std::shared_ptr<EventType>& event_type) {
std::optional<s64> CoreTiming::Advance() {
std::scoped_lock lock{advance_lock, basic_lock};
global_timer = static_cast<u64>(GetGlobalTimeNs().count());
global_timer = GetGlobalTimeNs().count();
while (!event_queue.empty() && event_queue.front().time <= global_timer) {
Event evt = std::move(event_queue.front());
@ -202,11 +201,11 @@ std::optional<s64> CoreTiming::Advance() {
}
basic_lock.lock();
global_timer = static_cast<u64>(GetGlobalTimeNs().count());
global_timer = GetGlobalTimeNs().count();
}
if (!event_queue.empty()) {
const auto next_time = static_cast<s64>(event_queue.front().time - global_timer);
const s64 next_time = event_queue.front().time - global_timer;
return next_time;
} else {
return std::nullopt;
@ -241,14 +240,14 @@ std::chrono::nanoseconds CoreTiming::GetGlobalTimeNs() const {
if (is_multicore) {
return clock->GetTimeNS();
}
return CyclesToNs(static_cast<s64>(ticks));
return CyclesToNs(ticks);
}
std::chrono::microseconds CoreTiming::GetGlobalTimeUs() const {
if (is_multicore) {
return clock->GetTimeUS();
}
return CyclesToUs(static_cast<s64>(ticks));
return CyclesToUs(ticks);
}
} // namespace Core::Timing