MdePkg: Fix Clang build failure

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15784 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
index 67b54926d6bfe8503f96e21f0d6137e9e9031bfb..0d34c561622c42a044ccc9970d69f5520f54f873 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-    .686:\r
+\r
     .code:\r
 \r
 #------------------------------------------------------------------------------\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
index 44fedc0ffb4fb7127c5a2f568c70db860c436445..f4df094195f99bc9d0cb7212e693638cac53f8d8 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
@@ -37,7 +37,7 @@ ASM_PFX(InternalMathDivRemU64x64):
     jnz     Hard                        # call _@DivRemU64x64 if Divisor > 2^32\r
     movl    20(%esp), %ecx\r
     jecxz   L1\r
-    and     $0, 4(%ecx)                 # zero high dword of remainder\r
+    andl     $0, 4(%ecx)                # zero high dword of remainder\r
     movl    %ecx, 16(%esp)              # set up stack frame to match DivRemU64x32\r
 L1:\r
     jmp     ASM_PFX(InternalMathDivRemU64x32)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
index 3adf55a08a9570a499cf999bc453338c1c3b86d2..08950ce0e2b7155c9e47825546bfb5a9595d2f54 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
@@ -58,6 +58,6 @@ LongStart:                              # long mode starts here
     .byte   0x67, 0x48\r
     movl    0x18(%esp), %esp            # mov rsp, [esp + 18h]\r
     .byte   0x48\r
-    addl    $0x-0x20, %esp              # add rsp, -20h\r
+    addl    $-0x20, %esp                # add rsp, -20h\r
     call    *%ebx                       # call rbx\r
     jmp     .                           # no one should get here\r

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
index b74fbfc4f235d78cb225e69113c54e6821696fe5..8e3f6f55602bb629393cbcea955c3e2b7353b0b5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-    .386:\r
+\r
     .code:\r
 \r
 ASM_GLOBAL ASM_PFX(InternalMathMultU64x32)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
index c12489ff452fafcc7d1c89078ce45ab9600ce3d8..17cdedb212efddd3f9eb2428dacb10e69df3b04a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-    .686:\r
+\r
     .code:\r
 \r
 ASM_GLOBAL ASM_PFX(InternalMathRShiftU64)\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
index c7330a926636cdadd9cf80558fcab363eb7744d3..7329d6818dc667d6cc87ba0c5e0e85a6f3d8ef72 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
@@ -43,7 +43,7 @@ ASM_PFX(InternalMemSetMem):
     andl    $7, %edx\r
     shrl    $3, %ecx                    # # of Qwords to set\r
     jz      L1\r
-    addl    $0x-10, %esp\r
+    addl    $-16, %esp\r
     movq    %mm0, (%esp)                # save mm0\r
     movq    %mm1, 8(%esp)               # save mm1\r
     movd    %eax, %mm0\r
@@ -53,7 +53,7 @@ ASM_PFX(InternalMemSetMem):
 L0:\r
     movq    %mm0, (%edi)\r
     addl    $8, %edi\r
-    loopl   L0\r
+    loop    L0\r
     movq    (%esp), %mm0                # restore mm0\r
     movq    8(%esp), %mm1               # restore mm1\r
     addl    $0x10, %esp                 # stack cleanup\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
index 0ba631860ad7c8f9a1dacd805d64b2600329ba74..4d84bebba9a64c35889ec1566b329afb17ea127d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
@@ -49,7 +49,7 @@ ASM_PFX(InternalMemSetMem16):
 L0:\r
     movq    %mm0, (%edi)\r
     addl    $8, %edi\r
-    loopl   L0\r
+    loop    L0\r
 L1:\r
     movl    %edx, %ecx\r
     rep\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
index 36291de5007255da27c9445e79c1d555fbdd5001..fb0d0788f9f4e01b144e7586b636fd0b992e6ace 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
@@ -44,7 +44,7 @@ ASM_PFX(InternalMemSetMem32):
 L0:\r
     movq    %mm0, (%edx)\r
     lea     8(%edx), %edx\r
-    loopl   L0\r
+    loop    L0\r
 L1:\r
     jnc     L2\r
     movd    %mm0, (%edx)\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
index 2f514444c87eb6e618fb55a2aa322f46d68f8df3..53379ad0efd73c61abd48c957082488a869bc3b5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
@@ -39,5 +39,5 @@ ASM_PFX(InternalMemSetMem64):
 L0:\r
     movq    %mm0, (%edx)\r
     lea     8(%edx), %edx\r
-    loopl   L0\r
+    loop    L0\r
     ret\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
index d642028c9d73c0c4a1bac5cd01b12784d5822c32..a4c7d8cb62f2b5c26a8ac8d43f70a3a7932ed1f3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S
@@ -36,7 +36,7 @@
 ASM_GLOBAL ASM_PFX(InternalMemSetMem64)\r
 ASM_PFX(InternalMemSetMem64):\r
     movd      %r8, %mm0                 #Value\r
-    movw      %rcx, %rax                #rax <- Buffer\r
+    movq      %rcx, %rax                #rax <- Buffer\r
     xchg      %rdx, %rcx                #rcx <- Count\r
 L0:\r
     movntq  %mm0, (%rdx) \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S
index 10d0ac50949584cae4b3a66b89801c947ac26731..6721693a20bb1855680dbe5d95d2748942f9eec9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S
@@ -40,7 +40,7 @@ ASM_PFX(InternalMemSetMem64):
     movq    %r8, %rax\r
     xchgq   %rdx, %rcx\r
     rep     stosq\r
-    movw    %rdx, %rax\r
+    movq    %rdx, %rax\r
     popq    %rdi\r
     ret\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
index fdaf1f01c0464868f9d1091861d088a55166faab..9b1f1cb60cac9d37aa206505a113bb048c9777c3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-    .386:\r
+\r
     .code:\r
 \r
 ASM_GLOBAL ASM_PFX(InternalMemSetMem)\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
index 59ef940d8e99a6dd4336d7d8aa8c6390335c7de1..63e2a993e7c453d43550f4e20e061ae4b0216cc3 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-    .686:\r
+\r
     #.MODEL flat,C\r
     .xmm:\r
     .code:\r