suyu/dynarmic
28
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove ExceptionalExit hack

Browse source
This commit is contained in:
MerryMage 2021-05-04 14:29:58 +01:00
parent 030ff82ba8
commit d6592c7142
4 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/dynarmic/A32/a32.h
View file

@ -59,13 +59,6 @@ public:
*/ */
void HaltExecution(); void HaltExecution();
/**
* HACK:
* Exits execution from a callback, the callback must rewind the stack or
* never return to dynarmic from it's current stack.
*/
void ExceptionalExit();
/// View and modify registers. /// View and modify registers.
std::array<std::uint32_t, 16>& Regs(); std::array<std::uint32_t, 16>& Regs();
const std::array<std::uint32_t, 16>& Regs() const; const std::array<std::uint32_t, 16>& Regs() const;

7
include/dynarmic/A64/a64.h
View file

@ -60,13 +60,6 @@ public:
*/ */
void HaltExecution(); void HaltExecution();
/**
* HACK:
* Exits execution from a callback, the callback must rewind the stack or
* never return to dynarmic from it's current stack.
*/
void ExceptionalExit();
/// Read Stack Pointer /// Read Stack Pointer
std::uint64_t GetSP() const; std::uint64_t GetSP() const;
/// Modify Stack Pointer /// Modify Stack Pointer

14
src/backend/x64/a32_interface.cpp
View file

@ -89,15 +89,6 @@ struct Jit::Impl {
block_of_code.StepCode(&jit_state, GetCurrentSingleStep()); block_of_code.StepCode(&jit_state, GetCurrentSingleStep());
} }
void ExceptionalExit() {
ClearExclusiveState();
if (!conf.wall_clock_cntpct) {
const s64 ticks = jit_state.cycles_to_run - jit_state.cycles_remaining;
conf.callbacks->AddTicks(ticks);
}
PerformCacheInvalidation();
}
void ClearExclusiveState() { void ClearExclusiveState() {
jit_state.exclusive_state = 0; jit_state.exclusive_state = 0;
} }
@ -233,11 +224,6 @@ void Jit::HaltExecution() {
impl->jit_state.halt_requested = true; impl->jit_state.halt_requested = true;
} }
void Jit::ExceptionalExit() {
impl->ExceptionalExit();
is_executing = false;
}
void Jit::ClearExclusiveState() { void Jit::ClearExclusiveState() {
impl->ClearExclusiveState(); impl->ClearExclusiveState();
} }

14
src/backend/x64/a64_interface.cpp
View file

@ -87,16 +87,6 @@ public:
PerformRequestedCacheInvalidation(); PerformRequestedCacheInvalidation();
} }
void ExceptionalExit() {
ClearExclusiveState();
if (!conf.wall_clock_cntpct) {
const s64 ticks = jit_state.cycles_to_run - jit_state.cycles_remaining;
conf.callbacks->AddTicks(ticks);
}
PerformRequestedCacheInvalidation();
is_executing = false;
}
void ClearCache() { void ClearCache() {
invalidate_entire_cache = true; invalidate_entire_cache = true;
RequestCacheInvalidation(); RequestCacheInvalidation();
@ -325,10 +315,6 @@ void Jit::HaltExecution() {
impl->HaltExecution(); impl->HaltExecution();
} }
void Jit::ExceptionalExit() {
impl->ExceptionalExit();
}
u64 Jit::GetSP() const { u64 Jit::GetSP() const {
return impl->GetSP(); return impl->GetSP();
} }