Merge pull request #9401 from lioncash/jittable

JitArm64_Tables: Construct tables at compile-time
dolphin-emu · Jan 1, 2021 · 452aad2 · 452aad2
2 parents 344a74a + 5b5b3a9
commit 452aad2
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 109 deletions.
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
@@ -44,9 +44,7 @@ JitArm64::~JitArm64() = default;
 
 void JitArm64::Init()
 {
-  InitializeInstructionTables();
-
-  size_t child_code_size = SConfig::GetInstance().bMMU ? FARCODE_SIZE_MMU : FARCODE_SIZE;
+  const size_t child_code_size = SConfig::GetInstance().bMMU ? FARCODE_SIZE_MMU : FARCODE_SIZE;
   AllocCodeSpace(CODE_SIZE + child_code_size);
   AddChildCodeSpace(&farcode, child_code_size);
 

diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h
@@ -43,7 +43,9 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
   void Jit(u32) override;
 
   const char* GetName() const override { return "JITARM64"; }
+
   // OPCODES
+  using Instruction = void (JitArm64::*)(UGeckoInstruction);
   void FallBackToInterpreter(UGeckoInstruction inst);
   void DoNothing(UGeckoInstruction inst);
   void HLEFunction(u32 hook_index);
@@ -172,7 +174,6 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
     const u8* slowmem_code;
   };
 
-  static void InitializeInstructionTables();
   void CompileInstruction(PPCAnalyst::CodeOp& op);
 
   bool HandleFunctionHooking(u32 address);