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

Don't double-break on debugbreak.

This commit is contained in:
Ben Vanik 2015-09-01 09:38:55 -07:00
parent 1cd8ed7db7
commit 5355183590
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/backend/x64/x64_emitter.cc
View File

@ -304,7 +304,9 @@ uint64_t TrapDebugPrint(void* raw_context, uint64_t address) {
uint64_t TrapDebugBreak(void* raw_context, uint64_t address) { uint64_t TrapDebugBreak(void* raw_context, uint64_t address) {
auto thread_state = *reinterpret_cast<ThreadState**>(raw_context); auto thread_state = *reinterpret_cast<ThreadState**>(raw_context);
XELOGE("Trap!"); XELOGE("Trap!");
xe::debugging::Break(); if (FLAGS_break_on_debugbreak) {
xe::debugging::Break();
}
return 0; return 0;
} }
@ -320,9 +322,6 @@ void X64Emitter::Trap(uint16_t trap_type) {
// Always trap? // Always trap?
// TODO(benvanik): post software interrupt to debugger. // TODO(benvanik): post software interrupt to debugger.
CallNative(TrapDebugBreak, 0); CallNative(TrapDebugBreak, 0);
if (FLAGS_break_on_debugbreak) {
db(0xCC);
}
break; break;
case 25: case 25:
// ? // ?