ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JitArm64_Tables: Move Instruction alias to the JIT class 

Does what the comment says I should do :p
This commit is contained in:
Lioncash 2020-12-30 19:28:34 -05:00
parent c9c874d7fb
commit 5b5b3a9979
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -43,7 +43,9 @@ public:
void Jit(u32) override; void Jit(u32) override;
const char* GetName() const override { return "JITARM64"; } const char* GetName() const override { return "JITARM64"; }
// OPCODES // OPCODES
using Instruction = void (JitArm64::*)(UGeckoInstruction);
void FallBackToInterpreter(UGeckoInstruction inst); void FallBackToInterpreter(UGeckoInstruction inst);
void DoNothing(UGeckoInstruction inst); void DoNothing(UGeckoInstruction inst);
void HLEFunction(u32 hook_index); void HLEFunction(u32 hook_index);

29
Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
View File

@ -10,13 +10,10 @@
namespace namespace
{ {
// Should be moved in to the Jit class
using Instruction = void (JitArm64::*)(UGeckoInstruction);
struct GekkoOPTemplate struct GekkoOPTemplate
{ {
int opcode; int opcode;
Instruction fn; JitArm64::Instruction fn;
// GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out // GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
}; };
@ -339,8 +336,8 @@ constexpr std::array<GekkoOPTemplate, 10> table63_2{{
{31, &JitArm64::fp_arith}, // fnmaddx {31, &JitArm64::fp_arith}, // fnmaddx
}}; }};
constexpr std::array<Instruction, 64> dynaOpTable = [] { constexpr std::array<JitArm64::Instruction, 64> dynaOpTable = [] {
std::array<Instruction, 64> table{}; std::array<JitArm64::Instruction, 64> table{};
for (auto& tpl : table) for (auto& tpl : table)
{ {
@ -355,8 +352,8 @@ constexpr std::array<Instruction, 64> dynaOpTable = [] {
return table; return table;
}(); }();
constexpr std::array<Instruction, 1024> dynaOpTable4 = [] { constexpr std::array<JitArm64::Instruction, 1024> dynaOpTable4 = [] {
std::array<Instruction, 1024> table{}; std::array<JitArm64::Instruction, 1024> table{};
for (auto& entry : table) for (auto& entry : table)
{ {
@ -391,8 +388,8 @@ constexpr std::array<Instruction, 1024> dynaOpTable4 = [] {
return table; return table;
}(); }();
constexpr std::array<Instruction, 1024> dynaOpTable19 = [] { constexpr std::array<JitArm64::Instruction, 1024> dynaOpTable19 = [] {
std::array<Instruction, 1024> table{}; std::array<JitArm64::Instruction, 1024> table{};
for (auto& entry : table) for (auto& entry : table)
{ {
@ -407,8 +404,8 @@ constexpr std::array<Instruction, 1024> dynaOpTable19 = [] {
return table; return table;
}(); }();
constexpr std::array<Instruction, 1024> dynaOpTable31 = [] { constexpr std::array<JitArm64::Instruction, 1024> dynaOpTable31 = [] {
std::array<Instruction, 1024> table{}; std::array<JitArm64::Instruction, 1024> table{};
for (auto& entry : table) for (auto& entry : table)
{ {
@ -423,8 +420,8 @@ constexpr std::array<Instruction, 1024> dynaOpTable31 = [] {
return table; return table;
}(); }();
constexpr std::array<Instruction, 32> dynaOpTable59 = [] { constexpr std::array<JitArm64::Instruction, 32> dynaOpTable59 = [] {
std::array<Instruction, 32> table{}; std::array<JitArm64::Instruction, 32> table{};
for (auto& entry : table) for (auto& entry : table)
{ {
@ -439,8 +436,8 @@ constexpr std::array<Instruction, 32> dynaOpTable59 = [] {
return table; return table;
}(); }();
constexpr std::array<Instruction, 1024> dynaOpTable63 = [] { constexpr std::array<JitArm64::Instruction, 1024> dynaOpTable63 = [] {
std::array<Instruction, 1024> table{}; std::array<JitArm64::Instruction, 1024> table{};
for (auto& entry : table) for (auto& entry : table)
{ {