diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/symfile.c | 80 |
2 files changed, 50 insertions, 37 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7d69419..1da02fd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2016-05-03 Kyrylo Tkachov <kyrylo.tkachov@arm.com> + + * symfile.c (find_pc_overlay): Add braces to avoid -Wparentheses + warning. + (find_pc_mapped_section): Likewise. + (list_overlays_command): Likewise. + 2016-05-02 Eli Zaretskii <eliz@gnu.org> * windows-nat.c (_initialize_check_for_gdb_ini): Fix off-by-one diff --git a/gdb/symfile.c b/gdb/symfile.c index 0d67bfd..ca304b8 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3285,19 +3285,21 @@ find_pc_overlay (CORE_ADDR pc) struct obj_section *osect, *best_match = NULL; if (overlay_debugging) - ALL_OBJSECTIONS (objfile, osect) - if (section_is_overlay (osect)) - { - if (pc_in_mapped_range (pc, osect)) + { + ALL_OBJSECTIONS (objfile, osect) + if (section_is_overlay (osect)) { - if (section_is_mapped (osect)) - return osect; - else + if (pc_in_mapped_range (pc, osect)) + { + if (section_is_mapped (osect)) + return osect; + else + best_match = osect; + } + else if (pc_in_unmapped_range (pc, osect)) best_match = osect; } - else if (pc_in_unmapped_range (pc, osect)) - best_match = osect; - } + } return best_match; } @@ -3312,9 +3314,11 @@ find_pc_mapped_section (CORE_ADDR pc) struct obj_section *osect; if (overlay_debugging) - ALL_OBJSECTIONS (objfile, osect) - if (pc_in_mapped_range (pc, osect) && section_is_mapped (osect)) - return osect; + { + ALL_OBJSECTIONS (objfile, osect) + if (pc_in_mapped_range (pc, osect) && section_is_mapped (osect)) + return osect; + } return NULL; } @@ -3330,31 +3334,33 @@ list_overlays_command (char *args, int from_tty) struct obj_section *osect; if (overlay_debugging) - ALL_OBJSECTIONS (objfile, osect) + { + ALL_OBJSECTIONS (objfile, osect) if (section_is_mapped (osect)) - { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - const char *name; - bfd_vma lma, vma; - int size; - - vma = bfd_section_vma (objfile->obfd, osect->the_bfd_section); - lma = bfd_section_lma (objfile->obfd, osect->the_bfd_section); - size = bfd_get_section_size (osect->the_bfd_section); - name = bfd_section_name (objfile->obfd, osect->the_bfd_section); - - printf_filtered ("Section %s, loaded at ", name); - fputs_filtered (paddress (gdbarch, lma), gdb_stdout); - puts_filtered (" - "); - fputs_filtered (paddress (gdbarch, lma + size), gdb_stdout); - printf_filtered (", mapped at "); - fputs_filtered (paddress (gdbarch, vma), gdb_stdout); - puts_filtered (" - "); - fputs_filtered (paddress (gdbarch, vma + size), gdb_stdout); - puts_filtered ("\n"); - - nmapped++; - } + { + struct gdbarch *gdbarch = get_objfile_arch (objfile); + const char *name; + bfd_vma lma, vma; + int size; + + vma = bfd_section_vma (objfile->obfd, osect->the_bfd_section); + lma = bfd_section_lma (objfile->obfd, osect->the_bfd_section); + size = bfd_get_section_size (osect->the_bfd_section); + name = bfd_section_name (objfile->obfd, osect->the_bfd_section); + + printf_filtered ("Section %s, loaded at ", name); + fputs_filtered (paddress (gdbarch, lma), gdb_stdout); + puts_filtered (" - "); + fputs_filtered (paddress (gdbarch, lma + size), gdb_stdout); + printf_filtered (", mapped at "); + fputs_filtered (paddress (gdbarch, vma), gdb_stdout); + puts_filtered (" - "); + fputs_filtered (paddress (gdbarch, vma + size), gdb_stdout); + puts_filtered ("\n"); + + nmapped++; + } + } if (nmapped == 0) printf_filtered (_("No sections are mapped.\n")); } |