4 files changed, 6 insertions, 7 deletions
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
index 4e35d1c858..3cf6fe7f73 100644
--- 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]
     movzx   edx, byte ptr [edi - 1]
     sub     eax, edx
-    sub     eax, edx
     ret
 InternalMemCompareMem   ENDP
 
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
index 827e6ecf67..3acbdac436 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
@@ -54,8 +54,8 @@ SetMem16 (
 {
   ASSERT (Buffer != NULL);
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
-  ASSERT ((((UINTN)Buffer) & 1) != 0);
-  ASSERT ((Length & 1) != 0);
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);
 
   if ((Length /= sizeof (Value)) == 0) {
     return Buffer;
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
index 4b9d2413eb..620b69aef4 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
@@ -54,8 +54,8 @@ SetMem32 (
 {
   ASSERT (Buffer != NULL);
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
-  ASSERT ((((UINTN)Buffer) & 1) != 0);
-  ASSERT ((Length & 1) != 0);
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);
 
   if ((Length /= sizeof (Value)) == 0) {
     return Buffer;
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
index dbf3b62782..73c28af4a1 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
@@ -54,8 +54,8 @@ SetMem64 (
 {
   ASSERT (Buffer != NULL);
   ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
-  ASSERT ((((UINTN)Buffer) & 1) != 0);
-  ASSERT ((Length & 1) != 0);
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
+  ASSERT ((Length & (sizeof (Value) - 1)) != 0);
 
   if ((Length /= sizeof (Value)) == 0) {
     return Buffer;