Module Name: src
Committed By: mrg
Date: Thu Aug 24 23:45:08 UTC 2017
Modified Files:
src/sys/arch/mips/mips: bds_emul.S
Log Message:
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.8 -r1.9 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/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.9
--- 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 24 23:45:08 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.9 2017/08/24 23:45:08 mrg 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
