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

Always enable debugger

This commit is contained in:
Kingcom 2014-08-15 21:25:30 +02:00
parent 2d7ef30e59
commit df0fb9551f
6 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -292,7 +292,7 @@ void CDVDsys_SetFile( CDVD_SourceType srctype, const wxString& newfile )
m_SourceFilename[srctype] = newfile; m_SourceFilename[srctype] = newfile;
// look for symbol file // look for symbol file
if (g_Conf->EmuOptions.Debugger.EnableDebugger && symbolMap.IsEmpty()) if (symbolMap.IsEmpty())
{ {
wxString symName; wxString symName;
int n = newfile.Last('.'); int n = newfile.Last('.');

1
pcsx2/Config.h
View File

@ -408,7 +408,6 @@ struct Pcsx2Config
{ {
BITFIELD32() BITFIELD32()
bool bool
EnableDebugger :1,
ShowDebuggerOnStart :1; ShowDebuggerOnStart :1;
BITFIELD_END BITFIELD_END

2
pcsx2/Pcsx2Config.cpp
View File

@ -376,7 +376,6 @@ void Pcsx2Config::GamefixOptions::LoadSave( IniInterface& ini )
Pcsx2Config::DebugOptions::DebugOptions() Pcsx2Config::DebugOptions::DebugOptions()
{ {
EnableDebugger = false;
ShowDebuggerOnStart = false; ShowDebuggerOnStart = false;
FontWidth = 8; FontWidth = 8;
FontHeight = 12; FontHeight = 12;
@ -386,7 +385,6 @@ void Pcsx2Config::DebugOptions::LoadSave( IniInterface& ini )
{ {
ScopedIniGroup path( ini, L"Debugger" ); ScopedIniGroup path( ini, L"Debugger" );
IniBitBool( EnableDebugger );
IniBitBool( ShowDebuggerOnStart ); IniBitBool( ShowDebuggerOnStart );
IniBitfield(FontWidth); IniBitfield(FontWidth);
IniBitfield(FontHeight); IniBitfield(FontHeight);

9
pcsx2/System/SysCoreThread.cpp
View File

@ -230,12 +230,9 @@ void SysCoreThread::GameStartingInThread()
{ {
GetMTGS().SendGameCRC(ElfCRC); GetMTGS().SendGameCRC(ElfCRC);
if (EmuConfig.Debugger.EnableDebugger) MIPSAnalyst::ScanForFunctions(ElfTextRange.first,ElfTextRange.first+ElfTextRange.second,true);
{ symbolMap.UpdateActiveSymbols();
MIPSAnalyst::ScanForFunctions(ElfTextRange.first,ElfTextRange.first+ElfTextRange.second,true); sApp.PostAppMethod(&Pcsx2App::resetDebugger);
symbolMap.UpdateActiveSymbols();
sApp.PostAppMethod(&Pcsx2App::resetDebugger);
}
if (EmuConfig.EnablePatches) ApplyPatch(0); if (EmuConfig.EnablePatches) ApplyPatch(0);
if (EmuConfig.EnableCheats) ApplyCheat(0); if (EmuConfig.EnableCheats) ApplyCheat(0);

20
pcsx2/gui/AppInit.cpp
View File

@ -66,22 +66,12 @@ void Pcsx2App::OpenMainFrame()
MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() ); MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() );
m_id_MainFrame = mainFrame->GetId(); m_id_MainFrame = mainFrame->GetId();
#ifndef PCSX2_DEVBUILD
if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#endif
{
DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
m_id_Disassembler = disassembly->GetId();
if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart) DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
disassembly->Show(); m_id_Disassembler = disassembly->GetId();
}
#ifndef PCSX2_DEVBUILD if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart)
else { disassembly->Show();
m_id_Disassembler = 0;
}
#endif
PostIdleAppMethod( &Pcsx2App::OpenProgramLog ); PostIdleAppMethod( &Pcsx2App::OpenProgramLog );

19
pcsx2/gui/MainFrame.cpp
View File

@ -339,13 +339,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menubar.Append( &m_menuCDVD, _("CD&VD") ); m_menubar.Append( &m_menuCDVD, _("CD&VD") );
m_menubar.Append( &m_menuConfig, _("&Config") ); m_menubar.Append( &m_menuConfig, _("&Config") );
m_menubar.Append( &m_menuMisc, _("&Misc") ); m_menubar.Append( &m_menuMisc, _("&Misc") );
m_menubar.Append( &m_menuDebug, _("&Debug") );
#ifndef PCSX2_DEVBUILD
if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#endif
{
m_menubar.Append( &m_menuDebug, _("&Debug") );
}
SetMenuBar( &m_menubar ); SetMenuBar( &m_menubar );
@ -512,14 +506,11 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuMisc.AppendSeparator(); m_menuMisc.AppendSeparator();
m_menuMisc.Append( MenuId_ChangeLang, L"Change Language" ); // Always in English m_menuMisc.Append( MenuId_ChangeLang, L"Change Language" ); // Always in English
#ifndef PCSX2_DEVBUILD m_menuDebug.Append(MenuId_Debug_Open, _("Open Debug Window..."), wxEmptyString);
if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#ifdef PCSX2_DEVBUILD
m_menuDebug.Append(MenuId_Debug_Logging, _("Logging..."), wxEmptyString);
#endif #endif
{
m_menuDebug.Append(MenuId_Debug_Open, _("Open Debug Window..."), wxEmptyString);
//m_menuDebug.Append(MenuId_Debug_MemoryDump, _("Memory Dump..."), wxEmptyString);
m_menuDebug.Append(MenuId_Debug_Logging, _("Logging..."), wxEmptyString);
}
m_MenuItem_Console.Check( g_Conf->ProgLogBox.Visible ); m_MenuItem_Console.Check( g_Conf->ProgLogBox.Visible );