From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89398+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89398+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227631; cv=none; d=zohomail.com; s=zohoarc; b=PlC6Hs0JxDAOgevcAu7HrP+u2gFoKmCynrl6PBxTX3CQj6RIzTKX5sVkc0kUAzL6/5puDh+aUo8vvu4lKwBdEE7PbJbgf1/Z39z8p8i2548mBOOVNBqxLL65P1dKiY0DbFg4kuBQL0mRJMI70+pKmWC4QZSydc3dh2sH5iI36Oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227631; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=XrnDFO5Q76Rv0diMO+2QzA+psjtrJlD2FbKjLzTRjD0=; b=SkxQHnTgimm6fe9r3BsRV+/mP7eE6Vf/mI9T+clzpCLLCDUlEDmrH/9vr+Kgfo90pewkQ+S5N3tJn56JCeRlzI6f62BdPZd8t2VsBs66nYKZDFY1T8bhJl/PxPgNvep0kjut//w3pVpipyxWmoCnRAm8gVlW2aY5f+P4HxMlZzw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89398+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227631110706.9089813443208; Fri, 29 Apr 2022 03:20:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ahBNYY1788612xkv0hGjpegR; Fri, 29 Apr 2022 03:20:30 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.8298.1651227629825222524 for ; Fri, 29 Apr 2022 03:20:30 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-ywJZxX30NOGstPmQtNCR9Q-1; Fri, 29 Apr 2022 06:20:23 -0400 X-MC-Unique: ywJZxX30NOGstPmQtNCR9Q-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 037C7833965; Fri, 29 Apr 2022 10:20:22 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 396B1C52C80; Fri, 29 Apr 2022 10:20:21 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EA27B180039F; Fri, 29 Apr 2022 12:20:19 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky , Jiewen Yao , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 01/10] MdePkg: promote CompilerIntrinsicsLib from ArmPkg to MdePkg Date: Fri, 29 Apr 2022 12:20:10 +0200 Message-Id: <20220429102019.1375348-2-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: S7gssCtB4CnwpWagRzZvIGGPx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227630; bh=2jCzA3gHJ0xzUURfDh3WeuDK9S+3fCTqMXEgKE4YqU0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=DaOyR9CTVgKbXWkh7JK7gdYW/GaAVVQbClKEwRhaTvWCK43lhlqKgJ3aRK2zvToUqQP No8Yr2gkXNUVfTH5UPFEyvW2GctFvbw8N1WUhLLUdciureHW98WF6xVfhgow7vIsDu7Th kD94mDBy4GuSkNjsygtxR2wBr+gcqWbbQ0I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227631941100006 Content-Type: text/plain; charset="utf-8"; x-default="true" First step in creating a single, common compiler intrinsics library for everybody who needs it. Move the ArmPkg library to MdePkg, update all references. No code changes. Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao Acked-by: Ard Biesheuvel Acked-by: Liming Gao --- ArmVirtPkg/ArmVirt.dsc.inc | 2 +- .../UnitTestFrameworkPkgTarget.dsc.inc | 2 +- ArmPkg/ArmPkg.dsc | 3 +-- .../ArmCrashDumpDxe/ArmCrashDumpDxe.dsc | 2 +- ArmPlatformPkg/ArmPlatformPkg.dsc | 2 +- CryptoPkg/CryptoPkg.dsc | 2 +- DynamicTablesPkg/DynamicTablesPkg.dsc | 2 +- EmbeddedPkg/EmbeddedPkg.dsc | 2 +- FatPkg/FatPkg.dsc | 2 +- FmpDevicePkg/FmpDevicePkg.dsc | 2 +- MdeModulePkg/MdeModulePkg.dsc | 2 +- MdePkg/MdePkg.dsc | 1 + NetworkPkg/NetworkPkg.dsc | 2 +- RedfishPkg/RedfishPkg.dsc | 2 +- SecurityPkg/SecurityPkg.dsc | 2 +- ShellPkg/ShellPkg.dsc | 2 +- SignedCapsulePkg/SignedCapsulePkg.dsc | 2 +- StandaloneMmPkg/StandaloneMmPkg.dsc | 2 +- .../CompilerIntrinsicsLib.inf | 1 - {ArmPkg =3D> MdePkg}/Include/AsmMacroIoLib.h | 0 .../Library/CompilerIntrinsicsLib/memcmp_ms.c | 0 .../Library/CompilerIntrinsicsLib/memcpy.c | 0 .../Library/CompilerIntrinsicsLib/memcpy_ms.c | 0 .../CompilerIntrinsicsLib/memmove_ms.c | 0 .../Library/CompilerIntrinsicsLib/memset.c | 0 .../Library/CompilerIntrinsicsLib/memset_ms.c | 0 ArmPkg/ArmPkg.ci.yaml | 1 - .../DEBUG_XCODE31/CompilerIntrinsicsLib.lib | Bin 36072 -> 36072 bytes .../DEBUG_XCODE32/CompilerIntrinsicsLib.lib | Bin 36072 -> 36072 bytes .../CompilerIntrinsicsLib/AArch64/Atomics.S | 0 .../CompilerIntrinsicsLib/Arm/ashldi3.S | 0 .../CompilerIntrinsicsLib/Arm/ashrdi3.S | 0 .../CompilerIntrinsicsLib/Arm/clzsi2.S | 0 .../CompilerIntrinsicsLib/Arm/ctzsi2.S | 0 .../Library/CompilerIntrinsicsLib/Arm/div.S | 0 .../Library/CompilerIntrinsicsLib/Arm/div.asm | 0 .../CompilerIntrinsicsLib/Arm/divdi3.S | 0 .../CompilerIntrinsicsLib/Arm/divsi3.S | 0 .../Library/CompilerIntrinsicsLib/Arm/lasr.S | 0 .../CompilerIntrinsicsLib/Arm/lasr.asm | 0 .../CompilerIntrinsicsLib/Arm/ldivmod.S | 0 .../CompilerIntrinsicsLib/Arm/ldivmod.asm | 0 .../Library/CompilerIntrinsicsLib/Arm/llsl.S | 0 .../CompilerIntrinsicsLib/Arm/llsl.asm | 0 .../Library/CompilerIntrinsicsLib/Arm/llsr.S | 0 .../CompilerIntrinsicsLib/Arm/llsr.asm | 0 .../CompilerIntrinsicsLib/Arm/lshrdi3.S | 0 .../CompilerIntrinsicsLib/Arm/memmove.S | 0 .../CompilerIntrinsicsLib/Arm/memmove.asm | 0 .../CompilerIntrinsicsLib/Arm/moddi3.S | 0 .../CompilerIntrinsicsLib/Arm/modsi3.S | 0 .../CompilerIntrinsicsLib/Arm/muldi3.S | 0 .../Library/CompilerIntrinsicsLib/Arm/mullu.S | 0 .../CompilerIntrinsicsLib/Arm/mullu.asm | 0 .../CompilerIntrinsicsLib/Arm/sourcery.S | 0 .../CompilerIntrinsicsLib/Arm/switch.asm | 0 .../CompilerIntrinsicsLib/Arm/switch16.S | 0 .../CompilerIntrinsicsLib/Arm/switch32.S | 0 .../CompilerIntrinsicsLib/Arm/switch8.S | 0 .../CompilerIntrinsicsLib/Arm/switchu8.S | 0 .../CompilerIntrinsicsLib/Arm/ucmpdi2.S | 0 .../CompilerIntrinsicsLib/Arm/udivdi3.S | 0 .../CompilerIntrinsicsLib/Arm/udivmoddi4.S | 0 .../CompilerIntrinsicsLib/Arm/udivsi3.S | 0 .../Library/CompilerIntrinsicsLib/Arm/uldiv.S | 0 .../CompilerIntrinsicsLib/Arm/uldiv.asm | 0 .../CompilerIntrinsicsLib/Arm/umoddi3.S | 0 .../CompilerIntrinsicsLib/Arm/umodsi3.S | 0 .../Library/CompilerIntrinsicsLib/Arm/uread.S | 0 .../CompilerIntrinsicsLib/Arm/uread.asm | 0 .../CompilerIntrinsicsLib/Arm/uwrite.S | 0 .../CompilerIntrinsicsLib/Arm/uwrite.asm | 0 MdePkg/MdePkg.ci.yaml | 1 + 73 files changed, 19 insertions(+), 20 deletions(-) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/CompilerIntrinsi= csLib.inf (95%) rename {ArmPkg =3D> MdePkg}/Include/AsmMacroIoLib.h (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcmp_ms.c (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy.c (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy_ms.c (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memmove_ms.c (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset.c (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset_ms.c (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/AArch64/Atomics.= S (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashldi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/clzsi2.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.S (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.asm (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divdi3.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divsi3.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.S (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.asm (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm = (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.S (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.asm (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.S (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.asm (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.asm = (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/moddi3.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/modsi3.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/muldi3.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.S (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.asm (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/sourcery.S (= 100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch.asm (= 100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch16.S (= 100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch32.S (= 100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch8.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switchu8.S (= 100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivdi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S= (100%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivsi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.S (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.asm (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umoddi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umodsi3.S (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.S (100= %) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.asm (1= 00%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.S (10= 0%) rename {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.asm (= 100%) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index ba711deac025..97edf0487964 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -96,7 +96,7 @@ [LibraryClasses.common] # It is not possible to prevent the ARM compiler from inserting calls to= intrinsic functions. # This library provides the instrinsic functions such a compiler may gen= erate calls to. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/Unit= TestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc index 8adf690098ae..9f2b671f7c86 100644 --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc @@ -37,7 +37,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # # Since software stack checking may be heuristically enabled by the comp= iler diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 59fd8f295d4f..f9268de8347e 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -101,7 +101,7 @@ [LibraryClasses.common.PEIM] PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/Pei= ServicesTablePointerLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf @@ -109,7 +109,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] [Components.common] ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf diff --git a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc b/ArmPkg/Dr= ivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc index 2818ce65db98..ac818f0d98a2 100644 --- a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc +++ b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc @@ -43,7 +43,7 @@ [LibraryClasses] UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [Components.common] diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatform= Pkg.dsc index 661a4cea220d..b146e4fe8a69 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dsc +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc @@ -76,7 +76,7 @@ [LibraryClasses.common] DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [LibraryClasses.common.PEIM] diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 0aa72ed87846..2d4d4c2797e5 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -74,7 +74,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this l= ibrary # into all ARM and AARCH64 images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/Dynam= icTablesPkg.dsc index 068f0bc63080..c30b0f943a60 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dsc +++ b/DynamicTablesPkg/DynamicTablesPkg.dsc @@ -34,7 +34,7 @@ [LibraryClasses] UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf =20 diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index f7ed61545c2e..4c4a6029d6fd 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -128,7 +128,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc index 4ddb5c3e004b..32708b1e58cf 100644 --- a/FatPkg/FatPkg.dsc +++ b/FatPkg/FatPkg.dsc @@ -57,7 +57,7 @@ [LibraryClasses.common.PEIM] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 ##########################################################################= ######################### diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 7b1af285dd65..258b5ce0cded 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -78,7 +78,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this l= ibrary # into all ARM and AARCH64 images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index b1d83461865e..e3146c378800 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -183,7 +183,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # # Since software stack checking may be heuristically enabled by the comp= iler diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index c8d282882ec1..c062078ca7a0 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -36,6 +36,7 @@ [LibraryClasses] =20 [Components] MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf MdePkg/Library/BaseCacheMaintenanceLibNull/BaseCacheMaintenanceLibNull.i= nf MdePkg/Library/BaseCpuLib/BaseCpuLib.inf diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index 762134023d3f..f69eb3d1d5c2 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -76,7 +76,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc index 16139146ff83..0dc120d82699 100644 --- a/RedfishPkg/RedfishPkg.dsc +++ b/RedfishPkg/RedfishPkg.dsc @@ -45,7 +45,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # # This library provides the instrinsic functions generated by a given co= mpiler. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 73a93c2285b1..2b5ef67016b8 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -79,7 +79,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the intrinsic functions generate by a given comp= iler. # And NULL mean link this library into all ARM images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index 38fde3dc71dd..a166af0a81ae 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -70,7 +70,7 @@ [LibraryClasses.ARM,LibraryClasses.AARCH64] # This library provides the instrinsic functions generate by a given com= piler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/Signe= dCapsulePkg.dsc index 8a27207a6f20..72b533cd04e8 100644 --- a/SignedCapsulePkg/SignedCapsulePkg.dsc +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc @@ -104,7 +104,7 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM] # This library provides the instrinsic functions generate by a given com= piler. # And NULL mean link this library into all ARM images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index 8012f93b7dcc..e9488538cb21 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -67,7 +67,7 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM] CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActi= onLib/StandaloneMmPeCoffExtraActionLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [LibraryClasses.common.MM_CORE_STANDALONE] diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf= b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf similarity index 95% rename from ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf rename to MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index fcf48c678119..6fa09e5f0dec 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -84,7 +84,6 @@ [Sources.AARCH64] =20 [Packages] MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec =20 [BuildOptions] MSFT:*_*_*_CC_FLAGS =3D /GL- diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/MdePkg/Include/AsmMacroIoLib.h similarity index 100% rename from ArmPkg/Include/AsmMacroIoLib.h rename to MdePkg/Include/AsmMacroIoLib.h diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcmp_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/MdePkg/Library= /CompilerIntrinsicsLib/memcpy.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcpy_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/memmove_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/MdePkg/Library= /CompilerIntrinsicsLib/memset.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memset.c rename to MdePkg/Library/CompilerIntrinsicsLib/memset.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memset_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c diff --git a/ArmPkg/ArmPkg.ci.yaml b/ArmPkg/ArmPkg.ci.yaml index b7e07aaef675..cb892894f3b8 100644 --- a/ArmPkg/ArmPkg.ci.yaml +++ b/ArmPkg/ArmPkg.ci.yaml @@ -21,7 +21,6 @@ "IgnoreFiles": [ "Library/ArmSoftFloatLib/berkeley-softfloat-3", "Library/ArmSoftFloatLib/ArmSoftFloatLib.c", - "Library/CompilerIntrinsicsLib", "Universal/Smbios/SmbiosMiscDxe" ] }, diff --git a/BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE31/CompilerIntrinsics= Lib.lib b/BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE31/CompilerIntrinsicsLib= .lib index 79964fe1b65afe472af19fdb87c2733f5297d0a4..712aa917bcd0342a4d47923d208= cf866992fbe5a 100644 GIT binary patch delta 369 zcmaDclj+4wrVZcNChyH;pZru!X|p{0WhOAkR3vJ1FxP*COts)pM)d`(`e`e=3Dv^AX8%A3eyFkTn{OrrLOis!P7c(KA+Pt;U2_YIr99CqGnE+bqw1nF-7>6p7m$%=3DI53Q!Tg|EVJ2AH=3D;plnjGj0%oTF*Pgy0mKeuC%$DO+hFhtR`o z+k)U+cWei9HYd6%!bDv*pY-|;)9k*P%kLkIuEObMNhL%i)c~xz*aLp2gjA%V0%y#F^G0l*mnGAAzXxk;2?arHXI}x18 Htv$&A)|`a2 diff --git a/BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE32/CompilerIntrinsics= Lib.lib b/BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE32/CompilerIntrinsicsLib= .lib index 79964fe1b65afe472af19fdb87c2733f5297d0a4..712aa917bcd0342a4d47923d208= cf866992fbe5a 100644 GIT binary patch delta 369 zcmaDclj+4wrVZcNChyH;pZru!X|p{0WhOAkR3vJ1FxP*COts)pM)d`(`e`e=3Dv^AX8%A3eyFkTn{OrrLOis!P7c(KA+Pt;U2_YIr99CqGnE+bqw1nF-7>6p7m$%=3DI53Q!Tg|EVJ2AH=3D;plnjGj0%oTF*Pgy0mKeuC%$DO+hFhtR`o z+k)U+cWei9HYd6%!bDv*pY-|;)9k*P%kLkIuEObMNhL%i)c~xz*aLp2gjA%V0%y#F^G0l*mnGAAzXxk;2?arHXI}x18 Htv$&A)|`a2 diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S b/MdePk= g/Library/CompilerIntrinsicsLib/AArch64/Atomics.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S rename to MdePkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ashldi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ashrdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/clzsi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/ctzsi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S b/MdePkg/Librar= y/CompilerIntrinsicsLib/Arm/div.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/div.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/divdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/divsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/lasr.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/lasr.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ldivmod.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm b/MdePkg/= Library/CompilerIntrinsicsLib/Arm/ldivmod.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/llsl.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/llsl.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/llsr.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/llsr.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/lshrdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/memmove.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm b/MdePkg/= Library/CompilerIntrinsicsLib/Arm/memmove.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/moddi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/modsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/muldi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/mullu.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/mullu.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/sourcery.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch16.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch16.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch32.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch32.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/switch8.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch8.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switchu8.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ucmpdi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/udivdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/MdePkg= /Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/udivsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/uldiv.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/uldiv.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/umoddi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/umodsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/uread.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/uread.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/uwrite.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/uwrite.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml index 054233ebc7bd..34300c06e36a 100644 --- a/MdePkg/MdePkg.ci.yaml +++ b/MdePkg/MdePkg.ci.yaml @@ -52,6 +52,7 @@ "Include/IndustryStandard/UefiTcgPlatform.h", "Include/Library/PcdLib.h", "Include/Library/SafeIntLib.h", + "Library/CompilerIntrinsicsLib", "Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLib.c" ] }, --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89398): https://edk2.groups.io/g/devel/message/89398 Mute This Topic: https://groups.io/mt/90772971/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89399+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89399+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227631; cv=none; d=zohomail.com; s=zohoarc; b=POpsxuvslYbPUKmMUWF8IUl0AegAZ0MMD88C0nFYFw8lTcrUOa49t1GuMZJvGGXMDmIR1GlaG4kwMuE0jlgYdns53KW1Xn/+rYv1jwpmtLh+xNJJpTK2Igd2bpfLAb1vz6GX3tDUKY6wKTL5XvNBf0jG88Ay21IAbq/woEYIODQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227631; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=+SziQsdoKkCCYHIyN/NseHGG68zhQMeXbMRmdSydbrg=; b=ibhRddFVVM3CP0ozcFrynwcP1NY4y62qmSmjtEe2qTJHESrhyl8xQJuk7msYfTCdxnrzvKMEyu7ohf6Iq9KwD2e9OMKQlTtGZ2mVKXyEYcbOsgDAsr6iS3ZZDxSDKbglu7oFdn3ywSaGj4DvaLCIkdSxca5GXbif2KXs+Rh42zE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89399+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227631844753.2080096123193; Fri, 29 Apr 2022 03:20:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id mnLBYY1788612xoytC7EfHzx; Fri, 29 Apr 2022 03:20:31 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.8394.1651227629978344544 for ; Fri, 29 Apr 2022 03:20:30 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-616-649jt1dNMSyyOG11DGCJlw-1; Fri, 29 Apr 2022 06:20:25 -0400 X-MC-Unique: 649jt1dNMSyyOG11DGCJlw-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C8A1802803; Fri, 29 Apr 2022 10:20:23 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E300401D49; Fri, 29 Apr 2022 10:20:23 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EF7B618003A5; Fri, 29 Apr 2022 12:20:19 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky , Jiewen Yao , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 02/10] MdePkg/CompilerIntrinsicsLib: fix msft sources for x64 Date: Fri, 29 Apr 2022 12:20:11 +0200 Message-Id: <20220429102019.1375348-3-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: qwqH35wtNNWfOzP25Rd4IwSox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227631; bh=PmLVH2KHv04OBZEm+zioIblZCqsRNdYRQr3rAQ/rXk4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=jseVvZ4wQWYesE7SLioSb0BSYs70fTrAUJJhO9XALJG3ECDehGpUFzkq17wIQ+z7vf3 xdkCBQ6kKPzlM/GYBRYCb62owsgYCcKfDBeDCAGxp6sCjIqMHWfTjDrQgUqEAcuzdFhLU PFsCSf+2YqxpvTh+OD6kb4SSLIKQ0LeOM+8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227633829100015 Content-Type: text/plain; charset="utf-8"; x-default="true" Update #if conditions so the 64bit version is picked for X64 too. Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao Acked-by: Ard Biesheuvel Acked-by: Liming Gao --- MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c | 2 +- MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c | 2 +- MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c | 2 +- MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcmp_ms.c index cedbfca47139..2fac8f1e23e3 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c @@ -7,7 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) +#if defined (_M_ARM64) || defined (_M_X64) typedef unsigned __int64 size_t; #else typedef unsigned __int32 size_t; diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcpy_ms.c index 0eafa83ed476..730aa806d50b 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c @@ -7,7 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) +#if defined (_M_ARM64) || defined (_M_X64) typedef unsigned __int64 size_t; #else typedef unsigned __int32 size_t; diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/memmove_ms.c index f68eb52a6ca5..3207b94a8675 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c @@ -7,7 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) +#if defined (_M_ARM64) || defined (_M_X64) typedef unsigned __int64 size_t; #else typedef unsigned __int32 size_t; diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memset_ms.c index 5882cd28b06d..deb902c6ae88 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c @@ -7,7 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) +#if defined (_M_ARM64) || defined (_M_X64) typedef unsigned __int64 size_t; #else typedef unsigned __int32 size_t; --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89399): https://edk2.groups.io/g/devel/message/89399 Mute This Topic: https://groups.io/mt/90772972/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89397+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89397+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227630; cv=none; d=zohomail.com; s=zohoarc; b=bgVgaOsQU9dxsX1vy2B9glbJ0NsfhDLfbTc1ggUKtoRg3t8Mx6do9bWcJj4kLZYbTohhWhK+D67BjYXUgQqx+mcfTGNWaComxMAY9U6EoqQxQ9lnXN3t61bNL7XJ/gJUHaUPgCdUBJ0ke0bHvXRgEQ69fY4IRIuL2P+yp8dQuFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227630; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=sQWf1iJMgKpxTDrIm7pOcArFyZ+egSzaxNcjdseQn+g=; b=SzHp+hlV5n1/9rYsIMUu8NPMS4glroq30bv8zNZmBfKZ3z3tGQtul1j3+fA5pseX/URzY+BSFd0nnUjAPOs232DI/kB0phOznAHt5xmvpPyXcvxaHSm8++ixEDhaC+e4WqdIvS+LEVB4EHQ0J6YHzuQi0Ypv+rFu5aj/shX4w50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89397+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227630364222.78227439680916; Fri, 29 Apr 2022 03:20:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nsWYYY1788612xkUArMjgE7a; Fri, 29 Apr 2022 03:20:30 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web09.8393.1651227629189941965 for ; Fri, 29 Apr 2022 03:20:29 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-KYkAnQIdMkiN_AcNya0YYg-1; Fri, 29 Apr 2022 06:20:25 -0400 X-MC-Unique: KYkAnQIdMkiN_AcNya0YYg-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99BB7802819; Fri, 29 Apr 2022 10:20:23 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E827C52C80; Fri, 29 Apr 2022 10:20:23 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0006A180060E; Fri, 29 Apr 2022 12:20:19 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 03/10] MdePkg/CompilerIntrinsicsLib: move size_t typedef to header file Date: Fri, 29 Apr 2022 12:20:12 +0200 Message-Id: <20220429102019.1375348-4-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: cBRYRENZqPfJI0YsE6B9NckPx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227630; bh=oUqRogvoCpxP8vlqrKM6JmHLLgrdTuTVL/D/iXdclk8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=eF1gj9FRn4/rbTaFKrDq+NYDj/9MCFiL4eZv2fan0FUG7h+O/6AZZsh4GodIZjwaObP hWXXchUrkp++P/pkeoqFhvAk7Ri/av606gM1GmT06R4J8sVhmg7NX/+z727YccYiPGS+O PmK8EYmSST10MeCMBErDV9pnbzN+dlQVcL8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227631835100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../{memset_ms.c =3D> types_ms.h} | 29 +------------------ .../Library/CompilerIntrinsicsLib/memcpy_ms.c | 6 +--- .../CompilerIntrinsicsLib/memmove_ms.c | 6 +--- .../Library/CompilerIntrinsicsLib/memset_ms.c | 6 +--- 4 files changed, 4 insertions(+), 43 deletions(-) copy MdePkg/Library/CompilerIntrinsicsLib/{memset_ms.c =3D> types_ms.h} (5= 2%) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/types_ms.h similarity index 52% copy from MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c copy to MdePkg/Library/CompilerIntrinsicsLib/types_ms.h index deb902c6ae88..d8b578be1f46 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/types_ms.h @@ -1,6 +1,6 @@ // -----------------------------------------------------------------------= ------- // -// Copyright (c) 2017, Pete Batard. All rights reserved.
+// Copyright (c) 2019, Pete Batard. All rights reserved. // Copyright (c) 2021, Arm Limited. All rights reserved.
// // SPDX-License-Identifier: BSD-2-Clause-Patent @@ -12,30 +12,3 @@ typedef unsigned __int64 size_t; #else typedef unsigned __int32 size_t; #endif - -void * -memset ( - void *, - int, - size_t - ); - -#pragma intrinsic(memset) -#pragma function(memset) -void * -memset ( - void *s, - int c, - size_t n - ) -{ - unsigned char *d; - - d =3D s; - - while (n-- !=3D 0) { - *d++ =3D (unsigned char)c; - } - - return s; -} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcpy_ms.c index 730aa806d50b..d2c3d7198121 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c @@ -7,11 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" =20 void * memcpy ( diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/memmove_ms.c index 3207b94a8675..837744a2920c 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c @@ -7,11 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" =20 void * memmove ( diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memset_ms.c index deb902c6ae88..3569bebdf80b 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c @@ -7,11 +7,7 @@ // // -----------------------------------------------------------------------= ------- =20 -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" =20 void * memset ( --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89397): https://edk2.groups.io/g/devel/message/89397 Mute This Topic: https://groups.io/mt/90772970/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89404+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89404+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227635; cv=none; d=zohomail.com; s=zohoarc; b=JGXo7xC6CwiIPKuuNkAt/UkBVAiVKpeP2a78GJkFTCaJi98J3j4EfipotO5FUlepxhtrIxy6nivlSBJSsHt3/KwHdvN5/55fqvj+Jw95PhqQwlMlMD2U8uNW2L0MIWVrOQ2/29gS5GreWSSCdoEIj1yuoF5huS+yCsI9di0ubPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=b51NNLA3tj5EPhoP6Wfsfjd1WAOVpCD8VwyJx2I9FUc=; b=ViKn9kmabOrFUBn9YJEd0I28SPH3ft/yK5/t4oobtIDJrGDYQEmiVDYpdg3/Tn4xCWmFJwMv1WLCuQJTxXH29o9H0Itgr9UV6syhtiLGnpODmGf/Tf9riTz14iwY2TbnbgHX6fCosKDmcgkWekLWk6qul1MlLm5bM7RoleXDRhg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89404+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227635644735.9278892828037; Fri, 29 Apr 2022 03:20:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sl0tYY1788612xvewqJy3MAJ; Fri, 29 Apr 2022 03:20:34 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.8396.1651227633127274947 for ; Fri, 29 Apr 2022 03:20:33 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-L8eKDoOHOkKrxuzq-eIuiQ-1; Fri, 29 Apr 2022 06:20:27 -0400 X-MC-Unique: L8eKDoOHOkKrxuzq-eIuiQ-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 393FB2811820; Fri, 29 Apr 2022 10:20:25 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DCA2407E1C0; Fri, 29 Apr 2022 10:20:24 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 04F4B1800612; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky , Jiewen Yao , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 04/10] MdePkg/CompilerIntrinsicsLib: move ia32 intrinsics and strcmp Date: Fri, 29 Apr 2022 12:20:13 +0200 Message-Id: <20220429102019.1375348-5-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: l8pVndBi1RsVDT1llG8ClqYGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227634; bh=qLZQ44/AA5JIV5zexB1KXO+oSFxCdl0jej1CzX4dnP8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=V6ULEzEYcVEHzXkYtpn90PuhAmy75WQb3gxUMkuC430Ula/p3x665BVALes/RlLWlVD fAnZ7C2pqG1KIZ2MkECtlOMOlC3U3S7WBmPaHGjcinxFihBXJ0JDrB0hO7+MSKsDjY0Fc xT8liYjvzbRWilvs/y7UGT1ie4A7WdAvWzw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227635939100028 Content-Type: text/plain; charset="utf-8"; x-default="true" Move intrinsics for ia32 from CryptoPkg/Library/IntrinsicLib to MdePkg/Library/CompilerIntrinsicsLib. Also move strcmp. Remove CryptoPkg/Library/IntrinsicLib. Use MdePkg/Library/CompilerIntrinsicsLib instead. Update all references. Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao Acked-by: Ard Biesheuvel Acked-by: Liming Gao --- ArmVirtPkg/ArmVirt.dsc.inc | 2 +- CryptoPkg/CryptoPkg.dsc | 3 +- EmulatorPkg/EmulatorPkg.dsc | 2 +- FmpDevicePkg/FmpDevicePkg.dsc | 2 +- NetworkPkg/NetworkPkg.dsc | 2 +- OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +- OvmfPkg/Bhyve/BhyveX64.dsc | 2 +- OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +- OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 +- OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- OvmfPkg/OvmfPkgX64.dsc | 2 +- OvmfPkg/OvmfXen.dsc | 2 +- SecurityPkg/SecurityPkg.dsc | 10 +-- SignedCapsulePkg/SignedCapsulePkg.dsc | 12 +-- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- .../Library/IntrinsicLib/IntrinsicLib.inf | 69 ----------------- .../CompilerIntrinsicsLib.inf | 16 ++++ CryptoPkg/Library/IntrinsicLib/CopyMem.c | 47 ------------ .../Library/IntrinsicLib/MemoryIntrinsics.c | 74 ------------------- .../CompilerIntrinsicsLib}/Ia32/MathFtol.c | 0 .../Ia32/MathLShiftS64.c | 0 .../Ia32/MathRShiftU64.c | 0 MdePkg/Library/CompilerIntrinsicsLib/strcmp.c | 33 +++++++++ .../Library/IntrinsicLib/BaseIntrinsicLib.uni | 16 ---- .../Ia32/MathLShiftS64.nasm | 0 .../CompilerIntrinsicsLib}/Ia32/MathLlmul.asm | 0 .../CompilerIntrinsicsLib}/Ia32/MathLlshr.asm | 0 .../Ia32/MathRShiftU64.nasm | 0 30 files changed, 75 insertions(+), 233 deletions(-) delete mode 100644 CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf delete mode 100644 CryptoPkg/Library/IntrinsicLib/CopyMem.c delete mode 100644 CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathFtol.c (100%) rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathLShiftS64.c (100%) rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathRShiftU64.c (100%) create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/strcmp.c delete mode 100644 CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathLShiftS64.nasm (100%) rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathLlmul.asm (100%) rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathLlshr.asm (100%) rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntrins= icsLib}/Ia32/MathRShiftU64.nasm (100%) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 97edf0487964..d8b3db4f75ce 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -154,7 +154,7 @@ [LibraryClasses.common] # # CryptoPkg libraries needed by multiple firmware features # - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 2d4d4c2797e5..d593ae0e709c 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -103,7 +103,7 @@ [LibraryClasses] UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf #??? IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf = #??? OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf =20 [LibraryClasses.ARM] @@ -240,7 +240,6 @@ [Components] CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf - CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf CryptoPkg/Library/TlsLib/TlsLib.inf CryptoPkg/Library/TlsLibNull/TlsLibNull.inf CryptoPkg/Library/OpensslLib/OpensslLib.inf diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 554c13ddb500..f3a97b2e4577 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -128,7 +128,7 @@ [LibraryClasses] =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 258b5ce0cded..f314548d4066 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -57,7 +57,7 @@ [LibraryClasses] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index f69eb3d1d5c2..95dedad392fb 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -53,7 +53,7 @@ [LibraryClasses] !else BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index f0700035c116..d29e278b9e14 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -188,7 +188,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index a8fa4d38ab60..60b12ad3651a 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -188,7 +188,7 @@ [LibraryClasses] IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index d1c85f60c768..1552e1883c50 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -198,7 +198,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX6= 4.dsc index 73a6c30096a8..ba395bcd356c 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -170,7 +170,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 20c3c9c4d862..632d2a3f0071 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -195,7 +195,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index f02b371f7427..25c0994fa158 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -195,7 +195,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index cb68e612bd35..37e26ab53b66 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -199,7 +199,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 45ffa2dbe35f..14be0f0a866f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -207,7 +207,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index a1626d06dfc3..969ffce0ac54 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -184,7 +184,7 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 2b5ef67016b8..b71b78f56ca5 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -101,7 +101,7 @@ [LibraryClasses.common.PEIM] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf !endif @@ -119,7 +119,7 @@ [LibraryClasses.common.DXE_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif @@ -140,7 +140,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif @@ -152,7 +152,7 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.comm= on.UEFI_APPLICATION] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif @@ -171,7 +171,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !endif diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/Signe= dCapsulePkg.dsc index 72b533cd04e8..213e165be5d0 100644 --- a/SignedCapsulePkg/SignedCapsulePkg.dsc +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc @@ -126,7 +126,7 @@ [LibraryClasses.common.PEIM] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf !endif @@ -141,7 +141,7 @@ [LibraryClasses.common.DXE_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif @@ -155,7 +155,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif @@ -178,7 +178,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !endif @@ -190,7 +190,7 @@ [LibraryClasses.common.UEFI_DRIVER] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif @@ -202,7 +202,7 @@ [LibraryClasses.common.UEFI_APPLICATION] !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !else - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 17b30589e77c..fa27513c696c 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -182,7 +182,7 @@ [LibraryClasses] DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.= inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Li= brary/IntrinsicLib/IntrinsicLib.inf deleted file mode 100644 index 86e74b57b109..000000000000 --- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +++ /dev/null @@ -1,69 +0,0 @@ -## @file -# Intrinsic Routines Wrapper Library Instance. -# -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
-# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D BaseIntrinsicLib - MODULE_UNI_FILE =3D BaseIntrinsicLib.uni - FILE_GUID =3D 63850097-3E97-4c4f-A52D-C811A0106105 - MODULE_TYPE =3D BASE - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D IntrinsicLib - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D IA32 X64 -# - -[Sources] - MemoryIntrinsics.c - -[Sources.IA32] - CopyMem.c - - Ia32/MathLShiftS64.c | MSFT - Ia32/MathRShiftU64.c | MSFT - Ia32/MathFtol.c | MSFT - Ia32/MathLlmul.asm | MSFT - Ia32/MathLlshr.asm | MSFT - - Ia32/MathLShiftS64.c | INTEL - Ia32/MathRShiftU64.c | INTEL - Ia32/MathFtol.c | INTEL - - Ia32/MathLShiftS64.nasm | GCC - Ia32/MathRShiftU64.nasm | GCC - -[Sources.X64] - CopyMem.c - -[Packages] - MdePkg/MdePkg.dec - -[LibraryClasses] - BaseLib - BaseMemoryLib - -[BuildOptions] - # - # Override MSFT build option to remove /Oi and /GL - # - MSFT:DEBUG_VS2003_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs327= 68 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm - MSFT:RELEASE_VS2003_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs327= 68 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /GX- - MSFT:DEBUG_VS2003xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs327= 68 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm - MSFT:RELEASE_VS2003xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs327= 68 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /GX- - MSFT:DEBUG_DDK3790_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs327= 68 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm - MSFT:RELEASE_DDK3790_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs327= 68 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF - MSFT:DEBUG_DDK3790xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs327= 68 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm - MSFT:RELEASE_DDK3790xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs327= 68 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF - MSFT:DEBUG_*_IA32_CC_FLAGS =3D=3D /nologo /c /WX /GS- /W4 /= Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm - MSFT:RELEASE_*_IA32_CC_FLAGS =3D=3D /nologo /c /WX /GS- /W4 /= Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF - MSFT:DEBUG_*_X64_CC_FLAGS =3D=3D /nologo /c /WX /GS- /X /W= 4 /Gs32768 /D UNICODE /O1b2s /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm - MSFT:RELEASE_*_X64_CC_FLAGS =3D=3D /nologo /c /WX /GS- /X /W= 4 /Gs32768 /D UNICODE /O1b2s /Gy /FIAutoGen.h /EHs-c- /GR- /GF - INTEL:*_*_*_CC_FLAGS =3D /Oi- diff --git a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf= b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index 6fa09e5f0dec..b5e11373c509 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -29,6 +29,8 @@ [Sources] memcmp_ms.c | MSFT memmove_ms.c | MSFT =20 + strcmp.c + [Sources.ARM] Arm/mullu.asm | RVCT Arm/switch.asm | RVCT @@ -82,6 +84,20 @@ [Sources.ARM] [Sources.AARCH64] AArch64/Atomics.S | GCC =20 +[Sources.IA32] + Ia32/MathLShiftS64.c | MSFT + Ia32/MathRShiftU64.c | MSFT + Ia32/MathFtol.c | MSFT + Ia32/MathLlmul.asm | MSFT + Ia32/MathLlshr.asm | MSFT + + Ia32/MathLShiftS64.c | INTEL + Ia32/MathRShiftU64.c | INTEL + Ia32/MathFtol.c | INTEL + + Ia32/MathLShiftS64.nasm | GCC + Ia32/MathRShiftU64.nasm | GCC + [Packages] MdePkg/MdePkg.dec =20 diff --git a/CryptoPkg/Library/IntrinsicLib/CopyMem.c b/CryptoPkg/Library/I= ntrinsicLib/CopyMem.c deleted file mode 100644 index 14a213d1dadf..000000000000 --- a/CryptoPkg/Library/IntrinsicLib/CopyMem.c +++ /dev/null @@ -1,47 +0,0 @@ -/** @file - Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based - Cryptographic Library. - -Copyright (c) 2010, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include - -#if defined (__clang__) && !defined (__APPLE__) - -/* Copies bytes between buffers */ -static __attribute__ ((__used__)) -void * -__memcpy ( - void *dest, - const void *src, - unsigned int count - ) -{ - return CopyMem (dest, src, (UINTN)count); -} - -__attribute__ ((__alias__ ("__memcpy"))) -void * -memcpy ( - void *dest, - const void *src, - unsigned int count - ); - -#else -/* Copies bytes between buffers */ -void * -memcpy ( - void *dest, - const void *src, - unsigned int count - ) -{ - return CopyMem (dest, src, (UINTN)count); -} - -#endif diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/= Library/IntrinsicLib/MemoryIntrinsics.c deleted file mode 100644 index 611e9fd773b0..000000000000 --- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c +++ /dev/null @@ -1,74 +0,0 @@ -/** @file - Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based - Cryptographic Library. - -Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include -#include - -typedef UINTN size_t; - -#if defined (__GNUC__) || defined (__clang__) -#define GLOBAL_USED __attribute__((used)) -#else -#define GLOBAL_USED -#endif - -/* OpenSSL will use floating point support, and C compiler produces the _f= ltused - symbol by default. Simply define this symbol here to satisfy the linker= . */ -int GLOBAL_USED _fltused =3D 1; - -/* Sets buffers to a specified character */ -void * -memset ( - void *dest, - int ch, - size_t count - ) -{ - // - // NOTE: Here we use one base implementation for memset, instead of the = direct - // optimized SetMem() wrapper. Because the IntrinsicLib has to be = built - // without whole program optimization option, and there will be so= me - // potential register usage errors when calling other optimized co= des. - // - - // - // Declare the local variables that actually move the data elements as - // volatile to prevent the optimizer from replacing this function with - // the intrinsic memset() - // - volatile UINT8 *Pointer; - - Pointer =3D (UINT8 *)dest; - while (count-- !=3D 0) { - *(Pointer++) =3D (UINT8)ch; - } - - return dest; -} - -/* Compare bytes in two buffers. */ -int -memcmp ( - const void *buf1, - const void *buf2, - size_t count - ) -{ - return (int)CompareMem (buf1, buf2, count); -} - -int -strcmp ( - const char *s1, - const char *s2 - ) -{ - return (int)AsciiStrCmp (s1, s2); -} diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c b/MdePkg/Librar= y/CompilerIntrinsicsLib/Ia32/MathFtol.c similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathFtol.c diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/MathLShiftS64.c similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.c diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/MathRShiftU64.c similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.c diff --git a/MdePkg/Library/CompilerIntrinsicsLib/strcmp.c b/MdePkg/Library= /CompilerIntrinsicsLib/strcmp.c new file mode 100644 index 000000000000..937b19a3dff7 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/strcmp.c @@ -0,0 +1,33 @@ +/** @file + Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based + Cryptographic Library. + +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include + +typedef UINTN size_t; + +#if defined (__GNUC__) || defined (__clang__) +#define GLOBAL_USED __attribute__((used)) +#else +#define GLOBAL_USED +#endif + +/* OpenSSL will use floating point support, and C compiler produces the _f= ltused + symbol by default. Simply define this symbol here to satisfy the linker= . */ +int GLOBAL_USED _fltused =3D 1; + +int +strcmp ( + const char *s1, + const char *s2 + ) +{ + return (int)AsciiStrCmp (s1, s2); +} diff --git a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni b/CryptoPk= g/Library/IntrinsicLib/BaseIntrinsicLib.uni deleted file mode 100644 index 47f19d4080f7..000000000000 --- a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni +++ /dev/null @@ -1,16 +0,0 @@ -// /** @file -// Intrinsic Routines Wrapper Library Instance. -// -// This module is intrinsic routines wrapper library instance. -// -// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
-// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// **/ - - -#string STR_MODULE_ABSTRACT #language en-US "Intrinsic Routine= s Wrapper Library Instance" - -#string STR_MODULE_DESCRIPTION #language en-US "This module is in= trinsic routines wrapper library instance." - diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm b/MdePk= g/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.nasm similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.nasm diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLlmul.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/MathLlmul.asm similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLlmul.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLlmul.asm diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLlshr.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/MathLlshr.asm similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLlshr.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLlshr.asm diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm b/MdePk= g/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.nasm similarity index 100% rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.nasm --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89404): https://edk2.groups.io/g/devel/message/89404 Mute This Topic: https://groups.io/mt/90772979/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89401+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89401+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227632; cv=none; d=zohomail.com; s=zohoarc; b=P+sD3UVLOx5irbLeigfoW3FzmQJIN74LfpcEkbO4d3d+Prc/BbfgBgu9NsduZpIPCRmupLFpxY8nOjzuQRf1jbMA7xeeb/mVSOPaOwL8Zv4zDk/mpJjAKg0nAvQNUS2d6nbRDcnyJv3Vf9vjwnLfRYhzuFUjrfjh4bdtdCqr9KM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dMw0whLyZ9LDqtJwf/1jE6PdjLy/u9mXgq+xBiTcaGk=; b=LiPbadGIMvBGhJ0tw2p5sy5hdrowsBzjExwcjPE2f5846y/YY5JbIsWU3MTAJN9hf7fMd1Um4BPbTQLl+NBiIPhUWuT8wlJppvGt532BK784RW/+8S8NrdEFJL7faPdv0rrQ3YtAO3k3HImiec11m2myI29vFm9EACfip1yK21w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89401+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227632962559.7626151281205; Fri, 29 Apr 2022 03:20:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 61nHYY1788612xo2RkXrydeT; Fri, 29 Apr 2022 03:20:32 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web12.8354.1651227631626895885 for ; Fri, 29 Apr 2022 03:20:32 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-S-l0eJdIP8mjMI_fnQqt3w-1; Fri, 29 Apr 2022 06:20:27 -0400 X-MC-Unique: S-l0eJdIP8mjMI_fnQqt3w-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8526F3C0FA80; Fri, 29 Apr 2022 10:20:25 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4B49407E1C1; Fri, 29 Apr 2022 10:20:24 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 09DF61800622; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 05/10] MdePkg/CompilerIntrinsicsLib: copy over intrinsics from edk2-libc repo Date: Fri, 29 Apr 2022 12:20:14 +0200 Message-Id: <20220429102019.1375348-6-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: XW19oyi7aGeZllQP4ks7Be3Rx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227632; bh=dis/YeALijghggMR7DbY1VwO509FGEXKfcSfPaxslB8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=c6U5K0E+SiCUacYrhgCbGkEqdLwthYaMALi0U2MlAIT3zsL8b4I+svWiXWwDRBDg+ec Cx/FTk7LrELH3ZR7uvrsyRkb71fEx7Q3e5h/orlYaHcrtDKPOxH+fornmIT7KAZQcPHG+ JCdUjV3E/6kVkM248NTnhBRN3JVYgvhBzSk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227633893100016 Content-Type: text/plain; charset="utf-8"; x-default="true" Copy over unmodified (except for running through uncrustify), from https://github.com/tianocore/edk2-libc/tree/master/StdLib/LibC/CRT Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../Library/CompilerIntrinsicsLib/Ia32/Gcc.c | 283 ++++++++++++++++++ .../CompilerIntrinsicsLib/Ia32/lldiv.c | 98 ++++++ .../CompilerIntrinsicsLib/Ia32/lldvrm.c | 102 +++++++ .../CompilerIntrinsicsLib/Ia32/llmul.c | 82 +++++ .../CompilerIntrinsicsLib/Ia32/llrem.c | 95 ++++++ .../CompilerIntrinsicsLib/Ia32/llshl.c | 57 ++++ .../CompilerIntrinsicsLib/Ia32/llshr.c | 61 ++++ .../CompilerIntrinsicsLib/Ia32/ulldiv.c | 89 ++++++ .../CompilerIntrinsicsLib/Ia32/ulldvrm.c | 102 +++++++ .../CompilerIntrinsicsLib/Ia32/ullrem.c | 95 ++++++ .../CompilerIntrinsicsLib/Ia32/ullshr.c | 60 ++++ .../CompilerIntrinsicsLib/Ia32/ashrdi3.S | 66 ++++ .../CompilerIntrinsicsLib/Ia32/mulll.S | 77 +++++ .../CompilerIntrinsicsLib/Ia32/shldi3.S | 62 ++++ .../CompilerIntrinsicsLib/Ia32/udivdi3.S | 83 +++++ .../CompilerIntrinsicsLib/Ia32/umoddi3.S | 89 ++++++ 16 files changed, 1501 insertions(+) create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Ia32/Gcc.c new file mode 100644 index 000000000000..430139fc5ee0 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c @@ -0,0 +1,283 @@ +/** @file + Integer Arithmetic Run-time support functions for GCC. + The integer arithmetic routines are used on platforms that don't provide + hardware support for arithmetic operations on some modes.. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ +#include +#include +#include + +#include + +// Shift Datum left by Count bits. +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +int +__ashlsi3 ( + int Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (int)LShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long +__ashldi3 ( + long Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long)LShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long long +__ashlti3 ( + long long Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)LShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +// Arithmetically shift Datum right by Count bits. +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +int +__ashrsi3 ( + int Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (int)ARShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long +__ashrdi3 ( + long Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long)ARShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long long +__ashrti3 ( + long long Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)ARShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +// Return the quotient of the signed division of Dividend and Divisor +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +int +__divsi3 ( + int Dividend, + int Divisor + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (int)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, NULL); +} + +INT64 +__divdi3 ( + INT64 Dividend, + INT64 Divisor + ) +{ + INT64 Quotient; + + Quotient =3D DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, NULL); + DEBUG ((DEBUG_INFO, "%a: %Ld / %Ld =3D %Ld\n", __func__, Dividend, Divis= or, Quotient)); + + return Quotient; +} + +long long +__divti3 ( + long long Dividend, + long long Divisor + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, N= ULL); +} + +// Logically shift Datum right by Count bits +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +int +__lshrsi3 ( + int Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (int)RShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long +__lshrdi3 ( + int Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long)RShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +long long +__lshrti3 ( + int Datum, + int Count + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)RShiftU64 ((UINT64)Datum, (UINTN)Count); +} + +// Return the remainder of the signed division of Dividend and Divisor +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +int +__modsi3 ( + int Dividend, + int Divisor + ) +{ + INT64 Remainder; + + (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); + DEBUG ((DEBUG_INFO, "modsi3: %d %% %d =3D %d\n", Dividend, Divisor, (int= )Remainder)); + + return (int)Remainder; +} + +INT64 +__moddi3 ( + INT64 Dividend, + INT64 Divisor + ) +{ + INT64 Remainder; + + (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); + DEBUG ((DEBUG_INFO, "moddi3: %Ld %% %Ld =3D %Ld\n", (INT64)Dividend, (IN= T64)Divisor, Remainder)); + + return Remainder; +} + +long long +__modti3 ( + long long Dividend, + long long Divisor + ) +{ + INT64 Remainder; + + (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); + DEBUG ((DEBUG_INFO, "modti3: %Ld %% %Ld =3D %Ld\n", (INT64)Dividend, (IN= T64)Divisor, Remainder)); + + return (long long)Remainder; +} + +// These functions return the product of the Multiplicand and Multiplier. +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +long long +__multi3 ( + long long Multiplicand, + long long Multiplier + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)MultS64x64 ((INT64)Multiplicand, (INT64)Multiplier); +} + +// Return the quotient of the unsigned division of a and b. +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +unsigned int +__udivsi3 ( + unsigned int Dividend, + unsigned int Divisor + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (int)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, NULL); +} + +unsigned long +__udivdi3 ( + unsigned long Dividend, + unsigned long Divisor + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, NULL= ); +} + +unsigned long long +__udivti3 ( + unsigned long long Dividend, + unsigned long long Divisor + ) +{ + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + return (long long)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor,= NULL); +} + +// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +unsigned int +__umodsi3 ( + unsigned int Dividend, + unsigned int Divisor + ) +{ + UINT64 Remainder; + + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); + + return (unsigned int)Remainder; +} + +unsigned long +__umoddi3 ( + unsigned long Dividend, + unsigned long Divisor + ) +{ + UINT64 Remainder; + + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); + + return (unsigned long)Remainder; +} + +unsigned long long +__umodti3 ( + unsigned long long Dividend, + unsigned long long Divisor + ) +{ + UINT64 Remainder; + + DEBUG ((DEBUG_INFO, "%a:\n", __func__)); + (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); + + return (unsigned long long)Remainder; +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/lldiv.c new file mode 100644 index 000000000000..792974d7b119 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c @@ -0,0 +1,98 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit signed value with a 64-bit signed value and returns + * a 64-bit signed result. + */ +__declspec(naked) void __cdecl +_alldiv ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivS64x64Remainder() routine + // INT64 + // EFIAPI + // DivS64x64Remainder ( + // IN UINT64 Dividend, + // IN UINT64 Divisor, + // OUT UINT64 *Remainder OPTIONAL + // ) + // + _asm { + ;Entry: + ; Arguments are passed on the stack: + ; 1st pushed: divisor (QWORD) + ; 2nd pushed: dividend (QWORD) + ; + ;Exit: + ; EDX:EAX contains the quotient (dividend/ divisor) + ; NOTE: this routine removes the parameters from the stack. + ; + ; Original local stack when calling _alldiv + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + + ; + ; Set up the local stack for NULL Reminder pointer + ; + xor eax, eax + push eax + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 20] + push eax + mov eax, [esp + 20] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 20] + push eax + mov eax, [esp + 20] + push eax + + ; + ; Call native DivS64x64Remainder of BaseLib + ; + call DivS64x64Remainder + + ; + ; Adjust stack + ; + add esp, 20 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/lldvrm.c new file mode 100644 index 000000000000..a1f87f6af5c3 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c @@ -0,0 +1,102 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit signed value by another 64-bit signed value and returns + * the 64-bit signed result and the 64-bit signed remainder. + */ +__declspec(naked) void __cdecl +_alldvrm ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivS64x64Remainder() routine + // INT64 + // EFIAPI + // DivS64x64Remainder ( + // IN INT64 Dividend, + // IN INT64 Divisor, + // OUT INT64 *Remainder + // ) + // + _asm { + ; Original local stack when calling _alldvrm + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + ; + ; On Exit: + ; EDX:EAX contains the quotient (dividend/ divisor) + ; EBX:ECX contains the remainder (divided % divisor) + ; NOTE: this routine removes the parameters from the stack. + ; + + ; + ; Set up the local stack for Reminder pointer + ; + sub esp, 8 + push esp + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Call native DivS64x64Remainder of BaseLib + ; + call DivS64x64Remainder + + ; + ; EDX:EAX contains the quotient (dividend/ divisor) + ; Put the Remainder in EBX:ECX + ; + mov ecx, [esp + 20] + mov ebx, [esp + 24] + + ; + ; Adjust stack + ; + add esp, 28 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llmul.c new file mode 100644 index 000000000000..61a5c416b912 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c @@ -0,0 +1,82 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Multiplies a 64-bit signed or unsigned value by a 64-bit signed or unsi= gned value + * and returns a 64-bit result. + */ +__declspec(naked) void __cdecl +_allmul ( + void + ) +{ + // + // Wrapper Implementation over EDKII MultS64x64() routine + // INT64 + // EFIAPI + // MultS64x64 ( + // IN INT64 Multiplicand, + // IN INT64 Multiplier + // ) + // + _asm { + ; Original local stack when calling _allmul + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |--Multiplier --| + ; | | + ; |---------------| + ; | | + ; |--Multiplicand-| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + + ; + ; Set up the local stack for Multiplicand parameter + ; + mov eax, [esp + 16] + push eax + mov eax, [esp + 16] + push eax + + ; + ; Set up the local stack for Multiplier parameter + ; + mov eax, [esp + 16] + push eax + mov eax, [esp + 16] + push eax + + ; + ; Call native MulS64x64 of BaseLib + ; + call MultS64x64 + + ; + ; Adjust stack + ; + add esp, 16 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llrem.c new file mode 100644 index 000000000000..f415fe82dd59 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c @@ -0,0 +1,95 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit signed value by another 64-bit signed value and returns + * the 64-bit signed remainder. + */ +__declspec(naked) void __cdecl +_allrem ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivS64x64Remainder() routine + // UINT64 + // EFIAPI + // DivS64x64Remainder ( + // IN UINT64 Dividend, + // IN UINT64 Divisor, + // OUT UINT64 *Remainder + // ) + // + _asm { + ; Original local stack when calling _allrem + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + + ; + ; Set up the local stack for Reminder pointer + ; + sub esp, 8 + push esp + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Call native DivS64x64Remainder of BaseLib + ; + call DivS64x64Remainder + + ; + ; Put the Reminder in EDX:EAX as return value + ; + mov eax, [esp + 20] + mov edx, [esp + 24] + + ; + ; Adjust stack + ; + add esp, 28 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llshl.c new file mode 100644 index 000000000000..f2121a713bd7 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c @@ -0,0 +1,57 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +/* + * Shifts a 64-bit signed value left by a particular number of bits. + */ +__declspec(naked) void __cdecl +_allshl ( + void + ) +{ + _asm { + ; + ; Handle shifting of 64 or more bits (return 0) + ; + + cmp cl, 64 + jae short ReturnZero + + ; + ; Handle shifting of between 0 and 31 bits + ; + cmp cl, 32 + jae short More32 + shld edx, eax, cl + shl eax, cl + ret + + ; + ; Handle shifting of between 32 and 63 bits + ; +More32: + mov edx, eax + xor eax, eax + and cl, 31 + shl edx, cl + ret + +ReturnZero: + xor eax,eax + xor edx,edx + ret + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llshr.c new file mode 100644 index 000000000000..ba60aaafada5 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c @@ -0,0 +1,61 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +/* + * Shifts a 64-bit signed value right by a particular number of bits. + */ +__declspec(naked) void __cdecl +_allshr ( + void + ) +{ + _asm { + ; + ; Handle shifts of 64 bits or more (if shifting 64 bits or more, the r= esult + ; depends only on the high order bit of edx). + ; + + cmp cl,64 + jae short SIGNRETURN + + ; + ; Handle shifts of between 0 and 31 bits + ; + cmp cl, 32 + jae short MORE32 + shrd eax,edx,cl + sar edx,cl + ret + + ; + ; Handle shifts of between 32 and 63 bits + ; +MORE32: + mov eax,edx + sar edx,31 + and cl,31 + sar eax,cl + ret + + ; + ; Return double precision 0 or -1, depending on the sign of edx + ; +SIGNRETURN: + sar edx,31 + mov eax,edx + ret + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ulldiv.c new file mode 100644 index 000000000000..287af8562839 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c @@ -0,0 +1,89 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit unsigned value with a 64-bit unsigned value and returns + * a 64-bit unsigned result. + */ +__declspec(naked) void __cdecl +_aulldiv ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivU64x64Reminder() routine + // UINT64 + // EFIAPI + // DivU64x64Remainder ( + // IN UINT64 Dividend, + // IN UINT64 Divisor, + // OUT UINT64 *Remainder OPTIONAL + // ) + // + _asm { + ; Original local stack when calling _aulldiv + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + + ; + ; Set up the local stack for NULL Reminder pointer + ; + xor eax, eax + push eax + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 20] + push eax + mov eax, [esp + 20] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 20] + push eax + mov eax, [esp + 20] + push eax + + ; + ; Call native DivU64x64Remainder of BaseLib + ; + call DivU64x64Remainder + + ; + ; Adjust stack + ; + add esp, 20 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/ulldvrm.c new file mode 100644 index 000000000000..378cdec115e5 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c @@ -0,0 +1,102 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit signed value by another 64-bit signed value and returns + * the 64-bit signed result and the 64-bit signed remainder. + */ +__declspec(naked) void __cdecl +_aulldvrm ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivU64x64Remainder() routine + // UINT64 + // EFIAPI + // DivU64x64Remainder ( + // IN UINT64 Dividend, + // IN UINT64 Divisor, + // OUT UINT64 *Remainder + // ) + // + _asm { + ; Original local stack when calling _aulldvrm + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + ; + ; On Exit: + ; EDX:EAX contains the quotient (dividend/ divisor) + ; EBX:ECX contains the remainder (divided % divisor) + ; NOTE: this routine removes the parameters from the stack. + ; + + ; + ; Set up the local stack for Remainder pointer + ; + sub esp, 8 + push esp + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Call native DivU64x64Remainder of BaseLib + ; + call DivU64x64Remainder + + ; + ; EDX:EAX contains the quotient (dividend/ divisor) + ; Put the Remainder in EBX:ECX + ; + mov ecx, [esp + 20] + mov ebx, [esp + 24] + + ; + ; Adjust stack + ; + add esp, 28 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ullrem.c new file mode 100644 index 000000000000..49d0064b0f03 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c @@ -0,0 +1,95 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +/* + * Divides a 64-bit unsigned value by another 64-bit unsigned value and re= turns + * the 64-bit unsigned remainder. + */ +__declspec(naked) void __cdecl +_aullrem ( + void + ) +{ + // + // Wrapper Implementation over EDKII DivU64x64Remainder() routine + // UINT64 + // EFIAPI + // DivU64x64Remainder ( + // IN UINT64 Dividend, + // IN UINT64 Divisor, + // OUT UINT64 *Remainder OPTIONAL + // ) + // + _asm { + ; Original local stack when calling _aullrem + ; ----------------- + ; | | + ; |---------------| + ; | | + ; |-- Divisor --| + ; | | + ; |---------------| + ; | | + ; |-- Dividend --| + ; | | + ; |---------------| + ; | ReturnAddr** | + ; ESP---->|---------------| + ; + + ; + ; Set up the local stack for Reminder pointer + ; + sub esp, 8 + push esp + + ; + ; Set up the local stack for Divisor parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Set up the local stack for Dividend parameter + ; + mov eax, [esp + 28] + push eax + mov eax, [esp + 28] + push eax + + ; + ; Call native DivU64x64Remainder of BaseLib + ; + call DivU64x64Remainder + + ; + ; Put the Reminder in EDX:EAX as return value + ; + mov eax, [esp + 20] + mov edx, [esp + 24] + + ; + ; Adjust stack + ; + add esp, 28 + + ret 16 + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ullshr.c new file mode 100644 index 000000000000..3c21b45941a1 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c @@ -0,0 +1,60 @@ +/** @file + 64-bit Math Worker Function. + The 32-bit versions of C compiler generate calls to library routines + to handle 64-bit math. These functions use non-standard calling conventi= ons. + + Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php. + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +/* + * Shifts a 64-bit unsigned value right by a certain number of bits. + */ +__declspec(naked) void __cdecl +_aullshr ( + void + ) +{ + _asm { + ; + ; Checking: Only handle 64bit shifting or more + ; + cmp cl, 64 + jae _Exit + + ; + ; Handle shifting between 0 and 31 bits + ; + cmp cl, 32 + jae More32 + shrd eax, edx, cl + shr edx, cl + ret + + ; + ; Handle shifting of 32-63 bits + ; +More32: + mov eax, edx + xor edx, edx + and cl, 31 + shr eax, cl + ret + + ; + ; Invalid number (less then 32bits), return 0 + ; + +_Exit: + xor eax, eax + xor edx, edx + ret + } +} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/ashrdi3.S new file mode 100644 index 000000000000..1c629dc23bf5 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S @@ -0,0 +1,66 @@ +#-------------------------------------------------------------------------= ----- +# +# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+# This program and the accompanying materials are licensed and made availa= ble +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +# Module Name: +# +# MathRShiftU64.S +# +# Abstract: +# +# 64-bit Math Worker Function. +# Shifts a 64-bit unsigned value right by a certain number of bits. +# +#-------------------------------------------------------------------------= ----- + + + .686: + .code: + +ASM_GLOBAL ASM_PFX(__ashrdi3) + +#-------------------------------------------------------------------------= ----- +# +# void __cdecl __ashrdi3 (void) +# +#-------------------------------------------------------------------------= ----- +ASM_PFX(__ashrdi3): + # + # Checking: Only handle 64bit shifting or more + # + cmpb $64, %cl + jae _Exit + + # + # Handle shifting between 0 and 31 bits + # + cmpb $32, %cl + jae More32 + shrd %cl, %edx, %eax + shr %cl, %edx + ret + + # + # Handle shifting of 32-63 bits + # +More32: + movl %edx, %eax + xor %edx, %edx + and $32, %cl + shr %cl, %eax + ret + + # + # Invalid number (less then 32bits), return 0 + # +_Exit: + xor %eax, %eax + xor %edx, %edx + ret diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/mulll.S new file mode 100644 index 000000000000..333fdfbb9f58 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S @@ -0,0 +1,77 @@ +#-------------------------------------------------------------------------= ----- +# +# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+# This program and the accompanying materials are licensed and made availa= ble +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +# Module Name: +# +# MathMultS64x64.S +# +# Abstract: +# +# 64-bit Math Worker Function. +# Multiplies a 64-bit signed or unsigned value by a 64-bit signed or uns= igned value +# and returns a 64-bit result +# +#-------------------------------------------------------------------------= ----- + + .686: + .code: + +ASM_GLOBAL ASM_PFX(_mulll), ASM_PFX(MultS64x64) + +#-------------------------------------------------------------------------= ----- +# +# void __cdecl __mulll (void) +# +#-------------------------------------------------------------------------= ----- +ASM_PFX(__mulll): + # Original local stack when calling __mulll + # ----------------- + # | | + # |---------------| + # | | + # |--Multiplier --| + # | | + # |---------------| + # | | + # |--Multiplicand-| + # | | + # |---------------| + # | ReturnAddr** | + # ESP---->|---------------| + # + + # + # Set up the local stack for Multiplicand parameter + # + movl 16(%esp), %eax + push %eax + movl 16(%esp), %eax + push %eax + + # + # Set up the local stack for Multiplier parameter + # + movl 16(%esp), %eax + push %eax + movl 16(%esp), %eax + push %eax + + # + # Call native MulS64x64 of BaseLib + # + jmp ASM_PFX(MultS64x64) + + # + # Adjust stack + # + add $16, %esp + + ret $16 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/shldi3.S new file mode 100644 index 000000000000..b2a03d98337e --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S @@ -0,0 +1,62 @@ +#-------------------------------------------------------------------------= ----- +# +# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+# This program and the accompanying materials are licensed and made availa= ble +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +# Module Name: +# +# MathLShiftS64.S +# +# Abstract: +# +# 64-bit Math Worker Function. +# Shifts a 64-bit signed value left by a certain number of bits. +# +#-------------------------------------------------------------------------= ----- + + .686: + .code: + +ASM_GLOBAL ASM_PFX(__ashldi3) + +#-------------------------------------------------------------------------= ----- +# +# void __cdecl __ashldi3 (void) +# +#-------------------------------------------------------------------------= ----- +ASM_PFX(__ashldi3): + # + # Handle shifting of 64 or more bits (return 0) + # + cmpb $64, %cl + jae ReturnZero + + # + # Handle shifting of between 0 and 31 bits + # + cmpb $32, %cl + jae More32 + shld %cl, %eax, %edx + shl %cl, %eax + ret + + # + # Handle shifting of between 32 and 63 bits + # +More32: + movl %eax, %edx + xor %eax, %eax + and $31, %cl + shl %cl, %edx + ret + +ReturnZero: + xor %eax, %eax + xor %edx, %edx + ret diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/udivdi3.S new file mode 100644 index 000000000000..336d75ee7c30 --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S @@ -0,0 +1,83 @@ +#-------------------------------------------------------------------------= ----- +# +# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+# This program and the accompanying materials are licensed and made availa= ble +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +# Module Name: +# +# MathDivU64x64.S +# +# Abstract: +# +# 64-bit Math Worker Function. +# Divides a 64-bit unsigned value with a 64-bit unsigned value and retur= ns +# a 64-bit unsigned result. +# +#-------------------------------------------------------------------------= ----- + + .686: + .code: + +ASM_GLOBAL ASM_PFX(__udivdi3), ASM_PFX(DivU64x64Remainder) + +#-------------------------------------------------------------------------= ----- +# +# void __cdecl __udivdi3 (void) +# +#-------------------------------------------------------------------------= ----- +ASM_PFX(__udivdi3): + # Original local stack when calling __udivdi3 + # ----------------- + # | | + # |---------------| + # | | + # |-- Divisor --| + # | | + # |---------------| + # | | + # |-- Dividend --| + # | | + # |---------------| + # | ReturnAddr** | + # ESP---->|---------------| + # + + # + # Set up the local stack for NULL Reminder pointer + # + xorl %eax, %eax + push %eax + + # + # Set up the local stack for Divisor parameter + # + movl 20(%esp), %eax + push %eax + movl 20(%esp), %eax + push %eax + + # + # Set up the local stack for Dividend parameter + # + movl 20(%esp), %eax + push %eax + movl 20(%esp), %eax + push %eax + + # + # Call native DivU64x64Remainder of BaseLib + # + jmp ASM_PFX(DivU64x64Remainder) + + # + # Adjust stack + # + addl $20, %esp + + ret $16 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/umoddi3.S new file mode 100644 index 000000000000..9b72e918a4ba --- /dev/null +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S @@ -0,0 +1,89 @@ +#-------------------------------------------------------------------------= ----- +# +# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+# This program and the accompanying materials are licensed and made availa= ble +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +# +# Module Name: +# +# MathReminderU64x64.S +# +# Abstract: +# +# 64-bit Math Worker Function. +# Divides a 64-bit unsigned value by another 64-bit unsigned value and r= eturns +# the 64-bit unsigned remainder +# +#-------------------------------------------------------------------------= ----- + + .686: + .code: + +ASM_GLOBAL ASM_PFX(__umoddi3), ASM_PFX(DivU64x64Remainder) + +#-------------------------------------------------------------------------= ----- +# +# void __cdecl __umoddi3 (void) +# +#-------------------------------------------------------------------------= ----- +ASM_PFX(__umoddi3): + # Original local stack when calling __umoddi3 + # ----------------- + # | | + # |---------------| + # | | + # |-- Divisor --| + # | | + # |---------------| + # | | + # |-- Dividend --| + # | | + # |---------------| + # | ReturnAddr** | + # ESP---->|---------------| + # + + # + # Set up the local stack for Reminder pointer + # + sub $8, %esp + push %esp + + # + # Set up the local stack for Divisor parameter + # + movl 28(%esp), %eax + push %eax + movl 28(%esp), %eax + push %eax + + # + # Set up the local stack for Dividend parameter + # + movl 28(%esp), %eax + push %eax + movl 28(%esp), %eax + push %eax + + # + # Call native DivU64x64Remainder of BaseLib + # + jmp ASM_PFX(DivU64x64Remainder) + + # + # Put the Reminder in EDX:EAX as return value + # + movl 20(%esp), %eax + movl 24(%esp), %edx + + # + # Adjust stack + # + add $28, %esp + + ret $16 --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89401): https://edk2.groups.io/g/devel/message/89401 Mute This Topic: https://groups.io/mt/90772975/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89402+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89402+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227634; cv=none; d=zohomail.com; s=zohoarc; b=jaOF395DUMpbGHVz+GjduhwfoFz98DxSO6FSmYMVmuHM4WBIyOmxqtcZ1Bj1wmq9bULM2BqY9p03IZDrgoOPTPJd/If2zZywKHWyszmC/eV8ju3pKojbdZmqz2m6KfnT7er3OUcRYWN13STMfKj+X/dP4O2hk7aAEwsFPNyyUpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227634; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=TNrPV/njj1ww4Zzx7l8f1LukNUmhQU9cFxKy80jzWdE=; b=Nhi0kBlXQKLxaQPlFKUYlPsI0xohFb0bZeGj7w6s+fAVTNLE/fU58wC2DiXQ/VuDn7sp571URcPgux4hxN6B4IHEYnUtBzzNizIOSpjPh9/nZ4ZzYpn9iCqnuHMUqbTAORaJ44XtZf4t3MGQrA+zwFnFNcmEL5Rr9iJ3h4sYLFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89402+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227634770515.3805709141387; Fri, 29 Apr 2022 03:20:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id EZcbYY1788612x1fd7KBsxyo; Fri, 29 Apr 2022 03:20:34 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web08.8280.1651227632774984142 for ; Fri, 29 Apr 2022 03:20:33 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-57-xvb3eM1OO_irLgAFjGfH1Q-1; Fri, 29 Apr 2022 06:20:28 -0400 X-MC-Unique: xvb3eM1OO_irLgAFjGfH1Q-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0CED0811E78; Fri, 29 Apr 2022 10:20:27 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 963CB407E1C0; Fri, 29 Apr 2022 10:20:26 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0ED25180078F; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 06/10] MdePkg/CompilerIntrinsicsLib: add SPDX License tags Date: Fri, 29 Apr 2022 12:20:15 +0200 Message-Id: <20220429102019.1375348-7-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: fc5biBJgldsjp6rlq0bRY7MQx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227634; bh=kxLYwVSnWxB/CQ5GqAVo0uJ+mz+MzgV1T0bfvkJrhfs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Nclcc7GbqWYL4zI3lOLy5DSGBVgEQNVbrasTeh+tJK4jnwfxmDnNExG/Jl9eaVa0A5F d6qJMZ94kE6YRRLp33cm5GozWhFbhWOHwBnuhRoPyjsMV6P0bIsJ5ePoinE4tABmAyUyz 9/WruvzriUD6AaaR2HJkEqvIwz2BpUvGVu0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227635880100026 Content-Type: text/plain; charset="utf-8"; x-default="true" It's not an exact match, edk2 expects "BSD-2-Clause-Patent" but http://opensource.org/licenses/bsd-license.php references in comments is "BSD-2-Clause". Guess I need an explicit Intel explicitly agreeing to this even though that is a rather minor change ... Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S | 2 ++ MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S | 2 ++ 16 files changed, 32 insertions(+) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Ia32/Gcc.c index 430139fc5ee0..bb211022c0e4 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/lldiv.c index 792974d7b119..cf2eec2a70b4 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldiv.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/lldvrm.c index a1f87f6af5c3..1fbe11bea751 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/lldvrm.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llmul.c index 61a5c416b912..3f9c54454128 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llmul.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llrem.c index f415fe82dd59..5a73d539a650 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llrem.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llshl.c index f2121a713bd7..665b628b4014 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshl.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/llshr.c index ba60aaafada5..94b91d4ea3c7 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/llshr.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ulldiv.c index 287af8562839..064e0e109b1d 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldiv.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/ulldvrm.c index 378cdec115e5..37946b4edc94 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ulldvrm.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ullrem.c index 49d0064b0f03..a5b65e600415 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullrem.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/ullshr.c index 3c21b45941a1..1cfe781720ac 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ullshr.c @@ -9,6 +9,8 @@ distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php. =20 +SPDX-License-Identifier: BSD-2-Clause-Patent + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/ashrdi3.S index 1c629dc23bf5..f671d419e1f9 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/ashrdi3.S @@ -6,6 +6,8 @@ # distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. # +# SPDX-License-Identifier: BSD-2-Clause-Patent +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Ia32/mulll.S index 333fdfbb9f58..c46d4ab82311 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/mulll.S @@ -6,6 +6,8 @@ # distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. # +# SPDX-License-Identifier: BSD-2-Clause-Patent +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Ia32/shldi3.S index b2a03d98337e..4e5ce03c40e6 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/shldi3.S @@ -6,6 +6,8 @@ # distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. # +# SPDX-License-Identifier: BSD-2-Clause-Patent +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/udivdi3.S index 336d75ee7c30..7dbae9c438a4 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/udivdi3.S @@ -6,6 +6,8 @@ # distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. # +# SPDX-License-Identifier: BSD-2-Clause-Patent +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/umoddi3.S index 9b72e918a4ba..6907eaabccc7 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/umoddi3.S @@ -6,6 +6,8 @@ # distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. # +# SPDX-License-Identifier: BSD-2-Clause-Patent +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89402): https://edk2.groups.io/g/devel/message/89402 Mute This Topic: https://groups.io/mt/90772976/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89403+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89403+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227635; cv=none; d=zohomail.com; s=zohoarc; b=kz8hltsX+A+dmg6+dlItrdSKRoNyRD23TmMxodrRrk8j8UNs36fpjZAboy7hJN5nKnbe+COEQMVI1wWeom3ODEdNMrJoXUU/2ZdzsqAPO2RnzCVMGReONubVL4uf/iadbQATUqRqAe/06O8WhWJPM5RhYyMqHzk1DRclEmhEkdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=veMJTsQ/9flJ6XcqMp5ethJms58OnkXAwrscPpn/unE=; b=ke29F+EOxb/+OpOjIiibTJdcL0JNMkZhoC9/AA70QEIvx5ykmdrEPlbIYTdQLo+nX60hf9RL1ALngqr6BLCSmAPL3/c8I1tA+r+fBD7bX06PXn02IYzbzuuzqtC9ypl2ydIqtQzLFYmTAKW19r5FQ8lw5jvZZBh3oP1F+kAbnbc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89403+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227635549274.6195740531632; Fri, 29 Apr 2022 03:20:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id kbOUYY1788612xX26ypDJA2C; Fri, 29 Apr 2022 03:20:34 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.8302.1651227633075324552 for ; Fri, 29 Apr 2022 03:20:33 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-zQYXmExTP52aDZyi08NZDA-1; Fri, 29 Apr 2022 06:20:29 -0400 X-MC-Unique: zQYXmExTP52aDZyi08NZDA-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0828B1C068C8; Fri, 29 Apr 2022 10:20:27 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BECEAC52C81; Fri, 29 Apr 2022 10:20:26 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 137FA1800855; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 07/10] MdePkg/CompilerIntrinsicsLib: drop include from Gcc.c Date: Fri, 29 Apr 2022 12:20:16 +0200 Message-Id: <20220429102019.1375348-8-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: mPWYSJ2u1kFO9hchW3YvzbFEx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227634; bh=TcHlerPohs53srKKUwDt36Ma7sG9RXATG/zPVEfUWN4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=pOn/Z4ZwL1G77a0U4tYmmHsK56P3b9Sv4/MSWj8np7Ie2TsP67O2pcf0OTnvMC7vCJp uzx01mwM0qcMph+9ji52CwoBu1k3ALy1vb8L5QiGwvWz2DU1nis1Kpjva/tCk1Gj2LiZn EjT8ZjVOEYAVoWT1+8hSCHy/EdqShG0mSG4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227635842100025 Content-Type: text/plain; charset="utf-8"; x-default="true" Does not exist and is not needed. Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Ia32/Gcc.c index bb211022c0e4..d0996d6276bc 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c @@ -17,7 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include #include -#include =20 #include =20 --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89403): https://edk2.groups.io/g/devel/message/89403 Mute This Topic: https://groups.io/mt/90772978/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89405+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89405+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227636; cv=none; d=zohomail.com; s=zohoarc; b=BXpLjWaUjAYhtKYjIy0ca71PJr3RQ/wPDAxuilypq/i7uymJku2ZsFz7U9Das8VNQ60Kbic3rAhp3b9d4T9HbkKXKKu1ZljNvZ1BJuM756jdoDtm7JZEYEHpgUOVJvm8cD+qZs3F4ojy9Tqh2uHGOoIWcynu8OopPkTr/MGpikE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=oL9mVvs15sw6DWRVFi/rLT+KXN832yTi5G+usnASCQA=; b=CZpvaWVgPJtsl3mujnAxKFQ95k4gtehiYnQhrswSyu3MOHocmZsJ+u4KQhkkb1hPP5QtnkNN8AcZJwG+OLp+1JEr7Uh50wJV6Ik2Z/incQ4ZTFtjf2CTyDEPxLEr4ZGrMbjvpZWsvF9a2wo8Lmtdgu88Bivf3zGwDXJCeNQMtPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89405+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16512276359441006.8381517994338; Fri, 29 Apr 2022 03:20:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id r1btYY1788612xyrVx0vftZt; Fri, 29 Apr 2022 03:20:35 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.8486.1651227634115899610 for ; Fri, 29 Apr 2022 03:20:34 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-jjBK5hUwPS-mcWGwfiwS6w-1; Fri, 29 Apr 2022 06:20:30 -0400 X-MC-Unique: jjBK5hUwPS-mcWGwfiwS6w-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DE4D85A5BE; Fri, 29 Apr 2022 10:20:28 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B29EC52C80; Fri, 29 Apr 2022 10:20:28 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 18428180090C; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 08/10] MdePkg/CompilerIntrinsicsLib: drop debug logging from Gcc.c Date: Fri, 29 Apr 2022 12:20:17 +0200 Message-Id: <20220429102019.1375348-9-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: 1fpXT4hlc1o7gqTfVNjKdyU4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227635; bh=PTKQISwK2sMCpes/3SCiYYO/xsuy5UOhnvUew0jUKaI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=N0eW6T5SUSxi4dEwa8jJREjc1Hdpo4qt8HjLGyD7bV39tOJ51VO2VCiWSd+8echBUip iH5wMRHmTVfATbTqRXKRljCyncdI3bMTr2g1A+QUlwWtPQE+VOFc4Vj6kIFHvgRS9d7bq KSB3Rl3Z/ZHlHpscYc6Wdqe5F1XNLNkp/oE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227637863100039 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../Library/CompilerIntrinsicsLib/Ia32/Gcc.c | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Ia32/Gcc.c index d0996d6276bc..3c47bef63c4d 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c @@ -28,7 +28,6 @@ __ashlsi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (int)LShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -38,7 +37,6 @@ __ashldi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long)LShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -48,7 +46,6 @@ __ashlti3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)LShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -60,7 +57,6 @@ __ashrsi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (int)ARShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -70,7 +66,6 @@ __ashrdi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long)ARShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -80,7 +75,6 @@ __ashrti3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)ARShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -92,7 +86,6 @@ __divsi3 ( int Divisor ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (int)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, NULL); } =20 @@ -105,7 +98,6 @@ __divdi3 ( INT64 Quotient; =20 Quotient =3D DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, NULL); - DEBUG ((DEBUG_INFO, "%a: %Ld / %Ld =3D %Ld\n", __func__, Dividend, Divis= or, Quotient)); =20 return Quotient; } @@ -116,7 +108,6 @@ __divti3 ( long long Divisor ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, N= ULL); } =20 @@ -128,7 +119,6 @@ __lshrsi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (int)RShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -138,7 +128,6 @@ __lshrdi3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long)RShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -148,7 +137,6 @@ __lshrti3 ( int Count ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)RShiftU64 ((UINT64)Datum, (UINTN)Count); } =20 @@ -163,7 +151,6 @@ __modsi3 ( INT64 Remainder; =20 (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); - DEBUG ((DEBUG_INFO, "modsi3: %d %% %d =3D %d\n", Dividend, Divisor, (int= )Remainder)); =20 return (int)Remainder; } @@ -177,7 +164,6 @@ __moddi3 ( INT64 Remainder; =20 (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); - DEBUG ((DEBUG_INFO, "moddi3: %Ld %% %Ld =3D %Ld\n", (INT64)Dividend, (IN= T64)Divisor, Remainder)); =20 return Remainder; } @@ -191,7 +177,6 @@ __modti3 ( INT64 Remainder; =20 (void)DivS64x64Remainder ((INT64)Dividend, (INT64)Divisor, &Remainder); - DEBUG ((DEBUG_INFO, "modti3: %Ld %% %Ld =3D %Ld\n", (INT64)Dividend, (IN= T64)Divisor, Remainder)); =20 return (long long)Remainder; } @@ -204,7 +189,6 @@ __multi3 ( long long Multiplier ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)MultS64x64 ((INT64)Multiplicand, (INT64)Multiplier); } =20 @@ -216,7 +200,6 @@ __udivsi3 ( unsigned int Divisor ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (int)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, NULL); } =20 @@ -226,7 +209,6 @@ __udivdi3 ( unsigned long Divisor ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, NULL= ); } =20 @@ -236,7 +218,6 @@ __udivti3 ( unsigned long long Divisor ) { - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); return (long long)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor,= NULL); } =20 @@ -249,7 +230,6 @@ __umodsi3 ( { UINT64 Remainder; =20 - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); =20 return (unsigned int)Remainder; @@ -263,7 +243,6 @@ __umoddi3 ( { UINT64 Remainder; =20 - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); =20 return (unsigned long)Remainder; @@ -277,7 +256,6 @@ __umodti3 ( { UINT64 Remainder; =20 - DEBUG ((DEBUG_INFO, "%a:\n", __func__)); (void)DivU64x64Remainder ((UINT64)Dividend, (UINT64)Divisor, &Remainder); =20 return (unsigned long long)Remainder; --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89405): https://edk2.groups.io/g/devel/message/89405 Mute This Topic: https://groups.io/mt/90772981/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89406+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89406+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227635; cv=none; d=zohomail.com; s=zohoarc; b=MdR1wZGC8+A8TholSlyIMCvo72dxORTgm/UiDdHZB4T562zQSivUGVbA38svO2ZZr5WCMViSUHZ92V4Yx/m8UJjpGHc3V7QmBuRinZSnQTwmsJY8AthcESiRgvL65wrH3JbfQHj8Mz/8yB7fQw68ZkmIsuor+txynspEG2crB3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BYD/xsxVDsxiREkqkJmT7Ow7Ng2wUfsbuk5HTAS1BW4=; b=Q4A0HXOj2p7bOFOQpr+xeV4m7wSX4zBjgniorqG+A/O6Yl1ikcwxWTvECGwaEFfsJwjqLE0tXPn/gq3Igt6419q0YFmiqaYyrY8DmWj/VJ+HodNtYaLPa8wF5UHuTmJCAozEXO3iWqCSEdcLXGTuhLertji7nkyYNp9qYPqqONM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89406+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 165122763594086.70166840712864; Fri, 29 Apr 2022 03:20:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Pj54YY1788612xu6UqsGz4nO; Fri, 29 Apr 2022 03:20:35 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web09.8397.1651227634822021450 for ; Fri, 29 Apr 2022 03:20:35 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-53-dUW9AZh_PHuluCqbv0NE6w-1; Fri, 29 Apr 2022 06:20:30 -0400 X-MC-Unique: dUW9AZh_PHuluCqbv0NE6w-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A66871014A6D; Fri, 29 Apr 2022 10:20:28 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FF52C52C81; Fri, 29 Apr 2022 10:20:28 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1CEB4180092B; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 09/10] MdePkg/CompilerIntrinsicsLib: remove duplicate functions from Gcc.c Date: Fri, 29 Apr 2022 12:20:18 +0200 Message-Id: <20220429102019.1375348-10-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: od3BX3sQMp5u6MJaDQQ3joxix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227635; bh=0plaOBYSH+R81CFqrjkMqTZscIZRN9eRk6NgHJ3BVdc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=bmCTG9krvOA/Ejy01rE6KoPHIktE4lFAjVJdV3RiqBspUFMiwN6VAOHZ+KYlbRwPjMJ YcddWFkYGOdoZtdcv+hWbs85cStJyy+E1KQHC8oorC2FF5rdonj4KRAiX2G1DE+W7KBHx Qe5hXZCAOQsKuMhJBQ2PW9n2W52THW+7VEE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227637881100040 Content-Type: text/plain; charset="utf-8"; x-default="true" Implementations for those functions already exist, so remove them to avoid duplicate symbols. Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../Library/CompilerIntrinsicsLib/Ia32/Gcc.c | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Ia32/Gcc.c index 3c47bef63c4d..7502d5afe65a 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c +++ b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/Gcc.c @@ -20,55 +20,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -// Shift Datum left by Count bits. -// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -int -__ashlsi3 ( - int Datum, - int Count - ) -{ - return (int)LShiftU64 ((UINT64)Datum, (UINTN)Count); -} - -long -__ashldi3 ( - long Datum, - int Count - ) -{ - return (long)LShiftU64 ((UINT64)Datum, (UINTN)Count); -} - -long long -__ashlti3 ( - long long Datum, - int Count - ) -{ - return (long long)LShiftU64 ((UINT64)Datum, (UINTN)Count); -} - // Arithmetically shift Datum right by Count bits. // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -int -__ashrsi3 ( - int Datum, - int Count - ) -{ - return (int)ARShiftU64 ((UINT64)Datum, (UINTN)Count); -} - -long -__ashrdi3 ( - long Datum, - int Count - ) -{ - return (long)ARShiftU64 ((UINT64)Datum, (UINTN)Count); -} - long long __ashrti3 ( long long Datum, --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89406): https://edk2.groups.io/g/devel/message/89406 Mute This Topic: https://groups.io/mt/90772983/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 21:02:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89407+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89407+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651227636; cv=none; d=zohomail.com; s=zohoarc; b=K4iU7mtcUBMOgQTl/INjGMADYnAd0iHsoumL+c4UJ1oynL2hXW7+G+wmaR7o/DflS66uf3BUwDa+rrNjqnaOm9jpoVubhllXq2tJcpM3d+7YCN/lcPAKOgl3EC9BTlhNEAIDBcELorHQQp8ebymrmXkDFaBZGoyiE+fO/JYeOxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651227636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=p0tA5hDi+YrUqDzV4BOoOOXhSghuZS1eRb+te8vfTqc=; b=H/t7lGeyjU+AzK5uRdPIhShDGamY0sPTX0GiWjP9iVPHUBvDXeUlj1mY1kbv+VkReIp+Q5W+XNJ5lR/HR2/GaMe7q0CuFwG2btIhzUUtqZwI+USzJAIZBuNM0byLP6NkYdNOk0xbYUJ3trs/pN4GdDcj1LrnJ8TG420sjr9wdQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89407+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651227636898608.2159904992245; Fri, 29 Apr 2022 03:20:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OEWkYY1788612xkkrk4uH406; Fri, 29 Apr 2022 03:20:36 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.8305.1651227635801738199 for ; Fri, 29 Apr 2022 03:20:36 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-rcW8VubhP4CnoBdWxnYpAQ-1; Fri, 29 Apr 2022 06:20:32 -0400 X-MC-Unique: rcW8VubhP4CnoBdWxnYpAQ-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 208E885A5BC; Fri, 29 Apr 2022 10:20:30 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D687E40CF8EA; Fri, 29 Apr 2022 10:20:29 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 21D021800936; Fri, 29 Apr 2022 12:20:20 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Erdem Aktas , Maciej Rabeda , Abner Chang , Peter Grehan , Gerd Hoffmann , Yuwei Chen , Jiaxin Wu , Siyuan Fu , Sean Brogan , Anthony Perard , Benjamin You , Guomin Jiang , Leif Lindholm , Rebecca Cran , Wei6 Xu , Nickle Wang , Xiaoyu Lu , Zhichao Gao , kilian_kegel@hotmail.com, Liming Gao , Jordan Justen , Sami Mujawar , Andrew Fish , Sami Mujawar , Oliver Steffen , Alexei Fedorov , Guo Dong , Brijesh Singh , Jian J Wang , Supreeth Venkatesh , Min Xu , Bret Barkelew , Maurice Ma , Pawel Polawski , Daniel Schaefer , Bob Feng , James Bottomley , Jiewen Yao , Ray Ni , Julien Grall , Michael D Kinney , Sebastien Boeuf , Zhiguang Liu , Tom Lendacky Subject: [edk2-devel] [PATCH v3 10/10] MdePkg/CompilerIntrinsicsLib: add new sources to CompilerIntrinsicsLib.inf Date: Fri, 29 Apr 2022 12:20:19 +0200 Message-Id: <20220429102019.1375348-11-kraxel@redhat.com> In-Reply-To: <20220429102019.1375348-1-kraxel@redhat.com> References: <20220429102019.1375348-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: 4owcZJhOuYXQncPcv2nRGLXDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651227636; bh=upAKGUzkHAkvEoctoYY+3OV+S2RQHIzU9XDuSyp5wIY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EY3dl6zEleBtM73lm15oT9y58Ss+yxn3d2G7diRdlYnek0NUFJjPEjpeD0THJ2NQINu 9t6/aOyGt77IerAmQ/ArATYFcP7P5QNAnpBfVOnJjHboR516BhfRmZTmLlYiQLD0xUETS T3vuzQppSFjNV1M4rbcURBmnW3S8GzOUnLs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651227637884100041 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../CompilerIntrinsicsLib.inf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf= b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index b5e11373c509..7ba5ca8c8f2b 100644 --- a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -98,6 +98,22 @@ [Sources.IA32] Ia32/MathLShiftS64.nasm | GCC Ia32/MathRShiftU64.nasm | GCC =20 + Ia32/ulldiv.c | MSFT # __aulldiv + Ia32/ullrem.c | MSFT # __aullrem + Ia32/lldiv.c | MSFT # __alldiv + Ia32/llrem.c | MSFT # __allrem + Ia32/lldvrm.c | MSFT # __alldvrm + Ia32/ulldvrm.c | MSFT # __aulldvrm + + Ia32/ulldiv.c | INTEL + Ia32/ullrem.c | INTEL + Ia32/lldiv.c | INTEL + Ia32/llrem.c | INTEL + Ia32/lldvrm.c | INTEL + Ia32/ulldvrm.c | INTEL + + Ia32/Gcc.c | GCC + [Packages] MdePkg/MdePkg.dec =20 --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89407): https://edk2.groups.io/g/devel/message/89407 Mute This Topic: https://groups.io/mt/90772985/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-