ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger: Fix class indentation

This commit is contained in:
Lioncash 2014-10-18 22:55:23 -04:00
parent 4ddd54847c
commit 635408b686
3 changed files with 143 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
Source/Core/DolphinWX/Debugger/CodeWindow.h
View File

@ -32,117 +32,113 @@ class wxListBox;
class wxMenu; class wxMenu;
class wxMenuBar; class wxMenuBar;
class CCodeWindow class CCodeWindow : public wxPanel
: public wxPanel
{ {
public: public:
CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter,
CFrame * parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _("Code"));
CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, void Load();
CFrame * parent, void Save();
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _("Code")
);
void Load(); // Parent interaction
void Save(); CFrame *Parent;
wxMenuBar * GetMenuBar();
wxToolBar * GetToolBar();
wxBitmap m_Bitmaps[ToolbarDebugBitmapMax];
// Parent interaction bool UseInterpreter();
CFrame *Parent; bool BootToPause();
wxMenuBar * GetMenuBar(); bool AutomaticStart();
wxToolBar * GetToolBar(); bool JITNoBlockCache();
wxBitmap m_Bitmaps[ToolbarDebugBitmapMax]; bool JITNoBlockLinking();
bool JumpToAddress(u32 address);
bool UseInterpreter(); void Update() override;
bool BootToPause(); void NotifyMapLoaded();
bool AutomaticStart(); void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar);
bool JITNoBlockCache(); void CreateMenuOptions(wxMenu *pMenu);
bool JITNoBlockLinking(); void CreateMenuSymbols(wxMenuBar *pMenuBar);
bool JumpToAddress(u32 address); void RecreateToolbar(wxToolBar*);
void PopulateToolbar(wxToolBar* toolBar);
void UpdateButtonStates();
void OpenPages();
void UpdateManager();
void Update() override; // Menu bar
void NotifyMapLoaded(); // -------------------
void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
void CreateMenuOptions(wxMenu *pMenu); void OnJITOff(wxCommandEvent& event);
void CreateMenuSymbols(wxMenuBar *pMenuBar);
void RecreateToolbar(wxToolBar*);
void PopulateToolbar(wxToolBar* toolBar);
void UpdateButtonStates();
void OpenPages();
void UpdateManager();
// Menu bar void ToggleCodeWindow(bool bShow);
// ------------------- void ToggleRegisterWindow(bool bShow);
void OnCPUMode(wxCommandEvent& event); // CPU Mode menu void ToggleBreakPointWindow(bool bShow);
void OnJITOff(wxCommandEvent& event); void ToggleMemoryWindow(bool bShow);
void ToggleJitWindow(bool bShow);
void ToggleSoundWindow(bool bShow);
void ToggleVideoWindow(bool bShow);
void ToggleCodeWindow(bool bShow); void OnChangeFont(wxCommandEvent& event);
void ToggleRegisterWindow(bool bShow);
void ToggleBreakPointWindow(bool bShow);
void ToggleMemoryWindow(bool bShow);
void ToggleJitWindow(bool bShow);
void ToggleSoundWindow(bool bShow);
void ToggleVideoWindow(bool bShow);
void OnChangeFont(wxCommandEvent& event); void OnCodeStep(wxCommandEvent& event);
void OnAddrBoxChange(wxCommandEvent& event);
void OnSymbolsMenu(wxCommandEvent& event);
void OnJitMenu(wxCommandEvent& event);
void OnProfilerMenu(wxCommandEvent& event);
void OnCodeStep(wxCommandEvent& event); // Sub dialogs
void OnAddrBoxChange(wxCommandEvent& event); CRegisterWindow* m_RegisterWindow;
void OnSymbolsMenu(wxCommandEvent& event); CBreakPointWindow* m_BreakpointWindow;
void OnJitMenu(wxCommandEvent& event); CMemoryWindow* m_MemoryWindow;
void OnProfilerMenu(wxCommandEvent& event); CJitWindow* m_JitWindow;
DSPDebuggerLLE* m_SoundWindow;
GFXDebuggerPanel* m_VideoWindow;
// Sub dialogs // Settings
CRegisterWindow* m_RegisterWindow; bool bAutomaticStart; bool bBootToPause;
CBreakPointWindow* m_BreakpointWindow; bool bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW + 1];
CMemoryWindow* m_MemoryWindow; int iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
CJitWindow* m_JitWindow;
DSPDebuggerLLE* m_SoundWindow;
GFXDebuggerPanel* m_VideoWindow;
// Settings private:
bool bAutomaticStart; bool bBootToPause; enum
bool bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW + 1]; {
int iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW + 1]; // Debugger GUI Objects
ID_CODEVIEW,
ID_CALLSTACKLIST,
ID_CALLERSLIST,
ID_CALLSLIST,
ID_SYMBOLLIST
};
private: void OnSymbolListChange(wxCommandEvent& event);
void OnSymbolListContextMenu(wxContextMenuEvent& event);
void OnCallstackListChange(wxCommandEvent& event);
void OnCallersListChange(wxCommandEvent& event);
void OnCallsListChange(wxCommandEvent& event);
void OnCodeViewChange(wxCommandEvent &event);
void OnHostMessage(wxCommandEvent& event);
enum // Debugger functions
{ void SingleStep();
// Debugger GUI Objects void StepOver();
ID_CODEVIEW, void ToggleBreakpoint();
ID_CALLSTACKLIST,
ID_CALLERSLIST,
ID_CALLSLIST,
ID_SYMBOLLIST
};
void OnSymbolListChange(wxCommandEvent& event); void UpdateLists();
void OnSymbolListContextMenu(wxContextMenuEvent& event); void UpdateCallstack();
void OnCallstackListChange(wxCommandEvent& event);
void OnCallersListChange(wxCommandEvent& event);
void OnCallsListChange(wxCommandEvent& event);
void OnCodeViewChange(wxCommandEvent &event);
void OnHostMessage(wxCommandEvent& event);
// Debugger functions void InitBitmaps();
void SingleStep();
void StepOver();
void ToggleBreakpoint();
void UpdateLists(); CCodeView* codeview;
void UpdateCallstack(); wxListBox* callstack;
wxListBox* symbols;
wxListBox* callers;
wxListBox* calls;
Common::Event sync_event;
void InitBitmaps(); DECLARE_EVENT_TABLE()
CCodeView* codeview;
wxListBox* callstack;
wxListBox* symbols;
wxListBox* callers;
wxListBox* calls;
Common::Event sync_event;
DECLARE_EVENT_TABLE()
}; };

24
Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
View File

@ -13,19 +13,19 @@ class wxTextCtrl;
class MemoryCheckDlg : public wxDialog class MemoryCheckDlg : public wxDialog
{ {
public: public:
MemoryCheckDlg(CBreakPointWindow *parent); MemoryCheckDlg(CBreakPointWindow *parent);
private: private:
CBreakPointWindow *m_parent; CBreakPointWindow *m_parent;
wxCheckBox* m_pReadFlag; wxCheckBox* m_pReadFlag;
wxCheckBox* m_pWriteFlag; wxCheckBox* m_pWriteFlag;
wxCheckBox* m_log_flag; wxCheckBox* m_log_flag;
wxCheckBox* m_break_flag; wxCheckBox* m_break_flag;
wxTextCtrl* m_pEditEndAddress; wxTextCtrl* m_pEditEndAddress;
wxTextCtrl* m_pEditStartAddress; wxTextCtrl* m_pEditStartAddress;
void OnOK(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
}; };

82
Source/Core/DolphinWX/Debugger/MemoryWindow.h
View File

@ -22,54 +22,52 @@ class wxListBox;
class wxTextCtrl; class wxTextCtrl;
class wxWindow; class wxWindow;
class CMemoryWindow class CMemoryWindow : public wxPanel
: public wxPanel
{ {
public: public:
CMemoryWindow(wxWindow* parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _("Memory"));
CMemoryWindow(wxWindow* parent, wxCheckBox* chk8;
wxWindowID id = wxID_ANY, wxCheckBox* chk16;
const wxPoint& pos = wxDefaultPosition, wxCheckBox* chk32;
const wxSize& size = wxDefaultSize, wxButton* btnSearch;
long style = wxTAB_TRAVERSAL | wxBORDER_NONE, wxCheckBox* chkAscii;
const wxString& name = _("Memory")); wxCheckBox* chkHex;
void Save(IniFile& _IniFile) const;
void Load(IniFile& _IniFile);
wxCheckBox* chk8; void Update() override;
wxCheckBox* chk16; void NotifyMapLoaded();
wxCheckBox* chk32;
wxButton* btnSearch;
wxCheckBox* chkAscii;
wxCheckBox* chkHex;
void Save(IniFile& _IniFile) const;
void Load(IniFile& _IniFile);
void Update() override; void JumpToAddress(u32 _Address);
void NotifyMapLoaded();
void JumpToAddress(u32 _Address); private:
DECLARE_EVENT_TABLE()
private: CMemoryView* memview;
DECLARE_EVENT_TABLE() wxListBox* symbols;
CMemoryView* memview; wxButton* buttonGo;
wxListBox* symbols; wxTextCtrl* addrbox;
wxTextCtrl* valbox;
wxButton* buttonGo; void U8(wxCommandEvent& event);
wxTextCtrl* addrbox; void U16(wxCommandEvent& event);
wxTextCtrl* valbox; void U32(wxCommandEvent& event);
void onSearch(wxCommandEvent& event);
void U8(wxCommandEvent& event); void onAscii(wxCommandEvent& event);
void U16(wxCommandEvent& event); void onHex(wxCommandEvent& event);
void U32(wxCommandEvent& event); void OnSymbolListChange(wxCommandEvent& event);
void onSearch(wxCommandEvent& event); void OnCallstackListChange(wxCommandEvent& event);
void onAscii(wxCommandEvent& event); void OnAddrBoxChange(wxCommandEvent& event);
void onHex(wxCommandEvent& event); void OnHostMessage(wxCommandEvent& event);
void OnSymbolListChange(wxCommandEvent& event); void SetMemoryValue(wxCommandEvent& event);
void OnCallstackListChange(wxCommandEvent& event); void OnDumpMemory(wxCommandEvent& event);
void OnAddrBoxChange(wxCommandEvent& event); void OnDumpMem2(wxCommandEvent& event);
void OnHostMessage(wxCommandEvent& event); void OnDumpFakeVMEM(wxCommandEvent& event);
void SetMemoryValue(wxCommandEvent& event);
void OnDumpMemory(wxCommandEvent& event);
void OnDumpMem2(wxCommandEvent& event);
void OnDumpFakeVMEM(wxCommandEvent& event);
}; };