Hi, a more lightweight version, the watchpoints type conversion does not need to be done from insert_breakpoints(). Still the check for more than 4 hw watchpoints is unimplemented/broken due to i386_can_use_hw_breakpoint() just returns 1 unconditionally - it will need an arch interface change. No regressions for this change on x86_64-unknown-linux-gnu. Regards, Jan