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 0141cb2ca4635424927e247ebdd081d113843e16..a1a01c060093f82bd9119505949284aca9e774d1 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.asm
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.asm
@@ -52,7 +52,7 @@ AsmCpuid    PROC    USES    ebx
 @@:\r
     mov     ecx, [ebp + 24]\r
     jecxz   @F\r
-    pop     [ecx]\r
+    pop     DWORD [ecx]\r
 @@:\r
     mov     ecx, [ebp + 28]\r
     jecxz   @F\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
index 504b397f1f68ee9c8f01d17170613a14ea58ed98..9cca11b7523bc540d8a44b752fd0bc69b771a189 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
@@ -58,7 +58,7 @@ AsmCpuidEx  PROC    USES    ebx
 @@:\r
     mov     ecx, [ebp + 28]\r
     jecxz   @F\r
-    pop     [ecx]\r
+    pop     DWORD [ecx]\r
 @@:\r
     mov     eax, [ebp + 12]\r
     leave\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
index 5cc1d6baf2cc93a139118ac45f4e6442d4f693c0..9ad340494525c1706688e1967ad7144a6a79f981 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
@@ -38,7 +38,7 @@
 ;------------------------------------------------------------------------------\r
 InternalX86EnablePaging64 PROC\r
     cli\r
-    mov     [esp], @F                   ; offset for far retf, seg is the 1st arg\r
+    mov     DWORD PTR [esp], @F         ; offset for far retf, seg is the 1st arg\r
     mov     eax, cr4\r
     or      al, (1 SHL 5)\r
     mov     cr4, eax                    ; enable PAE\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.asm b/MdePkg/Library/BaseLib/Ia32/SetJump.asm
index 8486b9f5b8c2016d9a8e40bb39098d77b117db88..0bfa404cf4d85c3fa029fbe09b376571ed3d90fd 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.asm
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.asm
@@ -33,7 +33,7 @@ InternalAssertJumpBuffer    PROTO   C
 ;   );\r
 ;------------------------------------------------------------------------------\r
 SetJump     PROC\r
-    push    [esp + 4]\r
+    push    DWORD [esp + 4]\r
     call    InternalAssertJumpBuffer    ; To validate JumpBuffer\r
     pop     ecx\r
     pop     ecx                         ; ecx <- return address\r