mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-14 18:19:36 +01:00
Make CBreakpoints an object
This commit is contained in:
1 parent
f692092159
commit
7992ff4627
26 files changed
+252
-258
No files matched your search
@@ -185,7 +185,7 @@ bool BreakpointWindow::fetchDialogData(HWND hwnd)
|
||||
wchar_t tempLogFormat[512];
|
||||
GetWindowTextW(GetDlgItem(hwnd, IDC_BREAKPOINT_LOG_FORMAT), tempLogFormat, 512);
|
||||
logFormat = ConvertWStringToUTF8(tempLogFormat);
|
||||
if (!CBreakPoints::ValidateLogFormat(cpu, logFormat)) {
|
||||
if (!g_breakpoints.ValidateLogFormat(cpu, logFormat)) {
|
||||
snprintf(errorMessage, sizeof(errorMessage), "Invalid log format (example: \"{a1}\").");
|
||||
MessageBoxA(hwnd, errorMessage, "Error", MB_OK);
|
||||
return false;
|
||||
@@ -219,32 +219,32 @@ void BreakpointWindow::addBreakpoint() {
|
||||
if (onChange)
|
||||
cond |= MEMCHECK_WRITE_ONCHANGE;
|
||||
|
||||
CBreakPoints::AddMemCheck(address, address + size, (MemCheckCondition)cond, result);
|
||||
g_breakpoints.AddMemCheck(address, address + size, (MemCheckCondition)cond, result);
|
||||
|
||||
if (!condition.empty()) {
|
||||
BreakPointCond cond;
|
||||
cond.debug = cpu;
|
||||
cond.expressionString = condition;
|
||||
cond.expression = compiledCondition;
|
||||
CBreakPoints::ChangeMemCheckAddCond(address, address + size, cond);
|
||||
g_breakpoints.ChangeMemCheckAddCond(address, address + size, cond);
|
||||
}
|
||||
|
||||
CBreakPoints::ChangeMemCheckLogFormat(address, address + size, logFormat);
|
||||
g_breakpoints.ChangeMemCheckLogFormat(address, address + size, logFormat);
|
||||
}
|
||||
else {
|
||||
// add breakpoint
|
||||
CBreakPoints::AddBreakPoint(address, false);
|
||||
g_breakpoints.AddBreakPoint(address, false);
|
||||
|
||||
if (!condition.empty()) {
|
||||
BreakPointCond cond;
|
||||
cond.debug = cpu;
|
||||
cond.expressionString = condition;
|
||||
cond.expression = compiledCondition;
|
||||
CBreakPoints::ChangeBreakPointAddCond(address, cond);
|
||||
g_breakpoints.ChangeBreakPointAddCond(address, cond);
|
||||
}
|
||||
|
||||
CBreakPoints::ChangeBreakPoint(address, result);
|
||||
CBreakPoints::ChangeBreakPointLogFormat(address, logFormat);
|
||||
g_breakpoints.ChangeBreakPoint(address, result);
|
||||
g_breakpoints.ChangeBreakPointLogFormat(address, logFormat);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user