From cad6ca61487b99405247d2aa890afc14358a87df Mon Sep 17 00:00:00 2001
From: "Dr. Chat" <arkolbed@gmail.com>
Date: Fri, 1 May 2015 15:52:09 -0500
Subject: [PATCH] Include host CPU information in x64 emitter

Conflicts:
	src/xenia/cpu/backend/x64/x64_emitter.cc
---
 src/xenia/cpu/backend/x64/x64_emitter.cc | 3 ++-
 src/xenia/cpu/backend/x64/x64_emitter.h  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc
index a51996529..b1f39895d 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -67,7 +67,8 @@ X64Emitter::X64Emitter(X64Backend* backend, XbyakAllocator* allocator)
       current_instr_(0),
       source_map_count_(0),
       stack_size_(0),
-      trace_flags_(0) {}
+      trace_flags_(0),
+      cpu_() {}
 
 X64Emitter::~X64Emitter() {}
 
diff --git a/src/xenia/cpu/backend/x64/x64_emitter.h b/src/xenia/cpu/backend/x64/x64_emitter.h
index a3ea927e4..797956e0c 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.h
+++ b/src/xenia/cpu/backend/x64/x64_emitter.h
@@ -11,6 +11,7 @@
 #define XENIA_BACKEND_X64_X64_EMITTER_H_
 
 #include "third_party/xbyak/xbyak/xbyak.h"
+#include "third_party/xbyak/xbyak/xbyak_util.h"
 
 #include "xenia/base/arena.h"
 #include "xenia/cpu/hir/value.h"
@@ -102,6 +103,7 @@ class X64Emitter : public Xbyak::CodeGenerator {
 
   Runtime* runtime() const { return runtime_; }
   X64Backend* backend() const { return backend_; }
+  const Xbyak::util::Cpu *cpu() const { return &cpu_; }
 
   int Initialize();
 
@@ -191,6 +193,7 @@ class X64Emitter : public Xbyak::CodeGenerator {
   X64Backend* backend_;
   X64CodeCache* code_cache_;
   XbyakAllocator* allocator_;
+  Xbyak::util::Cpu cpu_; // Host CPU info
 
   hir::Instr* current_instr_;