Merge pull request #1240 from FioraAeterna/fixdebugblocklink

Debug: fix disable block linking option
This commit is contained in:
Lioncash
2014-10-08 22:13:33 -04:00
8 changed files with 14 additions and 25 deletions

View File

@ -397,7 +397,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0);
pCoreMenu->AppendSeparator();
pCoreMenu->Append(IDM_JITBLOCKLINKING, _("&JIT Block Linking off"),
pCoreMenu->Append(IDM_JITNOBLOCKLINKING, _("&JIT Block Linking off"),
_("Provide safer execution by not linking the JIT blocks."),
wxITEM_CHECK);
@ -596,9 +596,9 @@ bool CCodeWindow::JITNoBlockCache()
return GetMenuBar()->IsChecked(IDM_JITNOBLOCKCACHE);
}
bool CCodeWindow::JITBlockLinking()
bool CCodeWindow::JITNoBlockLinking()
{
return GetMenuBar()->IsChecked(IDM_JITBLOCKLINKING);
return GetMenuBar()->IsChecked(IDM_JITNOBLOCKLINKING);
}
// Toolbar

View File

@ -59,7 +59,7 @@ class CCodeWindow
bool BootToPause();
bool AutomaticStart();
bool JITNoBlockCache();
bool JITBlockLinking();
bool JITNoBlockLinking();
bool JumpToAddress(u32 address);
void Update() override;

View File

@ -191,7 +191,7 @@ enum
// CPU Mode
IDM_INTERPRETER,
IDM_AUTOMATICSTART, IDM_BOOTTOPAUSE,
IDM_JITNOBLOCKCACHE, IDM_JITBLOCKLINKING, // JIT
IDM_JITNOBLOCKCACHE, IDM_JITNOBLOCKLINKING, // JIT
IDM_JITOFF,
IDM_JITLSOFF, IDM_JITLSLXZOFF, IDM_JITLSLWZOFF, IDM_JITLSLBZXOFF,
IDM_JITLSPOFF, IDM_JITLSFOFF,

View File

@ -559,7 +559,7 @@ void Host_SetStartupDebuggingParameters()
StartUp.bBootToPause = main_frame->g_pCodeWindow->BootToPause();
StartUp.bAutomaticStart = main_frame->g_pCodeWindow->AutomaticStart();
StartUp.bJITNoBlockCache = main_frame->g_pCodeWindow->JITNoBlockCache();
StartUp.bJITBlockLinking = main_frame->g_pCodeWindow->JITBlockLinking();
StartUp.bJITNoBlockLinking = main_frame->g_pCodeWindow->JITNoBlockLinking();
}
else
{