summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2017-01-01 17:54:39 -0500
committerGitHub <noreply@github.com>2017-01-01 17:54:39 -0500
commit6c5063c76b53ef06a6bb579349a21a37f2838355 (patch)
treedec55f9e934ca184eeab30fe4534c516cd2c95c8 /Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
parent4c90ad7514dce89a2b56a2085ef9486e0e9f2f19 (diff)
parent3eb25cea6f7a74cefe1e2bc262ee03d8e60484ce (diff)
Merge pull request #4585 from lioncash/dspnamespace
DSP: Namespace remaining un-namespaced DSP code
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp')
-rw-r--r--Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
index 94ba8bbd39..1777cc531a 100644
--- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
@@ -72,7 +72,7 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
wxPanel* code_panel = new wxPanel(m_MainNotebook, wxID_ANY);
wxBoxSizer* code_sizer = new wxBoxSizer(wxVERTICAL);
- m_CodeView = new CCodeView(&debug_interface, &DSPSymbols::g_dsp_symbol_db, code_panel);
+ m_CodeView = new CCodeView(&debug_interface, &DSP::Symbols::g_dsp_symbol_db, code_panel);
m_CodeView->SetPlain();
code_sizer->Add(m_CodeView, 1, wxEXPAND);
code_panel->SetSizer(code_sizer);
@@ -115,22 +115,24 @@ DSPDebuggerLLE::~DSPDebuggerLLE()
void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event)
{
- if (DSPCore_GetState() == DSPCORE_STOP)
+ const DSP::DSPCoreState dsp_state = DSP::DSPCore_GetState();
+
+ if (dsp_state == DSP::DSPCORE_STOP)
return;
switch (event.GetId())
{
case ID_RUNTOOL:
- if (DSPCore_GetState() == DSPCORE_RUNNING)
- DSPCore_SetState(DSPCORE_STEPPING);
+ if (dsp_state == DSP::DSPCORE_RUNNING)
+ DSP::DSPCore_SetState(DSP::DSPCORE_STEPPING);
else
- DSPCore_SetState(DSPCORE_RUNNING);
+ DSP::DSPCore_SetState(DSP::DSPCORE_RUNNING);
break;
case ID_STEPTOOL:
- if (DSPCore_GetState() == DSPCORE_STEPPING)
+ if (dsp_state == DSP::DSPCORE_STEPPING)
{
- DSPCore_Step();
+ DSP::DSPCore_Step();
Repopulate();
}
break;
@@ -168,12 +170,12 @@ void DSPDebuggerLLE::Repopulate()
void DSPDebuggerLLE::FocusOnPC()
{
- JumpToAddress(g_dsp.pc);
+ JumpToAddress(DSP::g_dsp.pc);
}
void DSPDebuggerLLE::UpdateState()
{
- if (DSPCore_GetState() == DSPCORE_RUNNING)
+ if (DSP::DSPCore_GetState() == DSP::DSPCORE_RUNNING)
{
m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Pause"));
m_Toolbar->SetToolBitmap(
@@ -192,23 +194,23 @@ void DSPDebuggerLLE::UpdateState()
void DSPDebuggerLLE::UpdateDisAsmListView()
{
- if (m_CachedStepCounter == g_dsp.step_counter)
+ if (m_CachedStepCounter == DSP::g_dsp.step_counter)
return;
// show PC
FocusOnPC();
- m_CachedStepCounter = g_dsp.step_counter;
+ m_CachedStepCounter = DSP::g_dsp.step_counter;
m_Regs->Repopulate();
}
void DSPDebuggerLLE::UpdateSymbolMap()
{
- if (g_dsp.dram == nullptr)
+ if (DSP::g_dsp.dram == nullptr)
return;
m_SymbolList->Freeze(); // HyperIris: wx style fast filling
m_SymbolList->Clear();
- for (const auto& symbol : DSPSymbols::g_dsp_symbol_db.Symbols())
+ for (const auto& symbol : DSP::Symbols::g_dsp_symbol_db.Symbols())
{
int idx = m_SymbolList->Append(StrToWxStr(symbol.second.name));
m_SymbolList->SetClientData(idx, (void*)&symbol.second);
@@ -259,7 +261,7 @@ bool DSPDebuggerLLE::JumpToAddress(u16 addr)
if (page == 0)
{
// Center on valid instruction in IRAM/IROM
- int new_line = DSPSymbols::Addr2Line(addr);
+ int new_line = DSP::Symbols::Addr2Line(addr);
if (new_line >= 0)
{
m_CodeView->Center(new_line);