From 1c5901528147af6f2d095a7b7d4bb73e19eeb365 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 14 Nov 2014 10:23:33 +0000 Subject: [PATCH] OvmfPg: flash driver: drop gratuitous 64-by-32 bit divisions (VS2010) In the InitializeVariableFvHeader() function, all three of "Offset", "Start" and "BlockSize" have type UINTN. Therefore the (Offset / BlockSize) and (Start / BlockSize) divisions can be compiled on all platforms without intrinsics. In the current expressions (EFI_LBA) Offset / BlockSize (EFI_LBA) Start / BlockSize "Offset" and "Start" are cast to UINT64 (== EFI_LBA), which leads to 64-by-32 bit divisions on Ia32, breaking the VS2010 / NOOPT / Ia32 build. The simplest way to fix them is to realize we don't need casts at all. (The prototypes of QemuFlashEraseBlock() and QemuFlashWrite() are visible via "QemuFlash.h", and they will easily take our UINTN quotients as UINT64.) Suggested-by: Scott Duplichan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Build-tested-by: Scott Duplichan Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16383 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 42060c84cf..9160bb885b 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -979,7 +979,7 @@ InitializeVariableFvHeader ( // Erase all the blocks // for (Offset = Start; Offset < Start + Length; Offset += BlockSize) { - Status = QemuFlashEraseBlock ((EFI_LBA) Offset / BlockSize); + Status = QemuFlashEraseBlock (Offset / BlockSize); ASSERT_EFI_ERROR (Status); } @@ -988,7 +988,7 @@ InitializeVariableFvHeader ( // WriteLength = GoodFwVolHeader->HeaderLength; Status = QemuFlashWrite ( - (EFI_LBA) Start / BlockSize, + Start / BlockSize, 0, &WriteLength, (UINT8 *) GoodFwVolHeader); -- 2.39.2