public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: remove BLOCK_RANGE_{START,END} macros Date: Thu, 28 Apr 2022 02:39:33 +0000 (GMT) [thread overview] Message-ID: <20220428023933.2A9CF3857C49@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6dd5a4bd44b7b7d2daf195dd5e48faeaf7231c17 commit 6dd5a4bd44b7b7d2daf195dd5e48faeaf7231c17 Author: Simon Marchi <simon.marchi@efficios.com> Date: Sun Feb 6 22:21:21 2022 -0500 gdb: remove BLOCK_RANGE_{START,END} macros Replace with equivalent methods on blockrange. Change-Id: I20fd8f624e0129782c36768291891e7582d77c74 Diff: --- gdb/block.h | 36 ++++++++++++++++++++++-------------- gdb/blockframe.c | 16 ++++++++-------- gdb/cli/cli-cmds.c | 4 ++-- gdb/objfiles.c | 5 +++-- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/gdb/block.h b/gdb/block.h index 2f71f3c8b21..60e53c641a2 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -38,19 +38,35 @@ struct addrmap; struct blockrange { - blockrange (CORE_ADDR startaddr_, CORE_ADDR endaddr_) - : startaddr (startaddr_), - endaddr (endaddr_) + blockrange (CORE_ADDR start, CORE_ADDR end) + : m_start (start), + m_end (end) { } + /* Return this blockrange's start address. */ + CORE_ADDR start () const + { return m_start; } + + /* Set this blockrange's start address. */ + void set_start (CORE_ADDR start) + { m_start = start; } + + /* Return this blockrange's end address. */ + CORE_ADDR end () const + { return m_end; } + + /* Set this blockrange's end address. */ + void set_end (CORE_ADDR end) + { m_end = end; } + /* Lowest address in this range. */ - CORE_ADDR startaddr; + CORE_ADDR m_start; /* One past the highest address in the range. */ - CORE_ADDR endaddr; + CORE_ADDR m_end; }; /* Two or more non-contiguous ranges in the same order as that provided @@ -203,14 +219,6 @@ struct global_block #define BLOCK_CONTIGUOUS_P(bl) (BLOCK_RANGES (bl) == nullptr \ || BLOCK_NRANGES (bl) <= 1) -/* Obtain the start address of the Nth range for block BL. */ - -#define BLOCK_RANGE_START(bl,n) (BLOCK_RANGE (bl)[n].startaddr) - -/* Obtain the end address of the Nth range for block BL. */ - -#define BLOCK_RANGE_END(bl,n) (BLOCK_RANGE (bl)[n].endaddr) - /* 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 non-contiguous, then use the start address for the first range in the @@ -227,7 +235,7 @@ struct global_block #define BLOCK_ENTRY_PC(bl) (BLOCK_CONTIGUOUS_P (bl) \ ? bl->start () \ - : BLOCK_RANGE_START (bl,0)) + : BLOCK_RANGE (bl)[0].start ()) struct blockvector { diff --git a/gdb/blockframe.c b/gdb/blockframe.c index cfc4fd2fd70..e91faaa98b1 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -286,11 +286,11 @@ find_pc_partial_function_sym (CORE_ADDR pc, int i; for (i = 0; i < BLOCK_NRANGES (b); i++) { - if (BLOCK_RANGE_START (b, i) <= mapped_pc - && mapped_pc < BLOCK_RANGE_END (b, i)) + if (BLOCK_RANGE (b)[i].start () <= mapped_pc + && mapped_pc < BLOCK_RANGE (b)[i].end ()) { - cache_pc_function_low = BLOCK_RANGE_START (b, i); - cache_pc_function_high = BLOCK_RANGE_END (b, i); + cache_pc_function_low = BLOCK_RANGE (b)[i].start (); + cache_pc_function_high = BLOCK_RANGE (b)[i].end (); break; } } @@ -396,14 +396,14 @@ find_function_entry_range_from_pc (CORE_ADDR pc, const char **name, for (int i = 0; i < BLOCK_NRANGES (block); i++) { - if (BLOCK_RANGE_START (block, i) <= entry_pc - && entry_pc < BLOCK_RANGE_END (block, i)) + if (BLOCK_RANGE (block)[i].start () <= entry_pc + && entry_pc < BLOCK_RANGE (block)[i].end ()) { if (address != nullptr) - *address = BLOCK_RANGE_START (block, i); + *address = BLOCK_RANGE (block)[i].start (); if (endaddr != nullptr) - *endaddr = BLOCK_RANGE_END (block, i); + *endaddr = BLOCK_RANGE (block)[i].end (); return status; } diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 2b4becc97b2..f7c556a4e0c 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1444,8 +1444,8 @@ print_disassembly (struct gdbarch *gdbarch, const char *name, { for (int i = 0; i < BLOCK_NRANGES (block); i++) { - CORE_ADDR range_low = BLOCK_RANGE_START (block, i); - CORE_ADDR range_high = BLOCK_RANGE_END (block, i); + CORE_ADDR range_low = BLOCK_RANGE (block)[i].start (); + CORE_ADDR range_high = BLOCK_RANGE (block)[i].end (); gdb_printf (_("Address range %ps to %ps:\n"), styled_string (address_style.style (), paddress (gdbarch, range_low)), diff --git a/gdb/objfiles.c b/gdb/objfiles.c index a709d947da0..9c7a30d9a60 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -683,8 +683,9 @@ objfile_relocate1 (struct objfile *objfile, if (BLOCK_RANGES (b) != nullptr) for (int j = 0; j < BLOCK_NRANGES (b); j++) { - BLOCK_RANGE_START (b, j) += delta[block_line_section]; - BLOCK_RANGE_END (b, j) += delta[block_line_section]; + blockrange &r = BLOCK_RANGE (b)[j]; + 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
reply other threads:[~2022-04-28 2:39 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220428023933.2A9CF3857C49@sourceware.org \ --to=simark@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).