ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CPU/Recompiler: Skip calling event update on interrupts

This commit is contained in:
Connor McLaughlin 2020-10-18 14:43:48 +10:00
parent a16c2f5462
commit 11faf6ccfb
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/cpu_recompiler_code_generator_aarch64.cpp
View File

@ -1976,6 +1976,12 @@ CodeCache::DispatcherFunction CodeGenerator::CompileDispatcher()
m_emit->Bind(&downcount_hit); m_emit->Bind(&downcount_hit);
// check events then for frame done // check events then for frame done
m_emit->ldr(a64::w8, a64::MemOperand(GetHostReg64(RCPUPTR), offsetof(State, pending_ticks)));
EmitLoadGlobalAddress(9, TimingEvents::GetHeadEventPtr());
m_emit->ldr(a64::x9, a64::MemOperand(a64::x9));
m_emit->ldr(a64::w9, a64::MemOperand(a64::x9, offsetof(TimingEvent, m_downcount)));
m_emit->cmp(a64::w8, a64::w9);
m_emit->b(&frame_done_loop, a64::lt);
EmitCall(reinterpret_cast<const void*>(&TimingEvents::RunEvents)); EmitCall(reinterpret_cast<const void*>(&TimingEvents::RunEvents));
m_emit->b(&frame_done_loop); m_emit->b(&frame_done_loop);

5
src/core/cpu_recompiler_code_generator_x64.cpp
View File

@ -2606,6 +2606,11 @@ CodeCache::DispatcherFunction CodeGenerator::CompileDispatcher()
m_emit->L(downcount_hit); m_emit->L(downcount_hit);
// check events then for frame done // check events then for frame done
EmitLoadGlobalAddress(Xbyak::Operand::RAX, TimingEvents::GetHeadEventPtr());
m_emit->mov(m_emit->rax, m_emit->qword[m_emit->rax]);
m_emit->mov(m_emit->eax, m_emit->dword[m_emit->rax + offsetof(TimingEvent, m_downcount)]);
m_emit->cmp(m_emit->eax, m_emit->dword[m_emit->rbp + offsetof(State, pending_ticks)]);
m_emit->jg(frame_done_loop);
EmitCall(reinterpret_cast<const void*>(&TimingEvents::RunEvents)); EmitCall(reinterpret_cast<const void*>(&TimingEvents::RunEvents));
m_emit->jmp(frame_done_loop); m_emit->jmp(frame_done_loop);

2
src/core/save_state_version.h
View File

@ -2,7 +2,7 @@
#include "types.h" #include "types.h"
static constexpr u32 SAVE_STATE_MAGIC = 0x43435544; static constexpr u32 SAVE_STATE_MAGIC = 0x43435544;
static constexpr u32 SAVE_STATE_VERSION = 42; static constexpr u32 SAVE_STATE_VERSION = 43;
static constexpr u32 SAVE_STATE_MINIMUM_VERSION = 42; static constexpr u32 SAVE_STATE_MINIMUM_VERSION = 42;
#pragma pack(push, 4) #pragma pack(push, 4)

13
src/core/timing_event.cpp
View File

@ -14,7 +14,6 @@ static TimingEvent* s_active_events_tail;
static TimingEvent* s_current_event = nullptr; static TimingEvent* s_current_event = nullptr;
static u32 s_active_event_count = 0; static u32 s_active_event_count = 0;
static u32 s_global_tick_counter = 0; static u32 s_global_tick_counter = 0;
static u32 s_last_event_run_time = 0;
u32 GetGlobalTickCounter() u32 GetGlobalTickCounter()
{ {
@ -29,7 +28,6 @@ void Initialize()
void Reset() void Reset()
{ {
s_global_tick_counter = 0; s_global_tick_counter = 0;
s_last_event_run_time = 0;
} }
void Shutdown() void Shutdown()
@ -264,7 +262,7 @@ void RunEvents()
{ {
DebugAssert(!s_current_event); DebugAssert(!s_current_event);
TickCount pending_ticks = (s_global_tick_counter + CPU::GetPendingTicks()) - s_last_event_run_time; TickCount pending_ticks = CPU::GetPendingTicks();
CPU::ResetPendingTicks(); CPU::ResetPendingTicks();
while (pending_ticks > 0) while (pending_ticks > 0)
{ {
@ -300,7 +298,6 @@ void RunEvents()
} }
} }
s_last_event_run_time = s_global_tick_counter;
s_current_event = nullptr; s_current_event = nullptr;
UpdateCPUDowncount(); UpdateCPUDowncount();
} }
@ -342,7 +339,11 @@ bool DoState(StateWrapper& sw)
event->m_interval = interval; event->m_interval = interval;
} }
sw.Do(&s_last_event_run_time); if (sw.GetVersion() < 43)
{
u32 last_event_run_time = 0;
sw.Do(&last_event_run_time);
}
Log_DevPrintf("Loaded %u events from save state.", event_count); Log_DevPrintf("Loaded %u events from save state.", event_count);
SortEvents(); SortEvents();
@ -361,8 +362,6 @@ bool DoState(StateWrapper& sw)
sw.Do(&event->m_interval); sw.Do(&event->m_interval);
} }
sw.Do(&s_last_event_run_time);
Log_DevPrintf("Wrote %u events to save state.", s_active_event_count); Log_DevPrintf("Wrote %u events to save state.", s_active_event_count);
} }