espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-21 18:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* breakpoint.c (bp_loc_is_permanent): Rename `brk' to

Browse Source 
`bpoint'(-Wshadow).
This commit is contained in:
Andrey Smirnov
2011-12-10 00:22:56 +00:00
parent 80e1d41794
commit 1afeeb75f2
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-09 Andrey Smirnov <andrew.smirnov@gmail.com>
* breakpoint.c (bp_loc_is_permanent): Rename `brk' to
`bpoint'(-Wshadow).
2011-12-09 Andrey Smirnov <andrew.smirnov@gmail.com> 2011-12-09 Andrey Smirnov <andrew.smirnov@gmail.com>
* breakpoint.c (update_static_tracepoint): Rename nested `sal' and * breakpoint.c (update_static_tracepoint): Rename nested `sal' and

8
gdb/breakpoint.c
View File

@ -7204,7 +7204,7 @@ bp_loc_is_permanent (struct bp_location *loc)
{ {
int len; int len;
CORE_ADDR addr; CORE_ADDR addr;
const gdb_byte *brk; const gdb_byte *bpoint;
gdb_byte *target_mem; gdb_byte *target_mem;
struct cleanup *cleanup; struct cleanup *cleanup;
int retval = 0; int retval = 0;
@ -7212,10 +7212,10 @@ bp_loc_is_permanent (struct bp_location *loc)
gdb_assert (loc != NULL); gdb_assert (loc != NULL);
addr = loc->address; addr = loc->address;
brk = gdbarch_breakpoint_from_pc (loc->gdbarch, &addr, &len); bpoint = gdbarch_breakpoint_from_pc (loc->gdbarch, &addr, &len);
/* Software breakpoints unsupported? */ /* Software breakpoints unsupported? */
if (brk == NULL) if (bpoint == NULL)
return 0; return 0;
target_mem = alloca (len); target_mem = alloca (len);
@ -7229,7 +7229,7 @@ bp_loc_is_permanent (struct bp_location *loc)
make_show_memory_breakpoints_cleanup (0); make_show_memory_breakpoints_cleanup (0);
if (target_read_memory (loc->address, target_mem, len) == 0 if (target_read_memory (loc->address, target_mem, len) == 0
&& memcmp (target_mem, brk, len) == 0) && memcmp (target_mem, bpoint, len) == 0)
retval = 1; retval = 1;
do_cleanups (cleanup); do_cleanups (cleanup);