summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-16 01:14:14 -0400
committerLioncash <mathew1800@gmail.com>2019-06-16 01:20:12 -0400
commita3046fe8071e4d70b9cec93f59fa4b9c559355d2 (patch)
tree5b348d96873b95553487f9c57d32be992eaf92f6 /Source/Core
parent936aa5dbaa123f748a8e4c0297372f01616b8302 (diff)
Core/HLE/HLE: Use std::string_view where applicable
Now that SymbolDB's querying functions accept std::string_view instances, we can alter the Patch/UnPatch HLE functions to follow suit.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HLE/HLE.cpp8
-rw-r--r--Source/Core/Core/HLE/HLE.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index d1206b756b..e9fc504528 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -80,11 +80,11 @@ constexpr std::array<SPatch, 1> OSBreakPoints{{
}};
// 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)
{
- if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name))
+ if (OSPatches[i].m_szPatchName == func_name)
{
s_original_instructions[addr] = i;
PowerPC::ppcState.iCache.Invalidate(addr);
@@ -215,7 +215,7 @@ bool IsEnabled(HookFlag flag)
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 SPatch& p) { return patch_name == p.m_szPatchName; });
@@ -258,7 +258,7 @@ u32 UnPatch(const std::string& patch_name)
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);
if (itr == s_original_instructions.end())
diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h
index 9f851e0396..6e07b832a7 100644
--- a/Source/Core/Core/HLE/HLE.h
+++ b/Source/Core/Core/HLE/HLE.h
@@ -4,7 +4,7 @@
#pragma once
-#include <string>
+#include <string_view>
#include "Common/CommonTypes.h"
@@ -29,9 +29,9 @@ void PatchFunctions();
void Clear();
void Reload();
-void Patch(u32 pc, const char* func_name);
-u32 UnPatch(const std::string& patchName);
-bool UnPatch(u32 addr, const std::string& name = {});
+void Patch(u32 pc, std::string_view func_name);
+u32 UnPatch(std::string_view patch_name);
+bool UnPatch(u32 addr, std::string_view name = {});
void Execute(u32 _CurrentPC, u32 _Instruction);
// Returns the HLE function index if the address is located in the function