Update MDE and EdkModule packages for ICC build with /W4 /WX /Ox switches, for some...

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

diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
index b12337a8282b688f9bc19fc9ebc89e4584578276..85e2db15d4ef44e80650f024632e4fb9f6f195b4 100644 (file)
--- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
+++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
@@ -32,7 +32,7 @@
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r

-      <Keyword>UefiApplicationEntryPoint</Keyword>\r
+      <Keyword>UefiDriverEntryPoint</Keyword>\r

     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

diff --git a/EdkModulePkg/Core/Dxe/Mem/Page.c b/EdkModulePkg/Core/Dxe/Mem/Page.c
index 47b41671bd13ce592bf3e55c49b07e556bda06af..c4f3274906b553382380873b0943e0b88b73b0ed 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Mem/Page.c
+++ b/EdkModulePkg/Core/Dxe/Mem/Page.c
@@ -134,8 +134,9 @@ RemoveMemoryMapEntry (
   \r
 STATIC\r
 MEMORY_MAP *\r
   \r
 STATIC\r
 MEMORY_MAP *\r

-AllocateMemoryMapEntry ( \r
- );\r
+AllocateMemoryMapEntry (\r
+  VOID\r
+  );\r

  \r
 VOID\r
 CoreAcquireMemoryLock (\r
  \r
 VOID\r
 CoreAcquireMemoryLock (\r


@@ -651,9 +652,11 @@ Returns:
   }\r
 }\r
 \r
   }\r
 }\r
 \r

+STATIC\r

 MEMORY_MAP *\r
 MEMORY_MAP *\r

-AllocateMemoryMapEntry ( \r
- )\r
+AllocateMemoryMapEntry (\r
+  VOID\r
+  )\r

 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
index 957a2224f924bf0281d1700658c803ce6d46f852..e851164998f19b85aad940ef88706b454cb5acb7 100644 (file)
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -47,7 +47,7 @@ CalculateSum8 (
   ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));\r
 \r
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r
   ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));\r
 \r
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r

-    Sum = Sum + *(Buffer + Count);\r
+    Sum = (UINT8) (Sum + *(Buffer + Count));\r

   }\r
   \r
   return Sum;\r
   }\r
   \r
   return Sum;\r


@@ -126,7 +126,7 @@ CalculateSum16 (
 \r
 \r
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r
 \r
 \r
   for (Sum = 0, Count = 0; Count < Length; Count++) {\r

-    Sum = Sum + *(Buffer + Count);\r
+    Sum = (UINT16) (Sum + *(Buffer + Count));\r

   }\r
   \r
   return Sum;\r
   }\r
   \r
   return Sum;\r

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 402d676631c4a44e5f4a5ee5520be72364237b9e..fefadc433724d1c64245d402904d3256eda49f9e 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -528,7 +528,7 @@ InternalCharToUpper (
   )
 {
   if (Char >= L'a' && Char <= L'z') {
   )
 {
   if (Char >= L'a' && Char <= L'z') {

-    return Char - (L'a' - L'A');
+    return (CHAR16) (Char - (L'a' - L'A'));

   }
 
   return Char;
   }
 
   return Char;


@@ -919,7 +919,8 @@ StrHexToUint64 (
       (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
       );
 
       (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
       );
 

-    Result = LShiftU64 (Result, 4) + InternalHexCharToUintn (*String);
+    Result = LShiftU64 (Result, 4);
+    Result = Result + InternalHexCharToUintn (*String);

     String++;
   }
 
     String++;
   }
 


@@ -1930,7 +1931,8 @@ AsciiStrHexToUint64 (
       (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
       );
 
       (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
       );
 

-    Result = LShiftU64 (Result, 4) + InternalAsciiHexCharToUintn (*String);
+    Result = LShiftU64 (Result, 4);
+    Result = Result + InternalAsciiHexCharToUintn (*String);

     String++;
   }
 
     String++;
   }