Fix GCC build break.

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLibSse2 / MemLibGuid.c

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index c13cd462e4ef92c42a6e52d0bade16bae2cb1d07..c5429d47b39d0237b565629cb6b89d990f413676 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -1,6 +1,16 @@
 /** @file\r
   Implementation of GUID functions.\r
 \r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
+    BaseMemoryLib\r
+    BaseMemoryLibMmx\r
+    BaseMemoryLibSse2\r
+    BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
+    PeiMemoryLib\r
+    DxeMemoryLib\r
+\r
   Copyright (c) 2006, Intel Corporation<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -10,20 +20,9 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
-\r
-    BaseMemoryLib\r
-    BaseMemoryLibMmx\r
-    BaseMemoryLibSse2\r
-    BaseMemoryLibRepStr\r
-    PeiMemoryLib\r
-    DxeMemoryLib\r
-\r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
+\r
 #include "MemLibInternals.h"\r
 \r
 /**\r
@@ -80,22 +79,17 @@ CompareGuid (
   IN CONST GUID  *Guid2\r
   )\r
 {\r
-  UINT64 Guid1ValueLo;\r
-  UINT64 Guid1ValueHi;\r
-  UINT64 Guid2ValueLo;\r
-  UINT64 Guid2ValueHi;\r
-\r
-  Guid1ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid1);\r
-  Guid2ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid2);\r
-\r
-  Guid1ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid1 + 1);\r
-  Guid2ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid2 + 1);\r
+  UINT64  LowPartOfGuid1;\r
+  UINT64  LowPartOfGuid2;\r
+  UINT64  HighPartOfGuid1;\r
+  UINT64  HighPartOfGuid2;\r
 \r
+  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64*) Guid1);\r
+  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64*) Guid2);\r
+  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1);\r
+  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1);\r
 \r
-  return (BOOLEAN)\r
-           ((Guid1ValueLo == Guid2ValueLo) &&\r
-            (Guid1ValueHi == Guid2ValueHi)\r
-           );\r
+  return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);\r
 }\r
 \r
 /**\r
@@ -110,7 +104,7 @@ CompareGuid (
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 128-bit boundary, then ASSERT().\r
-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
 \r
   @param  Buffer  Pointer to the target buffer to scan.\r
   @param  Length  Number of bytes in Buffer to scan.\r