Reviewed-by: Eric Dong <eric.d...@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Shenglei Zhang
> Sent: Tuesday, March 19, 2019 2:59 PM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Gao, Liming
> <liming....@intel.com>
> Subject: [edk2] [PATCH v2 02/10] UefiCpuPkg/BaseUefiCpuLib: Remove .S
> files for IA32 and X64 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: Michael D Kinney <michael.d.kin...@intel.com>
> Cc: Liming Gao <liming....@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com>
> ---
>  .../Library/BaseUefiCpuLib/BaseUefiCpuLib.inf |  2 -
>  .../BaseUefiCpuLib/Ia32/InitializeFpu.S       | 73 -------------------
>  .../BaseUefiCpuLib/X64/InitializeFpu.S        | 57 ---------------
>  3 files changed, 132 deletions(-)
>  delete mode 100644
> UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
>  delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
> 
> diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> index 5614452a88..2e9756e50e 100644
> --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> +++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> @@ -31,11 +31,9 @@
> 
>  [Sources.IA32]
>    Ia32/InitializeFpu.nasm
> -  Ia32/InitializeFpu.S
> 
>  [Sources.X64]
>    X64/InitializeFpu.nasm
> -  X64/InitializeFpu.S
> 
>  [Packages]
>    MdePkg/MdePkg.dec
> diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
> b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
> deleted file mode 100644
> index 0a1a9198f6..0000000000
> --- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -#------------------------------------------------------------------------------
> -#*
> -#*   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
> -#*   This program and the accompanying materials
> -#*   are licensed and made available 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 IMPLIED.
> -#*
> -#*
> -#------------------------------------------------------------------------------
> -
> -#
> -# Float control word initial value:
> -# all exceptions masked, double-precision, round-to-nearest -#
> -ASM_PFX(mFpuControlWord): .word     0x027F
> -#
> -# Multimedia-extensions control word:
> -# all exceptions masked, round-to-nearest, flush to zero for masked
> underflow -#
> -ASM_PFX(mMmxControlWord): .long     0x01F80
> -
> -#
> -# Initializes floating point units for requirement of UEFI specification.
> -#
> -# This function initializes floating-point control word to 0x027F (all
> exceptions -# masked,double-precision, round-to-nearest) and multimedia-
> extensions control word -# (if supported) to 0x1F80 (all exceptions masked,
> round-to-nearest, flush to zero -# for masked underflow).
> -#
> -ASM_GLOBAL ASM_PFX(InitializeFloatingPointUnits)
> -ASM_PFX(InitializeFloatingPointUnits):
> -
> -    pushl   %ebx
> -
> -    #
> -    # Initialize floating point units
> -    #
> -    finit
> -    fldcw   ASM_PFX(mFpuControlWord)
> -
> -    #
> -    # Use CpuId instructuion (CPUID.01H:EDX.SSE[bit 25] = 1) to test
> -    # whether the processor supports SSE instruction.
> -    #
> -    movl    $1,  %eax
> -    cpuid
> -    btl     $25, %edx
> -    jnc     Done
> -
> -    #
> -    # Set OSFXSR bit 9 in CR4
> -    #
> -    movl    %cr4, %eax
> -    or      $0x200, %eax
> -    movl    %eax, %cr4
> -
> -    #
> -    # The processor should support SSE instruction and we can use
> -    # ldmxcsr instruction
> -    #
> -    ldmxcsr ASM_PFX(mMmxControlWord)
> -
> -Done:
> -    popl    %ebx
> -
> -    ret
> -
> -#END
> -
> diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
> b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
> deleted file mode 100644
> index f0b0d3e264..0000000000
> --- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -#------------------------------------------------------------------------------
> -#*
> -#*   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
> -#*   This program and the accompanying materials
> -#*   are licensed and made available 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 IMPLIED.
> -#*
> -#*
> -#------------------------------------------------------------------------------
> -
> -#
> -# Initializes floating point units for requirement of UEFI specification.
> -#
> -# This function initializes floating-point control word to 0x037F (all
> exceptions -# masked,double-extended-precision, round-to-nearest) and
> multimedia-extensions control word -# (if supported) to 0x1F80 (all
> exceptions masked, round-to-nearest, flush to zero -# for masked
> underflow).
> -#
> -ASM_GLOBAL ASM_PFX(InitializeFloatingPointUnits)
> -ASM_PFX(InitializeFloatingPointUnits):
> -
> -    #
> -    # Initialize floating point units
> -    #
> -    finit
> -
> -    #
> -    # Float control word initial value:
> -    # all exceptions masked, double-precision, round-to-nearest
> -    #
> -    pushq   $0x037F
> -    lea     (%rsp), %rax
> -    fldcw   (%rax)
> -    popq    %rax
> -
> -    #
> -    # Set OSFXSR bit 9 in CR4
> -    #
> -    movq    %cr4, %rax
> -    or      $0x200, %rax
> -    movq    %rax, %cr4
> -
> -    #
> -    # Multimedia-extensions control word:
> -    # all exceptions masked, round-to-nearest, flush to zero for masked
> underflow
> -    #
> -    pushq   $0x01F80
> -    lea     (%rsp), %rax
> -    ldmxcsr (%rax)
> -    popq    %rax
> -
> -    ret
> -
> --
> 2.18.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to