mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile in MONITOR/MWAIT support by default for all cpu-level=6 configurations.

Browse Source
This commit is contained in:
Stanislav Shwartsman 2011-08-02 19:52:24 +00:00
parent 539c740f10
commit fb405ad39a
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bochs/CHANGES
View File

@ -50,6 +50,7 @@ Bochs repository moved to the SVN version control !
The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option. The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option.
- Removed --enable-trace-cache configure option. The option will be always ON - Removed --enable-trace-cache configure option. The option will be always ON
for any Bochs configuration. for any Bochs configuration.
- Compile in MONITOR/MWAIT support by default for all cpu-level=6 configurations.
- added support for MSVC DLL plugins with a separate workspace package. - added support for MSVC DLL plugins with a separate workspace package.
VS2008Ex can now create a BOCHS.EXE with a set of plugin DLLs. VS2008Ex can now create a BOCHS.EXE with a set of plugin DLLs.
TODO: nmake still cannot create plugin DLLs. TODO: nmake still cannot create plugin DLLs.

2
bochs/config.cc
View File

@ -2619,7 +2619,7 @@ static int parse_line_formatted(const char *context, int num_params, char *param
SIM->get_param_string(BXPN_CONFIGURABLE_MSRS_PATH)->set(&params[i][5]); SIM->get_param_string(BXPN_CONFIGURABLE_MSRS_PATH)->set(&params[i][5]);
} else if (!strncmp(params[i], "cpuid_limit_winnt=", 18)) { } else if (!strncmp(params[i], "cpuid_limit_winnt=", 18)) {
if (parse_param_bool(params[i], 18, BXPN_CPUID_LIMIT_WINNT) < 0) { if (parse_param_bool(params[i], 18, BXPN_CPUID_LIMIT_WINNT) < 0) {
PARSE_ERR(("%s: cpuid directive malformed.", context)); PARSE_ERR(("%s: cpu directive malformed.", context));
} }
} else { } else {
PARSE_ERR(("%s: cpu directive malformed.", context)); PARSE_ERR(("%s: cpu directive malformed.", context));

7
bochs/configure vendored
View File

@ -23177,10 +23177,17 @@ $as_echo "no" >&6; }
else else
if test "$bx_cpu_level" -gt 5; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define BX_SUPPORT_MONITOR_MWAIT 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
$as_echo "#define BX_SUPPORT_MONITOR_MWAIT 0" >>confdefs.h $as_echo "#define BX_SUPPORT_MONITOR_MWAIT 0" >>confdefs.h
fi
fi fi

5
bochs/configure.in
View File

@ -1451,8 +1451,13 @@ AC_ARG_ENABLE(monitor_mwait,
fi fi
], ],
[ [
if test "$bx_cpu_level" -gt 5; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_MONITOR_MWAIT, 1)
else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_MONITOR_MWAIT, 0) AC_DEFINE(BX_SUPPORT_MONITOR_MWAIT, 0)
fi
] ]
) )

1
bochs/iodev/devices.txt
View File

@ -91,6 +91,7 @@ Attached devices
+---- Host Controllers +---- Host Controllers
| | | |
| +---- USB OHCI adapter usb_ohci.cc | +---- USB OHCI adapter usb_ohci.cc
| +---- USB XHCI adapter usb_xhci.cc
| +---- USB UHCI adapter (PIIX3) usb_uhci.cc | +---- USB UHCI adapter (PIIX3) usb_uhci.cc
| |
+---- Attached USB devices +---- Attached USB devices