octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #275 from MerryMage/addticks-dynarmic

Browse Source 
arm_dynarmic: Fix timing
This commit is contained in:
bunnei
2018-03-24 05:47:42 -04:00
committed by GitHub
parent 31816aac38 88c9608eac
commit 46945b5c96
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/arm/dynarmic/arm_dynarmic.cpp
View File

@@ -86,21 +86,17 @@ public:
} }
void AddTicks(u64 ticks) override { void AddTicks(u64 ticks) override {
if (ticks > ticks_remaining) { CoreTiming::AddTicks(ticks - num_interpreted_instructions);
ticks_remaining = 0; num_interpreted_instructions = 0;
return;
}
ticks -= ticks_remaining;
} }
u64 GetTicksRemaining() override { u64 GetTicksRemaining() override {
return ticks_remaining; return std::max(CoreTiming::GetDowncount(), 0);
} }
u64 GetCNTPCT() override { u64 GetCNTPCT() override {
return CoreTiming::GetTicks(); return CoreTiming::GetTicks();
} }
ARM_Dynarmic& parent; ARM_Dynarmic& parent;
size_t ticks_remaining = 0;
size_t num_interpreted_instructions = 0; size_t num_interpreted_instructions = 0;
u64 tpidrro_el0 = 0; u64 tpidrro_el0 = 0;
u64 tpidr_el0 = 0; u64 tpidr_el0 = 0;