Sync to 970110 NetBSD

6 files changed, 13 insertions, 16 deletions

diff --git a/sys/arch/m68k/fpe/fpu_calcea.c b/sys/arch/m68k/fpe/fpu_calcea.c
index b8a29000959..00c9ce209f3 100644
--- a/sys/arch/m68k/fpe/fpu_calcea.c
+++ b/sys/arch/m68k/fpe/fpu_calcea.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_calcea.c,v 1.3 1996/05/09 22:20:43 niklas Exp $	*/
-/*	$NetBSD: fpu_calcea.c,v 1.4 1996/04/30 11:52:11 briggs Exp $	*/
+/*	$OpenBSD: fpu_calcea.c,v 1.4 1997/01/13 11:51:03 niklas Exp $	*/
+/*	$NetBSD: fpu_calcea.c,v 1.7 1996/10/16 06:27:05 scottr Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -50,8 +50,6 @@ static int fetch_disp __P((struct frame *frame, struct instruction *insn,
 			   int size, int *res));
 static int calc_ea __P((struct insn_ea *ea, char *ptr, char **eaddr));
 
-int fusword __P((void *));
-
 /*
  * Helper routines for dealing with "effective address" values.
  */
diff --git a/sys/arch/m68k/fpe/fpu_emulate.c b/sys/arch/m68k/fpe/fpu_emulate.c
index 5504d7e2d71..5092e3e7b55 100644
--- a/sys/arch/m68k/fpe/fpu_emulate.c
+++ b/sys/arch/m68k/fpe/fpu_emulate.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_emulate.c,v 1.6 1996/10/13 16:10:04 briggs Exp $	*/
-/*	$NetBSD: fpu_emulate.c,v 1.10 1996/10/13 03:19:12 christos Exp $	*/
+/*	$OpenBSD: fpu_emulate.c,v 1.7 1997/01/13 11:51:04 niklas Exp $	*/
+/*	$NetBSD: fpu_emulate.c,v 1.14 1996/12/18 05:44:31 scottr Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -52,8 +52,6 @@ static int fpu_emul_brcc __P((struct fpemu *fe, struct instruction *insn));
 static int test_cc __P((struct fpemu *fe, int pred));
 static struct fpn *fpu_cmp __P((struct fpemu *fe));
 
-int	fusword __P((void *));
-
 #if !defined(DL_DEFAULT)
 #  if defined(DEBUG_WITH_FPU)
 #    define DL_DEFAULT DL_ALL
@@ -871,6 +869,7 @@ fpu_emul_arith(fe, insn)
 	break;
 
     case 0x30:
+    case 0x31:
     case 0x32:
     case 0x33:
     case 0x34:
diff --git a/sys/arch/m68k/fpe/fpu_fmovecr.c b/sys/arch/m68k/fpe/fpu_fmovecr.c
index c3ebe5cdd06..42de32f45ec 100644
--- a/sys/arch/m68k/fpe/fpu_fmovecr.c
+++ b/sys/arch/m68k/fpe/fpu_fmovecr.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_fmovecr.c,v 1.3 1996/05/09 22:20:45 niklas Exp $	*/
-/*	$NetBSD: fpu_fmovecr.c,v 1.4 1996/04/30 11:52:22 briggs Exp $	*/
+/*	$OpenBSD: fpu_fmovecr.c,v 1.4 1997/01/13 11:51:05 niklas Exp $	*/
+/*	$NetBSD: fpu_fmovecr.c,v 1.6 1996/10/13 03:19:13 christos Exp $	*/
 
 /*
  * Copyright (c) 1995  Ken Nakata
diff --git a/sys/arch/m68k/fpe/fpu_fscale.c b/sys/arch/m68k/fpe/fpu_fscale.c
index 0deaef9da8e..8a87f181061 100644
--- a/sys/arch/m68k/fpe/fpu_fscale.c
+++ b/sys/arch/m68k/fpe/fpu_fscale.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_fscale.c,v 1.3 1996/05/29 11:29:32 niklas Exp $	*/
-/*	$NetBSD: fpu_fscale.c,v 1.4 1996/05/15 07:31:57 leo Exp $	*/
+/*	$OpenBSD: fpu_fscale.c,v 1.4 1997/01/13 11:51:05 niklas Exp $	*/
+/*	$NetBSD: fpu_fscale.c,v 1.6 1996/10/13 03:19:14 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Ken Nakata
diff --git a/sys/arch/m68k/fpe/fpu_fstore.c b/sys/arch/m68k/fpe/fpu_fstore.c
index bf39a7973ca..b0a8ad29ad0 100644
--- a/sys/arch/m68k/fpe/fpu_fstore.c
+++ b/sys/arch/m68k/fpe/fpu_fstore.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_fstore.c,v 1.2 1996/05/09 22:20:46 niklas Exp $	*/
-/*	$NetBSD: fpu_fstore.c,v 1.3 1996/04/30 11:52:27 briggs Exp $	*/
+/*	$OpenBSD: fpu_fstore.c,v 1.3 1997/01/13 11:51:06 niklas Exp $	*/
+/*	$NetBSD: fpu_fstore.c,v 1.5 1996/10/13 03:19:17 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Ken Nakata
diff --git a/sys/arch/m68k/fpe/fpu_log.c b/sys/arch/m68k/fpe/fpu_log.c
index d6a64e67433..ebdfee98438 100644
--- a/sys/arch/m68k/fpe/fpu_log.c
+++ b/sys/arch/m68k/fpe/fpu_log.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: fpu_log.c,v 1.2 1996/05/09 22:20:47 niklas Exp $	*/
-/*	$NetBSD: fpu_log.c,v 1.3 1996/04/30 11:52:33 briggs Exp $	*/
+/*	$OpenBSD: fpu_log.c,v 1.3 1997/01/13 11:51:06 niklas Exp $	*/
+/*	$NetBSD: fpu_log.c,v 1.5 1996/10/13 03:19:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1995  Ken Nakata