Skip to content
Permalink
Browse files

Merge pull request #8160 from lioncash/dsp-tables

Core/DSP/DSPTables: Make FindOpInfoByName/FindExtOpInfoByName use std::string_view
  • Loading branch information...
leoetlino committed Jun 7, 2019
2 parents 3f4952d + 60d10d2 commit e73a3ba1c626041f3a6e2aecda048c56680e533e
Showing with 6 additions and 6 deletions.
  1. +3 −3 Source/Core/Core/DSP/DSPTables.cpp
  2. +3 −3 Source/Core/Core/DSP/DSPTables.h
@@ -511,7 +511,7 @@ std::array<const DSPOPCTemplate*, OPTABLE_SIZE> s_op_table;
std::array<const DSPOPCTemplate*, EXT_OPTABLE_SIZE> s_ext_op_table;

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(),
[&name](const auto& info) { return name == info.name; });
@@ -527,7 +527,7 @@ const DSPOPCTemplate* FindOpInfoByOpcode(UDSPInstruction opcode)
return &*iter;
}

const DSPOPCTemplate* FindOpInfoByName(const std::string& name)
const DSPOPCTemplate* FindOpInfoByName(std::string_view name)
{
const auto iter = FindByName(name, s_opcodes);
if (iter == s_opcodes.cend())
@@ -545,7 +545,7 @@ const DSPOPCTemplate* FindExtOpInfoByOpcode(UDSPInstruction opcode)
return &*iter;
}

const DSPOPCTemplate* FindExtOpInfoByName(const std::string& name)
const DSPOPCTemplate* FindExtOpInfoByName(std::string_view name)
{
const auto iter = FindByName(name, s_opcodes_ext);
if (iter == s_opcodes_ext.cend())
@@ -9,7 +9,7 @@
#include <algorithm>
#include <array>
#include <cstddef>
#include <string>
#include <string_view>

#include "Core/DSP/DSPCommon.h"

@@ -111,10 +111,10 @@ void ZeroWriteBackLogPreserveAcc(u8 acc);

// Used by the assembler and disassembler for info retrieval.
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* FindExtOpInfoByName(const std::string& name);
const DSPOPCTemplate* FindExtOpInfoByName(std::string_view name);

// Used by the interpreter and JIT for instruction emulation
const DSPOPCTemplate* GetOpTemplate(UDSPInstruction inst);

0 comments on commit e73a3ba

Please sign in to comment.
You can’t perform that action at this time.