From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 13 Jul 2006 05:58:02 +0000 (+0000)
Subject: Fix bug in .S files.
X-Git-Tag: edk2-stable201903~24908
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f23c214dca7068e1b38bbf864a2c08065b20f915

Fix bug in .S files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@952 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
index 6bce0e1372..c7e0b8a2a1 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
@@ -42,7 +42,6 @@ _InternalMemCompareMem:
     movzbl  -1(%esi), %eax
     movzbl  -1(%edi), %edx
     subl    %edx, %eax
-    subl    %edx, %eax
     pop     %edi
     pop     %esi
     ret
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
index 3c00c2a81e..fff8bde5ea 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
@@ -85,6 +85,6 @@ L2:
     movsb
     cld
     movl    12(%esp), %eax
-    pop    %esi
-    pop    %edi
+    pop     %edi
+    pop     %esi
     ret
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
index 4215c20393..e80a00deb4 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
@@ -53,6 +53,6 @@ L0:
     movsb                               # Copy bytes backward
     cld
     movl    12(%esp),%eax               # eax <- Destination as return value
-    pop    %edi
-    pop    %esi
+    pop     %edi
+    pop     %esi
     ret
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
index f4e3e282a2..da40c149e9 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
@@ -39,4 +39,5 @@ _InternalMemScanMem8:
     repne   scasb
     leal    -1(%edi),%eax
     cmovnz  %ecx, %eax
+    pop     %edi
     ret
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
index 92eea21952..1e59587317 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
@@ -33,4 +33,5 @@ _InternalMemSetMem:
     rep
     stosb
     movl    8(%esp),%eax
+    pop     %edi
     ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
index c01b0c1358..428bb6a51b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
@@ -42,7 +42,6 @@ _InternalMemCompareMem:
     movzbl  -1(%esi), %eax
     movzbl  -1(%edi), %edx
     subl    %edx, %eax
-    subl    %edx, %eax
     pop     %edi
     pop     %esi
     ret