The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8160 from lioncash/dsp-tables

Browse Source 
Core/DSP/DSPTables: Make FindOpInfoByName/FindExtOpInfoByName use std::string_view
This commit is contained in:
Léo Lam 2019-06-07 16:16:41 +02:00 committed by GitHub
commit e73a3ba1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,7 @@ 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> template <size_t N>
auto FindByName(const std::string& name, const std::array<DSPOPCTemplate, N>& data) auto FindByName(std::string_view name, const std::array<DSPOPCTemplate, N>& data)
{ {
return std::find_if(data.cbegin(), data.cend(), return std::find_if(data.cbegin(), data.cend(),
[&name](const auto& info) { return name == info.name; }); [&name](const auto& info) { return name == info.name; });
@ -527,7 +527,7 @@ const DSPOPCTemplate* FindOpInfoByOpcode(UDSPInstruction opcode)
return &*iter; return &*iter;
} }
const DSPOPCTemplate* FindOpInfoByName(const std::string& name) const DSPOPCTemplate* FindOpInfoByName(std::string_view name)
{ {
const auto iter = FindByName(name, s_opcodes); const auto iter = FindByName(name, s_opcodes);
if (iter == s_opcodes.cend()) if (iter == s_opcodes.cend())
@ -545,7 +545,7 @@ const DSPOPCTemplate* FindExtOpInfoByOpcode(UDSPInstruction opcode)
return &*iter; return &*iter;
} }
const DSPOPCTemplate* FindExtOpInfoByName(const std::string& name) const DSPOPCTemplate* FindExtOpInfoByName(std::string_view name)
{ {
const auto iter = FindByName(name, s_opcodes_ext); const auto iter = FindByName(name, s_opcodes_ext);
if (iter == s_opcodes_ext.cend()) if (iter == s_opcodes_ext.cend())

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

@ -9,7 +9,7 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <string> #include <string_view>
#include "Core/DSP/DSPCommon.h" #include "Core/DSP/DSPCommon.h"
@ -111,10 +111,10 @@ void ZeroWriteBackLogPreserveAcc(u8 acc);
// Used by the assembler and disassembler for info retrieval. // Used by the assembler and disassembler for info retrieval.
const DSPOPCTemplate* FindOpInfoByOpcode(UDSPInstruction opcode); const DSPOPCTemplate* FindOpInfoByOpcode(UDSPInstruction opcode);
const DSPOPCTemplate* FindOpInfoByName(const std::string& name); const DSPOPCTemplate* FindOpInfoByName(std::string_view name);
const DSPOPCTemplate* FindExtOpInfoByOpcode(UDSPInstruction opcode); const DSPOPCTemplate* FindExtOpInfoByOpcode(UDSPInstruction opcode);
const DSPOPCTemplate* FindExtOpInfoByName(const std::string& name); const DSPOPCTemplate* FindExtOpInfoByName(std::string_view 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);