From 6e1e5405544724406f07344a5911298c3df44129 Mon Sep 17 00:00:00 2001
From: Feng Tian <feng.tian@intel.com>
Date: Thu, 7 Aug 2014 08:54:34 +0000
Subject: 1) Add type cast for better coding style. 2) replace StrCpy() usage
 in Variable driver with StrnCpy().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15770 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/EbcDxe/EbcExecute.c      | 4 ++--
 MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c | 4 ++--
 MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg/Universal/EbcDxe')

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 69aee07ea9..433eea250f 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -3269,7 +3269,7 @@ ExecuteCMP (
   if (Flag != 0) {
     VMFLAG_SET (VmPtr, VMFLAGS_CC);
   } else {
-    VMFLAG_CLEAR (VmPtr, VMFLAGS_CC);
+    VMFLAG_CLEAR (VmPtr, (UINT64)VMFLAGS_CC);
   }
   //
   // Advance the IP
@@ -3448,7 +3448,7 @@ ExecuteCMPI (
   if (Flag != 0) {
     VMFLAG_SET (VmPtr, VMFLAGS_CC);
   } else {
-    VMFLAG_CLEAR (VmPtr, VMFLAGS_CC);
+    VMFLAG_CLEAR (VmPtr, (UINT64)VMFLAGS_CC);
   }
   //
   // Advance the IP
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
index 41dc3a8585..bddfbf630d 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
@@ -2,7 +2,7 @@
   This module contains EBC support routines that are customized based on
   the target ia32 processor.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, 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
@@ -267,7 +267,7 @@ EbcInterpret (
   VmContext.StackTop = (UINT8*)VmContext.StackPool + (STACK_REMAIN_SIZE);
   VmContext.Gpr[0] = (UINT64)(UINTN) ((UINT8*)VmContext.StackPool + STACK_POOL_SIZE);
   VmContext.HighStackBottom = (UINTN)VmContext.Gpr[0];
-  VmContext.Gpr[0] &= ~(sizeof (UINTN) - 1);
+  VmContext.Gpr[0] &= ~((VM_REGISTER)(sizeof (UINTN) - 1));
   VmContext.Gpr[0] -= sizeof (UINTN);
 
   //
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
index 3f99a1a6e2..bdde5e41fa 100644
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
@@ -2,7 +2,7 @@
   This module contains EBC support routines that are customized based on
   the target x64 processor.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, 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
@@ -215,7 +215,7 @@ EbcInterpret (
   //
   // Align the stack on a natural boundary.
   //
-  VmContext.Gpr[0] &= ~(sizeof (UINTN) - 1);
+  VmContext.Gpr[0] &= ~(VM_REGISTER)(sizeof (UINTN) - 1);
 
   //
   // Put a magic value in the stack gap, then adjust down again.
@@ -359,7 +359,7 @@ ExecuteEbcImageEntryPoint (
 
   //
   // Align the stack on a natural boundary
-  VmContext.Gpr[0] &= ~(sizeof(UINTN) - 1);
+  VmContext.Gpr[0] &= ~(VM_REGISTER)(sizeof(UINTN) - 1);
   //
   VmContext.LowStackTop   = (UINTN) VmContext.Gpr[0];
 
-- 
cgit v1.2.3