From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Subject: [PATCH 3/3] gdb: make target_auxv_parse static and rename
Date: Thu, 29 Sep 2022 16:43:54 -0400 [thread overview]
Message-ID: <20220929204354.751741-4-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20220929204354.751741-1-simon.marchi@polymtl.ca>
It is only used in auxv.c. Also, given it is not strictly a wrapper
around target_ops::auxv (since 27a48a9223d0 "Add auxv parsing to the
architecture vector."), I think that the name prefixed with target is a
bit misleading. Rename to just parse_auxv.
Change-Id: I41cca055b92c8ede37c258ba6583746a07d8f77e
---
gdb/auxv.c | 14 +++++++++-----
gdb/auxv.h | 7 -------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/gdb/auxv.c b/gdb/auxv.c
index a9337d9f7ff4..76fc821c07c3 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -306,12 +306,16 @@ svr4_auxv_parse (struct gdbarch *gdbarch, const gdb_byte **readptr,
}
/* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
+
+ Use the auxv_parse method from the current inferior's gdbarch, if defined,
+ else use the current inferior's target stack's auxv_parse.
+
Return 0 if *READPTR is already at the end of the buffer.
Return -1 if there is insufficient buffer for a whole entry.
Return 1 if an entry was read into *TYPEP and *VALP. */
-int
-target_auxv_parse (const gdb_byte **readptr, const gdb_byte *endptr,
- CORE_ADDR *typep, CORE_ADDR *valp)
+static int
+parse_auxv (const gdb_byte **readptr, const gdb_byte *endptr, CORE_ADDR *typep,
+ CORE_ADDR *valp)
{
struct gdbarch *gdbarch = target_gdbarch();
@@ -388,7 +392,7 @@ target_auxv_search (struct target_ops *ops, CORE_ADDR match, CORE_ADDR *valp)
size_t len = info->data->size ();
while (1)
- switch (target_auxv_parse (&ptr, data + len, &type, &val))
+ switch (parse_auxv (&ptr, data + len, &type, &val))
{
case 1: /* Here's an entry, check it. */
if (type == match)
@@ -561,7 +565,7 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
const gdb_byte *ptr = data;
size_t len = info->data->size ();
- while (target_auxv_parse (&ptr, data + len, &type, &val) > 0)
+ while (parse_auxv (&ptr, data + len, &type, &val) > 0)
{
gdbarch_print_auxv_entry (gdbarch, file, type, val);
++ents;
diff --git a/gdb/auxv.h b/gdb/auxv.h
index 2e8b2ab33fc6..ab2a5dee5f74 100644
--- a/gdb/auxv.h
+++ b/gdb/auxv.h
@@ -46,13 +46,6 @@ extern int svr4_auxv_parse (struct gdbarch *gdbarch, const gdb_byte **readptr,
const gdb_byte *endptr, CORE_ADDR *typep,
CORE_ADDR *valp);
-/* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
- Return 0 if *READPTR is already at the end of the buffer.
- Return -1 if there is insufficient buffer for a whole entry.
- Return 1 if an entry was read into *TYPEP and *VALP. */
-extern int target_auxv_parse (const gdb_byte **readptr, const gdb_byte *endptr,
- CORE_ADDR *typep, CORE_ADDR *valp);
-
/* Extract the auxiliary vector entry with a_type matching MATCH.
Return zero if no such entry was found, or -1 if there was
an error getting the information. On success, return 1 after
--
2.37.3
next prev parent reply other threads:[~2022-09-29 20:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 20:43 [PATCH 0/3] Small cleanups in auxv.c Simon Marchi
2022-09-29 20:43 ` [PATCH 1/3] gdb: constify auxv parse functions Simon Marchi
2022-09-29 20:43 ` [PATCH 2/3] gdb: make fprint_target_auxv static Simon Marchi
2022-09-29 20:43 ` Simon Marchi [this message]
2022-09-29 21:31 ` [PATCH 0/3] Small cleanups in auxv.c John Baldwin
2022-09-29 23:57 ` Simon Marchi
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=20220929204354.751741-4-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@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: link
Be 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).