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

DSP/LabelMap: Use std::optional with GetLabelValue() 

Rather than use a bool and out parameter, we can collapse them into one
by using a std::optional.
This commit is contained in:
Lioncash 2019-06-07 17:26:22 -04:00
parent 747128b093
commit a3ed4ceec5
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,9 +200,9 @@ s32 DSPAssembler::ParseValue(const char* str)
else // Everything else is a label. else // Everything else is a label.
{ {
// Lookup label // Lookup label
u16 value; if (const std::optional<u16> value = m_labels.GetLabelValue(ptr))
if (m_labels.GetLabelValue(ptr, &value)) return *value;
return value;
if (m_cur_pass == 2) if (m_cur_pass == 2)
ShowError(AssemblerError::UnknownLabel, str); ShowError(AssemblerError::UnknownLabel, str);
} }

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

@ -33,11 +33,11 @@ void LabelMap::RegisterDefaults()
void LabelMap::RegisterLabel(const std::string& label, u16 lval, LabelType type) void LabelMap::RegisterLabel(const std::string& label, u16 lval, LabelType type)
{ {
u16 old_value; const std::optional<u16> old_value = GetLabelValue(label);
if (GetLabelValue(label, &old_value) && old_value != lval) if (old_value && old_value != lval)
{ {
printf("WARNING: Redefined label %s to %04x - old value %04x\n", label.c_str(), lval, printf("WARNING: Redefined label %s to %04x - old value %04x\n", label.c_str(), lval,
old_value); *old_value);
DeleteLabel(label); DeleteLabel(label);
} }
labels.emplace_back(label, lval, type); labels.emplace_back(label, lval, type);
@ -54,16 +54,15 @@ void LabelMap::DeleteLabel(const std::string& label)
labels.erase(iter); labels.erase(iter);
} }
bool LabelMap::GetLabelValue(const std::string& name, u16* value, LabelType type) const std::optional<u16> LabelMap::GetLabelValue(const std::string& name, LabelType type) const
{ {
for (auto& label : labels) for (const auto& label : labels)
{ {
if (!name.compare(label.name)) if (name == label.name)
{ {
if (type & label.type) if ((type & label.type) != 0)
{ {
*value = label.addr; return label.addr;
return true;
} }
else else
{ {
@ -71,7 +70,8 @@ bool LabelMap::GetLabelValue(const std::string& name, u16* value, LabelType type
} }
} }
} }
return false;
return std::nullopt;
} }
void LabelMap::Clear() void LabelMap::Clear()

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

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
@ -28,7 +29,7 @@ public:
void RegisterDefaults(); void RegisterDefaults();
void RegisterLabel(const std::string& label, u16 lval, LabelType type = LABEL_VALUE); void RegisterLabel(const std::string& label, u16 lval, LabelType type = LABEL_VALUE);
void DeleteLabel(const std::string& label); void DeleteLabel(const std::string& label);
bool GetLabelValue(const std::string& label, u16* value, LabelType type = LABEL_ANY) const; std::optional<u16> GetLabelValue(const std::string& label, LabelType type = LABEL_ANY) const;
void Clear(); void Clear();
private: private: