diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-12-28 11:39:37 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-12-28 13:15:48 -0500 |
| commit | f9c488f0d9cdfe2bc9115c23425a27db9d3075ef (patch) | |
| tree | a22c159739f5efcacda46eebcf0d71b30125a531 /Source/Core | |
| parent | 9d1c8fe49239242002ffe1000a1a1f1807d6a767 (diff) | |
DSPAnalyzer: Merge Analyzer namespace into DSP namespace
Now that the Analyzer class fully encapsulates all analyzer state, the
namespace is no longer necessary.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/DSP/DSPAnalyzer.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/DSP/DSPAnalyzer.h | 5 | ||||
| -rw-r--r-- | Source/Core/Core/DSP/DSPCore.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/Core/DSP/DSPAnalyzer.cpp b/Source/Core/Core/DSP/DSPAnalyzer.cpp index a86b9c2c3e..ccafaebc51 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.cpp +++ b/Source/Core/Core/DSP/DSPAnalyzer.cpp @@ -12,7 +12,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPTables.h" -namespace DSP::Analyzer +namespace DSP { // Good candidates for idle skipping is mail wait loops. If we're time slicing // between the main CPU and the DSP, if the DSP runs into one of these, it might @@ -160,4 +160,4 @@ void Analyzer::AnalyzeRange(u16 start_addr, u16 end_addr) } INFO_LOG_FMT(DSPLLE, "Finished analysis."); } -} // namespace DSP::Analyzer +} // namespace DSP diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h index 21dc740908..d3077fc48b 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.h +++ b/Source/Core/Core/DSP/DSPAnalyzer.h @@ -12,8 +12,7 @@ namespace DSP struct SDSP; } -// Basic code analysis. -namespace DSP::Analyzer +namespace DSP { // Useful things to detect: // * Loop endpoints - so that we can avoid checking for loops every cycle. @@ -102,4 +101,4 @@ private: // DSP context for analysis to be run under. const SDSP& m_dsp; }; -} // namespace DSP::Analyzer +} // namespace DSP diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h index f25c302a70..e3ed8f6f76 100644 --- a/Source/Core/Core/DSP/DSPCore.h +++ b/Source/Core/Core/DSP/DSPCore.h @@ -398,8 +398,8 @@ struct SDSP void DoState(PointerWrap& p); // DSP static analyzer. - Analyzer::Analyzer& GetAnalyzer() { return m_analyzer; } - const Analyzer::Analyzer& GetAnalyzer() const { return m_analyzer; } + Analyzer& GetAnalyzer() { return m_analyzer; } + const Analyzer& GetAnalyzer() const { return m_analyzer; } DSP_Regs r{}; u16 pc = 0; @@ -454,7 +454,7 @@ private: u16 ReadIFXImpl(u16 address); DSPCore& m_dsp_core; - Analyzer::Analyzer m_analyzer; + Analyzer m_analyzer; }; enum class State |