Refine code.

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

4 files changed, 23 insertions, 22 deletions

diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index e7fe9e28b6..cca08ed3f6 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -1,7 +1,7 @@
 /** @file

   Integer division worker functions for Ia32.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -42,8 +42,8 @@ InternalMathDivRemS64x64 (
   INT64                             Quot;

 

   Quot = InternalMathDivRemU64x64 (

-           Dividend >= 0 ? Dividend : -Dividend,

-           Divisor >= 0 ? Divisor : -Divisor,

+           (UINT64) (Dividend >= 0 ? Dividend : -Dividend),

+           (UINT64) (Divisor >= 0 ? Divisor : -Divisor),

            (UINT64 *) Remainder

            );

   if (Remainder != NULL && Dividend < 0) {

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 7821520d2e..0b6a195747 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -14,17 +14,18 @@
 

 #include "BaseLibInternals.h"

 

-#define QUOTIENT_MAX_UINTN_DIVIDED_BY_10      ((UINTN) -1 / 10U)

-#define REMAINDER_MAX_UINTN_DIVIDED_BY_10    ((UINTN) -1 % 10U)

+#define QUOTIENT_MAX_UINTN_DIVIDED_BY_10      ((~((UINTN) 0)) / 10U)

+#define REMAINDER_MAX_UINTN_DIVIDED_BY_10    ((~((UINTN) 0)) % 10U)

 

-#define QUOTIENT_MAX_UINTN_DIVIDED_BY_16       ((UINTN) -1 / 16U)

-#define REMAINDER_MAX_UINTN_DIVIDED_BY_16     ((UINTN) -1 % 16U)

 

-#define QUOTIENT_MAX_UINT64_DIVIDED_BY_10      ((UINT64) -1 / 10U)

-#define REMAINDER_MAX_UINT64_DIVIDED_BY_10    ((UINT64) -1 % 10U)

+#define QUOTIENT_MAX_UINTN_DIVIDED_BY_16       ((~((UINTN) 0)) / 16U)

+#define REMAINDER_MAX_UINTN_DIVIDED_BY_16     ((~((UINTN) 0)) % 16U)

 

-#define QUOTIENT_MAX_UINT64_DIVIDED_BY_16      ((UINT64) -1 / 16U)

-#define REMAINDER_MAX_UINT64_DIVIDED_BY_16    ((UINT64) -1 % 16U)

+#define QUOTIENT_MAX_UINT64_DIVIDED_BY_10      ((~((UINT64) 0)) / 10U)

+#define REMAINDER_MAX_UINT64_DIVIDED_BY_10    ((~((UINT64) 0)) % 10U)

+

+#define QUOTIENT_MAX_UINT64_DIVIDED_BY_16      ((~((UINT64) 0)) / 16U)

+#define REMAINDER_MAX_UINT64_DIVIDED_BY_16    ((~((UINT64) 0)) % 16U)

 

 /**

   Copies one Null-terminated Unicode string to another Null-terminated Unicode

diff --git a/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c b/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
index 90524a1017..895acdc39f 100644
--- a/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
+++ b/MdePkg/Library/BaseSynchronizationLib/SynchronizationMsc.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation of synchronization functions.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -383,7 +383,7 @@ InterlockedCompareExchangePointer (
 {

   UINT8  SizeOfValue;

 

-  SizeOfValue = sizeof (*Value);

+  SizeOfValue = (UINT8) sizeof (*Value);

 

   switch (SizeOfValue) {

     case sizeof (UINT32):

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index 8e1eddcce6..604cee996c 100644
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -277,7 +277,7 @@ BuildModuleHob (
   ASSERT (((MemoryAllocationModule & (EFI_PAGE_SIZE - 1)) == 0) &&

           ((ModuleLength & (EFI_PAGE_SIZE - 1)) == 0));

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE));

 

   CopyGuid (&(Hob->MemoryAllocationHeader.Name), &gEfiHobMemoryAllocModuleGuid);

   Hob->MemoryAllocationHeader.MemoryBaseAddress = MemoryAllocationModule;

@@ -319,7 +319,7 @@ BuildResourceDescriptorHob (
 {

   EFI_HOB_RESOURCE_DESCRIPTOR  *Hob;

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, sizeof (EFI_HOB_RESOURCE_DESCRIPTOR));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, (UINT16) sizeof (EFI_HOB_RESOURCE_DESCRIPTOR));

 

   Hob->ResourceType      = ResourceType;

   Hob->ResourceAttribute = ResourceAttribute;

@@ -428,7 +428,7 @@ BuildFvHob (
 {

   EFI_HOB_FIRMWARE_VOLUME  *Hob;

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV, sizeof (EFI_HOB_FIRMWARE_VOLUME));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV, (UINT16) sizeof (EFI_HOB_FIRMWARE_VOLUME));

 

   Hob->BaseAddress = BaseAddress;

   Hob->Length      = Length;

@@ -460,7 +460,7 @@ BuildFv2Hob (
 {

   EFI_HOB_FIRMWARE_VOLUME2  *Hob;

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV2, sizeof (EFI_HOB_FIRMWARE_VOLUME2));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV2, (UINT16) sizeof (EFI_HOB_FIRMWARE_VOLUME2));

 

   Hob->BaseAddress = BaseAddress;

   Hob->Length      = Length;

@@ -491,7 +491,7 @@ BuildCvHob (
 {

   EFI_HOB_UEFI_CAPSULE  *Hob;

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_UEFI_CAPSULE, sizeof (EFI_HOB_UEFI_CAPSULE));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_UEFI_CAPSULE, (UINT16) sizeof (EFI_HOB_UEFI_CAPSULE));

 

   Hob->BaseAddress  = BaseAddress;

   Hob->Length       = Length;

@@ -519,7 +519,7 @@ BuildCpuHob (
 {

   EFI_HOB_CPU  *Hob;

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CPU, sizeof (EFI_HOB_CPU));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CPU, (UINT16) sizeof (EFI_HOB_CPU));

 

   Hob->SizeOfMemorySpace = SizeOfMemorySpace;

   Hob->SizeOfIoSpace     = SizeOfIoSpace;

@@ -555,7 +555,7 @@ BuildStackHob (
   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

           ((Length & (EFI_PAGE_SIZE - 1)) == 0));

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK));

 

   CopyGuid (&(Hob->AllocDescriptor.Name), &gEfiHobMemoryAllocStackGuid);

   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;

@@ -595,7 +595,7 @@ BuildBspStoreHob (
   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

           ((Length & (EFI_PAGE_SIZE - 1)) == 0));

 

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE));

 

   CopyGuid (&(Hob->AllocDescriptor.Name), &gEfiHobMemoryAllocBspStoreGuid);

   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;

@@ -635,7 +635,7 @@ BuildMemoryAllocationHob (
   ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

           ((Length & (EFI_PAGE_SIZE - 1)) == 0));

   

-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION));

+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION));

   

   ZeroMem (&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID));

   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;