From 8a93c5696fdf8e372ac25fa3c4479c5dd9e59bb8 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Sat, 25 Nov 2023 01:28:23 +0000 Subject: [PATCH] Console: Update CPU detection Cuts out unnecessary info and uses CPUInfo to print processor name core count and thread count. --- pcsx2/System.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index 9ddd098fe8..b2c32a77c4 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -29,6 +29,7 @@ #include "svnrev.h" #include "SysForwardDefs.h" #include "x86/newVif.h" +#include "cpuinfo.h" #include "common/BitUtils.h" #include "common/Perf.h" @@ -113,26 +114,16 @@ void SysLogMachineCaps() Console.WriteLn(Color_StrongBlack, "Host Machine Init:"); Console.Indent().WriteLn( - "Operating System = %s\n" - "Physical RAM = %u MB", + "Operating System = %s\n" + "Physical RAM = %u MB", GetOSVersionString().c_str(), (u32)(GetPhysicalMemory() / _1mb)); - - Console.Indent().WriteLn( - "CPU name = %s\n" - "Vendor/Model = %s (stepping %02X)\n" - "Logical Cores = %u\n" - "x86PType = %s\n" - "x86Flags = %08x %08x\n" - "x86EFlags = %08x", - x86caps.FamilyName, - x86caps.VendorName, x86caps.StepID, - x86caps.LogicalCores, - x86caps.GetTypeName(), - x86caps.Flags, x86caps.Flags2, - x86caps.EFlags); + cpuinfo_initialize(); + Console.Indent().WriteLn("Processor = %s", cpuinfo_get_package(0)->name); + Console.Indent().WriteLn("Core Count = %u cores", cpuinfo_get_cores_count()); + Console.Indent().WriteLn("Thread Count = %u threads", cpuinfo_get_processors_count()); Console.Newline();