Module Name: src
Committed By: martin
Date: Thu Aug 31 11:16:17 UTC 2017
Modified Files:
src/sys/arch/evbmips/conf [netbsd-8]: MALTA MALTA32 MALTA64
src/sys/arch/mips/mips [netbsd-8]: bds_emul.S
Log Message:
Pull up following revision(s) (requested by mrg in ticket #239):
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.85 -r1.85.8.1 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.3 -r1.3.40.1 src/sys/arch/evbmips/conf/MALTA32
cvs rdiff -u -r1.7 -r1.7.12.1 src/sys/arch/evbmips/conf/MALTA64
cvs rdiff -u -r1.8 -r1.8.10.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.85 src/sys/arch/evbmips/conf/MALTA:1.85.8.1
--- src/sys/arch/evbmips/conf/MALTA:1.85 Tue Dec 13 20:42:17 2016
+++ src/sys/arch/evbmips/conf/MALTA Thu Aug 31 11:16:17 2017
@@ -1,17 +1,18 @@
-# $NetBSD: MALTA,v 1.85 2016/12/13 20:42:17 christos Exp $
+# $NetBSD: MALTA,v 1.85.8.1 2017/08/31 11:16:17 martin Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.85 $"
+#ident "MALTA-$Revision: 1.85.8.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.40.1
--- src/sys/arch/evbmips/conf/MALTA32:1.3 Thu Feb 9 18:58:44 2012
+++ src/sys/arch/evbmips/conf/MALTA32 Thu Aug 31 11:16:17 2017
@@ -1,11 +1,10 @@
-# $NetBSD: MALTA32,v 1.3 2012/02/09 18:58:44 matt Exp $
+# $NetBSD: MALTA32,v 1.3.40.1 2017/08/31 11:16:17 martin 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.7 src/sys/arch/evbmips/conf/MALTA64:1.7.12.1
--- src/sys/arch/evbmips/conf/MALTA64:1.7 Sun Aug 17 21:17:43 2014
+++ src/sys/arch/evbmips/conf/MALTA64 Thu Aug 31 11:16:17 2017
@@ -1,11 +1,10 @@
-# $NetBSD: MALTA64,v 1.7 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: MALTA64,v 1.7.12.1 2017/08/31 11:16:17 martin Exp $
#
include "arch/evbmips/conf/MALTA"
makeoptions LP64="yes"
no options MIPS32
-options NOFPU # No FPU
options EXEC_ELF64
options COMPAT_NETBSD32
no makeoptions COPY_SYMTAB
Index: src/sys/arch/mips/mips/bds_emul.S
diff -u src/sys/arch/mips/mips/bds_emul.S:1.8 src/sys/arch/mips/mips/bds_emul.S:1.8.10.1
--- src/sys/arch/mips/mips/bds_emul.S:1.8 Tue Jun 9 22:50:50 2015
+++ src/sys/arch/mips/mips/bds_emul.S Thu Aug 31 11:16:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bds_emul.S,v 1.8 2015/06/09 22:50:50 matt Exp $ */
+/* $NetBSD: bds_emul.S,v 1.8.10.1 2017/08/31 11:16:17 martin 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
