Only in bochs-2.0.2/build/macosx: Info.plist Only in bochs-2.0.2/build/win32/nsis: Makefile Only in bochs-2.0.2/build/win32/nsis: bochs.nsi diff -u -r bochs-2.0.2-orig/config.h.in bochs-2.0.2/config.h.in --- bochs-2.0.2-orig/config.h.in 2003-01-22 14:18:24.000000000 +0100 +++ bochs-2.0.2/config.h.in 2003-03-14 03:26:19.000000000 +0100 @@ -688,6 +688,7 @@ #define BX_SupportICache 0 #define BX_SupportHostAsms 0 +#define BX_SET_DE_BIT 0 // if 1, don't do gpf on MSRs that we don't implement #define BX_IGNORE_BAD_MSR 0 diff -u -r bochs-2.0.2-orig/configure bochs-2.0.2/configure --- bochs-2.0.2-orig/configure 2003-01-22 14:18:28.000000000 +0100 +++ bochs-2.0.2/configure 2003-03-14 03:26:19.000000000 +0100 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.194.2.2 2003/01/04 19:15:12 bdenney Exp . +# From configure.in Id: configure.in,v 1.194.2.3 2003/01/22 02:38:59 bdenney Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -1019,6 +1019,7 @@ --enable-pci enable limited i440FX PCI support --enable-dc2300-vlb-ide enable Promise DC2300 VLB-IDE support --enable-4meg-pages support 4Megabyte pages extensions + --enable-de-bit-hack set DE bit to 1 when calling instruction CPUID --enable-pae support Physical Address Extensions --enable-guest2host-tlb support guest to host addr TLB for speed --enable-repeat-speedups support repeated IO and mem copy speedups @@ -4207,7 +4208,7 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4210 "configure"' > conftest.$ac_ext + echo '#line 4211 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4757,7 +4758,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6588,7 +6589,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking for DE Hack... $ECHO_C" >&6 +# Check whether --enable-de-bit-hack or --disable-de-bit-hack was given. +if test "${enable_de_bit_hack+set}" = set; then + enableval="$enable_de_bit_hack" + if test "$enableval" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define BX_SET_DE_BIT 1 +_ACEOF + + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + cat >>confdefs.h <<\_ACEOF +#define BX_SET_DE_BIT 0 +_ACEOF + + fi +else + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + cat >>confdefs.h <<\_ACEOF +#define BX_SET_DE_BIT 0 +_ACEOF + + + + +fi; + echo "$as_me:$LINENO: checking for PAE support" >&5 echo $ECHO_N "checking for PAE support... $ECHO_C" >&6 diff -u -r bochs-2.0.2-orig/configure.in bochs-2.0.2/configure.in --- bochs-2.0.2-orig/configure.in 2003-01-22 14:18:28.000000000 +0100 +++ bochs-2.0.2/configure.in 2003-03-14 03:26:19.000000000 +0100 @@ -809,6 +809,27 @@ ] ) +# Laurent Gualdi +# Add a option to make BOCHS work with L4-ka +# not fully tested. small hack to make +# L4-ka start.. +AC_MSG_CHECKING(for DE Hack) +AC_ARG_ENABLE(de-bit-hack, + [ --enable-de-bit-hack set DE bit to 1 when calling instruction CPUID ], + [if test "$enableval" = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(BX_SET_DE_BIT, 1) + else + AC_MSG_RESULT(no) + AC_DEFINE(BX_SET_DE_BIT, 0) + fi], + [ + AC_MSG_RESULT(no) + AC_DEFINE(BX_SET_DE_BIT, 0) + + ] + ) + AC_MSG_CHECKING(for PAE support) AC_ARG_ENABLE(pae, diff -u -r bochs-2.0.2-orig/cpu/proc_ctrl.cc bochs-2.0.2/cpu/proc_ctrl.cc --- bochs-2.0.2-orig/cpu/proc_ctrl.cc 2003-01-22 14:18:30.000000000 +0100 +++ bochs-2.0.2/cpu/proc_ctrl.cc 2003-05-21 23:55:17.000000000 +0200 @@ -1417,6 +1417,8 @@ model = 1; // Pentium (60,66) stepping = 3; // ??? features |= (1<<4); // implement TSC + + # if BX_SUPPORT_FPU features |= 0x01; # endif @@ -1424,6 +1426,31 @@ features |= (1<<23); // support MMX # endif +/* + * Laurent Gualdi 21/05/2003 + * Set the VME bit to 1 when + * the cpu support Virtual 8086 mode + * _Not fully tested_ + * + */ + +#if BX_SUPPORT_V8086_MODE + features |= (1<<1); +#endif + +#if BX_SET_DE_BIT + /* + * Laurent Gualdi 14/03/2003: + * Really small hack that + * Set the DE bit to 1 + * Like that, L4-ka Hazelnut can start + * on bochs + * _Not fully tested !!!_ + */ + features |= (1<<2); //implement DE +#endif + + #elif BX_CPU_LEVEL == 6 family = 6; #if BX_SUPPORT_X86_64 @@ -1432,6 +1459,20 @@ model = 1; // Pentium Pro #endif stepping = 3; // ??? + +#if BX_SET_DE_BIT + /* + * Laurent Gualdi 14/03/2003: + * Really small hack that + * Set the DE bit to 1 + * Like that, L4-ka Hazelnut can start + * on bochs + * _Not fully tested !!!_ + */ + features |= (1<<2); //implement DE +#endif + + features |= (1<<4); // implement TSC features |= (1<<15); // Implement CMOV instructions. # if BX_SUPPORT_APIC @@ -1451,6 +1492,8 @@ features |= (1<<26); // support SSE2 # endif + + #else BX_PANIC(("CPUID: not implemented for > 6")); #endif