@@ -57,6 +57,10 @@ public:
const regs_info *get_regs_info () override;
+ int breakpoint_kind_from_pc (CORE_ADDR *pcptr) override;
+
+ int breakpoint_kind_from_current_state (CORE_ADDR *pcptr) override;
+
protected:
void low_arch_setup () override;
@@ -3064,10 +3068,10 @@ aarch64_sw_breakpoint_from_kind (int kind, int *size)
return arm_sw_breakpoint_from_kind (kind, size);
}
-/* Implementation of linux_target_ops method "breakpoint_kind_from_pc". */
+/* Implementation of target ops method "breakpoint_kind_from_pc". */
-static int
-aarch64_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
+int
+aarch64_target::breakpoint_kind_from_pc (CORE_ADDR *pcptr)
{
if (is_64bit_tdesc ())
return aarch64_breakpoint_len;
@@ -3075,11 +3079,11 @@ aarch64_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
return arm_breakpoint_kind_from_pc (pcptr);
}
-/* Implementation of the linux_target_ops method
+/* Implementation of the target ops method
"breakpoint_kind_from_current_state". */
-static int
-aarch64_breakpoint_kind_from_current_state (CORE_ADDR *pcptr)
+int
+aarch64_target::breakpoint_kind_from_current_state (CORE_ADDR *pcptr)
{
if (is_64bit_tdesc ())
return aarch64_breakpoint_len;
@@ -3097,7 +3101,6 @@ aarch64_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- aarch64_breakpoint_kind_from_pc,
aarch64_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0, /* decr_pc_after_break */
@@ -3123,7 +3126,6 @@ struct linux_target_ops the_low_target =
aarch64_emit_ops,
aarch64_get_min_fast_tracepoint_insn_len,
aarch64_supports_range_stepping,
- aarch64_breakpoint_kind_from_current_state,
aarch64_supports_hardware_single_step,
aarch64_get_syscall_trapinfo,
};
@@ -62,6 +62,10 @@ public:
const regs_info *get_regs_info () override;
+ int breakpoint_kind_from_pc (CORE_ADDR *pcptr) override;
+
+ int breakpoint_kind_from_current_state (CORE_ADDR *pcptr) override;
+
protected:
void low_arch_setup () override;
@@ -99,6 +103,18 @@ arm_target::low_set_pc (regcache *regcache, CORE_ADDR pc)
linux_set_pc_32bit (regcache, pc);
}
+int
+arm_target::breakpoint_kind_from_pc (CORE_ADDR *pcptr)
+{
+ return arm_breakpoint_kind_from_pc (pcptr);
+}
+
+int
+arm_target::breakpoint_kind_from_current_state (CORE_ADDR *pcptr)
+{
+ return arm_breakpoint_kind_from_current_state (pcptr);
+}
+
/* Information describing the hardware breakpoint capabilities. */
static struct
{
@@ -1051,7 +1067,6 @@ arm_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- arm_breakpoint_kind_from_pc,
arm_sw_breakpoint_from_kind,
arm_gdbserver_get_next_pcs,
0,
@@ -1077,7 +1092,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- arm_breakpoint_kind_from_current_state,
arm_supports_hardware_single_step,
arm_get_syscall_trapinfo,
};
@@ -159,7 +159,6 @@ bfin_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
bfin_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
2,
@@ -185,7 +184,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
bfin_supports_hardware_single_step,
};
@@ -156,7 +156,6 @@ cris_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
cris_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0,
@@ -453,7 +453,6 @@ crisv32_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
cris_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0,
@@ -479,7 +478,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
cris_supports_hardware_single_step,
};
@@ -7230,17 +7230,6 @@ current_lwp_ptid (void)
return ptid_of (current_thread);
}
-/* Implementation of the target_ops method "breakpoint_kind_from_pc". */
-
-int
-linux_process_target::breakpoint_kind_from_pc (CORE_ADDR *pcptr)
-{
- if (the_low_target.breakpoint_kind_from_pc != NULL)
- return (*the_low_target.breakpoint_kind_from_pc) (pcptr);
- else
- return process_stratum_target::breakpoint_kind_from_pc (pcptr);
-}
-
/* Implementation of the target_ops method "sw_breakpoint_from_kind". */
const gdb_byte *
@@ -7251,18 +7240,6 @@ linux_process_target::sw_breakpoint_from_kind (int kind, int *size)
return (*the_low_target.sw_breakpoint_from_kind) (kind, size);
}
-/* Implementation of the target_ops method
- "breakpoint_kind_from_current_state". */
-
-int
-linux_process_target::breakpoint_kind_from_current_state (CORE_ADDR *pcptr)
-{
- if (the_low_target.breakpoint_kind_from_current_state != NULL)
- return (*the_low_target.breakpoint_kind_from_current_state) (pcptr);
- else
- return breakpoint_kind_from_pc (pcptr);
-}
-
const char *
linux_process_target::thread_name (ptid_t thread)
{
@@ -131,9 +131,6 @@ struct lwp_info;
struct linux_target_ops
{
- /* See target.h for details. */
- int (*breakpoint_kind_from_pc) (CORE_ADDR *pcptr);
-
/* See target.h for details. */
const gdb_byte *(*sw_breakpoint_from_kind) (int kind, int *size);
@@ -227,9 +224,6 @@ struct linux_target_ops
/* Returns true if the low target supports range stepping. */
int (*supports_range_stepping) (void);
- /* See target.h. */
- int (*breakpoint_kind_from_current_state) (CORE_ADDR *pcptr);
-
/* See target.h. */
int (*supports_hardware_single_step) (void);
@@ -442,12 +436,8 @@ class linux_process_target : public process_stratum_target
ssize_t multifs_readlink (int pid, const char *filename, char *buf,
size_t bufsiz) override;
- int breakpoint_kind_from_pc (CORE_ADDR *pcptr) override;
-
const gdb_byte *sw_breakpoint_from_kind (int kind, int *size) override;
- int breakpoint_kind_from_current_state (CORE_ADDR *pcptr) override;
-
const char *thread_name (ptid_t thread) override;
#if USE_THREAD_DB
@@ -158,7 +158,6 @@ m32r_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_from_pc */
m32r_sw_breakpoint_from_kind,
NULL,
0,
@@ -184,7 +183,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
m32r_supports_hardware_single_step,
};
@@ -253,7 +253,6 @@ m68k_supports_hardware_single_step (void)
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
m68k_sw_breakpoint_from_kind,
NULL,
2,
@@ -279,7 +278,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
m68k_supports_hardware_single_step,
};
@@ -964,7 +964,6 @@ mips_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
mips_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0,
@@ -275,7 +275,6 @@ nios2_target::get_regs_info ()
struct linux_target_ops the_low_target =
{
- NULL, /* breakpoint_kind_from_pc */
nios2_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0,
@@ -3404,7 +3404,6 @@ ppc_get_ipa_tdesc_idx (void)
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
ppc_sw_breakpoint_from_kind,
NULL,
0,
@@ -3430,7 +3429,6 @@ struct linux_target_ops the_low_target = {
ppc_emit_ops,
ppc_get_min_fast_tracepoint_insn_len,
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
ppc_supports_hardware_single_step,
NULL, /* get_syscall_trapinfo */
ppc_get_ipa_tdesc_idx,
@@ -38,6 +38,8 @@ public:
const regs_info *get_regs_info () override;
+ int breakpoint_kind_from_pc (CORE_ADDR *pcptr) override;
+
protected:
void low_arch_setup () override;
@@ -245,10 +247,10 @@ riscv_target::low_set_pc (regcache *regcache, CORE_ADDR newpc)
static const uint16_t riscv_ibreakpoint[] = { 0x0073, 0x0010 };
static const uint16_t riscv_cbreakpoint = 0x9002;
-/* Implementation of linux_target_ops method "breakpoint_kind_from_pc". */
+/* Implementation of target ops method "breakpoint_kind_from_pc". */
-static int
-riscv_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
+int
+riscv_target::breakpoint_kind_from_pc (CORE_ADDR *pcptr)
{
union
{
@@ -257,7 +259,7 @@ riscv_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
}
buf;
- if (target_read_memory (*pcptr, buf.bytes, sizeof (buf.insn)) == 0
+ if (read_memory (*pcptr, buf.bytes, sizeof (buf.insn)) == 0
&& riscv_insn_length (buf.insn == sizeof (riscv_ibreakpoint)))
return sizeof (riscv_ibreakpoint);
else
@@ -305,7 +307,6 @@ riscv_breakpoint_at (CORE_ADDR pc)
/* RISC-V/Linux target operations. */
struct linux_target_ops the_low_target =
{
- riscv_breakpoint_kind_from_pc,
riscv_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0, /* decr_pc_after_break */
@@ -2824,7 +2824,6 @@ s390_emit_ops (void)
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
s390_sw_breakpoint_from_kind,
NULL,
s390_breakpoint_len,
@@ -2850,7 +2849,6 @@ struct linux_target_ops the_low_target = {
s390_emit_ops,
s390_get_min_fast_tracepoint_insn_len,
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
s390_supports_hardware_single_step,
NULL, /* get_syscall_trapinfo */
s390_get_ipa_tdesc_idx,
@@ -188,7 +188,6 @@ sh_target::low_arch_setup ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
sh_sw_breakpoint_from_kind,
NULL,
0,
@@ -214,7 +213,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
sh_supports_hardware_single_step,
};
@@ -337,7 +337,6 @@ sparc_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
sparc_sw_breakpoint_from_kind,
NULL, /* get_next_pcs */
0,
@@ -419,7 +419,6 @@ tic6x_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
tic6x_sw_breakpoint_from_kind,
NULL,
0,
@@ -445,7 +444,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
tic6x_supports_hardware_single_step,
};
@@ -220,7 +220,6 @@ tile_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- NULL, /* breakpoint_kind_from_pc */
tile_sw_breakpoint_from_kind,
NULL,
0,
@@ -246,7 +245,6 @@ struct linux_target_ops the_low_target =
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
tile_supports_hardware_single_step,
};
@@ -2897,7 +2897,6 @@ x86_get_ipa_tdesc_idx (void)
struct linux_target_ops the_low_target =
{
- NULL, /* breakpoint_kind_from_pc */
x86_sw_breakpoint_from_kind,
NULL,
1,
@@ -2927,7 +2926,6 @@ struct linux_target_ops the_low_target =
x86_emit_ops,
x86_get_min_fast_tracepoint_insn_len,
x86_supports_range_stepping,
- NULL, /* breakpoint_kind_from_current_state */
x86_supports_hardware_single_step,
x86_get_syscall_trapinfo,
x86_get_ipa_tdesc_idx,
@@ -326,7 +326,6 @@ xtensa_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* breakpoint_kind_from_pc */
xtensa_sw_breakpoint_from_kind,
NULL,
0,
@@ -352,7 +351,6 @@ struct linux_target_ops the_low_target = {
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */
NULL, /* supports_range_stepping */
- NULL, /* breakpoint_kind_from_current_state */
xtensa_supports_hardware_single_step,
};