3 files changed, 11 insertions, 10 deletions
diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
index bb29b95da2..74e2a7602c 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
@@ -36,9 +36,9 @@ typedef struct {
 
 CHAR8 *
 GetImageName (
-  IN  UINT32  FaultAddress,
-  OUT UINT32  *ImageBase,
-  OUT UINT32  *PeCoffSizeOfHeaders
+  IN  UINTN  FaultAddress,
+  OUT UINTN  *ImageBase,
+  OUT UINTN  *PeCoffSizeOfHeaders
   );
 
 /**
diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
index e68617e1e7..4a54298b11 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
@@ -26,9 +26,9 @@
 **/
 CHAR8 *
 GetImageName (
-  IN  UINT32  FaultAddress,
-  OUT UINT32  *ImageBase,
-  OUT UINT32  *PeCoffSizeOfHeaders
+  IN  UINTN  FaultAddress,
+  OUT UINTN  *ImageBase,
+  OUT UINTN  *PeCoffSizeOfHeaders
   )
 {
   return NULL;
diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
index 8543ade99c..b2d630cb33 100644
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
@@ -62,9 +62,9 @@ DefaultExceptionHandlerConstructor (
 **/
 CHAR8 *
 GetImageName (
-  IN  UINT32  FaultAddress,
-  OUT UINT32  *ImageBase,
-  OUT UINT32  *PeCoffSizeOfHeaders
+  IN  UINTN  FaultAddress,
+  OUT UINTN  *ImageBase,
+  OUT UINTN  *PeCoffSizeOfHeaders
   )
 {
   EFI_DEBUG_IMAGE_INFO  *DebugTable;
@@ -83,7 +83,7 @@ GetImageName (
           (DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {
         if ((Address >= (CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase) &&
             (Address <= ((CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase + DebugTable->NormalImage->LoadedImageProtocolInstance->ImageSize))) {
-          *ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;
+          *ImageBase = (UINTN)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;
           *PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)*ImageBase);
           return PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);
         }
@@ -93,3 +93,4 @@ GetImageName (
 
   return NULL;
 }
+