Module Name: src
Committed By: andvar
Date: Sun Oct 8 17:42:58 UTC 2023
Modified Files:
src/sys/arch/news68k/news68k: locore.s vectors.s
Log Message:
Revert my changes regarding removal of FPSP related blocks.
After additional discussion it is preferred to keep code consistency,
to make it easier refactor common code between m68k ports.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/news68k/news68k/vectors.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/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.69 src/sys/arch/news68k/news68k/locore.s:1.70
--- src/sys/arch/news68k/news68k/locore.s:1.69 Fri Oct 6 21:10:12 2023
+++ src/sys/arch/news68k/news68k/locore.s Sun Oct 8 17:42:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.69 2023/10/06 21:10:12 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.70 2023/10/08 17:42:58 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,6 +44,7 @@
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
+#include "opt_fpsp.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
Index: src/sys/arch/news68k/news68k/vectors.s
diff -u src/sys/arch/news68k/news68k/vectors.s:1.8 src/sys/arch/news68k/news68k/vectors.s:1.9
--- src/sys/arch/news68k/news68k/vectors.s:1.8 Fri Oct 6 21:10:12 2023
+++ src/sys/arch/news68k/news68k/vectors.s Sun Oct 8 17:42:58 2023
@@ -1,4 +1,4 @@
-| $NetBSD: vectors.s,v 1.8 2023/10/06 21:10:12 andvar Exp $
+| $NetBSD: vectors.s,v 1.9 2023/10/08 17:42:58 andvar Exp $
| Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
| Copyright (c) 1988 University of Utah
@@ -109,6 +109,15 @@ GLOBAL(vectab)
VECTOR(illinst) /* 45: TRAP instruction vector */
VECTOR(illinst) /* 46: TRAP instruction vector */
VECTOR(trap15) /* 47: TRAP instruction vector */
+#ifdef FPSP
+ ASVECTOR(bsun) /* 48: FPCP branch/set on unordered cond */
+ ASVECTOR(inex) /* 49: FPCP inexact result */
+ ASVECTOR(dz) /* 50: FPCP divide by zero */
+ ASVECTOR(unfl) /* 51: FPCP underflow */
+ ASVECTOR(operr) /* 52: FPCP operand error */
+ ASVECTOR(ovfl) /* 53: FPCP overflow */
+ ASVECTOR(snan) /* 54: FPCP signalling NAN */
+#else
VECTOR(fpfault) /* 48: FPCP branch/set on unordered cond */
VECTOR(fpfault) /* 49: FPCP inexact result */
VECTOR(fpfault) /* 50: FPCP divide by zero */
@@ -116,6 +125,8 @@ GLOBAL(vectab)
VECTOR(fpfault) /* 52: FPCP operand error */
VECTOR(fpfault) /* 53: FPCP overflow */
VECTOR(fpfault) /* 54: FPCP signalling NAN */
+#endif
+
VECTOR(fpunsupp) /* 55: FPCP unimplemented data type */
VECTOR(badtrap) /* 56: unassigned, reserved */
VECTOR(badtrap) /* 57: unassigned, reserved */
