preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-11 05:26:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Cleanup some header pollution.

Browse Source 
Also simplify just a bit.
This commit is contained in:
Unknown W. Brackets committed 2022-02-13 07:55:34 -08:00
1 parent df1a15938d
commit 9435938ad9
6 files changed
+32 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/Debugger/Debugger_Disasm.cpp
+19 -14
View File
@@ -7,11 +7,12 @@
#include "Core/Debugger/Breakpoints.h"
#include "Core/Debugger/SymbolMap.h"
#include "Windows/Debugger/BreakpointWindow.h"
#include "Windows/Debugger/CtrlDisAsmView.h"
#include "Windows/Debugger/Debugger_MemoryDlg.h"
#include "Windows/Debugger/Debugger_Disasm.h"
#include "Windows/Debugger/Debugger_VFPUDlg.h"
#include "Windows/Debugger/DebuggerShared.h"
#include "Windows/Debugger/BreakpointWindow.h"
#include "Windows/main.h"
#include "Windows/Debugger/CtrlRegisterList.h"
@@ -125,7 +126,7 @@ CDisasm::CDisasm(HINSTANCE _hInstance, HWND _hParent, DebugInterface *_cpu) : Di
SendMessage(statusBarWnd, SB_SETPARTS, (WPARAM) 2, (LPARAM) parts);
// init other controls
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDebugger(cpu);
ptr->gotoAddr(0x00000000);
@@ -201,7 +202,7 @@ void CDisasm::stepInto()
return;
}
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
lastTicks = CoreTiming::GetTicks();
u32 currentPc = cpu->GetPC();
@@ -249,7 +250,7 @@ void CDisasm::stepOver()
return;
}
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
lastTicks = CoreTiming::GetTicks();
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
@@ -318,7 +319,7 @@ void CDisasm::stepOut()
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
CBreakPoints::SetSkipFirst(currentMIPS->pc);
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDontRedraw(true);
CBreakPoints::AddBreakPoint(breakpointAddress,true);
@@ -334,7 +335,7 @@ void CDisasm::runToLine()
return;
}
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
u32 pos = ptr->getSelection();
lastTicks = CoreTiming::GetTicks();
@@ -379,7 +380,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
break;
case WM_COMMAND:
{
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
switch (LOWORD(wParam)) {
case ID_TOGGLE_BREAK:
SendMessage(MainWindow::GetHWND(), WM_COMMAND, ID_TOGGLE_BREAK, 0);
@@ -588,7 +589,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_DEB_GOTOWPARAM:
{
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->gotoAddr(wParam);
SetFocus(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
break;
@@ -599,7 +600,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
break;
}
wchar_t szBuffer[256];
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
GetWindowText(GetDlgItem(m_hDlg,IDC_ADDRESS),szBuffer,256);
u32 addr;
@@ -726,7 +727,7 @@ void CDisasm::UpdateSize(WORD width, WORD height)
topHeightOffset = (windowRect.bottom-windowRect.top);
}
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
int disassemblyRowHeight = ptr->getRowHeight();
// disassembly
@@ -803,7 +804,7 @@ void CDisasm::SetDebugMode(bool _bDebug, bool switchPC)
EnableWindow(GetDlgItem(hDlg, IDC_STEPOUT), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_GOTOPC), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_GOTOLR), TRUE);
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg,IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDontRedraw(false);
if (switchPC)
ptr->gotoPC();
@@ -845,14 +846,14 @@ void CDisasm::NotifyMapLoaded() {
} else {
deferredSymbolFill_ = true;
}
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg, IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->clearFunctions();
ptr->redraw();
}
void CDisasm::Goto(u32 addr)
{
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg, IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->gotoAddr(addr);
SetFocus(GetDlgItem(m_hDlg, IDC_DISASMVIEW));
ptr->redraw();
@@ -865,7 +866,7 @@ void CDisasm::UpdateDialog() {
}
// Since these update on a delay, it's okay to do them immediately.
CtrlDisAsmView *ptr = CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg, IDC_DISASMVIEW));
CtrlDisAsmView *ptr = DisAsmView();
ptr->redraw();
CtrlRegisterList *rl = CtrlRegisterList::getFrom(GetDlgItem(m_hDlg, IDC_REGLIST));
rl->redraw();
@@ -911,3 +912,7 @@ void CDisasm::ProcessUpdateDialog() {
updateThreadLabel(!ingame || !Core_IsStepping());
}
CtrlDisAsmView *CDisasm::DisAsmView() {
return CtrlDisAsmView::getFrom(GetDlgItem(m_hDlg, IDC_DISASMVIEW));
}