1. Fixed incorrect ASSERT conditions in wrapper functions.

2. Removed unnecessary SUB instructions in CompareMem.asm

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

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
index 4e35d1c85823085115d2c8fc8fbb5a8b6889b1dd..3cf6fe7f732bf8b3bbc30a8849212d877f5466bb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
@@ -39,7 +39,6 @@ InternalMemCompareMem   PROC    USES    esi edi
     movzx   eax, byte ptr [esi - 1]\r
     movzx   edx, byte ptr [edi - 1]\r
     sub     eax, edx\r
-    sub     eax, edx\r
     ret\r
 InternalMemCompareMem   ENDP\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index 4e35d1c85823085115d2c8fc8fbb5a8b6889b1dd..3cf6fe7f732bf8b3bbc30a8849212d877f5466bb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -39,7 +39,6 @@ InternalMemCompareMem   PROC    USES    esi edi
     movzx   eax, byte ptr [esi - 1]\r
     movzx   edx, byte ptr [edi - 1]\r
     sub     eax, edx\r
-    sub     eax, edx\r
     ret\r
 InternalMemCompareMem   ENDP\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
index 827e6ecf6741541c8637e2a070f0d465e41ab4dd..3acbdac4364a2cae7687fb0bf22013c524ccfee2 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
index 4b9d2413ebe90dee80fd323c6ad265cb0c2be45e..620b69aef44d407ffda88aab54716cb450526a20 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
index dbf3b627827e50851975d61e5bd3d9fa7a4a6703..73c28af4a171209a9d4fa611e9dc7dd22342c3dd 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {\r
   ASSERT (Buffer != NULL);\r
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
 \r
   if ((Length /= sizeof (Value)) == 0) {\r
     return Buffer;\r