Richard Biener
7734f5e8b4
Fix Werrors reported by GCC6. OBS-URL: https://build.opensuse.org/request/show/397681 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=137
129 lines
3.7 KiB
Diff
129 lines
3.7 KiB
Diff
From b631e59ba05af7c888838d3e2d6d408bfe60b57f Mon Sep 17 00:00:00 2001
|
|
From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
|
|
Date: Tue, 3 May 2016 09:40:54 +0100
|
|
Subject: [PATCH] [gdb] Fix -Wparentheses warnings
|
|
|
|
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.
|
|
---
|
|
gdb/ChangeLog | 7 ++++++
|
|
gdb/symfile.c | 80 ++++++++++++++++++++++++++++++++---------------------------
|
|
2 files changed, 50 insertions(+), 37 deletions(-)
|
|
|
|
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"));
|
|
}
|
|
--
|
|
2.8.2
|
|
|