From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by mx.groups.io with SMTP id smtpd.web11.26484.1678471108961323098 for ; Fri, 10 Mar 2023 09:58:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm2 header.b=OHQXcHWV; spf=pass (domain: bsdio.com, ip: 66.111.4.28, mailfrom: rebecca@bsdio.com) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 409385C012F; Fri, 10 Mar 2023 12:58:28 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 10 Mar 2023 12:58:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1678471108; x=1678557508; bh=nKwDGaaLhmnR7cnjmrRwPKPttGF7tN/FvsD pTenoynM=; b=OHQXcHWVb5ufwJYNZNZz9RDcgAUFzjNOteelsaURDZ0ZEYrYI09 APBASJFkByOk6f29t/sqWxNYOVsUbLikupjy3KdAt1+JgYBa8ypCM9Ct0bYotoUV yfe/OoTJ8/21wNkuzUG3Kc9K5VnCNs4mvXdYE9Vk5PhVZFojT7EHpkwBmGhYwQIe q9XP2OznOiID9qRME2AHVuHmwXYkxPBUfY5KXqKuWzEhzA5ybRaPVyG/Alw5bVJz JHlVpdqUhQ0sQxM9sauUBq1C10aC0kQpDHFec6PI6oygFqRaCvFbz83o/4gvu6XW 9hzWQMx3OMKrYos7kvPVOsmxgGi6UKUYAqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1678471108; x= 1678557508; bh=nKwDGaaLhmnR7cnjmrRwPKPttGF7tN/FvsDpTenoynM=; b=d nV0Un71we0OiVQPkwSKUTN975sAk/e+rK9mCIU61Z3YJaLOZouZlVL2zVBx7M9v8 dIM1qAdB+s8ZkjYnstOJXv1Ajx6YGhfDU87vZ3LoU4NzKG68kKISisjUTs5gV/Ue lQyYwqoX6LGAuZ4SNAaZHPfVU1JbL7fYlDhS9H8FD1KA5cXvbbG7irO0kMnKoGrH oylMZHeWEASUexdreSTwRnP56J7P/Kd5fL68kw8DD03ThiZgABGRkaYy6KcauIh1 jatlxNpGgJX8WOHs0AKorOOvEqLElEsxJJ3WrxHcMN3/ON9n4jZfQn5JMyof63Qa +BWHr5GmIG2o2U3ILDS+Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddukedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfhfhfgjtgfgsehtkeertddtfeejnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeeuheffgeefleeuudefffefjeeiueeggedvfefghfeuteehueehgeeifedt udefheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Mar 2023 12:58:27 -0500 (EST) Message-ID: <3e673abe-efd1-e92b-4f6c-ff9f1d823209@bsdio.com> Date: Fri, 10 Mar 2023 10:58:26 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: =?UTF-8?B?UmU6IOWbnuWkjTogW2VkazItZGV2ZWxdIFtQQVRDSCAxLzJdIE1kZVBrZzogVXBkYXRlIEJhc2UuaCB0byBiZSBjb21wbGlhbnQgd2l0aCBDMTE=?= To: gaoliming , devel@edk2.groups.io, 'Michael D Kinney' , 'Zhiguang Liu' References: <20230209154507.81877-1-rebecca@quicinc.com> <3fad4aa0-9bdb-715f-7b81-3f16b30be68e@bsdio.com> <009601d952fa$5a1fb7b0$0e5f2710$@byosoft.com.cn> From: "Rebecca Cran" In-Reply-To: <009601d952fa$5a1fb7b0$0e5f2710$@byosoft.com.cn> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Yes. Now that the MdePkg change has been reviewed and will be committed, I'll proceed with submitting patches for the other packages. -- Rebecca Cran On 3/9/23 7:45 PM, gaoliming wrote: > Rebecca: > This patch pass code review. It can be merged now. The second change to using __func__ is only for MdePkg. Do you expect the change in MdePkg is first merged? > > Thanks > Liming >> -----邮件原件----- >> 发件人: Rebecca Cran >> 发送时间: 2023年3月7日 0:39 >> 收件人: devel@edk2.groups.io; quic_rcran@quicinc.com; Michael D Kinney >> ; Liming Gao ; >> Zhiguang Liu >> 主题: Re: [edk2-devel] [PATCH 1/2] MdePkg: Update Base.h to be compliant >> with C11 >> >> Now that edk2-stable202302 has been released, I'd like to get this patch >> series committed. >> >> >> -- >> Rebecca Cran >> >> >> On 2/9/23 8:45 AM, Rebecca Cran wrote: >>> With the introduction of the use of _Static_assert, edk2 requires a C11 >>> compatible compiler. Update Include/Base.h to be compliant with C11. >>> >>> As of C11, the maximum type of an enum is type `int`. Since the UEFI >>> Specification 2.3.1 Errata C allows either `int` or `unsigned int`, fix >>> the 32-bit enum check to use a signed int. >>> >>> Since the UEFI 2.3 Specification only allowed signed int, update the >>> comment to reference 2.3.1 Errata C where the change was made to allow >>> unsigned int. >>> >>> Signed-off-by: Rebecca Cran >>> --- >>> MdePkg/Include/Base.h | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h >>> index d209e6de280a..e89c84962ab2 100644 >>> --- a/MdePkg/Include/Base.h >>> +++ b/MdePkg/Include/Base.h >>> @@ -796,9 +796,9 @@ STATIC_ASSERT (sizeof (L"A") == 4, "sizeof >> (L\"A\") does not meet UEFI Specif >>> // >>> // The following three enum types are used to verify that the compiler >>> // configuration for enum types is compliant with Section 2.3.1 of the >>> -// UEFI 2.3 Specification. These enum types and enum values are not >>> -// intended to be used. A prefix of '__' is used avoid conflicts with >>> -// other types. >>> +// UEFI 2.3.1 Errata C Specification. These enum types and enum values >>> +// are not intended to be used. A prefix of '__' is used avoid >>> +// conflicts with other types. >>> // >>> typedef enum { >>> __VerifyUint8EnumValue = 0xff >>> @@ -809,12 +809,12 @@ typedef enum { >>> } __VERIFY_UINT16_ENUM_SIZE; >>> >>> typedef enum { >>> - __VerifyUint32EnumValue = 0xffffffff >>> -} __VERIFY_UINT32_ENUM_SIZE; >>> + __VerifyInt32EnumValue = 0x7fffffff >>> +} __VERIFY_INT32_ENUM_SIZE; >>> >>> STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of >> enum does not meet UEFI Specification Data Type requirements"); >>> STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of >> enum does not meet UEFI Specification Data Type requirements"); >>> -STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of >> enum does not meet UEFI Specification Data Type requirements"); >>> +STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum >> does not meet UEFI Specification Data Type requirements"); >>> /** >>> Macro that returns a pointer to the data structure that contains a >> specified field of >