tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <scott@notabs.org>

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Build-tested-by: Scott Duplichan <scott@notabs.org>

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16383 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2014-11-14 10:23:33 +00:00 committed by lersek
parent 1e62c89c3a
commit 1c59015281
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
View File

@ -979,7 +979,7 @@ InitializeVariableFvHeader (
// Erase all the blocks // Erase all the blocks
// //
for (Offset = Start; Offset < Start + Length; Offset += BlockSize) { for (Offset = Start; Offset < Start + Length; Offset += BlockSize) {
Status = QemuFlashEraseBlock ((EFI_LBA) Offset / BlockSize); Status = QemuFlashEraseBlock (Offset / BlockSize);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} }
@ -988,7 +988,7 @@ InitializeVariableFvHeader (
// //
WriteLength = GoodFwVolHeader->HeaderLength; WriteLength = GoodFwVolHeader->HeaderLength;
Status = QemuFlashWrite ( Status = QemuFlashWrite (
(EFI_LBA) Start / BlockSize, Start / BlockSize,
0, 0,
&WriteLength, &WriteLength,
(UINT8 *) GoodFwVolHeader); (UINT8 *) GoodFwVolHeader);