Module Name: src Committed By: snj Date: Sun Sep 24 20:12:57 UTC 2017
Modified Files: src/sys/arch/evbmips/conf [netbsd-7]: MALTA MALTA32 MALTA64 src/sys/arch/mips/mips [netbsd-7]: bds_emul.S Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.3 -r1.3.22.1 src/sys/arch/evbmips/conf/MALTA32 cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/arch/evbmips/conf/MALTA64 cvs rdiff -u -r1.6 -r1.6.22.1 src/sys/arch/mips/mips/bds_emul.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbmips/conf/MALTA diff -u src/sys/arch/evbmips/conf/MALTA:1.78 src/sys/arch/evbmips/conf/MALTA:1.78.2.1 --- src/sys/arch/evbmips/conf/MALTA:1.78 Sun Jul 20 10:06:11 2014 +++ src/sys/arch/evbmips/conf/MALTA Sun Sep 24 20:12:57 2017 @@ -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 Index: src/sys/arch/evbmips/conf/MALTA32 diff -u src/sys/arch/evbmips/conf/MALTA32:1.3 src/sys/arch/evbmips/conf/MALTA32:1.3.22.1 --- src/sys/arch/evbmips/conf/MALTA32:1.3 Thu Feb 9 18:58:44 2012 +++ src/sys/arch/evbmips/conf/MALTA32 Sun Sep 24 20:12:57 2017 @@ -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* Index: src/sys/arch/evbmips/conf/MALTA64 diff -u src/sys/arch/evbmips/conf/MALTA64:1.6 src/sys/arch/evbmips/conf/MALTA64:1.6.12.1 --- src/sys/arch/evbmips/conf/MALTA64:1.6 Sat Oct 13 06:08:11 2012 +++ src/sys/arch/evbmips/conf/MALTA64 Sun Sep 24 20:12:57 2017 @@ -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 Index: src/sys/arch/mips/mips/bds_emul.S diff -u src/sys/arch/mips/mips/bds_emul.S:1.6 src/sys/arch/mips/mips/bds_emul.S:1.6.22.1 --- src/sys/arch/mips/mips/bds_emul.S:1.6 Sun Dec 25 11:51:15 2011 +++ src/sys/arch/mips/mips/bds_emul.S Sun Sep 24 20:12:57 2017 @@ -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 @@ bcemul_optbl: 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 @@ bcemul_uimmed_prologue: #ifndef __mips_o32 bcemul_daddi: bal bcemul_immed_prologue - daddiu t0, v0, v1 + dadd t0, v0, v1 b bcemul_check_add_overflow #endif