gdb: remove BLOCK_NRANGES macro
Replace with range for loops.
Change-Id: Icbe04f9b6f9e6ddae2e15b2409c61f7a336bc3e3
diff --git a/gdb/block.h b/gdb/block.h
index daaaecd..3782327 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -215,10 +215,6 @@ struct global_block
struct compunit_symtab *compunit_symtab;
};
-/* Number of ranges within a block. */
-
-#define BLOCK_NRANGES(bl) (bl)->ranges ().size ()
-
/* Access range array for block BL. */
#define BLOCK_RANGE(bl) (bl)->ranges ().data ()
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index e91faaa..78c9daa 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -283,19 +283,19 @@ find_pc_partial_function_sym (CORE_ADDR pc,
}
else
{
- int i;
- for (i = 0; i < BLOCK_NRANGES (b); i++)
+ bool found = false;
+ for (const blockrange &range : b->ranges ())
{
- if (BLOCK_RANGE (b)[i].start () <= mapped_pc
- && mapped_pc < BLOCK_RANGE (b)[i].end ())
+ if (range.start () <= mapped_pc && mapped_pc < range.end ())
{
- cache_pc_function_low = BLOCK_RANGE (b)[i].start ();
- cache_pc_function_high = BLOCK_RANGE (b)[i].end ();
+ cache_pc_function_low = range.start ();
+ cache_pc_function_high = range.end ();
+ found = true;
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);
- for (int i = 0; i < BLOCK_NRANGES (block); i++)
+ for (const blockrange &range : block->ranges ())
{
- if (BLOCK_RANGE (block)[i].start () <= entry_pc
- && entry_pc < BLOCK_RANGE (block)[i].end ())
+ if (range.start () <= entry_pc && entry_pc < range.end ())
{
if (address != nullptr)
- *address = BLOCK_RANGE (block)[i].start ();
+ *address = range.start ();
if (endaddr != nullptr)
- *endaddr = BLOCK_RANGE (block)[i].end ();
+ *endaddr = range.end ();
return status;
}
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index f7c556a..7a6a8ea 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1442,10 +1442,11 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
}
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_high = BLOCK_RANGE (block)[i].end ();
+ CORE_ADDR range_low = range.start ();
+ CORE_ADDR range_high = range.end ();
+
gdb_printf (_("Address range %ps to %ps:\n"),
styled_string (address_style.style (),
paddress (gdbarch, range_low)),
