Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved down_count to CoreTiming

Browse source
This commit is contained in:
Huw Pascoe 2017-09-30 17:25:49 +01:00
parent afb1012bcd
commit 529f4a0131
9 changed files with 33 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/core/core_timing.cpp
View file

@ -57,6 +57,9 @@ static s64 idled_cycles;
static s64 last_global_time_ticks;
static s64 last_global_time_us;
static s64 down_count = 0; ///< A decreasing counter of remaining cycles before the next event,
/// decreased by the cpu run loop
static std::recursive_mutex external_event_section;
// Warning: not included in save state.
@ -146,7 +149,7 @@ void UnregisterAllEvents() {
}
void Init() {
Core::CPU().down_count = INITIAL_SLICE_LENGTH;
down_count = INITIAL_SLICE_LENGTH;
g_slice_length = INITIAL_SLICE_LENGTH;
global_timer = 0;
idled_cycles = 0;
@ -185,8 +188,15 @@ void Shutdown() {
}
}
void AddTicks(u64 ticks) {
down_count -= ticks;
if (down_count < 0) {
Advance();
}
}
u64 GetTicks() {
return (u64)global_timer + g_slice_length - Core::CPU().down_count;
return (u64)global_timer + g_slice_length - down_count;
}
u64 GetIdleTicks() {
@ -460,18 +470,18 @@ void MoveEvents() {
}
void ForceCheck() {
s64 cycles_executed = g_slice_length - Core::CPU().down_count;
s64 cycles_executed = g_slice_length - down_count;
global_timer += cycles_executed;
// This will cause us to check for new events immediately.
Core::CPU().down_count = 0;
down_count = 0;
// But let's not eat a bunch more time in Advance() because of this.
g_slice_length = 0;
}
void Advance() {
s64 cycles_executed = g_slice_length - Core::CPU().down_count;
s64 cycles_executed = g_slice_length - down_count;
global_timer += cycles_executed;
Core::CPU().down_count = g_slice_length;
down_count = g_slice_length;
if (has_ts_events)
MoveEvents();
@ -480,7 +490,7 @@ void Advance() {
if (!first) {
if (g_slice_length < 10000) {
g_slice_length += 10000;
Core::CPU().down_count += g_slice_length;
down_count += g_slice_length;
}
} else {
// Note that events can eat cycles as well.
@ -490,7 +500,7 @@ void Advance() {
const int diff = target - g_slice_length;
g_slice_length += diff;
Core::CPU().down_count += diff;
down_count += diff;
}
if (advance_callback)
advance_callback(static_cast<int>(cycles_executed));
@ -506,12 +516,12 @@ void LogPendingEvents() {
}
void Idle(int max_idle) {
s64 cycles_down = Core::CPU().down_count;
s64 cycles_down = down_count;
if (max_idle != 0 && cycles_down > max_idle)
cycles_down = max_idle;
if (first && cycles_down > 0) {
s64 cycles_executed = g_slice_length - Core::CPU().down_count;
s64 cycles_executed = g_slice_length - down_count;
s64 cycles_next_event = first->time - global_timer;
if (cycles_next_event < cycles_executed + cycles_down) {
@ -526,9 +536,9 @@ void Idle(int max_idle) {
cycles_down / (float)(g_clock_rate_arm11 * 0.001f));
idled_cycles += cycles_down;
Core::CPU().down_count -= cycles_down;
if (Core::CPU().down_count == 0)
Core::CPU().down_count = -1;
down_count -= cycles_down;
if (down_count == 0)
down_count = -1;
}
std::string GetScheduledEventsSummary() {