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

Focus disassembly when a breakpoint triggered

This commit is contained in:
Kingcom 2014-03-05 18:51:43 +01:00
parent 100fe404a5
commit 10c3928eef
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/DebugTools/Breakpoints.cpp
View File

@ -11,6 +11,7 @@ u32 CBreakPoints::breakSkipFirstAt_ = 0;
u64 CBreakPoints::breakSkipFirstTicks_ = 0;
std::vector<MemCheck> CBreakPoints::memChecks_;
std::vector<MemCheck *> CBreakPoints::cleanupMemChecks_;
bool CBreakPoints::breakpointTriggered_ = false;
int addressMask = 0x1FFFFFFF;

4
pcsx2/DebugTools/Breakpoints.h
View File

@ -150,6 +150,9 @@ public:
static void Update(u32 addr = 0);
static void SetBreakpointTriggered(bool b) { breakpointTriggered_ = b; };
static bool GetBreakpointTriggered() { return breakpointTriggered_; };
private:
static size_t FindBreakpoint(u32 addr, bool matchTemp = false, bool temp = false);
// Finds exactly, not using a range check.
@ -158,6 +161,7 @@ private:
static std::vector<BreakPoint> breakPoints_;
static u32 breakSkipFirstAt_;
static u64 breakSkipFirstTicks_;
static bool breakpointTriggered_;
static std::vector<MemCheck> memChecks_;
static std::vector<MemCheck *> cleanupMemChecks_;

9
pcsx2/gui/Debugger/DisassemblyDialog.cpp
View File

@ -409,9 +409,12 @@ void DisassemblyDialog::setDebugMode(bool debugMode)
eeTab->getDisassembly()->gotoPc();
iopTab->getDisassembly()->gotoPc();
// Defocuses main window even when not debugging, causing savestate hotkeys to fail
/*if (currentCpu != NULL)
currentCpu->getDisassembly()->SetFocus();*/
if (CBreakPoints::GetBreakpointTriggered())
{
if (currentCpu != NULL)
currentCpu->getDisassembly()->SetFocus();
CBreakPoints::SetBreakpointTriggered(false);
}
} else {
breakRunButton->SetLabel(L"Break");

2
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -1278,6 +1278,7 @@ void dynarecCheckBreakpoint()
if (cond && !cond->Evaluate())
return;
CBreakPoints::SetBreakpointTriggered(true);
GetCoreThread().PauseSelf();
recExitExecution();
}
@ -1289,6 +1290,7 @@ void dynarecMemcheck()
return;
iFlushCall(FLUSH_INTERPRETER);
CBreakPoints::SetBreakpointTriggered(true);
GetCoreThread().PauseSelf();
recExitExecution();
}