summaryrefslogtreecommitdiffstats
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index d96d3fe16..604875160 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -69,7 +69,7 @@ using AdvanceCallback = void(int cycles_executed);
static AdvanceCallback* advance_callback = nullptr;
static std::vector<MHzChangeCallback> mhz_change_callbacks;
-void FireMhzChange() {
+static void FireMhzChange() {
for (auto callback : mhz_change_callbacks)
callback();
}
@@ -97,7 +97,7 @@ u64 GetGlobalTimeUs() {
return last_global_time_us + us_since_last;
}
-Event* GetNewEvent() {
+static Event* GetNewEvent() {
if (!event_pool)
return new Event;
@@ -106,7 +106,7 @@ Event* GetNewEvent() {
return event;
}
-Event* GetNewTsEvent() {
+static Event* GetNewTsEvent() {
allocated_ts_events++;
if (!event_ts_pool)
@@ -117,12 +117,12 @@ Event* GetNewTsEvent() {
return event;
}
-void FreeEvent(Event* event) {
+static void FreeEvent(Event* event) {
event->next = event_pool;
event_pool = event;
}
-void FreeTsEvent(Event* event) {
+static void FreeTsEvent(Event* event) {
event->next = event_ts_pool;
event_ts_pool = event;
allocated_ts_events--;
@@ -133,7 +133,7 @@ int RegisterEvent(const char* name, TimedCallback callback) {
return (int)event_types.size() - 1;
}
-void AntiCrashCallback(u64 userdata, int cycles_late) {
+static void AntiCrashCallback(u64 userdata, int cycles_late) {
LOG_CRITICAL(Core_Timing, "Savestate broken: an unregistered event was called.");
Core::Halt("invalid timing events");
}
@@ -228,7 +228,7 @@ void ClearPendingEvents() {
}
}
-void AddEventToQueue(Event* new_event) {
+static void AddEventToQueue(Event* new_event) {
Event* prev_event = nullptr;
Event** next_event = &first;
for (;;) {
@@ -459,7 +459,7 @@ void MoveEvents() {
}
void ForceCheck() {
- int cycles_executed = g_slice_length - Core::g_app_core->down_count;
+ s64 cycles_executed = g_slice_length - Core::g_app_core->down_count;
global_timer += cycles_executed;
// This will cause us to check for new events immediately.
Core::g_app_core->down_count = 0;
@@ -468,7 +468,7 @@ void ForceCheck() {
}
void Advance() {
- int cycles_executed = g_slice_length - Core::g_app_core->down_count;
+ s64 cycles_executed = g_slice_length - Core::g_app_core->down_count;
global_timer += cycles_executed;
Core::g_app_core->down_count = g_slice_length;
@@ -504,13 +504,13 @@ void LogPendingEvents() {
}
void Idle(int max_idle) {
- int cycles_down = Core::g_app_core->down_count;
+ s64 cycles_down = Core::g_app_core->down_count;
if (max_idle != 0 && cycles_down > max_idle)
cycles_down = max_idle;
if (first && cycles_down > 0) {
- int cycles_executed = g_slice_length - Core::g_app_core->down_count;
- int cycles_next_event = (int)(first->time - global_timer);
+ s64 cycles_executed = g_slice_length - Core::g_app_core->down_count;
+ s64 cycles_next_event = first->time - global_timer;
if (cycles_next_event < cycles_executed + cycles_down) {
cycles_down = cycles_next_event - cycles_executed;