Enable MTRRs by default for P6

bochs/CHANGES

@@ -6,7 +6,7 @@ Changes after 2.3.5 release:
     to enable POPCNT instruction only use configure option
         --enable-popcnt
   - Implemented MTRR emulation, to enable use --enable-mtrr configure
-    option
+    option. MTRRs is enabled by default when cpu-level >= 6.
   - Many minor bugfixes in x86-64 CPU emulation
   - Many fixes in Bochs internal debugger and disassembler
 

bochs/configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.344 2007/09/28 19:51:42 sshwarts Exp .
+# From configure.in Id: configure.in,v 1.345 2007/09/28 20:26:33 sshwarts Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -37863,12 +37863,22 @@ _ACEOF
    fi
 else
 
-    { echo "$as_me:$LINENO: result: no" >&5
+    if test "$bx_cpu_level" -gt 5; then
+      # enable by default
+      { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+      cat >>confdefs.h <<\_ACEOF
+#define BX_SUPPORT_MTRR 1
+_ACEOF
+
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-    cat >>confdefs.h <<\_ACEOF
+      cat >>confdefs.h <<\_ACEOF
 #define BX_SUPPORT_MTRR 0
 _ACEOF
 
+    fi
 
 
 fi

bochs/configure.in

@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.345 2007-09-28 20:26:33 sshwarts Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.346 2007-10-08 19:46:37 sshwarts Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -963,8 +963,14 @@ AC_ARG_ENABLE(mtrr,
     AC_DEFINE(BX_SUPPORT_MTRR, 0)
    fi],
   [
-    AC_MSG_RESULT(no)
-    AC_DEFINE(BX_SUPPORT_MTRR, 0)
+    if test "$bx_cpu_level" -gt 5; then
+      # enable by default
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(BX_SUPPORT_MTRR, 1)
+    else
+      AC_MSG_RESULT(no)
+      AC_DEFINE(BX_SUPPORT_MTRR, 0)
+    fi
     ]
   )