From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 4F7463858405; Thu, 28 Apr 2022 02:39:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F7463858405 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: remove BLOCK_NRANGES macro X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: f5cb8afdd297dd68273d98a10fbfd350dff918d8 X-Git-Newrev: f73b4922a06f5455c1f0173d3b2026dba957d1b7 Message-Id: <20220428023943.4F7463858405@sourceware.org> Date: Thu, 28 Apr 2022 02:39:43 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2022 02:39:43 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Df73b4922a06f= 5455c1f0173d3b2026dba957d1b7 commit f73b4922a06f5455c1f0173d3b2026dba957d1b7 Author: Simon Marchi Date: Sun Feb 6 22:30:06 2022 -0500 gdb: remove BLOCK_NRANGES macro =20 Replace with range for loops. =20 Change-Id: Icbe04f9b6f9e6ddae2e15b2409c61f7a336bc3e3 Diff: --- gdb/block.h | 4 ---- gdb/blockframe.c | 23 +++++++++++------------ gdb/cli/cli-cmds.c | 7 ++++--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/gdb/block.h b/gdb/block.h index daaaecdd501..3782327c155 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -215,10 +215,6 @@ struct global_block struct compunit_symtab *compunit_symtab; }; =20 -/* Number of ranges within a block. */ - -#define BLOCK_NRANGES(bl) (bl)->ranges ().size () - /* Access range array for block BL. */ =20 #define BLOCK_RANGE(bl) (bl)->ranges ().data () diff --git a/gdb/blockframe.c b/gdb/blockframe.c index e91faaa98b1..78c9daabf23 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 =3D 0; i < BLOCK_NRANGES (b); i++) + bool found =3D false; + for (const blockrange &range : b->ranges ()) { - if (BLOCK_RANGE (b)[i].start () <=3D mapped_pc - && mapped_pc < BLOCK_RANGE (b)[i].end ()) + if (range.start () <=3D mapped_pc && mapped_pc < range.end ()) { - cache_pc_function_low =3D BLOCK_RANGE (b)[i].start (); - cache_pc_function_high =3D BLOCK_RANGE (b)[i].end (); + cache_pc_function_low =3D range.start (); + cache_pc_function_high =3D range.end (); + found =3D true; break; } } /* Above loop should exit via the break. */ - gdb_assert (i < BLOCK_NRANGES (b)); + gdb_assert (found); } =20 =20 @@ -394,16 +394,15 @@ find_function_entry_range_from_pc (CORE_ADDR pc, cons= t char **name, { CORE_ADDR entry_pc =3D BLOCK_ENTRY_PC (block); =20 - for (int i =3D 0; i < BLOCK_NRANGES (block); i++) + for (const blockrange &range : block->ranges ()) { - if (BLOCK_RANGE (block)[i].start () <=3D entry_pc - && entry_pc < BLOCK_RANGE (block)[i].end ()) + if (range.start () <=3D entry_pc && entry_pc < range.end ()) { if (address !=3D nullptr) - *address =3D BLOCK_RANGE (block)[i].start (); + *address =3D range.start (); =20 if (endaddr !=3D nullptr) - *endaddr =3D BLOCK_RANGE (block)[i].end (); + *endaddr =3D range.end (); =20 return status; } diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index f7c556a4e0c..7a6a8ea20a1 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1442,10 +1442,11 @@ print_disassembly (struct gdbarch *gdbarch, const c= har *name, } else { - for (int i =3D 0; i < BLOCK_NRANGES (block); i++) + for (const blockrange &range : block->ranges ()) { - CORE_ADDR range_low =3D BLOCK_RANGE (block)[i].start (); - CORE_ADDR range_high =3D BLOCK_RANGE (block)[i].end (); + CORE_ADDR range_low =3D range.start (); + CORE_ADDR range_high =3D range.end (); + gdb_printf (_("Address range %ps to %ps:\n"), styled_string (address_style.style (), paddress (gdbarch, range_low)),