Update to 1.4. Notable changes:

- Completely remove half-done disk controller, skeletonize half-done fpu
- Guard use of the FPU with a runtime option (-o fpu).

11 files changed, 35 insertions, 115 deletions

diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 8f1d96d03f8..f75681dc570 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 12:55:21 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/14 05:44:44 shattered Exp $
 #
 
-DISTNAME=		vmips-1.3.1
+DISTNAME=		vmips-1.4
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vmips/}
 
@@ -11,6 +11,7 @@ COMMENT=		MIPS R3000 emulator
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 INSTALLATION_DIRS=	bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
@@ -19,4 +20,11 @@ CONF_FILES=		${EGDIR}/vmipsrc ${PKG_SYSCONFDIR}/vmipsrc
 
 USE_LANGUAGES=		c c++
 
+do-test:
+	if ${PKG_INFO} -qe dejagnu; then		\
+		(cd ${WRKSRC}/test_code && ${MAKE} check);	\
+	else						\
+		${ECHO} "dejagnu is required for the test target";	\
+	fi
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmips/distinfo b/emulators/vmips/distinfo
index 5ee1c44223a..2f8ad51d03d 100644
--- a/emulators/vmips/distinfo
+++ b/emulators/vmips/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/11/27 19:39:09 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/10/14 05:44:44 shattered Exp $
 
-SHA1 (vmips-1.3.1.tar.gz) = 0ca5d942db5ceaabe18aae831e80df59be8e16d9
-RMD160 (vmips-1.3.1.tar.gz) = cfc831072cac4295e26fc57d8ed892d56f32c81a
-Size (vmips-1.3.1.tar.gz) = 1144409 bytes
-SHA1 (patch-aa) = c8ba30db8a11adfd3848771e8eea5bdb0821b767
-SHA1 (patch-ab) = 3cc0b6f7a02f06cfbf9d70a1b26944b89f834c56
+SHA1 (vmips-1.4.tar.gz) = e8e1699c6922c00ed39d3e6210ba92bf5381e5aa
+RMD160 (vmips-1.4.tar.gz) = 6bc6b7bac1dc692ce8bce879b0e1c96ad779e9cc
+Size (vmips-1.4.tar.gz) = 1028066 bytes
 SHA1 (patch-cpu.cc) = 723ab3f436a460b3a7cca0f7610943606a8bdc3e
-SHA1 (patch-cpzero.h) = 7b476c321a0a7a272c7af3b32c38d02d3e991349
-SHA1 (patch-debug.cc) = c2307568ec6c5854c1a9e7fe6176069e4551ffca
-SHA1 (patch-exeloader.cc) = df1facc3acaf78f3f57b398dc201a94a5cf67edf
-SHA1 (patch-options.cc) = ac2319232f2e8cec8f4cc7c9117f3ac8faa88f99
-SHA1 (patch-terminalcontroller.cc) = 9927a984d99f3ca2cfe4861e89d7e9a288f338c1
-SHA1 (patch-vmips.cc) = 4783cd484c251427efc93c384616a06b67593664
-SHA1 (patch-vmipstool.cc) = cc8b271f868f999e389eadc959e36747a5d9a444
+SHA1 (patch-options.cc) = 65c0a46c7c1d1feddef344f95026007ccc7b0b1d
+SHA1 (patch-vmipstool.cc) = fe42e124cb205764be08cff6f65d9c3300220dfc
diff --git a/emulators/vmips/patches/patch-aa b/emulators/vmips/patches/patch-aa
deleted file mode 100644
index 82528a9fe38..00000000000
--- a/emulators/vmips/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/10/10 11:29:19 rillig Exp $
-
---- deviceint.h.orig	2005-01-06 22:04:54.000000000 +0100
-+++ deviceint.h	2007-10-10 13:27:57.000000000 +0200
-@@ -52,7 +52,7 @@ public:
- 
- 	/* Return the bit of the CP0 Status and Cause registers corresponding
- 	   to interrupt line number NUM, or 0 if no such interrupt line exists. */
--	static uint32 DeviceInt::num2irq(uint32 num) throw();
-+	static uint32 num2irq(uint32 num) throw();
- 
- protected:
- 	/* Assert an interrupt request on interrupt line LINE, which
diff --git a/emulators/vmips/patches/patch-ab b/emulators/vmips/patches/patch-ab
deleted file mode 100644
index a71e1bdff9c..00000000000
--- a/emulators/vmips/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/10/10 11:29:20 rillig Exp $
-
---- vmips.h.orig	2005-01-06 22:04:54.000000000 +0100
-+++ vmips.h	2007-10-10 13:27:20.000000000 +0200
-@@ -145,7 +145,7 @@ protected:
- 		TerminalController *c, const char *c_name) throw();
- 
- 	/* Initialize the halt device if it is configured. */
--    bool vmips::setup_haltdevice() throw( std::bad_alloc );
-+	bool setup_haltdevice() throw( std::bad_alloc );
- 
- public:
- 	void refresh_options(void);
diff --git a/emulators/vmips/patches/patch-cpzero.h b/emulators/vmips/patches/patch-cpzero.h
deleted file mode 100644
index e9db83ea024..00000000000
--- a/emulators/vmips/patches/patch-cpzero.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cpzero.h,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- cpzero.h.orig	2011-11-27 02:49:21.000000000 +0000
-+++ cpzero.h
-@@ -53,7 +53,7 @@ class CPZero
- 	void tlbp_emulate(uint32 instr, uint32 pc);
- 	void rfe_emulate(uint32 instr, uint32 pc);
- 	void load_addr_trans_excp_info(uint32 va, uint32 vpn, TLBEntry *match);
--	int find_matching_tlb_entry(uint32 asid, uint32 asid);
-+	int find_matching_tlb_entry(uint32 asid, uint32 asid2);
- 	uint32 tlb_translate(uint32 seg, uint32 vaddr, int mode,
- 		bool *cacheable, DeviceExc *client);
- 
diff --git a/emulators/vmips/patches/patch-debug.cc b/emulators/vmips/patches/patch-debug.cc
deleted file mode 100644
index 3a8f5a12122..00000000000
--- a/emulators/vmips/patches/patch-debug.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-debug.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- debug.cc.orig	2011-11-27 02:49:35.000000000 +0000
-+++ debug.cc
-@@ -17,6 +17,8 @@ You should have received a copy of the G
- with VMIPS; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include "debug.h"
- #include "remotegdb.h"
- #include "cpu.h"
diff --git a/emulators/vmips/patches/patch-exeloader.cc b/emulators/vmips/patches/patch-exeloader.cc
deleted file mode 100644
index 1c7881625a2..00000000000
--- a/emulators/vmips/patches/patch-exeloader.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-exeloader.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- exeloader.cc.orig	2011-11-27 02:49:56.000000000 +0000
-+++ exeloader.cc
-@@ -18,6 +18,7 @@ with VMIPS; if not, write to the Free So
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
- #include <string>
-+#include <cstring>
- #include <cerrno>
- #include <cstdio>
- #include "vmips.h"
diff --git a/emulators/vmips/patches/patch-options.cc b/emulators/vmips/patches/patch-options.cc
index e385265ef1e..9253d4e0231 100644
--- a/emulators/vmips/patches/patch-options.cc
+++ b/emulators/vmips/patches/patch-options.cc
@@ -1,14 +1,19 @@
-$NetBSD: patch-options.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+$NetBSD: patch-options.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $
 
---- options.cc.orig	2011-11-27 02:50:22.000000000 +0000
+--- options.cc.orig	2011-05-08 07:23:19.000000000 +0000
 +++ options.cc
-@@ -25,6 +25,9 @@ with VMIPS; if not, write to the Free So
+@@ -24,13 +24,13 @@ with VMIPS; if not, write to the Free So
+ #include <cassert>
  #include <cctype>
  #include <cerrno>
- #include <cstdio>
 +#include <climits>
-+#include <cstdlib>
-+#include <cstring>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
  #include <pwd.h>
  #include <string>
  #include <unistd.h>
+-#include <limits.h>
+ #include <vector>
+ 
+ #define OPTBUFSIZ 1024
diff --git a/emulators/vmips/patches/patch-terminalcontroller.cc b/emulators/vmips/patches/patch-terminalcontroller.cc
deleted file mode 100644
index dbdfccc36ae..00000000000
--- a/emulators/vmips/patches/patch-terminalcontroller.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-terminalcontroller.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- terminalcontroller.cc.orig	2011-11-27 02:51:21.000000000 +0000
-+++ terminalcontroller.cc
-@@ -21,6 +21,7 @@ with VMIPS; if not, write to the Free So
- #include "error.h"
- #include "terminalcontroller.h"
- #include <cassert>
-+#include <cstring>
- #include <errno.h>
- #include <sys/time.h>
- #include <unistd.h>
diff --git a/emulators/vmips/patches/patch-vmips.cc b/emulators/vmips/patches/patch-vmips.cc
deleted file mode 100644
index a1c56059759..00000000000
--- a/emulators/vmips/patches/patch-vmips.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-vmips.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- vmips.cc.orig	2011-11-27 02:51:01.000000000 +0000
-+++ vmips.cc
-@@ -50,6 +50,7 @@ with VMIPS; if not, write to the Free So
- #include <cassert>
- #include <csignal>
- #include <cstdarg>
-+#include <cstring>
- #include <string>
- #include <exception>
- 
diff --git a/emulators/vmips/patches/patch-vmipstool.cc b/emulators/vmips/patches/patch-vmipstool.cc
index f8d3ef25896..2dc7e63b6b4 100644
--- a/emulators/vmips/patches/patch-vmipstool.cc
+++ b/emulators/vmips/patches/patch-vmipstool.cc
@@ -1,14 +1,16 @@
-$NetBSD: patch-vmipstool.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+$NetBSD: patch-vmipstool.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $
 
---- vmipstool.cc.orig	2011-11-27 02:51:38.000000000 +0000
+--- vmipstool.cc.orig	2011-05-08 07:23:19.000000000 +0000
 +++ vmipstool.cc
-@@ -33,6 +33,9 @@ int getpagesize(void);
+@@ -32,9 +32,9 @@ int getpagesize(void);
+ #include "options.h"
  #include <cerrno>
  #include <cstdarg>
- #include <cstdio>
+-#include <cstring>
 +#include <climits>
-+#include <cstdlib>
+ #include <cstdlib>
+-#include <limits.h>
 +#include <cstring>
+ #include <cstdio>
  #include <iostream>
  #include <sys/stat.h>
- #include <sys/wait.h>