[RFA,3/6] Comment out some unused overlay code
Commit Message
>>>>> "Yao" == Yao Qi <qiyaoltc@gmail.com> writes:
Yao> I am inclined to remove these commented-out statements.
Sounds good. Here's the new patch.
Tom
commit 8c3dd5d738cbb40684d1210392ae540799906a84
Author: Tom Tromey <tom@tromey.com>
Date: Mon Jun 6 13:45:59 2016 -0600
Remove some unused overlay code
This patch removes some unneeded initializations in overlay code in
symfile.c. It also deletes some old commented-out code.
2016-06-06 Tom Tromey <tom@tromey.com>
* symfile.c (simple_overlay_update_1): Remove initialization
of "size", and commented-out code.
(simple_overlay_update): Likewise.
Comments
On Tue, Jun 28, 2016 at 9:55 PM, Tom Tromey <tom@tromey.com> wrote:
>>>>>> "Yao" == Yao Qi <qiyaoltc@gmail.com> writes:
>
> Yao> I am inclined to remove these commented-out statements.
>
> Sounds good. Here's the new patch.
>
Patch is good to me.
@@ -1,3 +1,9 @@
+2016-06-06 Tom Tromey <tom@tromey.com>
+
+ * symfile.c (simple_overlay_update_1): Remove initialization
+ of "size", and commented-out code.
+ (simple_overlay_update): Likewise.
+
2016-06-28 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_show_source_line): Use getcurx.
@@ -3584,25 +3584,22 @@ simple_read_overlay_table (void)
static int
simple_overlay_update_1 (struct obj_section *osect)
{
- int i, size;
+ int i;
bfd *obfd = osect->objfile->obfd;
asection *bsect = osect->the_bfd_section;
struct gdbarch *gdbarch = get_objfile_arch (osect->objfile);
int word_size = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
- size = bfd_get_section_size (osect->the_bfd_section);
for (i = 0; i < cache_novlys; i++)
if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect)
- && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect)
- /* && cache_ovly_table[i][OSIZE] == size */ )
+ && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect))
{
read_target_long_array (cache_ovly_table_base + i * word_size,
(unsigned int *) cache_ovly_table[i],
4, word_size, byte_order);
if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect)
- && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect)
- /* && cache_ovly_table[i][OSIZE] == size */ )
+ && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect))
{
osect->ovly_mapped = cache_ovly_table[i][MAPPED];
return 1;
@@ -3660,15 +3657,13 @@ simple_overlay_update (struct obj_section *osect)
ALL_OBJSECTIONS (objfile, osect)
if (section_is_overlay (osect))
{
- int i, size;
+ int i;
bfd *obfd = osect->objfile->obfd;
asection *bsect = osect->the_bfd_section;
- size = bfd_get_section_size (bsect);
for (i = 0; i < cache_novlys; i++)
if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect)
- && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect)
- /* && cache_ovly_table[i][OSIZE] == size */ )
+ && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect))
{ /* obj_section matches i'th entry in ovly_table. */
osect->ovly_mapped = cache_ovly_table[i][MAPPED];
break; /* finished with inner for loop: break out. */