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 6bce0e1372cd02fbd4ca56d50d6b2eb644fb4961..c7e0b8a2a19305df9798aae4f6c82d0204125c7a 100644 (file)
--- 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 3c00c2a81eaa5ef964502c22f989e62048036974..fff8bde5ea9d60eb04a3ea16701e0857ec65cf43 100644 (file)
--- 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 4215c203935bb44975f31a71565851ca4e4a5baf..e80a00deb4bf7de1df0c6f9aae5bf6c1fd48c3a9 100644 (file)
--- 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 f4e3e282a265bf42365eb33ff95ec75b4ebf6003..da40c149e961a4acbc3ce17f58f2c4682ef1f506 100644 (file)
--- 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 92eea21952ceaaa1588948275a75b4216a3fac55..1e5958731722b572d8b806df84132554245f1c3b 100644 (file)
--- 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 c01b0c1358af08ff3f46d652ac839fbfe6b2140e..428bb6a51b454beeea93c628247b35168439beb0 100644 (file)
--- 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