From 1639fab33b5932e1a5e88e29273996f70047da85 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 11 Oct 2022 20:53:39 -0400 Subject: [PATCH] gdb: rename target_read_auxv(target_ops *) to target_read_auxv_raw Having two overloads of target_read_auxv that don't have the same goals is confusing. Rename the one that reads from an explicit target_ops to target_read_auxv_raw. Also, it occured to me that the non-raw version could use the raw version, that reduces duplication a bit. Change-Id: I28e5f7cecbfcacd0174d4686efb3e4a23b4ad491 --- gdb/aarch64-linux-tdep.c | 2 +- gdb/arm-fbsd-tdep.c | 2 +- gdb/arm-linux-tdep.c | 2 +- gdb/auxv.c | 5 ++--- gdb/auxv.h | 2 +- gdb/ppc-linux-tdep.c | 2 +- gdb/s390-linux-tdep.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index 476db5aa3b8..a321aee036a 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -780,7 +780,7 @@ aarch64_linux_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { asection *tls = bfd_get_section_by_name (abfd, ".reg-aarch-tls"); - gdb::optional auxv = target_read_auxv (target); + gdb::optional auxv = target_read_auxv_raw (target); CORE_ADDR hwcap = linux_get_hwcap (auxv, target, gdbarch); CORE_ADDR hwcap2 = linux_get_hwcap2 (auxv, target, gdbarch); diff --git a/gdb/arm-fbsd-tdep.c b/gdb/arm-fbsd-tdep.c index 28fc73d694e..4395136b83c 100644 --- a/gdb/arm-fbsd-tdep.c +++ b/gdb/arm-fbsd-tdep.c @@ -238,7 +238,7 @@ arm_fbsd_core_read_description (struct gdbarch *gdbarch, { asection *tls = bfd_get_section_by_name (abfd, ".reg-aarch-tls"); - gdb::optional auxv = target_read_auxv (target); + gdb::optional auxv = target_read_auxv_raw (target); return arm_fbsd_read_description_auxv (auxv, target, gdbarch, tls != nullptr); } diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 65343f6c075..7fa8a67ae42 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -732,7 +732,7 @@ arm_linux_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - gdb::optional auxv = target_read_auxv (target); + gdb::optional auxv = target_read_auxv_raw (target); CORE_ADDR arm_hwcap = linux_get_hwcap (auxv, target, gdbarch); if (arm_hwcap & HWCAP_VFP) diff --git a/gdb/auxv.c b/gdb/auxv.c index 5853437b0f2..51723f9b17c 100644 --- a/gdb/auxv.c +++ b/gdb/auxv.c @@ -363,8 +363,7 @@ target_read_auxv () if (info == nullptr) { info = auxv_inferior_data.emplace (inf); - info->data = target_read_alloc (inf->top_target (), TARGET_OBJECT_AUXV, - nullptr); + info->data = target_read_auxv_raw (inf->top_target ()); } return info->data; @@ -373,7 +372,7 @@ target_read_auxv () /* See auxv.h. */ gdb::optional -target_read_auxv (target_ops *ops) +target_read_auxv_raw (target_ops *ops) { return target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL); } diff --git a/gdb/auxv.h b/gdb/auxv.h index 983e3bc9b0d..788d187b27a 100644 --- a/gdb/auxv.h +++ b/gdb/auxv.h @@ -52,7 +52,7 @@ extern gdb::optional target_read_auxv (); /* Read auxv data from OPS. */ -extern gdb::optional target_read_auxv (target_ops *ops); +extern gdb::optional target_read_auxv_raw (target_ops *ops); /* Search AUXV for an entry with a_type matching MATCH. diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 12f418fb5ac..f7d13bac8a3 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -1599,7 +1599,7 @@ ppc_linux_core_read_description (struct gdbarch *gdbarch, if (vsx) features.vsx = true; - gdb::optional auxv = target_read_auxv (target); + gdb::optional auxv = target_read_auxv_raw (target); CORE_ADDR hwcap = linux_get_hwcap (auxv, target, gdbarch); features.isa205 = ppc_linux_has_isa205 (hwcap); diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index ef2ed8510a6..14d71134e0c 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -332,7 +332,7 @@ s390_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { asection *section = bfd_get_section_by_name (abfd, ".reg"); - gdb::optional auxv = target_read_auxv (target); + gdb::optional auxv = target_read_auxv_raw (target); CORE_ADDR hwcap = linux_get_hwcap (auxv, target, gdbarch); bool high_gprs, v1, v2, te, vx, gs; -- 2.30.2