1 files changed, 12 insertions, 77 deletions
diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab
index f5a9951d796..6f82f1a5a1f 100644
--- a/emulators/bochs/patches/patch-ab
+++ b/emulators/bochs/patches/patch-ab
@@ -1,78 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2003/10/24 22:03:53 bouyer Exp $
+$NetBSD: patch-ab,v 1.6 2004/02/12 00:10:32 hubertf Exp $
 
---- cpu/fetchdecode.cc.orig	2003-10-18 20:42:56.000000000 +0200
-+++ cpu/fetchdecode.cc	2003-10-18 20:45:25.000000000 +0200
-@@ -160,53 +160,53 @@
- } BxOpcodeInfo_t;
- 
- static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEwIw } },
--  { 0,  { &BX_CPU_C::ADD_EGwIw } }
-+  { 0,  &BX_CPU_C::ADD_EEwIw  },
-+  { 0,  &BX_CPU_C::ADD_EGwIw  }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_EdId[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEdId } },
--  { 0,  { &BX_CPU_C::ADD_EGdId } }
-+  { 0,  &BX_CPU_C::ADD_EEdId },
-+  { 0,  &BX_CPU_C::ADD_EGdId }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
--  { 0,  { &BX_CPU_C::ADD_GwEEw } },
--  { 0,  { &BX_CPU_C::ADD_GwEGw } }
-+  { 0,  &BX_CPU_C::ADD_GwEEw },
-+  { 0,  &BX_CPU_C::ADD_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
--  { 0,  { &BX_CPU_C::ADD_GdEEd } },
--  { 0,  { &BX_CPU_C::ADD_GdEGd } }
-+  { 0,  &BX_CPU_C::ADD_GdEEd },
-+  { 0,  &BX_CPU_C::ADD_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
--  { 0,  { &BX_CPU_C::MOV_GbEEb } },
--  { 0,  { &BX_CPU_C::MOV_GbEGb } }
-+  { 0,  &BX_CPU_C::MOV_GbEEb },
-+  { 0,  &BX_CPU_C::MOV_GbEGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
--  { 0,  { &BX_CPU_C::MOV_GwEEw } },
--  { 0,  { &BX_CPU_C::MOV_GwEGw } }
-+  { 0,  &BX_CPU_C::MOV_GwEEw },
-+  { 0,  &BX_CPU_C::MOV_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
--  { 0,  { &BX_CPU_C::MOV_GdEEd } },
--  { 0,  { &BX_CPU_C::MOV_GdEGd } }
-+  { 0,  &BX_CPU_C::MOV_GdEEd },
-+  { 0,  &BX_CPU_C::MOV_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEbGb } },
--  { 0,  { &BX_CPU_C::MOV_EGbGb } }
-+  { 0,  &BX_CPU_C::MOV_EEbGb },
-+  { 0,  &BX_CPU_C::MOV_EGbGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEwGw } },
--  { 0,  { &BX_CPU_C::MOV_EGwGw } }
-+  { 0,  &BX_CPU_C::MOV_EEwGw },
-+  { 0,  &BX_CPU_C::MOV_EGwGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEdGd } },
--  { 0,  { &BX_CPU_C::MOV_EGdGd } }
-+  { 0,  &BX_CPU_C::MOV_EEdGd },
-+  { 0,  &BX_CPU_C::MOV_EGdGd }
-   };
- 
- /* ********** */
+--- iodev/eth_tap.cc.orig	Thu Oct  2 13:33:41 2003
++++ iodev/eth_tap.cc
+@@ -100,7 +100,7 @@
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
+ #include <net/if.h>
+ #else
+ #include <asm/types.h>