Fix ICC11(VS2005) build failure.

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14062 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index 38226d0dc24f0dab91fb3d26fb7713e5ee8420bf..08c6cad6f34283340b78471f5909eae18defa612 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -2,7 +2,7 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in\r
   S3 boot path specification 0.9.\r
 \r
   This is an implementation of the ACPI S3 Save protocol.  This is defined in\r
   S3 boot path specification 0.9.\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -74,8 +74,8 @@ EFI_GUID              mAcpiS3IdtrProfileGuid = {
 **/\r
 VOID*\r
 AllocateMemoryBelow4G (\r
 **/\r
 VOID*\r
 AllocateMemoryBelow4G (\r

-  IN UINTN      MemoryType,\r
-  IN UINTN      Size\r
+  IN EFI_MEMORY_TYPE    MemoryType,\r
+  IN UINTN              Size\r

   )\r
 {\r
   UINTN                 Pages;\r
   )\r
 {\r
   UINTN                 Pages;\r

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
index e2cfdbcb610bc6024f473116dd7a57d366fde755..641a0ae0c9ec4d90c6d9d8bd7fab2c633570abe2 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
@@ -1,7 +1,7 @@
 /** @file\r
   This is an implementation of the AcpiVariable platform field for ECP platform.\r
 \r
 /** @file\r
   This is an implementation of the AcpiVariable platform field for ECP platform.\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -59,8 +59,8 @@ ACPI_VARIABLE_SET_COMPATIBILITY               *mAcpiVariableSetCompatibility = N
 **/\r
 VOID*\r
 AllocateMemoryBelow4G (\r
 **/\r
 VOID*\r
 AllocateMemoryBelow4G (\r

-  IN UINTN      MemoryType,\r
-  IN UINTN      Size\r
+  IN EFI_MEMORY_TYPE    MemoryType,\r
+  IN UINTN              Size\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 54ea20aa7ecf6b2988dfcb3773899bb540358433..a8944e600c64b711073db916b9ee920cc8944ea2 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
@@ -3,7 +3,7 @@
 \r
   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform\r
 \r
 \r
   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -48,6 +48,7 @@ HookPageFaultHandler (
 {\r
   UINT32         RegEax;\r
   UINT32         RegEdx;\r
 {\r
   UINT32         RegEax;\r
   UINT32         RegEdx;\r

+  UINTN          PageFaultHandlerHookAddress;\r

 \r
   AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);\r
   mPhyMask = LShiftU64 (1, (UINT8)RegEax) - 1;\r
 \r
   AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);\r
   mPhyMask = LShiftU64 (1, (UINT8)RegEax) - 1;\r


@@ -67,13 +68,14 @@ HookPageFaultHandler (
   //\r
   // Set Page Fault entry to catch >4G access\r
   //\r
   //\r
   // Set Page Fault entry to catch >4G access\r
   //\r

+  PageFaultHandlerHookAddress = (UINTN)PageFaultHandlerHook;\r

   mOriginalHandler = (VOID *)(UINTN)(LShiftU64 (IdtEntry->Bits.OffsetUpper, 32) + IdtEntry->Bits.OffsetLow + (IdtEntry->Bits.OffsetHigh << 16));\r
   mOriginalHandler = (VOID *)(UINTN)(LShiftU64 (IdtEntry->Bits.OffsetUpper, 32) + IdtEntry->Bits.OffsetLow + (IdtEntry->Bits.OffsetHigh << 16));\r

-  IdtEntry->Bits.OffsetLow      = (UINT16)((UINTN)PageFaultHandlerHook);\r
+  IdtEntry->Bits.OffsetLow      = (UINT16)PageFaultHandlerHookAddress;\r

   IdtEntry->Bits.Selector       = (UINT16)AsmReadCs ();\r
   IdtEntry->Bits.Reserved_0     = 0;\r
   IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r
   IdtEntry->Bits.Selector       = (UINT16)AsmReadCs ();\r
   IdtEntry->Bits.Reserved_0     = 0;\r
   IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r

-  IdtEntry->Bits.OffsetHigh     = (UINT16)((UINTN)PageFaultHandlerHook >> 16);\r
-  IdtEntry->Bits.OffsetUpper    = (UINT32)((UINTN)PageFaultHandlerHook >> 32);\r
+  IdtEntry->Bits.OffsetHigh     = (UINT16)(PageFaultHandlerHookAddress >> 16);\r
+  IdtEntry->Bits.OffsetUpper    = (UINT32)(PageFaultHandlerHookAddress >> 32);\r

   IdtEntry->Bits.Reserved_1     = 0;\r
 \r
   if (mPage1GSupport) {\r
   IdtEntry->Bits.Reserved_1     = 0;\r
 \r
   if (mPage1GSupport) {\r