diff options
| -rw-r--r-- | gdb/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/i386-sol2-nat.c | 2 | ||||
| -rw-r--r-- | gdb/procfs.c | 34 | ||||
| -rw-r--r-- | gdb/procfs.h | 6 | ||||
| -rw-r--r-- | gdb/sparc-sol2-nat.c | 1 |
5 files changed, 37 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f326c8e..ae43d48 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2018-05-02 Pedro Alves <palves@redhat.com> + + * procfs.c (procfs_stopped_by_watchpoint) + (procfs_insert_watchpoint, procfs_remove_watchpoint) + (procfs_region_ok_for_hw_watchpoint, procfs_stopped_data_address): + Forward declare. + (procfs_use_watchpoints): Delete, move contents... + (procfs_target): ... here. + * procfs.h (procfs_use_watchpoints): Delete declaration. + * i386-sol2-nat.c (_initialize_amd64_sol2_nat): Don't call + procfs_use_watchpoints. + * sparc-sol2-nat.c (_initialize_sparc_sol2_nat): Don't call + procfs_use_watchpoints. + 2018-05-02 Tom Tromey <tom@tromey.com> PR python/20084: diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c index 679bb86..359fc32 100644 --- a/gdb/i386-sol2-nat.c +++ b/gdb/i386-sol2-nat.c @@ -138,8 +138,6 @@ _initialize_amd64_sol2_nat (void) /* Fill in the generic procfs methods. */ t = procfs_target (); - procfs_use_watchpoints (t); - #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64) amd64_native_gregset32_reg_offset = amd64_sol2_gregset32_reg_offset; amd64_native_gregset32_num_regs = diff --git a/gdb/procfs.c b/gdb/procfs.c index 3c747cd..0143f26 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -126,6 +126,22 @@ static int procfs_can_use_hw_breakpoint (struct target_ops *self, static void procfs_info_proc (struct target_ops *, const char *, enum info_proc_what); +static int procfs_stopped_by_watchpoint (struct target_ops *); + +static int procfs_insert_watchpoint (struct target_ops *, + CORE_ADDR, int, + enum target_hw_bp_type, + struct expression *); + +static int procfs_remove_watchpoint (struct target_ops *, + CORE_ADDR, int, + enum target_hw_bp_type, + struct expression *); + +static int procfs_region_ok_for_hw_watchpoint (struct target_ops *, + CORE_ADDR, int); +static int procfs_stopped_data_address (struct target_ops *, CORE_ADDR *); + #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64) /* When GDB is built as 64-bit application on Solaris, the auxv data is presented in 64-bit format. We need to provide a custom parser @@ -186,6 +202,13 @@ procfs_target (void) t->to_auxv_parse = procfs_auxv_parse; #endif + t->to_stopped_by_watchpoint = procfs_stopped_by_watchpoint; + t->to_insert_watchpoint = procfs_insert_watchpoint; + t->to_remove_watchpoint = procfs_remove_watchpoint; + t->to_region_ok_for_hw_watchpoint = procfs_region_ok_for_hw_watchpoint; + t->to_can_use_hw_breakpoint = procfs_can_use_hw_breakpoint; + t->to_stopped_data_address = procfs_stopped_data_address; + t->to_magic = OPS_MAGIC; return t; @@ -3385,17 +3408,6 @@ procfs_region_ok_for_hw_watchpoint (struct target_ops *self, return 1; } -void -procfs_use_watchpoints (struct target_ops *t) -{ - t->to_stopped_by_watchpoint = procfs_stopped_by_watchpoint; - t->to_insert_watchpoint = procfs_insert_watchpoint; - t->to_remove_watchpoint = procfs_remove_watchpoint; - t->to_region_ok_for_hw_watchpoint = procfs_region_ok_for_hw_watchpoint; - t->to_can_use_hw_breakpoint = procfs_can_use_hw_breakpoint; - t->to_stopped_data_address = procfs_stopped_data_address; -} - /* Memory Mappings Functions: */ /* Call a callback function once for each mapping, passing it the diff --git a/gdb/procfs.h b/gdb/procfs.h index 9419a70..beeb876 100644 --- a/gdb/procfs.h +++ b/gdb/procfs.h @@ -24,12 +24,6 @@ struct target_ops; extern struct target_ops *procfs_target (void); -/* Call this in the native _initialize routine that creates and - customizes the prototype target returned by procfs_target, if the - native debug interface supports procfs watchpoints. */ - -extern void procfs_use_watchpoints (struct target_ops *t); - /* Return a ptid for which we guarantee we will be able to find a 'live' procinfo. */ diff --git a/gdb/sparc-sol2-nat.c b/gdb/sparc-sol2-nat.c index 2ec2cfb..482050d 100644 --- a/gdb/sparc-sol2-nat.c +++ b/gdb/sparc-sol2-nat.c @@ -104,6 +104,5 @@ _initialize_sparc_sol2_nat (void) struct target_ops *t; t = procfs_target (); - procfs_use_watchpoints (t); add_target (t); } |