CVS commit: src/sys/arch/mac68k/mac68k

2024-01-03 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Jan  3 12:43:43 UTC 2024

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
get_physical(): Use bit defs from 


To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/arch/mac68k/mac68k/machdep.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/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.365 src/sys/arch/mac68k/mac68k/machdep.c:1.366
--- src/sys/arch/mac68k/mac68k/machdep.c:1.365	Sat Sep 23 13:45:50 2023
+++ src/sys/arch/mac68k/mac68k/machdep.c	Wed Jan  3 12:43:42 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $	*/
+/*	$NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $");
 
 #include "opt_adb.h"
 #include "opt_compat_netbsd.h"
@@ -122,6 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -2257,15 +2258,15 @@ get_physical(u_int addr, u_long * phys)
 
 	if (mmutype == MMU_68040) {
 		ph = ptest040((void *)addr, FC_SUPERD);
-		if ((ph & MMU40_RES) == 0) {
+		if ((ph & MMUSR40_R) == 0) {
 			ph = ptest040((void *)addr, FC_USERD);
-			if ((ph & MMU40_RES) == 0)
+			if ((ph & MMUSR40_R) == 0)
 return 0;
 		}
-		if ((ph & MMU40_TTR) != 0)
+		if ((ph & MMUSR40_T) != 0)
 			ph = addr;
 
-		mask = (macos_tc & 0x4000) ? 0x1fff : 0x0fff;
+		mask = (macos_tc & TCR40_P) ? 0x1fff : 0x0fff;
 		ph &= (~mask);
 	} else {
 		switch (get_pte(addr, pte, )) {



CVS commit: src/sys/arch/mac68k/mac68k

2024-01-03 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Jan  3 12:43:43 UTC 2024

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
get_physical(): Use bit defs from 


To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/arch/mac68k/mac68k/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2023-10-01 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Oct  1 21:04:10 UTC 2023

Modified Files:
src/sys/arch/mac68k/mac68k: vectors.s

Log Message:
remove unncessary leading space in #ifdef FPSP block.
remove one trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mac68k/mac68k/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/mac68k/mac68k/vectors.s
diff -u src/sys/arch/mac68k/mac68k/vectors.s:1.17 src/sys/arch/mac68k/mac68k/vectors.s:1.18
--- src/sys/arch/mac68k/mac68k/vectors.s:1.17	Tue Feb  8 20:20:18 2011
+++ src/sys/arch/mac68k/mac68k/vectors.s	Sun Oct  1 21:04:10 2023
@@ -1,4 +1,4 @@
-|	$NetBSD: vectors.s,v 1.17 2011/02/08 20:20:18 rmind Exp $
+|	$NetBSD: vectors.s,v 1.18 2023/10/01 21:04:10 andvar Exp $
 
 | Copyright (c) 1988 University of Utah
 | Copyright (c) 1990 Regents of the University of California.
@@ -89,7 +89,7 @@ GLOBAL(vectab)
 #ifdef COMPAT_16
 	VECTOR(trap3)		/* 35: compat_16_sigreturn */
 #else
-	VECTOR(illinst)	
+	VECTOR(illinst)
 #endif
 	VECTOR(illinst)		/* 36: TRAP instruction vector */
 	VECTOR(illinst)		/* 37: TRAP instruction vector */
@@ -104,21 +104,21 @@ GLOBAL(vectab)
 	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 */
+	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 */
- 	VECTOR(fpfault)		/* 51: FPCP underflow */
- 	VECTOR(fpfault)		/* 52: FPCP operand error */
- 	VECTOR(fpfault)		/* 53: FPCP overflow */
- 	VECTOR(fpfault)		/* 54: FPCP signalling NAN */
+	VECTOR(fpfault)		/* 48: FPCP branch/set on unordered cond */
+	VECTOR(fpfault)		/* 49: FPCP inexact result */
+	VECTOR(fpfault)		/* 50: FPCP divide by zero */
+	VECTOR(fpfault)		/* 51: FPCP underflow */
+	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 */



CVS commit: src/sys/arch/mac68k/mac68k

2023-10-01 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Oct  1 21:04:10 UTC 2023

Modified Files:
src/sys/arch/mac68k/mac68k: vectors.s

Log Message:
remove unncessary leading space in #ifdef FPSP block.
remove one trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mac68k/mac68k/vectors.s

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2023-09-23 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Sep 23 13:45:50 UTC 2023

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
pass just l param to exec_aout_prep_oldzmagic instead of l->l_proc.

In a huge "merge ktrace-lwp." commit struct proc was changed by struct lwp.
seemingly all 68k ports just replaced p with l, however mac68k changed to
refer to l->l_proc. I assume it was accidental leftover during refactoring.

fixes COMPAT_NOMID enabled build for mac68k.


To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/mac68k/mac68k/machdep.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/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.364 src/sys/arch/mac68k/mac68k/machdep.c:1.365
--- src/sys/arch/mac68k/mac68k/machdep.c:1.364	Mon Dec 26 01:05:35 2022
+++ src/sys/arch/mac68k/mac68k/machdep.c	Sat Sep 23 13:45:50 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $	*/
+/*	$NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $");
 
 #include "opt_adb.h"
 #include "opt_compat_netbsd.h"
@@ -846,7 +846,7 @@ cpu_exec_aout_makecmds(struct lwp *l, st
 #ifdef COMPAT_NOMID
 	/* Check to see if MID == 0. */
 	if (((struct exec *)epp->ep_hdr)->a_midmag == ZMAGIC)
-		return exec_aout_prep_oldzmagic(l->l_proc, epp);
+		return exec_aout_prep_oldzmagic(l, epp);
 #endif
 
 	return error;



CVS commit: src/sys/arch/mac68k/mac68k

2023-09-23 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Sep 23 13:45:50 UTC 2023

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
pass just l param to exec_aout_prep_oldzmagic instead of l->l_proc.

In a huge "merge ktrace-lwp." commit struct proc was changed by struct lwp.
seemingly all 68k ports just replaced p with l, however mac68k changed to
refer to l->l_proc. I assume it was accidental leftover during refactoring.

fixes COMPAT_NOMID enabled build for mac68k.


To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/mac68k/mac68k/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2022-12-25 Thread Nathanial Sloss
Module Name:src
Committed By:   nat
Date:   Mon Dec 26 01:05:36 UTC 2022

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
Sanity check and set the framebuffer length if necessary.

Addresses PR 57126.


To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/arch/mac68k/mac68k/machdep.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/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.363 src/sys/arch/mac68k/mac68k/machdep.c:1.364
--- src/sys/arch/mac68k/mac68k/machdep.c:1.363	Sat Oct  9 20:00:41 2021
+++ src/sys/arch/mac68k/mac68k/machdep.c	Mon Dec 26 01:05:35 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $");
 
 #include "opt_adb.h"
 #include "opt_compat_netbsd.h"
@@ -2616,6 +2616,10 @@ get_mapping(void)
 			mac68k_video.mv_len, mac68k_video.mv_len);
 		}
 	}
+	/* mv_len sanity check */
+	int reqsize = mac68k_video.mv_height * mac68k_video.mv_stride;
+	if (mac68k_video.mv_len != 0 && mac68k_video.mv_len < reqsize)
+		mac68k_video.mv_len = reqsize;
 
 	return load_addr;	/* Return physical address of logical 0 */
 }



CVS commit: src/sys/arch/mac68k/mac68k

2022-12-25 Thread Nathanial Sloss
Module Name:src
Committed By:   nat
Date:   Mon Dec 26 01:05:36 UTC 2022

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
Sanity check and set the framebuffer length if necessary.

Addresses PR 57126.


To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/arch/mac68k/mac68k/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-22 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Aug 22 12:47:57 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: clock.c

Log Message:
Adjust GMT bias automatically by using data obtained from Mac OS,
unless RTC_OFFSET is set explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mac68k/mac68k/clock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-22 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Aug 22 12:47:57 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: clock.c

Log Message:
Adjust GMT bias automatically by using data obtained from Mac OS,
unless RTC_OFFSET is set explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mac68k/mac68k/clock.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/mac68k/mac68k/clock.c
diff -u src/sys/arch/mac68k/mac68k/clock.c:1.49 src/sys/arch/mac68k/mac68k/clock.c:1.50
--- src/sys/arch/mac68k/mac68k/clock.c:1.49	Tue Feb  8 20:20:18 2011
+++ src/sys/arch/mac68k/mac68k/clock.c	Thu Aug 22 12:47:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.49 2011/02/08 20:20:18 rmind Exp $	*/
+/*	$NetBSD: clock.c,v 1.50 2019/08/22 12:47:57 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -75,7 +75,9 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.49 2011/02/08 20:20:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.50 2019/08/22 12:47:57 rin Exp $");
+
+#include "opt_rtc_offset.h"
 
 #include 
 #include 
@@ -391,6 +393,12 @@ mac68k_gettime(todr_chip_handle_t tch, s
 		mac68k_trust_pram = 0;
 	}
 	tvp->tv_sec = timbuf;
+#if !defined(RTC_OFFSET) || RTC_OFFSET == 0
+	/*
+	 * Adjust GTM bias unless RTC_OFFSET is set explicitly.
+	 */
+	tvp->tv_sec -= macos_gmtbias * 60;
+#endif
 	tvp->tv_usec = 0;
 	return 0;
 }



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-18 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug 18 07:05:16 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c pmap_bootstrap.c

Log Message:
0x%p ---> %p


To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/mac68k/mac68k/pmap_bootstrap.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/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.354 src/sys/arch/mac68k/mac68k/machdep.c:1.355
--- src/sys/arch/mac68k/mac68k/machdep.c:1.354	Sun Aug 18 07:03:55 2019
+++ src/sys/arch/mac68k/mac68k/machdep.c	Sun Aug 18 07:05:16 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.354 2019/08/18 07:03:55 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.355 2019/08/18 07:05:16 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.354 2019/08/18 07:03:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.355 2019/08/18 07:05:16 rin Exp $");
 
 #include "opt_adb.h"
 #include "opt_copy_symtab.h"
@@ -2326,7 +2326,7 @@ check_video(const char *id, u_long limit
 			addr += 32768;
 		}
 		if (mac68k_machine.do_graybars) {
-			printf("  %s internal video at addr 0x%p (phys 0x%p), ",
+			printf("  %s internal video at addr %p (phys %p), ",
 			id, (void *)mac68k_video.mv_log,
 			(void *)mac68k_video.mv_phys);
 			printf("len 0x%x.\n", mac68k_video.mv_len);
@@ -2471,7 +2471,7 @@ get_mapping(void)
 		 * Tell the user what we know.
 		 */
 		if (mac68k_machine.do_graybars)
-			printf("On-board video at addr 0x%p (phys 0x%p), "
+			printf("On-board video at addr %p (phys %p), "
 			"len 0x%x.\n",
 			(void *)mac68k_video.mv_kvaddr,
 			(void *)mac68k_video.mv_phys,
@@ -2597,9 +2597,9 @@ get_mapping(void)
 	mac68k_video.mv_kvaddr);
 			}
 		} else if (mac68k_machine.do_graybars) {
-			printf("  Video address = 0x%p\n",
+			printf("  Video address = %p\n",
 			(void *)mac68k_video.mv_kvaddr);
-			printf("  Int video starts at 0x%p\n",
+			printf("  Int video starts at %p\n",
 			(void *)mac68k_video.mv_log);
 			printf("  Length = 0x%x (%d) bytes\n",
 			mac68k_video.mv_len, mac68k_video.mv_len);

Index: src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
diff -u src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.94 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.95
--- src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.94	Tue Jul 16 07:31:40 2013
+++ src/sys/arch/mac68k/mac68k/pmap_bootstrap.c	Sun Aug 18 07:05:16 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.94 2013/07/16 07:31:40 jklos Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.95 2019/08/18 07:05:16 rin Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.94 2013/07/16 07:31:40 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.95 2019/08/18 07:05:16 rin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -587,7 +587,7 @@ bootstrap_mac68k(int tc)
 	mrg_fixupROMBase(oldROMBase, ROMBase);
 
 	if (mac68k_machine.do_graybars)
-		printf("Video address 0x%p -> 0x%p.\n",
+		printf("Video address %p -> %p.\n",
 		(void *)mac68k_video.mv_kvaddr, (void *)newvideoaddr);
 
 	mac68k_set_io_offsets(IOBase);



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-18 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug 18 07:05:16 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c pmap_bootstrap.c

Log Message:
0x%p ---> %p


To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-18 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug 18 07:03:55 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
We've switched to 8KB page.

XXX
pullup to netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.353 -r1.354 src/sys/arch/mac68k/mac68k/machdep.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/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.353 src/sys/arch/mac68k/mac68k/machdep.c:1.354
--- src/sys/arch/mac68k/mac68k/machdep.c:1.353	Fri Jul 26 10:48:44 2019
+++ src/sys/arch/mac68k/mac68k/machdep.c	Sun Aug 18 07:03:55 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.353 2019/07/26 10:48:44 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.354 2019/08/18 07:03:55 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.353 2019/07/26 10:48:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.354 2019/08/18 07:03:55 rin Exp $");
 
 #include "opt_adb.h"
 #include "opt_copy_symtab.h"
@@ -812,7 +812,7 @@ int	get_top_of_ram(void);
 int
 get_top_of_ram(void)
 {
-	return ((mac68k_machine.mach_memsize * (1024 * 1024)) - 4096);
+	return ((mac68k_machine.mach_memsize * (1024 * 1024)) - PAGE_SIZE);
 }
 
 /*



CVS commit: src/sys/arch/mac68k/mac68k

2019-08-18 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug 18 07:03:55 UTC 2019

Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c

Log Message:
We've switched to 8KB page.

XXX
pullup to netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.353 -r1.354 src/sys/arch/mac68k/mac68k/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/arch/mac68k/mac68k

2019-02-18 Thread Christos Zoulas
In article <21181.1550538...@splode.eterna.com.au>,
matthew green   wrote:
>Christos Zoulas writes:
>> In article <20190219003451.093b2f...@cvs.netbsd.org>,
>> matthew green  wrote:
>> >-=-=-=-=-=-
>> 
>> >+   memcpy(intrnames, inames, MAX_INAME_LENGTH);
>> 
>> That should be:
>>  memcpy(intrnames, inames, sizeof(intrnames));
>
>well.
>
>maybe.  but it's not really any better.  intrnames is not
>defined with MAX_INAME_LENGTH so using it in any place is
>still a hack...
>
>ie, the length is actually eintrnames-intrnames, but i am
>not aware of a way to do that in pure C (leaving the names
>as they are now, which they're needed for vmstat.  it needs
>'eintrnames' to know the end of the list of strings.)
>
>i'd like to replace it with a much less gross setup but i
>didn't see one...
>
>and the good thing is, gcc will whine if it grows ;)

Yes, the good thing about the sizeof(intrnames) is that if the type
changes it is still right...

christos



re: CVS commit: src/sys/arch/mac68k/mac68k

2019-02-18 Thread matthew green
Christos Zoulas writes:
> In article <20190219003451.093b2f...@cvs.netbsd.org>,
> matthew green  wrote:
> >-=-=-=-=-=-
> 
> >+memcpy(intrnames, inames, MAX_INAME_LENGTH);
> 
> That should be:
>   memcpy(intrnames, inames, sizeof(intrnames));

well.

maybe.  but it's not really any better.  intrnames is not
defined with MAX_INAME_LENGTH so using it in any place is
still a hack...

ie, the length is actually eintrnames-intrnames, but i am
not aware of a way to do that in pure C (leaving the names
as they are now, which they're needed for vmstat.  it needs
'eintrnames' to know the end of the list of strings.)

i'd like to replace it with a much less gross setup but i
didn't see one...

and the good thing is, gcc will whine if it grows ;)


.mrg.


Re: CVS commit: src/sys/arch/mac68k/mac68k

2019-02-18 Thread Christos Zoulas
In article <20190219003451.093b2f...@cvs.netbsd.org>,
matthew green  wrote:
>-=-=-=-=-=-

>+  memcpy(intrnames, inames, MAX_INAME_LENGTH);

That should be:
memcpy(intrnames, inames, sizeof(intrnames));

christos



CVS commit: src/sys/arch/mac68k/mac68k

2010-03-02 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Tue Mar  2 15:01:04 UTC 2010

Modified Files:
src/sys/arch/mac68k/mac68k: pmap_bootstrap.c

Log Message:
A variable protostfree is only declared for M68040 or M68060 kernels,
so it should also be wrapped with #ifdef M68040/#endif in MD sources.

Fixes build error on SMALLRAM kernel, reported by ha...@.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.