This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH 2/4] gdbserver use aarch64_create_target_description
- From: Alan Hayward <Alan dot Hayward at arm dot com>
- To: Yao Qi <qiyaoltc at gmail dot com>
- Cc: "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>, nd <nd at arm dot com>
- Date: Thu, 23 Nov 2017 16:08:25 +0000
- Subject: Re: [PATCH 2/4] gdbserver use aarch64_create_target_description
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan dot Hayward at arm dot com;
- Nodisclaimer: True
- References: <48281E67-64B6-4558-9790-CB4189187124@arm.com> <86po94ygg5.fsf@gmail.com> <83AC8291-7A68-4FC3-B1B4-9CA45EAA4E4F@arm.com> <B37B53CF-A54D-4977-9ADB-764AB1DE4714@arm.com> <86efpbwuuj.fsf@gmail.com> <6B24A0B2-B91D-4AE0-AAA3-158325FBC649@arm.com> <864lpms5c3.fsf@gmail.com>
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
> On 22 Nov 2017, at 15:25, Yao Qi <qiyaoltc@gmail.com> wrote:
>
> Alan Hayward <Alan.Hayward@arm.com> writes:
>
> Patch is good to me. A nit below,
>
>> + srv_aarch64_linux_regobj="aarch64.o"
>> else
>> srv_i386_linux_regobj=""
>> srv_amd64_linux_regobj=""
>> + srv_aarch64_linux_regobj=""
>> fi
>
> Can we avoid using a variable srv_aarch64_linux_regobj here? Instead,
> does the condition check $development somewhere below....
>
> We have these variables for x86 because these variables are used
> multiple times. However, for aarch64, we don't have such uses.
>
>>
>> ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-cell32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-cell64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o"
>> @@ -50,13 +52,15 @@ 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="$srv_aarch64_linux_regobj"
>
> ... here, like this,
> if $development; then
> srv_regobj="aarch64.o"
> else
> srv_regobj=""
> fi
Ok. Changed as requested, and managed to leave out the else case too.
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 82c3dc237c3fb6baeb2a72cd9ed66d8c7556d72a..0136ec326c916b0f35e49bf1500876e4cb80ce1f 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -50,13 +50,17 @@ 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="${srv_regobj} arm-with-neon.o"
+ srv_regobj="arm-with-neon.o"
+ if $development; then
+ srv_regobj="${srv_regobj} aarch64.o"
+ fi
srv_tgtobj="linux-aarch64-low.o aarch64-linux-hw-point.o"
srv_tgtobj="$srv_tgtobj linux-aarch32-low.o"
srv_tgtobj="${srv_tgtobj} arch/arm.o"
srv_tgtobj="$srv_tgtobj aarch64-linux.o"
srv_tgtobj="$srv_tgtobj arch/aarch64-insn.o"
+ srv_tgtobj="$srv_tgtobj arch/aarch64.o"
+ srv_tgtobj="$srv_tgtobj linux-aarch64-tdesc.o"
srv_tgtobj="${srv_tgtobj} $srv_linux_obj"
srv_xmlfiles="aarch64.xml"
srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml"
@@ -65,7 +69,9 @@ case "${target}" in
srv_xmlfiles="${srv_xmlfiles} arm/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"
+ ipa_obj="${ipa_obj} linux-aarch64-tdesc-ipa.o"
+ ipa_obj="${ipa_obj} arch/aarch64-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 ad1059029bb669f4fd6240d8ce8aef126879b6ff..28dc9776a1c8d273e8bc749296a57bc62b8619d5 100644
--- a/gdb/gdbserver/linux-aarch64-ipa.c
+++ b/gdb/gdbserver/linux-aarch64-ipa.c
@@ -25,10 +25,10 @@
#ifdef HAVE_GETAUXVAL
#include <sys/auxv.h>
#endif
+#include "linux-aarch64-tdesc.h"
/* Defined in auto-generated file aarch64.c. */
void init_registers_aarch64 (void);
-extern const struct target_desc *tdesc_aarch64;
/* Each register saved by the jump pad is in a 16 byte cell. */
#define FT_CR_SIZE 16
@@ -155,7 +155,7 @@ get_raw_reg (const unsigned char *raw_regs, int regnum)
const struct target_desc *
get_ipa_tdesc (int idx)
{
- return tdesc_aarch64;
+ return aarch64_linux_read_description ();
}
/* Allocate buffer for the jump pads. The branch instruction has a reach
diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index b00d5c502d2be67daf0e7f48025647f191efef3b..dcce287974cb6afd2f530ce1257dbbf25ed25ddc 100644
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -39,10 +39,10 @@
#include "gdb_proc_service.h"
#include "arch/aarch64.h"
+#include "linux-aarch64-tdesc.h"
/* Defined in auto-generated files. */
void init_registers_aarch64 (void);
-extern const struct target_desc *tdesc_aarch64;
#ifdef HAVE_SYS_REG_H
#include <sys/reg.h>
@@ -467,11 +467,10 @@ aarch64_linux_new_fork (struct process_info *parent,
*child->priv->arch_private = *parent->priv->arch_private;
}
-/* Return the right target description according to the ELF file of
- current thread. */
+/* Implementation of linux_target_ops method "arch_setup". */
-static const struct target_desc *
-aarch64_linux_read_description (void)
+static void
+aarch64_arch_setup (void)
{
unsigned int machine;
int is_elf64;
@@ -482,17 +481,9 @@ aarch64_linux_read_description (void)
is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
if (is_elf64)
- return tdesc_aarch64;
+ current_process ()->tdesc = aarch64_linux_read_description ();
else
- return tdesc_arm_with_neon;
-}
-
-/* Implementation of linux_target_ops method "arch_setup". */
-
-static void
-aarch64_arch_setup (void)
-{
- current_process ()->tdesc = aarch64_linux_read_description ();
+ current_process ()->tdesc = tdesc_arm_with_neon;
aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
}
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.h b/gdb/gdbserver/linux-aarch64-tdesc.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d6731720c3b4123d16f179acc5087ffd2d9b454
--- /dev/null
+++ b/gdb/gdbserver/linux-aarch64-tdesc.h
@@ -0,0 +1,20 @@
+/* Low level support for aarch64, shared between gdbserver and IPA.
+
+ Copyright (C) 2016-2017 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+const target_desc * aarch64_linux_read_description ();
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c
new file mode 100644
index 0000000000000000000000000000000000000000..8518ef73389ce9d7bd526de75716bd21dbef7959
--- /dev/null
+++ b/gdb/gdbserver/linux-aarch64-tdesc.c
@@ -0,0 +1,37 @@
+/* GNU/Linux/aarch64 specific target description, for the remote server
+ for GDB.
+ Copyright (C) 2017 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "server.h"
+#include "tdesc.h"
+#include "arch/aarch64.h"
+#include "linux-aarch32-low.h"
+
+/* Create the aarch64 target description. */
+
+const target_desc *
+aarch64_linux_read_description ()
+{
+ static target_desc *aarch64_tdesc = NULL;
+ target_desc **tdesc = &aarch64_tdesc;
+
+ if (*tdesc == NULL)
+ *tdesc = aarch64_create_target_description ();
+
+ return *tdesc;
+}