|
 |
d1b196 |
diff -ru bochs-2.6.11.orig/cpu/icache.h bochs-2.6.11/cpu/icache.h
|
|
|
d1b196 |
--- bochs-2.6.11.orig/cpu/icache.h 2019-12-09 17:44:36.435957000 +0100
|
|
|
d1b196 |
+++ bochs-2.6.11/cpu/icache.h 2021-07-18 13:10:35.350797475 +0200
|
|
|
d1b196 |
@@ -28,7 +28,7 @@
|
|
|
d1b196 |
|
|
|
d1b196 |
class bxPageWriteStampTable
|
|
|
d1b196 |
{
|
|
|
d1b196 |
- const Bit32u PHY_MEM_PAGES = 1024*1024;
|
|
|
d1b196 |
+ #define PHY_MEM_PAGES (1024*1024)
|
|
|
d1b196 |
Bit32u *fineGranularityMapping;
|
|
|
d1b196 |
|
|
|
d1b196 |
public:
|
|
|
d1b196 |
diff -ru bochs-2.6.9.orig/main.cc bochs-2.6.9/main.cc
|
|
|
d1b196 |
--- bochs-2.6.9.orig/main.cc 2017-02-18 17:28:04.318635000 +0100
|
|
|
d1b196 |
+++ bochs-2.6.9/main.cc 2021-07-18 01:15:37.859411673 +0200
|
|
|
d1b196 |
@@ -1525,5 +1525,9 @@
|
|
|
d1b196 |
}
|
|
|
d1b196 |
#endif
|
|
|
d1b196 |
|
|
|
d1b196 |
+ /* FIXME: this works, but definitely isn't right! */
|
|
|
d1b196 |
+ if(signum == 0)
|
|
|
d1b196 |
+ return;
|
|
|
d1b196 |
+
|
|
|
d1b196 |
BX_PANIC(("SIGNAL %u caught", signum));
|
|
|
d1b196 |
}
|
|
|
d1b196 |
diff -ru bochs-2.6.9.orig/configure bochs-2.6.9/configure
|
|
|
d1b196 |
--- bochs-2.6.9.orig/configure 2017-04-09 08:46:13.780213000 +0200
|
|
|
d1b196 |
+++ bochs-2.6.9/configure 2021-07-17 23:41:23.537634378 +0200
|
|
|
d1b196 |
@@ -23665,7 +23665,7 @@
|
|
|
d1b196 |
|
|
|
d1b196 |
fi
|
|
|
d1b196 |
case "$target" in
|
|
|
d1b196 |
- *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*)
|
|
|
d1b196 |
+ *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32* | *-midipix*)
|
|
|
d1b196 |
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
|
|
|
d1b196 |
ethernet_modules="$ethernet_modules win32"
|
|
|
d1b196 |
$as_echo "#define BX_NETMOD_WIN32 1" >>confdefs.h
|
|
|
d1b196 |
@@ -24629,10 +24629,10 @@
|
|
|
d1b196 |
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)"
|
|
|
d1b196 |
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
|
|
d1b196 |
# the files in gui/*.cc.
|
|
|
d1b196 |
- SDL_CFLAGS=`sdl-config --cflags`
|
|
|
d1b196 |
+ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl`
|
|
|
d1b196 |
GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
|
|
|
d1b196 |
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
|
|
|
d1b196 |
- GUI_LINK_OPTS_SDL="`sdl-config --libs`"
|
|
|
d1b196 |
+ GUI_LINK_OPTS_SDL=`$PKG_CONFIG --libs sdl`
|
|
|
d1b196 |
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
|
|
|
d1b196 |
# The enhanced X debugger depends on GTK2
|
|
|
d1b196 |
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
|
|
|
d1b196 |
diff -ru bochs-2.6.9.orig/gui/term.cc bochs-2.6.9/gui/term.cc
|
|
|
d1b196 |
--- bochs-2.6.9.orig/gui/term.cc 2017-01-15 12:44:43.207284000 +0100
|
|
|
d1b196 |
+++ bochs-2.6.9/gui/term.cc 2019-11-04 21:23:25.102021241 +0100
|
|
|
d1b196 |
@@ -29,7 +29,7 @@
|
|
|
d1b196 |
#if BX_WITH_TERM
|
|
|
d1b196 |
|
|
|
d1b196 |
extern "C" {
|
|
|
d1b196 |
-#include <curses.h>
|
|
|
d1b196 |
+#include <ncurses.h>
|
|
|
d1b196 |
#include <signal.h>
|
|
|
d1b196 |
};
|
|
|
d1b196 |
|