From 2e0f79d499247ee67542d29401867b9ab5c2693c Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Thu, 2 Aug 2012 12:13:21 +0000 Subject: [PATCH] fixed compilation with AVX OFF but x86-64 on --- bochs/cpu/bmi64.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bochs/cpu/bmi64.cc b/bochs/cpu/bmi64.cc index 48fdf8837..4a081108c 100644 --- a/bochs/cpu/bmi64.cc +++ b/bochs/cpu/bmi64.cc @@ -25,7 +25,9 @@ #include "cpu.h" #define LOG_THIS BX_CPU_THIS_PTR -#if BX_SUPPORT_X86_64 && BX_SUPPORT_AVX +#if BX_SUPPORT_X86_64 + +#if BX_SUPPORT_AVX BX_INSF_TYPE BX_CPP_AttrRegparmN(1) BX_CPU_C::ANDN_GqBqEqR(bxInstruction_c *i) { @@ -250,7 +252,7 @@ BX_INSF_TYPE BX_CPP_AttrRegparmN(1) BX_CPU_C::PDEP_GqEqBqR(bxInstruction_c *i) BX_NEXT_INSTR(i); } -#endif +#endif // BX_SUPPORT_AVX BX_INSF_TYPE BX_CPP_AttrRegparmN(1) BX_CPU_C::ADCX_GqEqR(bxInstruction_c *i) { @@ -279,3 +281,5 @@ BX_INSF_TYPE BX_CPP_AttrRegparmN(1) BX_CPU_C::ADOX_GqEqR(bxInstruction_c *i) BX_NEXT_INSTR(i); } + +#endif