CryptoPkg/IntrinsicLib: Remove .S files for IA32 arch

.nasm file has been added for X86 arch. .S assembly code
is not required any more.
https://bugzilla.tianocore.org/show_bug.cgi?id=1594

Cc: Ting Ye <ting.ye@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.S b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.S
deleted file mode 100644 (file)
index 7031a59..0000000
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.S
+++ /dev/null
@@ -1,62 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php.\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-# Module Name:\r
-#\r
-#   MathLShiftS64.S\r
-#\r
-# Abstract:\r
-#\r
-#   64-bit Math Worker Function.\r
-#   Shifts a 64-bit signed value left by a certain number of bits.\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-    .686:\r
-    .code:\r
-\r
-ASM_GLOBAL ASM_PFX(__ashldi3)\r
-\r
-#------------------------------------------------------------------------------\r
-#\r
-# void __cdecl __ashldi3 (void)\r
-#\r
-#------------------------------------------------------------------------------\r
-ASM_PFX(__ashldi3):\r
-    #\r
-    # Handle shifting of 64 or more bits (return 0)\r
-    #\r
-    cmpb    $64, %cl\r
-    jae     ReturnZero\r
-\r
-    #\r
-    # Handle shifting of between 0 and 31 bits\r
-    #\r
-    cmpb    $32, %cl\r
-    jae     More32\r
-    shld    %cl, %eax, %edx\r
-    shl     %cl, %eax\r
-    ret\r
-\r
-    #\r
-    # Handle shifting of between 32 and 63 bits\r
-    #\r
-More32:\r
-    movl    %eax, %edx\r
-    xor     %eax, %eax\r
-    and     $31, %cl\r
-    shl     %cl, %edx\r
-    ret\r
-\r
-ReturnZero:\r
-    xor     %eax, %eax\r
-    xor     %edx, %edx\r
-    ret\r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.S b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.S
deleted file mode 100644 (file)
index 24142b0..0000000
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.S
+++ /dev/null
@@ -1,66 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php.\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-# Module Name:\r
-#\r
-#   MathRShiftU64.S\r
-#\r
-# Abstract:\r
-#\r
-#   64-bit Math Worker Function.\r
-#   Shifts a 64-bit unsigned value right by a certain number of bits.\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-    .686:\r
-    .code:\r
-\r
-ASM_GLOBAL ASM_PFX(__ashrdi3)\r
-\r
-#------------------------------------------------------------------------------\r
-#\r
-# void __cdecl __ashrdi3 (void)\r
-#\r
-#------------------------------------------------------------------------------\r
-ASM_PFX(__ashrdi3):\r
-    #\r
-    # Checking: Only handle 64bit shifting or more\r
-    #\r
-    cmpb    $64, %cl\r
-    jae     _Exit\r
-\r
-    #\r
-    # Handle shifting between 0 and 31 bits\r
-    #\r
-    cmpb    $32, %cl\r
-    jae     More32\r
-    shrd    %cl, %edx, %eax\r
-    shr     %cl, %edx\r
-    ret\r
-\r
-    #\r
-    # Handle shifting of 32-63 bits\r
-    #\r
-More32:\r
-    movl    %edx, %eax\r
-    xor     %edx, %edx\r
-    and     $31, %cl\r
-    shr     %cl, %eax\r
-    ret\r
-\r
-    #\r
-    # Invalid number (less then 32bits), return 0\r
-    #\r
-_Exit:\r
-    xor     %eax, %eax\r
-    xor     %edx, %edx\r
-    ret\r

diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
index a91c850013a25ec281026b764f583cedf11f7a30..9704b9ea7d8e359f83e5d601716c92d1c61bc28c 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -39,8 +39,6 @@
   Ia32/MathLShiftS64.c      | INTEL\r
   Ia32/MathRShiftU64.c      | INTEL\r
 \r
-  Ia32/MathLShiftS64.S      | GCC\r
-  Ia32/MathRShiftU64.S      | GCC\r
   Ia32/MathLShiftS64.nasm   | GCC\r
   Ia32/MathRShiftU64.nasm   | GCC\r
 \r