Fix wrong NBSEG values for all hp300 pmap derived m68k ports.

They were incorrect since 1997 on amiga and atari, and since 2002 on other ports, but fortunately they don't look so fatal. Anyway, these values will be moved into <m68k/pmap_motorola.h> soon since they are quite pmap implementation dependent.
2009-12-09 12:21:58 +00:00 · 2009-12-09 12:21:58 +00:00 · d7debedc42
parent bf65171399
commit d7debedc42
10 changed files with 34 additions and 33 deletions
--- a/sys/arch/amiga/include/param.h
+++ b/sys/arch/amiga/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.45 2008/01/06 18:50:32 mhitch Exp $	*/
+/*	$NetBSD: param.h,v 1.46 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -89,10 +89,10 @@
 #define	KERNBASE	0x00000000	/* start of kernel virtual */

 #define	SEGSHIFT	24		/* LOG2(NBSEG) [68030 value] */
-/* bytes/segment */
-/* (256 * (1 << PGSHIFT)) == (1 << SEGSHIFT) */
-#define NBSEG		((mmutype == MMU_68040) \
-			    ? (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+
+#define NBSEG		((mmutype == MMU_68040) ? \
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
+					/* bytes/segment */
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

 #define	UPAGES		2		/* pages of u-area */
--- a/sys/arch/atari/include/param.h
+++ b/sys/arch/atari/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.31 2008/01/03 01:02:04 joerg Exp $	*/
+/*	$NetBSD: param.h,v 1.32 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -89,10 +89,10 @@
 #define	KERNBASE	0x00000000	/* start of kernel virtual */

 #define	SEGSHIFT	24		/* LOG2(NBSEG) [68030 value] */
-/* bytes/segment */
-/* (256 * (1 << PGSHIFT)) == (1 << SEGSHIFT) */
+
 #define	NBSEG		((mmutype == MMU_68040) \
-			    ? (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    ? (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
+					/* bytes/segment */
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

 #define	UPAGES		2		/* pages of u-area */
--- a/sys/arch/cesfic/include/param.h
+++ b/sys/arch/cesfic/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.8 2009/03/14 14:45:58 dsl Exp $	*/
+/*	$NetBSD: param.h,v 1.9 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -101,10 +101,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.49 2007/12/31 13:38:50 ad Exp $	*/
+/*	$NetBSD: param.h,v 1.50 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -92,10 +92,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/luna68k/include/param.h
+++ b/sys/arch/luna68k/include/param.h
@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
+/* $NetBSD: param.h,v 1.9 2009/12/09 12:21:58 tsutsui Exp $ */

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -89,10 +89,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.41 2005/12/11 12:18:03 christos Exp $	*/
+/*	$NetBSD: param.h,v 1.42 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1990 The Regents of the University of California.
@ -127,10 +127,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.29 2008/01/12 09:54:28 tsutsui Exp $	*/
+/*	$NetBSD: param.h,v 1.30 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -99,10 +99,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/news68k/include/param.h
+++ b/sys/arch/news68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.12 2007/12/31 13:38:52 ad Exp $	*/
+/*	$NetBSD: param.h,v 1.13 2009/12/09 12:21:58 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -90,13 +90,14 @@
 #define	KERNBASE	0x00000000	/* start of kernel virtual */

 #define	SEGSHIFT	22		/* LOG2(NBSEG) */
+
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/next68k/include/param.h
+++ b/sys/arch/next68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.8 2005/12/11 12:18:25 christos Exp $	*/
+/*	$NetBSD: param.h,v 1.9 2009/12/09 12:21:59 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -92,10 +92,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */

--- a/sys/arch/x68k/include/param.h
+++ b/sys/arch/x68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.24 2007/12/31 13:38:53 ad Exp $	*/
+/*	$NetBSD: param.h,v 1.25 2009/12/09 12:21:59 tsutsui Exp $	*/

 /*
 * Copyright (c) 1982, 1986, 1990, 1993
@ -92,10 +92,10 @@
 #if defined(M68030) && !defined(M68040) && !defined(M68060)
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #elif (defined(M68040) || defined(M68060)) && !defined(M68030)
-#define	NBSEG		(32 * (1 << PGSHIFT))
+#define	NBSEG		(1 << 18 /* SG4_SHIFT2 */)
 #else
 #define	NBSEG		((mmutype == MMU_68040) ? \
-				(32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT)))
+			    (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 #endif
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */