Re: [PATCH v2 2/2] gdbserver: riscv: Add support for hardware breakpoints/watchpoints

[liangzhen <liangzhen@linux.spacemit.com>]

Note: something forgot to change.

On 4/9/2026 10:45 AM, Zane Leung wrote:
> +/* Implementation of linux target ops method "low_insert_point".
> +
> +   It actually only records the info of the to-be-inserted bp/wp;
> +   the actual insertion will happen when threads are resumed.  */
> +
> +int
> +riscv_target::low_insert_point (raw_bkpt_type type, CORE_ADDR addr,
> +				int len, raw_breakpoint *bp)
> +{
> +  int ret;
> +  enum target_hw_bp_type targ_type;
> +  struct riscv_debug_reg_state *state
> +    = riscv_get_debug_reg_state (current_thread->id.pid ());
> +
> +  if (show_debug_regs)
> +    fprintf (stderr, "insert_point on entry (addr=0x%08lx, len=%d)\n",
> +	     (unsigned long) addr, len);
> +
> +  /* Determine the type from the raw breakpoint type.  */
> +  targ_type = raw_bkpt_type_to_target_hw_bp_type (type);
> +
> +  ret = riscv_handle_point (targ_type, addr, len,
> +			    1 /* is_insert */,
> +			    current_lwp_ptid (), state);
> +
Here should be
ret = riscv_handle_point (targ_type, addr, len,
                                         1 /* is_insert */,
                                          current_lwp_ptid (), state) ? 0 : -1;
> +  if (show_debug_regs)
> +    riscv_show_debug_reg_state (state, "insert_point", addr, len,
> +				targ_type);
> +
> +  return ret;
> +}
> +
> +/* Implementation of linux target ops method "low_remove_point".
> +
> +   It actually only records the info of the to-be-removed bp/wp,
> +   the actual removal will be done when threads are resumed.  */
> +
> +int
> +riscv_target::low_remove_point (raw_bkpt_type type, CORE_ADDR addr,
> +				int len, raw_breakpoint *bp)
> +{
> +  int ret;
> +  enum target_hw_bp_type targ_type;
> +  struct riscv_debug_reg_state *state
> +    = riscv_get_debug_reg_state (current_thread->id.pid ());
> +
> +  if (show_debug_regs)
> +    fprintf (stderr, "remove_point on entry (addr=0x%08lx, len=%d)\n",
> +	     (unsigned long) addr, len);
> +
> +  /* Determine the type from the raw breakpoint type.  */
> +  targ_type = raw_bkpt_type_to_target_hw_bp_type (type);
> +
> +  ret = riscv_handle_point (targ_type, addr, len,
> +			    0 /* is_insert */,
> +			    current_lwp_ptid (), state);
> +
Same above.
> +  if (show_debug_regs)
> +    riscv_show_debug_reg_state (state, "remove_point", addr, len,
> +				targ_type);
> +
> +  return ret;
> +}
> +