From 8396e2dd30bf6f9057d3cd5fa1d26f023341f0a0 Mon Sep 17 00:00:00 2001 From: Jeff Fan Date: Fri, 29 Jul 2016 21:08:01 +0800 Subject: UefiCpuPkg/MpInitLib: Fix typo and clean up the code 1. Rename NumApsExecutingLoction to NumApsExecutingLocation 2. Update some comments in NASM files. 3. Remove PeiCpuMpData from MP_CPU_EXCHANGE_INFO. Cc: Michael Kinney Cc: Feng Tian Cc: Giri P Mudusuru Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: Michael Kinney Tested-by: Laszlo Ersek Tested-by: Michael Kinney --- UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc | 2 +- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'UefiCpuPkg/Library/MpInitLib/X64') diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc index 00f57ce549..5aac212449 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc @@ -33,7 +33,7 @@ GdtrLocation equ LockLocation + 20h IdtrLocation equ LockLocation + 2Ah BufferStartLocation equ LockLocation + 34h ModeOffsetLocation equ LockLocation + 3Ch -NumApsExecutingLoction equ LockLocation + 44h +NumApsExecutingLocation equ LockLocation + 44h CodeSegmentLocation equ LockLocation + 4Ch DataSegmentLocation equ LockLocation + 54h Cr3Location equ LockLocation + 5Ch diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm index f19c75f913..848992ca44 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -57,7 +57,7 @@ BITS 16 mov di, CodeSegmentLocation mov edx, [di] mov di, ax - sub di, 02h + sub di, 02h mov [di],dx ; Patch long mode CS sub di, 04h add eax, ebx @@ -117,7 +117,7 @@ TestLock: jz TestLock mov edi, esi - add edi, NumApsExecutingLoction + add edi, NumApsExecutingLocation inc dword [edi] mov ebx, [edi] @@ -138,8 +138,8 @@ Releaselock: xchg qword [edi], rax CProcedureInvoke: - push rbp ; push BIST data at top of AP stack - xor rbp, rbp ; clear ebp for call stack trace + push rbp ; Push BIST data at top of AP stack + xor rbp, rbp ; Clear ebp for call stack trace push rbp mov rbp, rsp @@ -157,9 +157,9 @@ CProcedureInvoke: mov rax, qword [edi] sub rsp, 20h - call rax ; invoke C function + call rax ; Invoke C function add rsp, 20h - jmp $ + jmp $ ; Should never reach here RendezvousFunnelProcEnd: @@ -176,7 +176,7 @@ ASM_PFX(AsmGetAddressMap): ;------------------------------------------------------------------------------------- ;AsmExchangeRole procedure follows. This procedure executed by current BSP, that is -;about to become an AP. It switches it'stack with the current AP. +;about to become an AP. It switches its stack with the current AP. ;AsmExchangeRole (IN CPU_EXCHANGE_INFO *MyInfo, IN CPU_EXCHANGE_INFO *OthersInfo); ;------------------------------------------------------------------------------------- global ASM_PFX(AsmExchangeRole) -- cgit v1.2.3