From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 25 Jul 2014 01:15:13 +0000 (-0700)
Subject: MdePkg BaseLib Ia32 assembly: Specify DWORD sizes
X-Git-Tag: edk2-stable201903~6782
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=5fe292b42fa6e0066fdb1f9a98fdfb3f52ffcbd0

MdePkg BaseLib Ia32 assembly: Specify DWORD sizes

NASM wants this code to specify a size.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.asm b/MdePkg/Library/BaseLib/Ia32/CpuId.asm
index 0141cb2ca4..a1a01c0600 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.asm
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.asm
@@ -52,7 +52,7 @@ AsmCpuid    PROC    USES    ebx
 @@:
     mov     ecx, [ebp + 24]
     jecxz   @F
-    pop     [ecx]
+    pop     DWORD [ecx]
 @@:
     mov     ecx, [ebp + 28]
     jecxz   @F
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
index 504b397f1f..9cca11b752 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
@@ -58,7 +58,7 @@ AsmCpuidEx  PROC    USES    ebx
 @@:
     mov     ecx, [ebp + 28]
     jecxz   @F
-    pop     [ecx]
+    pop     DWORD [ecx]
 @@:
     mov     eax, [ebp + 12]
     leave
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
index 5cc1d6baf2..9ad3404945 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
@@ -38,7 +38,7 @@
 ;------------------------------------------------------------------------------
 InternalX86EnablePaging64 PROC
     cli
-    mov     [esp], @F                   ; offset for far retf, seg is the 1st arg
+    mov     DWORD PTR [esp], @F         ; offset for far retf, seg is the 1st arg
     mov     eax, cr4
     or      al, (1 SHL 5)
     mov     cr4, eax                    ; enable PAE
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.asm b/MdePkg/Library/BaseLib/Ia32/SetJump.asm
index 8486b9f5b8..0bfa404cf4 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.asm
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.asm
@@ -33,7 +33,7 @@ InternalAssertJumpBuffer    PROTO   C
 ;   );
 ;------------------------------------------------------------------------------
 SetJump     PROC
-    push    [esp + 4]
+    push    DWORD [esp + 4]
     call    InternalAssertJumpBuffer    ; To validate JumpBuffer
     pop     ecx
     pop     ecx                         ; ecx <- return address