[PATCH v2 09/13] btrace: identify cpu

[Markus Metzger <markus.t.metzger@intel.com>]

Add a struct for identifying a processor and a function to identify the
processor we're running on.

We will need this feature for the new btrace format.

2014-11-20  Markus Metzger  <markus.t.metzger@intel.com>

	* nat/x86-btrace.h (btrace_cpu_vendor, btrace_cpu)
	(btrace_this_cpu): New.
	* nat/x86-btrace.c: Include x86-cpuid.h.
	(btrace_this_cpu): New.
---
 gdb/nat/x86-btrace.c | 37 +++++++++++++++++++++++++++++++++++++
 gdb/nat/x86-btrace.h | 31 +++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/gdb/nat/x86-btrace.c b/gdb/nat/x86-btrace.c
index 5ca5731..845e895 100644
--- a/gdb/nat/x86-btrace.c
+++ b/gdb/nat/x86-btrace.c
@@ -18,10 +18,47 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "x86-btrace.h"
+#include "x86-cpuid.h"
 
 
 /* See x86-btrace.h.  */
 
+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)
+    {
+      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;
+	      cpu.model = (cpuid >> 4) & 0xf;
+
+	      if (cpu.family == 0x6)
+		cpu.model += (cpuid >> 12) & 0xf0;
+	    }
+	}
+    }
+
+  return cpu;
+}
+
+/* See x86-btrace.h.  */
+
 const char *
 btrace_format_string (enum btrace_format format)
 {
diff --git a/gdb/nat/x86-btrace.h b/gdb/nat/x86-btrace.h
index 48d6284..05d41fd 100644
--- a/gdb/nat/x86-btrace.h
+++ b/gdb/nat/x86-btrace.h
@@ -62,6 +62,34 @@ enum btrace_format
   BTRACE_FORMAT_BTS
 };
 
+/* An enumeration of cpu vendors.  */
+
+enum btrace_cpu_vendor
+{
+  /* We do not know this vendor.  */
+  CV_UNKNOWN,
+
+  /* Intel.  */
+  CV_INTEL
+};
+
+/* A cpu identifier.  */
+
+struct btrace_cpu
+{
+  /* The processor vendor.  */
+  enum btrace_cpu_vendor vendor;
+
+  /* The cpu family.  */
+  unsigned short family;
+
+  /* The cpu model.  */
+  unsigned char model;
+
+  /* The cpu stepping.  */
+  unsigned char stepping;
+};
+
 /* A BTS configuration.  */
 
 struct btrace_config_bts
@@ -141,6 +169,9 @@ enum btrace_error
   BTRACE_ERR_OVERFLOW
 };
 
+/* Identify the cpu we're running on.  */
+extern struct btrace_cpu btrace_this_cpu (void);
+
 /* Return a string representation of FORMAT.  */
 extern const char *btrace_format_string (enum btrace_format format);
 
-- 
1.8.3.1