From mboxrd@z Thu Jan 1 00:00:00 1970 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.web12.6657.1654259212607834846 for ; Fri, 03 Jun 2022 05:26:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M+reOiPW; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654259211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ot9iCZj6HbsIHma4Ha99CLQRzPd3rmAhG8iAYwJw+sk=; b=M+reOiPWpJLnGJ89CboRFRz/A2hIqCd14+mN+M4mXqbmDnNLvgduhhvz4MMWdpXbk5/hUx 2ncQt6TAVrKRhULKan3D2EFGH4k6CjWAvYQHeGguLXdFZKTP5lAUU6ek9ezZraMFscdGXB +GKyteRdcJ2lSu8oYYf40sD84O2ru+Y= 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-637-oPg_ehXuOCeVC7ues_FI3w-1; Fri, 03 Jun 2022 08:26:46 -0400 X-MC-Unique: oPg_ehXuOCeVC7ues_FI3w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82B9B3C1014B; Fri, 3 Jun 2022 12:26:44 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17F5E1410F36; Fri, 3 Jun 2022 12:26:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0530618009D2; Fri, 3 Jun 2022 14:26:39 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Jiaxin Wu , Sean Brogan , Anthony Perard , Leif Lindholm , Zhiguang Liu , Xiaoyu Lu , Pawel Polawski , Sami Mujawar , Maciej Rabeda , Bob Feng , Jiewen Yao , Andrew Fish , Bret Barkelew , Alexei Fedorov , Guo Dong , Gerd Hoffmann , kilian_kegel@hotmail.com, Maurice Ma , Siyuan Fu , Abner Chang , Zhichao Gao , Wei6 Xu , Supreeth Venkatesh , Julien Grall , Daniel Schaefer , Ard Biesheuvel , Guomin Jiang , Jordan Justen , Oliver Steffen , Sebastien Boeuf , Benjamin You , Min Xu , Ray Ni , Rebecca Cran , Nickle Wang , Michael D Kinney , Tom Lendacky , Sami Mujawar , Peter Grehan , Erdem Aktas , Brijesh Singh , James Bottomley , Yuwei Chen , Liming Gao Subject: [PATCH v4 3/9] MdePkg/CompilerIntrinsicsLib: move size_t typedef to header file Date: Fri, 3 Jun 2022 14:26:32 +0200 Message-Id: <20220603122638.1547060-4-kraxel@redhat.com> In-Reply-To: <20220603122638.1547060-1-kraxel@redhat.com> References: <20220603122638.1547060-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Signed-off-by: Gerd Hoffmann Acked-by: Liming Gao --- .../{memset_ms.c => 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 => types_ms.h} (52%) diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Library/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 = s; - - while (n-- != 0) { - *d++ = (unsigned char)c; - } - - return s; -} diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Library/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 @@ // // ------------------------------------------------------------------------------ -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" void * memcpy ( diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Library/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 @@ // // ------------------------------------------------------------------------------ -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" void * memmove ( diff --git a/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Library/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 @@ // // ------------------------------------------------------------------------------ -#if defined (_M_ARM64) || defined (_M_X64) -typedef unsigned __int64 size_t; -#else -typedef unsigned __int32 size_t; -#endif +#include "types_ms.h" void * memset ( -- 2.36.1