From: <ssh...@us...> - 2011-08-05 07:22:56
|
Revision: 10543 http://bochs.svn.sourceforge.net/bochs/?rev=10543&view=rev Author: sshwarts Date: 2011-08-05 07:22:43 +0000 (Fri, 05 Aug 2011) Log Message: ----------- fix compilation errors Modified Paths: -------------- trunk/bochs/config.h.in trunk/bochs/cpu/cpudb/atom_n270.cc Modified: trunk/bochs/config.h.in =================================================================== --- trunk/bochs/config.h.in 2011-08-04 19:02:49 UTC (rev 10542) +++ trunk/bochs/config.h.in 2011-08-05 07:22:43 UTC (rev 10543) @@ -666,6 +666,10 @@ #error "VMXx2 require x86-64 support" #endif +#if BX_SUPPORT_AVX && BX_SUPPORT_X86_64 == 0 + #error "AVX require x86-64 support" +#endif + #define BX_SupportRepeatSpeedups 0 #if BX_SUPPORT_3DNOW Modified: trunk/bochs/cpu/cpudb/atom_n270.cc =================================================================== --- trunk/bochs/cpu/cpudb/atom_n270.cc 2011-08-04 19:02:49 UTC (rev 10542) +++ trunk/bochs/cpu/cpudb/atom_n270.cc 2011-08-05 07:22:43 UTC (rev 10543) @@ -124,7 +124,7 @@ #if BX_SUPPORT_MONITOR_MWAIT BX_CPU_MONITOR_MWAIT | #endif - BX_CPU_MOVBE | + BX_CPU_MOVBE; } Bit32u atom_n270_t::get_cpu_extensions_bitmask(void) const @@ -319,7 +319,7 @@ } // leaf 0x00000003 // -void core2_extreme_x9770_t::get_std_cpuid_leaf_3(cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_3(cpuid_function_t *leaf) const { // CPUID function 0x00000003 - Processor Serial Number leaf->eax = 0; @@ -329,7 +329,7 @@ } // leaf 0x00000004 // -void core2_extreme_x9770_t::get_std_cpuid_leaf_4(Bit32u subfunction, cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_4(Bit32u subfunction, cpuid_function_t *leaf) const { // CPUID function 0x00000004 - Deterministic Cache Parameters @@ -385,7 +385,7 @@ } // leaf 0x00000005 // -void core2_extreme_x9770_t::get_std_cpuid_leaf_5(cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_5(cpuid_function_t *leaf) const { // CPUID function 0x00000005 - MONITOR/MWAIT Leaf @@ -416,7 +416,7 @@ } // leaf 0x00000006 // -void core2_extreme_x9770_t::get_std_cpuid_leaf_6(cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_6(cpuid_function_t *leaf) const { // CPUID function 0x00000006 - Thermal and Power Management Leaf leaf->eax = 0x00000001; @@ -429,7 +429,7 @@ // leaf 0x00000008 reserved // // leaf 0x00000009 // -void core2_extreme_x9770_t::get_std_cpuid_leaf_9(cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_9(cpuid_function_t *leaf) const { // CPUID function 0x00000009 - Direct Cache Access Information leaf->eax = 0; @@ -439,7 +439,7 @@ } // leaf 0x0000000A // -void core2_extreme_x9770_t::get_std_cpuid_leaf_A(cpuid_function_t *leaf) const +void atom_n270_t::get_std_cpuid_leaf_A(cpuid_function_t *leaf) const { // CPUID function 0x0000000A - Architectural Performance Monitoring Leaf leaf->eax = 0x07280203; @@ -451,7 +451,7 @@ } // leaf 0x80000000 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_0(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_0(cpuid_function_t *leaf) const { // EAX: highest extended function understood by CPUID // EBX: reserved @@ -464,7 +464,7 @@ } // leaf 0x80000001 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_1(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_1(cpuid_function_t *leaf) const { // EAX: CPU Version Information (reserved for Intel) leaf->eax = 0; @@ -510,7 +510,7 @@ // leaf 0x80000002 // // leaf 0x80000003 // // leaf 0x80000004 // -void core2_extreme_x9770_t::get_ext_cpuid_brand_string_leaf(Bit32u function, cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_brand_string_leaf(Bit32u function, cpuid_function_t *leaf) const { // CPUID function 0x80000002-0x80000004 - Processor Name String Identifier static const char* brand_string = " Intel(R) Atom(TM) CPU N270 @ 1.60GHz"; @@ -547,7 +547,7 @@ } // leaf 0x80000005 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_5(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_5(cpuid_function_t *leaf) const { // CPUID function 0x800000005 - L1 Cache and TLB Identifiers leaf->eax = 0; @@ -557,7 +557,7 @@ } // leaf 0x80000006 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_6(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_6(cpuid_function_t *leaf) const { // CPUID function 0x800000006 - L2 Cache and TLB Identifiers leaf->eax = 0x00000000; @@ -567,7 +567,7 @@ } // leaf 0x80000007 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_7(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_7(cpuid_function_t *leaf) const { // CPUID function 0x800000007 - Advanced Power Management leaf->eax = 0; @@ -577,7 +577,7 @@ } // leaf 0x80000008 // -void core2_extreme_x9770_t::get_ext_cpuid_leaf_8(cpuid_function_t *leaf) const +void atom_n270_t::get_ext_cpuid_leaf_8(cpuid_function_t *leaf) const { // virtual & phys address size in low 2 bytes. leaf->eax = BX_PHY_ADDRESS_WIDTH | (BX_LIN_ADDRESS_WIDTH << 8); // physical address should be 32-bit, no PSE-36 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |