[2/2] gdb, btrace: use cpuident.h to implement btrace_this_cpu

Message ID 20221108054530.796968-2-markus.t.metzger@intel.com
State New
Headers
Series [1/2] gprofng: make cpu identification available to others |

Commit Message

Markus Metzger Nov. 8, 2022, 5:45 a.m. UTC
  ---
 gdb/nat/linux-btrace.c | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)
  

Patch

diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index a951f3b56aa..108a4a10ecb 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -23,7 +23,7 @@ 
 #include "linux-btrace.h"
 #include "gdbsupport/common-regcache.h"
 #include "gdbsupport/gdb_wait.h"
-#include "x86-cpuid.h"
+#include "include/cpuident.h"
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/scoped_fd.h"
 #include "gdbsupport/scoped_mmap.h"
@@ -65,38 +65,23 @@  static struct btrace_cpu
 btrace_this_cpu (void)
 {
   struct btrace_cpu cpu;
-  unsigned int eax, ebx, ecx, edx;
-  int ok;
-
   memset (&cpu, 0, sizeof (cpu));
 
-  ok = x86_cpuid (0, &eax, &ebx, &ecx, &edx);
-  if (ok != 0)
+  unsigned int vendor = cpuid_getvendor ();
+  switch (vendor)
     {
-      if (ebx == signature_INTEL_ebx && ecx == signature_INTEL_ecx
-	  && edx == signature_INTEL_edx)
-	{
-	  unsigned int cpuid, ignore;
-
-	  ok = x86_cpuid (1, &cpuid, &ignore, &ignore, &ignore);
-	  if (ok != 0)
-	    {
-	      cpu.vendor = CV_INTEL;
-
-	      cpu.family = (cpuid >> 8) & 0xf;
-	      if (cpu.family == 0xf)
-		cpu.family += (cpuid >> 20) & 0xff;
+    case X86_VENDOR_Intel:
+      cpu.vendor = CV_INTEL;
+      break;
 
-	      cpu.model = (cpuid >> 4) & 0xf;
-	      if ((cpu.family == 0x6) || ((cpu.family & 0xf) == 0xf))
-		cpu.model += (cpuid >> 12) & 0xf0;
-	    }
-	}
-      else if (ebx == signature_AMD_ebx && ecx == signature_AMD_ecx
-	       && edx == signature_AMD_edx)
-	cpu.vendor = CV_AMD;
+    case X86_VENDOR_AMD:
+      cpu.vendor = CV_AMD;
+      break;
     }
 
+  cpu.family = (unsigned short) cpuid_getfamily ();
+  cpu.model = (unsigned char) cpuid_getmodel ();
+
   return cpu;
 }