* [PATCH 0/3] Support AARCH64 ILP32 for gdb
@ 2016-08-30 0:26 Andrew Pinski
2016-08-30 0:26 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Andrew Pinski @ 2016-08-30 0:26 UTC (permalink / raw)
To: gdb-patches, binutils; +Cc: Andrew Pinski
This patch set implements the basic support needed
to debug AARCH64 ILP32 programs under Linux.
This does not implement the full needed support
like for syscalls or core dump (both are still in flux).
But what is provided here is not influx at all and is indepedent
of any changes could happen to the Linux kernel or glibc.
Thanks,
Andrew Pinski
Andrew Pinski (3):
Move AARCH64 ILP32 rejection handling
Add ILP32 support to gdb.
Handle ILP32 AARCH64 correctly for gdbserver
bfd/ChangeLog | 8 ++
bfd/cpu-aarch64.c | 28 +-----
bfd/elfnn-aarch64.c | 17 +++-
gdb/ChangeLog | 23 +++++
gdb/aarch64-linux-tdep.c | 8 +-
gdb/aarch64-tdep.c | 23 ++++-
gdb/aarch64-tdep.h | 3 +
gdb/features/Makefile | 4 +-
gdb/features/aarch64_ilp32-core.xml | 67 +++++++++++++
gdb/features/aarch64_ilp32.c | 191 ++++++++++++++++++++++++++++++++++++
gdb/features/aarch64_ilp32.xml | 14 +++
gdb/gdbserver/ChangeLog | 19 ++++
gdb/gdbserver/Makefile.in | 6 ++
gdb/gdbserver/configure.srv | 7 +-
gdb/gdbserver/linux-aarch64-ipa.c | 11 ++-
gdb/gdbserver/linux-aarch64-low.c | 10 +-
gdb/regformats/aarch64_ilp32.dat | 73 ++++++++++++++
17 files changed, 474 insertions(+), 38 deletions(-)
create mode 100644 gdb/features/aarch64_ilp32-core.xml
create mode 100644 gdb/features/aarch64_ilp32.c
create mode 100644 gdb/features/aarch64_ilp32.xml
create mode 100644 gdb/regformats/aarch64_ilp32.dat
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 2/3] Add ILP32 support to gdb. 2016-08-30 0:26 [PATCH 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski @ 2016-08-30 0:26 ` Andrew Pinski 2016-08-30 7:44 ` Andreas Schwab 2016-08-30 0:26 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski ` (2 subsequent siblings) 3 siblings, 1 reply; 19+ messages in thread From: Andrew Pinski @ 2016-08-30 0:26 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski This patch adds AARCH64:ilp32 support to gdb and sets up the correct sizes for some types like pointers and long. Also sets up the correct linker map offsets for Linux. OK? Thanks, Andrew Pinski 2016-08-29 Andrew Pinski <apinski@cavium.com> * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. Make sure the gdbarches have compatible ilp32 flags. Set long and ptr sizes correctly for ilp32. * aarch64-linux-tdep.c (aarch64_linux_init_abi): Add support for ILP32. --- gdb/ChangeLog | 9 +++++++++ gdb/aarch64-linux-tdep.c | 8 ++++++-- gdb/aarch64-tdep.c | 14 ++++++++++++-- gdb/aarch64-tdep.h | 3 +++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7f580f0..cfaf3fd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-08-29 Andrew Pinski <apinski@cavium.com> + + * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. + * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. + Make sure the gdbarches have compatible ilp32 flags. + Set long and ptr sizes correctly for ilp32. + * aarch64-linux-tdep.c (aarch64_linux_init_abi): + Add support for ILP32. + 2016-08-25 Andreas Arnez <arnez@linux.vnet.ibm.com> * xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Replace diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index cd220a6..43f959b 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -1000,8 +1000,12 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) linux_init_abi (info, gdbarch); - set_solib_svr4_fetch_link_map_offsets (gdbarch, - svr4_lp64_fetch_link_map_offsets); + if (tdep->ilp32) + set_solib_svr4_fetch_link_map_offsets (gdbarch, + svr4_ilp32_fetch_link_map_offsets); + else + set_solib_svr4_fetch_link_map_offsets (gdbarch, + svr4_lp64_fetch_link_map_offsets); /* Enable TLS support. */ set_gdbarch_fetch_tls_load_module_address (gdbarch, diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 3b7e954..9c1a517 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -2646,6 +2646,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) const struct tdesc_feature *feature; int num_regs = 0; int num_pseudo_regs = 0; + char ilp32 = FALSE; /* Ensure we always have a target descriptor. */ if (!tdesc_has_registers (tdesc)) @@ -2695,6 +2696,11 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) return NULL; } + if (info.abfd + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) + ilp32 = TRUE; + /* AArch64 code is always little-endian. */ info.byte_order_for_code = BFD_ENDIAN_LITTLE; @@ -2703,6 +2709,9 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) best_arch != NULL; best_arch = gdbarch_list_lookup_by_info (best_arch->next, &info)) { + /* ILP32 and LP64 are incompatible. */ + if (gdbarch_tdep (arches->gdbarch)->ilp32 != ilp32) + continue; /* Found a match. */ break; } @@ -2721,6 +2730,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->lowest_pc = 0x20; tdep->jb_pc = -1; /* Longjump support not enabled by default. */ tdep->jb_elt_size = 8; + tdep->ilp32 = ilp32; set_gdbarch_push_dummy_call (gdbarch, aarch64_push_dummy_call); set_gdbarch_frame_align (gdbarch, aarch64_frame_align); @@ -2760,9 +2770,9 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_float_bit (gdbarch, 32); set_gdbarch_double_bit (gdbarch, 64); set_gdbarch_long_double_bit (gdbarch, 128); - set_gdbarch_long_bit (gdbarch, 64); + set_gdbarch_long_bit (gdbarch, ilp32 ? 32 : 64); set_gdbarch_long_long_bit (gdbarch, 64); - set_gdbarch_ptr_bit (gdbarch, 64); + set_gdbarch_ptr_bit (gdbarch, ilp32 ? 32 : 64); set_gdbarch_char_signed (gdbarch, 0); set_gdbarch_float_format (gdbarch, floatformats_ieee_single); set_gdbarch_double_format (gdbarch, floatformats_ieee_double); diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index a95b613..7b1ce3e 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -95,6 +95,9 @@ struct gdbarch_tdep /* syscall record. */ int (*aarch64_syscall_record) (struct regcache *regcache, unsigned long svc_number); + /* If this is ILP32 or LP64. */ + bool ilp32; + }; extern struct target_desc *tdesc_aarch64; -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] Add ILP32 support to gdb. 2016-08-30 0:26 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski @ 2016-08-30 7:44 ` Andreas Schwab 2016-09-01 4:21 ` Andrew Pinski 0 siblings, 1 reply; 19+ messages in thread From: Andreas Schwab @ 2016-08-30 7:44 UTC (permalink / raw) To: Andrew Pinski; +Cc: gdb-patches, binutils On Aug 30 2016, Andrew Pinski <apinski@cavium.com> wrote: > @@ -2695,6 +2696,11 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) > return NULL; > } > > + if (info.abfd > + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour > + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) > + ilp32 = TRUE; > + Shouldn't this use bfd_arch_bits_per_address? Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] Add ILP32 support to gdb. 2016-08-30 7:44 ` Andreas Schwab @ 2016-09-01 4:21 ` Andrew Pinski 2016-09-01 7:41 ` Andreas Schwab 0 siblings, 1 reply; 19+ messages in thread From: Andrew Pinski @ 2016-09-01 4:21 UTC (permalink / raw) To: Andreas Schwab; +Cc: Andrew Pinski, gdb-patches, binutils On Tue, Aug 30, 2016 at 12:44 AM, Andreas Schwab <schwab@suse.de> wrote: > On Aug 30 2016, Andrew Pinski <apinski@cavium.com> wrote: > >> @@ -2695,6 +2696,11 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) >> return NULL; >> } >> >> + if (info.abfd >> + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour >> + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) >> + ilp32 = TRUE; >> + > > Shouldn't this use bfd_arch_bits_per_address? That does not work as bfd_arch_bits_per_address is set to 64 still. The same is true even on x86 and powerpc. We actually need to check the elf header here still. Thanks, Andrew > > Andreas. > > -- > Andreas Schwab, SUSE Labs, schwab@suse.de > GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 > "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] Add ILP32 support to gdb. 2016-09-01 4:21 ` Andrew Pinski @ 2016-09-01 7:41 ` Andreas Schwab 0 siblings, 0 replies; 19+ messages in thread From: Andreas Schwab @ 2016-09-01 7:41 UTC (permalink / raw) To: Andrew Pinski; +Cc: Andrew Pinski, gdb-patches, binutils On Sep 01 2016, Andrew Pinski <pinskia@gmail.com> wrote: > On Tue, Aug 30, 2016 at 12:44 AM, Andreas Schwab <schwab@suse.de> wrote: >> On Aug 30 2016, Andrew Pinski <apinski@cavium.com> wrote: >> >>> @@ -2695,6 +2696,11 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) >>> return NULL; >>> } >>> >>> + if (info.abfd >>> + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour >>> + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) >>> + ilp32 = TRUE; >>> + >> >> Shouldn't this use bfd_arch_bits_per_address? > > That does not work as bfd_arch_bits_per_address is set to 64 still. Actually I meant bfd_get_arch_size. Does this fix the bits_per_address issue? * cpu-aarch64.c (N): Add argument ADDRSIZE. (bfd_aarch64_arch_ilp32): Pass 32 here. (bfd_aarch64_arch): Pass 64 here. --- bfd/cpu-aarch64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c index 6fb9133..ae0c8a9 100644 --- a/bfd/cpu-aarch64.c +++ b/bfd/cpu-aarch64.c @@ -78,16 +78,16 @@ scan (const struct bfd_arch_info *info, const char *string) return FALSE; } -#define N(NUMBER, PRINT, DEFAULT, NEXT) \ - { 64, 64, 8, bfd_arch_aarch64, NUMBER, \ +#define N(NUMBER, PRINT, ADDRSIZE, DEFAULT, NEXT) \ + { 64, ADDRSIZE, 8, bfd_arch_aarch64, NUMBER, \ "aarch64", PRINT, 4, DEFAULT, compatible, scan, \ bfd_arch_default_fill, NEXT } static const bfd_arch_info_type bfd_aarch64_arch_ilp32 = - N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", FALSE, NULL); + N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", 32, FALSE, NULL); const bfd_arch_info_type bfd_aarch64_arch = - N (0, "aarch64", TRUE, &bfd_aarch64_arch_ilp32); + N (0, "aarch64", 64, TRUE, &bfd_aarch64_arch_ilp32); bfd_boolean bfd_is_aarch64_special_symbol_name (const char *name, int type) -- 2.9.3 Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-08-30 0:26 [PATCH 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-08-30 0:26 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski @ 2016-08-30 0:26 ` Andrew Pinski 2016-08-30 8:01 ` Andreas Schwab 2016-08-31 10:42 ` Pedro Alves 2016-08-30 0:26 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 3 siblings, 2 replies; 19+ messages in thread From: Andrew Pinski @ 2016-08-30 0:26 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski In gdbserver, we need to send over 32bit registers for pc/sp instead of 64bit as we do right now. So we need another XML file for ILP32. Tested using gdbserver with an ILP32 program and even tested using gdbserver as an ILP32 program. OK? Thanks, Andrew Pinski ChangeLog: * aarch64-tdep.c: Include "features/aarch64_ilp32.c". (aarch64_gdbarch_init): Handle ilp32 correctly. (_initialize_aarch64_tdep): Call initialize_tdesc_aarch64_ilp32 too. * features/Makefile (WHICH): Add aarch64_ilp32. (aarch64_ilp32-expedite): Set. (XMLTOC): Add aarch64_ilp32.xml. (features/aarch64_ilp32-core.xml): New file. (features/aarch64_ilp32.xml): New file. (features/aarch64_ilp32.c): Generate. (regformats/aarch64_ilp32.dat): Generate. gdbserver/ChangeLog: * Makefile.in (clean): Remove aarch64_ilp32.c also. (aarch64_ilp32-ipa.o): New target. (aarch64_ilp32.c): New target. * configure.srv (aarch64*-*-linux*): Add ilp32 files to srv_regobj, srv_xmlfiles and ipa_obj. * linux-aarch64-ipa.c (init_registers_aarch64_ilp32): Declare. (tdesc_aarch64_ilp32): Likewise. (get_ipa_tdesc): Return tdesc_aarch64_ilp32 for ILP32. (initialize_low_tracepoint): Call init_registers_aarch64_ilp32 for ILP32. * linux-aarch64-low.c (init_registers_aarch64_ilp32): Declare. (tdesc_aarch64_ilp32): Likewise. (aarch64_linux_read_description): Return tdesc_aarch64_ilp32 for ILP32 executables. (initialize_low_arch): Call init_registers_aarch64_ilp32. Signed-off-by: Andrew Pinski <apinski@cavium.com> --- gdb/ChangeLog | 14 +++ gdb/aarch64-tdep.c | 19 ++-- gdb/features/Makefile | 4 +- gdb/features/aarch64_ilp32-core.xml | 67 +++++++++++++ gdb/features/aarch64_ilp32.c | 191 ++++++++++++++++++++++++++++++++++++ gdb/features/aarch64_ilp32.xml | 14 +++ gdb/gdbserver/ChangeLog | 19 ++++ gdb/gdbserver/Makefile.in | 6 ++ gdb/gdbserver/configure.srv | 7 +- gdb/gdbserver/linux-aarch64-ipa.c | 11 ++- gdb/gdbserver/linux-aarch64-low.c | 10 +- gdb/regformats/aarch64_ilp32.dat | 73 ++++++++++++++ 12 files changed, 422 insertions(+), 13 deletions(-) create mode 100644 gdb/features/aarch64_ilp32-core.xml create mode 100644 gdb/features/aarch64_ilp32.c create mode 100644 gdb/features/aarch64_ilp32.xml create mode 100644 gdb/regformats/aarch64_ilp32.dat diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cfaf3fd..881696e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2015-08-29 Andrew Pinski <apinski@cavium.com> + * aarch64-tdep.c: Include "features/aarch64_ilp32.c". + (aarch64_gdbarch_init): Handle ilp32 correctly. + (_initialize_aarch64_tdep): Call initialize_tdesc_aarch64_ilp32 + too. + * features/Makefile (WHICH): Add aarch64_ilp32. + (aarch64_ilp32-expedite): Set. + (XMLTOC): Add aarch64_ilp32.xml. + (features/aarch64_ilp32-core.xml): New file. + (features/aarch64_ilp32.xml): New file. + (features/aarch64_ilp32.c): Generate. + (regformats/aarch64_ilp32.dat): Generate. + +2015-08-29 Andrew Pinski <apinski@cavium.com> + * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. Make sure the gdbarches have compatible ilp32 flags. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 9c1a517..e9c1867 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -56,6 +56,7 @@ #include "record-full.h" #include "features/aarch64.c" +#include "features/aarch64_ilp32.c" #include "arch/aarch64-insn.h" @@ -2648,13 +2649,21 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) int num_pseudo_regs = 0; char ilp32 = FALSE; + if (info.abfd + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) + ilp32 = TRUE; + /* Ensure we always have a target descriptor. */ if (!tdesc_has_registers (tdesc)) - tdesc = tdesc_aarch64; + tdesc = ilp32 ? tdesc_aarch64_ilp32 : tdesc_aarch64; gdb_assert (tdesc); - feature = tdesc_find_feature (tdesc, "org.gnu.gdb.aarch64.core"); + if (ilp32) + feature = tdesc_find_feature (tdesc, "org.gnu.gdb.aarch64_ilp32.core"); + else + feature = tdesc_find_feature (tdesc, "org.gnu.gdb.aarch64.core"); if (feature == NULL) return NULL; @@ -2696,11 +2705,6 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) return NULL; } - if (info.abfd - && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour - && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) - ilp32 = TRUE; - /* AArch64 code is always little-endian. */ info.byte_order_for_code = BFD_ENDIAN_LITTLE; @@ -2845,6 +2849,7 @@ _initialize_aarch64_tdep (void) aarch64_dump_tdep); initialize_tdesc_aarch64 (); + initialize_tdesc_aarch64_ilp32 (); /* Debug this file's internals. */ add_setshow_boolean_cmd ("aarch64", class_maintenance, &aarch64_debug, _("\ diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 809c811..30d2d43 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -43,7 +43,7 @@ # # make GDB=/path/to/gdb XMLTOC="xml files" cfiles -WHICH = aarch64 \ +WHICH = aarch64 aarch64_ilp32\ arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \ i386/i386 i386/i386-linux \ i386/i386-mmx i386/i386-mmx-linux \ @@ -77,6 +77,7 @@ WHICH = aarch64 \ # Record which registers should be sent to GDB by default after stop. aarch64-expedite = x29,sp,pc +aarch64_ilp32-expedite = x29,sp,pc arm-expedite = r11,sp,pc i386/i386-expedite = ebp,esp,eip i386/i386-linux-expedite = ebp,esp,eip @@ -148,6 +149,7 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH)) # to make on the command line. XMLTOC = \ aarch64.xml \ + aarch64_ilp32.xml \ arm-with-iwmmxt.xml \ arm-with-m-fpa-layout.xml \ arm-with-m-vfp-d16.xml \ diff --git a/gdb/features/aarch64_ilp32-core.xml b/gdb/features/aarch64_ilp32-core.xml new file mode 100644 index 0000000..4ec620b --- /dev/null +++ b/gdb/features/aarch64_ilp32-core.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2009-2016 Free Software Foundation, Inc. + Contributed by ARM Ltd. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.aarch64_ilp32.core"> + <reg name="x0" bitsize="64"/> + <reg name="x1" bitsize="64"/> + <reg name="x2" bitsize="64"/> + <reg name="x3" bitsize="64"/> + <reg name="x4" bitsize="64"/> + <reg name="x5" bitsize="64"/> + <reg name="x6" bitsize="64"/> + <reg name="x7" bitsize="64"/> + <reg name="x8" bitsize="64"/> + <reg name="x9" bitsize="64"/> + <reg name="x10" bitsize="64"/> + <reg name="x11" bitsize="64"/> + <reg name="x12" bitsize="64"/> + <reg name="x13" bitsize="64"/> + <reg name="x14" bitsize="64"/> + <reg name="x15" bitsize="64"/> + <reg name="x16" bitsize="64"/> + <reg name="x17" bitsize="64"/> + <reg name="x18" bitsize="64"/> + <reg name="x19" bitsize="64"/> + <reg name="x20" bitsize="64"/> + <reg name="x21" bitsize="64"/> + <reg name="x22" bitsize="64"/> + <reg name="x23" bitsize="64"/> + <reg name="x24" bitsize="64"/> + <reg name="x25" bitsize="64"/> + <reg name="x26" bitsize="64"/> + <reg name="x27" bitsize="64"/> + <reg name="x28" bitsize="64"/> + <reg name="x29" bitsize="64"/> + <reg name="x30" bitsize="64"/> + <reg name="sp" bitsize="32" type="data_ptr"/> + + <reg name="pc" bitsize="32" type="code_ptr"/> + + <flags id="cpsr_flags" size="4"> + <field name="SP" start="0" type="bool"/> + <field name="" start="1" end="1"/> + <field name="EL" start="2" end="3"/> + <field name="nRW" start="4" type="bool"/> + <field name="" start="5" end="5"/> + <field name="F" start="6" type="bool"/> + <field name="I" start="7" type="bool"/> + <field name="A" start="8" type="bool"/> + <field name="D" start="9" type="bool"/> + + <field name="IL" start="20" type="bool"/> + <field name="SS" start="21" type="bool"/> + + <field name="V" start="28" type="bool"/> + <field name="C" start="29" type="bool"/> + <field name="Z" start="30" type="bool"/> + <field name="N" start="31" type="bool"/> + </flags> + <reg name="cpsr" bitsize="32" type="cpsr_flags"/> + +</feature> diff --git a/gdb/features/aarch64_ilp32.c b/gdb/features/aarch64_ilp32.c new file mode 100644 index 0000000..f25e805 --- /dev/null +++ b/gdb/features/aarch64_ilp32.c @@ -0,0 +1,191 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64_ilp32.xml */ + +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" + +struct target_desc *tdesc_aarch64_ilp32; +static void +initialize_tdesc_aarch64_ilp32 (void) +{ + struct target_desc *result = allocate_target_description (); + struct tdesc_feature *feature; + struct tdesc_type *field_type; + struct tdesc_type *type; + + set_tdesc_architecture (result, bfd_scan_arch ("aarch64:ilp32")); + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64_ilp32.core"); + type = tdesc_create_flags (feature, "cpsr_flags", 4); + tdesc_add_flag (type, 0, "SP"); + tdesc_add_bitfield (type, "", 1, 1); + tdesc_add_bitfield (type, "EL", 2, 3); + tdesc_add_flag (type, 4, "nRW"); + tdesc_add_bitfield (type, "", 5, 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, 32, "data_ptr"); + tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "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_ilp32 = result; +} diff --git a/gdb/features/aarch64_ilp32.xml b/gdb/features/aarch64_ilp32.xml new file mode 100644 index 0000000..9c9b23a --- /dev/null +++ b/gdb/features/aarch64_ilp32.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2009-2016 Free Software Foundation, Inc. + Contributed by ARM Ltd. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!DOCTYPE target SYSTEM "gdb-target.dtd"> +<target> + <architecture>aarch64:ilp32</architecture> + <xi:include href="aarch64_ilp32-core.xml"/> + <xi:include href="aarch64-fpu.xml"/> +</target> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index af0140f..f78e738 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,22 @@ +2016-08-29 Andrew Pinski <apinski@cavium.com> + + * Makefile.in (clean): Remove aarch64_ilp32.c also. + (aarch64_ilp32-ipa.o): New target. + (aarch64_ilp32.c): New target. + * configure.srv (aarch64*-*-linux*): Add ilp32 files + to srv_regobj, srv_xmlfiles and ipa_obj. + * linux-aarch64-ipa.c (init_registers_aarch64_ilp32): + Declare. + (tdesc_aarch64_ilp32): Likewise. + (get_ipa_tdesc): Return tdesc_aarch64_ilp32 for ILP32. + (initialize_low_tracepoint): Call init_registers_aarch64_ilp32 + for ILP32. + * linux-aarch64-low.c (init_registers_aarch64_ilp32): Declare. + (tdesc_aarch64_ilp32): Likewise. + (aarch64_linux_read_description): Return tdesc_aarch64_ilp32 + for ILP32 executables. + (initialize_low_arch): Call init_registers_aarch64_ilp32. + 2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org> PR server/20491 diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index f844ab8..cd18f81 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -352,6 +352,7 @@ clean: rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log rm -f $(IPA_LIB) rm -f aarch64.c + rm -f aarch64_ilp32.c rm -f reg-arm.c reg-bfin.c i386.c reg-ia64.c reg-m32r.c reg-m68k.c rm -f reg-sh.c reg-sparc.c reg-spu.c amd64.c i386-linux.c rm -f reg-cris.c reg-crisv32.c amd64-linux.c reg-xtensa.c @@ -540,6 +541,9 @@ linux-aarch64-ipa.o: linux-aarch64-ipa.c aarch64-ipa.o: aarch64.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) +aarch64_ilp32-ipa.o: aarch64_ilp32.c + $(IPAGENT_COMPILE) $< + $(POSTCOMPILE) linux-s390-ipa.o: linux-s390-ipa.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) @@ -800,6 +804,8 @@ aarch64-insn.o: ../arch/aarch64-insn.c aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c +aarch64_ilp32.c : $(srcdir)/../regformats/aarch64_ilp32.dat $(regdat_sh) + $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64_ilp32.dat aarch64_ilp32.c reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c arm-with-iwmmxt.c : $(srcdir)/../regformats/arm-with-iwmmxt.dat $(regdat_sh) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 39e8392..54cbf4e 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -50,7 +50,7 @@ srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-wa case "${target}" in aarch64*-*-linux*) - srv_regobj="aarch64.o" + srv_regobj="aarch64.o aarch64_ilp32.o" srv_regobj="${srv_regobj} arm-with-neon.o" srv_tgtobj="linux-aarch64-low.o aarch64-linux-hw-point.o" srv_tgtobj="$srv_tgtobj linux-aarch32-low.o" @@ -58,14 +58,15 @@ case "${target}" in srv_tgtobj="$srv_tgtobj aarch64-linux.o" srv_tgtobj="$srv_tgtobj aarch64-insn.o" srv_tgtobj="${srv_tgtobj} $srv_linux_obj" - srv_xmlfiles="aarch64.xml" + srv_xmlfiles="aarch64.xml aarch64_ilp32.xml" srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml" + srv_xmlfiles="${srv_xmlfiles} aarch64_ilp32-core.xml" srv_xmlfiles="${srv_xmlfiles} aarch64-fpu.xml" srv_xmlfiles="${srv_xmlfiles} arm-core.xml arm-vfpv3.xml" srv_xmlfiles="${srv_xmlfiles} arm-with-neon.xml" srv_linux_regsets=yes srv_linux_thread_db=yes - ipa_obj="linux-aarch64-ipa.o aarch64-ipa.o" + ipa_obj="linux-aarch64-ipa.o aarch64-ipa.o aarch64_ilp32-ipa.o" ;; arm*-*-linux*) srv_regobj="reg-arm.o arm-with-iwmmxt.o" srv_regobj="${srv_regobj} arm-with-vfpv2.o" diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c index 601d61c..d713bfa 100644 --- a/gdb/gdbserver/linux-aarch64-ipa.c +++ b/gdb/gdbserver/linux-aarch64-ipa.c @@ -29,6 +29,9 @@ /* Defined in auto-generated file aarch64.c. */ void init_registers_aarch64 (void); extern const struct target_desc *tdesc_aarch64; +/* Defined in auto-geenrated file aarch64_ilp32.c. */ +void init_registers_aarch64_ilp32 (void); +extern const struct target_desc *tdesc_aarch64_ilp32; /* Each register saved by the jump pad is in a 16 byte cell. */ #define FT_CR_SIZE 16 @@ -155,6 +158,9 @@ get_raw_reg (const unsigned char *raw_regs, int regnum) const struct target_desc * get_ipa_tdesc (int idx) { + if (sizeof (void*) == 4) + return tdesc_aarch64_ilp32; + return tdesc_aarch64; } @@ -207,5 +213,8 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { - init_registers_aarch64 (); + if (sizeof(void*) == 4) + init_registers_aarch64_ilp32 (); + else + init_registers_aarch64 (); } diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index e54a8ba..79084ef 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -42,6 +42,8 @@ /* Defined in auto-generated files. */ void init_registers_aarch64 (void); extern const struct target_desc *tdesc_aarch64; +void init_registers_aarch64_ilp32 (void); +extern const struct target_desc *tdesc_aarch64_ilp32; #ifdef HAVE_SYS_REG_H #include <sys/reg.h> @@ -484,8 +486,13 @@ aarch64_linux_read_description (void) is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); - if (is_elf64) + if (sizeof (void *) == 4 && is_elf64) + error (_("Can't debug 64-bit process with 32-bit GDBserver")); + + if (machine == EM_AARCH64 && is_elf64) return tdesc_aarch64; + else if (machine == EM_AARCH64 && !is_elf64) + return tdesc_aarch64_ilp32; else return tdesc_arm_with_neon; } @@ -3009,6 +3016,7 @@ void initialize_low_arch (void) { init_registers_aarch64 (); + init_registers_aarch64_ilp32 (); initialize_low_arch_aarch32 (); diff --git a/gdb/regformats/aarch64_ilp32.dat b/gdb/regformats/aarch64_ilp32.dat new file mode 100644 index 0000000..005c127 --- /dev/null +++ b/gdb/regformats/aarch64_ilp32.dat @@ -0,0 +1,73 @@ +# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: +# Generated from: aarch64_ilp32.xml +name:aarch64_ilp32 +xmltarget:aarch64_ilp32.xml +expedite:x29,sp,pc +64:x0 +64:x1 +64:x2 +64:x3 +64:x4 +64:x5 +64:x6 +64:x7 +64:x8 +64:x9 +64:x10 +64:x11 +64:x12 +64:x13 +64:x14 +64:x15 +64:x16 +64:x17 +64:x18 +64:x19 +64:x20 +64:x21 +64:x22 +64:x23 +64:x24 +64:x25 +64:x26 +64:x27 +64:x28 +64:x29 +64:x30 +32:sp +32:pc +32:cpsr +128:v0 +128:v1 +128:v2 +128:v3 +128:v4 +128:v5 +128:v6 +128:v7 +128:v8 +128:v9 +128:v10 +128:v11 +128:v12 +128:v13 +128:v14 +128:v15 +128:v16 +128:v17 +128:v18 +128:v19 +128:v20 +128:v21 +128:v22 +128:v23 +128:v24 +128:v25 +128:v26 +128:v27 +128:v28 +128:v29 +128:v30 +128:v31 +32:fpsr +32:fpcr -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-08-30 0:26 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski @ 2016-08-30 8:01 ` Andreas Schwab 2016-08-31 10:42 ` Pedro Alves 1 sibling, 0 replies; 19+ messages in thread From: Andreas Schwab @ 2016-08-30 8:01 UTC (permalink / raw) To: Andrew Pinski; +Cc: gdb-patches, binutils On Aug 30 2016, Andrew Pinski <apinski@cavium.com> wrote: > diff --git a/gdb/features/Makefile b/gdb/features/Makefile > index 809c811..30d2d43 100644 > --- a/gdb/features/Makefile > +++ b/gdb/features/Makefile > @@ -43,7 +43,7 @@ > # > # make GDB=/path/to/gdb XMLTOC="xml files" cfiles > > -WHICH = aarch64 \ > +WHICH = aarch64 aarch64_ilp32\ Space before backslash. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-08-30 0:26 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski 2016-08-30 8:01 ` Andreas Schwab @ 2016-08-31 10:42 ` Pedro Alves 2016-08-31 12:58 ` Yao Qi 1 sibling, 1 reply; 19+ messages in thread From: Pedro Alves @ 2016-08-31 10:42 UTC (permalink / raw) To: Andrew Pinski, gdb-patches, binutils On 08/30/2016 01:25 AM, Andrew Pinski wrote: > In gdbserver, we need to send over 32bit registers > for pc/sp instead of 64bit as we do right now. > So we need another XML file for ILP32. Why do we need to do that? The raw, architecture register is still 64-bit, right? Sounds to me that if you want to present a 32-bit pc to the user, then gdb should handle this, via a pseudo register, similarly to how x32 sends 64-bit rip, and then gdb shows a 32-bit pc. Mips does something like this too, to a larger extent, see mips_register_name. > > Tested using gdbserver with an ILP32 program and even > tested using gdbserver as an ILP32 program. > Thanks, Pedro Alves ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-08-31 10:42 ` Pedro Alves @ 2016-08-31 12:58 ` Yao Qi 2016-08-31 20:02 ` Andrew Pinski 0 siblings, 1 reply; 19+ messages in thread From: Yao Qi @ 2016-08-31 12:58 UTC (permalink / raw) To: Pedro Alves; +Cc: Andrew Pinski, gdb-patches, binutils On Wed, Aug 31, 2016 at 11:42 AM, Pedro Alves <palves@redhat.com> wrote: > On 08/30/2016 01:25 AM, Andrew Pinski wrote: >> In gdbserver, we need to send over 32bit registers >> for pc/sp instead of 64bit as we do right now. >> So we need another XML file for ILP32. > > Why do we need to do that? The raw, architecture register > is still 64-bit, right? > I want to ask the same... ILP32 is an ABI, it shouldn't affect the review to architecture register. > Sounds to me that if you want to present a 32-bit pc to the user, then > gdb should handle this, via a pseudo register, similarly to how > x32 sends 64-bit rip, and then gdb shows a 32-bit pc. Mips does > something like this too, to a larger extent, see mips_register_name. > Why do we need to present a 32-bit pc to the user? It is 64-bit, and I expect a 64-bit value is shown. -- Yao (齐尧) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-08-31 12:58 ` Yao Qi @ 2016-08-31 20:02 ` Andrew Pinski 0 siblings, 0 replies; 19+ messages in thread From: Andrew Pinski @ 2016-08-31 20:02 UTC (permalink / raw) To: Yao Qi; +Cc: Pedro Alves, Andrew Pinski, gdb-patches, binutils On Wed, Aug 31, 2016 at 5:58 AM, Yao Qi <qiyaoltc@gmail.com> wrote: > On Wed, Aug 31, 2016 at 11:42 AM, Pedro Alves <palves@redhat.com> wrote: >> On 08/30/2016 01:25 AM, Andrew Pinski wrote: >>> In gdbserver, we need to send over 32bit registers >>> for pc/sp instead of 64bit as we do right now. >>> So we need another XML file for ILP32. >> >> Why do we need to do that? The raw, architecture register >> is still 64-bit, right? >> > > I want to ask the same... ILP32 is an ABI, it shouldn't affect the > review to architecture register. > >> Sounds to me that if you want to present a 32-bit pc to the user, then >> gdb should handle this, via a pseudo register, similarly to how >> x32 sends 64-bit rip, and then gdb shows a 32-bit pc. Mips does >> something like this too, to a larger extent, see mips_register_name. >> > > Why do we need to present a 32-bit pc to the user? It is 64-bit, and > I expect a 64-bit value is shown. Yes understood, fixing that right now. I will submit a new version later today. Thanks, Andrew > > -- > Yao (齐尧) ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/3] Move AARCH64 ILP32 rejection handling 2016-08-30 0:26 [PATCH 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-08-30 0:26 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski 2016-08-30 0:26 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski @ 2016-08-30 0:26 ` Andrew Pinski 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 3 siblings, 0 replies; 19+ messages in thread From: Andrew Pinski @ 2016-08-30 0:26 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski For AARCH64 ILP32, we reject compatibility too early on to support gdb ILP32. This patch moves ILP32 rejection from compatible to elfNN_aarch64_merge_private_bfd_data which allows aarch64 and aarch64:ilp32 to be handled correctly with gdb. An added bonus is that we can have an error message on why two object files are rejected. OK? Tested both binutils and gdb. Thanks, Andrew Pinski 2016-08-29 Andrew Pinski <apinski@cavium.com> * cpu-aarch64.c (compatible): Don't reject different mach or ILP32 here. * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): Add an error message on why endianess is rejected. Reject different ILP32/LP64 settings. --- bfd/ChangeLog | 8 ++++++++ bfd/cpu-aarch64.c | 28 +++------------------------- bfd/elfnn-aarch64.c | 17 ++++++++++++++++- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 68a23d1..35b6dd0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2016-08-29 Andrew Pinski <apinski@cavium.com> + + * cpu-aarch64.c (compatible): + Don't reject different mach or ILP32 here. + * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): + Add an error message on why endianess is rejected. + Reject different ILP32/LP64 settings. + 2016-08-29 H.J. Lu <hongjiu.lu@intel.com> PR ld/14961 diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c index 596d241..6fb9133 100644 --- a/bfd/cpu-aarch64.c +++ b/bfd/cpu-aarch64.c @@ -34,31 +34,9 @@ compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b) if (a->arch != b->arch) return NULL; - /* If a & b are for the same machine then all is well. */ - if (a->mach == b->mach) - return a; - - /* Don't allow mixing ilp32 with lp64. */ - if ((a->mach & bfd_mach_aarch64_ilp32) != (b->mach & bfd_mach_aarch64_ilp32)) - return NULL; - - /* Otherwise if either a or b is the 'default' machine - then it can be polymorphed into the other. */ - if (a->the_default) - return b; - - if (b->the_default) - return a; - - /* So far all newer cores are - supersets of previous cores. */ - if (a->mach < b->mach) - return b; - else if (a->mach > b->mach) - return a; - - /* Never reached! */ - return NULL; + /* Machine compatibility is checked in + elfNN_aarch64_merge_private_bfd_data. */ + return a; } static struct diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 3435a3d..1e27501 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -6530,11 +6530,26 @@ elfNN_aarch64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) /* Check if we have the same endianess. */ if (!_bfd_generic_verify_endian_match (ibfd, obfd)) - return FALSE; + { + (*_bfd_error_handler) + (_("%B: endianness incompatible with that of the selected emulation"), + ibfd); + return FALSE; + } if (!is_aarch64_elf (ibfd) || !is_aarch64_elf (obfd)) return TRUE; + /* Don't allow mixing ilp32 with lp64. */ + if ((bfd_get_arch_info (ibfd)->mach & bfd_mach_aarch64_ilp32) + != (bfd_get_arch_info (obfd)->mach & bfd_mach_aarch64_ilp32)) + { + (*_bfd_error_handler) + (_("%B: ABI is incompatible with that of the selected emulation: \"%s\" != \"%s\""), + ibfd, bfd_get_target (ibfd), bfd_get_target (obfd)); + return FALSE; + } + /* The input BFD must have had its flags initialised. */ /* The following seems bogus to me -- The flags are initialized in the assembler but I don't think an elf_flags_init field is -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 0/3] Support AARCH64 ILP32 for gdb 2016-08-30 0:26 [PATCH 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski ` (2 preceding siblings ...) 2016-08-30 0:26 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski @ 2016-09-01 7:37 ` Andrew Pinski 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski ` (2 more replies) 3 siblings, 3 replies; 19+ messages in thread From: Andrew Pinski @ 2016-09-01 7:37 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski This patch set implements the basic support needed to debug AARCH64 ILP32 programs under Linux. This does not implement the full needed support like for syscalls or core dump (both are still in flux). But what is provided here is not influx at all and is indepedent of any changes could happen to the Linux kernel or glibc. v1 -> v2: 1. Rebase on top of the current trunk 2. Move the setting of ilp32 earlier in the patch 2 so less changes are done in patch 3. 3. Use 64bit registers for pc and sp like x32 does. 4. No longer changing the name of the register set for ILP32; reducing the changes for patch 3. Thanks, Andrew Pinski Andrew Pinski (3): Move AARCH64 ILP32 rejection handling Add ILP32 support to gdb. Handle ILP32 AARCH64 correctly for gdbserver bfd/ChangeLog | 8 ++ bfd/cpu-aarch64.c | 28 +----- bfd/elfnn-aarch64.c | 17 +++- gdb/ChangeLog | 23 +++++ gdb/aarch64-linux-tdep.c | 8 +- gdb/aarch64-tdep.c | 23 ++++- gdb/aarch64-tdep.h | 3 + gdb/features/Makefile | 4 +- gdb/features/aarch64_ilp32-core.xml | 67 +++++++++++++ gdb/features/aarch64_ilp32.c | 191 ++++++++++++++++++++++++++++++++++++ gdb/features/aarch64_ilp32.xml | 14 +++ gdb/gdbserver/ChangeLog | 19 ++++ gdb/gdbserver/Makefile.in | 6 ++ gdb/gdbserver/configure.srv | 7 +- gdb/gdbserver/linux-aarch64-ipa.c | 11 ++- gdb/gdbserver/linux-aarch64-low.c | 10 +- gdb/regformats/aarch64_ilp32.dat | 73 ++++++++++++++ 17 files changed, 474 insertions(+), 38 deletions(-) create mode 100644 gdb/features/aarch64_ilp32-core.xml create mode 100644 gdb/features/aarch64_ilp32.c create mode 100644 gdb/features/aarch64_ilp32.xml create mode 100644 gdb/regformats/aarch64_ilp32.dat -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/3] Add ILP32 support to gdb. 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski @ 2016-09-01 7:36 ` Andrew Pinski 2016-09-01 9:50 ` Andreas Schwab 2016-09-01 13:13 ` Yao Qi 2016-09-01 7:37 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski 2016-09-01 7:37 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski 2 siblings, 2 replies; 19+ messages in thread From: Andrew Pinski @ 2016-09-01 7:36 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski This patch adds AARCH64:ilp32 support to gdb and sets up the correct sizes for some types like pointers and long. Also sets up the correct linker map offsets for Linux. 2016-08-31 Andrew Pinski <apinski@cavium.com> * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. Make sure the gdbarches have compatible ilp32 flags. Set long and ptr sizes correctly for ilp32. * aarch64-linux-tdep.c (aarch64_linux_init_abi): Add support for ILP32. --- gdb/ChangeLog | 9 +++++++++ gdb/aarch64-linux-tdep.c | 8 ++++++-- gdb/aarch64-tdep.c | 14 ++++++++++++-- gdb/aarch64-tdep.h | 3 +++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 602a05a..03db9e2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-08-31 Andrew Pinski <apinski@cavium.com> + + * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. + * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. + Make sure the gdbarches have compatible ilp32 flags. + Set long and ptr sizes correctly for ilp32. + * aarch64-linux-tdep.c (aarch64_linux_init_abi): + Add support for ILP32. + 2016-08-31 Yao Qi <yao.qi@linaro.org> * record-full.c (record_full_insert_breakpoint): Fix typo. diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index cd220a6..43f959b 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -1000,8 +1000,12 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) linux_init_abi (info, gdbarch); - set_solib_svr4_fetch_link_map_offsets (gdbarch, - svr4_lp64_fetch_link_map_offsets); + if (tdep->ilp32) + set_solib_svr4_fetch_link_map_offsets (gdbarch, + svr4_ilp32_fetch_link_map_offsets); + else + set_solib_svr4_fetch_link_map_offsets (gdbarch, + svr4_lp64_fetch_link_map_offsets); /* Enable TLS support. */ set_gdbarch_fetch_tls_load_module_address (gdbarch, diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 3b7e954..1730ef8 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -2646,6 +2646,12 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) const struct tdesc_feature *feature; int num_regs = 0; int num_pseudo_regs = 0; + char ilp32 = FALSE; + + if (info.abfd + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) + ilp32 = TRUE; /* Ensure we always have a target descriptor. */ if (!tdesc_has_registers (tdesc)) @@ -2703,6 +2709,9 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) best_arch != NULL; best_arch = gdbarch_list_lookup_by_info (best_arch->next, &info)) { + /* ILP32 and LP64 are incompatible. */ + if (gdbarch_tdep (arches->gdbarch)->ilp32 != ilp32) + continue; /* Found a match. */ break; } @@ -2721,6 +2730,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->lowest_pc = 0x20; tdep->jb_pc = -1; /* Longjump support not enabled by default. */ tdep->jb_elt_size = 8; + tdep->ilp32 = ilp32; set_gdbarch_push_dummy_call (gdbarch, aarch64_push_dummy_call); set_gdbarch_frame_align (gdbarch, aarch64_frame_align); @@ -2760,9 +2770,9 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_float_bit (gdbarch, 32); set_gdbarch_double_bit (gdbarch, 64); set_gdbarch_long_double_bit (gdbarch, 128); - set_gdbarch_long_bit (gdbarch, 64); + set_gdbarch_long_bit (gdbarch, ilp32 ? 32 : 64); set_gdbarch_long_long_bit (gdbarch, 64); - set_gdbarch_ptr_bit (gdbarch, 64); + set_gdbarch_ptr_bit (gdbarch, ilp32 ? 32 : 64); set_gdbarch_char_signed (gdbarch, 0); set_gdbarch_float_format (gdbarch, floatformats_ieee_single); set_gdbarch_double_format (gdbarch, floatformats_ieee_double); diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index a95b613..7b1ce3e 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -95,6 +95,9 @@ struct gdbarch_tdep /* syscall record. */ int (*aarch64_syscall_record) (struct regcache *regcache, unsigned long svc_number); + /* If this is ILP32 or LP64. */ + bool ilp32; + }; extern struct target_desc *tdesc_aarch64; -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] Add ILP32 support to gdb. 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski @ 2016-09-01 9:50 ` Andreas Schwab 2016-09-01 13:13 ` Yao Qi 1 sibling, 0 replies; 19+ messages in thread From: Andreas Schwab @ 2016-09-01 9:50 UTC (permalink / raw) To: Andrew Pinski; +Cc: gdb-patches, binutils On Sep 01 2016, Andrew Pinski <apinski@cavium.com> wrote: > diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c > index 3b7e954..1730ef8 100644 > --- a/gdb/aarch64-tdep.c > +++ b/gdb/aarch64-tdep.c > @@ -2646,6 +2646,12 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) > const struct tdesc_feature *feature; > int num_regs = 0; > int num_pseudo_regs = 0; > + char ilp32 = FALSE; s/char/bool/? Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] Add ILP32 support to gdb. 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski 2016-09-01 9:50 ` Andreas Schwab @ 2016-09-01 13:13 ` Yao Qi 1 sibling, 0 replies; 19+ messages in thread From: Yao Qi @ 2016-09-01 13:13 UTC (permalink / raw) To: Andrew Pinski; +Cc: gdb-patches, binutils On Thu, Sep 1, 2016 at 8:36 AM, Andrew Pinski <apinski@cavium.com> wrote: > This patch adds AARCH64:ilp32 support to gdb and sets > up the correct sizes for some types like pointers and long. > Also sets up the correct linker map offsets for Linux. > > 2016-08-31 Andrew Pinski <apinski@cavium.com> > > * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. It should be * aarch64-tdep.h (gdbarch_tdep) <ilp32>: New field. > * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. > Make sure the gdbarches have compatible ilp32 flags. > Set long and ptr sizes correctly for ilp32. > * aarch64-linux-tdep.c (aarch64_linux_init_abi): > Add support for ILP32. > diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c > index 3b7e954..1730ef8 100644 > --- a/gdb/aarch64-tdep.c > +++ b/gdb/aarch64-tdep.c > @@ -2646,6 +2646,12 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) > const struct tdesc_feature *feature; > int num_regs = 0; > int num_pseudo_regs = 0; > + char ilp32 = FALSE; s/char/int/ > + > + if (info.abfd > + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour > + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS32) > + ilp32 = TRUE; How about this? if (info.bfd_arch_info->mach == bfd_mach_aarch64_ilp32) ilp32 = TRUE; > --- a/gdb/aarch64-tdep.h > +++ b/gdb/aarch64-tdep.h > @@ -95,6 +95,9 @@ struct gdbarch_tdep > > /* syscall record. */ > int (*aarch64_syscall_record) (struct regcache *regcache, unsigned long svc_number); > + /* If this is ILP32 or LP64. */ > + bool ilp32; We don't use bool in GDB, use int instead. -- Yao (齐尧) ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski @ 2016-09-01 7:37 ` Andrew Pinski 2016-09-01 8:32 ` Andreas Schwab 2016-09-01 7:37 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski 2 siblings, 1 reply; 19+ messages in thread From: Andrew Pinski @ 2016-09-01 7:37 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski In gdbserver, we need to send over 64bit registers for pc/sp and have gdb think they are 64bit registers. So we need another XML file for ILP32. Tested using gdbserver with an ILP32 program and even tested using gdbserver as an ILP32 program. OK? Thanks, Andrew Pinski ChangeLog: * aarch64-tdep.c: Include "features/aarch64_ilp32.c". (aarch64_gdbarch_init): Handle ilp32 correctly. (_initialize_aarch64_tdep): Call initialize_tdesc_aarch64_ilp32 too. * features/Makefile (WHICH): Add aarch64_ilp32. (aarch64_ilp32-expedite): Set. (XMLTOC): Add aarch64_ilp32.xml. (features/aarch64_ilp32-core.xml): New file. (features/aarch64_ilp32.xml): New file. (features/aarch64_ilp32.c): Generate. (regformats/aarch64_ilp32.dat): Generate. gdbserver/ChangeLog: * Makefile.in (clean): Remove aarch64_ilp32.c also. (aarch64_ilp32-ipa.o): New target. (aarch64_ilp32.c): New target. * configure.srv (aarch64*-*-linux*): Add ilp32 files to srv_regobj, srv_xmlfiles and ipa_obj. * linux-aarch64-ipa.c (init_registers_aarch64_ilp32): Declare. (tdesc_aarch64_ilp32): Likewise. (get_ipa_tdesc): Return tdesc_aarch64_ilp32 for ILP32. (initialize_low_tracepoint): Call init_registers_aarch64_ilp32 for ILP32. * linux-aarch64-low.c (init_registers_aarch64_ilp32): Declare. (tdesc_aarch64_ilp32): Likewise. (aarch64_linux_read_description): Return tdesc_aarch64_ilp32 for ILP32 executables. (initialize_low_arch): Call init_registers_aarch64_ilp32. Signed-off-by: Andrew Pinski <apinski@cavium.com> --- gdb/ChangeLog | 14 +++ gdb/aarch64-tdep.c | 4 +- gdb/features/Makefile | 4 +- gdb/features/aarch64_ilp32-core.xml | 67 +++++++++++++ gdb/features/aarch64_ilp32.c | 191 ++++++++++++++++++++++++++++++++++++ gdb/features/aarch64_ilp32.xml | 14 +++ gdb/gdbserver/ChangeLog | 19 ++++ gdb/gdbserver/Makefile.in | 6 ++ gdb/gdbserver/configure.srv | 7 +- gdb/gdbserver/linux-aarch64-ipa.c | 11 ++- gdb/gdbserver/linux-aarch64-low.c | 10 +- gdb/regformats/aarch64_ilp32.dat | 73 ++++++++++++++ 12 files changed, 413 insertions(+), 7 deletions(-) create mode 100644 gdb/features/aarch64_ilp32-core.xml create mode 100644 gdb/features/aarch64_ilp32.c create mode 100644 gdb/features/aarch64_ilp32.xml create mode 100644 gdb/regformats/aarch64_ilp32.dat diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 03db9e2..7345fc9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2015-08-31 Andrew Pinski <apinski@cavium.com> + * aarch64-tdep.c: Include "features/aarch64_ilp32.c". + (aarch64_gdbarch_init): Handle ilp32 correctly. + (_initialize_aarch64_tdep): Call initialize_tdesc_aarch64_ilp32 + too. + * features/Makefile (WHICH): Add aarch64_ilp32. + (aarch64_ilp32-expedite): Set. + (XMLTOC): Add aarch64_ilp32.xml. + (features/aarch64_ilp32-core.xml): New file. + (features/aarch64_ilp32.xml): New file. + (features/aarch64_ilp32.c): Generate. + (regformats/aarch64_ilp32.dat): Generate. + +2015-08-31 Andrew Pinski <apinski@cavium.com> + * aarch64-tdep.h (gdbarch_tdep): Add ilp32 field. * aarch64-tdep.c (aarch64_gdbarch_init): Setup ILP32 support. Make sure the gdbarches have compatible ilp32 flags. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 1730ef8..7c88c96 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -56,6 +56,7 @@ #include "record-full.h" #include "features/aarch64.c" +#include "features/aarch64_ilp32.c" #include "arch/aarch64-insn.h" @@ -2655,7 +2656,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Ensure we always have a target descriptor. */ if (!tdesc_has_registers (tdesc)) - tdesc = tdesc_aarch64; + tdesc = ilp32 ? tdesc_aarch64_ilp32 : tdesc_aarch64; gdb_assert (tdesc); @@ -2845,6 +2846,7 @@ _initialize_aarch64_tdep (void) aarch64_dump_tdep); initialize_tdesc_aarch64 (); + initialize_tdesc_aarch64_ilp32 (); /* Debug this file's internals. */ add_setshow_boolean_cmd ("aarch64", class_maintenance, &aarch64_debug, _("\ diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 809c811..62a61f3 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -43,7 +43,7 @@ # # make GDB=/path/to/gdb XMLTOC="xml files" cfiles -WHICH = aarch64 \ +WHICH = aarch64 aarch64_ilp32 \ arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \ i386/i386 i386/i386-linux \ i386/i386-mmx i386/i386-mmx-linux \ @@ -77,6 +77,7 @@ WHICH = aarch64 \ # Record which registers should be sent to GDB by default after stop. aarch64-expedite = x29,sp,pc +aarch64_ilp32-expedite = x29,sp,pc arm-expedite = r11,sp,pc i386/i386-expedite = ebp,esp,eip i386/i386-linux-expedite = ebp,esp,eip @@ -148,6 +149,7 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH)) # to make on the command line. XMLTOC = \ aarch64.xml \ + aarch64_ilp32.xml \ arm-with-iwmmxt.xml \ arm-with-m-fpa-layout.xml \ arm-with-m-vfp-d16.xml \ diff --git a/gdb/features/aarch64_ilp32-core.xml b/gdb/features/aarch64_ilp32-core.xml new file mode 100644 index 0000000..ace8d62 --- /dev/null +++ b/gdb/features/aarch64_ilp32-core.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2009-2016 Free Software Foundation, Inc. + Contributed by ARM Ltd. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.aarch64.core"> + <reg name="x0" bitsize="64"/> + <reg name="x1" bitsize="64"/> + <reg name="x2" bitsize="64"/> + <reg name="x3" bitsize="64"/> + <reg name="x4" bitsize="64"/> + <reg name="x5" bitsize="64"/> + <reg name="x6" bitsize="64"/> + <reg name="x7" bitsize="64"/> + <reg name="x8" bitsize="64"/> + <reg name="x9" bitsize="64"/> + <reg name="x10" bitsize="64"/> + <reg name="x11" bitsize="64"/> + <reg name="x12" bitsize="64"/> + <reg name="x13" bitsize="64"/> + <reg name="x14" bitsize="64"/> + <reg name="x15" bitsize="64"/> + <reg name="x16" bitsize="64"/> + <reg name="x17" bitsize="64"/> + <reg name="x18" bitsize="64"/> + <reg name="x19" bitsize="64"/> + <reg name="x20" bitsize="64"/> + <reg name="x21" bitsize="64"/> + <reg name="x22" bitsize="64"/> + <reg name="x23" bitsize="64"/> + <reg name="x24" bitsize="64"/> + <reg name="x25" bitsize="64"/> + <reg name="x26" bitsize="64"/> + <reg name="x27" bitsize="64"/> + <reg name="x28" bitsize="64"/> + <reg name="x29" bitsize="64"/> + <reg name="x30" bitsize="64"/> + <reg name="sp" bitsize="64" type="int64"/> + + <reg name="pc" bitsize="64" type="uint64"/> + + <flags id="cpsr_flags" size="4"> + <field name="SP" start="0" type="bool"/> + <field name="" start="1" end="1"/> + <field name="EL" start="2" end="3"/> + <field name="nRW" start="4" type="bool"/> + <field name="" start="5" end="5"/> + <field name="F" start="6" type="bool"/> + <field name="I" start="7" type="bool"/> + <field name="A" start="8" type="bool"/> + <field name="D" start="9" type="bool"/> + + <field name="IL" start="20" type="bool"/> + <field name="SS" start="21" type="bool"/> + + <field name="V" start="28" type="bool"/> + <field name="C" start="29" type="bool"/> + <field name="Z" start="30" type="bool"/> + <field name="N" start="31" type="bool"/> + </flags> + <reg name="cpsr" bitsize="32" type="cpsr_flags"/> + +</feature> diff --git a/gdb/features/aarch64_ilp32.c b/gdb/features/aarch64_ilp32.c new file mode 100644 index 0000000..2195130 --- /dev/null +++ b/gdb/features/aarch64_ilp32.c @@ -0,0 +1,191 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64_ilp32.xml */ + +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" + +struct target_desc *tdesc_aarch64_ilp32; +static void +initialize_tdesc_aarch64_ilp32 (void) +{ + struct target_desc *result = allocate_target_description (); + struct tdesc_feature *feature; + struct tdesc_type *field_type; + struct tdesc_type *type; + + set_tdesc_architecture (result, bfd_scan_arch ("aarch64:ilp32")); + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core"); + type = tdesc_create_flags (feature, "cpsr_flags", 4); + tdesc_add_flag (type, 0, "SP"); + tdesc_add_bitfield (type, "", 1, 1); + tdesc_add_bitfield (type, "EL", 2, 3); + tdesc_add_flag (type, 4, "nRW"); + tdesc_add_bitfield (type, "", 5, 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, "int64"); + tdesc_create_reg (feature, "pc", 32, 1, NULL, 64, "uint64"); + 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_ilp32 = result; +} diff --git a/gdb/features/aarch64_ilp32.xml b/gdb/features/aarch64_ilp32.xml new file mode 100644 index 0000000..9c9b23a --- /dev/null +++ b/gdb/features/aarch64_ilp32.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2009-2016 Free Software Foundation, Inc. + Contributed by ARM Ltd. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!DOCTYPE target SYSTEM "gdb-target.dtd"> +<target> + <architecture>aarch64:ilp32</architecture> + <xi:include href="aarch64_ilp32-core.xml"/> + <xi:include href="aarch64-fpu.xml"/> +</target> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 4dc2e45..67a8503 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,22 @@ +2016-08-31 Andrew Pinski <apinski@cavium.com> + + * Makefile.in (clean): Remove aarch64_ilp32.c also. + (aarch64_ilp32-ipa.o): New target. + (aarch64_ilp32.c): New target. + * configure.srv (aarch64*-*-linux*): Add ilp32 files + to srv_regobj, srv_xmlfiles and ipa_obj. + * linux-aarch64-ipa.c (init_registers_aarch64_ilp32): + Declare. + (tdesc_aarch64_ilp32): Likewise. + (get_ipa_tdesc): Return tdesc_aarch64_ilp32 for ILP32. + (initialize_low_tracepoint): Call init_registers_aarch64_ilp32 + for ILP32. + * linux-aarch64-low.c (init_registers_aarch64_ilp32): Declare. + (tdesc_aarch64_ilp32): Likewise. + (aarch64_linux_read_description): Return tdesc_aarch64_ilp32 + for ILP32 executables. + (initialize_low_arch): Call init_registers_aarch64_ilp32. + 2016-08-31 Antoine Tremblay <antoine.tremblay@ericsson.com> * linux-low.c (linux_wait_1): Move event switch after unsuspend_lwps. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index f844ab8..cd18f81 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -352,6 +352,7 @@ clean: rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log rm -f $(IPA_LIB) rm -f aarch64.c + rm -f aarch64_ilp32.c rm -f reg-arm.c reg-bfin.c i386.c reg-ia64.c reg-m32r.c reg-m68k.c rm -f reg-sh.c reg-sparc.c reg-spu.c amd64.c i386-linux.c rm -f reg-cris.c reg-crisv32.c amd64-linux.c reg-xtensa.c @@ -540,6 +541,9 @@ linux-aarch64-ipa.o: linux-aarch64-ipa.c aarch64-ipa.o: aarch64.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) +aarch64_ilp32-ipa.o: aarch64_ilp32.c + $(IPAGENT_COMPILE) $< + $(POSTCOMPILE) linux-s390-ipa.o: linux-s390-ipa.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) @@ -800,6 +804,8 @@ aarch64-insn.o: ../arch/aarch64-insn.c aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c +aarch64_ilp32.c : $(srcdir)/../regformats/aarch64_ilp32.dat $(regdat_sh) + $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64_ilp32.dat aarch64_ilp32.c reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c arm-with-iwmmxt.c : $(srcdir)/../regformats/arm-with-iwmmxt.dat $(regdat_sh) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 39e8392..54cbf4e 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -50,7 +50,7 @@ srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-wa case "${target}" in aarch64*-*-linux*) - srv_regobj="aarch64.o" + srv_regobj="aarch64.o aarch64_ilp32.o" srv_regobj="${srv_regobj} arm-with-neon.o" srv_tgtobj="linux-aarch64-low.o aarch64-linux-hw-point.o" srv_tgtobj="$srv_tgtobj linux-aarch32-low.o" @@ -58,14 +58,15 @@ case "${target}" in srv_tgtobj="$srv_tgtobj aarch64-linux.o" srv_tgtobj="$srv_tgtobj aarch64-insn.o" srv_tgtobj="${srv_tgtobj} $srv_linux_obj" - srv_xmlfiles="aarch64.xml" + srv_xmlfiles="aarch64.xml aarch64_ilp32.xml" srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml" + srv_xmlfiles="${srv_xmlfiles} aarch64_ilp32-core.xml" srv_xmlfiles="${srv_xmlfiles} aarch64-fpu.xml" srv_xmlfiles="${srv_xmlfiles} arm-core.xml arm-vfpv3.xml" srv_xmlfiles="${srv_xmlfiles} arm-with-neon.xml" srv_linux_regsets=yes srv_linux_thread_db=yes - ipa_obj="linux-aarch64-ipa.o aarch64-ipa.o" + ipa_obj="linux-aarch64-ipa.o aarch64-ipa.o aarch64_ilp32-ipa.o" ;; arm*-*-linux*) srv_regobj="reg-arm.o arm-with-iwmmxt.o" srv_regobj="${srv_regobj} arm-with-vfpv2.o" diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c index 601d61c..d713bfa 100644 --- a/gdb/gdbserver/linux-aarch64-ipa.c +++ b/gdb/gdbserver/linux-aarch64-ipa.c @@ -29,6 +29,9 @@ /* Defined in auto-generated file aarch64.c. */ void init_registers_aarch64 (void); extern const struct target_desc *tdesc_aarch64; +/* Defined in auto-geenrated file aarch64_ilp32.c. */ +void init_registers_aarch64_ilp32 (void); +extern const struct target_desc *tdesc_aarch64_ilp32; /* Each register saved by the jump pad is in a 16 byte cell. */ #define FT_CR_SIZE 16 @@ -155,6 +158,9 @@ get_raw_reg (const unsigned char *raw_regs, int regnum) const struct target_desc * get_ipa_tdesc (int idx) { + if (sizeof (void*) == 4) + return tdesc_aarch64_ilp32; + return tdesc_aarch64; } @@ -207,5 +213,8 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { - init_registers_aarch64 (); + if (sizeof(void*) == 4) + init_registers_aarch64_ilp32 (); + else + init_registers_aarch64 (); } diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index e54a8ba..79084ef 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -42,6 +42,8 @@ /* Defined in auto-generated files. */ void init_registers_aarch64 (void); extern const struct target_desc *tdesc_aarch64; +void init_registers_aarch64_ilp32 (void); +extern const struct target_desc *tdesc_aarch64_ilp32; #ifdef HAVE_SYS_REG_H #include <sys/reg.h> @@ -484,8 +486,13 @@ aarch64_linux_read_description (void) is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); - if (is_elf64) + if (sizeof (void *) == 4 && is_elf64) + error (_("Can't debug 64-bit process with 32-bit GDBserver")); + + if (machine == EM_AARCH64 && is_elf64) return tdesc_aarch64; + else if (machine == EM_AARCH64 && !is_elf64) + return tdesc_aarch64_ilp32; else return tdesc_arm_with_neon; } @@ -3009,6 +3016,7 @@ void initialize_low_arch (void) { init_registers_aarch64 (); + init_registers_aarch64_ilp32 (); initialize_low_arch_aarch32 (); diff --git a/gdb/regformats/aarch64_ilp32.dat b/gdb/regformats/aarch64_ilp32.dat new file mode 100644 index 0000000..bcef3e1 --- /dev/null +++ b/gdb/regformats/aarch64_ilp32.dat @@ -0,0 +1,73 @@ +# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: +# Generated from: aarch64_ilp32.xml +name:aarch64_ilp32 +xmltarget:aarch64_ilp32.xml +expedite:x29,sp,pc +64:x0 +64:x1 +64:x2 +64:x3 +64:x4 +64:x5 +64:x6 +64:x7 +64:x8 +64:x9 +64:x10 +64:x11 +64:x12 +64:x13 +64:x14 +64:x15 +64:x16 +64:x17 +64:x18 +64:x19 +64:x20 +64:x21 +64:x22 +64:x23 +64:x24 +64:x25 +64:x26 +64:x27 +64:x28 +64:x29 +64:x30 +64:sp +64:pc +32:cpsr +128:v0 +128:v1 +128:v2 +128:v3 +128:v4 +128:v5 +128:v6 +128:v7 +128:v8 +128:v9 +128:v10 +128:v11 +128:v12 +128:v13 +128:v14 +128:v15 +128:v16 +128:v17 +128:v18 +128:v19 +128:v20 +128:v21 +128:v22 +128:v23 +128:v24 +128:v25 +128:v26 +128:v27 +128:v28 +128:v29 +128:v30 +128:v31 +32:fpsr +32:fpcr -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver 2016-09-01 7:37 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski @ 2016-09-01 8:32 ` Andreas Schwab 0 siblings, 0 replies; 19+ messages in thread From: Andreas Schwab @ 2016-09-01 8:32 UTC (permalink / raw) To: Andrew Pinski; +Cc: gdb-patches, binutils On Sep 01 2016, Andrew Pinski <apinski@cavium.com> wrote: > diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c > index 601d61c..d713bfa 100644 > --- a/gdb/gdbserver/linux-aarch64-ipa.c > +++ b/gdb/gdbserver/linux-aarch64-ipa.c > @@ -29,6 +29,9 @@ > /* Defined in auto-generated file aarch64.c. */ > void init_registers_aarch64 (void); > extern const struct target_desc *tdesc_aarch64; > +/* Defined in auto-geenrated file aarch64_ilp32.c. */ generated > @@ -155,6 +158,9 @@ get_raw_reg (const unsigned char *raw_regs, int regnum) > const struct target_desc * > get_ipa_tdesc (int idx) > { > + if (sizeof (void*) == 4) Space before *. > @@ -207,5 +213,8 @@ alloc_jump_pad_buffer (size_t size) > void > initialize_low_tracepoint (void) > { > - init_registers_aarch64 (); > + if (sizeof(void*) == 4) Space before ( and *. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/3] Move AARCH64 ILP32 rejection handling 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski 2016-09-01 7:37 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski @ 2016-09-01 7:37 ` Andrew Pinski 2016-09-01 9:43 ` Richard Earnshaw (lists) 2 siblings, 1 reply; 19+ messages in thread From: Andrew Pinski @ 2016-09-01 7:37 UTC (permalink / raw) To: gdb-patches, binutils; +Cc: Andrew Pinski For AARCH64 ILP32, we reject compatibility too early on to support gdb ILP32. This patch moves ILP32 rejection from compatible to elfNN_aarch64_merge_private_bfd_data which allows aarch64 and aarch64:ilp32 to be handled correctly with gdb. An added bonus is that we can have an error message on why two object files are rejected. OK? Tested both binutils and gdb. Thanks, Andrew Pinski 2016-08-31 Andrew Pinski <apinski@cavium.com> * cpu-aarch64.c (compatible): Don't reject different mach or ILP32 here. * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): Add an error message on why endianess is rejected. Reject different ILP32/LP64 settings. Signed-off-by: Andrew Pinski <apinski@cavium.com> --- bfd/ChangeLog | 8 ++++++++ bfd/cpu-aarch64.c | 28 +++------------------------- bfd/elfnn-aarch64.c | 17 ++++++++++++++++- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 59dfb2c..77b2b6b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2016-08-31 Andrew Pinski <apinski@cavium.com> + + * cpu-aarch64.c (compatible): + Don't reject different mach or ILP32 here. + * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): + Add an error message on why endianess is rejected. + Reject different ILP32/LP64 settings. + 2016-08-31 Alan Modra <amodra@gmail.com> * elf64-ppc.c (group_sections): Delete stub14_group_size. Instead, diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c index 596d241..6fb9133 100644 --- a/bfd/cpu-aarch64.c +++ b/bfd/cpu-aarch64.c @@ -34,31 +34,9 @@ compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b) if (a->arch != b->arch) return NULL; - /* If a & b are for the same machine then all is well. */ - if (a->mach == b->mach) - return a; - - /* Don't allow mixing ilp32 with lp64. */ - if ((a->mach & bfd_mach_aarch64_ilp32) != (b->mach & bfd_mach_aarch64_ilp32)) - return NULL; - - /* Otherwise if either a or b is the 'default' machine - then it can be polymorphed into the other. */ - if (a->the_default) - return b; - - if (b->the_default) - return a; - - /* So far all newer cores are - supersets of previous cores. */ - if (a->mach < b->mach) - return b; - else if (a->mach > b->mach) - return a; - - /* Never reached! */ - return NULL; + /* Machine compatibility is checked in + elfNN_aarch64_merge_private_bfd_data. */ + return a; } static struct diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 3435a3d..1e27501 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -6530,11 +6530,26 @@ elfNN_aarch64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) /* Check if we have the same endianess. */ if (!_bfd_generic_verify_endian_match (ibfd, obfd)) - return FALSE; + { + (*_bfd_error_handler) + (_("%B: endianness incompatible with that of the selected emulation"), + ibfd); + return FALSE; + } if (!is_aarch64_elf (ibfd) || !is_aarch64_elf (obfd)) return TRUE; + /* Don't allow mixing ilp32 with lp64. */ + if ((bfd_get_arch_info (ibfd)->mach & bfd_mach_aarch64_ilp32) + != (bfd_get_arch_info (obfd)->mach & bfd_mach_aarch64_ilp32)) + { + (*_bfd_error_handler) + (_("%B: ABI is incompatible with that of the selected emulation: \"%s\" != \"%s\""), + ibfd, bfd_get_target (ibfd), bfd_get_target (obfd)); + return FALSE; + } + /* The input BFD must have had its flags initialised. */ /* The following seems bogus to me -- The flags are initialized in the assembler but I don't think an elf_flags_init field is -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] Move AARCH64 ILP32 rejection handling 2016-09-01 7:37 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski @ 2016-09-01 9:43 ` Richard Earnshaw (lists) 0 siblings, 0 replies; 19+ messages in thread From: Richard Earnshaw (lists) @ 2016-09-01 9:43 UTC (permalink / raw) To: Andrew Pinski, gdb-patches, binutils On 01/09/16 08:36, Andrew Pinski wrote: > For AARCH64 ILP32, we reject compatibility too > early on to support gdb ILP32. This patch > moves ILP32 rejection from compatible > to elfNN_aarch64_merge_private_bfd_data > which allows aarch64 and aarch64:ilp32 > to be handled correctly with gdb. > An added bonus is that we can have an error > message on why two object files are rejected. > > OK? Tested both binutils and gdb. > You haven't explained why you've dropped these tests: - /* Otherwise if either a or b is the 'default' machine - then it can be polymorphed into the other. */ - if (a->the_default) - return b; - - if (b->the_default) - return a; - - /* So far all newer cores are - supersets of previous cores. */ - if (a->mach < b->mach) - return b; - else if (a->mach > b->mach) - return a; R. > Thanks, > Andrew Pinski > > 2016-08-31 Andrew Pinski <apinski@cavium.com> > > * cpu-aarch64.c (compatible): > Don't reject different mach or ILP32 here. > * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): > Add an error message on why endianess is rejected. > Reject different ILP32/LP64 settings. > > Signed-off-by: Andrew Pinski <apinski@cavium.com> > --- > bfd/ChangeLog | 8 ++++++++ > bfd/cpu-aarch64.c | 28 +++------------------------- > bfd/elfnn-aarch64.c | 17 ++++++++++++++++- > 3 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/bfd/ChangeLog b/bfd/ChangeLog > index 59dfb2c..77b2b6b 100644 > --- a/bfd/ChangeLog > +++ b/bfd/ChangeLog > @@ -1,3 +1,11 @@ > +2016-08-31 Andrew Pinski <apinski@cavium.com> > + > + * cpu-aarch64.c (compatible): > + Don't reject different mach or ILP32 here. > + * elfnn-aarch64.c (elfNN_aarch64_merge_private_bfd_data): > + Add an error message on why endianess is rejected. > + Reject different ILP32/LP64 settings. > + > 2016-08-31 Alan Modra <amodra@gmail.com> > > * elf64-ppc.c (group_sections): Delete stub14_group_size. Instead, > diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c > index 596d241..6fb9133 100644 > --- a/bfd/cpu-aarch64.c > +++ b/bfd/cpu-aarch64.c > @@ -34,31 +34,9 @@ compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b) > if (a->arch != b->arch) > return NULL; > > - /* If a & b are for the same machine then all is well. */ > - if (a->mach == b->mach) > - return a; > - > - /* Don't allow mixing ilp32 with lp64. */ > - if ((a->mach & bfd_mach_aarch64_ilp32) != (b->mach & bfd_mach_aarch64_ilp32)) > - return NULL; > - > - /* Otherwise if either a or b is the 'default' machine > - then it can be polymorphed into the other. */ > - if (a->the_default) > - return b; > - > - if (b->the_default) > - return a; > - > - /* So far all newer cores are > - supersets of previous cores. */ > - if (a->mach < b->mach) > - return b; > - else if (a->mach > b->mach) > - return a; > - > - /* Never reached! */ > - return NULL; > + /* Machine compatibility is checked in > + elfNN_aarch64_merge_private_bfd_data. */ > + return a; > } > > static struct > diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c > index 3435a3d..1e27501 100644 > --- a/bfd/elfnn-aarch64.c > +++ b/bfd/elfnn-aarch64.c > @@ -6530,11 +6530,26 @@ elfNN_aarch64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) > > /* Check if we have the same endianess. */ > if (!_bfd_generic_verify_endian_match (ibfd, obfd)) > - return FALSE; > + { > + (*_bfd_error_handler) > + (_("%B: endianness incompatible with that of the selected emulation"), > + ibfd); > + return FALSE; > + } > > if (!is_aarch64_elf (ibfd) || !is_aarch64_elf (obfd)) > return TRUE; > > + /* Don't allow mixing ilp32 with lp64. */ > + if ((bfd_get_arch_info (ibfd)->mach & bfd_mach_aarch64_ilp32) > + != (bfd_get_arch_info (obfd)->mach & bfd_mach_aarch64_ilp32)) > + { > + (*_bfd_error_handler) > + (_("%B: ABI is incompatible with that of the selected emulation: \"%s\" != \"%s\""), > + ibfd, bfd_get_target (ibfd), bfd_get_target (obfd)); > + return FALSE; > + } > + > /* The input BFD must have had its flags initialised. */ > /* The following seems bogus to me -- The flags are initialized in > the assembler but I don't think an elf_flags_init field is > ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2016-09-01 13:13 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-08-30 0:26 [PATCH 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-08-30 0:26 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski 2016-08-30 7:44 ` Andreas Schwab 2016-09-01 4:21 ` Andrew Pinski 2016-09-01 7:41 ` Andreas Schwab 2016-08-30 0:26 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski 2016-08-30 8:01 ` Andreas Schwab 2016-08-31 10:42 ` Pedro Alves 2016-08-31 12:58 ` Yao Qi 2016-08-31 20:02 ` Andrew Pinski 2016-08-30 0:26 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski 2016-09-01 7:37 ` [PATCH v2 0/3] Support AARCH64 ILP32 for gdb Andrew Pinski 2016-09-01 7:36 ` [PATCH 2/3] Add ILP32 support to gdb Andrew Pinski 2016-09-01 9:50 ` Andreas Schwab 2016-09-01 13:13 ` Yao Qi 2016-09-01 7:37 ` [PATCH 3/3] Handle ILP32 AARCH64 correctly for gdbserver Andrew Pinski 2016-09-01 8:32 ` Andreas Schwab 2016-09-01 7:37 ` [PATCH 1/3] Move AARCH64 ILP32 rejection handling Andrew Pinski 2016-09-01 9:43 ` Richard Earnshaw (lists)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).