Skip to content

Instantly share code, notes, and snippets.

@khanhnt2

khanhnt2/patch.diff

Created Jun 3, 2020
Embed
What would you like to do?
diff --git a/.conf.win32-vcpp b/.conf.win32-vcpp
index 28a6865..61f3d1f 100644
--- a/.conf.win32-vcpp
+++ b/.conf.win32-vcpp
@@ -2,27 +2,26 @@
set echo
-./configure --target=pentium-windows \
- --enable-sb16 \
+./configure --enable-sb16 \
--enable-ne2000 \
- --enable-all-optimizations \
--enable-cpu-level=6 \
--enable-x86-64 \
- --enable-vmx=2 \
--enable-pci \
- --enable-clgd54xx \
- --enable-voodoo \
- --enable-usb \
- --enable-usb-ohci \
- --enable-usb-ehci \
- --enable-usb-xhci \
--enable-busmouse \
+ --enable-fast-function-calls \
--enable-es1370 \
--enable-e1000 \
--enable-show-ips \
+ --enable-avx \
+ --enable-fpu \
+ --enable-evex \
+ --enable-gameport \
--disable-readline \
+ --enable-all-optimizations \
+ --disable-memtype \
--without-x \
- --with-win32 --with-rfb --with-nogui
+ --with-win32 --with-rfb \
+ --enable-instrumentation="instrument/stubs"
unset echo
diff --git a/cpu/decoder/fetchdecode32.cc b/cpu/decoder/fetchdecode32.cc
index d348941..9a99505 100644
--- a/cpu/decoder/fetchdecode32.cc
+++ b/cpu/decoder/fetchdecode32.cc
@@ -23,6 +23,7 @@
#include "bochs.h"
#ifndef BX_STANDALONE_DECODER
#include "../cpu.h"
+#include "ia_opcodes.h"
#endif
#include "decoder.h"
diff --git a/iodev/network/slirp/slirp.cc b/iodev/network/slirp/slirp.cc
index d079872..c3e07a9 100644
--- a/iodev/network/slirp/slirp.cc
+++ b/iodev/network/slirp/slirp.cc
@@ -26,8 +26,8 @@
*/
#define BX_PLUGGABLE
-#include "slirp.h"
#include "iodev.h"
+#include "slirp.h"
#if BX_NETWORKING && BX_NETMOD_SLIRP
diff --git a/iodev/network/slirp/slirp.h b/iodev/network/slirp/slirp.h
index 6118752..34353de 100644
--- a/iodev/network/slirp/slirp.h
+++ b/iodev/network/slirp/slirp.h
@@ -392,8 +392,8 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
#endif
#ifdef _WIN32
-#undef errno
-#define errno (WSAGetLastError())
+//#undef errno
+//#define errno (WSAGetLastError())
#endif
#endif
diff --git a/plugin.h b/plugin.h
index c13b165..af5c2ca 100644
--- a/plugin.h
+++ b/plugin.h
@@ -317,7 +317,7 @@ typedef void (*deviceInitMem_t)(BX_MEM_C *);
typedef void (*deviceInitDev_t)(void);
typedef void (*deviceReset_t)(unsigned);
-BOCHSAPI void pluginRegisterDeviceDevmodel(plugin_t *plugin, plugintype_t type, bx_devmodel_c *dev, const char *name);
+BOCHSAPI void pluginRegisterDeviceDevmodel(plugin_t *plugin, plugintype_t type, bx_devmodel_c *devmodel, const char *name);
BOCHSAPI void pluginUnregisterDeviceDevmodel(const char *name);
BOCHSAPI bx_bool pluginDevicePresent(const char *name);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.