octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4560 from lioncash/convert 

core_timing: Resolve sign conversion warning
This commit is contained in:
bunnei 2020-08-23 02:11:14 -04:00 committed by GitHub
parent baff9ffcac 79504f1a39
commit cfb7fd395c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/core_timing.cpp
View File

@ -7,14 +7,14 @@
#include <string> #include <string>
#include <tuple> #include <tuple>
#include "common/assert.h"
#include "common/microprofile.h" #include "common/microprofile.h"
#include "core/core_timing.h" #include "core/core_timing.h"
#include "core/core_timing_util.h" #include "core/core_timing_util.h"
#include "core/hardware_properties.h"
namespace Core::Timing { namespace Core::Timing {
constexpr u64 MAX_SLICE_LENGTH = 4000; constexpr s64 MAX_SLICE_LENGTH = 4000;
std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) { std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) {
return std::make_shared<EventType>(std::move(callback), std::move(name)); return std::make_shared<EventType>(std::move(callback), std::move(name));
@ -37,10 +37,8 @@ struct CoreTiming::Event {
} }
}; };
CoreTiming::CoreTiming() { CoreTiming::CoreTiming()
clock = : clock{Common::CreateBestMatchingClock(Hardware::BASE_CLOCK_RATE, Hardware::CNTFREQ)} {}
Common::CreateBestMatchingClock(Core::Hardware::BASE_CLOCK_RATE, Core::Hardware::CNTFREQ);
}
CoreTiming::~CoreTiming() = default; CoreTiming::~CoreTiming() = default;
@ -136,7 +134,7 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
void CoreTiming::AddTicks(u64 ticks) { void CoreTiming::AddTicks(u64 ticks) {
this->ticks += ticks; this->ticks += ticks;
downcount -= ticks; downcount -= static_cast<s64>(ticks);
} }
void CoreTiming::Idle() { void CoreTiming::Idle() {

1
src/core/core_timing_util.cpp
View File

@ -8,6 +8,7 @@
#include <limits> #include <limits>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/uint128.h" #include "common/uint128.h"
#include "core/hardware_properties.h"
namespace Core::Timing { namespace Core::Timing {

1
src/core/core_timing_util.h
View File

@ -6,7 +6,6 @@
#include <chrono> #include <chrono>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hardware_properties.h"
namespace Core::Timing { namespace Core::Timing {