ArmPkg/ArmLib: VBAR_ELx not written correctly when handler above 4GB

The function ArmWriteVBar had a UINT32 parameter.
Need to change it to UINT.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15208 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index a05f7251a1c3e8068f164f11c86b08e287b2ee68..b874b29c672a21aba6a6d37afc00be7f58e6fbbb 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -1,7 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2014, ARM Ltd. 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
@@ -477,10 +477,10 @@ ArmInstructionSynchronizationBarrier (
 VOID\r
 EFIAPI\r
 ArmWriteVBar (\r
-  IN  UINT32   VectorBase\r
+  IN  UINTN   VectorBase\r
   );\r
 \r
-UINT32\r
+UINTN\r
 EFIAPI\r
 ArmReadVBar (\r
   VOID\r

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
index c512c03557ff7aa10291b3306c94dbc7142ba6d2..1f353d477f09b0057f2014be1616bf0b3c4aea87 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
   \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -22,7 +22,7 @@
 VOID\r
 EFIAPI\r
 ArmWriteVBar (\r
-  IN  UINT32   VectorBase\r
+  IN  UINTN   VectorBase\r
   )\r
 {\r
   ASSERT(FeaturePcdGet (PcdRelocateVectorTable) == TRUE);\r
@@ -37,7 +37,7 @@ ArmWriteVBar (
   }\r
 }\r
 \r
-UINT32\r
+UINTN\r
 EFIAPI\r
 ArmReadVBar (\r
   VOID\r