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

gdb: remove BLOCK_NRANGES macro

Browse source 
Replace with range for loops.

Change-Id: Icbe04f9b6f9e6ddae2e15b2409c61f7a336bc3e3
This commit is contained in:
Simon Marchi 2022-02-06 22:30:06 -05:00 • committed by Simon Marchi
parent f5cb8afdd2
commit f73b4922a0
3 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gdb/block.h
View file

@ -215,10 +215,6 @@ struct global_block
struct compunit_symtab *compunit_symtab; struct compunit_symtab *compunit_symtab;
}; };
/* Number of ranges within a block. */
#define BLOCK_NRANGES(bl) (bl)->ranges ().size ()
/* Access range array for block BL. */ /* Access range array for block BL. */
#define BLOCK_RANGE(bl) (bl)->ranges ().data () #define BLOCK_RANGE(bl) (bl)->ranges ().data ()

23
gdb/blockframe.c
View file

@ -283,19 +283,19 @@ find_pc_partial_function_sym (CORE_ADDR pc,
} }
else else
{ {
int i; bool found = false;
for (i = 0; i < BLOCK_NRANGES (b); i++) for (const blockrange &range : b->ranges ())
{ {
if (BLOCK_RANGE (b)[i].start () <= mapped_pc if (range.start () <= mapped_pc && mapped_pc < range.end ())
&& mapped_pc < BLOCK_RANGE (b)[i].end ())
{ {
cache_pc_function_low = BLOCK_RANGE (b)[i].start (); cache_pc_function_low = range.start ();
cache_pc_function_high = BLOCK_RANGE (b)[i].end (); cache_pc_function_high = range.end ();
found = true;
break; break;
} }
} }
/* Above loop should exit via the break. */ /* Above loop should exit via the break. */
gdb_assert (i < BLOCK_NRANGES (b)); gdb_assert (found);
} }
@ -394,16 +394,15 @@ find_function_entry_range_from_pc (CORE_ADDR pc, const char **name,
{ {
CORE_ADDR entry_pc = BLOCK_ENTRY_PC (block); CORE_ADDR entry_pc = BLOCK_ENTRY_PC (block);
for (int i = 0; i < BLOCK_NRANGES (block); i++) for (const blockrange &range : block->ranges ())
{ {
if (BLOCK_RANGE (block)[i].start () <= entry_pc if (range.start () <= entry_pc && entry_pc < range.end ())
&& entry_pc < BLOCK_RANGE (block)[i].end ())
{ {
if (address != nullptr) if (address != nullptr)
*address = BLOCK_RANGE (block)[i].start (); *address = range.start ();
if (endaddr != nullptr) if (endaddr != nullptr)
*endaddr = BLOCK_RANGE (block)[i].end (); *endaddr = range.end ();
return status; return status;
} }

7
gdb/cli/cli-cmds.c
View file

@ -1442,10 +1442,11 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
} }
else else
{ {
for (int i = 0; i < BLOCK_NRANGES (block); i++) for (const blockrange &range : block->ranges ())
{ {
CORE_ADDR range_low = BLOCK_RANGE (block)[i].start (); CORE_ADDR range_low = range.start ();
CORE_ADDR range_high = BLOCK_RANGE (block)[i].end (); CORE_ADDR range_high = range.end ();
gdb_printf (_("Address range %ps to %ps:\n"), gdb_printf (_("Address range %ps to %ps:\n"),
styled_string (address_style.style (), styled_string (address_style.style (),
paddress (gdbarch, range_low)), paddress (gdbarch, range_low)),