fpu: move public header file to include/fpu

[qemu.git] / target-i386 / cpu.h

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 90ef1ff1e25d145bd6f92332a02bc37c4abb41b7..070978035601cedaefc52f49d4334b21fe0cda8c 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -44,9 +44,9 @@
 
 #define CPUArchState struct CPUX86State
 
 
 #define CPUArchState struct CPUX86State
 

-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"

 
 

-#include "softfloat.h"
+#include "fpu/softfloat.h"

 
 #define R_EAX 0
 #define R_ECX 1
 
 #define R_EAX 0
 #define R_ECX 1


@@ -510,6 +510,8 @@
 #define CPUID_7_0_EBX_ADX      (1 << 19)
 #define CPUID_7_0_EBX_SMAP     (1 << 20)
 
 #define CPUID_7_0_EBX_ADX      (1 << 19)
 #define CPUID_7_0_EBX_SMAP     (1 << 20)
 

+#define CPUID_VENDOR_SZ      12
+

 #define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */
 #define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */
 #define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */
 #define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */
 #define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */
 #define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */


@@ -1115,7 +1117,7 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp)
 }
 #endif
 
 }
 #endif
 

-#include "cpu-all.h"
+#include "exec/cpu-all.h"

 #include "svm.h"
 
 #if !defined(CONFIG_USER_ONLY)
 #include "svm.h"
 
 #if !defined(CONFIG_USER_ONLY)


@@ -1135,7 +1137,7 @@ static inline bool cpu_has_work(CPUState *cpu)
                                       CPU_INTERRUPT_MCE));
 }
 
                                       CPU_INTERRUPT_MCE));
 }
 

-#include "exec-all.h"
+#include "exec/exec-all.h"

 
 static inline void cpu_pc_from_tb(CPUX86State *env, TranslationBlock *tb)
 {
 
 static inline void cpu_pc_from_tb(CPUX86State *env, TranslationBlock *tb)
 {