FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: remove BLOCK_RANGES macro

Browse source 
Replace with an equivalent method on struct block.

Change-Id: I6dcf13e9464ba8a08ade85c89e7329c300fd6c2a
This commit is contained in:
Simon Marchi 2022-02-06 22:27:53 -05:00 • committed by Simon Marchi
parent 6dd5a4bd44
commit f5cb8afdd2
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gdb/block.h
View file

@ -21,6 +21,7 @@
#define BLOCK_H
#include "dictionary.h"
#include "gdbsupport/array-view.h"
/* Opaque declarations. */
@ -154,6 +155,18 @@ struct block
void set_namespace_info (block_namespace_info *namespace_info)
{ m_namespace_info = namespace_info; }
/* Return a view on this block's ranges. */
gdb::array_view<blockrange> ranges ()
{ return gdb::make_array_view (m_ranges->range, m_ranges->nranges); }
/* Const version of the above. */
gdb::array_view<const blockrange> ranges () const
{ return gdb::make_array_view (m_ranges->range, m_ranges->nranges); }
/* Set this block's ranges array. */
void set_ranges (blockranges *ranges)
{ m_ranges = ranges; }
/* Addresses in the executable code that are in this block. */
CORE_ADDR m_start;
@ -185,7 +198,7 @@ struct block
is NULL, then there is only one range which is specified by
startaddr and endaddr above. */
struct blockranges *ranges;
struct blockranges *m_ranges;
};
/* The global block is singled out so that we can provide a back-link
@ -202,22 +215,18 @@ struct global_block
struct compunit_symtab *compunit_symtab;
};
/* Accessor for ranges field within block BL. */
#define BLOCK_RANGES(bl) (bl)->ranges
/* Number of ranges within a block. */
#define BLOCK_NRANGES(bl) (bl)->ranges->nranges
#define BLOCK_NRANGES(bl) (bl)->ranges ().size ()
/* Access range array for block BL. */
#define BLOCK_RANGE(bl) (bl)->ranges->range
#define BLOCK_RANGE(bl) (bl)->ranges ().data ()
/* Are all addresses within a block contiguous? */
#define BLOCK_CONTIGUOUS_P(bl) (BLOCK_RANGES (bl) == nullptr \
|| BLOCK_NRANGES (bl) <= 1)
#define BLOCK_CONTIGUOUS_P(bl) ((bl)->ranges ().size () == 0 \
|| (bl)->ranges ().size () == 1)
/* Define the "entry pc" for a block BL to be the lowest (start) address
for the block when all addresses within the block are contiguous. If

2
gdb/dwarf2/read.c
View file

@ -13192,7 +13192,7 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block,
blockvec.emplace_back (start, end);
});
BLOCK_RANGES(block) = make_blockranges (objfile, blockvec);
block->set_ranges (make_blockranges (objfile, blockvec));
}
}

12
gdb/objfiles.c
View file

@ -680,13 +680,11 @@ objfile_relocate1 (struct objfile *objfile,
b->set_start (b->start () + delta[block_line_section]);
b->set_end (b->end () + delta[block_line_section]);
if (BLOCK_RANGES (b) != nullptr)
for (int j = 0; j < BLOCK_NRANGES (b); j++)
{
blockrange &r = BLOCK_RANGE (b)[j];
r.set_start (r.start () + delta[block_line_section]);
r.set_end (r.end () + delta[block_line_section]);
}
for (blockrange &r : b->ranges ())
{
r.set_start (r.start () + delta[block_line_section]);
r.set_end (r.end () + delta[block_line_section]);
}
/* We only want to iterate over the local symbols, not any
symbols in included symtabs. */