UefiCpuPkg/CpuMpPei: Update files format to DOS

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18168 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 571 insertions, 571 deletions

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc b/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
index 50ec8c9cfc..fc637cc70f 100644
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
@@ -1,40 +1,40 @@
-;------------------------------------------------------------------------------ ;
-; Copyright (c) 2015, 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.
-;
-; Module Name:
-;
-;   MpEqu.inc
-;
-; Abstract:
-;
-;   This is the equates file for Multiple Processor support
-;
-;-------------------------------------------------------------------------------
-
-PROTECT_MODE_CS               equ        10h
-PROTECT_MODE_DS               equ        18h
-
-VacantFlag                    equ        00h
-NotVacantFlag                 equ        0ffh
-
-CPU_SWITCH_STATE_IDLE         equ        0
-CPU_SWITCH_STATE_STORED       equ        1
-CPU_SWITCH_STATE_LOADED       equ        2
-
-LockLocation                  equ        (RendezvousFunnelProcEnd - RendezvousFunnelProcStart)
-StackStartAddressLocation     equ        LockLocation + 04h
-StackSizeLocation             equ        LockLocation + 08h
-ApProcedureLocation           equ        LockLocation + 0Ch
-GdtrLocation                  equ        LockLocation + 10h
-IdtrLocation                  equ        LockLocation + 16h
-BufferStartLocation           equ        LockLocation + 1Ch
-PmodeOffsetLocation           equ        LockLocation + 20h
-NumApsExecutingLoction        equ        LockLocation + 24h
-
+;------------------------------------------------------------------------------ ;

+; Copyright (c) 2015, 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.

+;

+; Module Name:

+;

+;   MpEqu.inc

+;

+; Abstract:

+;

+;   This is the equates file for Multiple Processor support

+;

+;-------------------------------------------------------------------------------

+

+PROTECT_MODE_CS               equ        10h

+PROTECT_MODE_DS               equ        18h

+

+VacantFlag                    equ        00h

+NotVacantFlag                 equ        0ffh

+

+CPU_SWITCH_STATE_IDLE         equ        0

+CPU_SWITCH_STATE_STORED       equ        1

+CPU_SWITCH_STATE_LOADED       equ        2

+

+LockLocation                  equ        (RendezvousFunnelProcEnd - RendezvousFunnelProcStart)

+StackStartAddressLocation     equ        LockLocation + 04h

+StackSizeLocation             equ        LockLocation + 08h

+ApProcedureLocation           equ        LockLocation + 0Ch

+GdtrLocation                  equ        LockLocation + 10h

+IdtrLocation                  equ        LockLocation + 16h

+BufferStartLocation           equ        LockLocation + 1Ch

+PmodeOffsetLocation           equ        LockLocation + 20h

+NumApsExecutingLoction        equ        LockLocation + 24h

+

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
index 060f4670e0..eb23a16917 100644
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
@@ -1,276 +1,276 @@
-;------------------------------------------------------------------------------ ;
-; Copyright (c) 2015, 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.
-;
-; Module Name:
-;
-;   MpFuncs32.asm
-;
-; Abstract:
-;
-;   This is the assembly code for MP support
-;
-;-------------------------------------------------------------------------------
-
-.686p
-.model  flat
-
-include  MpEqu.inc
-InitializeFloatingPointUnits PROTO C
-
-.code
-
-;-------------------------------------------------------------------------------------
-;RendezvousFunnelProc  procedure follows. All APs execute their procedure. This
-;procedure serializes all the AP processors through an Init sequence. It must be
-;noted that APs arrive here very raw...ie: real mode, no stack.
-;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC
-;IS IN MACHINE CODE.
-;-------------------------------------------------------------------------------------
-RendezvousFunnelProc   PROC  PUBLIC
-RendezvousFunnelProcStart::
-; At this point CS = 0x(vv00) and ip= 0x0.
-; Save BIST information to ebp firstly
-    db 66h,  08bh, 0e8h                 ; mov        ebp, eax    ; save BIST information
-
-    db 8ch,0c8h                         ; mov        ax,cs
-    db 8eh,0d8h                         ; mov        ds,ax
-    db 8eh,0c0h                         ; mov        es,ax
-    db 8eh,0d0h                         ; mov        ss,ax
-    db 33h,0c0h                         ; xor        ax,ax
-    db 8eh,0e0h                         ; mov        fs,ax
-    db 8eh,0e8h                         ; mov        gs,ax
-
-    db 0BEh                             ; opcode of mov si, mem16
-    dw BufferStartLocation              ; mov        si, BufferStartLocation
-    db 66h,  8Bh, 1Ch                   ; mov        ebx,dword ptr [si]
-
-    db 0BFh                             ; opcode of mov di, mem16
-    dw PmodeOffsetLocation              ; mov        di, PmodeOffsetLocation
-    db 66h,  8Bh, 05h                   ; mov        eax,dword ptr [di]
-    db 8Bh,  0F8h                       ; mov        di, ax
-    db 83h,  0EFh,06h                   ; sub        di, 06h
-    db 66h,  03h, 0C3h                  ; add        eax, ebx
-    db 66h,  89h, 05h                   ; mov        dword ptr [di],eax
-
-    db 0BEh                             ; opcode of mov si, mem16
-    dw GdtrLocation                     ; mov        si, GdtrLocation
-    db 66h                              ; db         66h
-    db 2Eh,  0Fh, 01h, 14h              ; lgdt       fword ptr cs:[si]
-
-    db 0BEh
-    dw IdtrLocation                     ; mov        si, IdtrLocation
-    db 66h                              ; db         66h
-    db 2Eh,0Fh, 01h, 1Ch                ; lidt       fword ptr cs:[si]
-
-    db 33h,  0C0h                       ; xor        ax,  ax
-    db 8Eh,  0D8h                       ; mov        ds,  ax
-
-    db 0Fh,  20h, 0C0h                  ; mov        eax, cr0            ;Get control register 0
-    db 66h,  83h, 0C8h, 03h             ; or         eax, 000000003h     ;Set PE bit (bit #0) & MP
-    db 0Fh,  22h, 0C0h                  ; mov        cr0, eax
-
-    db 66h,  67h, 0EAh                  ; far jump
-    dd 0h                               ; 32-bit offset
-    dw PROTECT_MODE_CS                  ; 16-bit selector
-
-Flat32Start::                           ; protected mode entry point
-    mov        ax, PROTECT_MODE_DS
-    mov        ds, ax
-    mov        es, ax
-    mov        fs, ax
-    mov        gs, ax
-    mov        ss, ax
-
-    mov        esi, ebx
-    mov        edi, esi
-    add        edi, LockLocation
-    mov        eax, NotVacantFlag
-
-TestLock:
-    xchg       dword ptr [edi], eax
-    cmp        eax, NotVacantFlag
-    jz         TestLock
-
-    mov        edi, esi
-    add        edi, NumApsExecutingLoction
-    inc        dword ptr [edi]
-    mov        ebx, dword ptr [edi]
-
-ProgramStack:
-    mov        edi, esi
-    add        edi, StackSizeLocation
-    mov        eax, dword ptr [edi]
-    mov        edi, esi
-    add        edi, StackStartAddressLocation
-    add        eax, dword ptr [edi]
-    mov        esp, eax
-    mov        dword ptr [edi], eax
-
-Releaselock:
-    mov        eax, VacantFlag
-    mov        edi, esi
-    add        edi, LockLocation
-    xchg       dword ptr [edi], eax
-
-CProcedureInvoke:
-    push       ebp               ; push BIST data at top of AP stack
-    xor        ebp, ebp          ; clear ebp for call stack trace
-    push       ebp
-    mov        ebp, esp
-
-    mov        eax, InitializeFloatingPointUnits
-    call       eax               ; Call assembly function to initialize FPU per UEFI spec
-
-    push       ebx               ; Push NumApsExecuting
-    mov        eax, esi
-    add        eax, LockLocation
-    push       eax               ; push address of exchange info data buffer
-
-    mov        edi, esi
-    add        edi, ApProcedureLocation
-    mov        eax, dword ptr [edi]
-
-    call       eax               ; invoke C function
-
-    jmp        $                  ; never reach here
-
-RendezvousFunnelProc   ENDP
-RendezvousFunnelProcEnd::
-
-AsmCliHltLoop PROC near C PUBLIC
-    cli
-    hlt
-    jmp        $-2
-AsmCliHltLoop ENDP
-
-;-------------------------------------------------------------------------------------
-;  AsmGetAddressMap (&AddressMap);
-;-------------------------------------------------------------------------------------
-AsmGetAddressMap   PROC  near C  PUBLIC
-    pushad
-    mov        ebp,esp
-
-    mov        ebx, dword ptr [ebp+24h]
-    mov        dword ptr [ebx], RendezvousFunnelProcStart
-    mov        dword ptr [ebx +  4h], Flat32Start - RendezvousFunnelProcStart
-    mov        dword ptr [ebx +  8h], 0
-    mov        dword ptr [ebx + 0ch], RendezvousFunnelProcEnd - RendezvousFunnelProcStart
-
-    popad
-    ret
-AsmGetAddressMap   ENDP
-
-PAUSE32   MACRO
-    DB      0F3h
-    DB      090h
-    ENDM
-
-;-------------------------------------------------------------------------------------
-;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is
-;about to become an AP. It switches it'stack with the current AP.
-;AsmExchangeRole (IN   CPU_EXCHANGE_INFO    *MyInfo, IN   CPU_EXCHANGE_INFO    *OthersInfo);
-;-------------------------------------------------------------------------------------
-AsmExchangeRole   PROC  near C  PUBLIC
-    ; DO NOT call other functions in this function, since 2 CPU may use 1 stack
-    ; at the same time. If 1 CPU try to call a function, stack will be corrupted.
-    pushad
-    mov        ebp,esp
-
-    ; esi contains MyInfo pointer
-    mov        esi, dword ptr [ebp+24h]
-
-    ; edi contains OthersInfo pointer
-    mov        edi, dword ptr [ebp+28h]
-
-    ;Store EFLAGS, GDTR and IDTR register to stack
-    pushfd
-    mov        eax, cr4
-    push       eax       ; push cr4 firstly
-    mov        eax, cr0
-    push       eax
-
-    sgdt       fword ptr [esi+8]
-    sidt       fword ptr [esi+14]
-
-    ; Store the its StackPointer
-    mov        dword ptr [esi+4],esp
-
-    ; update its switch state to STORED
-    mov        byte ptr [esi], CPU_SWITCH_STATE_STORED
-
-WaitForOtherStored:
-    ; wait until the other CPU finish storing its state
-    cmp        byte ptr [edi], CPU_SWITCH_STATE_STORED
-    jz         OtherStored
-    PAUSE32
-    jmp        WaitForOtherStored
-
-OtherStored:
-    ; Since another CPU already stored its state, load them
-    ; load GDTR value
-    lgdt       fword ptr [edi+8]
-
-    ; load IDTR value
-    lidt       fword ptr [edi+14]
-
-    ; load its future StackPointer
-    mov        esp, dword ptr [edi+4]
-
-    ; update the other CPU's switch state to LOADED
-    mov        byte ptr [edi], CPU_SWITCH_STATE_LOADED
-
-WaitForOtherLoaded:
-    ; wait until the other CPU finish loading new state,
-    ; otherwise the data in stack may corrupt
-    cmp        byte ptr [esi], CPU_SWITCH_STATE_LOADED
-    jz         OtherLoaded
-    PAUSE32
-    jmp        WaitForOtherLoaded
-
-OtherLoaded:
-    ; since the other CPU already get the data it want, leave this procedure
-    pop        eax
-    mov        cr0, eax
-    pop        eax
-    mov        cr4, eax
-    popfd
-
-    popad
-    ret
-AsmExchangeRole   ENDP
-
-AsmInitializeGdt   PROC  near C  PUBLIC
-  push         ebp
-  mov          ebp, esp
-  pushad
-  mov          edi, [ebp + 8]      ; Load GDT register
-
-  mov          ax,cs               ; Get the selector data from our code image
-  mov          es,ax
-  lgdt         FWORD PTR es:[edi]  ; and update the GDTR
-
-  push         PROTECT_MODE_CS
-  lea          eax, SetCodeSelectorFarJump
-  push         eax
-  retf
-SetCodeSelectorFarJump:
-  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too
-  mov          ds, ax
-  mov          es, ax
-  mov          fs, ax
-  mov          gs, ax
-  mov          ss, ax
-
-  popad
-  pop          ebp
-  ret
-AsmInitializeGdt  ENDP
-
-END
+;------------------------------------------------------------------------------ ;

+; Copyright (c) 2015, 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.

+;

+; Module Name:

+;

+;   MpFuncs32.asm

+;

+; Abstract:

+;

+;   This is the assembly code for MP support

+;

+;-------------------------------------------------------------------------------

+

+.686p

+.model  flat

+

+include  MpEqu.inc

+InitializeFloatingPointUnits PROTO C

+

+.code

+

+;-------------------------------------------------------------------------------------

+;RendezvousFunnelProc  procedure follows. All APs execute their procedure. This

+;procedure serializes all the AP processors through an Init sequence. It must be

+;noted that APs arrive here very raw...ie: real mode, no stack.

+;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC

+;IS IN MACHINE CODE.

+;-------------------------------------------------------------------------------------

+RendezvousFunnelProc   PROC  PUBLIC

+RendezvousFunnelProcStart::

+; At this point CS = 0x(vv00) and ip= 0x0.

+; Save BIST information to ebp firstly

+    db 66h,  08bh, 0e8h                 ; mov        ebp, eax    ; save BIST information

+

+    db 8ch,0c8h                         ; mov        ax,cs

+    db 8eh,0d8h                         ; mov        ds,ax

+    db 8eh,0c0h                         ; mov        es,ax

+    db 8eh,0d0h                         ; mov        ss,ax

+    db 33h,0c0h                         ; xor        ax,ax

+    db 8eh,0e0h                         ; mov        fs,ax

+    db 8eh,0e8h                         ; mov        gs,ax

+

+    db 0BEh                             ; opcode of mov si, mem16

+    dw BufferStartLocation              ; mov        si, BufferStartLocation

+    db 66h,  8Bh, 1Ch                   ; mov        ebx,dword ptr [si]

+

+    db 0BFh                             ; opcode of mov di, mem16

+    dw PmodeOffsetLocation              ; mov        di, PmodeOffsetLocation

+    db 66h,  8Bh, 05h                   ; mov        eax,dword ptr [di]

+    db 8Bh,  0F8h                       ; mov        di, ax

+    db 83h,  0EFh,06h                   ; sub        di, 06h

+    db 66h,  03h, 0C3h                  ; add        eax, ebx

+    db 66h,  89h, 05h                   ; mov        dword ptr [di],eax

+

+    db 0BEh                             ; opcode of mov si, mem16

+    dw GdtrLocation                     ; mov        si, GdtrLocation

+    db 66h                              ; db         66h

+    db 2Eh,  0Fh, 01h, 14h              ; lgdt       fword ptr cs:[si]

+

+    db 0BEh

+    dw IdtrLocation                     ; mov        si, IdtrLocation

+    db 66h                              ; db         66h

+    db 2Eh,0Fh, 01h, 1Ch                ; lidt       fword ptr cs:[si]

+

+    db 33h,  0C0h                       ; xor        ax,  ax

+    db 8Eh,  0D8h                       ; mov        ds,  ax

+

+    db 0Fh,  20h, 0C0h                  ; mov        eax, cr0            ;Get control register 0

+    db 66h,  83h, 0C8h, 03h             ; or         eax, 000000003h     ;Set PE bit (bit #0) & MP

+    db 0Fh,  22h, 0C0h                  ; mov        cr0, eax

+

+    db 66h,  67h, 0EAh                  ; far jump

+    dd 0h                               ; 32-bit offset

+    dw PROTECT_MODE_CS                  ; 16-bit selector

+

+Flat32Start::                           ; protected mode entry point

+    mov        ax, PROTECT_MODE_DS

+    mov        ds, ax

+    mov        es, ax

+    mov        fs, ax

+    mov        gs, ax

+    mov        ss, ax

+

+    mov        esi, ebx

+    mov        edi, esi

+    add        edi, LockLocation

+    mov        eax, NotVacantFlag

+

+TestLock:

+    xchg       dword ptr [edi], eax

+    cmp        eax, NotVacantFlag

+    jz         TestLock

+

+    mov        edi, esi

+    add        edi, NumApsExecutingLoction

+    inc        dword ptr [edi]

+    mov        ebx, dword ptr [edi]

+

+ProgramStack:

+    mov        edi, esi

+    add        edi, StackSizeLocation

+    mov        eax, dword ptr [edi]

+    mov        edi, esi

+    add        edi, StackStartAddressLocation

+    add        eax, dword ptr [edi]

+    mov        esp, eax

+    mov        dword ptr [edi], eax

+

+Releaselock:

+    mov        eax, VacantFlag

+    mov        edi, esi

+    add        edi, LockLocation

+    xchg       dword ptr [edi], eax

+

+CProcedureInvoke:

+    push       ebp               ; push BIST data at top of AP stack

+    xor        ebp, ebp          ; clear ebp for call stack trace

+    push       ebp

+    mov        ebp, esp

+

+    mov        eax, InitializeFloatingPointUnits

+    call       eax               ; Call assembly function to initialize FPU per UEFI spec

+

+    push       ebx               ; Push NumApsExecuting

+    mov        eax, esi

+    add        eax, LockLocation

+    push       eax               ; push address of exchange info data buffer

+

+    mov        edi, esi

+    add        edi, ApProcedureLocation

+    mov        eax, dword ptr [edi]

+

+    call       eax               ; invoke C function

+

+    jmp        $                  ; never reach here

+

+RendezvousFunnelProc   ENDP

+RendezvousFunnelProcEnd::

+

+AsmCliHltLoop PROC near C PUBLIC

+    cli

+    hlt

+    jmp        $-2

+AsmCliHltLoop ENDP

+

+;-------------------------------------------------------------------------------------

+;  AsmGetAddressMap (&AddressMap);

+;-------------------------------------------------------------------------------------

+AsmGetAddressMap   PROC  near C  PUBLIC

+    pushad

+    mov        ebp,esp

+

+    mov        ebx, dword ptr [ebp+24h]

+    mov        dword ptr [ebx], RendezvousFunnelProcStart

+    mov        dword ptr [ebx +  4h], Flat32Start - RendezvousFunnelProcStart

+    mov        dword ptr [ebx +  8h], 0

+    mov        dword ptr [ebx + 0ch], RendezvousFunnelProcEnd - RendezvousFunnelProcStart

+

+    popad

+    ret

+AsmGetAddressMap   ENDP

+

+PAUSE32   MACRO

+    DB      0F3h

+    DB      090h

+    ENDM

+

+;-------------------------------------------------------------------------------------

+;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is

+;about to become an AP. It switches it'stack with the current AP.

+;AsmExchangeRole (IN   CPU_EXCHANGE_INFO    *MyInfo, IN   CPU_EXCHANGE_INFO    *OthersInfo);

+;-------------------------------------------------------------------------------------

+AsmExchangeRole   PROC  near C  PUBLIC

+    ; DO NOT call other functions in this function, since 2 CPU may use 1 stack

+    ; at the same time. If 1 CPU try to call a function, stack will be corrupted.

+    pushad

+    mov        ebp,esp

+

+    ; esi contains MyInfo pointer

+    mov        esi, dword ptr [ebp+24h]

+

+    ; edi contains OthersInfo pointer

+    mov        edi, dword ptr [ebp+28h]

+

+    ;Store EFLAGS, GDTR and IDTR register to stack

+    pushfd

+    mov        eax, cr4

+    push       eax       ; push cr4 firstly

+    mov        eax, cr0

+    push       eax

+

+    sgdt       fword ptr [esi+8]

+    sidt       fword ptr [esi+14]

+

+    ; Store the its StackPointer

+    mov        dword ptr [esi+4],esp

+

+    ; update its switch state to STORED

+    mov        byte ptr [esi], CPU_SWITCH_STATE_STORED

+

+WaitForOtherStored:

+    ; wait until the other CPU finish storing its state

+    cmp        byte ptr [edi], CPU_SWITCH_STATE_STORED

+    jz         OtherStored

+    PAUSE32

+    jmp        WaitForOtherStored

+

+OtherStored:

+    ; Since another CPU already stored its state, load them

+    ; load GDTR value

+    lgdt       fword ptr [edi+8]

+

+    ; load IDTR value

+    lidt       fword ptr [edi+14]

+

+    ; load its future StackPointer

+    mov        esp, dword ptr [edi+4]

+

+    ; update the other CPU's switch state to LOADED

+    mov        byte ptr [edi], CPU_SWITCH_STATE_LOADED

+

+WaitForOtherLoaded:

+    ; wait until the other CPU finish loading new state,

+    ; otherwise the data in stack may corrupt

+    cmp        byte ptr [esi], CPU_SWITCH_STATE_LOADED

+    jz         OtherLoaded

+    PAUSE32

+    jmp        WaitForOtherLoaded

+

+OtherLoaded:

+    ; since the other CPU already get the data it want, leave this procedure

+    pop        eax

+    mov        cr0, eax

+    pop        eax

+    mov        cr4, eax

+    popfd

+

+    popad

+    ret

+AsmExchangeRole   ENDP

+

+AsmInitializeGdt   PROC  near C  PUBLIC

+  push         ebp

+  mov          ebp, esp

+  pushad

+  mov          edi, [ebp + 8]      ; Load GDT register

+

+  mov          ax,cs               ; Get the selector data from our code image

+  mov          es,ax

+  lgdt         FWORD PTR es:[edi]  ; and update the GDTR

+

+  push         PROTECT_MODE_CS

+  lea          eax, SetCodeSelectorFarJump

+  push         eax

+  retf

+SetCodeSelectorFarJump:

+  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too

+  mov          ds, ax

+  mov          es, ax

+  mov          fs, ax

+  mov          gs, ax

+  mov          ss, ax

+

+  popad

+  pop          ebp

+  ret

+AsmInitializeGdt  ENDP

+

+END

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
index 3a8e91fe74..5d2da82d14 100644
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
@@ -1,255 +1,255 @@
-;------------------------------------------------------------------------------ ;
-; Copyright (c) 2015, 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.
-;
-; Module Name:
-;
-;   MpFuncs.nasm
-;
-; Abstract:
-;
-;   This is the assembly code for MP support
-;
-;-------------------------------------------------------------------------------
-
-%include "MpEqu.inc"
-extern ASM_PFX(InitializeFloatingPointUnits)
-
-SECTION .text
-
-;-------------------------------------------------------------------------------------
-;RendezvousFunnelProc  procedure follows. All APs execute their procedure. This
-;procedure serializes all the AP processors through an Init sequence. It must be
-;noted that APs arrive here very raw...ie: real mode, no stack.
-;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC
-;IS IN MACHINE CODE.
-;-------------------------------------------------------------------------------------
-global ASM_PFX(RendezvousFunnelProc)
-ASM_PFX(RendezvousFunnelProc):
-RendezvousFunnelProcStart:
-; At this point CS = 0x(vv00) and ip= 0x0.
-BITS 16
-    mov        ebp, eax                        ; save BIST information
-
-    mov        ax, cs
-    mov        ds, ax
-    mov        es, ax
-    mov        ss, ax
-    xor        ax, ax
-    mov        fs, ax
-    mov        gs, ax
-
-    mov        si,  BufferStartLocation
-    mov        ebx, [si]
-
-    mov        di,  PmodeOffsetLocation
-    mov        eax, [di]
-    mov        di,  ax
-    sub        di,  06h
-    add        eax, ebx
-    mov        [di],eax
-
-    mov        si, GdtrLocation
-o32 lgdt       [cs:si]
-
-    mov        si, IdtrLocation
-o32 lidt       [cs:si]
-
-    xor        ax,  ax
-    mov        ds,  ax
-
-    mov        eax, cr0                        ;Get control register 0
-    or         eax, 000000003h                 ;Set PE bit (bit #0) & MP
-    mov        cr0, eax
-
-    jmp        PROTECT_MODE_CS:strict dword 0  ; far jump to protected mode
-BITS 32
-Flat32Start:                                   ; protected mode entry point
-    mov        ax, PROTECT_MODE_DS
-    mov        ds, ax
-    mov        es, ax
-    mov        fs, ax
-    mov        gs, ax
-    mov        ss, ax
-
-    mov        esi, ebx
-    mov        edi, esi
-    add        edi, LockLocation
-    mov        eax, NotVacantFlag
-
-TestLock:
-    xchg       [edi], eax
-    cmp        eax, NotVacantFlag
-    jz         TestLock
-
-    mov        edi, esi
-    add        edi, NumApsExecutingLoction
-    inc        dword [edi]
-    mov        ebx, [edi]
-
-ProgramStack:
-    mov        edi, esi
-    add        edi, StackSizeLocation
-    mov        eax, [edi]
-    mov        edi, esi
-    add        edi, StackStartAddressLocation
-    add        eax, [edi]
-    mov        esp, eax
-    mov        [edi], eax
-
-Releaselock:
-    mov        eax, VacantFlag
-    mov        edi, esi
-    add        edi, LockLocation
-    xchg       [edi], eax
-
-CProcedureInvoke:
-    push       ebp               ; push BIST data at top of AP stack
-    xor        ebp, ebp          ; clear ebp for call stack trace
-    push       ebp
-    mov        ebp, esp
-
-    mov        eax, ASM_PFX(InitializeFloatingPointUnits)
-    call       eax               ; Call assembly function to initialize FPU per UEFI spec
-
-    push       ebx               ; Push NumApsExecuting
-    mov        eax, esi
-    add        eax, LockLocation
-    push       eax               ; push address of exchange info data buffer
-
-    mov        edi, esi
-    add        edi, ApProcedureLocation
-    mov        eax, [edi]
-
-    call       eax               ; invoke C function
-
-    jmp        $                 ; never reach here
-RendezvousFunnelProcEnd:
-
-global ASM_PFX(AsmCliHltLoop)
-ASM_PFX(AsmCliHltLoop):
-    cli
-    hlt
-    jmp        $-2
-
-;-------------------------------------------------------------------------------------
-;  AsmGetAddressMap (&AddressMap);
-;-------------------------------------------------------------------------------------
-global ASM_PFX(AsmGetAddressMap)
-ASM_PFX(AsmGetAddressMap):
-    pushad
-    mov        ebp,esp
-
-    mov        ebx,  [ebp + 24h]
-    mov        dword [ebx], RendezvousFunnelProcStart
-    mov        dword [ebx +  4h], Flat32Start - RendezvousFunnelProcStart
-    mov        dword [ebx +  8h], 0
-    mov        dword [ebx + 0ch], RendezvousFunnelProcEnd - RendezvousFunnelProcStart
-
-    popad
-    ret
-
-;-------------------------------------------------------------------------------------
-;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is
-;about to become an AP. It switches it'stack with the current AP.
-;AsmExchangeRole (IN   CPU_EXCHANGE_INFO    *MyInfo, IN   CPU_EXCHANGE_INFO    *OthersInfo);
-;-------------------------------------------------------------------------------------
-global ASM_PFX(AsmExchangeRole)
-ASM_PFX(AsmExchangeRole):
-    ; DO NOT call other functions in this function, since 2 CPU may use 1 stack
-    ; at the same time. If 1 CPU try to call a function, stack will be corrupted.
-    pushad
-    mov        ebp,esp
-
-    ; esi contains MyInfo pointer
-    mov        esi, [ebp + 24h]
-
-    ; edi contains OthersInfo pointer
-    mov        edi, [ebp + 28h]
-
-    ;Store EFLAGS, GDTR and IDTR register to stack
-    pushfd
-    mov        eax, cr4
-    push       eax       ; push cr4 firstly
-    mov        eax, cr0
-    push       eax
-
-    sgdt       [esi + 8]
-    sidt       [esi + 14]
-
-    ; Store the its StackPointer
-    mov        [esi + 4],esp
-
-    ; update its switch state to STORED
-    mov        byte [esi], CPU_SWITCH_STATE_STORED
-
-WaitForOtherStored:
-    ; wait until the other CPU finish storing its state
-    cmp        byte [edi], CPU_SWITCH_STATE_STORED
-    jz         OtherStored
-    pause
-    jmp        WaitForOtherStored
-
-OtherStored:
-    ; Since another CPU already stored its state, load them
-    ; load GDTR value
-    lgdt       [edi + 8]
-
-    ; load IDTR value
-    lidt       [edi + 14]
-
-    ; load its future StackPointer
-    mov        esp, [edi + 4]
-
-    ; update the other CPU's switch state to LOADED
-    mov        byte [edi], CPU_SWITCH_STATE_LOADED
-
-WaitForOtherLoaded:
-    ; wait until the other CPU finish loading new state,
-    ; otherwise the data in stack may corrupt
-    cmp        byte [esi], CPU_SWITCH_STATE_LOADED
-    jz         OtherLoaded
-    pause
-    jmp        WaitForOtherLoaded
-
-OtherLoaded:
-    ; since the other CPU already get the data it want, leave this procedure
-    pop        eax
-    mov        cr0, eax
-    pop        eax
-    mov        cr4, eax
-    popfd
-
-    popad
-    ret
-
-global ASM_PFX(AsmInitializeGdt)
-ASM_PFX(AsmInitializeGdt):
-  push         ebp
-  mov          ebp, esp
-  pushad
-  mov          edi, [ebp + 8]      ; Load GDT register
-
-  lgdt         [edi]      ; and update the GDTR
-
-  push         PROTECT_MODE_CS
-  mov          eax, ASM_PFX(SetCodeSelectorFarJump)
-  push         eax
-  retf
-ASM_PFX(SetCodeSelectorFarJump):
-  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too
-  mov          ds, ax
-  mov          es, ax
-  mov          fs, ax
-  mov          gs, ax
-  mov          ss, ax
-
-  popad
-  pop          ebp
-  ret
+;------------------------------------------------------------------------------ ;

+; Copyright (c) 2015, 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.

+;

+; Module Name:

+;

+;   MpFuncs.nasm

+;

+; Abstract:

+;

+;   This is the assembly code for MP support

+;

+;-------------------------------------------------------------------------------

+

+%include "MpEqu.inc"

+extern ASM_PFX(InitializeFloatingPointUnits)

+

+SECTION .text

+

+;-------------------------------------------------------------------------------------

+;RendezvousFunnelProc  procedure follows. All APs execute their procedure. This

+;procedure serializes all the AP processors through an Init sequence. It must be

+;noted that APs arrive here very raw...ie: real mode, no stack.

+;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC

+;IS IN MACHINE CODE.

+;-------------------------------------------------------------------------------------

+global ASM_PFX(RendezvousFunnelProc)

+ASM_PFX(RendezvousFunnelProc):

+RendezvousFunnelProcStart:

+; At this point CS = 0x(vv00) and ip= 0x0.

+BITS 16

+    mov        ebp, eax                        ; save BIST information

+

+    mov        ax, cs

+    mov        ds, ax

+    mov        es, ax

+    mov        ss, ax

+    xor        ax, ax

+    mov        fs, ax

+    mov        gs, ax

+

+    mov        si,  BufferStartLocation

+    mov        ebx, [si]

+

+    mov        di,  PmodeOffsetLocation

+    mov        eax, [di]

+    mov        di,  ax

+    sub        di,  06h

+    add        eax, ebx

+    mov        [di],eax

+

+    mov        si, GdtrLocation

+o32 lgdt       [cs:si]

+

+    mov        si, IdtrLocation

+o32 lidt       [cs:si]

+

+    xor        ax,  ax

+    mov        ds,  ax

+

+    mov        eax, cr0                        ;Get control register 0

+    or         eax, 000000003h                 ;Set PE bit (bit #0) & MP

+    mov        cr0, eax

+

+    jmp        PROTECT_MODE_CS:strict dword 0  ; far jump to protected mode

+BITS 32

+Flat32Start:                                   ; protected mode entry point

+    mov        ax, PROTECT_MODE_DS

+    mov        ds, ax

+    mov        es, ax

+    mov        fs, ax

+    mov        gs, ax

+    mov        ss, ax

+

+    mov        esi, ebx

+    mov        edi, esi

+    add        edi, LockLocation

+    mov        eax, NotVacantFlag

+

+TestLock:

+    xchg       [edi], eax

+    cmp        eax, NotVacantFlag

+    jz         TestLock

+

+    mov        edi, esi

+    add        edi, NumApsExecutingLoction

+    inc        dword [edi]

+    mov        ebx, [edi]

+

+ProgramStack:

+    mov        edi, esi

+    add        edi, StackSizeLocation

+    mov        eax, [edi]

+    mov        edi, esi

+    add        edi, StackStartAddressLocation

+    add        eax, [edi]

+    mov        esp, eax

+    mov        [edi], eax

+

+Releaselock:

+    mov        eax, VacantFlag

+    mov        edi, esi

+    add        edi, LockLocation

+    xchg       [edi], eax

+

+CProcedureInvoke:

+    push       ebp               ; push BIST data at top of AP stack

+    xor        ebp, ebp          ; clear ebp for call stack trace

+    push       ebp

+    mov        ebp, esp

+

+    mov        eax, ASM_PFX(InitializeFloatingPointUnits)

+    call       eax               ; Call assembly function to initialize FPU per UEFI spec

+

+    push       ebx               ; Push NumApsExecuting

+    mov        eax, esi

+    add        eax, LockLocation

+    push       eax               ; push address of exchange info data buffer

+

+    mov        edi, esi

+    add        edi, ApProcedureLocation

+    mov        eax, [edi]

+

+    call       eax               ; invoke C function

+

+    jmp        $                 ; never reach here

+RendezvousFunnelProcEnd:

+

+global ASM_PFX(AsmCliHltLoop)

+ASM_PFX(AsmCliHltLoop):

+    cli

+    hlt

+    jmp        $-2

+

+;-------------------------------------------------------------------------------------

+;  AsmGetAddressMap (&AddressMap);

+;-------------------------------------------------------------------------------------

+global ASM_PFX(AsmGetAddressMap)

+ASM_PFX(AsmGetAddressMap):

+    pushad

+    mov        ebp,esp

+

+    mov        ebx,  [ebp + 24h]

+    mov        dword [ebx], RendezvousFunnelProcStart

+    mov        dword [ebx +  4h], Flat32Start - RendezvousFunnelProcStart

+    mov        dword [ebx +  8h], 0

+    mov        dword [ebx + 0ch], RendezvousFunnelProcEnd - RendezvousFunnelProcStart

+

+    popad

+    ret

+

+;-------------------------------------------------------------------------------------

+;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is

+;about to become an AP. It switches it'stack with the current AP.

+;AsmExchangeRole (IN   CPU_EXCHANGE_INFO    *MyInfo, IN   CPU_EXCHANGE_INFO    *OthersInfo);

+;-------------------------------------------------------------------------------------

+global ASM_PFX(AsmExchangeRole)

+ASM_PFX(AsmExchangeRole):

+    ; DO NOT call other functions in this function, since 2 CPU may use 1 stack

+    ; at the same time. If 1 CPU try to call a function, stack will be corrupted.

+    pushad

+    mov        ebp,esp

+

+    ; esi contains MyInfo pointer

+    mov        esi, [ebp + 24h]

+

+    ; edi contains OthersInfo pointer

+    mov        edi, [ebp + 28h]

+

+    ;Store EFLAGS, GDTR and IDTR register to stack

+    pushfd

+    mov        eax, cr4

+    push       eax       ; push cr4 firstly

+    mov        eax, cr0

+    push       eax

+

+    sgdt       [esi + 8]

+    sidt       [esi + 14]

+

+    ; Store the its StackPointer

+    mov        [esi + 4],esp

+

+    ; update its switch state to STORED

+    mov        byte [esi], CPU_SWITCH_STATE_STORED

+

+WaitForOtherStored:

+    ; wait until the other CPU finish storing its state

+    cmp        byte [edi], CPU_SWITCH_STATE_STORED

+    jz         OtherStored

+    pause

+    jmp        WaitForOtherStored

+

+OtherStored:

+    ; Since another CPU already stored its state, load them

+    ; load GDTR value

+    lgdt       [edi + 8]

+

+    ; load IDTR value

+    lidt       [edi + 14]

+

+    ; load its future StackPointer

+    mov        esp, [edi + 4]

+

+    ; update the other CPU's switch state to LOADED

+    mov        byte [edi], CPU_SWITCH_STATE_LOADED

+

+WaitForOtherLoaded:

+    ; wait until the other CPU finish loading new state,

+    ; otherwise the data in stack may corrupt

+    cmp        byte [esi], CPU_SWITCH_STATE_LOADED

+    jz         OtherLoaded

+    pause

+    jmp        WaitForOtherLoaded

+

+OtherLoaded:

+    ; since the other CPU already get the data it want, leave this procedure

+    pop        eax

+    mov        cr0, eax

+    pop        eax

+    mov        cr4, eax

+    popfd

+

+    popad

+    ret

+

+global ASM_PFX(AsmInitializeGdt)

+ASM_PFX(AsmInitializeGdt):

+  push         ebp

+  mov          ebp, esp

+  pushad

+  mov          edi, [ebp + 8]      ; Load GDT register

+

+  lgdt         [edi]      ; and update the GDTR

+

+  push         PROTECT_MODE_CS

+  mov          eax, ASM_PFX(SetCodeSelectorFarJump)

+  push         eax

+  retf

+ASM_PFX(SetCodeSelectorFarJump):

+  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too

+  mov          ds, ax

+  mov          es, ax

+  mov          fs, ax

+  mov          gs, ax

+  mov          ss, ax

+

+  popad

+  pop          ebp

+  ret