[CHERRY-PICK] MdeModulePkg: Remove ambiguous negation of narrower type

ardbiesheuvel · makubacki · commit fb48ef2ee226 · 2025-12-03T12:09:36.000-05:00
Replace UINTN casts with EFI_PHYSICAL_ADDRESS in places where the result is negated, as otherwise, the top bits may remain 0 unexpectedly. VS2022 started warning about this, and thus breaking the IA32 CI build. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> (cherry picked from commit bd4bb10)
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -790,7 +790,7 @@ CoreLoadPeImage (
   if (!Image->ImageContext.IsTeImage) {
     Image->ImageContext.ImageAddress =
       (Image->ImageContext.ImageAddress + Image->ImageContext.SectionAlignment - 1) &
-      ~((UINTN)Image->ImageContext.SectionAlignment - 1);
+      ~((EFI_PHYSICAL_ADDRESS)Image->ImageContext.SectionAlignment - 1);
   }
 
   //
diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -402,7 +402,7 @@ LoadAndRelocatePeCoffImage (
       if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {
         ImageContext.ImageAddress =
           (ImageContext.ImageAddress + ImageContext.SectionAlignment - 1) &
-          ~((UINTN)ImageContext.SectionAlignment - 1);
+          ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);
       }
 
       //

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ CoreLoadPeImage (`
`790`	`790`	`if (!Image->ImageContext.IsTeImage) {`
`791`	`791`	`Image->ImageContext.ImageAddress =`
`792`	`792`	`(Image->ImageContext.ImageAddress + Image->ImageContext.SectionAlignment - 1) &`
`793`		`- ~((UINTN)Image->ImageContext.SectionAlignment - 1);`
	`793`	`+ ~((EFI_PHYSICAL_ADDRESS)Image->ImageContext.SectionAlignment - 1);`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`//`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ LoadAndRelocatePeCoffImage (`
`402`	`402`	`if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {`
`403`	`403`	`ImageContext.ImageAddress =`
`404`	`404`	`(ImageContext.ImageAddress + ImageContext.SectionAlignment - 1) &`
`405`		`- ~((UINTN)ImageContext.SectionAlignment - 1);`
	`405`	`+ ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`//`