summaryrefslogtreecommitdiff
path: root/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2019-10-31 18:50:08 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2019-10-31 18:50:08 +0000
commit709579b2d6795f6433a5e4fe5750c9518cf21d76 (patch)
treec40000825dcce0b889aab329155b23c49eb386c6 /src/VBox/HostDrivers/Support/SUPDrvGip.cpp
parentcd17115a22763de4229653777a87334c00356f62 (diff)
downloadVirtualBox-svn-709579b2d6795f6433a5e4fe5750c9518cf21d76.tar.gz
VMM,SUPDrv,x86.h: Nits.
- supdrvTscMeasureDeltaOne: No bulldozer Hygon, right, so don't muddle complicated if expression with impossibilities. - CPUMMICROARCH: Put the Hygon and Shanghai immediately after the CPU families they are derived from (in the enum). - cpumR3CpuIdExplodeFeatures: No K7 Hygon, right, so just flag all Hygons having leaking FxSR when FFXSR is set. - cpumR3LoadCpuIdInner: Incorrect indent. - getMsrNameHandled: Unnecessary parentheses and space. git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@81613 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/HostDrivers/Support/SUPDrvGip.cpp')
-rw-r--r--src/VBox/HostDrivers/Support/SUPDrvGip.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/VBox/HostDrivers/Support/SUPDrvGip.cpp b/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
index 35528b9a242..77c48583807 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
@@ -4020,7 +4020,7 @@ static int supdrvTscMeasureDeltaOne(PSUPDRVDEVEXT pDevExt, uint32_t idxWorker)
&& ASMHasCpuId()
&& ASMIsValidStdRange(ASMCpuId_EAX(0))
&& (ASMCpuId_EDX(1) & X86_CPUID_FEATURE_EDX_HTT)
- && ( (!ASMIsAmdCpu() && !ASMIsHygonCpu())
+ && ( !ASMIsAmdCpu()
|| ASMGetCpuFamily(u32Tmp = ASMCpuId_EAX(1)) > 0x15
|| ( ASMGetCpuFamily(u32Tmp) == 0x15 /* Piledriver+, not bulldozer (FX-4150 didn't like it). */
&& ASMGetCpuModelAMD(u32Tmp) >= 0x02) ) )