piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSP: Namespace remaining un-namespaced DSP code

Browse Source
This commit is contained in:
Lioncash
2016-12-30 13:25:40 -05:00
parent a2e191649d
commit 3eb25cea6f
70 changed files with 672 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
View File

@ -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);

2
Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
View File

@ -34,7 +34,7 @@ private:
ID_SHOWPCTOOL,
};
DSPDebugInterface debug_interface;
DSP::LLE::DSPDebugInterface debug_interface;
u64 m_CachedStepCounter;
// GUI updaters

10
Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
View File

@ -18,9 +18,9 @@ wxString CDSPRegTable::GetValue(int row, int col)
switch (col)
{
case 0:
return StrToWxStr(pdregname(row));
return StrToWxStr(DSP::pdregname(row));
case 1:
return wxString::Format("0x%04x", DSPCore_ReadRegister(row));
return wxString::Format("0x%04x", DSP::DSPCore_ReadRegister(row));
default:
return wxEmptyString;
}
@ -34,16 +34,16 @@ void CDSPRegTable::SetValue(int, int, const wxString&)
void CDSPRegTable::UpdateCachedRegs()
{
if (m_CachedCounter == g_dsp.step_counter)
if (m_CachedCounter == DSP::g_dsp.step_counter)
{
return;
}
m_CachedCounter = g_dsp.step_counter;
m_CachedCounter = DSP::g_dsp.step_counter;
for (size_t i = 0; i < m_CachedRegs.size(); ++i)
{
const u16 value = DSPCore_ReadRegister(i);
const u16 value = DSP::DSPCore_ReadRegister(i);
m_CachedRegHasChanged[i] = m_CachedRegs[i] != value;
m_CachedRegs[i] = value;