From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.freebsd.org (mx2.freebsd.org [96.47.72.81]) by sourceware.org (Postfix) with ESMTPS id E19713858D39 for ; Fri, 28 Jul 2023 21:23:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E19713858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "mx1.freebsd.org", Issuer "R3" (verified OK)) by mx2.freebsd.org (Postfix) with ESMTPS id 4RCLGC15Zcz3NyH; Fri, 28 Jul 2023 21:23:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RCLGC0LfSz4B6y; Fri, 28 Jul 2023 21:23:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690579395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1kNd3j7yT0ndyg3qCDGkYXStQ4MjL8oJU6O7nWJsjPI=; b=C37QiUF4JTIRVKvx2j5jHtLbp4GisULrkPsD8gIASeLT9Hjor7+/GgSYtcuFaP5JoCZnWr RWI2V+IPCZYXCKhlZYL5V9CyuXHpa0zJzc4vd1wsiYZ4orkg/j6q6t+vBiIxmfF7sPJKxC kMAnZasgFiFJl2rm/KwT2HUrL4diQRuxXfhAtOxPPt5gk+kUMP8ijfUzB826sXeQWTSpIX n+KYqnD11FjpZIQE4BfIQ6r6aevszh/M7ok10K0eYld2vTjxIq1UC56xCzSWD/gv/sw+ak FsjrcZRqOHLsQhdh2li4qlOom8u7D22E3C8KNwZZ9J9DypX04gTnVyQfzWOF4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690579395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1kNd3j7yT0ndyg3qCDGkYXStQ4MjL8oJU6O7nWJsjPI=; b=qv33fBKPmVrm2kf0PhrN8YKtuvfPbrwxs2s8yCr/EDOUOGuYkWY6KQzpzK9d86rX7xXHEe ez4a0oiWqL2VrwmDzKOkQQNi68VwilPLxykLFDnZzmNEre/2Zya6Flb4L9WZFiIfrUFiOJ KtQ+g5RVIyC6ccH/et/l00u0Cu7d4IsF+tfCPYU1aV5pCZvBP6fdxI0ou+QSRCJOVaSk0a KpO6FMTcrsbVI4CW0KRkyYCZHc2i76w4RmFFHFkRIWL9TOhg4XXjBDLoyzuFwF0eNpbvCR LH6zqaurA0eIXN1MRRH7+IqBqzdI4DdwBhCkCjnljOq6k+5Quo3Cxm/Mwn51aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690579395; a=rsa-sha256; cv=none; b=I4AhLzak3099BF318y9VeyocIYRBnZKN1yrHxTRjddQGi8Pa3L6Xo/po6vWuqp5pK9IWSf zohgXY5RRSbqRZJctavJL7DMeVbOFCYVHbx7YN5ZehsoWXj4fmWJbYyE+6XSlIpVClmwfH Z3HAa3dKBnm0yQBYN/hS5c68Ve6Jy1S7D2qBUncHbPR9eJtZ3aEh40HOCm2snNh+xeAD7G RouoRqc6KJIOa1eQUi7Iz49DbFH2vf6+tJaklM8qcIFO/6kPrDy7p2o0J9Ncu7stUrYc5O t6lu4H6ITXlHSdBoKc4I4AwvrPFs5oQceVrY8EVIaEIHp+mkLGyKQzXHWEiYOA== Received: from [IPV6:2601:648:8680:16b0:8009:504c:66ab:5f0f] (unknown [IPv6:2601:648:8680:16b0:8009:504c:66ab:5f0f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RCLGB4VwkzFkr; Fri, 28 Jul 2023 21:23:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 28 Jul 2023 14:23:13 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: [PATCH v6a 06/15] gdb: Update x86 FreeBSD architectures to support XSAVE layouts. Content-Language: en-US To: gdb-patches@sourceware.org, Simon Marchi References: <20230714155151.21723-1-jhb@FreeBSD.org> <20230714155151.21723-7-jhb@FreeBSD.org> From: John Baldwin In-Reply-To: <20230714155151.21723-7-jhb@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Refactor i386fbsd_core_read_xcr0 to fetch and return a corresponding x86_xsave_layout as well as xcr0 using the size of an existing NT_X86_XSTATE core dump to determine the offsets via i387_guess_xsave_layout. Use this to add an implementation of gdbarch_core_xfer_x86_xsave_layout. Use tdep->xsave_layout.sizeof_xsave as the size of the XSTATE register set and only fetch/store the register set if this size is non-zero. --- gdb/amd64-fbsd-tdep.c | 15 +++++++-- gdb/i386-fbsd-tdep.c | 71 ++++++++++++++++++++++++------------------- gdb/i386-fbsd-tdep.h | 14 +++++++-- 3 files changed, 64 insertions(+), 36 deletions(-) diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c index 0d5ce004fb1..2b633cd479c 100644 --- a/gdb/amd64-fbsd-tdep.c +++ b/gdb/amd64-fbsd-tdep.c @@ -224,7 +224,12 @@ amd64fbsd_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - return amd64_target_description (i386fbsd_core_read_xcr0 (abfd), true); + x86_xsave_layout layout; + uint64_t xcr0 = i386_fbsd_core_read_xsave_info (abfd, layout); + if (xcr0 == 0) + xcr0 = X86_XSTATE_SSE_MASK; + + return amd64_target_description (xcr0, true); } /* Similar to amd64_supply_fpregset, but use XSAVE extended state. */ @@ -271,8 +276,10 @@ amd64fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, cb (".reg-x86-segbases", AMD64_FBSD_SIZEOF_SEGBASES_REGSET, AMD64_FBSD_SIZEOF_SEGBASES_REGSET, &amd64_fbsd_segbases_regset, "segment bases", cb_data); - cb (".reg-xstate", X86_XSTATE_SIZE (tdep->xcr0), X86_XSTATE_SIZE (tdep->xcr0), - &amd64fbsd_xstateregset, "XSAVE extended state", cb_data); + if (tdep->xsave_layout.sizeof_xsave != 0) + cb (".reg-xstate", tdep->xsave_layout.sizeof_xsave, + tdep->xsave_layout.sizeof_xsave, &amd64fbsd_xstateregset, + "XSAVE extended state", cb_data); } /* Implement the get_thread_local_address gdbarch method. */ @@ -313,6 +320,8 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tramp_frame_prepend_unwinder (gdbarch, &amd64_fbsd_sigframe); tdep->xsave_xcr0_offset = I386_FBSD_XSAVE_XCR0_OFFSET; + set_gdbarch_core_read_x86_xsave_layout + (gdbarch, i386_fbsd_core_read_x86_xsave_layout); /* Iterate over core file register note sections. */ set_gdbarch_iterate_over_regset_sections diff --git a/gdb/i386-fbsd-tdep.c b/gdb/i386-fbsd-tdep.c index fb9030413ab..f8c2758c2b0 100644 --- a/gdb/i386-fbsd-tdep.c +++ b/gdb/i386-fbsd-tdep.c @@ -18,13 +18,13 @@ along with this program. If not, see . */ #include "defs.h" +#include "gdbcore.h" #include "osabi.h" #include "regcache.h" #include "regset.h" #include "trad-frame.h" #include "tramp-frame.h" #include "i386-fbsd-tdep.h" -#include "gdbsupport/x86-xstate.h" #include "i386-tdep.h" #include "i387-tdep.h" @@ -241,43 +241,46 @@ static const struct tramp_frame i386_fbsd64_sigframe = i386_fbsd_sigframe_init }; -/* Get XSAVE extended state xcr0 from core dump. */ +/* See i386-fbsd-tdep.h. */ uint64_t -i386fbsd_core_read_xcr0 (bfd *abfd) +i386_fbsd_core_read_xsave_info (bfd *abfd, x86_xsave_layout &layout) { asection *xstate = bfd_get_section_by_name (abfd, ".reg-xstate"); - uint64_t xcr0; + if (xstate == nullptr) + return 0; - if (xstate) + /* Check extended state size. */ + size_t size = bfd_section_size (xstate); + if (size < X86_XSTATE_AVX_SIZE) + return 0; + + char contents[8]; + if (! bfd_get_section_contents (abfd, xstate, contents, + I386_FBSD_XSAVE_XCR0_OFFSET, 8)) { - size_t size = bfd_section_size (xstate); - - /* Check extended state size. */ - if (size < X86_XSTATE_AVX_SIZE) - xcr0 = X86_XSTATE_SSE_MASK; - else - { - char contents[8]; - - if (! bfd_get_section_contents (abfd, xstate, contents, - I386_FBSD_XSAVE_XCR0_OFFSET, - 8)) - { - warning (_("Couldn't read `xcr0' bytes from " - "`.reg-xstate' section in core file.")); - return X86_XSTATE_SSE_MASK; - } - - xcr0 = bfd_get_64 (abfd, contents); - } + warning (_("Couldn't read `xcr0' bytes from " + "`.reg-xstate' section in core file.")); + return 0; } - else - xcr0 = X86_XSTATE_SSE_MASK; + + uint64_t xcr0 = bfd_get_64 (abfd, contents); + + if (!i387_guess_xsave_layout (xcr0, size, layout)) + return 0; return xcr0; } +/* See i386-fbsd-tdep.h. */ + +bool +i386_fbsd_core_read_x86_xsave_layout (struct gdbarch *gdbarch, + x86_xsave_layout &layout) +{ + return i386_fbsd_core_read_xsave_info (core_bfd, layout) != 0; +} + /* Implement the core_read_description gdbarch method. */ static const struct target_desc * @@ -285,7 +288,11 @@ i386fbsd_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - return i386_target_description (i386fbsd_core_read_xcr0 (abfd), true); + x86_xsave_layout layout; + uint64_t xcr0 = i386_fbsd_core_read_xsave_info (abfd, layout); + if (xcr0 == 0) + xcr0 = X86_XSTATE_X87_MASK; + return i386_target_description (xcr0, true); } /* Similar to i386_supply_fpregset, but use XSAVE extended state. */ @@ -335,9 +342,9 @@ i386fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, I386_FBSD_SIZEOF_SEGBASES_REGSET, &i386_fbsd_segbases_regset, "segment bases", cb_data); - if (tdep->xcr0 & X86_XSTATE_AVX) - cb (".reg-xstate", X86_XSTATE_SIZE (tdep->xcr0), - X86_XSTATE_SIZE (tdep->xcr0), &i386fbsd_xstateregset, + if (tdep->xsave_layout.sizeof_xsave != 0) + cb (".reg-xstate", tdep->xsave_layout.sizeof_xsave, + tdep->xsave_layout.sizeof_xsave, &i386fbsd_xstateregset, "XSAVE extended state", cb_data); } @@ -386,6 +393,8 @@ i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_elf_init_abi (info, gdbarch); tdep->xsave_xcr0_offset = I386_FBSD_XSAVE_XCR0_OFFSET; + set_gdbarch_core_read_x86_xsave_layout + (gdbarch, i386_fbsd_core_read_x86_xsave_layout); /* Iterate over core file register note sections. */ set_gdbarch_iterate_over_regset_sections diff --git a/gdb/i386-fbsd-tdep.h b/gdb/i386-fbsd-tdep.h index cb991af9e49..c49cb1eba68 100644 --- a/gdb/i386-fbsd-tdep.h +++ b/gdb/i386-fbsd-tdep.h @@ -20,10 +20,20 @@ #ifndef I386_FBSD_TDEP_H #define I386_FBSD_TDEP_H +#include "gdbsupport/x86-xstate.h" #include "regset.h" -/* Get XSAVE extended state xcr0 from core dump. */ -extern uint64_t i386fbsd_core_read_xcr0 (bfd *abfd); +/* Read the XSAVE extended state xcr0 value from the ABFD core file. + If it appears to be valid, return it and fill LAYOUT with values + inferred from that value. + + Otherwise, return 0 to indicate no state was found and leave LAYOUT + untouched. */ +uint64_t i386_fbsd_core_read_xsave_info (bfd *abfd, x86_xsave_layout &layout); + +/* Implement the core_read_x86_xsave_layout gdbarch method. */ +bool i386_fbsd_core_read_x86_xsave_layout (struct gdbarch *gdbarch, + x86_xsave_layout &layout); /* The format of the XSAVE extended area is determined by hardware. Cores store the XSAVE extended area in a NT_X86_XSTATE note that -- 2.40.0