From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 100126 invoked by alias); 11 May 2017 15:55:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 99758 invoked by uid 89); 11 May 2017 15:55:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pg0-f46.google.com Received: from mail-pg0-f46.google.com (HELO mail-pg0-f46.google.com) (74.125.83.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 May 2017 15:55:18 +0000 Received: by mail-pg0-f46.google.com with SMTP id f131so1955755pgc.2 for ; Thu, 11 May 2017 08:55:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fGfXopLoaSUnhp99oUcgmamA7chZZpc7aTxyqEdXsfs=; b=iEA1dEs4Y/DTmYF8OtYqrbuv0R+w9mzrLzBhHhaErBSQIiYiCxMtCSEaJK4KdEPbbR Ut05HSe+s0tBFD2qKywtQOD9vTNykG5WrvFLVWnVPX4VDa1D1UGn0Zw+ggRezapB7TWo gbmX9ySmA8nr6nXtYWhQh1u5kDc1hQFESBEzkn9U4cMvE1ksK2fzFOmq/2DA4eE9ObgG tUj27lf8CMlaP+mjiaRHsviUDV2zEpYfTe9h6zG40n3iY5gpeLrGfY+JPmpy0KSsnalJ nK3i5hd9RUuxhsTRe397CusTsBHnZCRrlrKNH4DdoIz6niApkiULvUokfKg42AdQUVDu LFRA== X-Gm-Message-State: AODbwcCxNkmKGUELOESpiGwd/dSCycwo0IgMSTA8VmA0xhvTYBAt3fYA Djipqj9mEW3/m+LD X-Received: by 10.84.135.34 with SMTP id 31mr1329213pli.99.1494518119681; Thu, 11 May 2017 08:55:19 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id f27sm1021158pga.41.2017.05.11.08.55.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 May 2017 08:55:19 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [RFC 5/7] Centralize i386 linux target descriptions Date: Thu, 11 May 2017 15:55:00 -0000 Message-Id: <1494518105-15412-6-git-send-email-yao.qi@linaro.org> In-Reply-To: <1494518105-15412-1-git-send-email-yao.qi@linaro.org> References: <1494518105-15412-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2017-05/txt/msg00292.txt.bz2 This patch moves all the tdesc_i386*_linux target descriptions to a function i386_linux_read_description, which returns the right target description according to xcr0. gdb: 2017-04-27 Yao Qi * i386-linux-tdep.c (i386_linux_read_description): New function. (i386_linux_core_read_description): Call i386_linux_read_description. * i386-linux-tdep.h (i386_linux_read_description): Declare. (tdesc_i386_linux, tdesc_i386_mmx_linux): Remove declarations. (tdesc_i386_avx_linux, tdesc_i386_mpx_linux): Likewise (tdesc_i386_avx_mpx_linux, tdesc_i386_avx_avx512_linux): Likewise. (tdesc_i386_avx_mpx_avx512_pku_linux): Likewise. * x86-linux-nat.c (x86_linux_read_description): Call i386_linux_read_description. --- gdb/i386-linux-tdep.c | 34 ++++++++++++++++++++++------------ gdb/i386-linux-tdep.h | 10 ++-------- gdb/x86-linux-nat.c | 24 ++++++++---------------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 1909d61..1bc1a6f 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -678,16 +678,9 @@ i386_linux_core_read_xcr0 (bfd *abfd) return xcr0; } -/* Get Linux/x86 target description from core dump. */ - -static const struct target_desc * -i386_linux_core_read_description (struct gdbarch *gdbarch, - struct target_ops *target, - bfd *abfd) +const struct target_desc * +i386_linux_read_description (uint64_t xcr0) { - /* Linux/i386. */ - uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); - switch ((xcr0 & X86_XSTATE_ALL_MASK)) { case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: @@ -708,10 +701,27 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, break; } + return NULL; +} + +/* Get Linux/x86 target description from core dump. */ + +static const struct target_desc * +i386_linux_core_read_description (struct gdbarch *gdbarch, + struct target_ops *target, + bfd *abfd) +{ + /* Linux/i386. */ + uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); + const struct target_desc * tdesc = i386_linux_read_description (xcr0); + + if (tdesc != NULL) + return tdesc; + if (bfd_get_section_by_name (abfd, ".reg-xfp") != NULL) - return tdesc_i386_linux; + return i386_linux_read_description (X86_XSTATE_SSE_MASK); else - return tdesc_i386_mmx_linux; + return i386_linux_read_description (X86_XSTATE_X87_MASK); } /* Similar to i386_supply_fpregset, but use XSAVE extended state. */ @@ -835,7 +845,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_num_regs (gdbarch, I386_LINUX_NUM_REGS); if (! tdesc_has_registers (tdesc)) - tdesc = tdesc_i386_linux; + tdesc = i386_linux_read_description (X86_XSTATE_SSE_MASK); tdep->tdesc = tdesc; feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux"); diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h index 8d4c7ca..1ca8d6b 100644 --- a/gdb/i386-linux-tdep.h +++ b/gdb/i386-linux-tdep.h @@ -42,14 +42,8 @@ extern uint64_t i386_linux_core_read_xcr0 (bfd *abfd); extern void i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, struct ui_out *uiout); -/* Linux target description. */ -extern struct target_desc *tdesc_i386_linux; -extern struct target_desc *tdesc_i386_mmx_linux; -extern struct target_desc *tdesc_i386_avx_linux; -extern struct target_desc *tdesc_i386_mpx_linux; -extern struct target_desc *tdesc_i386_avx_mpx_linux; -extern struct target_desc *tdesc_i386_avx_avx512_linux; -extern struct target_desc *tdesc_i386_avx_mpx_avx512_pku_linux; +/* Return the target description according to XCR0. */ +extern const struct target_desc *i386_linux_read_description (uint64_t xcr0); /* Format of XSAVE extended state is: struct diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 40a1b62..4eafce6 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -163,7 +163,7 @@ x86_linux_read_description (struct target_ops *ops) { have_ptrace_getfpxregs = 0; have_ptrace_getregset = TRIBOOL_FALSE; - return tdesc_i386_mmx_linux; + return i386_linux_read_description (X86_XSTATE_X87_MASK); } } #endif @@ -240,21 +240,13 @@ x86_linux_read_description (struct target_ops *ops) } else { - switch (xcr0_features_bits) - { - case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - return tdesc_i386_avx_mpx_avx512_pku_linux; - case X86_XSTATE_AVX_AVX512_MASK: - return tdesc_i386_avx_avx512_linux; - case X86_XSTATE_MPX_MASK: - return tdesc_i386_mpx_linux; - case X86_XSTATE_AVX_MPX_MASK: - return tdesc_i386_avx_mpx_linux; - case X86_XSTATE_AVX_MASK: - return tdesc_i386_avx_linux; - default: - return tdesc_i386_linux; - } + const struct target_desc * tdesc + = i386_linux_read_description (xcr0_features_bits); + + if (tdesc == NULL) + tdesc = i386_linux_read_description (X86_XSTATE_SSE_MASK); + + return tdesc; } gdb_assert_not_reached ("failed to return tdesc"); -- 1.9.1