mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-11-18 04:00:12 -08:00
win32_demon: make conflicting trap net / user bp trap behavior identical to linux - always find info for *first* trap in list. second... dbg_engine: store trap net traps *first*, so that trap net behavior is preferred when trap nets conflict with user bp traps.
This commit is contained in:
1 parent
4e7a6127d8
commit
2933143b08
2 files changed
+3
-2
No files matched your search
@@ -4878,8 +4878,8 @@ d_ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, D_Msg *msg)
|
||||
//
|
||||
DMN_TrapChunkList joined_traps = {0};
|
||||
{
|
||||
dmn_trap_chunk_list_concat_shallow_copy(scratch.arena, &joined_traps, &user_traps);
|
||||
dmn_trap_chunk_list_concat_shallow_copy(scratch.arena, &joined_traps, &trap_net_traps);
|
||||
dmn_trap_chunk_list_concat_shallow_copy(scratch.arena, &joined_traps, &user_traps);
|
||||
}
|
||||
|
||||
//////////////////////////////
|
||||
|
||||
@@ -2478,10 +2478,11 @@ dmn_ctrl_run(Arena *arena, DMN_CtrlCtx *ctx, DMN_RunCtrls *ctrls)
|
||||
{
|
||||
hit_user_trap = 1;
|
||||
user_trap_id = n->v[idx].id;
|
||||
break;
|
||||
goto end_find_user_trap;
|
||||
}
|
||||
}
|
||||
}
|
||||
end_find_user_trap:;
|
||||
}
|
||||
|
||||
//- rjf: check if trap is explicit in the actual code memory
|
||||
|
||||
Reference in new issue
Block a user