[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by mrg ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc473b70db87
branches:  netbsd-7
changeset: 800337:dc473b70db87
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Sep 24 20:12:57 2017 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1500):
        sys/arch/evbmips/conf/MALTA64: revision 1.8
        sys/arch/evbmips/conf/MALTA32: revision 1.4
        sys/arch/mips/mips/bds_emul.S: revision 1.9
        sys/arch/evbmips/conf/MALTA: revision 1.88
Re-enable the NOFPU and (renamed) FPEMUL options.  None of the Malta
CPU daughter cards currently supported by NetBSD have an FPU.
Detected on real hardware.  gxemul wrongly supports an FPU on the
4Kc and 5Kc CPUs.
--
Remove the NOFPU option.  The main MALTA config file has this now.
--
mips_emul_daddi and mips_emul_daddiu don't exist, but there are
bcemul_daddi and bcemul_daddiu here that should be used.  however,
bcemul_daddi needed to be changed to use dadd not daddui.
fixes FPEMUL and N64 kernels.  ok simonb.

diffstat:

 sys/arch/evbmips/conf/MALTA   |  9 +++++----
 sys/arch/evbmips/conf/MALTA32 |  3 +--
 sys/arch/evbmips/conf/MALTA64 |  3 +--
 sys/arch/mips/mips/bds_emul.S |  8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)

diffs (87 lines):

diff -r 1fcb2b237d15 -r dc473b70db87 sys/arch/evbmips/conf/MALTA
--- a/sys/arch/evbmips/conf/MALTA       Sun Sep 24 20:05:03 2017 +0000
+++ b/sys/arch/evbmips/conf/MALTA       Sun Sep 24 20:12:57 2017 +0000
@@ -1,17 +1,18 @@
-#      $NetBSD: MALTA,v 1.78 2014/07/20 10:06:11 alnsn Exp $
+#      $NetBSD: MALTA,v 1.78.2.1 2017/09/24 20:12:57 snj Exp $
 
 include        "arch/evbmips/conf/std.malta"
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "MALTA-$Revision: 1.78 $"
+#ident                 "MALTA-$Revision: 1.78.2.1 $"
 
 maxusers       32
 
 options        MIPS32
 options        MIPS64
-#options       NOFPU           # No FPU
-#options       FPEMUL          # emulate FPU insn
+
+options        NOFPU           # No FPU
+options        FPEMUL          # emulate FPU insn
 
 # Options for necessary to use MD
 # options      MEMORY_DISK_HOOKS
diff -r 1fcb2b237d15 -r dc473b70db87 sys/arch/evbmips/conf/MALTA32
--- a/sys/arch/evbmips/conf/MALTA32     Sun Sep 24 20:05:03 2017 +0000
+++ b/sys/arch/evbmips/conf/MALTA32     Sun Sep 24 20:12:57 2017 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: MALTA32,v 1.3 2012/02/09 18:58:44 matt Exp $
+# $NetBSD: MALTA32,v 1.3.22.1 2017/09/24 20:12:57 snj Exp $
 #
 include "arch/evbmips/conf/MALTA"
 
 makeoptions    LP64="no"
 
 no options     MIPS32
-options        NOFPU           # No FPU
 #options       EXEC_ELF64
 
 no ath*
diff -r 1fcb2b237d15 -r dc473b70db87 sys/arch/evbmips/conf/MALTA64
--- a/sys/arch/evbmips/conf/MALTA64     Sun Sep 24 20:05:03 2017 +0000
+++ b/sys/arch/evbmips/conf/MALTA64     Sun Sep 24 20:12:57 2017 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: MALTA64,v 1.6 2012/10/13 06:08:11 riz Exp $
+# $NetBSD: MALTA64,v 1.6.12.1 2017/09/24 20:12:57 snj Exp $
 #
 include "arch/evbmips/conf/MALTA"
 
 makeoptions    LP64="yes"
 
 no options     MIPS32
-options        NOFPU                   # No FPU
 options        EXEC_ELF64
 options        COMPAT_NETBSD32
 no options     SYMTAB_SPACE
diff -r 1fcb2b237d15 -r dc473b70db87 sys/arch/mips/mips/bds_emul.S
--- a/sys/arch/mips/mips/bds_emul.S     Sun Sep 24 20:05:03 2017 +0000
+++ b/sys/arch/mips/mips/bds_emul.S     Sun Sep 24 20:12:57 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bds_emul.S,v 1.6 2011/12/25 11:51:15 kiyohara Exp $    */
+/*     $NetBSD: bds_emul.S,v 1.6.22.1 2017/09/24 20:12:57 snj Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -101,8 +101,8 @@
        PTR_WORD bcemul_sigill                  # 030 LDL (*)
        PTR_WORD bcemul_sigill                  # 031 LDR (*)
 #else
-       PTR_WORD _C_LABEL(mips_emul_daddi)      # 030 DADDI (*)
-       PTR_WORD _C_LABEL(mips_emul_daddiu)     # 031 DADDIU (*)
+       PTR_WORD bcemul_daddi                   # 030 DADDI (*)
+       PTR_WORD bcemul_daddiu                  # 031 DADDIU (*)
        PTR_WORD _C_LABEL(mips_emul_ldl)        # 032 LDL (*)
        PTR_WORD _C_LABEL(mips_emul_ldr)        # 033 LDR (*)
 #endif
@@ -191,7 +191,7 @@
 #ifndef __mips_o32
 bcemul_daddi:
        bal     bcemul_immed_prologue
-       daddiu  t0, v0, v1
+       dadd    t0, v0, v1
        b       bcemul_check_add_overflow
 #endif