report 3dnow! to CPUID only if compiled in (by default it wasn't)

bochs-emu · Jan 18, 2025 · f876418 · f876418
1 parent c636a8c
commit f876418
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/bochs/cpu/cpudb/amd/amd_k6_2_chomper.cc b/bochs/cpu/cpudb/amd/amd_k6_2_chomper.cc
@@ -36,7 +36,9 @@ amd_k6_2_chomper_t::amd_k6_2_chomper_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
   enable_cpu_extension(BX_ISA_PENTIUM);
   enable_cpu_extension(BX_ISA_MMX);
   enable_cpu_extension(BX_ISA_SYSCALL_SYSRET_LEGACY);
+#if BX_SUPPORT_3DNOW
   enable_cpu_extension(BX_ISA_3DNOW);
+#endif
   enable_cpu_extension(BX_ISA_DEBUG_EXTENSIONS);
   enable_cpu_extension(BX_ISA_VME);
   enable_cpu_extension(BX_ISA_PSE);

diff --git a/bochs/cpu/cpudb/amd/athlon64_clawhammer.cc b/bochs/cpu/cpudb/amd/athlon64_clawhammer.cc
@@ -35,7 +35,9 @@ athlon64_clawhammer_t::athlon64_clawhammer_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
   enable_cpu_extension(BX_ISA_486);
   enable_cpu_extension(BX_ISA_PENTIUM);
   enable_cpu_extension(BX_ISA_MMX);
+#if BX_SUPPORT_3DNOW
   enable_cpu_extension(BX_ISA_3DNOW);
+#endif
   enable_cpu_extension(BX_ISA_SYSCALL_SYSRET_LEGACY);
   enable_cpu_extension(BX_ISA_SYSENTER_SYSEXIT);
   enable_cpu_extension(BX_ISA_P6);

diff --git a/bochs/cpu/cpudb/amd/athlon64_venice.cc b/bochs/cpu/cpudb/amd/athlon64_venice.cc
@@ -35,7 +35,9 @@ athlon64_venice_t::athlon64_venice_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
   enable_cpu_extension(BX_ISA_486);
   enable_cpu_extension(BX_ISA_PENTIUM);
   enable_cpu_extension(BX_ISA_MMX);
+#if BX_SUPPORT_3DNOW
   enable_cpu_extension(BX_ISA_3DNOW);
+#endif
   enable_cpu_extension(BX_ISA_SYSCALL_SYSRET_LEGACY);
   enable_cpu_extension(BX_ISA_SYSENTER_SYSEXIT);
   enable_cpu_extension(BX_ISA_P6);

diff --git a/bochs/cpu/cpudb/amd/phenomx3_8650_toliman.cc b/bochs/cpu/cpudb/amd/phenomx3_8650_toliman.cc
@@ -43,7 +43,9 @@ phenom_8650_toliman_t::phenom_8650_toliman_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
   enable_cpu_extension(BX_ISA_486);
   enable_cpu_extension(BX_ISA_PENTIUM);
   enable_cpu_extension(BX_ISA_MMX);
+#if BX_SUPPORT_3DNOW
   enable_cpu_extension(BX_ISA_3DNOW);
+#endif
   enable_cpu_extension(BX_ISA_SYSCALL_SYSRET_LEGACY);
   enable_cpu_extension(BX_ISA_SYSENTER_SYSEXIT);
   enable_cpu_extension(BX_ISA_P6);

diff --git a/bochs/cpu/cpudb/amd/turion64_tyler.cc b/bochs/cpu/cpudb/amd/turion64_tyler.cc
@@ -38,7 +38,9 @@ turion64_tyler_t::turion64_tyler_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
   enable_cpu_extension(BX_ISA_486);
   enable_cpu_extension(BX_ISA_PENTIUM);
   enable_cpu_extension(BX_ISA_MMX);
+#if BX_SUPPORT_3DNOW
   enable_cpu_extension(BX_ISA_3DNOW);
+#endif
   enable_cpu_extension(BX_ISA_SYSCALL_SYSRET_LEGACY);
   enable_cpu_extension(BX_ISA_SYSENTER_SYSEXIT);
   enable_cpu_extension(BX_ISA_P6);

diff --git a/bochs/cpu/cpuid.cc b/bochs/cpu/cpuid.cc
@@ -933,8 +933,10 @@ Bit32u bx_cpuid_t::get_ext_cpuid_leaf_1_edx_amd(Bit32u extra) const
 
   // [30:30] AMD 3DNow! Extensions
   // [31:31] AMD 3DNow! Instructions
+#if BX_SUPPORT_3DNOW
   if (is_cpu_extension_supported(BX_ISA_3DNOW))
     edx |= BX_CPUID_EXT1_EDX_3DNOW | BX_CPUID_EXT1_EDX_3DNOW_EXT;
+#endif
 
   return edx;
 }