mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #568 from bunnei/hook-isb-a32

Browse source 
A32: Add hook_isb option.
This commit is contained in:
LC 2021-01-29 06:52:09 -05:00 committed by GitHub
commit 8c09da666a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,8 @@ struct UserCallbacks {
virtual void ExceptionRaised(VAddr pc, Exception exception) = 0; virtual void ExceptionRaised(VAddr pc, Exception exception) = 0;
virtual void InstructionSynchronizationBarrierRaised() {}
// Timing-related callbacks // Timing-related callbacks
// ticks ticks have passed // ticks ticks have passed
virtual void AddTicks(std::uint64_t ticks) = 0; virtual void AddTicks(std::uint64_t ticks) = 0;
@ -164,6 +166,11 @@ struct UserConfig {
// Coprocessors // Coprocessors
std::array<std::shared_ptr<Coprocessor>, 16> coprocessors{}; std::array<std::shared_ptr<Coprocessor>, 16> coprocessors{};
/// When set to true, UserCallbacks::InstructionSynchronizationBarrierRaised will be
/// called when an ISB instruction is executed.
/// When set to false, ISB will be treated as a NOP instruction.
bool hook_isb = false;
/// Hint instructions would cause ExceptionRaised to be called with the appropriate /// Hint instructions would cause ExceptionRaised to be called with the appropriate
/// argument. /// argument.
bool hook_hint_instructions = false; bool hook_hint_instructions = false;

8
src/backend/x64/a32_emit_x64.cpp
View file

@ -720,10 +720,12 @@ void A32EmitX64::EmitA32DataMemoryBarrier(A32EmitContext&, IR::Inst*) {
} }
void A32EmitX64::EmitA32InstructionSynchronizationBarrier(A32EmitContext& ctx, IR::Inst*) { void A32EmitX64::EmitA32InstructionSynchronizationBarrier(A32EmitContext& ctx, IR::Inst*) {
ctx.reg_alloc.HostCall(nullptr); if (!conf.hook_isb) {
return;
}
code.mov(code.ABI_PARAM1, reinterpret_cast<u64>(jit_interface)); ctx.reg_alloc.HostCall(nullptr);
code.CallLambda([](A32::Jit* jit) { jit->ClearCache(); }); Devirtualize<&A32::UserCallbacks::InstructionSynchronizationBarrierRaised>(conf.callbacks).EmitCall(code);
} }
void A32EmitX64::EmitA32BXWritePC(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32BXWritePC(A32EmitContext& ctx, IR::Inst* inst) {