From patchwork Mon Aug 21 15:29:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 22277 Received: (qmail 129659 invoked by alias); 21 Aug 2017 15:29:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 129003 invoked by uid 89); 21 Aug 2017 15:29:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=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-io0-f195.google.com Received: from mail-io0-f195.google.com (HELO mail-io0-f195.google.com) (209.85.223.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 21 Aug 2017 15:29:38 +0000 Received: by mail-io0-f195.google.com with SMTP id l190so2193379iol.2 for ; Mon, 21 Aug 2017 08:29:38 -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=YdLHnvT9sN5M4d4tZ/T12Cyp7RNqNL7kjsxjjmipqfM=; b=Wt/+LiPMQhwBR6GBpi23ADHQ7y/O1QNCxVVdqsQXbNyquOj9mRdjvC6cq2MRfYTS+l 88+6HxTQomTp2fTHqH5U7s010YXNG0+XE6gU3NbqRXDOngkq1lJtTuPTnO9FDZu1razz Ci0+Fx8PzpQTBC0TPTvpJ97NVs7L4KI0338bhWAct0RcRGbr9xFmRuGTFlPogprXLUne VKLSslqUDr9zs1whA/r4mEdYQ6+kHUEUtE0gACEbR7QJE7oQEHEBwl6e3UhnFY+6fw5d Zv4tUSf89w06UZSfpbBeePSeVDhr9iDR0G/pOwLaBE/VixozypkN/7D0QeK7NgrJCv2k bzDA== X-Gm-Message-State: AHYfb5gxrVL4uDiaJxqMDGHvrTJGtp1DjhfhdfzuU3w92FmOke5CSjA+ v0yu1Co3Mk/eLr0F X-Received: by 10.107.6.205 with SMTP id f74mr922108ioi.355.1503329376474; Mon, 21 Aug 2017 08:29:36 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id p62sm5831589ioe.34.2017.08.21.08.29.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Aug 2017 08:29:36 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 16/22] Centralize amd64-linux target descriptions Date: Mon, 21 Aug 2017 16:29:01 +0100 Message-Id: <1503329347-26711-17-git-send-email-yao.qi@linaro.org> In-Reply-To: <1503329347-26711-1-git-send-email-yao.qi@linaro.org> References: <1503329347-26711-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch adds a new function amd64_linux_read_description, which creates amd64-linux target descriptions according to its two arguments, xcr0 and is_x32. gdb: 2017-06-07 Yao Qi * amd64-linux-tdep.c (amd64_linux_read_description): New function. (amd64_linux_core_read_description): Call amd64_linux_read_description. (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-linux-tdep.h (amd64_linux_read_description): Declare. * x86-linux-nat.c (x86_linux_read_description): Call amd64_linux_read_description. --- gdb/amd64-linux-tdep.c | 46 ++++++++++++++++++++++++++++------------------ gdb/amd64-linux-tdep.h | 6 ++++++ gdb/x86-linux-nat.c | 35 +---------------------------------- 3 files changed, 35 insertions(+), 52 deletions(-) diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 54c2eb9..85efbef 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -1575,54 +1575,61 @@ amd64_linux_record_signal (struct gdbarch *gdbarch, return 0; } -/* Get Linux/x86 target description from core dump. */ - -static const struct target_desc * -amd64_linux_core_read_description (struct gdbarch *gdbarch, - struct target_ops *target, - bfd *abfd) +const target_desc * +amd64_linux_read_description (uint64_t xcr0_features_bit, bool is_x32) { - /* Linux/x86-64. */ - uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); - - switch (xcr0 & X86_XSTATE_ALL_MASK) + switch (xcr0_features_bit) { case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX, PKU on x32, fallback to AVX-AVX512. */ return tdesc_x32_avx_avx512_linux; else return tdesc_amd64_avx_mpx_avx512_pku_linux; case X86_XSTATE_AVX_AVX512_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_avx_avx512_linux; else return tdesc_amd64_avx_avx512_linux; case X86_XSTATE_MPX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX on x32, fallback to AVX. */ return tdesc_x32_avx_linux; else return tdesc_amd64_mpx_linux; case X86_XSTATE_AVX_MPX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX on x32, fallback to AVX. */ return tdesc_x32_avx_linux; else return tdesc_amd64_avx_mpx_linux; case X86_XSTATE_AVX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_avx_linux; else return tdesc_amd64_avx_linux; default: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_linux; else return tdesc_amd64_linux; } } +/* Get Linux/x86 target description from core dump. */ + +static const struct target_desc * +amd64_linux_core_read_description (struct gdbarch *gdbarch, + struct target_ops *target, + bfd *abfd) +{ + /* Linux/x86-64. */ + uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); + + return amd64_linux_read_description (xcr0 & X86_XSTATE_ALL_MASK, + gdbarch_ptr_bit (gdbarch) == 32); +} + /* Similar to amd64_supply_fpregset, but use XSAVE extended state. */ static void @@ -1873,7 +1880,8 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset); tdep->sizeof_gregset = 27 * 8; - amd64_init_abi (info, gdbarch, tdesc_amd64_linux); + amd64_init_abi (info, gdbarch, + amd64_linux_read_description (X86_XSTATE_SSE_MASK, false)); const target_desc *tdesc = tdep->tdesc; @@ -2086,7 +2094,9 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset); tdep->sizeof_gregset = 27 * 8; - amd64_x32_init_abi (info, gdbarch, tdesc_x32_linux); + amd64_x32_init_abi (info, gdbarch, + amd64_linux_read_description (X86_XSTATE_SSE_MASK, + true)); /* Reserve a number for orig_rax. */ set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS); diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h index 7453408..ab134a4 100644 --- a/gdb/amd64-linux-tdep.h +++ b/gdb/amd64-linux-tdep.h @@ -43,6 +43,12 @@ extern struct target_desc *tdesc_x32_linux; extern struct target_desc *tdesc_x32_avx_linux; extern struct target_desc *tdesc_x32_avx_avx512_linux; +/* Return the right amd64-linux target descriptions according to + XCR0_FEATURES_BIT and IS_X32. */ + +const target_desc *amd64_linux_read_description (uint64_t xcr0_features_bit, + bool is_x32); + /* Enum that defines the syscall identifiers for amd64 linux. Used for process record/replay, these will be translated into a gdb-canonical set of syscall ids in linux-record.c. */ diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 2c4afb1..4611527 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -192,40 +192,7 @@ x86_linux_read_description (struct target_ops *ops) if (is_64bit) { #ifdef __x86_64__ - switch (xcr0_features_bits) - { - case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - if (is_x32) - /* No MPX, PKU on x32, fall back to AVX-AVX512. */ - return tdesc_x32_avx_avx512_linux; - else - return tdesc_amd64_avx_mpx_avx512_pku_linux; - case X86_XSTATE_AVX_AVX512_MASK: - if (is_x32) - return tdesc_x32_avx_avx512_linux; - else - return tdesc_amd64_avx_avx512_linux; - case X86_XSTATE_MPX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; /* No MPX on x32 using AVX. */ - else - return tdesc_amd64_mpx_linux; - case X86_XSTATE_AVX_MPX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; /* No MPX on x32 using AVX. */ - else - return tdesc_amd64_avx_mpx_linux; - case X86_XSTATE_AVX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; - else - return tdesc_amd64_avx_linux; - default: - if (is_x32) - return tdesc_x32_linux; - else - return tdesc_amd64_linux; - } + return amd64_linux_read_description (xcr0_features_bits, is_x32); #endif } else