N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Core: Cleaned up SingleStep(), updated default LCD refresh to assume each instruction is ~3 cycles

Browse source
This commit is contained in:
bunnei 2014-06-06 00:06:33 -04:00
parent 52735d5513
commit bac6ca233c
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/core.cpp
View file

@ -18,6 +18,7 @@
namespace Core { namespace Core {
u64 g_last_ticks = 0; ///< Last CPU ticks
ARM_Disasm* g_disasm = NULL; ///< ARM disassembler ARM_Disasm* g_disasm = NULL; ///< ARM disassembler
ARM_Interface* g_app_core = NULL; ///< ARM11 application core ARM_Interface* g_app_core = NULL; ///< ARM11 application core
ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core
@ -25,7 +26,7 @@ ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core
/// Run the core CPU loop /// Run the core CPU loop
void RunLoop() { void RunLoop() {
for (;;){ for (;;){
g_app_core->Run(LCD::kFrameTicks / 3); g_app_core->Run(LCD::kFrameTicks);
HW::Update(); HW::Update();
Kernel::Reschedule(); Kernel::Reschedule();
} }
@ -33,16 +34,14 @@ void RunLoop() {
/// Step the CPU one instruction /// Step the CPU one instruction
void SingleStep() { void SingleStep() {
static int ticks = 0;
g_app_core->Step(); g_app_core->Step();
if ((ticks >= LCD::kFrameTicks / 3) || HLE::g_reschedule) { // Update and reschedule after approx. 1 frame
u64 current_ticks = Core::g_app_core->GetTicks();
if ((current_ticks - g_last_ticks) >= LCD::kFrameTicks || HLE::g_reschedule) {
g_last_ticks = current_ticks;
HW::Update(); HW::Update();
Kernel::Reschedule(); Kernel::Reschedule();
ticks = 0;
} else {
ticks++;
} }
} }
@ -64,6 +63,8 @@ int Init() {
g_app_core = new ARM_Interpreter(); g_app_core = new ARM_Interpreter();
g_sys_core = new ARM_Interpreter(); g_sys_core = new ARM_Interpreter();
g_last_ticks = Core::g_app_core->GetTicks();
return 0; return 0;
} }

3
src/core/hw/lcd.h
View file

@ -8,7 +8,8 @@
namespace LCD { namespace LCD {
static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second static const u32 kFrameCycles = 268123480 / 60; ///< 268MHz / 60 frames per second
static const u32 kFrameTicks = kFrameCycles / 3; ///< Approximate number of instructions/frame
struct Registers { struct Registers {
u32 framebuffer_top_left_1; u32 framebuffer_top_left_1;