From bd5225139c83a80aad542e46efb66fabf51bff91 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 26 Oct 2017 09:46:16 +0100 Subject: [PATCH] const-fy breakpoint_ops->breakpoint_hit parameter aspace gdb: 2017-10-26 Yao Qi * break-catch-sig.c (signal_catchpoint_breakpoint_hit): Make aspace const. * break-catch-syscall.c (breakpoint_hit_catch_syscall): Likewise. * breakpoint.c (bpstat_check_location): Remove cast. (breakpoint_hit_catch_fork): Make aspce const. (breakpoint_hit_catch_solib): Likewise. (breakpoint_hit_catch_exec): Likewise. (breakpoint_hit_ranged_breakpoint): Likewise. (breakpoint_hit_watchpoint): Likewise. (base_breakpoint_breakpoint_hit): Likewise. (bkpt_breakpoint_hit): Likewise. (dprintf_breakpoint_hit): Likewise. (tracepoint_breakpoint_hit): Likewise. * breakpoint.h (breakpoint_ops) : Likewise. --- gdb/ChangeLog | 18 ++++++++++++++++++ gdb/break-catch-sig.c | 2 +- gdb/break-catch-syscall.c | 2 +- gdb/breakpoint.c | 23 +++++++++++------------ gdb/breakpoint.h | 2 +- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 042c609..47a4ac5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,23 @@ 2017-10-26 Yao Qi + * break-catch-sig.c (signal_catchpoint_breakpoint_hit): Make + aspace const. + * break-catch-syscall.c (breakpoint_hit_catch_syscall): + Likewise. + * breakpoint.c (bpstat_check_location): Remove cast. + (breakpoint_hit_catch_fork): Make aspce const. + (breakpoint_hit_catch_solib): Likewise. + (breakpoint_hit_catch_exec): Likewise. + (breakpoint_hit_ranged_breakpoint): Likewise. + (breakpoint_hit_watchpoint): Likewise. + (base_breakpoint_breakpoint_hit): Likewise. + (bkpt_breakpoint_hit): Likewise. + (dprintf_breakpoint_hit): Likewise. + (tracepoint_breakpoint_hit): Likewise. + * breakpoint.h (breakpoint_ops) : Likewise. + +2017-10-26 Yao Qi + * breakpoint.c (breakpoint_location_address_match): Change "struct address_space *" to "const address_space". (breakpoint_location_address_range_overlap): Likewise. diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index 5bc3aed..5ab7cd3 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -145,7 +145,7 @@ signal_catchpoint_remove_location (struct bp_location *bl, static int signal_catchpoint_breakpoint_hit (const struct bp_location *bl, - struct address_space *aspace, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index 82d3e36..b0ed4d2 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -157,7 +157,7 @@ remove_catch_syscall (struct bp_location *bl, enum remove_bp_reason reason) static int breakpoint_hit_catch_syscall (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { /* We must check if we are catching specific syscalls in this diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index f0a8d49..ada72e0 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5072,8 +5072,7 @@ bpstat_check_location (const struct bp_location *bl, /* BL is from an existing breakpoint. */ gdb_assert (b != NULL); - return b->ops->breakpoint_hit (bl, const_cast (aspace), - bp_addr, ws); + return b->ops->breakpoint_hit (bl, aspace, bp_addr, ws); } /* Determine if the watched values have actually changed, and we @@ -7828,7 +7827,7 @@ remove_catch_fork (struct bp_location *bl, enum remove_bp_reason reason) static int breakpoint_hit_catch_fork (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { struct fork_catchpoint *c = (struct fork_catchpoint *) bl->owner; @@ -7944,7 +7943,7 @@ remove_catch_vfork (struct bp_location *bl, enum remove_bp_reason reason) static int breakpoint_hit_catch_vfork (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { struct fork_catchpoint *c = (struct fork_catchpoint *) bl->owner; @@ -8072,7 +8071,7 @@ remove_catch_solib (struct bp_location *ignore, enum remove_bp_reason reason) static int breakpoint_hit_catch_solib (const struct bp_location *bl, - struct address_space *aspace, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { @@ -8378,7 +8377,7 @@ remove_catch_exec (struct bp_location *bl, enum remove_bp_reason reason) static int breakpoint_hit_catch_exec (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { struct exec_catchpoint *c = (struct exec_catchpoint *) bl->owner; @@ -9796,7 +9795,7 @@ agent_printf_command (char *arg, int from_tty) static int breakpoint_hit_ranged_breakpoint (const struct bp_location *bl, - struct address_space *aspace, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { @@ -10256,7 +10255,7 @@ remove_watchpoint (struct bp_location *bl, enum remove_bp_reason reason) static int breakpoint_hit_watchpoint (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { struct breakpoint *b = bl->owner; @@ -12433,7 +12432,7 @@ base_breakpoint_remove_location (struct bp_location *bl, static int base_breakpoint_breakpoint_hit (const struct bp_location *bl, - struct address_space *aspace, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { @@ -12601,7 +12600,7 @@ bkpt_remove_location (struct bp_location *bl, enum remove_bp_reason reason) static int bkpt_breakpoint_hit (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { if (ws->kind != TARGET_WAITKIND_STOPPED @@ -12622,7 +12621,7 @@ bkpt_breakpoint_hit (const struct bp_location *bl, static int dprintf_breakpoint_hit (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { if (dprintf_style == dprintf_style_agent @@ -12982,7 +12981,7 @@ tracepoint_re_set (struct breakpoint *b) static int tracepoint_breakpoint_hit (const struct bp_location *bl, - struct address_space *aspace, CORE_ADDR bp_addr, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { /* By definition, the inferior does not report stops at diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index c4e55ea..63e879c 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -540,7 +540,7 @@ struct breakpoint_ops which the inferior stopped, and WS is the target_waitstatus describing the event. */ int (*breakpoint_hit) (const struct bp_location *bl, - struct address_space *aspace, + const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws); -- 2.7.4