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

Merge pull request #8186 from lioncash/view 

{Common/SymbolDB, Core/HLE/HLE}: Make use of std::string_view where applicable
This commit is contained in:
Léo Lam 2019-06-16 16:20:02 +02:00 committed by GitHub
parent 1550c098d3 a3046fe807
commit b3525ad774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/SymbolDB.cpp
View File

@ -63,7 +63,7 @@ void SymbolDB::Index()
} }
} }
Symbol* SymbolDB::GetSymbolFromName(const std::string& name) Symbol* SymbolDB::GetSymbolFromName(std::string_view name)
{ {
for (auto& func : m_functions) for (auto& func : m_functions)
{ {
@ -74,7 +74,7 @@ Symbol* SymbolDB::GetSymbolFromName(const std::string& name)
return nullptr; return nullptr;
} }
std::vector<Symbol*> SymbolDB::GetSymbolsFromName(const std::string& name) std::vector<Symbol*> SymbolDB::GetSymbolsFromName(std::string_view name)
{ {
std::vector<Symbol*> symbols; std::vector<Symbol*> symbols;

5
Source/Core/Common/SymbolDB.h
View File

@ -10,6 +10,7 @@
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -71,8 +72,8 @@ public:
virtual Symbol* AddFunction(u32 start_addr) { return nullptr; } virtual Symbol* AddFunction(u32 start_addr) { return nullptr; }
void AddCompleteSymbol(const Symbol& symbol); void AddCompleteSymbol(const Symbol& symbol);
Symbol* GetSymbolFromName(const std::string& name); Symbol* GetSymbolFromName(std::string_view name);
std::vector<Symbol*> GetSymbolsFromName(const std::string& name); std::vector<Symbol*> GetSymbolsFromName(std::string_view name);
Symbol* GetSymbolFromHash(u32 hash); Symbol* GetSymbolFromHash(u32 hash);
std::vector<Symbol*> GetSymbolsFromHash(u32 hash); std::vector<Symbol*> GetSymbolsFromHash(u32 hash);

8
Source/Core/Core/HLE/HLE.cpp
View File

@ -80,11 +80,11 @@ constexpr std::array<SPatch, 1> OSBreakPoints{{
}}; }};
// clang-format on // clang-format on
void Patch(u32 addr, const char* hle_func_name) void Patch(u32 addr, std::string_view func_name)
{ {
for (u32 i = 1; i < OSPatches.size(); ++i) for (u32 i = 1; i < OSPatches.size(); ++i)
{ {
if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name)) if (OSPatches[i].m_szPatchName == func_name)
{ {
s_original_instructions[addr] = i; s_original_instructions[addr] = i;
PowerPC::ppcState.iCache.Invalidate(addr); PowerPC::ppcState.iCache.Invalidate(addr);
@ -215,7 +215,7 @@ bool IsEnabled(HookFlag flag)
PowerPC::GetMode() == PowerPC::CoreMode::Interpreter; PowerPC::GetMode() == PowerPC::CoreMode::Interpreter;
} }
u32 UnPatch(const std::string& patch_name) u32 UnPatch(std::string_view patch_name)
{ {
const auto patch = std::find_if(std::begin(OSPatches), std::end(OSPatches), const auto patch = std::find_if(std::begin(OSPatches), std::end(OSPatches),
[&](const SPatch& p) { return patch_name == p.m_szPatchName; }); [&](const SPatch& p) { return patch_name == p.m_szPatchName; });
@ -258,7 +258,7 @@ u32 UnPatch(const std::string& patch_name)
return 0; return 0;
} }
bool UnPatch(u32 addr, const std::string& name) bool UnPatch(u32 addr, std::string_view name)
{ {
auto itr = s_original_instructions.find(addr); auto itr = s_original_instructions.find(addr);
if (itr == s_original_instructions.end()) if (itr == s_original_instructions.end())

8
Source/Core/Core/HLE/HLE.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <string> #include <string_view>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -29,9 +29,9 @@ void PatchFunctions();
void Clear(); void Clear();
void Reload(); void Reload();
void Patch(u32 pc, const char* func_name); void Patch(u32 pc, std::string_view func_name);
u32 UnPatch(const std::string& patchName); u32 UnPatch(std::string_view patch_name);
bool UnPatch(u32 addr, const std::string& name = {}); bool UnPatch(u32 addr, std::string_view name = {});
void Execute(u32 _CurrentPC, u32 _Instruction); void Execute(u32 _CurrentPC, u32 _Instruction);
// Returns the HLE function index if the address is located in the function // Returns the HLE function index if the address is located in the function