Module Name: src
Committed By: rin
Date: Wed Jul 15 09:19:49 UTC 2020
Modified Files:
src/sys/arch/powerpc/include: fpu.h
src/sys/arch/powerpc/powerpc: fpu.c
Log Message:
Expose fpu_get_fault_code() even if !PPC_HAVE_FPU, and
adjust it to systems without FPU.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/include/fpu.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/powerpc/powerpc/fpu.c
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/powerpc/include/fpu.h
diff -u src/sys/arch/powerpc/include/fpu.h:1.24 src/sys/arch/powerpc/include/fpu.h:1.25
--- src/sys/arch/powerpc/include/fpu.h:1.24 Mon Jul 6 10:52:12 2020
+++ src/sys/arch/powerpc/include/fpu.h Wed Jul 15 09:19:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.24 2020/07/06 10:52:12 rin Exp $ */
+/* $NetBSD: fpu.h,v 1.25 2020/07/15 09:19:49 rin Exp $ */
/*-
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -83,6 +83,8 @@ void fpu_mark_used(struct lwp *);
void fpu_restore_from_mcontext(struct lwp *, const mcontext_t *);
bool fpu_save_to_mcontext(struct lwp *, mcontext_t *, unsigned int *);
+int fpu_get_fault_code(void);
+
extern const pcu_ops_t fpu_ops;
/* List of PowerPC architectures that support FPUs. */
@@ -112,8 +114,6 @@ fpu_discard(lwp_t *l)
void fpu_load_from_fpreg(const struct fpreg *);
void fpu_unload_to_fpreg(struct fpreg *);
-int fpu_get_fault_code(void);
-
#endif /* PPC_HAVE_FPU */
#endif /* _KERNEL */
Index: src/sys/arch/powerpc/powerpc/fpu.c
diff -u src/sys/arch/powerpc/powerpc/fpu.c:1.41 src/sys/arch/powerpc/powerpc/fpu.c:1.42
--- src/sys/arch/powerpc/powerpc/fpu.c:1.41 Mon Jul 6 10:52:12 2020
+++ src/sys/arch/powerpc/powerpc/fpu.c Wed Jul 15 09:19:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $ */
+/* $NetBSD: fpu.c,v 1.42 2020/07/15 09:19:49 rin Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.42 2020/07/15 09:19:49 rin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -124,7 +124,6 @@ fpu_state_release(lwp_t *l)
#endif
}
-#ifdef PPC_HAVE_FPU
#define STICKYBITS (FPSCR_VX|FPSCR_OX|FPSCR_UX|FPSCR_ZX|FPSCR_XX)
#define STICKYSHIFT 25
#define MASKBITS (FPSCR_VE|FPSCR_OE|FPSCR_UE|FPSCR_ZE|FPSCR_XE)
@@ -139,6 +138,7 @@ fpu_get_fault_code(void)
uint32_t fpscr, ofpscr;
int code;
+#ifdef PPC_HAVE_FPU
kpreempt_disable();
struct cpu_info * const ci = curcpu();
@@ -182,6 +182,10 @@ fpu_get_fault_code(void)
}
kpreempt_enable();
+#else /* !PPC_HAVE_FPU */
+ fpscr64 = *(uint64_t *)&pcb->pcb_fpu.fpscr;
+ ((uint32_t *)&pcb->pcb_fpu.fpscr)[_QUAD_LOWWORD] &= ~MASKBITS;
+#endif
/*
* Now determine the fault type. First we test to see if any of sticky
@@ -207,7 +211,6 @@ fpu_get_fault_code(void)
else code = 0;
return code;
}
-#endif /* PPC_HAVE_FPU */
bool
fpu_save_to_mcontext(lwp_t *l, mcontext_t *mcp, unsigned int *flagp)
