EmulatorPkg: Fix Visual Studio build for IA32 & X64

This code is untested since there is currently no 'host' component
for Win32/Win64.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>

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

3 files changed, 9 insertions, 9 deletions

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index fc8d325ffc..b25ed45da4 100644
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -1,7 +1,7 @@
 /*++ @file

   Emu driver to produce CPU Architectural Protocol.

 

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

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

 Portions copyright (c) 2011 - 2012, Apple Inc. All rights reserved.

 This program and the accompanying materials

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

@@ -241,9 +241,9 @@ CpuUpdateSmbios (
   IN UINTN  MaxCpus

   )

 {

-  mCpuSmbiosType4.CoreCount        = MaxCpus;

-  mCpuSmbiosType4.EnabledCoreCount = MaxCpus;

-  mCpuSmbiosType4.ThreadCount      = MaxCpus;

+  mCpuSmbiosType4.CoreCount        = (UINT8) MaxCpus;

+  mCpuSmbiosType4.EnabledCoreCount = (UINT8) MaxCpus;

+  mCpuSmbiosType4.ThreadCount      = (UINT8) MaxCpus;

 

   LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mCpuSmbiosType4, mCpuSmbiosType4Strings);

 }

diff --git a/EmulatorPkg/CpuRuntimeDxe/CpuIo.c b/EmulatorPkg/CpuRuntimeDxe/CpuIo.c
index 3d4309d422..37905f892a 100644
--- a/EmulatorPkg/CpuRuntimeDxe/CpuIo.c
+++ b/EmulatorPkg/CpuRuntimeDxe/CpuIo.c
@@ -6,7 +6,7 @@
   Bridge I/O Protocol.

 

 

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

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

 Portions copyright (c) 2011, Apple Inc. All rights reserved.

 This program and the accompanying materials

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

@@ -315,7 +315,7 @@ CpuIoCheckAddressRange (
   }

 

   Width = Width & 0x03;

-  if (Address - 1 + (1 << Width) * Count > Limit) {

+  if ((Address - 1 + LShiftU64 (Count, Width)) > Limit) {

     return EFI_UNSUPPORTED;

   }

 

diff --git a/EmulatorPkg/CpuRuntimeDxe/MpService.c b/EmulatorPkg/CpuRuntimeDxe/MpService.c
index 6eecbbc9bd..bffc82b047 100644
--- a/EmulatorPkg/CpuRuntimeDxe/MpService.c
+++ b/EmulatorPkg/CpuRuntimeDxe/MpService.c
@@ -28,7 +28,7 @@
   APs to help test system memory in parallel with other device initialization.

   Diagnostics applications may also use this protocol for multi-processor.

 

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

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

 Portitions Copyright (c) 2011, Apple Inc. All rights reserved.

 This program and the accompanying materials are licensed and made available under

 the terms and conditions of the BSD License that accompanies this distribution.

@@ -1158,7 +1158,7 @@ FillInProcessorInformation (
     gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag |= PROCESSOR_AS_BSP_BIT;

   }

 

-  gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Package = ProcessorNumber;

+  gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Package = (UINT32) ProcessorNumber;

   gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Core    = 0;

   gMPSystem.ProcessorData[ProcessorNumber].Info.Location.Thread  = 0;

   gMPSystem.ProcessorData[ProcessorNumber].State = BSP ? CPU_STATE_BUSY : CPU_STATE_IDLE;

@@ -1332,7 +1332,7 @@ CpuMpServicesInit (
     return EFI_SUCCESS;

   }

 

-  gPollInterval = PcdGet64 (PcdEmuMpServicesPollingInterval);

+  gPollInterval = (UINTN) PcdGet64 (PcdEmuMpServicesPollingInterval);

 

   Status  = InitializeMpSystemData (*MaxCpus);

   if (EFI_ERROR (Status)) {