From a0d1812ad5936499a412f38bedf5342fc1f39ae5 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Thu, 28 Jan 2021 20:11:13 +0100
Subject: [PATCH] early-access version 1391

---
 README.md                                           |  2 +-
 externals/dynarmic/include/dynarmic/A64/config.h    |  6 ++++++
 externals/dynarmic/src/backend/x64/a64_emit_x64.cpp | 10 ++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 22565adac..cc609f8c4 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1390.
+This is the source code for early-access 1391.
 
 ## Legal Notice
 
diff --git a/externals/dynarmic/include/dynarmic/A64/config.h b/externals/dynarmic/include/dynarmic/A64/config.h
index e6f48ef61..6a029d978 100755
--- a/externals/dynarmic/include/dynarmic/A64/config.h
+++ b/externals/dynarmic/include/dynarmic/A64/config.h
@@ -110,6 +110,7 @@ struct UserCallbacks {
 
     virtual void ExceptionRaised(VAddr pc, Exception exception) = 0;
     virtual void DataCacheOperationRaised(DataCacheOperation /*op*/, VAddr /*value*/) {}
+    virtual void InstructionSynchronizationBarrierRaised() {}
 
     // Timing-related callbacks
     // ticks ticks have passed
@@ -153,6 +154,11 @@ struct UserConfig {
     /// Executing DC ZVA in this mode will result in zeros being written to memory.
     bool hook_data_cache_operations = false;
 
+    /// 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;
+
     /// When set to true, UserCallbacks::ExceptionRaised will be called when any hint
     /// instruction is executed.
     bool hook_hint_instructions = false;
diff --git a/externals/dynarmic/src/backend/x64/a64_emit_x64.cpp b/externals/dynarmic/src/backend/x64/a64_emit_x64.cpp
index c8be6fe1f..c89f4e918 100755
--- a/externals/dynarmic/src/backend/x64/a64_emit_x64.cpp
+++ b/externals/dynarmic/src/backend/x64/a64_emit_x64.cpp
@@ -659,11 +659,13 @@ void A64EmitX64::EmitA64DataMemoryBarrier(A64EmitContext&, IR::Inst*) {
     code.lfence();
 }
 
-void A64EmitX64::EmitA64InstructionSynchronizationBarrier(A64EmitContext& ctx, IR::Inst* ) {
-    ctx.reg_alloc.HostCall(nullptr);
+void A64EmitX64::EmitA64InstructionSynchronizationBarrier(A64EmitContext& ctx, IR::Inst*) {
+    if (!conf.hook_isb) {
+        return;
+    }
 
-    code.mov(code.ABI_PARAM1, reinterpret_cast<u64>(jit_interface));
-    code.CallLambda([](A64::Jit* jit) { jit->ClearCache(); });
+    ctx.reg_alloc.HostCall(nullptr);
+    Devirtualize<&A64::UserCallbacks::InstructionSynchronizationBarrierRaised>(conf.callbacks).EmitCall(code);
 }
 
 void A64EmitX64::EmitA64GetCNTFRQ(A64EmitContext& ctx, IR::Inst* inst) {