diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp index 4c3b13228f..391432d1cb 100644 --- a/Windows/Debugger/CtrlDisAsmView.cpp +++ b/Windows/Debugger/CtrlDisAsmView.cpp @@ -934,8 +934,6 @@ void CtrlDisAsmView::onMouseUp(WPARAM wParam, LPARAM lParam, int button) case ID_DISASM_GOTOINMEMORYVIEW: SendMessage(GetParent(wnd),WM_DEB_GOTOHEXEDIT,curAddress,0); break; - case ID_DISASM_ADDHLE: - break; case ID_DISASM_TOGGLEBREAKPOINT: toggleBreakpoint(); redraw(); diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp index 3d802ddeef..99828b2be8 100644 --- a/Windows/Debugger/Debugger_Disasm.cpp +++ b/Windows/Debugger/Debugger_Disasm.cpp @@ -405,11 +405,11 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) bottomTabs->ShowTab(stackTraceView->GetHandle()); break; - case ID_DEBUG_DSIPLAYREGISTERLIST: + case ID_DEBUG_DISPLAYREGISTERLIST: leftTabs->ShowTab(0); break; - case ID_DEBUG_DSIPLAYFUNCTIONLIST: + case ID_DEBUG_DISPLAYFUNCTIONLIST: leftTabs->ShowTab(1); break; @@ -585,10 +585,6 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) } break; - case IDC_ALLFUNCTIONS: - if (g_symbolMap) - g_symbolMap->FillSymbolListBox(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST),ST_FUNCTION); - break; default: return FALSE; } diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 3d7d263d4a..d1905b9fca 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -65,7 +65,6 @@ BEGIN "G", ID_DEBUG_GEDEBUGGER, VIRTKEY, CONTROL, NOINVERT "L", ID_DEBUG_LOG, VIRTKEY, CONTROL, NOINVERT "M", ID_DEBUG_MEMORYVIEW, VIRTKEY, CONTROL, NOINVERT - "R", ID_DEBUG_REGISTERS, VIRTKEY, CONTROL, NOINVERT VK_F3, ID_FILE_SAVESTATE_NEXT_SLOT_HC, VIRTKEY, NOINVERT VK_F2, ID_FILE_QUICKSAVESTATE_HC, VIRTKEY, NOINVERT VK_F4, ID_FILE_QUICKLOADSTATE_HC, VIRTKEY, NOINVERT @@ -81,8 +80,8 @@ END IDR_DEBUGACCELS ACCELERATORS BEGIN "B", ID_DEBUG_ADDBREAKPOINT, VIRTKEY, CONTROL, NOINVERT - "R", ID_DEBUG_DSIPLAYREGISTERLIST, VIRTKEY, CONTROL, NOINVERT - "L", ID_DEBUG_DSIPLAYFUNCTIONLIST, VIRTKEY, CONTROL, NOINVERT + "R", ID_DEBUG_DISPLAYREGISTERLIST, VIRTKEY, CONTROL, NOINVERT + "L", ID_DEBUG_DISPLAYFUNCTIONLIST, VIRTKEY, CONTROL, NOINVERT "1", ID_DEBUG_DISPLAYMEMVIEW, VIRTKEY, CONTROL, NOINVERT "2", ID_DEBUG_DISPLAYBREAKPOINTLIST, VIRTKEY, CONTROL, NOINVERT "3", ID_DEBUG_DISPLAYTHREADLIST, VIRTKEY, CONTROL, NOINVERT @@ -693,18 +692,12 @@ BEGIN MENUITEM "Toggle Breakpoint", ID_DISASM_TOGGLEBREAKPOINT MENUITEM "Follow Branch", ID_DISASM_FOLLOWBRANCH MENUITEM SEPARATOR - MENUITEM "Show Dynarec Results", ID_DISASM_DYNARECRESULTS MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW MENUITEM SEPARATOR - MENUITEM "Kill Function", ID_DISASM_ADDHLE MENUITEM "Rename Function...", ID_DISASM_RENAMEFUNCTION MENUITEM "Remove Function", ID_DISASM_REMOVEFUNCTION MENUITEM "Add Function Here", ID_DISASM_ADDFUNCTION END - POPUP "funclist" - BEGIN - MENUITEM "Kill Function", ID_FUNCLIST_KILLFUNCTION - END POPUP "reglist" BEGIN MENUITEM "Go to in Memory View", ID_REGLIST_GOTOINMEMORYVIEW @@ -713,10 +706,6 @@ BEGIN MENUITEM "Copy Value", ID_REGLIST_COPYVALUE MENUITEM "Change...", ID_REGLIST_CHANGE END - POPUP "controls" - BEGIN - MENUITEM "Disable", ID_CONTROLS_KEY_DISABLE - END POPUP "breakpointlist" BEGIN MENUITEM "Enable", ID_DISASM_DISABLEBREAKPOINT diff --git a/Windows/resource.h b/Windows/resource.h index 97294fd306..95742e1999 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -11,52 +11,26 @@ #define IDC_RAM 107 #define IDC_STEPOVER 108 #define IDC_TABDATATYPE 109 -#define IDC_CALLSTACK 110 #define ID_MEMVIEW_GOTOINDISASM 112 -#define ID_DISASM_DYNARECRESULTS 113 #define IDI_PPSSPP 115 -#define IDD_CONFIG 116 #define IDI_STOPDISABLE 118 #define ID_DEBUG_DISASSEMBLY 119 -#define ID_DEBUG_REGISTERS 120 #define WHEEL_DELTA 120 #define ID_DEBUG_LOG 121 -#define ID_DEBUG_BREAKPOINTS 122 #define ID_FILE_OPEN_NEW_INSTANCE 123 #define ID_FILE_LOADSTATEFILE 126 #define ID_FILE_SAVESTATEFILE 127 #define ID_EMULATION_RESET 130 #define IDD_ABOUTBOX 133 #define ID_DEBUG_LOADMAPFILE 134 -#define ID_CONFIG_RESOLUTION 141 #define ID_OPTIONS_FULLSCREEN 154 -#define ID_OPTIONS_SETTINGS 155 -#define ID_OPTIONS_SHOWERRORS 158 -#define ID_PLUGINS_LOADDEFAULTPLUGINS 159 #define IDD_MEMORY 160 #define ID_DEBUG_MEMORYVIEW 161 #define IDR_ACCELS 162 -#define ID_FILE_BOOTDVD 166 -#define ID_OPTIONS_ENABLEFRAMEBUFFER 167 #define IDR_POPUPMENUS 169 -#define ID_DEBUG_MEMORYCHECKS 173 -#define IDD_DIALOG2 186 -#define IDD_MEMORYSEARCH 187 -#define ID_DEBUG_MEMORYSEARCH 188 -#define ID_DEBUG_EXPERIMENT 189 -#define IDR_MENU2 190 #define ID_DISASM_GOTOINMEMORYVIEW 197 #define ID_DISASM_TOGGLEBREAKPOINT 198 #define ID_MEMVIEW_DUMP 199 -#define ID_OPTIONS_LOGGPFIFO 200 -#define ID_VIEW_TOOLBAR202 202 -#define ID_VIEW_STATUSBAR 203 -#define ID_HELP_INDEX204 204 -#define ID_HELP_ 206 -#define ID_HELP_HOMEPAGE 208 -#define ID_DEBUG_COMPILESIGNATUREFILE 209 -#define ID_DEBUG_USESIGNATUREFILE 210 -#define ID_DEBUG_UNLOADALLSYMBOLS 211 #define ID_DEBUG_RESETSYMBOLTABLE 212 #define IDI_STOP 223 #define IDD_INPUTBOX 226 @@ -73,8 +47,8 @@ #define ID_DEBUG_STEPINTO 244 #define ID_DEBUG_RUNTOLINE 245 #define ID_DEBUG_STEPOUT 246 -#define ID_DEBUG_DSIPLAYREGISTERLIST 247 -#define ID_DEBUG_DSIPLAYFUNCTIONLIST 248 +#define ID_DEBUG_DISPLAYREGISTERLIST 247 +#define ID_DEBUG_DISPLAYFUNCTIONLIST 248 #define ID_MEMVIEW_COPYADDRESS 249 #define IDD_GEDEBUGGER 250 #define IDD_TABDISPLAYLISTS 251 @@ -88,50 +62,21 @@ #define IDC_ADDRESS 1002 #define IDC_DEBUG_COUNT 1003 #define IDC_SEARCH_BOX 1004 -#define IDC_MEMORY 1006 -#define IDC_SH4REGISTERS 1007 -#define IDC_REGISTERS 1007 -#define IDC_BREAKPOINTS 1008 #define IDC_STEP 1009 #define IDC_VERSION 1010 -#define IDC_UP 1014 -#define IDC_DOWN 1015 -#define IDC_BREAKPOINTS_LIST 1015 -#define IDC_ADD 1016 -#define IDC_BREAKPOINT_EDIT 1017 -#define IDC_REMOVE 1018 -#define IDC_REMOVE_ALL 1019 -#define IDC_REGISTER_TAB 1019 -#define IDC_HIDE 1020 -#define IDC_TOGGLEBREAKPOINT 1049 -#define IDC_STAGE 1059 #define IDC_MEMVIEW 1069 #define IDC_GOTOLR 1070 #define IDC_GOTOINT 1071 #define IDC_MEMSORT 1073 -#define IDC_ALLFUNCTIONS 1075 -#define IDC_RESULTS 1093 #define IDC_SYMBOLS 1097 -#define IDC_X86ASM 1098 #define IDC_INPUTBOX 1098 #define IDC_MODENORMAL 1099 #define IDC_MODESYMBOLS 1100 -#define IDC_LOG_SHOW 1101 #define IDC_SEARCH_RESULTS 1102 -#define IDC_UPDATELOG 1108 -#define IDC_SETPC 1118 -#define IDC_UPDATEMISC 1134 -#define IDC_CODEADDRESS 1135 -#define IDC_BLOCKNUMBER 1136 -#define IDC_PREVBLOCK 1138 #define IDC_REGIONS 1142 #define IDC_REGLIST 1146 #define IDC_VALUENAME 1148 -#define IDC_FILELIST 1150 -#define IDC_BROWSE 1159 #define IDC_SHOWVFPU 1161 -#define IDC_LISTCONTROLS 1162 -#define IDC_FORCE_INPUT_DEVICE 1163 #define IDC_BREAKPOINTLIST 1164 #define IDC_DEBUGMEMVIEW 1165 #define IDC_BREAKPOINT_OK 1166 @@ -176,8 +121,6 @@ #define ID_FILE_EXIT 40000 #define ID_DEBUG_SAVEMAPFILE 40001 -#define ID_DISASM_ADDHLE 40002 -#define ID_FUNCLIST_KILLFUNCTION 40003 #define ID_DISASM_RUNTOHERE 40004 #define ID_MEMVIEW_COPYVALUE_8 40005 #define ID_DISASM_COPYINSTRUCTIONDISASM 40006 @@ -233,7 +176,6 @@ #define ID_TEXTURESCALING_DEPOSTERIZE 40057 #define ID_TEXTURESCALING_BICUBIC 40058 #define ID_TEXTURESCALING_HYBRID_BICUBIC 40059 -#define ID_CONTROLS_KEY_DISABLE 40062 #define ID_OPTIONS_TOPMOST 40063 #define ID_HELP_OPENFORUM 40064 #define ID_OPTIONS_VSYNC 40065