From 0054c4e0d9799765cdeb99f117fb664aa9d19c84 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 28 Jun 2015 18:40:24 +0200 Subject: [PATCH] JitArm64: Drop icbi instruction It was already just a fallback + exit. Now we emit the exit for all affected fallbacks. --- Source/Core/Core/PowerPC/JitArm64/Jit.h | 1 - Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp | 9 --------- Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h index aa9f43add3..6b2d0c3fe8 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h @@ -114,7 +114,6 @@ public: void mtspr(UGeckoInstruction inst); // LoadStore - void icbi(UGeckoInstruction inst); void lXX(UGeckoInstruction inst); void stX(UGeckoInstruction inst); void lmw(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index 9739fb35c1..19433dcda0 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -18,15 +18,6 @@ using namespace Arm64Gen; -void JitArm64::icbi(UGeckoInstruction inst) -{ - gpr.Flush(FlushMode::FLUSH_ALL); - fpr.Flush(FlushMode::FLUSH_ALL); - - FallBackToInterpreter(inst); - WriteExit(js.compilerPC + 4); -} - void JitArm64::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 offset, bool update) { // We want to make sure to not get LR as a temp register diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index fe3bb519a4..7bf211bdc5 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -302,7 +302,7 @@ static GekkoOPTemplate table31[] = {4, &JitArm64::twx}, // tw {598, &JitArm64::DoNothing}, // sync - {982, &JitArm64::icbi}, // icbi + {982, &JitArm64::FallBackToInterpreter}, // icbi // Unused instructions on GC {310, &JitArm64::FallBackToInterpreter}, // eciwx