1. Sync LinkedList.c with MWG

2. Fix one bug in Ipf/InterlockedCompareExchange64.s
3. Fix one bug in AsmDisablePaging64()

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

diff --git a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s b/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
index 200e30e09eb50d8f0def9e03a73db2673e2c0099..88b9d2b49078fab32220a100328abae03338fc0b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
+++ b/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
@@ -22,7 +22,7 @@
 .type   InternalSyncCompareExchange64, @function\r
 InternalSyncCompareExchange64::\r
         mov                 ar.ccv = r33\r
 .type   InternalSyncCompareExchange64, @function\r
 InternalSyncCompareExchange64::\r
         mov                 ar.ccv = r33\r

-        cmpxchg8.rel        r8  = [r64], r34\r
+        cmpxchg8.rel        r8  = [r32], r34\r

         mf\r
         br.ret.sptk.many    b0\r
 .endp   InternalSyncCompareExchange64
\ No newline at end of file
         mf\r
         br.ret.sptk.many    b0\r
 .endp   InternalSyncCompareExchange64
\ No newline at end of file

diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index a1a2453fdec14b00de1edaecf8e32fc4011490ca..15ceb584db1634db79e5ab2357e9479fb6ef78ea 100644 (file)
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -34,9 +34,6 @@ IsNodeInList (
   ASSERT (Node != NULL);\r
 \r
   Count = PcdGet32 (PcdMaximumLinkedListLength);\r
   ASSERT (Node != NULL);\r
 \r
   Count = PcdGet32 (PcdMaximumLinkedListLength);\r

-  if (Count != 0) {\r
-    Count++;\r
-  }\r

 \r
   Ptr = List;\r
   do {\r
 \r
   Ptr = List;\r
   do {\r

diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm b/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
index 3134e4257150a7d734f85a6a0ac58605e542a03a..7b1e1b8bd292fd5c5ad2df4ea61e0a3fba0a8141 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
+++ b/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
@@ -26,7 +26,8 @@
 InternalX86DisablePaging64    PROC\r
     cli\r
     shl     rcx, 32\r
 InternalX86DisablePaging64    PROC\r
     cli\r
     shl     rcx, 32\r

-    lea     ecx, @F\r
+    lea     eax, @F\r
+    mov     ecx, eax\r

     push    rcx\r
     mov     ebx, edx\r
     mov     esi, r8d\r
     push    rcx\r
     mov     ebx, edx\r
     mov     esi, r8d\r