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

DSPTables: Deduplicate FindByOpcode() implementations in DSP opcode tables 

This function was duplicated across all the opcode tables: the main info
tables, the interpreter tables, and the x86-64 JIT tables. However, we
can just make the type of the std::array parameter a template type and
get rid of this duplication.
This commit is contained in:
Lioncash 2018-06-21 13:06:39 -04:00
parent 77f6e50493
commit fd1ad02c5c
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/DSP/DSPTables.cpp
View File

@ -510,14 +510,6 @@ constexpr size_t EXT_OPTABLE_SIZE = 0xff + 1;
std::array<const DSPOPCTemplate*, OPTABLE_SIZE> s_op_table; std::array<const DSPOPCTemplate*, OPTABLE_SIZE> s_op_table;
std::array<const DSPOPCTemplate*, EXT_OPTABLE_SIZE> s_ext_op_table; std::array<const DSPOPCTemplate*, EXT_OPTABLE_SIZE> s_ext_op_table;
template <size_t N>
auto FindByOpcode(UDSPInstruction opcode, const std::array<DSPOPCTemplate, N>& data)
{
return std::find_if(data.cbegin(), data.cend(), [opcode](const auto& info) {
return (opcode & info.opcode_mask) == info.opcode;
});
}
template <size_t N> template <size_t N>
auto FindByName(const std::string& name, const std::array<DSPOPCTemplate, N>& data) auto FindByName(const std::string& name, const std::array<DSPOPCTemplate, N>& data)
{ {

9
Source/Core/Core/DSP/DSPTables.h
View File

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <algorithm>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <string> #include <string>
@ -118,4 +119,12 @@ const DSPOPCTemplate* FindExtOpInfoByName(const std::string& name);
// Used by the interpreter and JIT for instruction emulation // Used by the interpreter and JIT for instruction emulation
const DSPOPCTemplate* GetOpTemplate(UDSPInstruction inst); const DSPOPCTemplate* GetOpTemplate(UDSPInstruction inst);
const DSPOPCTemplate* GetExtOpTemplate(UDSPInstruction inst); const DSPOPCTemplate* GetExtOpTemplate(UDSPInstruction inst);
template <typename T, size_t N>
auto FindByOpcode(UDSPInstruction opcode, const std::array<T, N>& data)
{
return std::find_if(data.cbegin(), data.cend(), [opcode](const auto& info) {
return (opcode & info.opcode_mask) == info.opcode;
});
}
} // namespace DSP } // namespace DSP

11
Source/Core/Core/DSP/Interpreter/DSPIntTables.cpp
View File

@ -4,10 +4,10 @@
#include "Core/DSP/Interpreter/DSPIntTables.h" #include "Core/DSP/Interpreter/DSPIntTables.h"
#include <algorithm>
#include <array> #include <array>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/Interpreter/DSPIntExtOps.h" #include "Core/DSP/Interpreter/DSPIntExtOps.h"
#include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Core/DSP/Interpreter/DSPInterpreter.h"
@ -16,7 +16,7 @@ namespace DSP::Interpreter
struct InterpreterOpInfo struct InterpreterOpInfo
{ {
u16 opcode; u16 opcode;
u16 mask; u16 opcode_mask;
InterpreterFunction function; InterpreterFunction function;
}; };
@ -331,13 +331,6 @@ namespace
std::array<InterpreterFunction, 65536> s_op_table; std::array<InterpreterFunction, 65536> s_op_table;
std::array<InterpreterFunction, 256> s_ext_op_table; std::array<InterpreterFunction, 256> s_ext_op_table;
bool s_tables_initialized = false; bool s_tables_initialized = false;
template <size_t N>
auto FindByOpcode(UDSPInstruction opcode, const std::array<InterpreterOpInfo, N>& data)
{
return std::find_if(data.cbegin(), data.cend(),
[opcode](const auto& info) { return (opcode & info.mask) == info.opcode; });
}
} // Anonymous namespace } // Anonymous namespace
InterpreterFunction GetOp(UDSPInstruction inst) InterpreterFunction GetOp(UDSPInstruction inst)

11
Source/Core/Core/DSP/Jit/x64/DSPJitTables.cpp
View File

@ -4,10 +4,10 @@
#include "Core/DSP/Jit/x64/DSPJitTables.h" #include "Core/DSP/Jit/x64/DSPJitTables.h"
#include <algorithm>
#include <array> #include <array>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/Jit/x64/DSPEmitter.h" #include "Core/DSP/Jit/x64/DSPEmitter.h"
namespace DSP::JIT::x64 namespace DSP::JIT::x64
@ -15,7 +15,7 @@ namespace DSP::JIT::x64
struct JITOpInfo struct JITOpInfo
{ {
u16 opcode; u16 opcode;
u16 mask; u16 opcode_mask;
JITFunction function; JITFunction function;
}; };
@ -330,13 +330,6 @@ namespace
std::array<JITFunction, 65536> s_op_table; std::array<JITFunction, 65536> s_op_table;
std::array<JITFunction, 256> s_ext_op_table; std::array<JITFunction, 256> s_ext_op_table;
bool s_tables_initialized = false; bool s_tables_initialized = false;
template <size_t N>
auto FindByOpcode(UDSPInstruction opcode, const std::array<JITOpInfo, N>& data)
{
return std::find_if(data.cbegin(), data.cend(),
[opcode](const auto& info) { return (opcode & info.mask) == info.opcode; });
}
} // Anonymous namespace } // Anonymous namespace
JITFunction GetOp(UDSPInstruction inst) JITFunction GetOp(UDSPInstruction inst)