From 2933143b0805a8f8435df1e7e2bff21bd1dca056 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Mon, 28 Sep 2026 10:10:16 -0600 Subject: [PATCH] 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. --- src/dbg_engine/dbg_engine_ctrl.c | 2 +- src/win32/demon/win32_demon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dbg_engine/dbg_engine_ctrl.c b/src/dbg_engine/dbg_engine_ctrl.c index a0eaab39..3272c8ec 100644 --- a/src/dbg_engine/dbg_engine_ctrl.c +++ b/src/dbg_engine/dbg_engine_ctrl.c @@ -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); } ////////////////////////////// diff --git a/src/win32/demon/win32_demon.c b/src/win32/demon/win32_demon.c index 8c906a9f..1f1a0e5d 100644 --- a/src/win32/demon/win32_demon.c +++ b/src/win32/demon/win32_demon.c @@ -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