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

DSP/LabelMap: std::move std::string instances where applicable 

We can std::move the std::string parameter in Label's constructor,
allowing the constructor to be moved into in calling code.

We can cascade this outwards in the interface as well.
This commit is contained in:
Lioncash 2019-06-07 17:42:08 -04:00
parent 32427af79e
commit 6e9329455c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/DSP/LabelMap.cpp
View File

@ -14,8 +14,8 @@ namespace DSP
{ {
struct LabelMap::Label struct LabelMap::Label
{ {
Label(const std::string& lbl, s32 address, LabelType ltype) Label(std::string lbl, s32 address, LabelType ltype)
: name(lbl), addr(address), type(ltype) : name(std::move(lbl)), addr(address), type(ltype)
{ {
} }
std::string name; std::string name;
@ -42,7 +42,7 @@ void LabelMap::RegisterDefaults()
} }
} }
void LabelMap::RegisterLabel(const std::string& label, u16 lval, LabelType type) void LabelMap::RegisterLabel(std::string label, u16 lval, LabelType type)
{ {
const std::optional<u16> old_value = GetLabelValue(label); const std::optional<u16> old_value = GetLabelValue(label);
if (old_value && old_value != lval) if (old_value && old_value != lval)
@ -51,10 +51,10 @@ void LabelMap::RegisterLabel(const std::string& label, u16 lval, LabelType type)
*old_value); *old_value);
DeleteLabel(label); DeleteLabel(label);
} }
labels.emplace_back(label, lval, type); labels.emplace_back(std::move(label), lval, type);
} }
void LabelMap::DeleteLabel(const std::string& label) void LabelMap::DeleteLabel(std::string_view label)
{ {
const auto iter = std::find_if(labels.cbegin(), labels.cend(), const auto iter = std::find_if(labels.cbegin(), labels.cend(),
[&label](const auto& entry) { return entry.name == label; }); [&label](const auto& entry) { return entry.name == label; });

5
Source/Core/Core/DSP/LabelMap.h
View File

@ -6,6 +6,7 @@
#include <optional> #include <optional>
#include <string> #include <string>
#include <string_view>
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -27,8 +28,8 @@ public:
~LabelMap(); ~LabelMap();
void RegisterDefaults(); void RegisterDefaults();
void RegisterLabel(const std::string& label, u16 lval, LabelType type = LABEL_VALUE); void RegisterLabel(std::string label, u16 lval, LabelType type = LABEL_VALUE);
void DeleteLabel(const std::string& label); void DeleteLabel(std::string_view label);
std::optional<u16> GetLabelValue(const std::string& label, LabelType type = LABEL_ANY) const; std::optional<u16> GetLabelValue(const std::string& label, LabelType type = LABEL_ANY) const;
void Clear(); void Clear();