#include <Library/DebugLib.h>\r
#include <Library/DefaultExceptionHandlerLib.h>\r
\r
+STATIC\r
RETURN_STATUS\r
CopyExceptionHandlers(\r
IN PHYSICAL_ADDRESS BaseAddress\r
// library we cannot represent this in a PCD since PCDs are evaluated on\r
// a per-module basis.\r
#if defined(ARM_RELOCATE_VECTORS)\r
-BOOLEAN gArmRelocateVectorTable = TRUE;\r
+STATIC CONST BOOLEAN gArmRelocateVectorTable = TRUE;\r
#else\r
-BOOLEAN gArmRelocateVectorTable = FALSE;\r
+STATIC CONST BOOLEAN gArmRelocateVectorTable = FALSE;\r
#endif\r
\r
\r
// if we are requested to copy exceptin handlers to another location\r
if (gArmRelocateVectorTable) {\r
\r
- VectorBase = PcdGet32(PcdCpuVectorBaseAddress);\r
+ VectorBase = PcdGet64(PcdCpuVectorBaseAddress);\r
Status = CopyExceptionHandlers(VectorBase);\r
\r
}\r
// for encapsulated FVs.\r
ASSERT(((UINTN)ExceptionHandlersStart & gExceptionVectorAlignmentMask) == 0);\r
\r
- // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector\r
+ // We do not copy the Exception Table at PcdGet64(PcdCpuVectorBaseAddress). We just set Vector\r
// Base Address to point into CpuDxe code.\r
VectorBase = (UINTN)ExceptionHandlersStart;\r
\r
@retval EFI_UNSUPPORTED This function is not supported.\r
\r
**/\r
+STATIC\r
RETURN_STATUS\r
CopyExceptionHandlers(\r
IN PHYSICAL_ADDRESS BaseAddress\r