Local variable sw_single_step_trap_p is not read in handle_inferior_event. We can safely remove it. It is somewhat obvious, and I'll check it in in 24 hours if no objection. -- Yao (齐尧)