From f66a43b26e6e0f4c1e5871dd3a88f2970b3abf87 Mon Sep 17 00:00:00 2001
From: Jiamin Ma <mjmthy@gmail.com>
Date: Sat, 12 Oct 2013 06:31:55 +0000
Subject: We enabled X64 native version NT32, and made it works on Windows 7
 X64 OS.

Signed-off-by: Jiamin Ma <mjmthy@gmail.com>
Reviewed by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed by: Liming Gao <liming.gao@intel.com>
Reviewed by: Jiewen Yao <jiewen.yao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14766 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/CpuRuntimeDxe/Cpu.c   | 4 ++--
 Nt32Pkg/CpuRuntimeDxe/CpuIo.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Nt32Pkg/CpuRuntimeDxe')

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index d15ac989ea..9e7dfbb29f 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, 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
@@ -467,7 +467,7 @@ Returns:
   ASSERT (CpuVerStrLen <= SMBIOS_STRING_MAX_LENGTH);
 
 
-  TotalSize = sizeof(SMBIOS_TABLE_TYPE4) + CpuVerStrLen + 1 + 1;
+  TotalSize = (UINT32)(sizeof(SMBIOS_TABLE_TYPE4) + CpuVerStrLen + 1 + 1);
   SmbiosRecord = AllocatePool(TotalSize);
   ZeroMem(SmbiosRecord, TotalSize);
 
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
index 7f171e6094..9c3478f0a3 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, 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        
@@ -326,11 +326,11 @@ Returns:
   }
 
   Width = (EFI_CPU_IO_PROTOCOL_WIDTH)(Width & 0x03);
-  if (Address - 1 + (1 << Width) * Count > Limit) {
+  if (Address - 1 + ((UINTN)1 << Width) * Count > Limit) {
     return EFI_UNSUPPORTED;
   }
 
-  AlignMask = (1 << Width) - 1;
+  AlignMask = ((UINTN)1 << Width) - 1;
   if ((UINTN) Buffer & AlignMask) {
     return EFI_UNSUPPORTED;
   }
-- 
cgit v1.2.3