From: andrewfish Date: Sat, 22 Dec 2012 00:47:17 +0000 (+0000) Subject: Update to build with 10.8 OS X Frameworks. This is a Mac only change. X-Git-Tag: edk2-stable201903~12818 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=5b484a25f744b123093a49bbb0188b78e7c7d99d Update to build with 10.8 OS X Frameworks. This is a Mac only change. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14016 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c index 52875c3bce..a7b12b14e5 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -259,18 +259,26 @@ QueryPerformanceCounter ( { #if __APPLE__ UINT64 Start; - Nanoseconds elapsedNano; + static mach_timebase_info_data_t sTimebaseInfo; + Start = mach_absolute_time (); // Convert to nanoseconds. - // Have to do some pointer fun because AbsoluteToNanoseconds - // works in terms of UnsignedWide, which is a structure rather - // than a proper 64-bit integer. - elapsedNano = AbsoluteToNanoseconds (*(AbsoluteTime *) &Start); + // If this is the first time we've run, get the timebase. + // We can use denom == 0 to indicate that sTimebaseInfo is + // uninitialised because it makes no sense to have a zero + // denominator is a fraction. + + if ( sTimebaseInfo.denom == 0 ) { + (void) mach_timebase_info(&sTimebaseInfo); + } + + // Do the maths. We hope that the multiplication doesn't + // overflow; the price you pay for working in fixed point. - return *(uint64_t *) &elapsedNano; + return (Start * sTimebaseInfo.numer) / sTimebaseInfo.denom; #else // Need to figure out what to do for Linux? return 0;