* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 11:41 ` Fredrik Hederstierna
@ 2020-10-20 12:39 ` Simon Marchi
2020-10-20 14:00 ` Fredrik Hederstierna
2020-10-20 19:34 ` [PATCH] gdb: Support corefiles for arm-none-eabi Fredrik Hederstierna
` (5 subsequent siblings)
6 siblings, 1 reply; 39+ messages in thread
From: Simon Marchi @ 2020-10-20 12:39 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu
Cc: gdb-patches, Luis Machado, Alan Hayward
On 2020-10-20 7:41 a.m., Fredrik Hederstierna wrote:
> Hi all,
>
> I rebased and update my patch and it not run against GDB 10 / git-master, available at
>
> https://sourceware.org/bugzilla/show_bug.cgi?id=14383
>
> I debugged my remote arm-none bare-metal Cortex-M4 target app over openocd/JTAG,
> and generate core-file:
> (gdb) gcore bare_metal.core
>
> Then later off-line on my host PC, I successfully debugged it with register, call-stack etc:
> $ arm-none-eabi-gdb my_bare_metal_app.elf bare_metal.core
>
> So this patch 'works', but I'm not sure if this is the correct direction to go,
> but could be a start.
> Besides this, next step could be to do this 'core-generator' tool that could be used for embedded targets, running on host PC.
>
> Please check the patch out, it builds fine with GDB-10/master on my machine.
> Any comments are appreciated!
>
> Thanks, BR Fredrik
Can you please send it on this list using git-send-email? We don't do
patch review on bugzilla (and it's not really practical).
You can send it as a reply to your message (so it's threaded correctly)
by mentioning the Message-Id of your message:
git send-email --in-reply-to AM6PR10MB21504CBD56291D9C255739E1EF1F0@AM6PR10MB2150.EURPRD10.PROD.OUTLOOK.COM <other args>
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 12:39 ` Simon Marchi
@ 2020-10-20 14:00 ` Fredrik Hederstierna
2020-10-20 15:04 ` Simon Marchi
0 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-20 14:00 UTC (permalink / raw)
To: Simon Marchi, Paul Mathieu; +Cc: gdb-patches, Luis Machado, Alan Hayward
[-- Attachment #1: Type: text/plain, Size: 2110 bytes --]
From: Simon Marchi <simark@simark.ca>
Sent: Tuesday, October 20, 2020 2:39 PM
To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>; Paul Mathieu <paulmathieu@google.com>
Cc: gdb-patches@sourceware.org <gdb-patches@sourceware.org>; Luis Machado <luis.machado@linaro.org>; Alan Hayward <Alan.Hayward@arm.com>
Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
On 2020-10-20 7:41 a.m., Fredrik Hederstierna wrote:
> Hi all,
>
> I rebased and update my patch and it not run against GDB 10 / git-master, available at
>
> https://urldefense.com/v3/__https://sourceware.org/bugzilla/show_bug.cgi?id=14383__;!!BFCLnRDDbM3FOmw!sFHQSRGODtw_TucPLlwMNAMob6sJKx4DCgz3ryd9VjcmJNdXXPz78keCE4GRXIlJ9HDNheH5$
>
> I debugged my remote arm-none bare-metal Cortex-M4 target app over openocd/JTAG,
> and generate core-file:
> (gdb) gcore bare_metal.core
>
> Then later off-line on my host PC, I successfully debugged it with register, call-stack etc:
> $ arm-none-eabi-gdb my_bare_metal_app.elf bare_metal.core
>
> So this patch 'works', but I'm not sure if this is the correct direction to go,
> but could be a start.
> Besides this, next step could be to do this 'core-generator' tool that could be used for embedded targets, running on host PC.
>
> Please check the patch out, it builds fine with GDB-10/master on my machine.
> Any comments are appreciated!
>
> Thanks, BR Fredrik
> Can you please send it on this list using git-send-email? We don't do
> patch review on bugzilla (and it's not really practical).
>
> You can send it as a reply to your message (so it's threaded correctly)
> by mentioning the Message-Id of your message:
>
> git send-email --in-reply-to AM6PR10MB21504CBD56291D9C255739E1EF1F0@AM6PR10MB2150.EURPRD10.PROD.OUTLOOK.COM <other args>
>
> Simon
Sorry my crappy corporate Outlook SMTP doesnt support me sending through git, and I had problems to using eg Google gmail,
I try to attach the patch here and in the meantime try to solve this in a better way, sorry for the inconvenience.
Kindly, Fredrik
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-corefiles-for-arm-none-eabi.patch --]
[-- Type: text/x-patch; name="0001-corefiles-for-arm-none-eabi.patch", Size: 24757 bytes --]
From 48f7f72a4d50b697483cb9cde56496f07c7aec3e Mon Sep 17 00:00:00 2001
From: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
Date: Tue, 20 Oct 2020 09:06:55 +0200
Subject: [PATCH] gdb: Support corefiles for arm-none-eabi
---
gdb/arm-none-tdep.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 60 ++++++++
gdb/arm-tdep.c | 8 +
gdb/configure.tgt | 6 +-
gdb/none-tdep.c | 231 +++++++++++++++++++++++++++
gdb/none-tdep.h | 39 +++++
6 files changed, 711 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..9d83a8b913
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,368 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
+#include "breakpoint.h"
+#include "auxv.h"
+
+#include "aarch32-tdep.h"
+#include "arch/arm.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+
+#include "elf/common.h"
+
+/* ---- based on arm-linux-tdep.h ---- */
+
+#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
+ + 2 * ARM_INT_REGISTER_SIZE \
+ + 8 + ARM_INT_REGISTER_SIZE)
+
+/* The index to access CSPR in user_regs defined in GLIBC. */
+#define ARM_CPSR_GREGNUM 16
+
+/* Support for register format used by the NWFPE FPA emulator. Each
+ register takes three words, where either the first one, two, or
+ three hold a single, double, or extended precision value (depending
+ on the corresponding tag). The register set is eight registers,
+ followed by the fpsr and fpcr, followed by eight tag bytes, and a
+ final word flag which indicates whether NWFPE has been
+ initialized. */
+
+#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
+#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
+
+/* Reuse ARM GNU/Linux HWCAP values for none. These are in defined in
+ <asm/elf.h> in current kernels. */
+#define HWCAP_VFP 64
+#define HWCAP_IWMMXT 512
+#define HWCAP_NEON 4096
+#define HWCAP_VFPv3 8192
+#define HWCAP_VFPv3D16 16384
+
+/* Core file and register set support. */
+
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* ---- based on arm-linux-tdep.c ---- */
+
+void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support for register format used by the NWFPE FPA emulator. */
+
+#define typeNone 0x00
+#define typeSingle 0x01
+#define typeDouble 0x02
+#define typeExtended 0x03
+
+void
+arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs)
+{
+ const gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+ memset (buf, 0, ARM_FP_REGISTER_SIZE);
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (buf, reg_data, 4);
+ break;
+ case typeDouble:
+ memcpy (buf, reg_data + 4, 4);
+ memcpy (buf + 4, reg_data, 4);
+ break;
+ case typeExtended:
+ /* We want sign and exponent, then least significant bits,
+ then most significant. NWFPE does sign, most, least. */
+ memcpy (buf, reg_data, 4);
+ memcpy (buf + 4, reg_data + 8, 4);
+ memcpy (buf + 8, reg_data + 4, 4);
+ break;
+ default:
+ break;
+ }
+
+ regcache->raw_supply (regno, buf);
+}
+
+void
+arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs)
+{
+ gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ regcache->raw_collect (regno, buf);
+
+ /* NOTE drow/2006-06-07: This code uses the tag already in the
+ register buffer. I've preserved that when moving the code
+ from the native file to the target file. But this doesn't
+ always make sense. */
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (reg_data, buf, 4);
+ break;
+ case typeDouble:
+ memcpy (reg_data, buf + 4, 4);
+ memcpy (reg_data + 4, buf, 4);
+ break;
+ case typeExtended:
+ memcpy (reg_data, buf, 4);
+ memcpy (reg_data + 4, buf + 8, 4);
+ memcpy (reg_data + 8, buf + 4, 4);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPS_REGNUM,
+ regs + NWFPE_FPSR_OFFSET);
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_supply_nwfpe_register (regcache, regno, regs);
+}
+
+void
+arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_collect_nwfpe_register (regcache, regno, regs);
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPS_REGNUM,
+ regs + ARM_INT_REGISTER_SIZE * ARM_FPS_REGNUM);
+}
+
+/* Support VFP register format. */
+
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ NULL, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_fpregset =
+ {
+ NULL, arm_none_supply_nwfpe, arm_none_collect_nwfpe
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ NULL, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, NULL, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+ else if (tdep->have_fpa_registers)
+ cb (".reg2", ARM_NONE_SIZEOF_NWFPE, ARM_NONE_SIZEOF_NWFPE,
+ &arm_none_fpregset, "FPA floating-point", cb_data);
+}
+
+/* Determine target description from core file. */
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd)
+{
+ CORE_ADDR arm_hwcap = 0;
+ if (target_auxv_search (target, AT_HWCAP, &arm_hwcap) != 1)
+ return nullptr;
+
+ if (arm_hwcap & HWCAP_VFP)
+ {
+ /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support
+ Neon with VFPv3-D32. */
+ if (arm_hwcap & HWCAP_NEON)
+ return aarch32_read_description ();
+ else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
+ return arm_read_description (ARM_FP_TYPE_VFPV3);
+
+ return arm_read_description (ARM_FP_TYPE_VFPV2);
+ }
+
+ return nullptr;
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7927c0aff3
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,60 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "gdbarch.h"
+#include "target.h"
+#include "bfd.h"
+
+struct regset;
+struct regcache;
+
+void arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len);
+void arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len);
+
+void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs);
+void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs);
+
+void arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len);
+void arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len);
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd);
+
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..be47cc2228 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (info, gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+ set_gdbarch_core_read_description (gdbarch, arm_none_core_read_description);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..f4a1540464 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
@@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
if test "$t" = linux-tdep.o; then
gdb_have_gcore=true
fi
+ if test "$t" = arm-none-tdep.o; then
+ gdb_have_gcore=true
+ fi
done
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..8cd139c500
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,231 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "none-tdep.h"
+#include "auxv.h"
+#include "target.h"
+#include "gdbthread.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "regset.h"
+#include "elf/common.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+#include "cli/cli-utils.h"
+#include "arch-utils.h"
+#include "gdb_obstack.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "infcall.h"
+#include "gdbcmd.h"
+#include "gdb_regex.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
+
+#include <ctype.h>
+
+/* ---- based on linux-tdep.c ---- */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ int abort_iteration;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != NULL
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data = (char *) elfcore_write_prstatus
+ (data->obfd, data->note_data, data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal), buf.data ());
+ else
+ data->note_data = (char *) elfcore_write_register_note
+ (data->obfd, data->note_data, data->note_size,
+ sect_name, buf.data (), collect_size);
+
+ if (data->note_data == NULL)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static char *
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ char *note_data, int *note_size,
+ enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct none_collect_regset_section_cb_data data;
+
+ data.gdbarch = gdbarch;
+ data.regcache = regcache;
+ data.obfd = obfd;
+ data.note_data = note_data;
+ data.note_size = note_size;
+ data.stop_signal = stop_signal;
+ data.abort_iteration = 0;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ data.lwp = ptid.lwp ();
+ if (!data.lwp)
+ data.lwp = ptid.tid ();
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+ return data.note_data;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ char *note_data = NULL;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ char *psargs = xstrdup (fname);
+
+ if (get_inferior_args ())
+ psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+ (char *) NULL);
+
+ note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
+ fname, psargs);
+ xfree (psargs);
+ }
+
+ if (!note_data)
+ return NULL;
+
+ if (note_data)
+ {
+ ptid_t ptid;
+ struct regcache *regcache;
+ process_stratum_target *targ = NULL;
+ int global_id = 1;
+ struct thread_info *info = find_thread_global_id (global_id);
+ if (info)
+ {
+ ptid = info->ptid;
+ targ = info->inf->process_target ();
+ }
+ else
+ ptid = minus_one_ptid;
+ regcache = get_thread_arch_regcache (targ, ptid, gdbarch);
+
+ note_data = collect (regcache,
+ ptid,
+ obfd,
+ note_data,
+ note_size,
+ GDB_SIGNAL_0);
+ if (!note_data)
+ return NULL;
+
+ /* Auxillary vector. */
+ gdb::optional<gdb::byte_vector> auxv =
+ target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
+ if (auxv && !auxv->empty ())
+ {
+ note_data = elfcore_write_note (obfd, note_data, note_size,
+ "CORE", NT_AUXV, auxv->data (),
+ auxv->size ());
+
+ if (!note_data)
+ return NULL;
+ }
+ }
+
+ /* make_cleanup (xfree, note_data); */
+ return note_data;
+}
+
+static char *
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
+}
+
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_none_tdep;
+
+void
+_initialize_none_tdep (void)
+{
+ /* No special actions. */
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..4aea7004d8
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,39 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "bfd.h"
+
+struct regcache;
+
+typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
+ ptid_t,
+ bfd *, char *, int *,
+ enum gdb_signal);
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect);
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 14:00 ` Fredrik Hederstierna
@ 2020-10-20 15:04 ` Simon Marchi
2020-10-20 22:05 ` Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Simon Marchi @ 2020-10-20 15:04 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu
Cc: gdb-patches, Luis Machado, Alan Hayward
> Sorry my crappy corporate Outlook SMTP doesnt support me sending through git, and I had problems to using eg Google gmail,
> I try to attach the patch here and in the meantime try to solve this in a better way, sorry for the inconvenience.
Ok, thanks for trying. Is Outlook's SMTP not really SMTP?
One warning to fix we get when applying:
Applying: gdb: Support corefiles for arm-none-eabi
.git/rebase-apply/patch:703: trailing whitespace.
I'm leaving stylistic comments for later, it will be easier if you
succeed using git-send-email.
One thing that doesn't look right is this, in none_make_corefile_notes:
int global_id = 1;
struct thread_info *info = find_thread_global_id (global_id);
As you might have noticed, GDB now supports being connected to multiple
targets at the same time. So, inferior 1 could be a local GNU/Linux
executable, while inferior 2 could be a remote bare-metal ARM program.
So you can't assume that the thread you want to dump has global id 1.
You should get the current inferior with the current_inferior function,
and access its threads.
Also, if GDB connects to a remote target that is able to report the OS's
(FreeRTOS, for example) tasks as threads, is it possible to see them in
GDB? If I understand correctly this section of the OpenOCD manual,
OpenOCD can do it:
http://openocd.org/doc/html/GDB-and-OpenOCD.html#RTOS-Support
If so, I guess GDB should just dump all the current inferior's threads
in the core dump.
I see you have this commented out:
/* make_cleanup (xfree, note_data); */
The way to do it now would be to make note_data a
gdb::unique_xmalloc_ptr<char>, and do "return note_data.release ();"
when returning. This way, it gets automatically freed if something bad
happens. And ideally, gdbarch_make_corefile_notes should be changed to
return a gdb::unique_xmalloc_ptr<char>, but that's out of the scope of
this patch (I'll give it a quick try).
You don't need an _initialize_none_tdep if you don't do anything in it.
One last question: I see that you deal with AUXV stuff. Will bare-metal
arm programs really have an auxiliary vector?
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 15:04 ` Simon Marchi
@ 2020-10-20 22:05 ` Fredrik Hederstierna
2020-10-20 23:06 ` Simon Marchi
0 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-20 22:05 UTC (permalink / raw)
To: Simon Marchi, Paul Mathieu; +Cc: gdb-patches, Luis Machado, Alan Hayward
> From: Simon Marchi <simark@simark.ca>
> Sent: Tuesday, October 20, 2020 5:04 PM
> To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>; Paul Mathieu <paulmathieu@google.com>
> Cc: gdb-patches@sourceware.org <gdb-patches@sourceware.org>; Luis Machado <luis.machado@linaro.org>; Alan Hayward > <Alan.Hayward@arm.com>
> Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
> Ok, thanks for trying. Is Outlook's SMTP not really SMTP?
I think git-email now works with the SMTP server, but need to learn how to embed message etc. sorry for beginners mistakes..
> One warning to fix we get when applying:
>
> Applying: gdb: Support corefiles for arm-none-eabi
> .git/rebase-apply/patch:703: trailing whitespace.
I found one place with trailing whitespace that I missed, should be fixed.
> One thing that doesn't look right is this, in none_make_corefile_notes:
>
> int global_id = 1;
> struct thread_info *info = find_thread_global_id (global_id);
>
> As you might have noticed, GDB now supports being connected to multiple
> targets at the same time. So, inferior 1 could be a local GNU/Linux
> executable, while inferior 2 could be a remote bare-metal ARM program.
> If so, I guess GDB should just dump all the current inferior's threads
> in the core dump.
I've tried to modify code so it should dump all threads,
created a [PATCH v2] which includes this (sent with git-email).
> I see you have this commented out:
>
> /* make_cleanup (xfree, note_data); */
>
> The way to do it now would be to make note_data a
> gdb::unique_xmalloc_ptr<char>, and do "return note_data.release ();"
> when returning. This way, it gets automatically freed if something bad
> happens. And ideally, gdbarch_make_corefile_notes should be changed to
> return a gdb::unique_xmalloc_ptr<char>, but that's out of the scope of
> this patch (I'll give it a quick try).
I tried to copy linux-tdep.c, and I could not find where data is unallocated, but maybe its a later problem.
> You don't need an _initialize_none_tdep if you don't do anything in it.
Ok, I kept if for now, if something pops up that needs to be put there along the road..
> One last question: I see that you deal with AUXV stuff. Will bare-metal
> arm programs really have an auxiliary vector?
I'm not sure what Auxv contains, but seems to be eg some system info that is handy, I do not know what/if its filled with something by default on a bare-metal arm-none target/arch?
Thanks! BR Fredrik
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 22:05 ` Fredrik Hederstierna
@ 2020-10-20 23:06 ` Simon Marchi
2020-10-22 0:52 ` Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Simon Marchi @ 2020-10-20 23:06 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu
Cc: gdb-patches, Luis Machado, Alan Hayward
On 2020-10-20 6:05 p.m., Fredrik Hederstierna wrote:
>
>
>
>> From: Simon Marchi <simark@simark.ca>
>> Sent: Tuesday, October 20, 2020 5:04 PM
>> To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>; Paul Mathieu <paulmathieu@google.com>
>> Cc: gdb-patches@sourceware.org <gdb-patches@sourceware.org>; Luis Machado <luis.machado@linaro.org>; Alan Hayward > <Alan.Hayward@arm.com>
>> Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
>
>> Ok, thanks for trying. Is Outlook's SMTP not really SMTP?
>
> I think git-email now works with the SMTP server, but need to learn how to embed message etc. sorry for beginners mistakes..
Well, that's good news!
>> One thing that doesn't look right is this, in none_make_corefile_notes:
>>
>> int global_id = 1;
>> struct thread_info *info = find_thread_global_id (global_id);
>>
>> As you might have noticed, GDB now supports being connected to multiple
>> targets at the same time. So, inferior 1 could be a local GNU/Linux
>> executable, while inferior 2 could be a remote bare-metal ARM program.
>
>
>> If so, I guess GDB should just dump all the current inferior's threads
>> in the core dump.
>
> I've tried to modify code so it should dump all threads,
> created a [PATCH v2] which includes this (sent with git-email).
Thanks, I'll take a look.
>
>> I see you have this commented out:
>>
>> /* make_cleanup (xfree, note_data); */
>>
>> The way to do it now would be to make note_data a
>> gdb::unique_xmalloc_ptr<char>, and do "return note_data.release ();"
>> when returning. This way, it gets automatically freed if something bad
>> happens. And ideally, gdbarch_make_corefile_notes should be changed to
>> return a gdb::unique_xmalloc_ptr<char>, but that's out of the scope of
>> this patch (I'll give it a quick try).
>
> I tried to copy linux-tdep.c, and I could not find where data is unallocated, but maybe its a later problem.
If everything works well, your function returns allocated data to the
caller and gives up ownership. So it becomes the caller's problem to
de-allocate it. However, you need to make sure that your function
doesn't leak the data if an exception is thrown.
If you do:
char *data = (char *) xmalloc (1234);
call_function_that_may_throw ();
return data;
... and call_function_that_may_throw throws, the allocated buffer leaks.
If you do:
gdb::unique_xmalloc_ptr<char> data ((char *) xmalloc (1234));
call_function_that_may_throw ();
return data.release ();
... then data gets freed if the function throws.
I'll look at changing the callback type to make it return a
gdb::unique_xmalloc_ptr<char> instead of a `char *`, in which case it
would become:
gdb::unique_xmalloc_ptr<char> data ((char *) xmalloc (1234));
call_function_that_may_throw ();
return data;
>> You don't need an _initialize_none_tdep if you don't do anything in it.
>
> Ok, I kept if for now, if something pops up that needs to be put there along the road..
If you don't have anything, just remove it. We can easily add it later.
>> One last question: I see that you deal with AUXV stuff. Will bare-metal
>> arm programs really have an auxiliary vector?
>
> I'm not sure what Auxv contains, but seems to be eg some system info that is handy, I do not know what/if its filled with something by default on a bare-metal arm-none target/arch?
On "standard" OSes, the auxiliary vector (auxv) is set up by the kernel
when it loads the executable in memory, to provide some information
about the ELF file how it was loaded. I don't think it applies to bare
metal targets. If not (I'd be happy to be proven wrong), you shouldn't
include it, it just makes the code unnecessarily more complicated.
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-20 23:06 ` Simon Marchi
@ 2020-10-22 0:52 ` Fredrik Hederstierna
2020-10-22 1:24 ` Simon Marchi
2020-10-22 1:49 ` Simon Marchi
0 siblings, 2 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-22 0:52 UTC (permalink / raw)
To: Simon Marchi, Paul Mathieu; +Cc: gdb-patches, Luis Machado, Alan Hayward
Hi,
I did a new patch v3 where I try address all your comments,
stripped alot of more "*ix" stuff, and hopefully the remaining parts are all good for bare metal none core files.
Still I have not done the xmalloc/xfree transform to newer variant, but maybe that can be in another future commit.
And sorry for the git-email mess, I'm still learning to use this feature..
Any comments or feedback are welcome!
Thanks, BR Fredrik
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-22 0:52 ` Fredrik Hederstierna
@ 2020-10-22 1:24 ` Simon Marchi
2020-10-22 1:49 ` Simon Marchi
1 sibling, 0 replies; 39+ messages in thread
From: Simon Marchi @ 2020-10-22 1:24 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu
Cc: gdb-patches, Luis Machado, Alan Hayward
On 2020-10-21 8:52 p.m., Fredrik Hederstierna wrote:
> Hi,
> I did a new patch v3 where I try address all your comments,
> stripped alot of more "*ix" stuff, and hopefully the remaining parts are all good for bare metal none core files.
> Still I have not done the xmalloc/xfree transform to newer variant, but maybe that can be in another future commit.
> And sorry for the git-email mess, I'm still learning to use this feature..
> Any comments or feedback are welcome!
> Thanks, BR Fredrik
Do you know why your patches are sent as two emails, one with (what
appears to be) the commit log, and another one with the diff? If you
put the description in the git commit/log message itself, it will be
sent as part of the patch, all in one message.
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-22 0:52 ` Fredrik Hederstierna
2020-10-22 1:24 ` Simon Marchi
@ 2020-10-22 1:49 ` Simon Marchi
2020-10-22 22:32 ` Fredrik Hederstierna
1 sibling, 1 reply; 39+ messages in thread
From: Simon Marchi @ 2020-10-22 1:49 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu; +Cc: gdb-patches
On 2020-10-21 8:52 p.m., Fredrik Hederstierna via Gdb-patches wrote:
> Hi,
> I did a new patch v3 where I try address all your comments,
> stripped alot of more "*ix" stuff, and hopefully the remaining parts are all good for bare metal none core files.
> Still I have not done the xmalloc/xfree transform to newer variant, but maybe that can be in another future commit.
I've rebased your patch on top of master and made the necessary changes
to make it build (the equivalent changes that I did to linux-tdep.c and
fbsd-tdep.c).
You can find it on the users/simark/arm-none-core-file branch upstream:
https://sourceware.org/git/?p=binutils-gdb.git;a=shortlog;h=refs/heads/users/simark/arm-none-core-file
Feel free to pick it up.
I've also removed an xmalloc/xfree to use an std::string instead, but
other than that I haven't made any other change.
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-22 1:49 ` Simon Marchi
@ 2020-10-22 22:32 ` Fredrik Hederstierna
2020-10-23 0:37 ` Simon Marchi
0 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-22 22:32 UTC (permalink / raw)
To: Simon Marchi, Paul Mathieu; +Cc: gdb-patches
> From: Simon Marchi <simark@simark.ca>
> Sent: Thursday, October 22, 2020 3:49 AM
> I've rebased your patch on top of master and made the necessary changes
> to make it build (the equivalent changes that I did to linux-tdep.c and
> fbsd-tdep.c).
>
> You can find it on the users/simark/arm-none-core-file branch upstream:
Looks great, thanks Simon, I have no futher changes to be made,
what is next step, are we near for this to being mergable?
The features regarding eg FreeRTOS could be added later on top of this I guess.
The format of the corefile right now is exactly as Linux, minus all '*ix' stuff,
only threads, registers and memory I think. What is next step on this?
Thanks, BR Fredrik
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-22 22:32 ` Fredrik Hederstierna
@ 2020-10-23 0:37 ` Simon Marchi
2020-10-25 21:06 ` Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Simon Marchi @ 2020-10-23 0:37 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu; +Cc: gdb-patches
On 2020-10-22 6:32 p.m., Fredrik Hederstierna via Gdb-patches wrote:
>> From: Simon Marchi <simark@simark.ca>
>> Sent: Thursday, October 22, 2020 3:49 AM
>> I've rebased your patch on top of master and made the necessary changes
>> to make it build (the equivalent changes that I did to linux-tdep.c and
>> fbsd-tdep.c).
>>
>> You can find it on the users/simark/arm-none-core-file branch upstream:
>
> Looks great, thanks Simon, I have no futher changes to be made,
> what is next step, are we near for this to being mergable?
> The features regarding eg FreeRTOS could be added later on top of this I guess.
> The format of the corefile right now is exactly as Linux, minus all '*ix' stuff,
> only threads, registers and memory I think. What is next step on this?
On my side, from the comments I gave earlier and other observations:
- there area clearly some unnecessary includes, cut it down to what's
necessary
- don't put things in the header file if they are only used in the
source file (the macros in arm-none-tdep.h, for example)
- none_init_corefile has an unused parameter
- some unnecessary forward declarations here and there
- is the handling of inferior arguments relevant for bare-metal?
- if it works with the GDB simulator (target sim), I'd really like if we
could have a test for this: generate a core, read it back, make sure
you can print stuff
Luis and Alan (both GDB ARM maintainers) also expressed the desire to
have the format documented. Alan suggested a section in the GDB manual,
in the ARM-specific section. I think it is a good idea. This is
important, so we have something to point to when people ask "what format
should I generate so GDB can read it".
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-23 0:37 ` Simon Marchi
@ 2020-10-25 21:06 ` Fredrik Hederstierna
2020-10-26 11:24 ` Luis Machado
2021-06-22 2:16 ` Mike Frysinger
0 siblings, 2 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-25 21:06 UTC (permalink / raw)
To: Simon Marchi, Paul Mathieu; +Cc: gdb-patches
> From: Simon Marchi <simark@simark.ca>
> Sent: Friday, October 23, 2020 2:37 AM
>
> On my side, from the comments I gave earlier and other observations:
>
> - there area clearly some unnecessary includes, cut it down to what's
> necessary
> - don't put things in the header file if they are only used in the
> source file (the macros in arm-none-tdep.h, for example)
> - none_init_corefile has an unused parameter
> - some unnecessary forward declarations here and there
> - is the handling of inferior arguments relevant for bare-metal?
> - if it works with the GDB simulator (target sim), I'd really like if we
> could have a test for this: generate a core, read it back, make sure
> you can print stuff
Thanks for feedback, I think the new [Patch v4] address all your bullets above.
I have tested the patch on ARM simulator in GDB, and it worked,
though some observations:
- The ARM simulator does not support ARM Cortex architecture?
I had to try it out on ARMv4T arch code, though needed to make some patchwork.
- The ARM simulator does enumerate registers differently, and remapping is done,
though if trying to fetch all registers by passing -1, then eg D0-D15 was not handled.
- The ARM simulator expect that target have a stack frame and tried to put that in separate section,
though this needs to be setup, if just running with SP=0, then SP will soon be 0xFFFFFFFxx, and
then when trying to make corefile and stack should be saved, all 0-0xFFFFFFFFF will be saved 4GByte!
Though by explicitly setting SP (either by code or from console) it seems to work.
Cortex handles initial stack pointer differently by having an entry for SP in start vectors table.
This worked for me in the ARM simulator on test application compiled for ARMv4T thumb.
(gdb) target sim
(gdb) load
(gdb) break main
(gdb) run
(gdb) set $sp = 0xFFFFFF
(gdb) cont
<CTRL-C>
(gdb) gcore test.core
Exiting and restarting GDB with elf-file and adding corefile 'test.core', same registers and call-stack could be reviewed, so my simple example worked.
> Luis and Alan (both GDB ARM maintainers) also expressed the desire to
> have the format documented. Alan suggested a section in the GDB manual,
> in the ARM-specific section. I think it is a good idea. This is
> important, so we have something to point to when people ask "what format
> should I generate so GDB can read it".
Yes, it was suggested by someone to adding an arm-none section in "G.5.3 ARM Features".
How to proceed on this? I guess the current design is same as *ix minus all specific *ix parts that could be stripped out from documentation.
Thanks! BR Fredrik
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-25 21:06 ` Fredrik Hederstierna
@ 2020-10-26 11:24 ` Luis Machado
2020-10-26 15:49 ` Fredrik Hederstierna
2021-06-22 2:16 ` Mike Frysinger
1 sibling, 1 reply; 39+ messages in thread
From: Luis Machado @ 2020-10-26 11:24 UTC (permalink / raw)
To: Fredrik Hederstierna, Simon Marchi, Paul Mathieu; +Cc: gdb-patches
On 10/25/20 6:06 PM, Fredrik Hederstierna via Gdb-patches wrote:
>> From: Simon Marchi <simark@simark.ca>
>> Sent: Friday, October 23, 2020 2:37 AM
>>
>> On my side, from the comments I gave earlier and other observations:
>>
>> - there area clearly some unnecessary includes, cut it down to what's
>> necessary
>> - don't put things in the header file if they are only used in the
>> source file (the macros in arm-none-tdep.h, for example)
>> - none_init_corefile has an unused parameter
>> - some unnecessary forward declarations here and there
>> - is the handling of inferior arguments relevant for bare-metal?
>> - if it works with the GDB simulator (target sim), I'd really like if we
>> could have a test for this: generate a core, read it back, make sure
>> you can print stuff
>
> Thanks for feedback, I think the new [Patch v4] address all your bullets above.
>
> I have tested the patch on ARM simulator in GDB, and it worked,
> though some observations:
>
> - The ARM simulator does not support ARM Cortex architecture?
> I had to try it out on ARMv4T arch code, though needed to make some patchwork.
> - The ARM simulator does enumerate registers differently, and remapping is done,
> though if trying to fetch all registers by passing -1, then eg D0-D15 was not handled.
> - The ARM simulator expect that target have a stack frame and tried to put that in separate section,
> though this needs to be setup, if just running with SP=0, then SP will soon be 0xFFFFFFFxx, and
> then when trying to make corefile and stack should be saved, all 0-0xFFFFFFFFF will be saved 4GByte!
> Though by explicitly setting SP (either by code or from console) it seems to work.
> Cortex handles initial stack pointer differently by having an entry for SP in start vectors table.
>
> This worked for me in the ARM simulator on test application compiled for ARMv4T thumb.
>
> (gdb) target sim
> (gdb) load
> (gdb) break main
> (gdb) run
> (gdb) set $sp = 0xFFFFFF
> (gdb) cont
> <CTRL-C>
> (gdb) gcore test.core
>
> Exiting and restarting GDB with elf-file and adding corefile 'test.core', same registers and call-stack could be reviewed, so my simple example worked.
>
>> Luis and Alan (both GDB ARM maintainers) also expressed the desire to
>> have the format documented. Alan suggested a section in the GDB manual,
>> in the ARM-specific section. I think it is a good idea. This is
>> important, so we have something to point to when people ask "what format
>> should I generate so GDB can read it".
>
> Yes, it was suggested by someone to adding an arm-none section in "G.5.3 ARM Features".
> How to proceed on this? I guess the current design is same as *ix minus all specific *ix parts that could be stripped out from documentation.
I recall also suggesting discussing the core file format out in the open
through the gdb@sourcware.org mailing list (here
https://sourceware.org/pipermail/gdb-patches/2020-October/172721.html).
That would make it easier to others interested in this to contribute and
provide their thoughts.
It makes it a bit harder to design things based on patches directly.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-26 11:24 ` Luis Machado
@ 2020-10-26 15:49 ` Fredrik Hederstierna
2020-10-27 16:53 ` Paul Mathieu
0 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-26 15:49 UTC (permalink / raw)
To: Luis Machado, Simon Marchi, Paul Mathieu; +Cc: gdb-patches
> From: Luis Machado <luis.machado@linaro.org>
> Sent: Monday, October 26, 2020 12:24 PM
>
>>> Luis and Alan (both GDB ARM maintainers) also expressed the desire to
>>> have the format documented. Alan suggested a section in the GDB manual,
>>> in the ARM-specific section. I think it is a good idea. This is
>>> important, so we have something to point to when people ask "what format
>>> should I generate so GDB can read it".
>>
>> Yes, it was suggested by someone to adding an arm-none section in "G.5.3 ARM Features".
>> How to proceed on this? I guess the current design is same as *ix minus all specific *ix parts that could be stripped out from documentation.
>
> I recall also suggesting discussing the core file format out in the open
> through the gdb@sourcware.org mailing list (here
> https://urldefense.com/v3/__https://sourceware.org/pipermail/gdb-patches/2020-October/172721.html__;!!BFCLnRDDbM3FOmw!sNi8byoH5SSID20XZ9bMNX2DOjXF4ZJcrHvYbpgAnuXp0WCSVEiMdf2v2kNX1j4uVrbATpFt$ ).
> That would make it easier to others interested in this to contribute and
> provide their thoughts.
>
> It makes it a bit harder to design things based on patches directly.
Yes, agree, re-engineering is not preferred design,
and the Linux format is far more complex that what a none-corefile would need probably.
I tried to strip out everything but 'memory' and 'registers',
so the none corefile should be a regular valid ELF file, with memory and registers only I guess.
I tried to find a good specification/documentation source for corefiles, but it is not very clear where to look...
Found this as a starting point
https://stackoverflow.com/questions/5986366/elf-core-file-format
This is the current format when trying from ARM simulator:
fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
ELF Header:
Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
Class: ELF32
Data: 2's complement, little endian
Version: 1 (current)
OS/ABI: ARM
ABI Version: 0
Type: CORE (Core file)
Machine: ARM
Version: 0x1
Entry point address: 0x0
Start of program headers: 52 (bytes into file)
Start of section headers: 8084 (bytes into file)
Flags: 0x0
Size of this header: 52 (bytes)
Size of program headers: 32 (bytes)
Number of program headers: 5
Size of section headers: 40 (bytes)
Number of section headers: 7
Section header string table index: 6
Section Headers:
[Nr] Name Type Addr Off Size ES Flg Lk Inf Al
[ 0] NULL 00000000 000000 000000 00 0 0 0
[ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
[ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
[ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
[ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
[ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
[ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
Key to Flags:
W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
L (link order), O (extra OS processing required), G (group), T (TLS),
C (compressed), x (unknown), o (OS specific), E (exclude),
y (purecode), p (processor specific)
There are no section groups in this file.
Program Headers:
Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
Section to Segment mapping:
Segment Sections...
00
01 load
02 load
03 load load
04 load
There is no dynamic section in this file.
There are no relocations in this file.
There are no unwind sections in this file.
No version information found in this file.
Displaying notes found at file offset 0x00001e44 with length 0x00000138:
Owner Data size Description
CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
CORE 0x00000094 NT_PRSTATUS (prstatus structure)
/Fredrik
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-26 15:49 ` Fredrik Hederstierna
@ 2020-10-27 16:53 ` Paul Mathieu
2021-01-14 12:36 ` Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Paul Mathieu @ 2020-10-27 16:53 UTC (permalink / raw)
To: Fredrik Hederstierna; +Cc: Luis Machado, Simon Marchi, gdb-patches
Hi Fredrik,
> This is the current format when trying from ARM simulator:
>
> fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
> ELF Header:
> Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
> Class: ELF32
> Data: 2's complement, little endian
> Version: 1 (current)
> OS/ABI: ARM
> ABI Version: 0
> Type: CORE (Core file)
> Machine: ARM
> Version: 0x1
> Entry point address: 0x0
> Start of program headers: 52 (bytes into file)
> Start of section headers: 8084 (bytes into file)
> Flags: 0x0
> Size of this header: 52 (bytes)
> Size of program headers: 32 (bytes)
> Number of program headers: 5
> Size of section headers: 40 (bytes)
> Number of section headers: 7
> Section header string table index: 6
>
> Section Headers:
> [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
> [ 0] NULL 00000000 000000 000000 00 0 0 0
> [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
> [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
> [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
> [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
> [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
> [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
> Key to Flags:
> W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
> L (link order), O (extra OS processing required), G (group), T (TLS),
> C (compressed), x (unknown), o (OS specific), E (exclude),
> y (purecode), p (processor specific)
>
> There are no section groups in this file.
>
> Program Headers:
> Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
> LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
> LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
> LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
> LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
>
> Section to Segment mapping:
> Segment Sections...
> 00
> 01 load
> 02 load
> 03 load load
> 04 load
>
> There is no dynamic section in this file.
> There are no relocations in this file.
> There are no unwind sections in this file.
> No version information found in this file.
>
> Displaying notes found at file offset 0x00001e44 with length 0x00000138:
> Owner Data size Description
> CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
> CORE 0x00000094 NT_PRSTATUS (prstatus structure)
Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
It would be really nice to have `info threads` "just work"
Paul
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-27 16:53 ` Paul Mathieu
@ 2021-01-14 12:36 ` Fredrik Hederstierna
2021-01-14 12:50 ` Luis Machado
2021-01-18 11:01 ` [PATCH] gdb: add support for handling core dumps on arm-none-eabi Andrew Burgess
0 siblings, 2 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2021-01-14 12:36 UTC (permalink / raw)
To: Paul Mathieu; +Cc: Luis Machado, Simon Marchi, gdb-patches
Ping, do anyone have any more input how to proceed on this?
I think I have made what I can do, to the limits of my knowledge and understanding.
I read recently about RISCV now seems to have merged corefile support for their arch?
why can RISCV corefile be merged but not this? I guess ARM-Cortex users is magnitude amount higher and the benefit of this feature is huge.
And it would be really good if synergy could be used to share code, since alot functions I guess are same.
If documentation is the issue, do we have an issue ticket on that?
Can we just merge this patch-v4 and set target GDB-11, and solve the doc-issue-ticket, then we just force ourselves to solve docs before the release,
or how can we 'make it happen'? It seems to be about to fail again if time just goes and none try push it further forward.
Thanks! Kindly,
Fredrik
From: Paul Mathieu <paulmathieu@google.com>
Sent: Tuesday, October 27, 2020 5:53 PM
To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
Cc: Luis Machado <luis.machado@linaro.org>; Simon Marchi <simark@simark.ca>; gdb-patches@sourceware.org <gdb-patches@sourceware.org>
Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
Hi Fredrik,
> This is the current format when trying from ARM simulator:
>
> fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
> ELF Header:
> Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
> Class: ELF32
> Data: 2's complement, little endian
> Version: 1 (current)
> OS/ABI: ARM
> ABI Version: 0
> Type: CORE (Core file)
> Machine: ARM
> Version: 0x1
> Entry point address: 0x0
> Start of program headers: 52 (bytes into file)
> Start of section headers: 8084 (bytes into file)
> Flags: 0x0
> Size of this header: 52 (bytes)
> Size of program headers: 32 (bytes)
> Number of program headers: 5
> Size of section headers: 40 (bytes)
> Number of section headers: 7
> Section header string table index: 6
>
> Section Headers:
> [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
> [ 0] NULL 00000000 000000 000000 00 0 0 0
> [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
> [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
> [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
> [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
> [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
> [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
> Key to Flags:
> W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
> L (link order), O (extra OS processing required), G (group), T (TLS),
> C (compressed), x (unknown), o (OS specific), E (exclude),
> y (purecode), p (processor specific)
>
> There are no section groups in this file.
>
> Program Headers:
> Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
> LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
> LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
> LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
> LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
>
> Section to Segment mapping:
> Segment Sections...
> 00
> 01 load
> 02 load
> 03 load load
> 04 load
>
> There is no dynamic section in this file.
> There are no relocations in this file.
> There are no unwind sections in this file.
> No version information found in this file.
>
> Displaying notes found at file offset 0x00001e44 with length 0x00000138:
> Owner Data size Description
> CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
> CORE 0x00000094 NT_PRSTATUS (prstatus structure)
Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
It would be really nice to have `info threads` "just work"
Paul
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2021-01-14 12:36 ` Fredrik Hederstierna
@ 2021-01-14 12:50 ` Luis Machado
2021-01-18 11:09 ` Andrew Burgess
2021-01-18 11:01 ` [PATCH] gdb: add support for handling core dumps on arm-none-eabi Andrew Burgess
1 sibling, 1 reply; 39+ messages in thread
From: Luis Machado @ 2021-01-14 12:50 UTC (permalink / raw)
To: Fredrik Hederstierna, Paul Mathieu; +Cc: Simon Marchi, gdb-patches
Hi,
On 1/14/21 9:36 AM, Fredrik Hederstierna wrote:
> Ping, do anyone have any more input how to proceed on this?
> I think I have made what I can do, to the limits of my knowledge and understanding.
>
> I read recently about RISCV now seems to have merged corefile support for their arch?
The idea was to establish a common ground that could be used for both
RISCV and ARM, and prevent design issues from getting in the way.
If RISCV bare metal corefile was merged, does that mean we can reuse the
same strategy to pursue bare metal ARM core file support now? And does
that mean we just need to come up with a patch using the same design?
> why can RISCV corefile be merged but not this? I guess ARM-Cortex users is magnitude amount higher and the benefit of this feature is huge.
> And it would be really good if synergy could be used to share code, since alot functions I guess are same.
> If documentation is the issue, do we have an issue ticket on that?
From my end, the acceptance of ARM bare metal core files was dependent
on having a documented design of what the bare metal core files should
look like. Was that documentation included in the RISCV work? If not,
that wasn't the agreement when I send comments to that patch series.
>
> Can we just merge this patch-v4 and set target GDB-11, and solve the doc-issue-ticket, then we just force ourselves to solve docs before the release,
> or how can we 'make it happen'? It seems to be about to fail again if time just goes and none try push it further forward.
I'd love to have such support, but I'm not actively working on it. I can
commit to review the changes and not let it be forgotten, but the
development work must be pursued by someone else.
>
> Thanks! Kindly,
> Fredrik
>
> From: Paul Mathieu <paulmathieu@google.com>
> Sent: Tuesday, October 27, 2020 5:53 PM
> To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
> Cc: Luis Machado <luis.machado@linaro.org>; Simon Marchi <simark@simark.ca>; gdb-patches@sourceware.org <gdb-patches@sourceware.org>
> Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
>
> Hi Fredrik,
>
>> This is the current format when trying from ARM simulator:
>>
>> fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
>> ELF Header:
>> Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
>> Class: ELF32
>> Data: 2's complement, little endian
>> Version: 1 (current)
>> OS/ABI: ARM
>> ABI Version: 0
>> Type: CORE (Core file)
>> Machine: ARM
>> Version: 0x1
>> Entry point address: 0x0
>> Start of program headers: 52 (bytes into file)
>> Start of section headers: 8084 (bytes into file)
>> Flags: 0x0
>> Size of this header: 52 (bytes)
>> Size of program headers: 32 (bytes)
>> Number of program headers: 5
>> Size of section headers: 40 (bytes)
>> Number of section headers: 7
>> Section header string table index: 6
>>
>> Section Headers:
>> [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
>> [ 0] NULL 00000000 000000 000000 00 0 0 0
>> [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
>> [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
>> [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
>> [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
>> [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
>> [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
>> Key to Flags:
>> W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
>> L (link order), O (extra OS processing required), G (group), T (TLS),
>> C (compressed), x (unknown), o (OS specific), E (exclude),
>> y (purecode), p (processor specific)
>>
>> There are no section groups in this file.
>>
>> Program Headers:
>> Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
>> NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
>> LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
>> LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
>> LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
>> LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
>>
>> Section to Segment mapping:
>> Segment Sections...
>> 00
>> 01 load
>> 02 load
>> 03 load load
>> 04 load
>>
>> There is no dynamic section in this file.
>> There are no relocations in this file.
>> There are no unwind sections in this file.
>> No version information found in this file.
>>
>> Displaying notes found at file offset 0x00001e44 with length 0x00000138:
>> Owner Data size Description
>> CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
>> CORE 0x00000094 NT_PRSTATUS (prstatus structure)
>
> Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
> It would be really nice to have `info threads` "just work"
>
> Paul
>
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2021-01-14 12:50 ` Luis Machado
@ 2021-01-18 11:09 ` Andrew Burgess
2021-01-18 14:01 ` Luis Machado
0 siblings, 1 reply; 39+ messages in thread
From: Andrew Burgess @ 2021-01-18 11:09 UTC (permalink / raw)
To: Luis Machado
Cc: Fredrik Hederstierna, Paul Mathieu, Simon Marchi, gdb-patches
* Luis Machado via Gdb-patches <gdb-patches@sourceware.org> [2021-01-14 09:50:42 -0300]:
> Hi,
>
> On 1/14/21 9:36 AM, Fredrik Hederstierna wrote:
> > Ping, do anyone have any more input how to proceed on this?
> > I think I have made what I can do, to the limits of my knowledge and understanding.
> >
> > I read recently about RISCV now seems to have merged corefile support for their arch?
>
> The idea was to establish a common ground that could be used for both RISCV
> and ARM, and prevent design issues from getting in the way.
>
> If RISCV bare metal corefile was merged, does that mean we can reuse the
> same strategy to pursue bare metal ARM core file support now? And does that
> mean we just need to come up with a patch using the same design?
We covered most of this ground in the discussion on the RISC-V patch,
but if we assume that the plan is ELF + NOTES then most of the
"design" is actually dictated by GDB and BFD already. All we actually
end up providing on the GDB side is glue to funnel the GDB state over
to BFD.
Most of the work is in laying out the registers, something which is (I
hope we can agree) something that is target specific.
My goal for this week is to get an updated revision of the RISC-V bare
metal patches on to the list, with as much code as possible moved into
a common file. Honestly, I don't think there's going to be a huge
amount of reuse, but I'll do as much as I can.
The ARM patch that was proposed was already ELF + NOTES, and already
had some code in a common file. So I'll probably borrow some of that.
>
> > why can RISCV corefile be merged but not this? I guess ARM-Cortex users is magnitude amount higher and the benefit of this feature is huge.
> > And it would be really good if synergy could be used to share code, since alot functions I guess are same.
> > If documentation is the issue, do we have an issue ticket on that?
>
> From my end, the acceptance of ARM bare metal core files was dependent on
> having a documented design of what the bare metal core files should look
> like. Was that documentation included in the RISCV work? If not, that wasn't
> the agreement when I send comments to that patch series.
The RISC-V work has not been merged, and writing some documentation is
also on my goal list for this week.
I take all feedback I get on this list seriously, and though mistakes
can happen, I'll not going to merge a patch without fixing the review
issues, at least not without having a good discussion with the
reviewer first.
Thanks,
Andrew
>
> >
> > Can we just merge this patch-v4 and set target GDB-11, and solve the doc-issue-ticket, then we just force ourselves to solve docs before the release,
> > or how can we 'make it happen'? It seems to be about to fail again if time just goes and none try push it further forward.
>
> I'd love to have such support, but I'm not actively working on it. I can
> commit to review the changes and not let it be forgotten, but the
> development work must be pursued by someone else.
>
> >
> > Thanks! Kindly,
> > Fredrik
> >
> > From: Paul Mathieu <paulmathieu@google.com>
> > Sent: Tuesday, October 27, 2020 5:53 PM
> > To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
> > Cc: Luis Machado <luis.machado@linaro.org>; Simon Marchi <simark@simark.ca>; gdb-patches@sourceware.org <gdb-patches@sourceware.org>
> > Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
> > Hi Fredrik,
> >
> > > This is the current format when trying from ARM simulator:
> > >
> > > fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
> > > ELF Header:
> > > Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
> > > Class: ELF32
> > > Data: 2's complement, little endian
> > > Version: 1 (current)
> > > OS/ABI: ARM
> > > ABI Version: 0
> > > Type: CORE (Core file)
> > > Machine: ARM
> > > Version: 0x1
> > > Entry point address: 0x0
> > > Start of program headers: 52 (bytes into file)
> > > Start of section headers: 8084 (bytes into file)
> > > Flags: 0x0
> > > Size of this header: 52 (bytes)
> > > Size of program headers: 32 (bytes)
> > > Number of program headers: 5
> > > Size of section headers: 40 (bytes)
> > > Number of section headers: 7
> > > Section header string table index: 6
> > >
> > > Section Headers:
> > > [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
> > > [ 0] NULL 00000000 000000 000000 00 0 0 0
> > > [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
> > > [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
> > > [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
> > > [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
> > > [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
> > > [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
> > > Key to Flags:
> > > W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
> > > L (link order), O (extra OS processing required), G (group), T (TLS),
> > > C (compressed), x (unknown), o (OS specific), E (exclude),
> > > y (purecode), p (processor specific)
> > >
> > > There are no section groups in this file.
> > >
> > > Program Headers:
> > > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> > > NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
> > > LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
> > > LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
> > > LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
> > > LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
> > >
> > > Section to Segment mapping:
> > > Segment Sections...
> > > 00
> > > 01 load
> > > 02 load
> > > 03 load load
> > > 04 load
> > >
> > > There is no dynamic section in this file.
> > > There are no relocations in this file.
> > > There are no unwind sections in this file.
> > > No version information found in this file.
> > >
> > > Displaying notes found at file offset 0x00001e44 with length 0x00000138:
> > > Owner Data size Description
> > > CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
> > > CORE 0x00000094 NT_PRSTATUS (prstatus structure)
> >
> > Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
> > It would be really nice to have `info threads` "just work"
> >
> > Paul
> >
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2021-01-18 11:09 ` Andrew Burgess
@ 2021-01-18 14:01 ` Luis Machado
2021-06-21 6:30 ` [PATCH] sim: arm: add support for handling core dumps Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Luis Machado @ 2021-01-18 14:01 UTC (permalink / raw)
To: Andrew Burgess
Cc: Fredrik Hederstierna, Paul Mathieu, Simon Marchi, gdb-patches
Hi Andrew,
On 1/18/21 8:09 AM, Andrew Burgess wrote:
> * Luis Machado via Gdb-patches <gdb-patches@sourceware.org> [2021-01-14 09:50:42 -0300]:
>
>> Hi,
>>
>> On 1/14/21 9:36 AM, Fredrik Hederstierna wrote:
>>> Ping, do anyone have any more input how to proceed on this?
>>> I think I have made what I can do, to the limits of my knowledge and understanding.
>>>
>>> I read recently about RISCV now seems to have merged corefile support for their arch?
>>
>> The idea was to establish a common ground that could be used for both RISCV
>> and ARM, and prevent design issues from getting in the way.
>>
>> If RISCV bare metal corefile was merged, does that mean we can reuse the
>> same strategy to pursue bare metal ARM core file support now? And does that
>> mean we just need to come up with a patch using the same design?
>
> We covered most of this ground in the discussion on the RISC-V patch,
> but if we assume that the plan is ELF + NOTES then most of the
> "design" is actually dictated by GDB and BFD already. All we actually
> end up providing on the GDB side is glue to funnel the GDB state over
> to BFD.
>
> Most of the work is in laying out the registers, something which is (I
> hope we can agree) something that is target specific.
>
> My goal for this week is to get an updated revision of the RISC-V bare
> metal patches on to the list, with as much code as possible moved into
> a common file. Honestly, I don't think there's going to be a huge
> amount of reuse, but I'll do as much as I can.
I'm sure you will. I can write some documentation based on my
understanding so far. Maybe that will be a good start and then folks can
add to it.
>
> The ARM patch that was proposed was already ELF + NOTES, and already
> had some code in a common file. So I'll probably borrow some of that.
>
>>
>>> why can RISCV corefile be merged but not this? I guess ARM-Cortex users is magnitude amount higher and the benefit of this feature is huge.
>>> And it would be really good if synergy could be used to share code, since alot functions I guess are same.
>>> If documentation is the issue, do we have an issue ticket on that?
>>
>> From my end, the acceptance of ARM bare metal core files was dependent on
>> having a documented design of what the bare metal core files should look
>> like. Was that documentation included in the RISCV work? If not, that wasn't
>> the agreement when I send comments to that patch series.
>
> The RISC-V work has not been merged, and writing some documentation is
> also on my goal list for this week.
That's what I noticed when I went looking for the commits. I think there
was a misunderstanding.
>
> I take all feedback I get on this list seriously, and though mistakes
> can happen, I'll not going to merge a patch without fixing the review
> issues, at least not without having a good discussion with the
> reviewer first.
No doubt about that, really. I think there was some expectation that
merging changes into GDB was quicker than it really is in practice.
>
> Thanks,
> Andrew
>
>>
>>>
>>> Can we just merge this patch-v4 and set target GDB-11, and solve the doc-issue-ticket, then we just force ourselves to solve docs before the release,
>>> or how can we 'make it happen'? It seems to be about to fail again if time just goes and none try push it further forward.
>>
>> I'd love to have such support, but I'm not actively working on it. I can
>> commit to review the changes and not let it be forgotten, but the
>> development work must be pursued by someone else.
>
>
>
>>
>>>
>>> Thanks! Kindly,
>>> Fredrik
>>>
>>> From: Paul Mathieu <paulmathieu@google.com>
>>> Sent: Tuesday, October 27, 2020 5:53 PM
>>> To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
>>> Cc: Luis Machado <luis.machado@linaro.org>; Simon Marchi <simark@simark.ca>; gdb-patches@sourceware.org <gdb-patches@sourceware.org>
>>> Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
>>> Hi Fredrik,
>>>
>>>> This is the current format when trying from ARM simulator:
>>>>
>>>> fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
>>>> ELF Header:
>>>> Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
>>>> Class: ELF32
>>>> Data: 2's complement, little endian
>>>> Version: 1 (current)
>>>> OS/ABI: ARM
>>>> ABI Version: 0
>>>> Type: CORE (Core file)
>>>> Machine: ARM
>>>> Version: 0x1
>>>> Entry point address: 0x0
>>>> Start of program headers: 52 (bytes into file)
>>>> Start of section headers: 8084 (bytes into file)
>>>> Flags: 0x0
>>>> Size of this header: 52 (bytes)
>>>> Size of program headers: 32 (bytes)
>>>> Number of program headers: 5
>>>> Size of section headers: 40 (bytes)
>>>> Number of section headers: 7
>>>> Section header string table index: 6
>>>>
>>>> Section Headers:
>>>> [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
>>>> [ 0] NULL 00000000 000000 000000 00 0 0 0
>>>> [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
>>>> [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
>>>> [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
>>>> [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
>>>> [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
>>>> [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
>>>> Key to Flags:
>>>> W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
>>>> L (link order), O (extra OS processing required), G (group), T (TLS),
>>>> C (compressed), x (unknown), o (OS specific), E (exclude),
>>>> y (purecode), p (processor specific)
>>>>
>>>> There are no section groups in this file.
>>>>
>>>> Program Headers:
>>>> Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
>>>> NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
>>>> LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
>>>> LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
>>>> LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
>>>> LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
>>>>
>>>> Section to Segment mapping:
>>>> Segment Sections...
>>>> 00
>>>> 01 load
>>>> 02 load
>>>> 03 load load
>>>> 04 load
>>>>
>>>> There is no dynamic section in this file.
>>>> There are no relocations in this file.
>>>> There are no unwind sections in this file.
>>>> No version information found in this file.
>>>>
>>>> Displaying notes found at file offset 0x00001e44 with length 0x00000138:
>>>> Owner Data size Description
>>>> CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
>>>> CORE 0x00000094 NT_PRSTATUS (prstatus structure)
>>>
>>> Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
>>> It would be really nice to have `info threads` "just work"
>>>
>>> Paul
>>>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH] sim: arm: add support for handling core dumps
2021-01-18 14:01 ` Luis Machado
@ 2021-06-21 6:30 ` Fredrik Hederstierna
2021-06-22 3:20 ` Mike Frysinger
0 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2021-06-21 6:30 UTC (permalink / raw)
To: Luis Machado, Andrew Burgess; +Cc: Paul Mathieu, Simon Marchi, gdb-patches
The ARM simulator does not support all registers, and also crash in case of entering zero length when fetching registers.
This patch allow gcore to also work in ARM simulator, though by default it seems to dump full memory space 4GB, so core files get very large, though seems to work ok anyhow.
BR Fredrik
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 857a52a9a51..2820e456cf7 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -4246,6 +4246,10 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
+ /* The current GDB ARM simulator does not support D0-D31 nor FPSCR. */
+ if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
+ return -1;
+
if (reg < NUM_GREGS)
return SIM_ARM_R0_REGNUM + reg;
reg -= NUM_GREGS;
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index e697d55a6b5..2a8a539b939 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -526,6 +526,10 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
init ();
+ /* Check that memory and length are valid before fetching the register. */
+ if ((memory == NULL) || (length == 0))
+ return 0;
+
switch ((enum sim_arm_regs) rn)
{
case SIM_ARM_R0_REGNUM:
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH] sim: arm: add support for handling core dumps
2021-06-21 6:30 ` [PATCH] sim: arm: add support for handling core dumps Fredrik Hederstierna
@ 2021-06-22 3:20 ` Mike Frysinger
2021-06-24 13:01 ` Alan Hayward
0 siblings, 1 reply; 39+ messages in thread
From: Mike Frysinger @ 2021-06-22 3:20 UTC (permalink / raw)
To: Fredrik Hederstierna
Cc: Luis Machado, Andrew Burgess, Simon Marchi, gdb-patches, Paul Mathieu
On 21 Jun 2021 06:30, Fredrik Hederstierna via Gdb-patches wrote:
> The ARM simulator does not support all registers, and also crash in case of entering zero length when fetching registers.
> This patch allow gcore to also work in ARM simulator, though by default it seems to dump full memory space 4GB, so core files get very large, though seems to work ok anyhow.
dumping the entire address space doesn't sound unreasonable for bare metal env.
you have an ELF which will tell you the memory regions it occupies directly,
but there's no API i'm aware of to communicate things like stack & heap.
that said, the arm sim has some non-ideal behavior. it allocates 2MiB by
default, but after that, access to anywhere in the 4GiB address space will
automatically allocate a page if one hasn't yet. if someone gets around to
gutting arm's custom memory implementation and switching it to the common
sim memory core, this would get fixed in the process ...
> --- a/gdb/arm-tdep.c
> +++ b/gdb/arm-tdep.c
> @@ -4246,6 +4246,10 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
> if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
> return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
>
> + /* The current GDB ARM simulator does not support D0-D31 nor FPSCR. */
> + if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
> + return -1;
> +
> if (reg < NUM_GREGS)
> return SIM_ARM_R0_REGNUM + reg;
> reg -= NUM_GREGS;
shouldn't this check be at the end of arm_register_sim_regno instead of
calling internal error ?
> --- a/sim/arm/wrapper.c
> +++ b/sim/arm/wrapper.c
> @@ -526,6 +526,10 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
>
> init ();
>
> + /* Check that memory and length are valid before fetching the register. */
> + if ((memory == NULL) || (length == 0))
> + return 0;
why is the caller passing NULL to the sim ?
-mike
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] sim: arm: add support for handling core dumps
2021-06-22 3:20 ` Mike Frysinger
@ 2021-06-24 13:01 ` Alan Hayward
2021-06-29 9:11 ` Fredrik Hederstierna
0 siblings, 1 reply; 39+ messages in thread
From: Alan Hayward @ 2021-06-24 13:01 UTC (permalink / raw)
To: Mike Frysinger
Cc: Fredrik Hederstierna, Simon Marchi, gdb-patches, Paul Mathieu
> On 22 Jun 2021, at 04:20, Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> wrote:
>
> On 21 Jun 2021 06:30, Fredrik Hederstierna via Gdb-patches wrote:
>> The ARM simulator does not support all registers, and also crash in case of entering zero length when fetching registers.
>> This patch allow gcore to also work in ARM simulator, though by default it seems to dump full memory space 4GB, so core files get very large, though seems to work ok anyhow.
>
> dumping the entire address space doesn't sound unreasonable for bare metal env.
> you have an ELF which will tell you the memory regions it occupies directly,
> but there's no API i'm aware of to communicate things like stack & heap.
>
> that said, the arm sim has some non-ideal behavior. it allocates 2MiB by
> default, but after that, access to anywhere in the 4GiB address space will
> automatically allocate a page if one hasn't yet. if someone gets around to
> gutting arm's custom memory implementation and switching it to the common
> sim memory core, this would get fixed in the process ...
>
>> --- a/gdb/arm-tdep.c
>> +++ b/gdb/arm-tdep.c
>> @@ -4246,6 +4246,10 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
>> if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
>> return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
>>
>> + /* The current GDB ARM simulator does not support D0-D31 nor FPSCR. */
>> + if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
>> + return -1;
>> +
>> if (reg < NUM_GREGS)
>> return SIM_ARM_R0_REGNUM + reg;
>> reg -= NUM_GREGS;
>
> shouldn't this check be at the end of arm_register_sim_regno instead of
> calling internal error ?
I’m not familiar with the sim, so Im going to assume the comment statement is correct.
With the added code, it means the "if (reg < NUM_FREGS)” and "if (reg < NUM_SREGS)” statements can never be hit.
So, it’s probably worth removing those.
Agree with Mike’s comment - the internal_error at the end of the function needs dropping too. The caller handles the bad value.
>> --- a/sim/arm/wrapper.c
>> +++ b/sim/arm/wrapper.c
>> @@ -526,6 +526,10 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
>>
>> init ();
>>
>> + /* Check that memory and length are valid before fetching the register. */
>> + if ((memory == NULL) || (length == 0))
>> + return 0;
>
> why is the caller passing NULL to the sim ?
> -mike
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] sim: arm: add support for handling core dumps
2021-06-24 13:01 ` Alan Hayward
@ 2021-06-29 9:11 ` Fredrik Hederstierna
0 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2021-06-29 9:11 UTC (permalink / raw)
To: Alan Hayward, Mike Frysinger; +Cc: Simon Marchi, gdb-patches, Paul Mathieu
I reviewed comments and decided to make a complete retake on this.
Here is a patch that adds IDs for D0-D31, then let any calling ARM simulator implementation handle the results.
I tested 'gcore' on target sim for ARM on this, and it worked well on my tests.
I also understood better why I got these 4GB corefiles, since I did not set SP (ARM simulator is not supporting Cortex),
so as SP was 0, then after some calls, the SP was like 0xFFFFFFxx, so stack was like 4GB up in memory space.
When I added code lines at start to set SP to a lower address, the corefile was getting smaller correct size.
BR Fredrik
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 857a52a9a51..2593d89269f 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -4246,6 +4246,9 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
+ if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
+ return regnum - ARM_D0_REGNUM + SIM_ARM_D0_REGNUM;
+
if (reg < NUM_GREGS)
return SIM_ARM_R0_REGNUM + reg;
reg -= NUM_GREGS;
diff --git a/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
index 8aafa045a0e..28d336be525 100644
--- a/include/gdb/sim-arm.h
+++ b/include/gdb/sim-arm.h
@@ -98,7 +98,41 @@ enum sim_arm_regs
SIM_ARM_IWMMXT_COP1R12_REGNUM,
SIM_ARM_IWMMXT_COP1R13_REGNUM,
SIM_ARM_IWMMXT_COP1R14_REGNUM,
- SIM_ARM_IWMMXT_COP1R15_REGNUM
+ SIM_ARM_IWMMXT_COP1R15_REGNUM,
+ SIM_ARM_D0_REGNUM,
+ SIM_ARM_D1_REGNUM,
+ SIM_ARM_D2_REGNUM,
+ SIM_ARM_D3_REGNUM,
+ SIM_ARM_D4_REGNUM,
+ SIM_ARM_D5_REGNUM,
+ SIM_ARM_D6_REGNUM,
+ SIM_ARM_D7_REGNUM,
+ SIM_ARM_D8_REGNUM,
+ SIM_ARM_D9_REGNUM,
+ SIM_ARM_D10_REGNUM,
+ SIM_ARM_D11_REGNUM,
+ SIM_ARM_D12_REGNUM,
+ SIM_ARM_D13_REGNUM,
+ SIM_ARM_D14_REGNUM,
+ SIM_ARM_D15_REGNUM,
+ SIM_ARM_D16_REGNUM,
+ SIM_ARM_D17_REGNUM,
+ SIM_ARM_D18_REGNUM,
+ SIM_ARM_D19_REGNUM,
+ SIM_ARM_D20_REGNUM,
+ SIM_ARM_D21_REGNUM,
+ SIM_ARM_D22_REGNUM,
+ SIM_ARM_D23_REGNUM,
+ SIM_ARM_D24_REGNUM,
+ SIM_ARM_D25_REGNUM,
+ SIM_ARM_D26_REGNUM,
+ SIM_ARM_D27_REGNUM,
+ SIM_ARM_D28_REGNUM,
+ SIM_ARM_D29_REGNUM,
+ SIM_ARM_D30_REGNUM,
+ SIM_ARM_D31_REGNUM,
+ SIM_ARM_FPSCR_REGNUM,
+ SIM_ARM_NUM_REGS
};
#endif
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index e697d55a6b5..69c5905b1ff 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -418,6 +418,12 @@ arm_reg_store (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
{
init ();
+ if (rn >= SIM_ARM_NUM_REGS)
+ {
+ sim_io_eprintf (CPU_STATE (cpu), "Invalid register %d (register store ignored)\n", rn);
+ return 0;
+ }
+
switch ((enum sim_arm_regs) rn)
{
case SIM_ARM_R0_REGNUM:
@@ -509,7 +515,47 @@ arm_reg_store (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
case SIM_ARM_IWMMXT_COP1R13_REGNUM:
case SIM_ARM_IWMMXT_COP1R14_REGNUM:
case SIM_ARM_IWMMXT_COP1R15_REGNUM:
- return Store_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
+ if (state->is_iWMMXt)
+ {
+ return Store_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
+ }
+ return 0;
+
+ case SIM_ARM_D0_REGNUM:
+ case SIM_ARM_D1_REGNUM:
+ case SIM_ARM_D2_REGNUM:
+ case SIM_ARM_D3_REGNUM:
+ case SIM_ARM_D4_REGNUM:
+ case SIM_ARM_D5_REGNUM:
+ case SIM_ARM_D6_REGNUM:
+ case SIM_ARM_D7_REGNUM:
+ case SIM_ARM_D8_REGNUM:
+ case SIM_ARM_D9_REGNUM:
+ case SIM_ARM_D10_REGNUM:
+ case SIM_ARM_D11_REGNUM:
+ case SIM_ARM_D12_REGNUM:
+ case SIM_ARM_D13_REGNUM:
+ case SIM_ARM_D14_REGNUM:
+ case SIM_ARM_D15_REGNUM:
+ case SIM_ARM_D16_REGNUM:
+ case SIM_ARM_D17_REGNUM:
+ case SIM_ARM_D18_REGNUM:
+ case SIM_ARM_D19_REGNUM:
+ case SIM_ARM_D20_REGNUM:
+ case SIM_ARM_D21_REGNUM:
+ case SIM_ARM_D22_REGNUM:
+ case SIM_ARM_D23_REGNUM:
+ case SIM_ARM_D24_REGNUM:
+ case SIM_ARM_D25_REGNUM:
+ case SIM_ARM_D26_REGNUM:
+ case SIM_ARM_D27_REGNUM:
+ case SIM_ARM_D28_REGNUM:
+ case SIM_ARM_D29_REGNUM:
+ case SIM_ARM_D30_REGNUM:
+ case SIM_ARM_D31_REGNUM:
+ case SIM_ARM_FPSCR_REGNUM:
+ /* The current GDB ARM simulator does not support D0-D31 nor FPSCR. */
+ return 0;
default:
return 0;
@@ -526,6 +572,12 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
init ();
+ if (rn >= SIM_ARM_NUM_REGS)
+ {
+ sim_io_eprintf (CPU_STATE (cpu), "Invalid register %d (register fetch ignored)\n", rn);
+ return 0;
+ }
+
switch ((enum sim_arm_regs) rn)
{
case SIM_ARM_R0_REGNUM:
@@ -619,7 +671,47 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
case SIM_ARM_IWMMXT_COP1R13_REGNUM:
case SIM_ARM_IWMMXT_COP1R14_REGNUM:
case SIM_ARM_IWMMXT_COP1R15_REGNUM:
- return Fetch_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
+ if (state->is_iWMMXt)
+ {
+ return Fetch_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
+ }
+ return 0;
+
+ case SIM_ARM_D0_REGNUM:
+ case SIM_ARM_D1_REGNUM:
+ case SIM_ARM_D2_REGNUM:
+ case SIM_ARM_D3_REGNUM:
+ case SIM_ARM_D4_REGNUM:
+ case SIM_ARM_D5_REGNUM:
+ case SIM_ARM_D6_REGNUM:
+ case SIM_ARM_D7_REGNUM:
+ case SIM_ARM_D8_REGNUM:
+ case SIM_ARM_D9_REGNUM:
+ case SIM_ARM_D10_REGNUM:
+ case SIM_ARM_D11_REGNUM:
+ case SIM_ARM_D12_REGNUM:
+ case SIM_ARM_D13_REGNUM:
+ case SIM_ARM_D14_REGNUM:
+ case SIM_ARM_D15_REGNUM:
+ case SIM_ARM_D16_REGNUM:
+ case SIM_ARM_D17_REGNUM:
+ case SIM_ARM_D18_REGNUM:
+ case SIM_ARM_D19_REGNUM:
+ case SIM_ARM_D20_REGNUM:
+ case SIM_ARM_D21_REGNUM:
+ case SIM_ARM_D22_REGNUM:
+ case SIM_ARM_D23_REGNUM:
+ case SIM_ARM_D24_REGNUM:
+ case SIM_ARM_D25_REGNUM:
+ case SIM_ARM_D26_REGNUM:
+ case SIM_ARM_D27_REGNUM:
+ case SIM_ARM_D28_REGNUM:
+ case SIM_ARM_D29_REGNUM:
+ case SIM_ARM_D30_REGNUM:
+ case SIM_ARM_D31_REGNUM:
+ case SIM_ARM_FPSCR_REGNUM:
+ /* The current GDB ARM simulator does not support D0-D31 nor FPSCR. */
+ return 0;
default:
return 0;
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2021-01-14 12:36 ` Fredrik Hederstierna
2021-01-14 12:50 ` Luis Machado
@ 2021-01-18 11:01 ` Andrew Burgess
1 sibling, 0 replies; 39+ messages in thread
From: Andrew Burgess @ 2021-01-18 11:01 UTC (permalink / raw)
To: Fredrik Hederstierna; +Cc: Paul Mathieu, Simon Marchi, gdb-patches
* Fredrik Hederstierna via Gdb-patches <gdb-patches@sourceware.org> [2021-01-14 12:36:35 +0000]:
> Ping, do anyone have any more input how to proceed on this?
> I think I have made what I can do, to the limits of my knowledge and understanding.
>
> I read recently about RISCV now seems to have merged corefile
> support for their arch?
This is not correct, I posted some patches for RISC-V bare metal core
file support here:
https://sourceware.org/pipermail/gdb-patches/2020-December/173714.html
They have not yet been merged.
> why can RISCV corefile be merged but not this? I guess ARM-Cortex
> users is magnitude amount higher and the benefit of this feature is
> huge.
Patches are not merged based on the popularity of a target, but on the
commitment of an engineer to see the patch merged. You need to follow
up to review comments and convince other members of the list that the
patch is worth adding to GDB.
> And it would be really good if synergy could be used to share code,
> since alot functions I guess are same.
That requires people to do the work, right?
> If documentation is the issue, do we have an issue ticket on that?
You're welcome to create one. Luis has made it clear he's going to
object to the patch until he sees some documentation. If you want to
get your patch merged you either need to write the documentation,
convince someone else to write it, or convince Luis to drop that
requirement. If you think having a ticket will help with any of the
above steps, then go for it. But creating a ticket in itself doesn't
get the docs written.
>
> Can we just merge this patch-v4 and set target GDB-11, and solve the
> doc-issue-ticket, then we just force ourselves to solve docs before
> the release, or how can we 'make it happen'?
The problem is nobody really wants to write documentation, so if we do
things that way, there's a pretty good chance the docs wont get
written. Then either we (a) leave the feature in with no docs, or (b)
rip the feature out just to make some kind of point.
I think we should just decide up front if we are happy for it to be
undocumented, or write the docs.
> It seems to be about to
> fail again if time just goes and none try push it further forward.
GDB is maintained with volunteer effort. Nothing happens unless
someone wants to it happen. So don't think of it as "failing",
instead think that if the patch stalls its simply a reflection that
demand for this feature is actually pretty low.
Thanks,
Andrew
>
> Thanks! Kindly,
> Fredrik
>
> From: Paul Mathieu <paulmathieu@google.com>
> Sent: Tuesday, October 27, 2020 5:53 PM
> To: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
> Cc: Luis Machado <luis.machado@linaro.org>; Simon Marchi <simark@simark.ca>; gdb-patches@sourceware.org <gdb-patches@sourceware.org>
> Subject: Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
>
> Hi Fredrik,
>
> > This is the current format when trying from ARM simulator:
> >
> > fredrik@legion ~/src/armv4t_coretest$ readelf -aA test.core
> > ELF Header:
> > Magic: 7f 45 4c 46 01 01 01 61 00 00 00 00 00 00 00 00
> > Class: ELF32
> > Data: 2's complement, little endian
> > Version: 1 (current)
> > OS/ABI: ARM
> > ABI Version: 0
> > Type: CORE (Core file)
> > Machine: ARM
> > Version: 0x1
> > Entry point address: 0x0
> > Start of program headers: 52 (bytes into file)
> > Start of section headers: 8084 (bytes into file)
> > Flags: 0x0
> > Size of this header: 52 (bytes)
> > Size of program headers: 32 (bytes)
> > Number of program headers: 5
> > Size of section headers: 40 (bytes)
> > Number of section headers: 7
> > Section header string table index: 6
> >
> > Section Headers:
> > [Nr] Name Type Addr Off Size ES Flg Lk Inf Al
> > [ 0] NULL 00000000 000000 000000 00 0 0 0
> > [ 1] note0 NOTE 00000000 001e44 000138 00 A 0 0 1
> > [ 2] load PROGBITS 00010000 0000d4 000100 00 AX 0 0 1
> > [ 3] load PROGBITS 00080000 0001d4 000000 00 WA 0 0 1
> > [ 4] load PROGBITS 00080000 0001d4 000400 00 WA 0 0 1
> > [ 5] load PROGBITS 000fe790 0005d4 001870 00 WA 0 0 1
> > [ 6] .shstrtab STRTAB 00000000 001f7c 000016 00 0 0 1
> > Key to Flags:
> > W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
> > L (link order), O (extra OS processing required), G (group), T (TLS),
> > C (compressed), x (unknown), o (OS specific), E (exclude),
> > y (purecode), p (processor specific)
> >
> > There are no section groups in this file.
> >
> > Program Headers:
> > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> > NOTE 0x001e44 0x00000000 0x00000000 0x00138 0x00000 R 0x1
> > LOAD 0x0000d4 0x00010000 0x00000000 0x00100 0x00100 R E 0x1
> > LOAD 0x0001d4 0x00080000 0x00000000 0x00000 0x00000 RW 0x1
> > LOAD 0x0001d4 0x00080000 0x00000000 0x00400 0x00400 RW 0x1
> > LOAD 0x0005d4 0x000fe790 0x00000000 0x01870 0x01870 RW 0x1
> >
> > Section to Segment mapping:
> > Segment Sections...
> > 00
> > 01 load
> > 02 load
> > 03 load load
> > 04 load
> >
> > There is no dynamic section in this file.
> > There are no relocations in this file.
> > There are no unwind sections in this file.
> > No version information found in this file.
> >
> > Displaying notes found at file offset 0x00001e44 with length 0x00000138:
> > Owner Data size Description
> > CORE 0x0000007c NT_PRPSINFO (prpsinfo structure)
> > CORE 0x00000094 NT_PRSTATUS (prstatus structure)
>
> Does this support `.reg/xxx` notes for RTOS that support multiple tasks?
> It would be really nice to have `info threads` "just work"
>
> Paul
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH] gdb: add support for handling core dumps on arm-none-eabi
2020-10-25 21:06 ` Fredrik Hederstierna
2020-10-26 11:24 ` Luis Machado
@ 2021-06-22 2:16 ` Mike Frysinger
1 sibling, 0 replies; 39+ messages in thread
From: Mike Frysinger @ 2021-06-22 2:16 UTC (permalink / raw)
To: Fredrik Hederstierna; +Cc: Simon Marchi, Paul Mathieu, gdb-patches
On 25 Oct 2020 21:06, Fredrik Hederstierna via Gdb-patches wrote:
> From: Simon Marchi <simark@simark.ca>
> > Luis and Alan (both GDB ARM maintainers) also expressed the desire to
> > have the format documented. Alan suggested a section in the GDB manual,
> > in the ARM-specific section. I think it is a good idea. This is
> > important, so we have something to point to when people ask "what format
> > should I generate so GDB can read it".
>
> Yes, it was suggested by someone to adding an arm-none section in "G.5.3 ARM Features".
> How to proceed on this? I guess the current design is same as *ix minus all specific *ix parts that could be stripped out from documentation.
good use for the wiki ?
-mike
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH] gdb: Support corefiles for arm-none-eabi
2020-10-20 11:41 ` Fredrik Hederstierna
2020-10-20 12:39 ` Simon Marchi
@ 2020-10-20 19:34 ` Fredrik Hederstierna
2020-10-20 21:49 ` Fredrik Hederstierna
` (4 subsequent siblings)
6 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-20 19:34 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: Fredrik Hederstierna
From: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
---
gdb/arm-none-tdep.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 60 ++++++++
gdb/arm-tdep.c | 8 +
gdb/configure.tgt | 6 +-
gdb/none-tdep.c | 231 +++++++++++++++++++++++++++
gdb/none-tdep.h | 39 +++++
6 files changed, 711 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..9d83a8b913
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,368 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
+#include "breakpoint.h"
+#include "auxv.h"
+
+#include "aarch32-tdep.h"
+#include "arch/arm.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+
+#include "elf/common.h"
+
+/* ---- based on arm-linux-tdep.h ---- */
+
+#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
+ + 2 * ARM_INT_REGISTER_SIZE \
+ + 8 + ARM_INT_REGISTER_SIZE)
+
+/* The index to access CSPR in user_regs defined in GLIBC. */
+#define ARM_CPSR_GREGNUM 16
+
+/* Support for register format used by the NWFPE FPA emulator. Each
+ register takes three words, where either the first one, two, or
+ three hold a single, double, or extended precision value (depending
+ on the corresponding tag). The register set is eight registers,
+ followed by the fpsr and fpcr, followed by eight tag bytes, and a
+ final word flag which indicates whether NWFPE has been
+ initialized. */
+
+#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
+#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
+
+/* Reuse ARM GNU/Linux HWCAP values for none. These are in defined in
+ <asm/elf.h> in current kernels. */
+#define HWCAP_VFP 64
+#define HWCAP_IWMMXT 512
+#define HWCAP_NEON 4096
+#define HWCAP_VFPv3 8192
+#define HWCAP_VFPv3D16 16384
+
+/* Core file and register set support. */
+
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* ---- based on arm-linux-tdep.c ---- */
+
+void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support for register format used by the NWFPE FPA emulator. */
+
+#define typeNone 0x00
+#define typeSingle 0x01
+#define typeDouble 0x02
+#define typeExtended 0x03
+
+void
+arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs)
+{
+ const gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+ memset (buf, 0, ARM_FP_REGISTER_SIZE);
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (buf, reg_data, 4);
+ break;
+ case typeDouble:
+ memcpy (buf, reg_data + 4, 4);
+ memcpy (buf + 4, reg_data, 4);
+ break;
+ case typeExtended:
+ /* We want sign and exponent, then least significant bits,
+ then most significant. NWFPE does sign, most, least. */
+ memcpy (buf, reg_data, 4);
+ memcpy (buf + 4, reg_data + 8, 4);
+ memcpy (buf + 8, reg_data + 4, 4);
+ break;
+ default:
+ break;
+ }
+
+ regcache->raw_supply (regno, buf);
+}
+
+void
+arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs)
+{
+ gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ regcache->raw_collect (regno, buf);
+
+ /* NOTE drow/2006-06-07: This code uses the tag already in the
+ register buffer. I've preserved that when moving the code
+ from the native file to the target file. But this doesn't
+ always make sense. */
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (reg_data, buf, 4);
+ break;
+ case typeDouble:
+ memcpy (reg_data, buf + 4, 4);
+ memcpy (reg_data + 4, buf, 4);
+ break;
+ case typeExtended:
+ memcpy (reg_data, buf, 4);
+ memcpy (reg_data + 4, buf + 8, 4);
+ memcpy (reg_data + 8, buf + 4, 4);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPS_REGNUM,
+ regs + NWFPE_FPSR_OFFSET);
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_supply_nwfpe_register (regcache, regno, regs);
+}
+
+void
+arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_collect_nwfpe_register (regcache, regno, regs);
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPS_REGNUM,
+ regs + ARM_INT_REGISTER_SIZE * ARM_FPS_REGNUM);
+}
+
+/* Support VFP register format. */
+
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ NULL, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_fpregset =
+ {
+ NULL, arm_none_supply_nwfpe, arm_none_collect_nwfpe
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ NULL, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, NULL, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+ else if (tdep->have_fpa_registers)
+ cb (".reg2", ARM_NONE_SIZEOF_NWFPE, ARM_NONE_SIZEOF_NWFPE,
+ &arm_none_fpregset, "FPA floating-point", cb_data);
+}
+
+/* Determine target description from core file. */
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd)
+{
+ CORE_ADDR arm_hwcap = 0;
+ if (target_auxv_search (target, AT_HWCAP, &arm_hwcap) != 1)
+ return nullptr;
+
+ if (arm_hwcap & HWCAP_VFP)
+ {
+ /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support
+ Neon with VFPv3-D32. */
+ if (arm_hwcap & HWCAP_NEON)
+ return aarch32_read_description ();
+ else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
+ return arm_read_description (ARM_FP_TYPE_VFPV3);
+
+ return arm_read_description (ARM_FP_TYPE_VFPV2);
+ }
+
+ return nullptr;
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7927c0aff3
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,60 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "gdbarch.h"
+#include "target.h"
+#include "bfd.h"
+
+struct regset;
+struct regcache;
+
+void arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len);
+void arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len);
+
+void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs);
+void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs);
+
+void arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len);
+void arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len);
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd);
+
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..be47cc2228 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (info, gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+ set_gdbarch_core_read_description (gdbarch, arm_none_core_read_description);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..f4a1540464 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
@@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
if test "$t" = linux-tdep.o; then
gdb_have_gcore=true
fi
+ if test "$t" = arm-none-tdep.o; then
+ gdb_have_gcore=true
+ fi
done
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..8cd139c500
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,231 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "none-tdep.h"
+#include "auxv.h"
+#include "target.h"
+#include "gdbthread.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "regset.h"
+#include "elf/common.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+#include "cli/cli-utils.h"
+#include "arch-utils.h"
+#include "gdb_obstack.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "infcall.h"
+#include "gdbcmd.h"
+#include "gdb_regex.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
+
+#include <ctype.h>
+
+/* ---- based on linux-tdep.c ---- */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ int abort_iteration;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != NULL
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data = (char *) elfcore_write_prstatus
+ (data->obfd, data->note_data, data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal), buf.data ());
+ else
+ data->note_data = (char *) elfcore_write_register_note
+ (data->obfd, data->note_data, data->note_size,
+ sect_name, buf.data (), collect_size);
+
+ if (data->note_data == NULL)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static char *
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ char *note_data, int *note_size,
+ enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct none_collect_regset_section_cb_data data;
+
+ data.gdbarch = gdbarch;
+ data.regcache = regcache;
+ data.obfd = obfd;
+ data.note_data = note_data;
+ data.note_size = note_size;
+ data.stop_signal = stop_signal;
+ data.abort_iteration = 0;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ data.lwp = ptid.lwp ();
+ if (!data.lwp)
+ data.lwp = ptid.tid ();
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+ return data.note_data;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ char *note_data = NULL;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ char *psargs = xstrdup (fname);
+
+ if (get_inferior_args ())
+ psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+ (char *) NULL);
+
+ note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
+ fname, psargs);
+ xfree (psargs);
+ }
+
+ if (!note_data)
+ return NULL;
+
+ if (note_data)
+ {
+ ptid_t ptid;
+ struct regcache *regcache;
+ process_stratum_target *targ = NULL;
+ int global_id = 1;
+ struct thread_info *info = find_thread_global_id (global_id);
+ if (info)
+ {
+ ptid = info->ptid;
+ targ = info->inf->process_target ();
+ }
+ else
+ ptid = minus_one_ptid;
+ regcache = get_thread_arch_regcache (targ, ptid, gdbarch);
+
+ note_data = collect (regcache,
+ ptid,
+ obfd,
+ note_data,
+ note_size,
+ GDB_SIGNAL_0);
+ if (!note_data)
+ return NULL;
+
+ /* Auxillary vector. */
+ gdb::optional<gdb::byte_vector> auxv =
+ target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
+ if (auxv && !auxv->empty ())
+ {
+ note_data = elfcore_write_note (obfd, note_data, note_size,
+ "CORE", NT_AUXV, auxv->data (),
+ auxv->size ());
+
+ if (!note_data)
+ return NULL;
+ }
+ }
+
+ /* make_cleanup (xfree, note_data); */
+ return note_data;
+}
+
+static char *
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
+}
+
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_none_tdep;
+
+void
+_initialize_none_tdep (void)
+{
+ /* No special actions. */
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..4aea7004d8
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,39 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "bfd.h"
+
+struct regcache;
+
+typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
+ ptid_t,
+ bfd *, char *, int *,
+ enum gdb_signal);
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect);
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH] gdb: Support corefiles for arm-none-eabi
2020-10-20 11:41 ` Fredrik Hederstierna
2020-10-20 12:39 ` Simon Marchi
2020-10-20 19:34 ` [PATCH] gdb: Support corefiles for arm-none-eabi Fredrik Hederstierna
@ 2020-10-20 21:49 ` Fredrik Hederstierna
2020-10-20 21:58 ` [PATCH v2] Support for corefiles for arm-none-eabi target Fredrik Hederstierna
` (3 subsequent siblings)
6 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-20 21:49 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: Fredrik Hederstierna
From: Fredrik Hederstierna <fredrik.hederstierna@verisure.com>
---
gdb/arm-none-tdep.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 60 ++++++++
gdb/arm-tdep.c | 8 +
gdb/configure.tgt | 6 +-
gdb/none-tdep.c | 231 +++++++++++++++++++++++++++
gdb/none-tdep.h | 39 +++++
6 files changed, 711 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..9d83a8b913
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,368 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
+#include "breakpoint.h"
+#include "auxv.h"
+
+#include "aarch32-tdep.h"
+#include "arch/arm.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+
+#include "elf/common.h"
+
+/* ---- based on arm-linux-tdep.h ---- */
+
+#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
+ + 2 * ARM_INT_REGISTER_SIZE \
+ + 8 + ARM_INT_REGISTER_SIZE)
+
+/* The index to access CSPR in user_regs defined in GLIBC. */
+#define ARM_CPSR_GREGNUM 16
+
+/* Support for register format used by the NWFPE FPA emulator. Each
+ register takes three words, where either the first one, two, or
+ three hold a single, double, or extended precision value (depending
+ on the corresponding tag). The register set is eight registers,
+ followed by the fpsr and fpcr, followed by eight tag bytes, and a
+ final word flag which indicates whether NWFPE has been
+ initialized. */
+
+#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
+#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
+
+/* Reuse ARM GNU/Linux HWCAP values for none. These are in defined in
+ <asm/elf.h> in current kernels. */
+#define HWCAP_VFP 64
+#define HWCAP_IWMMXT 512
+#define HWCAP_NEON 4096
+#define HWCAP_VFPv3 8192
+#define HWCAP_VFPv3D16 16384
+
+/* Core file and register set support. */
+
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* ---- based on arm-linux-tdep.c ---- */
+
+void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support for register format used by the NWFPE FPA emulator. */
+
+#define typeNone 0x00
+#define typeSingle 0x01
+#define typeDouble 0x02
+#define typeExtended 0x03
+
+void
+arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs)
+{
+ const gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+ memset (buf, 0, ARM_FP_REGISTER_SIZE);
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (buf, reg_data, 4);
+ break;
+ case typeDouble:
+ memcpy (buf, reg_data + 4, 4);
+ memcpy (buf + 4, reg_data, 4);
+ break;
+ case typeExtended:
+ /* We want sign and exponent, then least significant bits,
+ then most significant. NWFPE does sign, most, least. */
+ memcpy (buf, reg_data, 4);
+ memcpy (buf + 4, reg_data + 8, 4);
+ memcpy (buf + 8, reg_data + 4, 4);
+ break;
+ default:
+ break;
+ }
+
+ regcache->raw_supply (regno, buf);
+}
+
+void
+arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs)
+{
+ gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ regcache->raw_collect (regno, buf);
+
+ /* NOTE drow/2006-06-07: This code uses the tag already in the
+ register buffer. I've preserved that when moving the code
+ from the native file to the target file. But this doesn't
+ always make sense. */
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (reg_data, buf, 4);
+ break;
+ case typeDouble:
+ memcpy (reg_data, buf + 4, 4);
+ memcpy (reg_data + 4, buf, 4);
+ break;
+ case typeExtended:
+ memcpy (reg_data, buf, 4);
+ memcpy (reg_data + 4, buf + 8, 4);
+ memcpy (reg_data + 8, buf + 4, 4);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPS_REGNUM,
+ regs + NWFPE_FPSR_OFFSET);
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_supply_nwfpe_register (regcache, regno, regs);
+}
+
+void
+arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_collect_nwfpe_register (regcache, regno, regs);
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPS_REGNUM,
+ regs + ARM_INT_REGISTER_SIZE * ARM_FPS_REGNUM);
+}
+
+/* Support VFP register format. */
+
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ NULL, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_fpregset =
+ {
+ NULL, arm_none_supply_nwfpe, arm_none_collect_nwfpe
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ NULL, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, NULL, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+ else if (tdep->have_fpa_registers)
+ cb (".reg2", ARM_NONE_SIZEOF_NWFPE, ARM_NONE_SIZEOF_NWFPE,
+ &arm_none_fpregset, "FPA floating-point", cb_data);
+}
+
+/* Determine target description from core file. */
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd)
+{
+ CORE_ADDR arm_hwcap = 0;
+ if (target_auxv_search (target, AT_HWCAP, &arm_hwcap) != 1)
+ return nullptr;
+
+ if (arm_hwcap & HWCAP_VFP)
+ {
+ /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support
+ Neon with VFPv3-D32. */
+ if (arm_hwcap & HWCAP_NEON)
+ return aarch32_read_description ();
+ else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
+ return arm_read_description (ARM_FP_TYPE_VFPV3);
+
+ return arm_read_description (ARM_FP_TYPE_VFPV2);
+ }
+
+ return nullptr;
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7927c0aff3
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,60 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "gdbarch.h"
+#include "target.h"
+#include "bfd.h"
+
+struct regset;
+struct regcache;
+
+void arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len);
+void arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len);
+
+void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs);
+void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs);
+
+void arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len);
+void arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len);
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd);
+
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..be47cc2228 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (info, gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+ set_gdbarch_core_read_description (gdbarch, arm_none_core_read_description);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..f4a1540464 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
@@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
if test "$t" = linux-tdep.o; then
gdb_have_gcore=true
fi
+ if test "$t" = arm-none-tdep.o; then
+ gdb_have_gcore=true
+ fi
done
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..8cd139c500
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,231 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "none-tdep.h"
+#include "auxv.h"
+#include "target.h"
+#include "gdbthread.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "regset.h"
+#include "elf/common.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+#include "cli/cli-utils.h"
+#include "arch-utils.h"
+#include "gdb_obstack.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "infcall.h"
+#include "gdbcmd.h"
+#include "gdb_regex.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
+
+#include <ctype.h>
+
+/* ---- based on linux-tdep.c ---- */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ int abort_iteration;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != NULL
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data = (char *) elfcore_write_prstatus
+ (data->obfd, data->note_data, data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal), buf.data ());
+ else
+ data->note_data = (char *) elfcore_write_register_note
+ (data->obfd, data->note_data, data->note_size,
+ sect_name, buf.data (), collect_size);
+
+ if (data->note_data == NULL)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static char *
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ char *note_data, int *note_size,
+ enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct none_collect_regset_section_cb_data data;
+
+ data.gdbarch = gdbarch;
+ data.regcache = regcache;
+ data.obfd = obfd;
+ data.note_data = note_data;
+ data.note_size = note_size;
+ data.stop_signal = stop_signal;
+ data.abort_iteration = 0;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ data.lwp = ptid.lwp ();
+ if (!data.lwp)
+ data.lwp = ptid.tid ();
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+ return data.note_data;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ char *note_data = NULL;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ char *psargs = xstrdup (fname);
+
+ if (get_inferior_args ())
+ psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+ (char *) NULL);
+
+ note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
+ fname, psargs);
+ xfree (psargs);
+ }
+
+ if (!note_data)
+ return NULL;
+
+ if (note_data)
+ {
+ ptid_t ptid;
+ struct regcache *regcache;
+ process_stratum_target *targ = NULL;
+ int global_id = 1;
+ struct thread_info *info = find_thread_global_id (global_id);
+ if (info)
+ {
+ ptid = info->ptid;
+ targ = info->inf->process_target ();
+ }
+ else
+ ptid = minus_one_ptid;
+ regcache = get_thread_arch_regcache (targ, ptid, gdbarch);
+
+ note_data = collect (regcache,
+ ptid,
+ obfd,
+ note_data,
+ note_size,
+ GDB_SIGNAL_0);
+ if (!note_data)
+ return NULL;
+
+ /* Auxillary vector. */
+ gdb::optional<gdb::byte_vector> auxv =
+ target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
+ if (auxv && !auxv->empty ())
+ {
+ note_data = elfcore_write_note (obfd, note_data, note_size,
+ "CORE", NT_AUXV, auxv->data (),
+ auxv->size ());
+
+ if (!note_data)
+ return NULL;
+ }
+ }
+
+ /* make_cleanup (xfree, note_data); */
+ return note_data;
+}
+
+static char *
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
+}
+
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_none_tdep;
+
+void
+_initialize_none_tdep (void)
+{
+ /* No special actions. */
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..4aea7004d8
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,39 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "bfd.h"
+
+struct regcache;
+
+typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
+ ptid_t,
+ bfd *, char *, int *,
+ enum gdb_signal);
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect);
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH v2] Support for corefiles for arm-none-eabi target.
2020-10-20 11:41 ` Fredrik Hederstierna
` (2 preceding siblings ...)
2020-10-20 21:49 ` Fredrik Hederstierna
@ 2020-10-20 21:58 ` Fredrik Hederstierna
2020-10-21 2:51 ` Simon Marchi
2020-10-21 14:38 ` Luis Machado
2020-10-22 0:44 ` [PATCH v3][PR gdb/14383]: gdb: corefile support " Fredrik Hederstierna
` (2 subsequent siblings)
6 siblings, 2 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-20 21:58 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: fredrikhederstierna
From: fredrikhederstierna <fredrik@hederstierna.com>
---
gdb/arm-none-tdep.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 60 ++++++++
gdb/arm-tdep.c | 8 +
gdb/configure.tgt | 6 +-
gdb/none-tdep.c | 335 ++++++++++++++++++++++++++++++++++++++++
gdb/none-tdep.h | 39 +++++
6 files changed, 815 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..9d83a8b913
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,368 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
+#include "breakpoint.h"
+#include "auxv.h"
+
+#include "aarch32-tdep.h"
+#include "arch/arm.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+
+#include "elf/common.h"
+
+/* ---- based on arm-linux-tdep.h ---- */
+
+#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
+ + 2 * ARM_INT_REGISTER_SIZE \
+ + 8 + ARM_INT_REGISTER_SIZE)
+
+/* The index to access CSPR in user_regs defined in GLIBC. */
+#define ARM_CPSR_GREGNUM 16
+
+/* Support for register format used by the NWFPE FPA emulator. Each
+ register takes three words, where either the first one, two, or
+ three hold a single, double, or extended precision value (depending
+ on the corresponding tag). The register set is eight registers,
+ followed by the fpsr and fpcr, followed by eight tag bytes, and a
+ final word flag which indicates whether NWFPE has been
+ initialized. */
+
+#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
+#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
+#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
+
+/* Reuse ARM GNU/Linux HWCAP values for none. These are in defined in
+ <asm/elf.h> in current kernels. */
+#define HWCAP_VFP 64
+#define HWCAP_IWMMXT 512
+#define HWCAP_NEON 4096
+#define HWCAP_VFPv3 8192
+#define HWCAP_VFPv3D16 16384
+
+/* Core file and register set support. */
+
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* ---- based on arm-linux-tdep.c ---- */
+
+void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support for register format used by the NWFPE FPA emulator. */
+
+#define typeNone 0x00
+#define typeSingle 0x01
+#define typeDouble 0x02
+#define typeExtended 0x03
+
+void
+arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs)
+{
+ const gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+ memset (buf, 0, ARM_FP_REGISTER_SIZE);
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (buf, reg_data, 4);
+ break;
+ case typeDouble:
+ memcpy (buf, reg_data + 4, 4);
+ memcpy (buf + 4, reg_data, 4);
+ break;
+ case typeExtended:
+ /* We want sign and exponent, then least significant bits,
+ then most significant. NWFPE does sign, most, least. */
+ memcpy (buf, reg_data, 4);
+ memcpy (buf + 4, reg_data + 8, 4);
+ memcpy (buf + 8, reg_data + 4, 4);
+ break;
+ default:
+ break;
+ }
+
+ regcache->raw_supply (regno, buf);
+}
+
+void
+arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs)
+{
+ gdb_byte *reg_data;
+ gdb_byte reg_tag;
+ gdb_byte buf[ARM_FP_REGISTER_SIZE];
+
+ regcache->raw_collect (regno, buf);
+
+ /* NOTE drow/2006-06-07: This code uses the tag already in the
+ register buffer. I've preserved that when moving the code
+ from the native file to the target file. But this doesn't
+ always make sense. */
+
+ reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
+ reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
+
+ switch (reg_tag)
+ {
+ case typeSingle:
+ memcpy (reg_data, buf, 4);
+ break;
+ case typeDouble:
+ memcpy (reg_data, buf + 4, 4);
+ memcpy (reg_data + 4, buf, 4);
+ break;
+ case typeExtended:
+ memcpy (reg_data, buf, 4);
+ memcpy (reg_data + 4, buf + 8, 4);
+ memcpy (reg_data + 8, buf + 4, 4);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPS_REGNUM,
+ regs + NWFPE_FPSR_OFFSET);
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_supply_nwfpe_register (regcache, regno, regs);
+}
+
+void
+arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ arm_none_collect_nwfpe_register (regcache, regno, regs);
+
+ if (regnum == ARM_FPS_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPS_REGNUM,
+ regs + ARM_INT_REGISTER_SIZE * ARM_FPS_REGNUM);
+}
+
+/* Support VFP register format. */
+
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ NULL, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_fpregset =
+ {
+ NULL, arm_none_supply_nwfpe, arm_none_collect_nwfpe
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ NULL, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, NULL, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+ else if (tdep->have_fpa_registers)
+ cb (".reg2", ARM_NONE_SIZEOF_NWFPE, ARM_NONE_SIZEOF_NWFPE,
+ &arm_none_fpregset, "FPA floating-point", cb_data);
+}
+
+/* Determine target description from core file. */
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd)
+{
+ CORE_ADDR arm_hwcap = 0;
+ if (target_auxv_search (target, AT_HWCAP, &arm_hwcap) != 1)
+ return nullptr;
+
+ if (arm_hwcap & HWCAP_VFP)
+ {
+ /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support
+ Neon with VFPv3-D32. */
+ if (arm_hwcap & HWCAP_NEON)
+ return aarch32_read_description ();
+ else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
+ return arm_read_description (ARM_FP_TYPE_VFPV3);
+
+ return arm_read_description (ARM_FP_TYPE_VFPV2);
+ }
+
+ return nullptr;
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7927c0aff3
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,60 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "gdbarch.h"
+#include "target.h"
+#include "bfd.h"
+
+struct regset;
+struct regcache;
+
+void arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len);
+void arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len);
+
+void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
+ const gdb_byte *regs);
+void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
+ gdb_byte *regs);
+
+void arm_none_supply_nwfpe (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len);
+void arm_none_collect_nwfpe (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len);
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+
+const struct target_desc *
+arm_none_core_read_description (struct gdbarch *gdbarch,
+ struct target_ops *target,
+ bfd *abfd);
+
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..be47cc2228 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (info, gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+ set_gdbarch_core_read_description (gdbarch, arm_none_core_read_description);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..f4a1540464 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
@@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
if test "$t" = linux-tdep.o; then
gdb_have_gcore=true
fi
+ if test "$t" = arm-none-tdep.o; then
+ gdb_have_gcore=true
+ fi
done
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..5ac5c6c707
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,335 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "none-tdep.h"
+#include "auxv.h"
+#include "target.h"
+#include "gdbthread.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "regset.h"
+#include "elf/common.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+#include "cli/cli-utils.h"
+#include "arch-utils.h"
+#include "gdb_obstack.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "infcall.h"
+#include "gdbcmd.h"
+#include "gdb_regex.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
+
+#include <ctype.h>
+
+/* ---- based on linux-tdep.c ---- */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ int abort_iteration;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != NULL
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data = (char *) elfcore_write_prstatus
+ (data->obfd, data->note_data, data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal), buf.data ());
+ else
+ data->note_data = (char *) elfcore_write_register_note
+ (data->obfd, data->note_data, data->note_size,
+ sect_name, buf.data (), collect_size);
+
+ if (data->note_data == NULL)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static char *
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ char *note_data, int *note_size,
+ enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct none_collect_regset_section_cb_data data;
+
+ data.gdbarch = gdbarch;
+ data.regcache = regcache;
+ data.obfd = obfd;
+ data.note_data = note_data;
+ data.note_size = note_size;
+ data.stop_signal = stop_signal;
+ data.abort_iteration = 0;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ data.lwp = ptid.lwp ();
+ if (!data.lwp)
+ data.lwp = ptid.tid ();
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+ return data.note_data;
+}
+
+/* Fetch the siginfo data for the specified thread, if it exists. If
+ there is no data, or we could not read it, return an empty
+ buffer. */
+
+static gdb::byte_vector
+none_get_siginfo_data (thread_info *thread, struct gdbarch *gdbarch)
+{
+ struct type *siginfo_type;
+ LONGEST bytes_read;
+
+ if (!gdbarch_get_siginfo_type_p (gdbarch))
+ return gdb::byte_vector ();
+
+ scoped_restore_current_thread save_current_thread;
+ switch_to_thread (thread);
+
+ siginfo_type = gdbarch_get_siginfo_type (gdbarch);
+
+ gdb::byte_vector buf (TYPE_LENGTH (siginfo_type));
+
+ bytes_read = target_read (current_top_target (), TARGET_OBJECT_SIGNAL_INFO, NULL,
+ buf.data (), 0, TYPE_LENGTH (siginfo_type));
+ if (bytes_read != TYPE_LENGTH (siginfo_type))
+ buf.clear ();
+
+ return buf;
+}
+
+struct none_corefile_thread_data
+{
+ struct gdbarch *gdbarch;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ enum gdb_signal stop_signal;
+};
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_corefile_thread (struct thread_info *info,
+ struct none_corefile_thread_data *args)
+{
+ struct regcache *regcache;
+
+ regcache = get_thread_arch_regcache (info->inf->process_target (),
+ info->ptid, args->gdbarch);
+
+ target_fetch_registers (regcache, -1);
+ gdb::byte_vector siginfo_data = none_get_siginfo_data (info, args->gdbarch);
+
+ args->note_data = none_collect_thread_registers
+ (regcache, info->ptid, args->obfd, args->note_data,
+ args->note_size, args->stop_signal);
+
+ /* Don't return anything if we got no register information above,
+ such a core file is useless. */
+ if (args->note_data != NULL)
+ if (!siginfo_data.empty ())
+ args->note_data = elfcore_write_note (args->obfd,
+ args->note_data,
+ args->note_size,
+ "CORE", NT_SIGINFO,
+ siginfo_data.data (),
+ siginfo_data.size ());
+}
+
+/* Find the signalled thread. In case there's more than one signalled
+ thread, prefer the current thread, if it is signalled. If no
+ thread was signalled, default to the current thread, unless it has
+ exited, in which case return NULL. */
+
+static thread_info *
+find_signalled_thread ()
+{
+ thread_info *curr_thr = inferior_thread ();
+ if (curr_thr->state != THREAD_EXITED
+ && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return curr_thr;
+
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ if (thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return thr;
+
+ /* Default to the current thread, unless it has exited. */
+ if (curr_thr->state != THREAD_EXITED)
+ return curr_thr;
+
+ return nullptr;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ struct none_corefile_thread_data thread_args;
+ char *note_data = NULL;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ char *psargs = xstrdup (fname);
+
+ if (get_inferior_args ())
+ psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+ (char *) NULL);
+
+ note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
+ fname, psargs);
+ xfree (psargs);
+ }
+
+ if (!note_data)
+ return NULL;
+
+ /* Thread register information. */
+ try
+ {
+ update_thread_list ();
+ }
+ catch (const gdb_exception_error &e)
+ {
+ exception_print (gdb_stderr, e);
+ }
+
+ /* Like the kernel, prefer dumping the signalled thread first.
+ "First thread" is what tools use to infer the signalled
+ thread. */
+ thread_info *signalled_thr = find_signalled_thread ();
+
+ thread_args.gdbarch = gdbarch;
+ thread_args.obfd = obfd;
+ thread_args.note_data = note_data;
+ thread_args.note_size = note_size;
+ if (signalled_thr != nullptr)
+ thread_args.stop_signal = signalled_thr->suspend.stop_signal;
+ else
+ thread_args.stop_signal = GDB_SIGNAL_0;
+
+ if (signalled_thr != nullptr)
+ none_corefile_thread (signalled_thr, &thread_args);
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ {
+ if (thr == signalled_thr)
+ continue;
+
+ none_corefile_thread (thr, &thread_args);
+ }
+
+ note_data = thread_args.note_data;
+ if (!note_data)
+ return NULL;
+
+ /* Auxillary vector. */
+ gdb::optional<gdb::byte_vector> auxv =
+ target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
+ if (auxv && !auxv->empty ())
+ {
+ note_data = elfcore_write_note (obfd, note_data, note_size,
+ "CORE", NT_AUXV, auxv->data (),
+ auxv->size ());
+ if (!note_data)
+ return NULL;
+ }
+
+ /* make_cleanup (xfree, note_data); */
+ return note_data;
+}
+
+static char *
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
+}
+
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_none_tdep;
+
+void
+_initialize_none_tdep (void)
+{
+ /* No special actions. */
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..4aea7004d8
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,39 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "bfd.h"
+
+struct regcache;
+
+typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
+ ptid_t,
+ bfd *, char *, int *,
+ enum gdb_signal);
+char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect);
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2] Support for corefiles for arm-none-eabi target.
2020-10-20 21:58 ` [PATCH v2] Support for corefiles for arm-none-eabi target Fredrik Hederstierna
@ 2020-10-21 2:51 ` Simon Marchi
2020-10-21 14:38 ` Luis Machado
1 sibling, 0 replies; 39+ messages in thread
From: Simon Marchi @ 2020-10-21 2:51 UTC (permalink / raw)
To: Fredrik Hederstierna, gdb-patches, luis.machado, Alan.Hayward,
paulmathieu
Hi Fredrik,
Note that for the patch to be accepted, it will need a commit message
that explains sufficiently well what's happening, as well as a ChangeLog
entry:
https://sourceware.org/gdb/wiki/ContributionChecklist#ChangeLog
https://sourceware.org/gdb/wiki/ContributionChecklist#Properly_Formatted_GNU_ChangeLog
You will need to add your new files to the ALL_TARGET_OBS list in
gdb/Makefile.in, so that they get built when GDB is configured with
--enable-targets=all.
I posted a patch that makes gdbarch_make_corefile_notes return a
gdb::unique_xmalloc_ptr<char>:
https://sourceware.org/pipermail/gdb-patches/2020-October/172712.html
It will probably be merged soon, so you can probably rebase yours on top
and imitate the changes I did in linux-tdep.c and fbsd-tdep.c.
Here's a first round of comments below.
On 2020-10-20 5:58 p.m., Fredrik Hederstierna wrote:
> diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
> new file mode 100644
> index 0000000000..9d83a8b913
> --- /dev/null
> +++ b/gdb/arm-none-tdep.c
> @@ -0,0 +1,368 @@
> +/* none on ARM target support.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#include "defs.h"
> +#include "target.h"
> +#include "value.h"
> +#include "gdbtypes.h"
> +#include "gdbcore.h"
> +#include "frame.h"
> +#include "regcache.h"
> +#include "solib-svr4.h"
> +#include "osabi.h"
> +#include "regset.h"
> +#include "trad-frame.h"
> +#include "tramp-frame.h"
> +#include "breakpoint.h"
> +#include "auxv.h"
> +
> +#include "aarch32-tdep.h"
> +#include "arch/arm.h"
> +#include "arm-tdep.h"
> +#include "arm-none-tdep.h"
> +#include "glibc-tdep.h"
> +#include "arch-utils.h"
> +#include "inferior.h"
> +#include "gdbthread.h"
> +#include "symfile.h"
> +
> +#include "cli/cli-utils.h"
> +#include "stap-probe.h"
> +#include "parser-defs.h"
> +#include "user-regs.h"
> +#include <ctype.h>
> +
> +#include "elf-bfd.h"
> +#include "coff/internal.h"
> +#include "elf/arm.h"
> +
> +#include "elf/common.h"
I have the feeling that a bunch of these includes are not necessary.
Can you reduce the the essential?
> +
> +/* ---- based on arm-linux-tdep.h ---- */
I don't think it's useful to say it's based on this other file.
Instead, you might want to say that the register layout was
designed based on the layout used by Linux.
> +
> +#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
> + + 2 * ARM_INT_REGISTER_SIZE \
> + + 8 + ARM_INT_REGISTER_SIZE)
> +
> +/* The index to access CSPR in user_regs defined in GLIBC. */
> +#define ARM_CPSR_GREGNUM 16
> +
> +/* Support for register format used by the NWFPE FPA emulator. Each
> + register takes three words, where either the first one, two, or
> + three hold a single, double, or extended precision value (depending
> + on the corresponding tag). The register set is eight registers,
> + followed by the fpsr and fpcr, followed by eight tag bytes, and a
> + final word flag which indicates whether NWFPE has been
> + initialized. */
> +
> +#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
> +#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
> +#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
> +#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
What's NWFPE? From what I can read, it's floating point emulation in
the Linux kernels, is that right? If so, is it relevant to have here?
> diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
> new file mode 100644
> index 0000000000..7927c0aff3
> --- /dev/null
> +++ b/gdb/arm-none-tdep.h
> @@ -0,0 +1,60 @@
> +/* none on ARM target support, prototypes.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#ifndef ARM_NONE_TDEP_H
> +#define ARM_NONE_TDEP_H
> +
> +#include "gdbarch.h"
> +#include "target.h"
> +#include "bfd.h"
> +
> +struct regset;
> +struct regcache;
> +
> +void arm_none_supply_gregset (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *gregs_buf, size_t len);
> +void arm_none_collect_gregset (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *gregs_buf, size_t len);
> +
> +void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
> + const gdb_byte *regs);
> +void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
> + gdb_byte *regs);
> +
> +void arm_none_supply_nwfpe (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *regs_buf, size_t len);
> +void arm_none_collect_nwfpe (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *regs_buf, size_t len);
> +
> +void
> +arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
> + iterate_over_regset_sections_cb *cb,
> + void *cb_data,
> + const struct regcache *regcache);
> +
> +const struct target_desc *
> +arm_none_core_read_description (struct gdbarch *gdbarch,
> + struct target_ops *target,
> + bfd *abfd);
For all functions declared above, if they are only used in
arm-none-tdep.c, make them static to arm-none-tdep.c.
> +
> +#endif /* ARM_NONE_TDEP_H */
> diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
> index a214f22d7a..be47cc2228 100644
> --- a/gdb/arm-tdep.c
> +++ b/gdb/arm-tdep.c
> @@ -50,6 +50,8 @@
> #include "arch/arm.h"
> #include "arch/arm-get-next-pcs.h"
> #include "arm-tdep.h"
> +#include "none-tdep.h"
> +#include "arm-none-tdep.h"
> #include "gdb/sim-arm.h"
>
> #include "elf-bfd.h"
> @@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
> /* Virtual tables. */
> set_gdbarch_vbit_in_delta (gdbarch, 1);
>
> + /* Default none core file support, can be overridden by osabi. */
Our convention is to have two spaces after periods, even the last one:
/* Default none core file support, can be overridden by osabi. */
Apply everywhere.
> +
> /* Hook in the ABI-specific overrides, if they have been registered. */
> gdbarch_init_osabi (info, gdbarch);
>
> diff --git a/gdb/configure.tgt b/gdb/configure.tgt
> index d865ecdcb6..f4a1540464 100644
> --- a/gdb/configure.tgt
> +++ b/gdb/configure.tgt
> @@ -64,7 +64,8 @@ arc*-*-*)
>
> arm*-*-*)
> cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
> - arch/arm-get-next-pcs.o arm-tdep.o";;
> + arch/arm-get-next-pcs.o arm-tdep.o \
> + none-tdep.o arm-none-tdep.o";;
>
> hppa*-*-*)
> # Target: HP PA-RISC
> @@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
> if test "$t" = linux-tdep.o; then
> gdb_have_gcore=true
> fi
> + if test "$t" = arm-none-tdep.o; then
> + gdb_have_gcore=true
> + fi
Are you sure you want this? gcore is a standalone program to generate a
core given a pid, I don't think it applies in our bare-metal scenario,
does it?
> +/* Callback for iterate_over_regset_sections that records a single
> + regset in the corefile note section. */
> +
> +static void
> +none_collect_regset_section_cb (const char *sect_name, int supply_size,
> + int collect_size, const struct regset *regset,
> + const char *human_name, void *cb_data)
Make sure the right whitespaces are used throughout. It should use as
many tabs as possible (one tab is 8 columnms) and then spaces until the
desired column.
> +{
> + struct none_collect_regset_section_cb_data *data
> + = (struct none_collect_regset_section_cb_data *) cb_data;
> + bool variable_size_section = (regset != NULL
> + && regset->flags & REGSET_VARIABLE_SIZE);
> +
> + if (!variable_size_section)
> + gdb_assert (supply_size == collect_size);
> +
> + if (data->abort_iteration)
> + return;
> +
> + gdb_assert (regset && regset->collect_regset);
When comparing pointers, we use explicit comparison, so:
regset == nullptr
regset != nullptr
We also use nullptr instead of NULL for new code, since we have switched
to C++. You'll find plenty of old code that doesn't follow this, but we
try to be strict for the new or modified code.
> +/* Fetch the siginfo data for the specified thread, if it exists. If
> + there is no data, or we could not read it, return an empty
> + buffer. */
> +
> +static gdb::byte_vector
> +none_get_siginfo_data (thread_info *thread, struct gdbarch *gdbarch)
> +{
> + struct type *siginfo_type;
> + LONGEST bytes_read;
> +
> + if (!gdbarch_get_siginfo_type_p (gdbarch))
> + return gdb::byte_vector ();
> +
> + scoped_restore_current_thread save_current_thread;
> + switch_to_thread (thread);
> +
> + siginfo_type = gdbarch_get_siginfo_type (gdbarch);
> +
> + gdb::byte_vector buf (TYPE_LENGTH (siginfo_type));
> +
> + bytes_read = target_read (current_top_target (), TARGET_OBJECT_SIGNAL_INFO, NULL,
> + buf.data (), 0, TYPE_LENGTH (siginfo_type));
> + if (bytes_read != TYPE_LENGTH (siginfo_type))
> + buf.clear ();
> +
> + return buf;
> +}
Is siginfo relevant for a bare-metal target?
> +struct none_corefile_thread_data
> +{
> + struct gdbarch *gdbarch;
> + bfd *obfd;
> + char *note_data;
> + int *note_size;
> + enum gdb_signal stop_signal;
> +};
> +
> +/* Records the thread's register state for the corefile note
> + section. */
> +
> +static void
> +none_corefile_thread (struct thread_info *info,
> + struct none_corefile_thread_data *args)
> +{
> + struct regcache *regcache;
> +
> + regcache = get_thread_arch_regcache (info->inf->process_target (),
> + info->ptid, args->gdbarch);
> +
> + target_fetch_registers (regcache, -1);
> + gdb::byte_vector siginfo_data = none_get_siginfo_data (info, args->gdbarch);
> +
> + args->note_data = none_collect_thread_registers
> + (regcache, info->ptid, args->obfd, args->note_data,
> + args->note_size, args->stop_signal);
> +
> + /* Don't return anything if we got no register information above,
> + such a core file is useless. */
> + if (args->note_data != NULL)
> + if (!siginfo_data.empty ())
> + args->note_data = elfcore_write_note (args->obfd,
> + args->note_data,
> + args->note_size,
> + "CORE", NT_SIGINFO,
> + siginfo_data.data (),
> + siginfo_data.size ());
> +}
> +
> +/* Find the signalled thread. In case there's more than one signalled
> + thread, prefer the current thread, if it is signalled. If no
> + thread was signalled, default to the current thread, unless it has
> + exited, in which case return NULL. */
> +
> +static thread_info *
> +find_signalled_thread ()
> +{
> + thread_info *curr_thr = inferior_thread ();
> + if (curr_thr->state != THREAD_EXITED
> + && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
> + return curr_thr;
> +
> + for (thread_info *thr : current_inferior ()->non_exited_threads ())
> + if (thr->suspend.stop_signal != GDB_SIGNAL_0)
> + return thr;
> +
> + /* Default to the current thread, unless it has exited. */
> + if (curr_thr->state != THREAD_EXITED)
> + return curr_thr;
> +
> + return nullptr;
> +}
> +
> +/* Fills the "to_make_corefile_note" target vector. Builds the note
> + section for a corefile, and returns it in a malloc buffer. */
> +
> +char *
> +none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
> + none_collect_thread_registers_ftype collect)
> +{
> + struct none_corefile_thread_data thread_args;
> + char *note_data = NULL;
> +
> + /* Process information. */
> + if (get_exec_file (0))
> + {
> + const char *fname = lbasename (get_exec_file (0));
> + char *psargs = xstrdup (fname);
> +
> + if (get_inferior_args ())
> + psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
> + (char *) NULL);
> +
> + note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
> + fname, psargs);
> + xfree (psargs);
> + }
> +
> + if (!note_data)
> + return NULL;
> +
> + /* Thread register information. */
> + try
> + {
> + update_thread_list ();
> + }
> + catch (const gdb_exception_error &e)
> + {
> + exception_print (gdb_stderr, e);
> + }
> +
> + /* Like the kernel, prefer dumping the signalled thread first.
> + "First thread" is what tools use to infer the signalled
> + thread. */
> + thread_info *signalled_thr = find_signalled_thread ();
> +
> + thread_args.gdbarch = gdbarch;
> + thread_args.obfd = obfd;
> + thread_args.note_data = note_data;
> + thread_args.note_size = note_size;
> + if (signalled_thr != nullptr)
> + thread_args.stop_signal = signalled_thr->suspend.stop_signal;
> + else
> + thread_args.stop_signal = GDB_SIGNAL_0;
> +
> + if (signalled_thr != nullptr)
> + none_corefile_thread (signalled_thr, &thread_args);
> + for (thread_info *thr : current_inferior ()->non_exited_threads ())
> + {
> + if (thr == signalled_thr)
> + continue;
> +
> + none_corefile_thread (thr, &thread_args);
> + }
> +
> + note_data = thread_args.note_data;
> + if (!note_data)
> + return NULL;
> +
> + /* Auxillary vector. */
> + gdb::optional<gdb::byte_vector> auxv =
> + target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
> + if (auxv && !auxv->empty ())
> + {
> + note_data = elfcore_write_note (obfd, note_data, note_size,
> + "CORE", NT_AUXV, auxv->data (),
> + auxv->size ());
> + if (!note_data)
> + return NULL;
> + }
As mentioned earlier, I don't think auxv is relevant for a bare-metal
target, I don't know of any bare-metal target using this concept. Do
you use it?
I'd suggest just sticking to the features you use and have actually
tested (it's not clear to me what in this file you actually use for your
use case). More things can be added later as needed.
> +
> + /* make_cleanup (xfree, note_data); */
> + return note_data;
> +}
> +
> +static char *
> +none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
> +{
Our convention is that the _1 version of the function is the helper, so
it would be the other way around.
> + return none_make_corefile_notes (gdbarch, obfd, note_size,
> + none_collect_thread_registers);
> +}
> +
> +/* Setup default core file support for none targets.
> + Can be overridden later by OSABI. */
> +
> +void
> +none_init_corefile (struct gdbarch_info info,
> + struct gdbarch *gdbarch)
Function comments go to the header file. Here, you just write:
/* See none-tdep.h. */
> +{
> + /* Default core file support. */
> + set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
> +}
> +
> +/* Provide a prototype to silence -Wmissing-prototypes. */
> +extern initialize_file_ftype _initialize_none_tdep;
> +
> +void
> +_initialize_none_tdep (void)
> +{
> + /* No special actions. */
> +}
Remove if not needed.
> diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
> new file mode 100644
> index 0000000000..4aea7004d8
> --- /dev/null
> +++ b/gdb/none-tdep.h
> @@ -0,0 +1,39 @@
> +/* Target-dependent code for none, architecture independent.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#ifndef NONE_TDEP_H
> +#define NONE_TDEP_H
> +
> +#include "bfd.h"
> +
> +struct regcache;
> +
> +typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
> + ptid_t,
> + bfd *, char *, int *,
> + enum gdb_signal);
> +char *
> +none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
> + none_collect_thread_registers_ftype collect);
For declarations, the return type doesn't go on its own line, sorry if I
lead you into error.
Thanks,
Simon
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2] Support for corefiles for arm-none-eabi target.
2020-10-20 21:58 ` [PATCH v2] Support for corefiles for arm-none-eabi target Fredrik Hederstierna
2020-10-21 2:51 ` Simon Marchi
@ 2020-10-21 14:38 ` Luis Machado
1 sibling, 0 replies; 39+ messages in thread
From: Luis Machado @ 2020-10-21 14:38 UTC (permalink / raw)
To: Fredrik Hederstierna, gdb-patches, simark, Alan.Hayward, paulmathieu
Hi,
Apologies for the delay in replying.
I think this still needs some more work to cut it down to the bare
essentials for a core file. I see quite a few things that are
linux-specific and that shouldn't be included in a potential all-arch
bare-metal core file format.
As Simon said, siginfo and auxv are *nix concepts. HWCAP_* constants
are also *nix/Linux concepts. So those should be dropped unless there is
good reason to include them.
If we require some of their data, then we should think of a way to make
that available. For example, AUXV's entry point information.
We should really discuss what the generic core file format for
bare-metal targets will look like before having a possible patch to
implement it. At least that's my take on it.
Otherwise we risk having an implementation without a formal definition.
And core files are already somewhat vaguely-defined anyway.
On 10/20/20 6:58 PM, Fredrik Hederstierna wrote:
> From: fredrikhederstierna <fredrik@hederstierna.com>
>
> ---
> gdb/arm-none-tdep.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
> gdb/arm-none-tdep.h | 60 ++++++++
> gdb/arm-tdep.c | 8 +
> gdb/configure.tgt | 6 +-
> gdb/none-tdep.c | 335 ++++++++++++++++++++++++++++++++++++++++
> gdb/none-tdep.h | 39 +++++
> 6 files changed, 815 insertions(+), 1 deletion(-)
> create mode 100644 gdb/arm-none-tdep.c
> create mode 100644 gdb/arm-none-tdep.h
> create mode 100644 gdb/none-tdep.c
> create mode 100644 gdb/none-tdep.h
>
> diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
> new file mode 100644
> index 0000000000..9d83a8b913
> --- /dev/null
> +++ b/gdb/arm-none-tdep.c
> @@ -0,0 +1,368 @@
> +/* none on ARM target support.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#include "defs.h"
> +#include "target.h"
> +#include "value.h"
> +#include "gdbtypes.h"
> +#include "gdbcore.h"
> +#include "frame.h"
> +#include "regcache.h"
> +#include "solib-svr4.h"
> +#include "osabi.h"
> +#include "regset.h"
> +#include "trad-frame.h"
> +#include "tramp-frame.h"
> +#include "breakpoint.h"
> +#include "auxv.h"
> +
> +#include "aarch32-tdep.h"
> +#include "arch/arm.h"
> +#include "arm-tdep.h"
> +#include "arm-none-tdep.h"
> +#include "glibc-tdep.h"
> +#include "arch-utils.h"
> +#include "inferior.h"
> +#include "gdbthread.h"
> +#include "symfile.h"
> +
> +#include "cli/cli-utils.h"
> +#include "stap-probe.h"
> +#include "parser-defs.h"
> +#include "user-regs.h"
> +#include <ctype.h>
> +
> +#include "elf-bfd.h"
> +#include "coff/internal.h"
> +#include "elf/arm.h"
> +
> +#include "elf/common.h"
> +
> +/* ---- based on arm-linux-tdep.h ---- */
> +
> +#define ARM_NONE_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
> + + 2 * ARM_INT_REGISTER_SIZE \
> + + 8 + ARM_INT_REGISTER_SIZE)
> +
> +/* The index to access CSPR in user_regs defined in GLIBC. */
> +#define ARM_CPSR_GREGNUM 16
> +
> +/* Support for register format used by the NWFPE FPA emulator. Each
> + register takes three words, where either the first one, two, or
> + three hold a single, double, or extended precision value (depending
> + on the corresponding tag). The register set is eight registers,
> + followed by the fpsr and fpcr, followed by eight tag bytes, and a
> + final word flag which indicates whether NWFPE has been
> + initialized. */
> +
> +#define NWFPE_FPSR_OFFSET (8 * ARM_FP_REGISTER_SIZE)
> +#define NWFPE_FPCR_OFFSET (NWFPE_FPSR_OFFSET + ARM_INT_REGISTER_SIZE)
> +#define NWFPE_TAGS_OFFSET (NWFPE_FPCR_OFFSET + ARM_INT_REGISTER_SIZE)
> +#define NWFPE_INITFLAG_OFFSET (NWFPE_TAGS_OFFSET + 8)
> +
> +/* Reuse ARM GNU/Linux HWCAP values for none. These are in defined in
> + <asm/elf.h> in current kernels. */
> +#define HWCAP_VFP 64
> +#define HWCAP_IWMMXT 512
> +#define HWCAP_NEON 4096
> +#define HWCAP_VFPv3 8192
> +#define HWCAP_VFPv3D16 16384
> +
> +/* Core file and register set support. */
> +
> +#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
> +
> +/* ---- based on arm-linux-tdep.c ---- */
> +
> +void
> +arm_none_supply_gregset (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *gregs_buf, size_t len)
> +{
> + struct gdbarch *gdbarch = regcache->arch ();
> + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
> + const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
> + int regno;
> + CORE_ADDR reg_pc;
> + gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
> +
> + for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
> +
> + if (regnum == ARM_PS_REGNUM || regnum == -1)
> + {
> + if (arm_apcs_32)
> + regcache->raw_supply (ARM_PS_REGNUM,
> + gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
> + else
> + regcache->raw_supply (ARM_PS_REGNUM,
> + gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
> + }
> +
> + if (regnum == ARM_PC_REGNUM || regnum == -1)
> + {
> + reg_pc = extract_unsigned_integer (
> + gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
> + ARM_INT_REGISTER_SIZE, byte_order);
> + reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
> + store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
> + reg_pc);
> + regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
> + }
> +}
> +
> +void
> +arm_none_collect_gregset (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *gregs_buf, size_t len)
> +{
> + gdb_byte *gregs = (gdb_byte *) gregs_buf;
> + int regno;
> +
> + for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + regcache->raw_collect (regno,
> + gregs + ARM_INT_REGISTER_SIZE * regno);
> +
> + if (regnum == ARM_PS_REGNUM || regnum == -1)
> + {
> + if (arm_apcs_32)
> + regcache->raw_collect (ARM_PS_REGNUM,
> + gregs + ARM_INT_REGISTER_SIZE * ARM_CPSR_GREGNUM);
> + else
> + regcache->raw_collect (ARM_PS_REGNUM,
> + gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
> + }
> +
> + if (regnum == ARM_PC_REGNUM || regnum == -1)
> + regcache->raw_collect (ARM_PC_REGNUM,
> + gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
> +}
> +
> +/* Support for register format used by the NWFPE FPA emulator. */
> +
> +#define typeNone 0x00
> +#define typeSingle 0x01
> +#define typeDouble 0x02
> +#define typeExtended 0x03
> +
> +void
> +arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
> + const gdb_byte *regs)
> +{
> + const gdb_byte *reg_data;
> + gdb_byte reg_tag;
> + gdb_byte buf[ARM_FP_REGISTER_SIZE];
> +
> + reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
> + reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
> + memset (buf, 0, ARM_FP_REGISTER_SIZE);
> +
> + switch (reg_tag)
> + {
> + case typeSingle:
> + memcpy (buf, reg_data, 4);
> + break;
> + case typeDouble:
> + memcpy (buf, reg_data + 4, 4);
> + memcpy (buf + 4, reg_data, 4);
> + break;
> + case typeExtended:
> + /* We want sign and exponent, then least significant bits,
> + then most significant. NWFPE does sign, most, least. */
> + memcpy (buf, reg_data, 4);
> + memcpy (buf + 4, reg_data + 8, 4);
> + memcpy (buf + 8, reg_data + 4, 4);
> + break;
> + default:
> + break;
> + }
> +
> + regcache->raw_supply (regno, buf);
> +}
> +
> +void
> +arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
> + gdb_byte *regs)
> +{
> + gdb_byte *reg_data;
> + gdb_byte reg_tag;
> + gdb_byte buf[ARM_FP_REGISTER_SIZE];
> +
> + regcache->raw_collect (regno, buf);
> +
> + /* NOTE drow/2006-06-07: This code uses the tag already in the
> + register buffer. I've preserved that when moving the code
> + from the native file to the target file. But this doesn't
> + always make sense. */
> +
> + reg_data = regs + (regno - ARM_F0_REGNUM) * ARM_FP_REGISTER_SIZE;
> + reg_tag = regs[(regno - ARM_F0_REGNUM) + NWFPE_TAGS_OFFSET];
> +
> + switch (reg_tag)
> + {
> + case typeSingle:
> + memcpy (reg_data, buf, 4);
> + break;
> + case typeDouble:
> + memcpy (reg_data, buf + 4, 4);
> + memcpy (reg_data + 4, buf, 4);
> + break;
> + case typeExtended:
> + memcpy (reg_data, buf, 4);
> + memcpy (reg_data + 4, buf + 8, 4);
> + memcpy (reg_data + 8, buf + 4, 4);
> + break;
> + default:
> + break;
> + }
> +}
> +
> +void
> +arm_none_supply_nwfpe (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *regs_buf, size_t len)
> +{
> + const gdb_byte *regs = (const gdb_byte *) regs_buf;
> + int regno;
> +
> + if (regnum == ARM_FPS_REGNUM || regnum == -1)
> + regcache->raw_supply (ARM_FPS_REGNUM,
> + regs + NWFPE_FPSR_OFFSET);
> +
> + for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + arm_none_supply_nwfpe_register (regcache, regno, regs);
> +}
> +
> +void
> +arm_none_collect_nwfpe (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *regs_buf, size_t len)
> +{
> + gdb_byte *regs = (gdb_byte *) regs_buf;
> + int regno;
> +
> + for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + arm_none_collect_nwfpe_register (regcache, regno, regs);
> +
> + if (regnum == ARM_FPS_REGNUM || regnum == -1)
> + regcache->raw_collect (ARM_FPS_REGNUM,
> + regs + ARM_INT_REGISTER_SIZE * ARM_FPS_REGNUM);
> +}
> +
> +/* Support VFP register format. */
> +
> +#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
> +
> +static void
> +arm_none_supply_vfp (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *regs_buf, size_t len)
> +{
> + const gdb_byte *regs = (const gdb_byte *) regs_buf;
> + int regno;
> +
> + if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
> + regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
> +
> + for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
> +}
> +
> +static void
> +arm_none_collect_vfp (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *regs_buf, size_t len)
> +{
> + gdb_byte *regs = (gdb_byte *) regs_buf;
> + int regno;
> +
> + if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
> + regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
> +
> + for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
> + if (regnum == -1 || regnum == regno)
> + regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
> +}
> +
> +static const struct regset arm_none_gregset =
> + {
> + NULL, arm_none_supply_gregset, arm_none_collect_gregset
> + };
> +
> +static const struct regset arm_none_fpregset =
> + {
> + NULL, arm_none_supply_nwfpe, arm_none_collect_nwfpe
> + };
> +
> +static const struct regset arm_none_vfpregset =
> + {
> + NULL, arm_none_supply_vfp, arm_none_collect_vfp
> + };
> +
> +/* Iterate over core file register note sections. */
> +
> +void
> +arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
> + iterate_over_regset_sections_cb *cb,
> + void *cb_data,
> + const struct regcache *regcache)
> +{
> + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
> +
> + cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
> + &arm_none_gregset, NULL, cb_data);
> +
> + if (tdep->vfp_register_count > 0)
> + cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
> + &arm_none_vfpregset, "VFP floating-point", cb_data);
> + else if (tdep->have_fpa_registers)
> + cb (".reg2", ARM_NONE_SIZEOF_NWFPE, ARM_NONE_SIZEOF_NWFPE,
> + &arm_none_fpregset, "FPA floating-point", cb_data);
> +}
> +
> +/* Determine target description from core file. */
> +
> +const struct target_desc *
> +arm_none_core_read_description (struct gdbarch *gdbarch,
> + struct target_ops *target,
> + bfd *abfd)
> +{
> + CORE_ADDR arm_hwcap = 0;
> + if (target_auxv_search (target, AT_HWCAP, &arm_hwcap) != 1)
> + return nullptr;
> +
> + if (arm_hwcap & HWCAP_VFP)
> + {
> + /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support
> + Neon with VFPv3-D32. */
> + if (arm_hwcap & HWCAP_NEON)
> + return aarch32_read_description ();
> + else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
> + return arm_read_description (ARM_FP_TYPE_VFPV3);
> +
> + return arm_read_description (ARM_FP_TYPE_VFPV2);
> + }
> +
> + return nullptr;
> +}
> diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
> new file mode 100644
> index 0000000000..7927c0aff3
> --- /dev/null
> +++ b/gdb/arm-none-tdep.h
> @@ -0,0 +1,60 @@
> +/* none on ARM target support, prototypes.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#ifndef ARM_NONE_TDEP_H
> +#define ARM_NONE_TDEP_H
> +
> +#include "gdbarch.h"
> +#include "target.h"
> +#include "bfd.h"
> +
> +struct regset;
> +struct regcache;
> +
> +void arm_none_supply_gregset (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *gregs_buf, size_t len);
> +void arm_none_collect_gregset (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *gregs_buf, size_t len);
> +
> +void arm_none_supply_nwfpe_register (struct regcache *regcache, int regno,
> + const gdb_byte *regs);
> +void arm_none_collect_nwfpe_register (const struct regcache *regcache, int regno,
> + gdb_byte *regs);
> +
> +void arm_none_supply_nwfpe (const struct regset *regset,
> + struct regcache *regcache,
> + int regnum, const void *regs_buf, size_t len);
> +void arm_none_collect_nwfpe (const struct regset *regset,
> + const struct regcache *regcache,
> + int regnum, void *regs_buf, size_t len);
> +
> +void
> +arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
> + iterate_over_regset_sections_cb *cb,
> + void *cb_data,
> + const struct regcache *regcache);
> +
> +const struct target_desc *
> +arm_none_core_read_description (struct gdbarch *gdbarch,
> + struct target_ops *target,
> + bfd *abfd);
> +
> +#endif /* ARM_NONE_TDEP_H */
> diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
> index a214f22d7a..be47cc2228 100644
> --- a/gdb/arm-tdep.c
> +++ b/gdb/arm-tdep.c
> @@ -50,6 +50,8 @@
> #include "arch/arm.h"
> #include "arch/arm-get-next-pcs.h"
> #include "arm-tdep.h"
> +#include "none-tdep.h"
> +#include "arm-none-tdep.h"
> #include "gdb/sim-arm.h"
>
> #include "elf-bfd.h"
> @@ -9453,6 +9455,12 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
> /* Virtual tables. */
> set_gdbarch_vbit_in_delta (gdbarch, 1);
>
> + /* Default none core file support, can be overridden by osabi. */
> + none_init_corefile (info, gdbarch);
> + set_gdbarch_iterate_over_regset_sections (gdbarch,
> + arm_none_iterate_over_regset_sections);
> + set_gdbarch_core_read_description (gdbarch, arm_none_core_read_description);
> +
> /* Hook in the ABI-specific overrides, if they have been registered. */
> gdbarch_init_osabi (info, gdbarch);
>
> diff --git a/gdb/configure.tgt b/gdb/configure.tgt
> index d865ecdcb6..f4a1540464 100644
> --- a/gdb/configure.tgt
> +++ b/gdb/configure.tgt
> @@ -64,7 +64,8 @@ arc*-*-*)
>
> arm*-*-*)
> cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
> - arch/arm-get-next-pcs.o arm-tdep.o";;
> + arch/arm-get-next-pcs.o arm-tdep.o \
> + none-tdep.o arm-none-tdep.o";;
>
> hppa*-*-*)
> # Target: HP PA-RISC
> @@ -798,4 +799,7 @@ for t in x ${gdb_target_obs}; do
> if test "$t" = linux-tdep.o; then
> gdb_have_gcore=true
> fi
> + if test "$t" = arm-none-tdep.o; then
> + gdb_have_gcore=true
> + fi
> done
> diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
> new file mode 100644
> index 0000000000..5ac5c6c707
> --- /dev/null
> +++ b/gdb/none-tdep.c
> @@ -0,0 +1,335 @@
> +/* Target-dependent code for none, architecture independent.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#include "defs.h"
> +#include "gdbtypes.h"
> +#include "none-tdep.h"
> +#include "auxv.h"
> +#include "target.h"
> +#include "gdbthread.h"
> +#include "gdbcore.h"
> +#include "regcache.h"
> +#include "regset.h"
> +#include "elf/common.h"
> +#include "elf-bfd.h" /* for elfcore_write_* */
> +#include "inferior.h"
> +#include "cli/cli-utils.h"
> +#include "arch-utils.h"
> +#include "gdb_obstack.h"
> +#include "observable.h"
> +#include "objfiles.h"
> +#include "infcall.h"
> +#include "gdbcmd.h"
> +#include "gdb_regex.h"
> +#include "gdbsupport/enum-flags.h"
> +#include "gdbsupport/gdb_optional.h"
> +
> +#include <ctype.h>
> +
> +/* ---- based on linux-tdep.c ---- */
> +
> +/* Structure for passing information from
> + none_collect_thread_registers via an iterator to
> + none_collect_regset_section_cb. */
> +
> +struct none_collect_regset_section_cb_data
> +{
> + struct gdbarch *gdbarch;
> + const struct regcache *regcache;
> + bfd *obfd;
> + char *note_data;
> + int *note_size;
> + unsigned long lwp;
> + enum gdb_signal stop_signal;
> + int abort_iteration;
> +};
> +
> +/* Callback for iterate_over_regset_sections that records a single
> + regset in the corefile note section. */
> +
> +static void
> +none_collect_regset_section_cb (const char *sect_name, int supply_size,
> + int collect_size, const struct regset *regset,
> + const char *human_name, void *cb_data)
> +{
> + struct none_collect_regset_section_cb_data *data
> + = (struct none_collect_regset_section_cb_data *) cb_data;
> + bool variable_size_section = (regset != NULL
> + && regset->flags & REGSET_VARIABLE_SIZE);
> +
> + if (!variable_size_section)
> + gdb_assert (supply_size == collect_size);
> +
> + if (data->abort_iteration)
> + return;
> +
> + gdb_assert (regset && regset->collect_regset);
> +
> + /* This is intentionally zero-initialized by using std::vector, so
> + that any padding bytes in the core file will show as 0. */
> + std::vector<gdb_byte> buf (collect_size);
> +
> + regset->collect_regset (regset, data->regcache, -1, buf.data (),
> + collect_size);
> +
> + /* PRSTATUS still needs to be treated specially. */
> + if (strcmp (sect_name, ".reg") == 0)
> + data->note_data = (char *) elfcore_write_prstatus
> + (data->obfd, data->note_data, data->note_size, data->lwp,
> + gdb_signal_to_host (data->stop_signal), buf.data ());
> + else
> + data->note_data = (char *) elfcore_write_register_note
> + (data->obfd, data->note_data, data->note_size,
> + sect_name, buf.data (), collect_size);
> +
> + if (data->note_data == NULL)
> + data->abort_iteration = 1;
> +}
> +
> +/* Records the thread's register state for the corefile note
> + section. */
> +
> +static char *
> +none_collect_thread_registers (const struct regcache *regcache,
> + ptid_t ptid, bfd *obfd,
> + char *note_data, int *note_size,
> + enum gdb_signal stop_signal)
> +{
> + struct gdbarch *gdbarch = regcache->arch ();
> + struct none_collect_regset_section_cb_data data;
> +
> + data.gdbarch = gdbarch;
> + data.regcache = regcache;
> + data.obfd = obfd;
> + data.note_data = note_data;
> + data.note_size = note_size;
> + data.stop_signal = stop_signal;
> + data.abort_iteration = 0;
> +
> + /* For remote targets the LWP may not be available, so use the TID. */
> + data.lwp = ptid.lwp ();
> + if (!data.lwp)
> + data.lwp = ptid.tid ();
> +
> + gdbarch_iterate_over_regset_sections (gdbarch,
> + none_collect_regset_section_cb,
> + &data, regcache);
> + return data.note_data;
> +}
> +
> +/* Fetch the siginfo data for the specified thread, if it exists. If
> + there is no data, or we could not read it, return an empty
> + buffer. */
> +
> +static gdb::byte_vector
> +none_get_siginfo_data (thread_info *thread, struct gdbarch *gdbarch)
> +{
> + struct type *siginfo_type;
> + LONGEST bytes_read;
> +
> + if (!gdbarch_get_siginfo_type_p (gdbarch))
> + return gdb::byte_vector ();
> +
> + scoped_restore_current_thread save_current_thread;
> + switch_to_thread (thread);
> +
> + siginfo_type = gdbarch_get_siginfo_type (gdbarch);
> +
> + gdb::byte_vector buf (TYPE_LENGTH (siginfo_type));
> +
> + bytes_read = target_read (current_top_target (), TARGET_OBJECT_SIGNAL_INFO, NULL,
> + buf.data (), 0, TYPE_LENGTH (siginfo_type));
> + if (bytes_read != TYPE_LENGTH (siginfo_type))
> + buf.clear ();
> +
> + return buf;
> +}
> +
> +struct none_corefile_thread_data
> +{
> + struct gdbarch *gdbarch;
> + bfd *obfd;
> + char *note_data;
> + int *note_size;
> + enum gdb_signal stop_signal;
> +};
> +
> +/* Records the thread's register state for the corefile note
> + section. */
> +
> +static void
> +none_corefile_thread (struct thread_info *info,
> + struct none_corefile_thread_data *args)
> +{
> + struct regcache *regcache;
> +
> + regcache = get_thread_arch_regcache (info->inf->process_target (),
> + info->ptid, args->gdbarch);
> +
> + target_fetch_registers (regcache, -1);
> + gdb::byte_vector siginfo_data = none_get_siginfo_data (info, args->gdbarch);
> +
> + args->note_data = none_collect_thread_registers
> + (regcache, info->ptid, args->obfd, args->note_data,
> + args->note_size, args->stop_signal);
> +
> + /* Don't return anything if we got no register information above,
> + such a core file is useless. */
> + if (args->note_data != NULL)
> + if (!siginfo_data.empty ())
> + args->note_data = elfcore_write_note (args->obfd,
> + args->note_data,
> + args->note_size,
> + "CORE", NT_SIGINFO,
> + siginfo_data.data (),
> + siginfo_data.size ());
> +}
> +
> +/* Find the signalled thread. In case there's more than one signalled
> + thread, prefer the current thread, if it is signalled. If no
> + thread was signalled, default to the current thread, unless it has
> + exited, in which case return NULL. */
> +
> +static thread_info *
> +find_signalled_thread ()
> +{
> + thread_info *curr_thr = inferior_thread ();
> + if (curr_thr->state != THREAD_EXITED
> + && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
> + return curr_thr;
> +
> + for (thread_info *thr : current_inferior ()->non_exited_threads ())
> + if (thr->suspend.stop_signal != GDB_SIGNAL_0)
> + return thr;
> +
> + /* Default to the current thread, unless it has exited. */
> + if (curr_thr->state != THREAD_EXITED)
> + return curr_thr;
> +
> + return nullptr;
> +}
> +
> +/* Fills the "to_make_corefile_note" target vector. Builds the note
> + section for a corefile, and returns it in a malloc buffer. */
> +
> +char *
> +none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
> + none_collect_thread_registers_ftype collect)
> +{
> + struct none_corefile_thread_data thread_args;
> + char *note_data = NULL;
> +
> + /* Process information. */
> + if (get_exec_file (0))
> + {
> + const char *fname = lbasename (get_exec_file (0));
> + char *psargs = xstrdup (fname);
> +
> + if (get_inferior_args ())
> + psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
> + (char *) NULL);
> +
> + note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
> + fname, psargs);
> + xfree (psargs);
> + }
> +
> + if (!note_data)
> + return NULL;
> +
> + /* Thread register information. */
> + try
> + {
> + update_thread_list ();
> + }
> + catch (const gdb_exception_error &e)
> + {
> + exception_print (gdb_stderr, e);
> + }
> +
> + /* Like the kernel, prefer dumping the signalled thread first.
> + "First thread" is what tools use to infer the signalled
> + thread. */
> + thread_info *signalled_thr = find_signalled_thread ();
> +
> + thread_args.gdbarch = gdbarch;
> + thread_args.obfd = obfd;
> + thread_args.note_data = note_data;
> + thread_args.note_size = note_size;
> + if (signalled_thr != nullptr)
> + thread_args.stop_signal = signalled_thr->suspend.stop_signal;
> + else
> + thread_args.stop_signal = GDB_SIGNAL_0;
> +
> + if (signalled_thr != nullptr)
> + none_corefile_thread (signalled_thr, &thread_args);
> + for (thread_info *thr : current_inferior ()->non_exited_threads ())
> + {
> + if (thr == signalled_thr)
> + continue;
> +
> + none_corefile_thread (thr, &thread_args);
> + }
> +
> + note_data = thread_args.note_data;
> + if (!note_data)
> + return NULL;
> +
> + /* Auxillary vector. */
> + gdb::optional<gdb::byte_vector> auxv =
> + target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
> + if (auxv && !auxv->empty ())
> + {
> + note_data = elfcore_write_note (obfd, note_data, note_size,
> + "CORE", NT_AUXV, auxv->data (),
> + auxv->size ());
> + if (!note_data)
> + return NULL;
> + }
> +
> + /* make_cleanup (xfree, note_data); */
> + return note_data;
> +}
> +
> +static char *
> +none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
> +{
> + return none_make_corefile_notes (gdbarch, obfd, note_size,
> + none_collect_thread_registers);
> +}
> +
> +/* Setup default core file support for none targets.
> + Can be overridden later by OSABI. */
> +
> +void
> +none_init_corefile (struct gdbarch_info info,
> + struct gdbarch *gdbarch)
> +{
> + /* Default core file support. */
> + set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes_1);
> +}
> +
> +/* Provide a prototype to silence -Wmissing-prototypes. */
> +extern initialize_file_ftype _initialize_none_tdep;
> +
> +void
> +_initialize_none_tdep (void)
> +{
> + /* No special actions. */
> +}
> diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
> new file mode 100644
> index 0000000000..4aea7004d8
> --- /dev/null
> +++ b/gdb/none-tdep.h
> @@ -0,0 +1,39 @@
> +/* Target-dependent code for none, architecture independent.
> +
> + Copyright (C) 2020 Free Software Foundation, Inc.
> +
> + This file is part of GDB.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 3 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program. If not, see <http://www.gnu.org/licenses/>. */
> +
> +#ifndef NONE_TDEP_H
> +#define NONE_TDEP_H
> +
> +#include "bfd.h"
> +
> +struct regcache;
> +
> +typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
> + ptid_t,
> + bfd *, char *, int *,
> + enum gdb_signal);
> +char *
> +none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
> + none_collect_thread_registers_ftype collect);
> +
> +void
> +none_init_corefile (struct gdbarch_info info,
> + struct gdbarch *gdbarch);
> +
> +#endif /* none-tdep.h */
>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3][PR gdb/14383]: gdb: corefile support for arm-none-eabi target
2020-10-20 11:41 ` Fredrik Hederstierna
` (3 preceding siblings ...)
2020-10-20 21:58 ` [PATCH v2] Support for corefiles for arm-none-eabi target Fredrik Hederstierna
@ 2020-10-22 0:44 ` Fredrik Hederstierna
2020-10-22 0:44 ` [PATCH v3][PR gdb/14383]: Support for corefiles " Fredrik Hederstierna
2020-10-25 20:46 ` [PATCH] " Fredrik Hederstierna
2020-10-25 20:50 ` [PATCH v4][PR gdb/14383] " Fredrik Hederstierna
6 siblings, 1 reply; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-22 0:44 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
This patch adds corefile support for arm-none-eabi targets.
2020-10-20 Fredrik Hederstierna <fredrik@hederstierna.com>
PR gdb/14383
* Makefile.in (ALL_TARGET_OBS): Add new files below.
* configure.tgt: Add support for none target.
* arm-tdep.c (arm_gdbarch_init): Added init for default none corefile.
* arm-none-tdep.h: New file.
* arm-none-tdep.c: New file.
* none-tdep.h: New file.
* none-tdep.c: New file.
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH v3][PR gdb/14383]: Support for corefiles for arm-none-eabi target.
2020-10-22 0:44 ` [PATCH v3][PR gdb/14383]: gdb: corefile support " Fredrik Hederstierna
@ 2020-10-22 0:44 ` Fredrik Hederstierna
0 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-22 0:44 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: fredrikhederstierna
From: fredrikhederstierna <fredrik@hederstierna.com>
---
gdb/Makefile.in | 6 +
gdb/arm-none-tdep.c | 184 +++++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 42 +++++++
gdb/arm-tdep.c | 7 ++
gdb/configure.tgt | 3 +-
gdb/none-tdep.c | 276 ++++++++++++++++++++++++++++++++++++++++++++
gdb/none-tdep.h | 30 +++++
7 files changed, 547 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8a160896e2..61a13312ce 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -721,6 +721,7 @@ ALL_TARGET_OBS = \
arm-fbsd-tdep.o \
arm-linux-tdep.o \
arm-netbsd-tdep.o \
+ arm-none-tdep.o \
arm-obsd-tdep.o \
arm-pikeos-tdep.o \
arm-symbian-tdep.o \
@@ -788,6 +789,7 @@ ALL_TARGET_OBS = \
nds32-tdep.o \
nios2-linux-tdep.o \
nios2-tdep.o \
+ none-tdep.o \
nto-tdep.o \
obsd-tdep.o \
or1k-linux-tdep.o \
@@ -1225,6 +1227,7 @@ HFILES_NO_SRCDIR = \
arch-utils.h \
arm-linux-tdep.h \
arm-netbsd-tdep.h \
+ arm-none-tdep.h \
arm-tdep.h \
async-event.h \
auto-load.h \
@@ -1350,6 +1353,7 @@ HFILES_NO_SRCDIR = \
netbsd-tdep.h \
nds32-tdep.h \
nios2-tdep.h \
+ none-tdep.h \
nto-tdep.h \
objc-lang.h \
objfiles.h \
@@ -2152,6 +2156,7 @@ ALLDEPFILES = \
arm-linux-tdep.c \
arm-netbsd-nat.c \
arm-netbsd-tdep.c \
+ arm-none-tdep.c \
arm-obsd-tdep.c \
arm-symbian-tdep.c \
arm-tdep.c \
@@ -2238,6 +2243,7 @@ ALLDEPFILES = \
nds32-tdep.c \
nios2-linux-tdep.c \
nios2-tdep.c \
+ none-tdep.c \
obsd-nat.c \
obsd-tdep.c \
posix-hdep.c \
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..c355feff2f
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,184 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
+#include "breakpoint.h"
+#include "auxv.h"
+
+#include "aarch32-tdep.h"
+#include "arch/arm.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+#include "elf/common.h"
+
+/* The ARM none register setup is based on the ARM GNU/Linux design. */
+
+static void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+static void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support VFP register format. */
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ nullptr, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ nullptr, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, nullptr, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..927fd91c43
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,42 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "bfd.h"
+#include "regset.h"
+
+struct regcache;
+
+/* Core file and register set support. */
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* Support VFP register format. */
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+/* The index to access CSPR in user_regs as defined in GLIBC. */
+#define ARM_NONE_CPSR_GREGNUM 16
+
+void
+ arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..3ee444f09a 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -9453,6 +9455,11 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (info, gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..789541d49f 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..9a2b5b9442
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,276 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "none-tdep.h"
+#include "target.h"
+#include "gdbthread.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "regset.h"
+#include "elf/common.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+#include "cli/cli-utils.h"
+#include "arch-utils.h"
+#include "gdb_obstack.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "infcall.h"
+#include "gdbcmd.h"
+#include "gdb_regex.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
+
+#include <ctype.h>
+
+typedef char *(*none_collect_thread_registers_ftype) (const struct regcache *,
+ ptid_t,
+ bfd *, char *, int *,
+ enum gdb_signal);
+
+/* The ARM none corefile setup is based on the ARM GNU/Linux design. */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ int abort_iteration;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != nullptr
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data = (char *) elfcore_write_prstatus
+ (data->obfd, data->note_data, data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal), buf.data ());
+ else
+ data->note_data = (char *) elfcore_write_register_note
+ (data->obfd, data->note_data, data->note_size,
+ sect_name, buf.data (), collect_size);
+
+ if (data->note_data == nullptr)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static char *
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ char *note_data, int *note_size,
+ enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct none_collect_regset_section_cb_data data;
+
+ data.gdbarch = gdbarch;
+ data.regcache = regcache;
+ data.obfd = obfd;
+ data.note_data = note_data;
+ data.note_size = note_size;
+ data.stop_signal = stop_signal;
+ data.abort_iteration = 0;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ data.lwp = ptid.lwp ();
+ if (!data.lwp)
+ data.lwp = ptid.tid ();
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+ return data.note_data;
+}
+
+struct none_corefile_thread_data
+{
+ struct gdbarch *gdbarch;
+ bfd *obfd;
+ char *note_data;
+ int *note_size;
+ enum gdb_signal stop_signal;
+};
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_corefile_thread (struct thread_info *info,
+ struct none_corefile_thread_data *args)
+{
+ struct regcache *regcache;
+
+ regcache = get_thread_arch_regcache (info->inf->process_target (),
+ info->ptid, args->gdbarch);
+
+ target_fetch_registers (regcache, -1);
+ args->note_data = none_collect_thread_registers
+ (regcache, info->ptid, args->obfd, args->note_data,
+ args->note_size, args->stop_signal);
+}
+
+/* Find the signalled thread. In case there's more than one signalled
+ thread, prefer the current thread, if it is signalled. If no
+ thread was signalled, default to the current thread, unless it has
+ exited, in which case return nullptr. */
+
+static thread_info *
+find_signalled_thread ()
+{
+ thread_info *curr_thr = inferior_thread ();
+ if (curr_thr->state != THREAD_EXITED
+ && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return curr_thr;
+
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ if (thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return thr;
+
+ /* Default to the current thread, unless it has exited. */
+ if (curr_thr->state != THREAD_EXITED)
+ return curr_thr;
+
+ return nullptr;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+static char *
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ struct none_corefile_thread_data thread_args;
+ char *note_data = nullptr;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ char *psargs = xstrdup (fname);
+
+ if (get_inferior_args ())
+ psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+ (char *) nullptr);
+
+ note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
+ fname, psargs);
+ xfree (psargs);
+ }
+
+ if (!note_data)
+ return nullptr;
+
+ /* Thread register information. */
+ try
+ {
+ update_thread_list ();
+ }
+ catch (const gdb_exception_error &e)
+ {
+ exception_print (gdb_stderr, e);
+ }
+
+ /* Like the kernel, prefer dumping the signalled thread first.
+ "First thread" is what tools use to infer the signalled
+ thread. */
+ thread_info *signalled_thr = find_signalled_thread ();
+
+ thread_args.gdbarch = gdbarch;
+ thread_args.obfd = obfd;
+ thread_args.note_data = note_data;
+ thread_args.note_size = note_size;
+ if (signalled_thr != nullptr)
+ thread_args.stop_signal = signalled_thr->suspend.stop_signal;
+ else
+ thread_args.stop_signal = GDB_SIGNAL_0;
+
+ if (signalled_thr != nullptr)
+ none_corefile_thread (signalled_thr, &thread_args);
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ {
+ if (thr == signalled_thr)
+ continue;
+
+ none_corefile_thread (thr, &thread_args);
+ }
+
+ note_data = thread_args.note_data;
+ if (!note_data)
+ return nullptr;
+
+ return note_data;
+}
+
+static char *
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes_1 (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes);
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..e5054189b5
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,30 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "bfd.h"
+
+struct regcache;
+
+void none_init_corefile (struct gdbarch_info info,
+ struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH] Support for corefiles for arm-none-eabi target.
2020-10-20 11:41 ` Fredrik Hederstierna
` (4 preceding siblings ...)
2020-10-22 0:44 ` [PATCH v3][PR gdb/14383]: gdb: corefile support " Fredrik Hederstierna
@ 2020-10-25 20:46 ` Fredrik Hederstierna
2020-10-25 20:50 ` [PATCH v4][PR gdb/14383] " Fredrik Hederstierna
6 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-25 20:46 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: fredrikhederstierna
From: fredrikhederstierna <fredrik@hederstierna.com>
---
gdb/Makefile.in | 6 +
gdb/arm-none-tdep.c | 161 +++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 31 ++++++
gdb/arm-tdep.c | 11 ++
gdb/configure.tgt | 3 +-
gdb/none-tdep.c | 264 ++++++++++++++++++++++++++++++++++++++++++++
gdb/none-tdep.h | 27 +++++
sim/arm/wrapper.c | 4 +
8 files changed, 506 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8a160896e2..61a13312ce 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -721,6 +721,7 @@ ALL_TARGET_OBS = \
arm-fbsd-tdep.o \
arm-linux-tdep.o \
arm-netbsd-tdep.o \
+ arm-none-tdep.o \
arm-obsd-tdep.o \
arm-pikeos-tdep.o \
arm-symbian-tdep.o \
@@ -788,6 +789,7 @@ ALL_TARGET_OBS = \
nds32-tdep.o \
nios2-linux-tdep.o \
nios2-tdep.o \
+ none-tdep.o \
nto-tdep.o \
obsd-tdep.o \
or1k-linux-tdep.o \
@@ -1225,6 +1227,7 @@ HFILES_NO_SRCDIR = \
arch-utils.h \
arm-linux-tdep.h \
arm-netbsd-tdep.h \
+ arm-none-tdep.h \
arm-tdep.h \
async-event.h \
auto-load.h \
@@ -1350,6 +1353,7 @@ HFILES_NO_SRCDIR = \
netbsd-tdep.h \
nds32-tdep.h \
nios2-tdep.h \
+ none-tdep.h \
nto-tdep.h \
objc-lang.h \
objfiles.h \
@@ -2152,6 +2156,7 @@ ALLDEPFILES = \
arm-linux-tdep.c \
arm-netbsd-nat.c \
arm-netbsd-tdep.c \
+ arm-none-tdep.c \
arm-obsd-tdep.c \
arm-symbian-tdep.c \
arm-tdep.c \
@@ -2238,6 +2243,7 @@ ALLDEPFILES = \
nds32-tdep.c \
nios2-linux-tdep.c \
nios2-tdep.c \
+ none-tdep.c \
obsd-nat.c \
obsd-tdep.c \
posix-hdep.c \
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..0288e13175
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,161 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+
+/* Core file and register set support. */
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* Support VFP register format. */
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+/* The index to access CSPR in user_regs as defined in GLIBC. */
+#define ARM_NONE_CPSR_GREGNUM 16
+
+/* The ARM none register setup is based on the ARM GNU/Linux design. */
+
+static void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+static void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support VFP register format. */
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ nullptr, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ nullptr, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, nullptr, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7e2784ff93
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,31 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "bfd.h"
+#include "regset.h"
+
+void
+ arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..c361818367 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -4205,6 +4207,10 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
+ /* The ARM simulator does not support D0-D31 nor FPSCR. */
+ if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
+ return -1;
+
if (reg < NUM_GREGS)
return SIM_ARM_R0_REGNUM + reg;
reg -= NUM_GREGS;
@@ -9453,6 +9459,11 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..789541d49f 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..b7a49924c6
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,264 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "none-tdep.h"
+#include "regset.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+
+using none_collect_thread_registers_ftype
+ = void (const struct regcache *, ptid_t, bfd *,
+ gdb::unique_xmalloc_ptr<char> &, int *, enum gdb_signal);
+
+/* The ARM none corefile setup is based on the ARM GNU/Linux design. */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ none_collect_regset_section_cb_data (struct gdbarch *gdbarch,
+ const struct regcache *regcache,
+ bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size,
+ unsigned long lwp,
+ enum gdb_signal stop_signal)
+ : gdbarch (gdbarch), regcache (regcache), obfd (obfd),
+ note_data (note_data), note_size (note_size),
+ lwp (lwp), stop_signal (stop_signal)
+ {}
+
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> ¬e_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ bool abort_iteration = false;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != nullptr
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data.reset (elfcore_write_prstatus
+ (data->obfd, data->note_data.release (),
+ data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal),
+ buf.data ()));
+ else
+ data->note_data.reset (elfcore_write_register_note
+ (data->obfd, data->note_data.release (),
+ data->note_size, sect_name, buf.data (),
+ collect_size));
+
+ if (data->note_data == nullptr)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size, enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ unsigned long lwp;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ lwp = ptid.lwp ();
+ if (lwp == 0)
+ lwp = ptid.tid ();
+
+ none_collect_regset_section_cb_data data (gdbarch, regcache, obfd, note_data,
+ note_size, lwp, stop_signal);
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+}
+
+struct none_corefile_thread_data
+{
+ none_corefile_thread_data (struct gdbarch *gdbarch,
+ bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size,
+ enum gdb_signal stop_signal)
+ : gdbarch (gdbarch), obfd (obfd), note_data (note_data),
+ note_size (note_size), stop_signal (stop_signal)
+ {}
+
+ struct gdbarch *gdbarch;
+ bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> ¬e_data;
+ int *note_size;
+ enum gdb_signal stop_signal;
+};
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_corefile_thread (struct thread_info *info,
+ struct none_corefile_thread_data *args)
+{
+ struct regcache *regcache;
+
+ regcache = get_thread_arch_regcache (info->inf->process_target (),
+ info->ptid, args->gdbarch);
+
+ target_fetch_registers (regcache, -1);
+ none_collect_thread_registers
+ (regcache, info->ptid, args->obfd, args->note_data,
+ args->note_size, args->stop_signal);
+}
+
+/* Find the signalled thread. In case there's more than one signalled
+ thread, prefer the current thread, if it is signalled. If no
+ thread was signalled, default to the current thread, unless it has
+ exited, in which case return nullptr. */
+
+static thread_info *
+find_signalled_thread ()
+{
+ thread_info *curr_thr = inferior_thread ();
+ if (curr_thr->state != THREAD_EXITED
+ && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return curr_thr;
+
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ if (thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return thr;
+
+ /* Default to the current thread, unless it has exited. */
+ if (curr_thr->state != THREAD_EXITED)
+ return curr_thr;
+
+ return nullptr;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+static gdb::unique_xmalloc_ptr<char>
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ gdb::unique_xmalloc_ptr<char> note_data;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ std::string psargs = fname;
+ note_data.reset (elfcore_write_prpsinfo (obfd, note_data.release (),
+ note_size, fname,
+ psargs.c_str ()));
+ }
+
+ if (!note_data)
+ return nullptr;
+
+ /* Thread register information. */
+ try
+ {
+ update_thread_list ();
+ }
+ catch (const gdb_exception_error &e)
+ {
+ exception_print (gdb_stderr, e);
+ }
+
+ /* Like the kernel, prefer dumping the signalled thread first.
+ "First thread" is what tools use to infer the signalled
+ thread. */
+ thread_info *signalled_thr = find_signalled_thread ();
+ gdb_signal stop_signal;
+
+ if (signalled_thr != nullptr)
+ stop_signal = signalled_thr->suspend.stop_signal;
+ else
+ stop_signal = GDB_SIGNAL_0;
+
+ none_corefile_thread_data thread_args (gdbarch, obfd, note_data, note_size,
+ stop_signal);
+
+ if (signalled_thr != nullptr)
+ none_corefile_thread (signalled_thr, &thread_args);
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ {
+ if (thr == signalled_thr)
+ continue;
+
+ none_corefile_thread (thr, &thread_args);
+ }
+
+ return note_data;
+}
+
+static gdb::unique_xmalloc_ptr<char>
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes_1 (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes);
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..f25b124019
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,27 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "gdbarch.h"
+
+void none_init_corefile (struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 68f8242288..759dac0331 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -515,6 +515,10 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
init ();
+ /* Check that memory and length are valid before trying read reg. */
+ if ((memory == NULL) || (length == 0))
+ return 0;
+
switch ((enum sim_arm_regs) rn)
{
case SIM_ARM_R0_REGNUM:
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH v4][PR gdb/14383] Support for corefiles for arm-none-eabi target.
2020-10-20 11:41 ` Fredrik Hederstierna
` (5 preceding siblings ...)
2020-10-25 20:46 ` [PATCH] " Fredrik Hederstierna
@ 2020-10-25 20:50 ` Fredrik Hederstierna
6 siblings, 0 replies; 39+ messages in thread
From: Fredrik Hederstierna @ 2020-10-25 20:50 UTC (permalink / raw)
To: gdb-patches, simark, luis.machado, Alan.Hayward, paulmathieu
Cc: fredrikhederstierna
From: fredrikhederstierna <fredrik@hederstierna.com>
---
gdb/Makefile.in | 6 +
gdb/arm-none-tdep.c | 161 +++++++++++++++++++++++++++
gdb/arm-none-tdep.h | 31 ++++++
gdb/arm-tdep.c | 11 ++
gdb/configure.tgt | 3 +-
gdb/none-tdep.c | 264 ++++++++++++++++++++++++++++++++++++++++++++
gdb/none-tdep.h | 27 +++++
sim/arm/wrapper.c | 4 +
8 files changed, 506 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-none-tdep.c
create mode 100644 gdb/arm-none-tdep.h
create mode 100644 gdb/none-tdep.c
create mode 100644 gdb/none-tdep.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8a160896e2..61a13312ce 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -721,6 +721,7 @@ ALL_TARGET_OBS = \
arm-fbsd-tdep.o \
arm-linux-tdep.o \
arm-netbsd-tdep.o \
+ arm-none-tdep.o \
arm-obsd-tdep.o \
arm-pikeos-tdep.o \
arm-symbian-tdep.o \
@@ -788,6 +789,7 @@ ALL_TARGET_OBS = \
nds32-tdep.o \
nios2-linux-tdep.o \
nios2-tdep.o \
+ none-tdep.o \
nto-tdep.o \
obsd-tdep.o \
or1k-linux-tdep.o \
@@ -1225,6 +1227,7 @@ HFILES_NO_SRCDIR = \
arch-utils.h \
arm-linux-tdep.h \
arm-netbsd-tdep.h \
+ arm-none-tdep.h \
arm-tdep.h \
async-event.h \
auto-load.h \
@@ -1350,6 +1353,7 @@ HFILES_NO_SRCDIR = \
netbsd-tdep.h \
nds32-tdep.h \
nios2-tdep.h \
+ none-tdep.h \
nto-tdep.h \
objc-lang.h \
objfiles.h \
@@ -2152,6 +2156,7 @@ ALLDEPFILES = \
arm-linux-tdep.c \
arm-netbsd-nat.c \
arm-netbsd-tdep.c \
+ arm-none-tdep.c \
arm-obsd-tdep.c \
arm-symbian-tdep.c \
arm-tdep.c \
@@ -2238,6 +2243,7 @@ ALLDEPFILES = \
nds32-tdep.c \
nios2-linux-tdep.c \
nios2-tdep.c \
+ none-tdep.c \
obsd-nat.c \
obsd-tdep.c \
posix-hdep.c \
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
new file mode 100644
index 0000000000..0288e13175
--- /dev/null
+++ b/gdb/arm-none-tdep.c
@@ -0,0 +1,161 @@
+/* none on ARM target support.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "arm-tdep.h"
+#include "arm-none-tdep.h"
+
+/* Core file and register set support. */
+#define ARM_NONE_SIZEOF_GREGSET (18 * ARM_INT_REGISTER_SIZE)
+
+/* Support VFP register format. */
+#define ARM_NONE_SIZEOF_VFP (32 * 8 + 4)
+
+/* The index to access CSPR in user_regs as defined in GLIBC. */
+#define ARM_NONE_CPSR_GREGNUM 16
+
+/* The ARM none register setup is based on the ARM GNU/Linux design. */
+
+static void
+arm_none_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs_buf, size_t len)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ const gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ int regno;
+ CORE_ADDR reg_pc;
+ gdb_byte pc_buf[ARM_INT_REGISTER_SIZE];
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_supply (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ {
+ reg_pc = extract_unsigned_integer (
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM,
+ ARM_INT_REGISTER_SIZE, byte_order);
+ reg_pc = gdbarch_addr_bits_remove (gdbarch, reg_pc);
+ store_unsigned_integer (pc_buf, ARM_INT_REGISTER_SIZE, byte_order,
+ reg_pc);
+ regcache->raw_supply (ARM_PC_REGNUM, pc_buf);
+ }
+}
+
+static void
+arm_none_collect_gregset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *gregs_buf, size_t len)
+{
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
+ int regno;
+
+ for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno,
+ gregs + ARM_INT_REGISTER_SIZE * regno);
+
+ if (regnum == ARM_PS_REGNUM || regnum == -1)
+ {
+ if (arm_apcs_32)
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_NONE_CPSR_GREGNUM);
+ else
+ regcache->raw_collect (ARM_PS_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+ }
+
+ if (regnum == ARM_PC_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_PC_REGNUM,
+ gregs + ARM_INT_REGISTER_SIZE * ARM_PC_REGNUM);
+}
+
+/* Support VFP register format. */
+
+static void
+arm_none_supply_vfp (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *regs_buf, size_t len)
+{
+ const gdb_byte *regs = (const gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_supply (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_supply (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static void
+arm_none_collect_vfp (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *regs_buf, size_t len)
+{
+ gdb_byte *regs = (gdb_byte *) regs_buf;
+ int regno;
+
+ if (regnum == ARM_FPSCR_REGNUM || regnum == -1)
+ regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
+
+ for (regno = ARM_D0_REGNUM; regno <= ARM_D31_REGNUM; regno++)
+ if (regnum == -1 || regnum == regno)
+ regcache->raw_collect (regno, regs + (regno - ARM_D0_REGNUM) * 8);
+}
+
+static const struct regset arm_none_gregset =
+ {
+ nullptr, arm_none_supply_gregset, arm_none_collect_gregset
+ };
+
+static const struct regset arm_none_vfpregset =
+ {
+ nullptr, arm_none_supply_vfp, arm_none_collect_vfp
+ };
+
+/* Iterate over core file register note sections. */
+
+void
+arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ cb (".reg", ARM_NONE_SIZEOF_GREGSET, ARM_NONE_SIZEOF_GREGSET,
+ &arm_none_gregset, nullptr, cb_data);
+
+ if (tdep->vfp_register_count > 0)
+ cb (".reg-arm-vfp", ARM_NONE_SIZEOF_VFP, ARM_NONE_SIZEOF_VFP,
+ &arm_none_vfpregset, "VFP floating-point", cb_data);
+}
diff --git a/gdb/arm-none-tdep.h b/gdb/arm-none-tdep.h
new file mode 100644
index 0000000000..7e2784ff93
--- /dev/null
+++ b/gdb/arm-none-tdep.h
@@ -0,0 +1,31 @@
+/* none on ARM target support, prototypes.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef ARM_NONE_TDEP_H
+#define ARM_NONE_TDEP_H
+
+#include "bfd.h"
+#include "regset.h"
+
+void
+ arm_none_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
+#endif /* ARM_NONE_TDEP_H */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a214f22d7a..c361818367 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -50,6 +50,8 @@
#include "arch/arm.h"
#include "arch/arm-get-next-pcs.h"
#include "arm-tdep.h"
+#include "none-tdep.h"
+#include "arm-none-tdep.h"
#include "gdb/sim-arm.h"
#include "elf-bfd.h"
@@ -4205,6 +4207,10 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum)
if (regnum >= ARM_WCGR0_REGNUM && regnum <= ARM_WCGR7_REGNUM)
return regnum - ARM_WCGR0_REGNUM + SIM_ARM_IWMMXT_COP1R8_REGNUM;
+ /* The ARM simulator does not support D0-D31 nor FPSCR. */
+ if (regnum >= ARM_D0_REGNUM && regnum <= ARM_FPSCR_REGNUM)
+ return -1;
+
if (reg < NUM_GREGS)
return SIM_ARM_R0_REGNUM + reg;
reg -= NUM_GREGS;
@@ -9453,6 +9459,11 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Virtual tables. */
set_gdbarch_vbit_in_delta (gdbarch, 1);
+ /* Default none core file support, can be overridden by osabi. */
+ none_init_corefile (gdbarch);
+ set_gdbarch_iterate_over_regset_sections (gdbarch,
+ arm_none_iterate_over_regset_sections);
+
/* Hook in the ABI-specific overrides, if they have been registered. */
gdbarch_init_osabi (info, gdbarch);
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d865ecdcb6..789541d49f 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -64,7 +64,8 @@ arc*-*-*)
arm*-*-*)
cpu_obs="aarch32-tdep.o arch/aarch32.o arch/arm.o \
- arch/arm-get-next-pcs.o arm-tdep.o";;
+ arch/arm-get-next-pcs.o arm-tdep.o \
+ none-tdep.o arm-none-tdep.o";;
hppa*-*-*)
# Target: HP PA-RISC
diff --git a/gdb/none-tdep.c b/gdb/none-tdep.c
new file mode 100644
index 0000000000..b7a49924c6
--- /dev/null
+++ b/gdb/none-tdep.c
@@ -0,0 +1,264 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "none-tdep.h"
+#include "regset.h"
+#include "elf-bfd.h" /* for elfcore_write_* */
+#include "inferior.h"
+
+using none_collect_thread_registers_ftype
+ = void (const struct regcache *, ptid_t, bfd *,
+ gdb::unique_xmalloc_ptr<char> &, int *, enum gdb_signal);
+
+/* The ARM none corefile setup is based on the ARM GNU/Linux design. */
+
+/* Structure for passing information from
+ none_collect_thread_registers via an iterator to
+ none_collect_regset_section_cb. */
+
+struct none_collect_regset_section_cb_data
+{
+ none_collect_regset_section_cb_data (struct gdbarch *gdbarch,
+ const struct regcache *regcache,
+ bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size,
+ unsigned long lwp,
+ enum gdb_signal stop_signal)
+ : gdbarch (gdbarch), regcache (regcache), obfd (obfd),
+ note_data (note_data), note_size (note_size),
+ lwp (lwp), stop_signal (stop_signal)
+ {}
+
+ struct gdbarch *gdbarch;
+ const struct regcache *regcache;
+ bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> ¬e_data;
+ int *note_size;
+ unsigned long lwp;
+ enum gdb_signal stop_signal;
+ bool abort_iteration = false;
+};
+
+/* Callback for iterate_over_regset_sections that records a single
+ regset in the corefile note section. */
+
+static void
+none_collect_regset_section_cb (const char *sect_name, int supply_size,
+ int collect_size, const struct regset *regset,
+ const char *human_name, void *cb_data)
+{
+ struct none_collect_regset_section_cb_data *data
+ = (struct none_collect_regset_section_cb_data *) cb_data;
+ bool variable_size_section = (regset != nullptr
+ && regset->flags & REGSET_VARIABLE_SIZE);
+
+ if (!variable_size_section)
+ gdb_assert (supply_size == collect_size);
+
+ if (data->abort_iteration)
+ return;
+
+ gdb_assert (regset && regset->collect_regset);
+
+ /* This is intentionally zero-initialized by using std::vector, so
+ that any padding bytes in the core file will show as 0. */
+ std::vector<gdb_byte> buf (collect_size);
+
+ regset->collect_regset (regset, data->regcache, -1, buf.data (),
+ collect_size);
+
+ /* PRSTATUS still needs to be treated specially. */
+ if (strcmp (sect_name, ".reg") == 0)
+ data->note_data.reset (elfcore_write_prstatus
+ (data->obfd, data->note_data.release (),
+ data->note_size, data->lwp,
+ gdb_signal_to_host (data->stop_signal),
+ buf.data ()));
+ else
+ data->note_data.reset (elfcore_write_register_note
+ (data->obfd, data->note_data.release (),
+ data->note_size, sect_name, buf.data (),
+ collect_size));
+
+ if (data->note_data == nullptr)
+ data->abort_iteration = 1;
+}
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_collect_thread_registers (const struct regcache *regcache,
+ ptid_t ptid, bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size, enum gdb_signal stop_signal)
+{
+ struct gdbarch *gdbarch = regcache->arch ();
+ unsigned long lwp;
+
+ /* For remote targets the LWP may not be available, so use the TID. */
+ lwp = ptid.lwp ();
+ if (lwp == 0)
+ lwp = ptid.tid ();
+
+ none_collect_regset_section_cb_data data (gdbarch, regcache, obfd, note_data,
+ note_size, lwp, stop_signal);
+
+ gdbarch_iterate_over_regset_sections (gdbarch,
+ none_collect_regset_section_cb,
+ &data, regcache);
+}
+
+struct none_corefile_thread_data
+{
+ none_corefile_thread_data (struct gdbarch *gdbarch,
+ bfd *obfd,
+ gdb::unique_xmalloc_ptr<char> ¬e_data,
+ int *note_size,
+ enum gdb_signal stop_signal)
+ : gdbarch (gdbarch), obfd (obfd), note_data (note_data),
+ note_size (note_size), stop_signal (stop_signal)
+ {}
+
+ struct gdbarch *gdbarch;
+ bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> ¬e_data;
+ int *note_size;
+ enum gdb_signal stop_signal;
+};
+
+/* Records the thread's register state for the corefile note
+ section. */
+
+static void
+none_corefile_thread (struct thread_info *info,
+ struct none_corefile_thread_data *args)
+{
+ struct regcache *regcache;
+
+ regcache = get_thread_arch_regcache (info->inf->process_target (),
+ info->ptid, args->gdbarch);
+
+ target_fetch_registers (regcache, -1);
+ none_collect_thread_registers
+ (regcache, info->ptid, args->obfd, args->note_data,
+ args->note_size, args->stop_signal);
+}
+
+/* Find the signalled thread. In case there's more than one signalled
+ thread, prefer the current thread, if it is signalled. If no
+ thread was signalled, default to the current thread, unless it has
+ exited, in which case return nullptr. */
+
+static thread_info *
+find_signalled_thread ()
+{
+ thread_info *curr_thr = inferior_thread ();
+ if (curr_thr->state != THREAD_EXITED
+ && curr_thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return curr_thr;
+
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ if (thr->suspend.stop_signal != GDB_SIGNAL_0)
+ return thr;
+
+ /* Default to the current thread, unless it has exited. */
+ if (curr_thr->state != THREAD_EXITED)
+ return curr_thr;
+
+ return nullptr;
+}
+
+/* Fills the "to_make_corefile_note" target vector. Builds the note
+ section for a corefile, and returns it in a malloc buffer. */
+
+static gdb::unique_xmalloc_ptr<char>
+none_make_corefile_notes_1 (struct gdbarch *gdbarch, bfd *obfd, int *note_size,
+ none_collect_thread_registers_ftype collect)
+{
+ gdb::unique_xmalloc_ptr<char> note_data;
+
+ /* Process information. */
+ if (get_exec_file (0))
+ {
+ const char *fname = lbasename (get_exec_file (0));
+ std::string psargs = fname;
+ note_data.reset (elfcore_write_prpsinfo (obfd, note_data.release (),
+ note_size, fname,
+ psargs.c_str ()));
+ }
+
+ if (!note_data)
+ return nullptr;
+
+ /* Thread register information. */
+ try
+ {
+ update_thread_list ();
+ }
+ catch (const gdb_exception_error &e)
+ {
+ exception_print (gdb_stderr, e);
+ }
+
+ /* Like the kernel, prefer dumping the signalled thread first.
+ "First thread" is what tools use to infer the signalled
+ thread. */
+ thread_info *signalled_thr = find_signalled_thread ();
+ gdb_signal stop_signal;
+
+ if (signalled_thr != nullptr)
+ stop_signal = signalled_thr->suspend.stop_signal;
+ else
+ stop_signal = GDB_SIGNAL_0;
+
+ none_corefile_thread_data thread_args (gdbarch, obfd, note_data, note_size,
+ stop_signal);
+
+ if (signalled_thr != nullptr)
+ none_corefile_thread (signalled_thr, &thread_args);
+ for (thread_info *thr : current_inferior ()->non_exited_threads ())
+ {
+ if (thr == signalled_thr)
+ continue;
+
+ none_corefile_thread (thr, &thread_args);
+ }
+
+ return note_data;
+}
+
+static gdb::unique_xmalloc_ptr<char>
+none_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
+{
+ return none_make_corefile_notes_1 (gdbarch, obfd, note_size,
+ none_collect_thread_registers);
+}
+
+/* Setup default core file support for none targets.
+ Can be overridden later by OSABI. */
+
+void
+none_init_corefile (struct gdbarch *gdbarch)
+{
+ /* Default core file support. */
+ set_gdbarch_make_corefile_notes (gdbarch, none_make_corefile_notes);
+}
diff --git a/gdb/none-tdep.h b/gdb/none-tdep.h
new file mode 100644
index 0000000000..f25b124019
--- /dev/null
+++ b/gdb/none-tdep.h
@@ -0,0 +1,27 @@
+/* Target-dependent code for none, architecture independent.
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef NONE_TDEP_H
+#define NONE_TDEP_H
+
+#include "gdbarch.h"
+
+void none_init_corefile (struct gdbarch *gdbarch);
+
+#endif /* none-tdep.h */
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 68f8242288..759dac0331 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -515,6 +515,10 @@ arm_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
init ();
+ /* Check that memory and length are valid before trying read reg. */
+ if ((memory == NULL) || (length == 0))
+ return 0;
+
switch ((enum sim_arm_regs) rn)
{
case SIM_ARM_R0_REGNUM:
--
2.17.1
^ permalink raw reply [flat|nested] 39+ messages in thread
