diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index 4d6279385..b4209e323 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -217,17 +217,17 @@ BEGIN EDITTEXT IDC_VIREFRESH,102,75,109,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,90,91,10 EDITTEXT IDC_COUNTPERBYTE,102,88,109,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Overclock Modifier", IDC_OVER_CLOCK_MODIFIER_TEXT, 6, 103, 91, 10 - EDITTEXT IDC_OVER_CLOCK_MODIFIER, 102, 101, 109, 12, ES_AUTOHSCROLL | ES_NUMBER - CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME | SS_SUNKEN, 3, 116, 208, 1 - CONTROL "32 Bit Engine", IDC_ROM_32BIT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 121, 91, 10 - CONTROL "Use TLB", IDC_USE_TLB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 102, 121, 91, 10 - CONTROL "Fixed Audio Timing", IDC_ROM_FIXEDAUDIO, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 132, 91, 10 - CONTROL "Sync using Audio", IDC_SYNC_AUDIO, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 102, 132, 91, 10 - CONTROL "Delay DP Interrupt", IDC_DELAY_DP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 143, 91, 10 - CONTROL "Delay SI Interrupt", IDC_DELAY_SI, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 102, 143, 91, 10 - CONTROL "RSP Audio Signal", IDC_AUDIO_SIGNAL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 154, 91, 10 - CONTROL "Unaligned DMA", IDC_UNALIGNED_DMA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 102, 154, 91, 10 + LTEXT "Overclock Modifier",IDC_OVER_CLOCK_MODIFIER_TEXT,6,103,91,10 + EDITTEXT IDC_OVER_CLOCK_MODIFIER,102,101,109,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,3,116,208,1 + CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,121,91,10 + CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,121,91,10 + CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,132,91,10 + CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,132,91,10 + CONTROL "Delay DP Interrupt",IDC_DELAY_DP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,143,91,10 + CONTROL "Delay SI Interrupt",IDC_DELAY_SI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,91,10 + CONTROL "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,154,91,10 + CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,154,91,10 END IDD_Settings_Accelerator DIALOGEX 0, 0, 218, 183 @@ -690,7 +690,7 @@ BEGIN PUSHBUTTON "+",IDC_ADDBP_BTN,511,17,20,12 PUSHBUTTON "-",IDC_RMBP_BTN,511,29,20,12 PUSHBUTTON "x",IDC_CLEARBP_BTN,511,41,20,12 - CONTROL "",IDC_REG_TABS,"SysTabControl32",TCS_MULTILINE | 0x8,298,62,234,233 + CONTROL "",IDC_REG_TABS,"SysTabControl32",TCS_MULTILINE | 0x8,298,62,234,249 CONTROL "",IDC_CMD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_OWNERDRAWFIXED | LVS_NOSCROLL | LVS_NOSORTHEADER | WS_TABSTOP,0,0,284,327 LISTBOX IDC_BP_LIST,422,17,88,42,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP GROUPBOX "",IDC_OPCODE_BOX,298,14,119,45,0,WS_EX_TRANSPARENT @@ -718,59 +718,59 @@ BEGIN LTEXT "T5",IDC_R13_LBL,3,158,10,8,SS_NOTIFY LTEXT "T6",IDC_R14_LBL,3,169,10,8,SS_NOTIFY LTEXT "T7",IDC_R15_LBL,3,180,10,8,SS_NOTIFY - LTEXT "S0",IDC_R16_LBL,95,15,10,8,SS_NOTIFY - LTEXT "S1",IDC_R17_LBL,95,26,10,8,SS_NOTIFY - LTEXT "S2",IDC_R18_LBL,95,37,10,8,SS_NOTIFY - LTEXT "S3",IDC_R19_LBL,95,48,10,8,SS_NOTIFY - LTEXT "S4",IDC_R20_LBL,95,59,10,8,SS_NOTIFY - LTEXT "S5",IDC_R21_LBL,95,70,10,8,SS_NOTIFY - LTEXT "S6",IDC_R22_LBL,95,81,10,8,SS_NOTIFY - LTEXT "S7",IDC_R23_LBL,95,92,10,8,SS_NOTIFY - LTEXT "T8",IDC_R24_LBL,95,103,10,8,SS_NOTIFY - LTEXT "T9",IDC_R25_LBL,95,114,10,8,SS_NOTIFY - LTEXT "K0",IDC_R26_LBL,95,125,10,8,SS_NOTIFY - LTEXT "K1",IDC_R27_LBL,95,136,10,8,SS_NOTIFY - LTEXT "GP",IDC_R28_LBL,95,147,10,8,SS_NOTIFY - LTEXT "SP",IDC_R29_LBL,95,158,10,8,SS_NOTIFY - LTEXT "FP",IDC_R30_LBL,95,169,10,8,SS_NOTIFY - LTEXT "RA",IDC_R31_LBL,95,180,10,8,SS_NOTIFY - EDITTEXT IDC_R0_EDIT,17,15,75,10,ES_UPPERCASE | ES_AUTOHSCROLL | WS_DISABLED,WS_EX_RIGHT - EDITTEXT IDC_R1_EDIT,17,26,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R2_EDIT,17,37,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R3_EDIT,17,48,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R4_EDIT,17,59,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R5_EDIT,17,70,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R6_EDIT,17,81,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R7_EDIT,17,92,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R8_EDIT,17,103,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R9_EDIT,17,114,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R10_EDIT,17,125,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R11_EDIT,17,136,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R12_EDIT,17,147,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R13_EDIT,17,158,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R14_EDIT,17,169,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R15_EDIT,17,180,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R16_EDIT,109,15,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R17_EDIT,109,26,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R18_EDIT,109,37,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R19_EDIT,109,48,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R20_EDIT,109,59,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R21_EDIT,109,70,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R22_EDIT,109,81,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R23_EDIT,109,92,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R24_EDIT,109,103,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R25_EDIT,109,114,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R26_EDIT,109,125,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R27_EDIT,109,136,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R28_EDIT,109,147,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R29_EDIT,109,158,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R30_EDIT,109,169,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_R31_EDIT,109,180,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + LTEXT "S0",IDC_R16_LBL,92,15,10,8,SS_NOTIFY + LTEXT "S1",IDC_R17_LBL,92,26,10,8,SS_NOTIFY + LTEXT "S2",IDC_R18_LBL,92,37,10,8,SS_NOTIFY + LTEXT "S3",IDC_R19_LBL,92,48,10,8,SS_NOTIFY + LTEXT "S4",IDC_R20_LBL,92,59,10,8,SS_NOTIFY + LTEXT "S5",IDC_R21_LBL,92,70,10,8,SS_NOTIFY + LTEXT "S6",IDC_R22_LBL,92,81,10,8,SS_NOTIFY + LTEXT "S7",IDC_R23_LBL,92,92,10,8,SS_NOTIFY + LTEXT "T8",IDC_R24_LBL,92,103,10,8,SS_NOTIFY + LTEXT "T9",IDC_R25_LBL,92,114,10,8,SS_NOTIFY + LTEXT "K0",IDC_R26_LBL,92,125,10,8,SS_NOTIFY + LTEXT "K1",IDC_R27_LBL,92,136,10,8,SS_NOTIFY + LTEXT "GP",IDC_R28_LBL,92,147,10,8,SS_NOTIFY + LTEXT "SP",IDC_R29_LBL,92,158,10,8,SS_NOTIFY + LTEXT "FP",IDC_R30_LBL,92,169,10,8,SS_NOTIFY + LTEXT "RA",IDC_R31_LBL,92,180,10,8,SS_NOTIFY + EDITTEXT IDC_R0_EDIT,15,15,72,10,ES_UPPERCASE | ES_AUTOHSCROLL | WS_DISABLED,WS_EX_RIGHT + EDITTEXT IDC_R1_EDIT,15,26,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R2_EDIT,15,37,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R3_EDIT,15,48,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R4_EDIT,15,59,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R5_EDIT,15,70,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R6_EDIT,15,81,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R7_EDIT,15,92,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R8_EDIT,15,103,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R9_EDIT,15,114,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R10_EDIT,15,125,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R11_EDIT,15,136,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R12_EDIT,15,147,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R13_EDIT,15,158,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R14_EDIT,15,169,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R15_EDIT,15,180,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R16_EDIT,104,15,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R17_EDIT,104,26,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R18_EDIT,104,37,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R19_EDIT,104,48,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R20_EDIT,104,59,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R21_EDIT,104,70,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R22_EDIT,104,81,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R23_EDIT,104,92,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R24_EDIT,104,103,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R25_EDIT,104,114,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R26_EDIT,104,125,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R27_EDIT,104,136,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R28_EDIT,104,147,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R29_EDIT,104,158,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R30_EDIT,104,169,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_R31_EDIT,104,180,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT LTEXT "HI",IDC_HI_LBL,3,195,10,8,SS_NOTIFY - LTEXT "LO",IDC_LO_LBL,95,195,10,8,SS_NOTIFY - EDITTEXT IDC_HI_EDIT,17,195,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - EDITTEXT IDC_LO_EDIT,109,195,75,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - CONTROL "",IDC_STATIC,"Static",SS_GRAYFRAME | SS_SUNKEN,3,192,180,1 + LTEXT "LO",IDC_LO_LBL,92,195,10,8,SS_NOTIFY + EDITTEXT IDC_HI_EDIT,15,195,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + EDITTEXT IDC_LO_EDIT,104,195,72,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT + CONTROL "",IDC_STATIC,"Static",SS_GRAYFRAME | SS_SUNKEN,3,192,173,1 LTEXT "CPU General Purpose Registers",IDC_STATIC,3,4,165,8 END @@ -1172,7 +1172,7 @@ BEGIN END IDD_Debugger_RegVI DIALOGEX 0, 0, 190, 210 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU +STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU FONT 9, "Lucida Console", 400, 0, 0x1 BEGIN LTEXT "00 VI_STATUS/CONTROL_REG",IDC_STATIC,3,29,103,8 @@ -1182,7 +1182,7 @@ BEGIN LTEXT "14 VI_BURST/TIMING_REG",IDC_STATIC,3,83,94,8 LTEXT "18 VI_V_SYNC_REG",IDC_STATIC,3,94,94,8 LTEXT "1C VI_H_SYNC_REG",IDC_STATIC,3,105,66,8 - LTEXT "20 VI_LEAP/H_SYNC_LEAP_REG",IDC_STATIC,3,116,103,8 + LTEXT "20 VI_LEAP/H_SYNC_LEAP_REG",IDC_STATIC,3,116,122,8 LTEXT "24 VI_H_START/H_VIDEO_REG",IDC_STATIC,3,127,121,8 LTEXT "28 VI_V_START/V_VIDEO_REG",IDC_STATIC,3,138,122,8 LTEXT "2C VI_V_BURST_REG",IDC_STATIC,3,149,69,8 @@ -1208,7 +1208,7 @@ BEGIN END IDD_Debugger_RegDD DIALOGEX 0, 0, 190, 238 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU +STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU FONT 9, "Lucida Console", 400, 0, 0x1 BEGIN LTEXT "00 ASIC_DATA",IDC_STATIC,3,29,103,8 @@ -1247,9 +1247,9 @@ BEGIN EDITTEXT IDC_DD3C_EDIT,87,193,39,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT LTEXT "40 ASIC_ID_REG",IDC_STATIC,3,204,61,8 EDITTEXT IDC_DD40_EDIT,87,204,39,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - LTEXT "44 ASIC_TEST_REG",IDC_STATIC,3,215,63,8 + LTEXT "44 ASIC_TEST_REG",IDC_STATIC,3,215,82,8 EDITTEXT IDC_DD44_EDIT,87,215,39,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT - LTEXT "48 ASIC_TEST_PIN_SEL",IDC_STATIC,3,226,78,8 + LTEXT "48 ASIC_TEST_PIN_SEL",IDC_STATIC,3,226,83,8 EDITTEXT IDC_DD48_EDIT,87,226,39,10,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT END @@ -2194,6 +2194,16 @@ BEGIN 0 END +IDD_Debugger_RegDD AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_Debugger_RegVI AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// //