preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-23 03:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'debugger2' of https://github.com/unknownbrackets/ppsspp into unknownbrackets-debugger2

Browse Source 
Conflicts:
	Core/Debugger/Breakpoints.cpp
This commit is contained in:
Henrik Rydgård committed 2014-01-26 23:10:37 +01:00
2 parents 241c78fb4c 5e01119d60
commit efd44a6933
9 files changed
+190 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/Debugger/Debugger_Lists.cpp
+7 -1
View File
@@ -429,7 +429,7 @@ void CtrlBreakpointList::GetColumnText(wchar_t* dest, int row, int col)
case BPL_TYPE:
{
if (isMemory) {
switch (displayedMemChecks_[index].cond) {
switch ((int)displayedMemChecks_[index].cond) {
case MEMCHECK_READ:
wcscpy(dest,L"Read");
break;
@@ -439,6 +439,12 @@ void CtrlBreakpointList::GetColumnText(wchar_t* dest, int row, int col)
case MEMCHECK_READWRITE:
wcscpy(dest,L"Read/Write");
break;
case MEMCHECK_WRITE | MEMCHECK_WRITE_ONCHANGE:
wcscpy(dest,L"Write Change");
break;
case MEMCHECK_READWRITE | MEMCHECK_WRITE_ONCHANGE:
wcscpy(dest,L"Read/Write Change");
break;
}
} else {
wcscpy(dest,L"Execute");