From 1389bf35bd7bd62364d9221e825b392d9d330d7d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 18 Jun 2018 15:35:56 -0400 Subject: [PATCH] DSPAssembler: In-class initialize members where applicable Avoids repeating ourself in the initializer list and makes the class have a predictable initial state. --- Source/Core/Core/DSP/DSPAssembler.cpp | 4 +--- Source/Core/Core/DSP/DSPAssembler.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index e6b8106b9f..449023efbd 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -51,9 +51,7 @@ static const char* err_string[] = {"", "Number out of range", "Program counter out of range"}; -DSPAssembler::DSPAssembler(const AssemblerSettings& settings) - : m_cur_addr(0), m_cur_pass(0), m_current_param(0), settings_(settings) - +DSPAssembler::DSPAssembler(const AssemblerSettings& settings) : settings_(settings) { } diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h index 8e2d0664f1..07eefec13c 100644 --- a/Source/Core/Core/DSP/DSPAssembler.h +++ b/Source/Core/Core/DSP/DSPAssembler.h @@ -107,23 +107,23 @@ private: std::string include_dir; std::string cur_line; - u32 m_cur_addr; - int m_totalSize; - u8 m_cur_pass; + u32 m_cur_addr = 0; + int m_totalSize = 0; + u8 m_cur_pass = 0; LabelMap labels; - u32 code_line; - bool failed; + u32 code_line = 0; + bool failed = false; std::string last_error_str; - AssemblerError last_error; + AssemblerError last_error = AssemblerError::OK; typedef std::map AliasMap; AliasMap aliases; - segment_t cur_segment; - u32 segment_addr[SEGMENT_MAX]; - int m_current_param; + segment_t cur_segment = SEGMENT_CODE; + u32 segment_addr[SEGMENT_MAX] = {}; + int m_current_param = 0; const AssemblerSettings settings_; }; } // namespace DSP