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

[Project64] clean up debugger code

This commit is contained in:
zilmar 2017-09-13 20:36:03 +10:00
parent b645ef908f
commit 7bb70c2a49
21 changed files with 1316 additions and 1326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/N64System/Debugger/Assembler.h
View File

@ -2,7 +2,6 @@
#include <stdint.h>
typedef void(*SYNTAX)(uint32_t* opcode);
typedef struct {
@ -29,4 +28,3 @@ class CAssembler {
public:
static bool AssembleLine(char* line, uint32_t* opcode, uint32_t address = 0x00000000);
};

1
Source/Project64/N64System/Debugger/Breakpoints.h
View File

@ -139,5 +139,4 @@ public:
}
return BP_NOT_SET;
}
};

26
Source/Project64/N64System/Debugger/Debugger-Commands.h
View File

@ -197,24 +197,24 @@ private:
void CPUStepInto();
void CPUResume();
LRESULT OnInitDialog (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnActivate (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnSizing (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnScroll (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnMeasureItem (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnAddrChanged (WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnPCChanged (WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnListBoxClicked (WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnClicked (WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnSizing(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnScroll(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnMeasureItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnAddrChanged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnPCChanged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnListBoxClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnOpKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnCommandListClicked(NMHDR* pNMHDR);
LRESULT OnCommandListDblClicked(NMHDR* pNMHDR);
LRESULT OnCommandListRightClicked (NMHDR* pNMHDR);
LRESULT OnRegisterTabChange (NMHDR* pNMHDR);
LRESULT OnCustomDrawList (NMHDR* pNMHDR);
LRESULT OnDestroy (void);
LRESULT OnCommandListRightClicked(NMHDR* pNMHDR);
LRESULT OnRegisterTabChange(NMHDR* pNMHDR);
LRESULT OnCustomDrawList(NMHDR* pNMHDR);
LRESULT OnDestroy(void);
BEGIN_MSG_MAP_EX(CDebugCommandsView)
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)

3
Source/Project64/N64System/Debugger/Debugger-RegisterTabs.h
View File

@ -15,7 +15,7 @@
#include "Breakpoints.h"
#ifndef COUNT_OF
#define COUNT_OF(a) (sizeof(a) / sizeof(a[0]))
#define COUNT_OF(a) (sizeof(a) / sizeof(a[0]))
#endif
class CEditReg64 : public CWindowImpl<CEditReg64, CEdit>
@ -52,7 +52,6 @@ private:
unsigned : 1;
unsigned fromDelaySlot : 1;
};
} CAUSE;
enum TAB_ID {

1
Source/Project64/N64System/Debugger/Debugger-Scripts.h
View File

@ -139,5 +139,4 @@ public:
DLGRESIZE_CONTROL(IDC_CLEAR_BTN, DLSZ_MOVE_X)
DLGRESIZE_CONTROL(IDC_COPY_BTN, DLSZ_MOVE_X)
END_DLGRESIZE_MAP()
};

1
Source/Project64/N64System/Debugger/Debugger-StackView.h
View File

@ -11,7 +11,6 @@
#pragma once
class CDebugStackView :
public CDebugDialog<CDebugStackView>,
public CDialogResize<CDebugStackView>

2
Source/Project64/N64System/Debugger/Debugger-Symbols.h
View File

@ -15,7 +15,6 @@
// todo maybe add char* ownerName and use a TreeView
class CDebugSymbols :
public CDebugDialog<CDebugSymbols>,
public CDialogResize<CDebugSymbols>
@ -58,4 +57,3 @@ public:
DLGRESIZE_CONTROL(IDC_SYMBOLS_LIST, DLSZ_SIZE_X | DLSZ_SIZE_Y)
END_DLGRESIZE_MAP()
};

64
Source/Project64/N64System/Debugger/ScriptInstance.h
View File

@ -120,39 +120,39 @@ private:
static CScriptInstance* FetchInstance(duk_context* ctx);
// Bound functions (_native object)
static duk_ret_t js_ioSockCreate (duk_context*);
static duk_ret_t js_ioSockListen (duk_context*);
static duk_ret_t js_ioSockAccept (duk_context*); // async
static duk_ret_t js_ioSockConnect (duk_context*); // async
static duk_ret_t js_ioRead (duk_context*); // async
static duk_ret_t js_ioWrite (duk_context*); // async
static duk_ret_t js_ioClose (duk_context*); // (fd) ; file or socket
static duk_ret_t js_MsgBox (duk_context*); // (message, caption)
static duk_ret_t js_AddCallback (duk_context*); // (hookId, callback, tag) ; external events
static duk_ret_t js_RemoveCallback (duk_context*); // (callbackId)
static duk_ret_t js_GetPCVal (duk_context*); // ()
static duk_ret_t js_SetPCVal (duk_context*); // (value)
static duk_ret_t js_GetHIVal (duk_context*); // (bUpper)
static duk_ret_t js_SetHIVal (duk_context*); // (bUpper, value)
static duk_ret_t js_GetLOVal (duk_context*); // (bUpper)
static duk_ret_t js_SetLOVal (duk_context*); // (bUpper, value)
static duk_ret_t js_GetGPRVal (duk_context*); // (regNum, bUpper)
static duk_ret_t js_SetGPRVal (duk_context*); // (regNum, bUpper, value)
static duk_ret_t js_GetFPRVal (duk_context*); // (regNum, bDouble)
static duk_ret_t js_SetFPRVal (duk_context*); // (regNum, bDouble, value)
static duk_ret_t js_GetROMInt (duk_context*); // (address, bitwidth, signed)
static duk_ret_t js_GetROMFloat (duk_context*); // (address, bDouble)
static duk_ret_t js_GetROMBlock (duk_context*); // (address, nBytes) ; returns Buffer
static duk_ret_t js_GetROMString (duk_context*); // (address[, maxLen]) ; fetch zero terminated string from memory
static duk_ret_t js_ioSockCreate(duk_context*);
static duk_ret_t js_ioSockListen(duk_context*);
static duk_ret_t js_ioSockAccept(duk_context*); // async
static duk_ret_t js_ioSockConnect(duk_context*); // async
static duk_ret_t js_ioRead(duk_context*); // async
static duk_ret_t js_ioWrite(duk_context*); // async
static duk_ret_t js_ioClose(duk_context*); // (fd) ; file or socket
static duk_ret_t js_MsgBox(duk_context*); // (message, caption)
static duk_ret_t js_AddCallback(duk_context*); // (hookId, callback, tag) ; external events
static duk_ret_t js_RemoveCallback(duk_context*); // (callbackId)
static duk_ret_t js_GetPCVal(duk_context*); // ()
static duk_ret_t js_SetPCVal(duk_context*); // (value)
static duk_ret_t js_GetHIVal(duk_context*); // (bUpper)
static duk_ret_t js_SetHIVal(duk_context*); // (bUpper, value)
static duk_ret_t js_GetLOVal(duk_context*); // (bUpper)
static duk_ret_t js_SetLOVal(duk_context*); // (bUpper, value)
static duk_ret_t js_GetGPRVal(duk_context*); // (regNum, bUpper)
static duk_ret_t js_SetGPRVal(duk_context*); // (regNum, bUpper, value)
static duk_ret_t js_GetFPRVal(duk_context*); // (regNum, bDouble)
static duk_ret_t js_SetFPRVal(duk_context*); // (regNum, bDouble, value)
static duk_ret_t js_GetROMInt(duk_context*); // (address, bitwidth, signed)
static duk_ret_t js_GetROMFloat(duk_context*); // (address, bDouble)
static duk_ret_t js_GetROMBlock(duk_context*); // (address, nBytes) ; returns Buffer
static duk_ret_t js_GetROMString(duk_context*); // (address[, maxLen]) ; fetch zero terminated string from memory
static duk_ret_t js_GetRDRAMInt (duk_context*); // (address, bitwidth, signed)
static duk_ret_t js_SetRDRAMInt (duk_context*); // (address, bitwidth, signed, newValue)
static duk_ret_t js_GetRDRAMFloat (duk_context*); // (address, bDouble)
static duk_ret_t js_SetRDRAMFloat (duk_context*); // (address, bDouble, newValue)
static duk_ret_t js_GetRDRAMBlock (duk_context*); // (address, nBytes) ; returns Buffer
static duk_ret_t js_GetRDRAMString (duk_context*); // (address[, maxLen]) ; fetch zero terminated string from memory
static duk_ret_t js_ConsolePrint (duk_context*);
static duk_ret_t js_ConsoleClear (duk_context*);
static duk_ret_t js_GetRDRAMInt(duk_context*); // (address, bitwidth, signed)
static duk_ret_t js_SetRDRAMInt(duk_context*); // (address, bitwidth, signed, newValue)
static duk_ret_t js_GetRDRAMFloat(duk_context*); // (address, bDouble)
static duk_ret_t js_SetRDRAMFloat(duk_context*); // (address, bDouble, newValue)
static duk_ret_t js_GetRDRAMBlock(duk_context*); // (address, nBytes) ; returns Buffer
static duk_ret_t js_GetRDRAMString(duk_context*); // (address[, maxLen]) ; fetch zero terminated string from memory
static duk_ret_t js_ConsolePrint(duk_context*);
static duk_ret_t js_ConsoleClear(duk_context*);
static duk_ret_t js_Pause(duk_context*); // () ; pauses emulation
static duk_ret_t js_ShowCommands(duk_context*); // ([address]) ; shows commands window

1
Source/Project64/N64System/Debugger/ScriptSystem.h
View File

@ -67,7 +67,6 @@ private:
public:
// Returns true if any of the script hooks have callbacks for scriptInstance
void SetScreenDC(HDC hdc)
{
m_ScreenDC = hdc;

1
Source/Project64/N64System/Debugger/Symbols.h
View File

@ -102,7 +102,6 @@ public:
static void DeleteCriticalSection();
static void EnterCriticalSection();
static void LeaveCriticalSection();
};
class CSymbolEntry {

58
Source/Project64/N64System/Debugger/debugger.h
View File

@ -27,10 +27,10 @@ class CScriptSystem;
__interface CDebugger
{
virtual void TLBChanged ( void ) = 0;
virtual bool CPUStepStarted ( void ) = 0;
virtual void CPUStep ( void ) = 0;
virtual void FrameDrawn ( void ) = 0;
virtual void TLBChanged(void) = 0;
virtual bool CPUStepStarted(void) = 0;
virtual void CPUStep(void) = 0;
virtual void FrameDrawn(void) = 0;
};
class CDebuggerUI :
@ -57,32 +57,32 @@ protected:
CDebuggerUI();
virtual ~CDebuggerUI();
void TLBChanged ( void );
bool CPUStepStarted ( void );
void CPUStep ( void );
void FrameDrawn ( void );
void TLBChanged(void);
bool CPUStepStarted(void);
void CPUStep(void);
void FrameDrawn(void);
public:
void Debug_Reset ( void );
void Debug_ShowMemoryDump ( void );
void Debug_ShowMemoryWindow ( void );
void Debug_ShowMemoryLocation ( uint32_t Address, bool VAddr );
void Debug_ShowMemorySearch ( void );
void Debug_ShowTLBWindow ( void );
void Debug_RefreshTLBWindow ( void );
void Debug_ShowCommandsWindow ( void );
void Debug_ShowCommandsLocation ( uint32_t address, bool top );
void Debug_ShowScriptsWindow ( void );
void Debug_LogScriptsWindow ( const char* text );
void Debug_ClearScriptsWindow ( void );
void Debug_RefreshScriptsWindow ( void );
void Debug_RefreshSymbolsWindow ( void );
void Debug_ShowSymbolsWindow ( void );
void Debug_ShowStackTrace ( void );
void Debug_ShowStackWindow ( void );
void Debug_RefreshStackWindow ( void );
void Debug_RefreshStackTraceWindow ( void );
void Debug_ShowDMALogWindow ( void );
void Debug_Reset(void);
void Debug_ShowMemoryDump(void);
void Debug_ShowMemoryWindow(void);
void Debug_ShowMemoryLocation(uint32_t Address, bool VAddr);
void Debug_ShowMemorySearch(void);
void Debug_ShowTLBWindow(void);
void Debug_RefreshTLBWindow(void);
void Debug_ShowCommandsWindow(void);
void Debug_ShowCommandsLocation(uint32_t address, bool top);
void Debug_ShowScriptsWindow(void);
void Debug_LogScriptsWindow(const char* text);
void Debug_ClearScriptsWindow(void);
void Debug_RefreshScriptsWindow(void);
void Debug_RefreshSymbolsWindow(void);
void Debug_ShowSymbolsWindow(void);
void Debug_ShowStackTrace(void);
void Debug_ShowStackWindow(void);
void Debug_RefreshStackWindow(void);
void Debug_RefreshStackTraceWindow(void);
void Debug_ShowDMALogWindow(void);
CBreakpoints* Breakpoints();
CDebugSymbols* Symbols();
@ -90,5 +90,5 @@ public:
CDebugScripts* ScriptConsole();
CDMALog* DMALog();
static void GameReset ( CDebuggerUI * _this );
static void GameReset(CDebuggerUI * _this);
};