From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DDBA33858C41 for ; Sat, 11 May 2024 10:09:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DDBA33858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DDBA33858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715422147; cv=none; b=l4Rq5zZr820Bb4EocZYug9qL7XdSc4jlSiTl6ZSLHiYcdPrZOBL1vTB7XYrvdvjYZjfc9KYRO0bPi48vBihBB451h48QR+vRu7sraArAeUAeg/uvYzkJts7i7SFsRwZuoBtqeLhiUrbHpO9kwRylMi2+19f2DFSK7SnNN5+r+WQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715422147; c=relaxed/simple; bh=9Diia1TGB7M9tr/V9zOJ29zUoGLo682cMaasu8gp76s=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=a/0X33HuLoHTmmxbORMyWamJnmtlst2lnWxZHfWEDwhVjZODpJHq92UElPG4p2Y5kJyy8zsyOqo6YQ2w5/542C+m2urAMp1hOHLy6qpsjDOioeHsS953Z1ZQaqGgSUXMtm+8jl7HWIqxvE0KOIWPWZkO6L8ouIjOHMi7xH/YT8Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715422145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kdi8zyO660x2jbUvey0z6P24eCeNTfLaEBp/iQZW12c=; b=c4eJChxO7aYaIun4DedHnUiG958JVU1DCxB6ZJ7F4C/iHH/fEGIOg4Ua/KvyO1HGf9Q+H/ xLosdgXaHZcEhcwFBpFpqBSE3KprRLCKinEU4kgOqC9GJqDKAgiYLiyvlPwcl1UTv2icRv t8qi6DwwplQ5VrOhuWVbZt3mD/53Itw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-8--xpzwuSNMyK03sgGmGF1GQ-1; Sat, 11 May 2024 06:09:04 -0400 X-MC-Unique: -xpzwuSNMyK03sgGmGF1GQ-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-41ff6049fdbso7556055e9.0 for ; Sat, 11 May 2024 03:09:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715422141; x=1716026941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kdi8zyO660x2jbUvey0z6P24eCeNTfLaEBp/iQZW12c=; b=mZ1p7l92IpkoDvwC1fcHHWg5BQPBuL02lHAzbps6YMhSnSu3Z1ndXc4cHC5iIuDkjA wcMyoWPc4eHxzDBm85v7e9lRqJZXfi1GkkrtXtwhwoV38j6JyW4jRZ1vvPqtTrxNcMrZ TXfF+pFOc1JLVeC2/TtnmtWtVEwvYcYMUHRLny6ZfOWAIYI7PVDqwwY7CwZ48pnviFEj A3KbPbJipVsmR/ZdjUYX1qLV7CfhZYSo81s5O/5Z1hiAXzk8xjIXyLtsXq9SNfpWXQlo YCnb1xAf1/1BrlLFIRoKGTQYRY+leHPSo1LmI0MjJ5WxdiZO3NeCXSIfIUlK6/L+max6 DS5Q== X-Gm-Message-State: AOJu0YxnM5R8yvCttqe1OLtzRmDZ97wG95TUOH6Z+YDesIEFzkkXVM5M nEgKtO3LwPRYKF1mCU+FE/4SJo+PDo/s4Zlhwucw76VhmllkvXdYYwzlfFN5gi5sDIBsgGIfCYM nKeL5RG1+3ra0lR7i92s2ZaCQM5LD31ZUWta0YHBVrpJOHNDUthJztLfGHJsqw9d8fmYJF4kTNR AFGzlx8d93wmuxrjQdgBj/38U3Z3+rzIk5w1oy4P64H6I= X-Received: by 2002:a7b:cb0f:0:b0:416:9b7f:7098 with SMTP id 5b1f17b1804b1-41feab4479bmr37517725e9.24.1715422141222; Sat, 11 May 2024 03:09:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEM+WD+jweWYYhJ0M1eH4lTvvkcKGHZ8SPcav/YxN7tepNk4qN6SmKyxQ9u/F7GYhEVBOnraQ== X-Received: by 2002:a7b:cb0f:0:b0:416:9b7f:7098 with SMTP id 5b1f17b1804b1-41feab4479bmr37517555e9.24.1715422140628; Sat, 11 May 2024 03:09:00 -0700 (PDT) Received: from localhost (92.40.185.101.threembb.co.uk. [92.40.185.101]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f88110fedsm129879695e9.31.2024.05.11.03.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 03:08:59 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , felix.willgerodt@intel.com, jhb@FreeBSD.org Subject: [PATCHv7 6/9] gdb: move xcr0 == 0 check into i386_linux_core_read_description Date: Sat, 11 May 2024 11:08:36 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_ABUSEAT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_NONE,TXREP 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: Currently, in i386_linux_core_read_description, if GDB fails to extract an xcr0 value from the core file, then we will have a default zero value for the xcr0 variable, we still call the i386_linux_read_description function, which checks for this zero value and returns nullptr. Back in i386_linux_core_read_description we spot the nullptr return value from i386_linux_read_description and call i386_linux_read_description again, but this time passing a default value for xcr0. In the next commit I plan to rework i386_linux_read_description, and in so doing I will remove the check for xcr0 == 0, this is inline with how the amd64 code is written. However, this means that the 'xcr0 == 0' check needs to move up the stack to i386_linux_core_read_description, again, this brings the i386 code into line with the amd64 code. This is just a refactor in preparation for the next commit, there should be no user visible changes after this commit. Approved-By: Felix Willgerodt Approved-By: John Baldwin --- gdb/i386-linux-tdep.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index a78f03fac8d..511e43f3b6f 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -714,15 +714,16 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, /* Linux/i386. */ x86_xsave_layout layout; uint64_t xcr0 = i386_linux_core_read_xsave_info (abfd, layout); - const struct target_desc *tdesc = i386_linux_read_description (xcr0); - if (tdesc != NULL) - return tdesc; + if (xcr0 == 0) + { + if (bfd_get_section_by_name (abfd, ".reg-xfp") != nullptr) + xcr0 = X86_XSTATE_SSE_MASK; + else + xcr0 = X86_XSTATE_X87_MASK; + } - if (bfd_get_section_by_name (abfd, ".reg-xfp") != NULL) - return i386_linux_read_description (X86_XSTATE_SSE_MASK); - else - return i386_linux_read_description (X86_XSTATE_X87_MASK); + return i386_linux_read_description (xcr0); } /* Similar to i386_supply_fpregset, but use XSAVE extended state. */ -- 2.25.4