From 49bdb7ee48a10581e9f7254782f2eb953c4a164b Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Fri, 24 Nov 2017 10:20:48 +0000 Subject: [PATCH] Use flexible target descriptors for aarch64 gdb/ * aarch64-tdep.c (_initialize_aarch64_tdep): Remove init. * arch/aarch64.c (aarch64_create_target_description): Create new target description. * features/Makefile: Add new files. * features/aarch64.c: Remove file. * features/aarch64-core.c: New autogenerated file. * features/aarch64-fpu.c: New autogenerated file. * target-descriptions.c (maint_print_c_tdesc_cmd): Check for aarch64. gdbserver/ * linux-aarch64-ipa.c (initialize_low_tracepoint): Remove init. * linux-aarch64-low.c (initialize_low_arch): Remove init. * linux-aarch64-tdesc.c (aarch64_linux_read_description): Add init. --- gdb/ChangeLog | 10 ++ gdb/aarch64-tdep.c | 5 - gdb/arch/aarch64.c | 18 ++- gdb/features/Makefile | 5 +- gdb/features/aarch64-core.c | 66 ++++++++++ gdb/features/aarch64-fpu.c | 132 +++++++++++++++++++ gdb/features/aarch64.c | 191 ---------------------------- gdb/gdbserver/ChangeLog | 6 + gdb/gdbserver/linux-aarch64-ipa.c | 4 - gdb/gdbserver/linux-aarch64-low.c | 5 - gdb/gdbserver/linux-aarch64-tdesc.c | 11 +- gdb/target-descriptions.c | 3 +- 12 files changed, 244 insertions(+), 212 deletions(-) create mode 100644 gdb/features/aarch64-core.c create mode 100644 gdb/features/aarch64-fpu.c delete mode 100644 gdb/features/aarch64.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f7ad590d188..4cf7853cad7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2017-11-24 Alan Hayward + + * aarch64-tdep.c (_initialize_aarch64_tdep): Remove init. + * arch/aarch64.c (aarch64_create_target_description): Create + new target description. + * features/Makefile: Add new files. + * features/aarch64.c: Remove file. + * features/aarch64-core.c: New autogenerated file. + * features/aarch64-fpu.c: New autogenerated file. + * target-descriptions.c (maint_print_c_tdesc_cmd): Check for aarch64. 2017-11-24 Alan Hayward diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 541a909edaa..61023dd3bb9 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -54,9 +54,6 @@ #include "record.h" #include "record-full.h" - -#include "features/aarch64.c" - #include "arch/aarch64-insn.h" #include "opcode/aarch64.h" @@ -3058,8 +3055,6 @@ _initialize_aarch64_tdep (void) gdbarch_register (bfd_arch_aarch64, aarch64_gdbarch_init, aarch64_dump_tdep); - initialize_tdesc_aarch64 (); - /* Debug this file's internals. */ add_setshow_boolean_cmd ("aarch64", class_maintenance, &aarch64_debug, _("\ Set AArch64 debugging."), _("\ diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c index 95d9906f10e..0126215767e 100644 --- a/gdb/arch/aarch64.c +++ b/gdb/arch/aarch64.c @@ -17,14 +17,26 @@ #include "aarch64.h" +#include -extern struct target_desc *tdesc_aarch64; +#include "../features/aarch64-core.c" +#include "../features/aarch64-fpu.c" /* Create the aarch64 target description. */ target_desc * aarch64_create_target_description () { - return tdesc_aarch64; -} + target_desc *tdesc = allocate_target_description (); + +#ifndef IN_PROCESS_AGENT + set_tdesc_architecture (tdesc, "aarch64"); +#endif + + long regnum = 0; + regnum = create_feature_aarch64_core (tdesc, regnum); + regnum = create_feature_aarch64_fpu (tdesc, regnum); + + return tdesc; +} diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 78a44ca1319..73be34c313f 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -119,7 +119,6 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH)) # --enable-targets=all GDB. You can override this by passing XMLTOC # to make on the command line. XMLTOC = \ - aarch64.xml \ arc-v2.xml \ arc-arcompact.xml \ arm/arm-with-iwmmxt.xml \ @@ -206,7 +205,9 @@ $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl $(XSLTPROC) gdbserver-regs.xsl - >> $(outdir)/$*.tmp sh ../../move-if-change $(outdir)/$*.tmp $(outdir)/$*.dat -FEATURE_XMLFILES = i386/32bit-core.xml \ +FEATURE_XMLFILES = aarch64-core.xml \ + aarch64-fpu.xml \ + i386/32bit-core.xml \ i386/32bit-sse.xml \ i386/32bit-linux.xml \ i386/32bit-avx.xml \ diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c new file mode 100644 index 00000000000..f3fad40133b --- /dev/null +++ b/gdb/features/aarch64-core.c @@ -0,0 +1,66 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64-core.xml */ + +#include "arch/tdesc.h" + +static int +create_feature_aarch64_core (struct target_desc *result, long regnum) +{ + struct tdesc_feature *feature; + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core", "aarch64-core.xml"); + struct tdesc_type *field_type; + struct tdesc_type *type; + type = tdesc_create_flags (feature, "cpsr_flags", 4); + tdesc_add_flag (type, 0, "SP"); + tdesc_add_flag (type, 1, ""); + tdesc_add_bitfield (type, "EL", 2, 3); + tdesc_add_flag (type, 4, "nRW"); + tdesc_add_flag (type, 5, ""); + tdesc_add_flag (type, 6, "F"); + tdesc_add_flag (type, 7, "I"); + tdesc_add_flag (type, 8, "A"); + tdesc_add_flag (type, 9, "D"); + tdesc_add_flag (type, 20, "IL"); + tdesc_add_flag (type, 21, "SS"); + tdesc_add_flag (type, 28, "V"); + tdesc_add_flag (type, 29, "C"); + tdesc_add_flag (type, 30, "Z"); + tdesc_add_flag (type, 31, "N"); + + tdesc_create_reg (feature, "x0", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x1", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x2", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x3", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x4", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x5", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x6", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x7", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x8", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x9", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x10", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x11", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x12", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x13", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x14", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x15", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x16", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x17", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x18", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x19", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x20", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x21", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x22", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x23", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x24", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x25", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x26", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x27", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x28", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x29", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x30", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "sp", regnum++, 1, NULL, 64, "data_ptr"); + tdesc_create_reg (feature, "pc", regnum++, 1, NULL, 64, "code_ptr"); + tdesc_create_reg (feature, "cpsr", regnum++, 1, NULL, 32, "cpsr_flags"); + return regnum; +} diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c new file mode 100644 index 00000000000..3672f2541ef --- /dev/null +++ b/gdb/features/aarch64-fpu.c @@ -0,0 +1,132 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64-fpu.xml */ + +#include "arch/tdesc.h" + +static int +create_feature_aarch64_fpu (struct target_desc *result, long regnum) +{ + struct tdesc_feature *feature; + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.fpu", "aarch64-fpu.xml"); + struct tdesc_type *field_type; + field_type = tdesc_named_type (feature, "ieee_double"); + tdesc_create_vector (feature, "v2d", field_type, 2); + + field_type = tdesc_named_type (feature, "uint64"); + tdesc_create_vector (feature, "v2u", field_type, 2); + + field_type = tdesc_named_type (feature, "int64"); + tdesc_create_vector (feature, "v2i", field_type, 2); + + field_type = tdesc_named_type (feature, "ieee_single"); + tdesc_create_vector (feature, "v4f", field_type, 4); + + field_type = tdesc_named_type (feature, "uint32"); + tdesc_create_vector (feature, "v4u", field_type, 4); + + field_type = tdesc_named_type (feature, "int32"); + tdesc_create_vector (feature, "v4i", field_type, 4); + + field_type = tdesc_named_type (feature, "uint16"); + tdesc_create_vector (feature, "v8u", field_type, 8); + + field_type = tdesc_named_type (feature, "int16"); + tdesc_create_vector (feature, "v8i", field_type, 8); + + field_type = tdesc_named_type (feature, "uint8"); + tdesc_create_vector (feature, "v16u", field_type, 16); + + field_type = tdesc_named_type (feature, "int8"); + tdesc_create_vector (feature, "v16i", field_type, 16); + + field_type = tdesc_named_type (feature, "uint128"); + tdesc_create_vector (feature, "v1u", field_type, 1); + + field_type = tdesc_named_type (feature, "int128"); + tdesc_create_vector (feature, "v1i", field_type, 1); + + struct tdesc_type *type; + type = tdesc_create_union (feature, "vnd"); + field_type = tdesc_named_type (feature, "v2d"); + tdesc_add_field (type, "f", field_type); + field_type = tdesc_named_type (feature, "v2u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v2i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vns"); + field_type = tdesc_named_type (feature, "v4f"); + tdesc_add_field (type, "f", field_type); + field_type = tdesc_named_type (feature, "v4u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v4i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnh"); + field_type = tdesc_named_type (feature, "v8u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v8i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnb"); + field_type = tdesc_named_type (feature, "v16u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v16i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnq"); + field_type = tdesc_named_type (feature, "v1u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v1i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "aarch64v"); + field_type = tdesc_named_type (feature, "vnd"); + tdesc_add_field (type, "d", field_type); + field_type = tdesc_named_type (feature, "vns"); + tdesc_add_field (type, "s", field_type); + field_type = tdesc_named_type (feature, "vnh"); + tdesc_add_field (type, "h", field_type); + field_type = tdesc_named_type (feature, "vnb"); + tdesc_add_field (type, "b", field_type); + field_type = tdesc_named_type (feature, "vnq"); + tdesc_add_field (type, "q", field_type); + + regnum = 34; + tdesc_create_reg (feature, "v0", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v1", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v2", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v3", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v4", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v5", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v6", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v7", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v8", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v9", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v10", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v11", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v12", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v13", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v14", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v15", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v16", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v17", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v18", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v19", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v20", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v21", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v22", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v23", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v24", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v25", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v26", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v27", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v28", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v29", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v30", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v31", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "fpsr", regnum++, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "fpcr", regnum++, 1, NULL, 32, "int"); + return regnum; +} diff --git a/gdb/features/aarch64.c b/gdb/features/aarch64.c deleted file mode 100644 index 7411cacd4b8..00000000000 --- a/gdb/features/aarch64.c +++ /dev/null @@ -1,191 +0,0 @@ -/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: - Original: aarch64.xml */ - -#include "defs.h" -#include "osabi.h" -#include "target-descriptions.h" - -struct target_desc *tdesc_aarch64; -static void -initialize_tdesc_aarch64 (void) -{ - struct target_desc *result = allocate_target_description (); - set_tdesc_architecture (result, bfd_scan_arch ("aarch64")); - - struct tdesc_feature *feature; - - feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core"); - struct tdesc_type *field_type; - struct tdesc_type *type; - type = tdesc_create_flags (feature, "cpsr_flags", 4); - tdesc_add_flag (type, 0, "SP"); - tdesc_add_flag (type, 1, ""); - tdesc_add_bitfield (type, "EL", 2, 3); - tdesc_add_flag (type, 4, "nRW"); - tdesc_add_flag (type, 5, ""); - tdesc_add_flag (type, 6, "F"); - tdesc_add_flag (type, 7, "I"); - tdesc_add_flag (type, 8, "A"); - tdesc_add_flag (type, 9, "D"); - tdesc_add_flag (type, 20, "IL"); - tdesc_add_flag (type, 21, "SS"); - tdesc_add_flag (type, 28, "V"); - tdesc_add_flag (type, 29, "C"); - tdesc_add_flag (type, 30, "Z"); - tdesc_add_flag (type, 31, "N"); - - tdesc_create_reg (feature, "x0", 0, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x1", 1, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x2", 2, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x3", 3, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x4", 4, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x5", 5, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x6", 6, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x7", 7, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x8", 8, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x9", 9, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x10", 10, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x11", 11, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x12", 12, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x13", 13, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x14", 14, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x15", 15, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x16", 16, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x17", 17, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x18", 18, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x19", 19, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x20", 20, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x21", 21, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x22", 22, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x23", 23, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x24", 24, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x25", 25, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x26", 26, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x27", 27, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x28", 28, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x29", 29, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x30", 30, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "sp", 31, 1, NULL, 64, "data_ptr"); - tdesc_create_reg (feature, "pc", 32, 1, NULL, 64, "code_ptr"); - tdesc_create_reg (feature, "cpsr", 33, 1, NULL, 32, "cpsr_flags"); - - feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.fpu"); - field_type = tdesc_named_type (feature, "ieee_double"); - tdesc_create_vector (feature, "v2d", field_type, 2); - - field_type = tdesc_named_type (feature, "uint64"); - tdesc_create_vector (feature, "v2u", field_type, 2); - - field_type = tdesc_named_type (feature, "int64"); - tdesc_create_vector (feature, "v2i", field_type, 2); - - field_type = tdesc_named_type (feature, "ieee_single"); - tdesc_create_vector (feature, "v4f", field_type, 4); - - field_type = tdesc_named_type (feature, "uint32"); - tdesc_create_vector (feature, "v4u", field_type, 4); - - field_type = tdesc_named_type (feature, "int32"); - tdesc_create_vector (feature, "v4i", field_type, 4); - - field_type = tdesc_named_type (feature, "uint16"); - tdesc_create_vector (feature, "v8u", field_type, 8); - - field_type = tdesc_named_type (feature, "int16"); - tdesc_create_vector (feature, "v8i", field_type, 8); - - field_type = tdesc_named_type (feature, "uint8"); - tdesc_create_vector (feature, "v16u", field_type, 16); - - field_type = tdesc_named_type (feature, "int8"); - tdesc_create_vector (feature, "v16i", field_type, 16); - - field_type = tdesc_named_type (feature, "uint128"); - tdesc_create_vector (feature, "v1u", field_type, 1); - - field_type = tdesc_named_type (feature, "int128"); - tdesc_create_vector (feature, "v1i", field_type, 1); - - type = tdesc_create_union (feature, "vnd"); - field_type = tdesc_named_type (feature, "v2d"); - tdesc_add_field (type, "f", field_type); - field_type = tdesc_named_type (feature, "v2u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v2i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vns"); - field_type = tdesc_named_type (feature, "v4f"); - tdesc_add_field (type, "f", field_type); - field_type = tdesc_named_type (feature, "v4u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v4i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnh"); - field_type = tdesc_named_type (feature, "v8u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v8i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnb"); - field_type = tdesc_named_type (feature, "v16u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v16i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnq"); - field_type = tdesc_named_type (feature, "v1u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v1i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "aarch64v"); - field_type = tdesc_named_type (feature, "vnd"); - tdesc_add_field (type, "d", field_type); - field_type = tdesc_named_type (feature, "vns"); - tdesc_add_field (type, "s", field_type); - field_type = tdesc_named_type (feature, "vnh"); - tdesc_add_field (type, "h", field_type); - field_type = tdesc_named_type (feature, "vnb"); - tdesc_add_field (type, "b", field_type); - field_type = tdesc_named_type (feature, "vnq"); - tdesc_add_field (type, "q", field_type); - - tdesc_create_reg (feature, "v0", 34, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v1", 35, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v2", 36, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v3", 37, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v4", 38, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v5", 39, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v6", 40, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v7", 41, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v8", 42, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v9", 43, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v10", 44, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v11", 45, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v12", 46, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v13", 47, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v14", 48, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v15", 49, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v16", 50, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v17", 51, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v18", 52, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v19", 53, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v20", 54, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v21", 55, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v22", 56, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v23", 57, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v24", 58, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v25", 59, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v26", 60, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v27", 61, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v28", 62, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v29", 63, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v30", 64, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v31", 65, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "fpsr", 66, 1, NULL, 32, "int"); - tdesc_create_reg (feature, "fpcr", 67, 1, NULL, 32, "int"); - - tdesc_aarch64 = result; -} diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 90680555fdd..5f7e59d11d8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2017-11-24 Alan Hayward + + * linux-aarch64-ipa.c (initialize_low_tracepoint): Remove init. + * linux-aarch64-low.c (initialize_low_arch): Remove init. + * linux-aarch64-tdesc.c (aarch64_linux_read_description): Add init. + 2017-11-24 Alan Hayward * configure.srv: Add new files. diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c index 28dc9776a1c..b240100a13e 100644 --- a/gdb/gdbserver/linux-aarch64-ipa.c +++ b/gdb/gdbserver/linux-aarch64-ipa.c @@ -27,9 +27,6 @@ #endif #include "linux-aarch64-tdesc.h" -/* Defined in auto-generated file aarch64.c. */ -void init_registers_aarch64 (void); - /* Each register saved by the jump pad is in a 16 byte cell. */ #define FT_CR_SIZE 16 @@ -207,5 +204,4 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { - init_registers_aarch64 (); } diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index dcce287974c..96825377288 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -41,9 +41,6 @@ #include "arch/aarch64.h" #include "linux-aarch64-tdesc.h" -/* Defined in auto-generated files. */ -void init_registers_aarch64 (void); - #ifdef HAVE_SYS_REG_H #include #endif @@ -2998,8 +2995,6 @@ struct linux_target_ops the_low_target = void initialize_low_arch (void) { - init_registers_aarch64 (); - initialize_low_arch_aarch32 (); initialize_regsets_info (&aarch64_regsets_info); diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c index 8518ef73389..b1c3dd4441d 100644 --- a/gdb/gdbserver/linux-aarch64-tdesc.c +++ b/gdb/gdbserver/linux-aarch64-tdesc.c @@ -31,7 +31,16 @@ aarch64_linux_read_description () target_desc **tdesc = &aarch64_tdesc; if (*tdesc == NULL) - *tdesc = aarch64_create_target_description (); + { + *tdesc = aarch64_create_target_description (); + + init_target_desc (*tdesc); + +#ifndef IN_PROCESS_AGENT + static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL }; + (*tdesc)->expedite_regs = expedite_regs_aarch64; +#endif + } return *tdesc; } diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 1ba535f5e92..7896dd15998 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -2328,7 +2328,8 @@ maint_print_c_tdesc_cmd (const char *args, int from_tty) if (startswith (filename_after_features.c_str (), "i386/32bit-") || startswith (filename_after_features.c_str (), "i386/64bit-") || startswith (filename_after_features.c_str (), "i386/x32-core.xml") - || startswith (filename_after_features.c_str (), "tic6x-")) + || startswith (filename_after_features.c_str (), "tic6x-") + || startswith (filename_after_features.c_str (), "aarch64")) { print_c_feature v (filename_after_features); -- 2.30.2