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

Core: Make 32bit CPU recompiler only setting

This commit is contained in:
zilmar 2022-12-19 09:07:26 +10:30
parent ad4f16abc6
commit cbacddb65e
17 changed files with 30 additions and 1274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Android/Bridge/jniBridgeSettings.cpp
View File

@ -77,7 +77,6 @@ CJniBridegSettings::CJniBridegSettings()
ADD_SETTING(Default_ViRefreshRate);
ADD_SETTING(Default_AiCountPerBytes);
ADD_SETTING(Default_CounterFactor);
ADD_SETTING(Default_32Bit);
ADD_SETTING(Default_SyncViaAudio);
ADD_SETTING(Default_FixedAudio);
ADD_SETTING(Default_UnalignedDMA);

11
Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp
View File

@ -4,7 +4,6 @@
#include <Project64-core/Debugger.h>
#include <Project64-core/ExceptionHandler.h>
#include <Project64-core/N64System/Interpreter/InterpreterOps32.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/R4300iInstruction.h>
#include <Project64-core/N64System/N64System.h>
@ -22,15 +21,7 @@ void ExecuteInterpreterOps(uint32_t /*Cycles*/)
void CInterpreterCPU::BuildCPU()
{
R4300iOp::m_TestTimer = false;
if (g_Settings->LoadBool(Game_32Bit))
{
m_R4300i_Opcode = R4300iOp32::BuildInterpreter();
}
else
{
m_R4300i_Opcode = R4300iOp::BuildInterpreter();
}
m_R4300i_Opcode = R4300iOp::BuildInterpreter();
}
void CInterpreterCPU::InPermLoop()

1135
Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp
View File

File diff suppressed because it is too large Load Diff

73
Source/Project64-core/N64System/Interpreter/InterpreterOps32.h
View File

@ -1,73 +0,0 @@
#pragma once
#include <Project64-core/N64System/Interpreter/InterpreterOps.h>
class R4300iOp32 :
public R4300iOp
{
public:
// Opcode functions
static void JAL();
static void BEQ();
static void BNE();
static void BLEZ();
static void BGTZ();
static void ADDI();
static void ADDIU();
static void SLTI();
static void SLTIU();
static void ANDI();
static void ORI();
static void XORI();
static void LUI();
static void BEQL();
static void BNEL();
static void BLEZL();
static void BGTZL();
static void LB();
static void LH();
static void LWL();
static void LW();
static void LBU();
static void LHU();
static void LWR();
static void LWU();
static void LL();
// R4300i opcodes: Special
static void SPECIAL_SLL();
static void SPECIAL_SRL();
static void SPECIAL_SRA();
static void SPECIAL_SLLV();
static void SPECIAL_SRLV();
static void SPECIAL_SRAV();
static void SPECIAL_JALR();
static void SPECIAL_ADD();
static void SPECIAL_ADDU();
static void SPECIAL_SUB();
static void SPECIAL_SUBU();
static void SPECIAL_AND();
static void SPECIAL_OR();
static void SPECIAL_NOR();
static void SPECIAL_SLT();
static void SPECIAL_SLTU();
static void SPECIAL_TEQ();
// R4300i opcodes: RegImm
static void REGIMM_BLTZ();
static void REGIMM_BGEZ();
static void REGIMM_BLTZL();
static void REGIMM_BGEZL();
static void REGIMM_BLTZAL();
static void REGIMM_BGEZAL();
// COP0 functions
static void COP0_MF();
// COP1 functions
static void COP1_MF();
static void COP1_CF();
static void COP1_DMT();
static Func * BuildInterpreter();
};

2
Source/Project64-core/Project64-core.vcxproj
View File

@ -58,7 +58,6 @@
<ClCompile Include="N64System\FramePerSecond.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterCPU.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterOps.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp" />
<ClCompile Include="N64System\MemoryHandler\AudioInterfaceHandler.cpp" />
<ClCompile Include="N64System\MemoryHandler\CartridgeDomain1Address1Handler.cpp" />
<ClCompile Include="N64System\MemoryHandler\CartridgeDomain1Address3Handler.cpp" />
@ -176,7 +175,6 @@
<ClInclude Include="N64System\Enhancement\Enhancements.h" />
<ClInclude Include="N64System\FramePerSecond.h" />
<ClInclude Include="N64System\Interpreter\InterpreterCPU.h" />
<ClInclude Include="N64System\Interpreter\InterpreterOps32.h" />
<ClInclude Include="N64System\Interpreter\InterpreterOps.h" />
<ClInclude Include="N64System\MemoryHandler\AudioInterfaceHandler.h" />
<ClInclude Include="N64System\MemoryHandler\CartridgeDomain1Address1Handler.h" />

6
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -288,9 +288,6 @@
<ClCompile Include="N64System\Interpreter\InterpreterOps.cpp">
<Filter>Source Files\N64 System\Interpreter</Filter>
</ClCompile>
<ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp">
<Filter>Source Files\N64 System\Interpreter</Filter>
</ClCompile>
<ClCompile Include="Multilanguage\Language.cpp">
<Filter>Source Files\Multilanguage</Filter>
</ClCompile>
@ -656,9 +653,6 @@
<ClInclude Include="N64System\Interpreter\InterpreterCPU.h">
<Filter>Header Files\N64 System\Interpreter</Filter>
</ClInclude>
<ClInclude Include="N64System\Interpreter\InterpreterOps32.h">
<Filter>Header Files\N64 System\Interpreter</Filter>
</ClInclude>
<ClInclude Include="N64System\Interpreter\InterpreterOps.h">
<Filter>Header Files\N64 System\Interpreter</Filter>
</ClInclude>

3
Source/Project64-core/Settings.cpp
View File

@ -132,7 +132,6 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
AddHandler(Default_ViRefreshRate, new CSettingTypeApplication("Defaults", "ViRefresh", 1500u));
AddHandler(Default_AiCountPerBytes, new CSettingTypeApplication("Defaults", "AiCountPerBytes", 0u));
AddHandler(Default_CounterFactor, new CSettingTypeApplication("Defaults", "Counter Factor", 2u));
AddHandler(Default_32Bit, new CSettingTypeApplication("Defaults", "32bit", false));
AddHandler(Default_SyncViaAudio, new CSettingTypeApplication("Defaults", "Audio-Sync Audio", true));
AddHandler(Default_FixedAudio, new CSettingTypeApplication("Defaults", "Fixed Audio", true));
AddHandler(Default_UnalignedDMA, new CSettingTypeApplication("Defaults", "Unaligned DMA", false));
@ -148,7 +147,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
AddHandler(Rdb_CounterFactor, new CSettingTypeRomDatabase("Counter Factor", Default_CounterFactor));
AddHandler(Rdb_DelayDP, new CSettingTypeRDBYesNo("Delay DP", true));
AddHandler(Rdb_DelaySi, new CSettingTypeRDBYesNo("Delay SI", false));
AddHandler(Rdb_32Bit, new CSettingTypeRDBYesNo("32bit", Default_32Bit));
AddHandler(Rdb_32Bit, new CSettingTypeRDBYesNo("32bit", false));
AddHandler(Rdb_FastSP, new CSettingTypeRDBYesNo("Fast SP", true));
AddHandler(Rdb_FixedAudio, new CSettingTypeRomDatabase("Fixed Audio", Default_FixedAudio));
AddHandler(Rdb_SyncViaAudio, new CSettingTypeRomDatabase("Audio-Sync Audio", Default_SyncViaAudio));

1
Source/Project64-core/Settings/SettingsID.h
View File

@ -68,7 +68,6 @@ enum SettingID
Default_ViRefreshRate,
Default_AiCountPerBytes,
Default_CounterFactor,
Default_32Bit,
Default_SyncViaAudio,
Default_FixedAudio,
Default_UnalignedDMA,

2
Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp
View File

@ -15,7 +15,6 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay)
SetDlgItemText(IDC_VIREFESH_TEXT, wGS(ROM_VIREFRESH).c_str());
SetDlgItemText(IDC_COUNTPERBYTE_TEXT, wGS(ROM_COUNTPERBYTE).c_str());
SetDlgItemText(IDC_COUNTFACT_TEXT, wGS(ROM_COUNTER_FACTOR).c_str());
SetDlgItemText(IDC_ROM_32BIT, wGS(ROM_32BIT).c_str());
SetDlgItemText(IDC_ROM_FIXEDAUDIO, wGS(ROM_FIXED_AUDIO).c_str());
SetDlgItemText(IDC_SYNC_AUDIO, wGS(ROM_SYNC_AUDIO).c_str());
SetDlgItemText(IDC_UNALIGNED_DMA, wGS(ROM_UNALIGNED_DMA).c_str());
@ -50,7 +49,6 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay)
TxtBox->SetTextField(GetDlgItem(IDC_COUNTPERBYTE_TEXT));
AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Default_UseHleGfx);
AddModCheckBox(GetDlgItem(IDC_ROM_32BIT), Default_32Bit);
AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Default_SyncViaAudio);
AddModCheckBox(GetDlgItem(IDC_ROM_FIXEDAUDIO), Default_FixedAudio);
AddModCheckBox(GetDlgItem(IDC_UNALIGNED_DMA), Default_UnalignedDMA);

1
Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h
View File

@ -7,7 +7,6 @@ class CDefaultsOptionsPage :
BEGIN_MSG_MAP_EX(CDefaultsOptionsPage)
{
COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_32BIT, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_SYNC_AUDIO, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_FIXEDAUDIO, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_UNALIGNED_DMA, CheckBoxChanged);

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp
View File

@ -20,7 +20,6 @@ CGameGeneralPage::CGameGeneralPage(HWND hParent, const RECT & rcDispay)
SetDlgItemText(IDC_COUNTPERBYTE_TEXT, wGS(ROM_COUNTPERBYTE).c_str());
SetDlgItemText(IDC_OVER_CLOCK_MODIFIER_TEXT, wGS(ROM_OVER_CLOCK_MODIFIER).c_str());
SetDlgItemText(IDC_ROM_32BIT, wGS(ROM_32BIT).c_str());
SetDlgItemText(IDC_ROM_FIXEDAUDIO, wGS(ROM_FIXED_AUDIO).c_str());
SetDlgItemText(IDC_DELAY_DP, wGS(ROM_DELAY_DP).c_str());
SetDlgItemText(IDC_SYNC_AUDIO, wGS(ROM_SYNC_AUDIO).c_str());
@ -29,7 +28,6 @@ CGameGeneralPage::CGameGeneralPage(HWND hParent, const RECT & rcDispay)
SetDlgItemText(IDC_UNALIGNED_DMA, wGS(ROM_UNALIGNED_DMA).c_str());
SetDlgItemText(IDC_RANDOMIZE_SIPI_INTERRUPTS, wGS(ROM_RANDOMIZE_SIPI_INTERRUPTS).c_str());
AddModCheckBox(GetDlgItem(IDC_ROM_32BIT), Game_32Bit);
AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Game_SyncViaAudio);
AddModCheckBox(GetDlgItem(IDC_ROM_FIXEDAUDIO), Game_FixedAudio);
AddModCheckBox(GetDlgItem(IDC_DELAY_DP), Game_DelayDP);

1
Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h
View File

@ -13,7 +13,6 @@ class CGameGeneralPage :
COMMAND_HANDLER_EX(IDC_RDRAM_SIZE, LBN_SELCHANGE, ComboBoxChanged);
COMMAND_HANDLER_EX(IDC_SAVE_TYPE, LBN_SELCHANGE, ComboBoxChanged);
COMMAND_HANDLER_EX(IDC_COUNTFACT, LBN_SELCHANGE, ComboBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_32BIT, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_SYNC_AUDIO, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_FIXEDAUDIO, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_DELAY_DP, CheckBoxChanged);

2
Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp
View File

@ -17,6 +17,7 @@ CGameRecompilePage::CGameRecompilePage(HWND hParent, const RECT & rcDispay)
SetDlgItemText(IDC_ROM_REGCACHE, wGS(ROM_REG_CACHE).c_str());
SetDlgItemText(IDC_BLOCK_LINKING, wGS(ADVANCE_ABL).c_str());
SetDlgItemText(IDC_ROM_FASTSP, wGS(ROM_FAST_SP).c_str());
SetDlgItemText(IDC_ROM_32BIT, wGS(ROM_32BIT).c_str());
SetDlgItemText(IDC_SMM_FRAME, wGS(ADVANCE_SMCM).c_str());
SetDlgItemText(IDC_SMM_CACHE, wGS(ADVANCE_SMM_CACHE).c_str());
@ -36,6 +37,7 @@ CGameRecompilePage::CGameRecompilePage(HWND hParent, const RECT & rcDispay)
AddModCheckBox(GetDlgItem(IDC_SMM_PROTECT), Game_SMM_Protect);
AddModCheckBox(GetDlgItem(IDC_SMM_STORE), Game_SMM_StoreInstruc);
AddModCheckBox(GetDlgItem(IDC_ROM_FASTSP), Game_FastSP);
AddModCheckBox(GetDlgItem(IDC_ROM_32BIT), Game_32Bit);
CModifiedComboBox * ComboBox;
ComboBox = AddModComboBox(GetDlgItem(IDC_CPU_TYPE), Game_CpuType);

1
Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h
View File

@ -12,6 +12,7 @@ class CGameRecompilePage :
COMMAND_ID_HANDLER_EX(IDC_ROM_REGCACHE, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_FASTSP, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_BLOCK_LINKING, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_ROM_32BIT, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_SMM_CACHE, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_SMM_DMA, CheckBoxChanged);
COMMAND_ID_HANDLER_EX(IDC_SMM_VALIDATE, CheckBoxChanged);

1
Source/Project64/UserInterface/Settings/SettingsPage-Options.cpp
View File

@ -20,7 +20,6 @@ CGeneralOptionsPage::CGeneralOptionsPage(CSettingConfig * SettingsConfig, HWND h
SetDlgItemText(IDC_ROMSEL_TEXT2, wGS(RB_ROMS).c_str());
SetDlgItemText(IDC_MAXROMDIR_TXT, wGS(RB_MAX_DIRS).c_str());
SetDlgItemText(IDC_ROMSEL_TEXT4, wGS(RB_DIRS).c_str());
SetDlgItemText(IDC_IPLDIR_TXT, wGS(OPTION_IPL_ROM_PATH).c_str());
AddModCheckBox(GetDlgItem(IDC_AUTOSLEEP), (SettingID)Setting_AutoSleep);
AddModCheckBox(GetDlgItem(IDC_LOAD_FULLSCREEN), (SettingID)Setting_AutoFullscreen);

41
Source/Project64/UserInterface/UIResources.rc
View File

@ -161,10 +161,10 @@ BEGIN
CONTROL "Enable Discord Rich Presence",IDC_DISCORD_RPC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,54,206,10
CONTROL "Hide Advanced Settings",IDC_BASIC_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,69,206,10
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,84,208,1
LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,92,142,10,SS_LEFT|WS_GROUP|SS_ENDELLIPSIS
LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,92,142,10,SS_ENDELLIPSIS
EDITTEXT IDC_REMEMBER,148,90,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "roms",IDC_ROMSEL_TEXT2,178,93,31,10
LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,107,142,10,SS_LEFT|WS_GROUP|SS_ENDELLIPSIS
LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,107,142,10,SS_ENDELLIPSIS
EDITTEXT IDC_REMEMBERDIR,148,105,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "dirs",IDC_ROMSEL_TEXT4,178,109,34,10
END
@ -221,14 +221,13 @@ BEGIN
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 "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,121,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"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 "Delay DP Interrupt",IDC_DELAY_DP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,132,91,10
CONTROL "Delay SI Interrupt",IDC_DELAY_SI,"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 "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,143,91,10
CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,107,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
@ -350,7 +349,8 @@ BEGIN
CONTROL "Frame rate display",IDC_DISPLAY_FRAMERATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,128,86,10
COMBOBOX IDC_FRAME_DISPLAY_TYPE,101,129,99,57,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "Show Status Bar",IDC_SHOW_STATUS_BAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,189,10
CONTROL "Exit Fullscreen on Lose Focus",IDC_EXIT_FULLSCREEN_ON_LOSE_FOCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,156,189,10
CONTROL "Exit Fullscreen on Lose Focus",IDC_EXIT_FULLSCREEN_ON_LOSE_FOCUS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,156,189,10
END
IDD_Settings_ShellInt DIALOGEX 0, 0, 231, 206
@ -564,17 +564,18 @@ BEGIN
COMBOBOX IDC_CPU_TYPE,113,8,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Function lookup method:",IDC_FUNCFIND_TEXT,4,27,106,10
COMBOBOX IDC_FUNCFIND,113,25,99,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Register caching",IDC_ROM_REGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,95,10
GROUPBOX "Self Mod Methods",IDC_SMM_FRAME,4,79,208,54
CONTROL "Cache",IDC_SMM_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,89,10
CONTROL "PI DMA",IDC_SMM_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,89,10
CONTROL "Start Changed",IDC_SMM_VALIDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,89,10
CONTROL "Protect Memory",IDC_SMM_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,115,89,10
CONTROL "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,103,89,10
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,6,42,208,1
CONTROL "Register caching",IDC_ROM_REGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,95,10
CONTROL "Advanced Block Linking",IDC_BLOCK_LINKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,49,95,10
CONTROL "Fast SP",IDC_ROM_FASTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,62,91,10
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,62,95,10
GROUPBOX "Self Mod Methods",IDC_SMM_FRAME,4,79,208,54
CONTROL "Cache",IDC_SMM_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,89,10
CONTROL "Store Instruction",IDC_SMM_STORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,91,89,10
CONTROL "PI DMA",IDC_SMM_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,89,10
CONTROL "TLB Unmapping",IDC_SMM_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,103,89,10
CONTROL "Start Changed",IDC_SMM_VALIDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,89,10
CONTROL "Protect Memory",IDC_SMM_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,115,89,10
END
IDD_Settings_GamePlugin DIALOGEX 0, 0, 231, 206
@ -1241,14 +1242,13 @@ BEGIN
EDITTEXT IDC_COUNTPERBYTE,102,51,109,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT1,6,67,91,10
COMBOBOX IDC_DISKSEEKTIMING,102,65,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,80,91,10
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,80,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,80,91,10
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,92,91,10
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,92,91,10
CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,92,107,10
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,104,91,10
CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,104,91,10
CONTROL "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,104,91,10
CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,116,91,10
END
IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214
@ -2312,6 +2312,11 @@ BEGIN
0
END
IDD_Settings_GameRecompiler AFX_DIALOG_LAYOUT
BEGIN
0
END
/////////////////////////////////////////////////////////////////////////////
//

21
Source/Project64/UserInterface/resource.h
View File

@ -52,7 +52,6 @@
#define IDD_Debugger_Symbols 172
#define IDD_Debugger_AddSymbol 174
#define IDR_MEM_BP_POPUP 177
#define IDR_JSAPI_TEXT 181
#define IDD_Debugger_DMALog 182
#define IDD_Debugger_StackTrace 184
#define IDD_Debugger_RegCOP0 185
@ -116,7 +115,6 @@
#define IDC_LIST 1012
#define IDC_HLE_AUDIO 1012
#define IDC_SMM_CACHE 1012
#define IDC_ROM_32BIT 1012
#define IDC_INFO_COUNTRY 1013
#define IDC_SHIFT 1013
#define IDC_TLB 1013
@ -127,6 +125,7 @@
#define IDC_INFO_CRC1 1014
#define IDC_ASSIGNED_MENU_ITEM 1014
#define IDC_TLB_RULES 1014
#define IDC_ROM_32BIT 1014
#define IDC_INFO_CRC2 1015
#define IDC_GOOD_NAME 1015
#define GFX_LIST 1016
@ -205,33 +204,21 @@
#define IDC_UP 1069
#define IDC_AUTO_OTHER 1070
#define IDC_DOWN 1070
#define IDC_TEAM 1070
#define IDC_AUTO_DIR 1071
#define IDC_ZILMAR_DETAILS 1071
#define IDC_ABOUT_PROJECT 1071
#define IDC_AUTO_DEFAULT 1072
#define IDC_JABO_DETAILS 1072
#define IDC_SELECT_AUTO_DIR 1073
#define IDC_SMIFF_DETAILS 1073
#define IDC_INSTANT_OTHER 1074
#define IDC_GENT_DETAILS 1074
#define IDC_INSTANT_DIR 1075
#define IDC_ZILMAR 1075
#define IDC_INSTANT_DEFAULT 1076
#define IDC_JABO 1076
#define IDC_SELECT_INSTANT_DIR 1077
#define IDC_SMIFF 1077
#define IDC_SNAP_OTHER 1078
#define IDC_GENT 1078
#define IDC_SNAP_DIR 1079
#define IDC_THANKS 1079
#define IDC_THANKS_CORE 1079
#define IDC_SNAP_DEFAULT 1080
#define IDC_THANK_LIST 1080
#define IDC_CORE_THANK_LIST 1080
#define IDC_SELECT_SNAP_DIR 1081
#define IDC_THANKYOU 1081
#define IDC_THANK_LIST2 1082
#define IDC_THANKYOU_LIST 1082
#define IDC_START_ON_ROM_OPEN 1084
#define IDC_BMP_LOGO 1084
@ -416,7 +403,6 @@
#define IDC_F15_EDIT 1219
#define IDC_F16_EDIT 1220
#define IDC_F17_EDIT 1221
#define IDC_IPLDIR_TXT 1222
#define IDC_F18_EDIT 1222
#define IDC_F19_EDIT 1223
#define IDC_F20_EDIT 1224
@ -464,7 +450,6 @@
#define IDC_EXPORT_BTN 1305
#define IDC_RUN_BTN 1305
#define IDC_DMA_ROM_EDIT 1306
#define IDC_STOP_BTN 1306
#define IDC_TRACE_STATIC 1307
#define IDC_RAM_STATIC 1308
#define IDC_ROM_STATIC 1309
@ -724,7 +709,6 @@
#define IDC_F8_LBL 1583
#define IDC_BTN_PLUGIN 1583
#define IDC_F9_LBL 1584
#define IDC_LIST1 1584
#define IDC_PLUGIN_LIST 1584
#define IDC_F10_LBL 1585
#define IDC_ADD_EDIT 1585
@ -869,7 +853,6 @@
#define IDC_CANCEL 1724
#define IDC_APPLY 1725
#define IDC_RADIO_GLIDEN64 1728
#define IDC_RADIO_JABO 1729
#define IDC_RADIO_PJ64_VIDEO 1729
#define IDC_REMOVE_BTN 1734
#define IDC_ADD_BTN 1735
@ -946,7 +929,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 227
#define _APS_NEXT_RESOURCE_VALUE 228
#define _APS_NEXT_COMMAND_VALUE 40122
#define _APS_NEXT_CONTROL_VALUE 1738
#define _APS_NEXT_SYMED_VALUE 102