|
|
@ -88,9 +88,8 @@ public:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void AddTicks(u64 ticks) override {
|
|
|
|
void AddTicks(u64 ticks) override {
|
|
|
|
if (parent.uses_wall_clock) {
|
|
|
|
ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// Divide the number of ticks by the amount of CPU cores. TODO(Subv): This yields only a
|
|
|
|
// Divide the number of ticks by the amount of CPU cores. TODO(Subv): This yields only a
|
|
|
|
// rough approximation of the amount of executed ticks in the system, it may be thrown off
|
|
|
|
// rough approximation of the amount of executed ticks in the system, it may be thrown off
|
|
|
|
// if not all cores are doing a similar amount of work. Instead of doing this, we should
|
|
|
|
// if not all cores are doing a similar amount of work. Instead of doing this, we should
|
|
|
@ -106,12 +105,8 @@ public:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u64 GetTicksRemaining() override {
|
|
|
|
u64 GetTicksRemaining() override {
|
|
|
|
if (parent.uses_wall_clock) {
|
|
|
|
ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");
|
|
|
|
if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {
|
|
|
|
|
|
|
|
return minimum_run_cycles;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0U;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
|
|
|
|
return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -146,6 +141,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
|
|
|
|
|
|
|
|
|
|
|
|
// Timing
|
|
|
|
// Timing
|
|
|
|
config.wall_clock_cntpct = uses_wall_clock;
|
|
|
|
config.wall_clock_cntpct = uses_wall_clock;
|
|
|
|
|
|
|
|
config.enable_cycle_counting = !uses_wall_clock;
|
|
|
|
|
|
|
|
|
|
|
|
// Code cache size
|
|
|
|
// Code cache size
|
|
|
|
config.code_cache_size = 512_MiB;
|
|
|
|
config.code_cache_size = 512_MiB;
|
|
|
@ -222,13 +218,13 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
|
|
|
|
|
|
|
|
|
|
|
|
void ARM_Dynarmic_32::Run() {
|
|
|
|
void ARM_Dynarmic_32::Run() {
|
|
|
|
while (true) {
|
|
|
|
while (true) {
|
|
|
|
jit->Run();
|
|
|
|
const auto hr = jit->Run();
|
|
|
|
if (!svc_called) {
|
|
|
|
if (!svc_called) {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
svc_called = false;
|
|
|
|
svc_called = false;
|
|
|
|
Kernel::Svc::Call(system, svc_swi);
|
|
|
|
Kernel::Svc::Call(system, svc_swi);
|
|
|
|
if (shutdown) {
|
|
|
|
if (shutdown || Has(hr, Dynarmic::HaltReason::UserDefined2)) {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -318,6 +314,10 @@ void ARM_Dynarmic_32::PrepareReschedule() {
|
|
|
|
shutdown = true;
|
|
|
|
shutdown = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ARM_Dynarmic_32::SignalInterrupt() {
|
|
|
|
|
|
|
|
jit->HaltExecution(Dynarmic::HaltReason::UserDefined2);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ARM_Dynarmic_32::ClearInstructionCache() {
|
|
|
|
void ARM_Dynarmic_32::ClearInstructionCache() {
|
|
|
|
jit->ClearCache();
|
|
|
|
jit->ClearCache();
|
|
|
|
}
|
|
|
|
}
|
|
|
|