Module Name: src Committed By: tsutsui Date: Tue Sep 26 12:46:30 UTC 2023
Modified Files: src/sys/arch/m68k/include: asm.h bus_dma.h cacheops_30.h cpuframe.h db_machdep.h fenv.h frame.h ieeefp.h int_limits.h m68k.h pmap_motorola.h src/sys/arch/m68k/m68k: bus_dma.c copypage.s db_disasm.h db_memrw.c db_trace.c m68k_machdep.c oc_cksum.s pmap_motorola.c switch_subr.s trap_subr.s w16copy.s Log Message: Remove trailing spaces and TABs. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/include/asm.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/include/bus_dma.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/cacheops_30.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/cpuframe.h \ src/sys/arch/m68k/include/fenv.h src/sys/arch/m68k/include/int_limits.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/m68k/include/db_machdep.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/include/frame.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/include/ieeefp.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/m68k/include/m68k.h cvs rdiff -u -r1.37 -r1.38 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/m68k/bus_dma.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/m68k/m68k/copypage.s cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/m68k/db_disasm.h \ src/sys/arch/m68k/m68k/m68k_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/db_memrw.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/m68k/m68k/db_trace.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/m68k/oc_cksum.s cvs rdiff -u -r1.77 -r1.78 src/sys/arch/m68k/m68k/pmap_motorola.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/m68k/switch_subr.s cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/m68k/trap_subr.s cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/m68k/w16copy.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/m68k/include/asm.h diff -u src/sys/arch/m68k/include/asm.h:1.34 src/sys/arch/m68k/include/asm.h:1.35 --- src/sys/arch/m68k/include/asm.h:1.34 Fri Apr 17 14:19:43 2020 +++ src/sys/arch/m68k/include/asm.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.34 2020/04/17 14:19:43 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.35 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -122,7 +122,7 @@ /* * The m68k ALTENTRY macro is very different than the traditional - * implementation used by other NetBSD ports. Usually ALTENTRY + * implementation used by other NetBSD ports. Usually ALTENTRY * simply provides an alternate function entry point. The m68k * definition takes a second argument and jumps inside the second * function when profiling is enabled. Index: src/sys/arch/m68k/include/bus_dma.h diff -u src/sys/arch/m68k/include/bus_dma.h:1.13 src/sys/arch/m68k/include/bus_dma.h:1.14 --- src/sys/arch/m68k/include/bus_dma.h:1.13 Sun Dec 5 04:54:20 2021 +++ src/sys/arch/m68k/include/bus_dma.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.h,v 1.13 2021/12/05 04:54:20 msaitoh Exp $ */ +/* $NetBSD: bus_dma.h,v 1.14 2023/09/26 12:46:30 tsutsui Exp $ */ /* * This file was extracted from alpha/include/bus.h @@ -193,7 +193,7 @@ struct m68k_bus_dma_tag { #define bus_dmamem_mmap(t, sg, n, o, p, f) \ (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f)) -#define bus_dmatag_subregion(t, mna, mxa, nt, f) EOPNOTSUPP +#define bus_dmatag_subregion(t, mna, mxa, nt, f) EOPNOTSUPP #define bus_dmatag_destroy(t) /* Index: src/sys/arch/m68k/include/cacheops_30.h diff -u src/sys/arch/m68k/include/cacheops_30.h:1.9 src/sys/arch/m68k/include/cacheops_30.h:1.10 --- src/sys/arch/m68k/include/cacheops_30.h:1.9 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/m68k/include/cacheops_30.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cacheops_30.h,v 1.9 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: cacheops_30.h,v 1.10 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ TBIA_30(void) __asm volatile (" pflusha;" " movc %0,%%cacr" : : "d" (tmp)); } - + /* * Invalidate any TLB entry for given VA (TB Invalidate Single) */ Index: src/sys/arch/m68k/include/cpuframe.h diff -u src/sys/arch/m68k/include/cpuframe.h:1.8 src/sys/arch/m68k/include/cpuframe.h:1.9 --- src/sys/arch/m68k/include/cpuframe.h:1.8 Sun Dec 5 02:53:51 2021 +++ src/sys/arch/m68k/include/cpuframe.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuframe.h,v 1.8 2021/12/05 02:53:51 msaitoh Exp $ */ +/* $NetBSD: cpuframe.h,v 1.9 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -64,7 +64,7 @@ struct frame { u_int f_fa; u_int f_fslw; /* for 060FP type 4 FP disabled frames: */ -#define f_fea f_fa +#define f_fea f_fa #define f_pcfi f_fslw } F_fmt4; @@ -187,8 +187,8 @@ struct fpframe { #define fpf_busy FPF_u2.FPF_busy #define fpf_unimp FPF_u2.FPF_unimp -/* - * This is incompatible with the earlier one; especially, an earlier frame +/* + * This is incompatible with the earlier one; especially, an earlier frame * must not be FRESTOREd on a 060 or vv, because a frame error exception is * not guaranteed. */ Index: src/sys/arch/m68k/include/fenv.h diff -u src/sys/arch/m68k/include/fenv.h:1.8 src/sys/arch/m68k/include/fenv.h:1.9 --- src/sys/arch/m68k/include/fenv.h:1.8 Sat Oct 26 17:51:49 2019 +++ src/sys/arch/m68k/include/fenv.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: fenv.h,v 1.8 2019/10/26 17:51:49 christos Exp $ */ +/* $NetBSD: fenv.h,v 1.9 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -86,19 +86,19 @@ typedef struct { do { \ __t d = __d; \ __asm__ __volatile__ ("fmul" __s "; fnop" : "=f" (d) : "0" (d)); \ - } while (/*CONSTCOND*/0) + } while (/*CONSTCOND*/0) #define __fdiv(__s, __t, __d) \ do { \ __t d = __d; \ __asm__ __volatile__ ("fdiv" __s "; fnop" : "=f" (d) : "0" (d)); \ - } while (/*CONSTCOND*/0) + } while (/*CONSTCOND*/0) #define __fetox(__s, __t, __d) \ do { \ __t d = __d; \ __asm__ __volatile__ ("fetox" __s "; fnop" : "=f" (d) : "0" (d)); \ - } while (/*CONSTCOND*/0) + } while (/*CONSTCOND*/0) #define __fgetenv(__envp) \ __asm__ __volatile__ ("fmovem%.l %/fpcr/%/fpsr/%/fpiar,%0" : "=m" (__envp)) Index: src/sys/arch/m68k/include/int_limits.h diff -u src/sys/arch/m68k/include/int_limits.h:1.8 src/sys/arch/m68k/include/int_limits.h:1.9 --- src/sys/arch/m68k/include/int_limits.h:1.8 Wed Aug 13 22:31:07 2014 +++ src/sys/arch/m68k/include/int_limits.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.8 2014/08/13 22:31:07 matt Exp $ */ +/* $NetBSD: int_limits.h,v 1.9 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -80,7 +80,7 @@ #define UINT_LEAST64_MAX 0xffffffffffffffffULL /* uint_least64_t */ /* 7.18.2.3 Limits of fastest minimum-width integer types */ - + /* minimum values of fastest minimum-width signed integer types */ #define INT_FAST8_MIN (-0x7f-1) /* int_fast8_t */ #define INT_FAST16_MIN (-0x7fff-1) /* int_fast16_t */ Index: src/sys/arch/m68k/include/db_machdep.h diff -u src/sys/arch/m68k/include/db_machdep.h:1.33 src/sys/arch/m68k/include/db_machdep.h:1.34 --- src/sys/arch/m68k/include/db_machdep.h:1.33 Mon Nov 6 03:47:47 2017 +++ src/sys/arch/m68k/include/db_machdep.h Tue Sep 26 12:46:30 2023 @@ -1,28 +1,28 @@ -/* $NetBSD: db_machdep.h,v 1.33 2017/11/06 03:47:47 christos Exp $ */ +/* $NetBSD: db_machdep.h,v 1.34 2023/09/26 12:46:30 tsutsui Exp $ */ -/* +/* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or software.distribut...@cs.cmu.edu * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ Index: src/sys/arch/m68k/include/frame.h diff -u src/sys/arch/m68k/include/frame.h:1.31 src/sys/arch/m68k/include/frame.h:1.32 --- src/sys/arch/m68k/include/frame.h:1.31 Mon Feb 18 01:12:23 2019 +++ src/sys/arch/m68k/include/frame.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.31 2019/02/18 01:12:23 thorpej Exp $ */ +/* $NetBSD: frame.h,v 1.32 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -128,8 +128,8 @@ #define FSLW_SIZE 0x00600000 /* - * We better define the FSLW_SIZE values here, as the table given in the - * MC68060UM/AD rev. 0/1 p. 8-23 is wrong, and was corrected in the errata + * We better define the FSLW_SIZE values here, as the table given in the + * MC68060UM/AD rev. 0/1 p. 8-23 is wrong, and was corrected in the errata * document. */ #define FSLW_SIZE_LONG 0x00000000 Index: src/sys/arch/m68k/include/ieeefp.h diff -u src/sys/arch/m68k/include/ieeefp.h:1.10 src/sys/arch/m68k/include/ieeefp.h:1.11 --- src/sys/arch/m68k/include/ieeefp.h:1.10 Wed Mar 22 23:11:09 2017 +++ src/sys/arch/m68k/include/ieeefp.h Tue Sep 26 12:46:30 2023 @@ -1,6 +1,6 @@ -/* $NetBSD: ieeefp.h,v 1.10 2017/03/22 23:11:09 chs Exp $ */ +/* $NetBSD: ieeefp.h,v 1.11 2023/09/26 12:46:30 tsutsui Exp $ */ -/* +/* * Written by J.T. Conklin, Apr 6, 1995 * Modified by Jason R. Thorpe, June 22, 2003 * Public domain. @@ -19,7 +19,7 @@ typedef int fp_except; -/* adjust for FP_* and FE_* value differences */ +/* adjust for FP_* and FE_* value differences */ #define __FPE(x) ((x) >> 3) #define __FEE(x) ((x) << 3) #define __FPR(x) ((x) >> 4) Index: src/sys/arch/m68k/include/m68k.h diff -u src/sys/arch/m68k/include/m68k.h:1.24 src/sys/arch/m68k/include/m68k.h:1.25 --- src/sys/arch/m68k/include/m68k.h:1.24 Sat Apr 6 03:06:26 2019 +++ src/sys/arch/m68k/include/m68k.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: m68k.h,v 1.24 2019/04/06 03:06:26 thorpej Exp $ */ +/* $NetBSD: m68k.h,v 1.25 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -110,7 +110,7 @@ int getsfc(void); /* switch_subr.s */ void lwp_trampoline(void); void m68881_save(struct fpframe *); -void m68881_restore(struct fpframe *); +void m68881_restore(struct fpframe *); void savectx(struct pcb *); /* w16copy.s */ Index: src/sys/arch/m68k/include/pmap_motorola.h diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.37 src/sys/arch/m68k/include/pmap_motorola.h:1.38 --- src/sys/arch/m68k/include/pmap_motorola.h:1.37 Sun Sep 19 10:34:09 2021 +++ src/sys/arch/m68k/include/pmap_motorola.h Tue Sep 26 12:46:30 2023 @@ -1,6 +1,6 @@ -/* $NetBSD: pmap_motorola.h,v 1.37 2021/09/19 10:34:09 andvar Exp $ */ +/* $NetBSD: pmap_motorola.h,v 1.38 2023/09/26 12:46:30 tsutsui Exp $ */ -/* +/* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -35,7 +35,7 @@ * @(#)pmap.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Copyright (c) 1987 Carnegie-Mellon University * * This code is derived from software contributed to Berkeley by @@ -142,7 +142,7 @@ struct pmap { #define NBSEG ((mmutype == MMU_68040) ? NBSEG40 : NBSEG30) #endif -#define SEGOFSET (NBSEG - 1) /* byte offset into segment */ +#define SEGOFSET (NBSEG - 1) /* byte offset into segment */ #define m68k_round_seg(x) ((((vaddr_t)(x)) + SEGOFSET) & ~SEGOFSET) #define m68k_trunc_seg(x) ((vaddr_t)(x) & ~SEGOFSET) Index: src/sys/arch/m68k/m68k/bus_dma.c diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.39 src/sys/arch/m68k/m68k/bus_dma.c:1.40 --- src/sys/arch/m68k/m68k/bus_dma.c:1.39 Thu Jan 5 18:27:48 2023 +++ src/sys/arch/m68k/m68k/bus_dma.c Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.39 2023/01/05 18:27:48 tsutsui Exp $ */ +/* $NetBSD: bus_dma.c,v 1.40 2023/09/26 12:46:30 tsutsui Exp $ */ /* * This file was taken from alpha/common/bus_dma.c @@ -41,7 +41,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.39 2023/01/05 18:27:48 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.40 2023/09/26 12:46:30 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,7 +69,7 @@ _bus_dmamap_mapsize(int const nsegments) KASSERT(nsegments > 0); return sizeof(struct m68k_bus_dmamap) + (sizeof(bus_dma_segment_t) * (nsegments - 1)); -} +} /* * Common function for DMA map creation. May be called by bus-specific Index: src/sys/arch/m68k/m68k/copypage.s diff -u src/sys/arch/m68k/m68k/copypage.s:1.16 src/sys/arch/m68k/m68k/copypage.s:1.17 --- src/sys/arch/m68k/m68k/copypage.s:1.16 Sat Sep 7 19:06:29 2013 +++ src/sys/arch/m68k/m68k/copypage.s Tue Sep 26 12:46:30 2023 @@ -1,12 +1,12 @@ -/* $NetBSD: copypage.s,v 1.16 2013/09/07 19:06:29 chs Exp $ */ +/* $NetBSD: copypage.s,v 1.17 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by J.T. Conklin <j...@netbsd.org> and - * by Hiroshi Horitomo <horim...@cs-aoi.cs.sist.ac.jp> + * by J.T. Conklin <j...@netbsd.org> and + * by Hiroshi Horitomo <horim...@cs-aoi.cs.sist.ac.jp> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -80,12 +80,12 @@ ENTRY(copypage) movl (%a0)+,(%a1)+ movl (%a0)+,(%a1)+ dbf %d0,.Lmlloop -#else /* __mc68010__ */ +#else /* __mc68010__ */ movw #PAGE_SIZE/4-1,%d0 | number of 4 byte chunks - 1 .Lmlloop: movl (%a0)+,(%a1)+ dbf %d0,.Lmlloop | use the 68010 loop mode -#endif /* __mc68010__ */ +#endif /* __mc68010__ */ rts /* Index: src/sys/arch/m68k/m68k/db_disasm.h diff -u src/sys/arch/m68k/m68k/db_disasm.h:1.10 src/sys/arch/m68k/m68k/db_disasm.h:1.11 --- src/sys/arch/m68k/m68k/db_disasm.h:1.10 Tue Apr 6 16:05:17 2021 +++ src/sys/arch/m68k/m68k/db_disasm.h Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.h,v 1.10 2021/04/06 16:05:17 simonb Exp $ */ +/* $NetBSD: db_disasm.h,v 1.11 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -34,7 +34,7 @@ ((b7 << 7) | (b6 << 6) | (b5 << 5) | (b4 << 4) | \ (b3 << 3) | (b2 << 2) | (b1 << 1) | (b0)) - + #define ENCW(b15,b14,b13,b12,b11,b10,b9,b8,b7,b6,b5,b4,b3,b2,b1,b0) \ ((ENCB(b15,b14,b13,b12,b11,b10,b9,b8) << 8) |\ ENCB(b7,b6,b5,b4,b3,b2,b1,b0)) @@ -120,7 +120,7 @@ /* * Group misc. (0100) - */ + */ #define BGND_MASK 0xffff #define ILLEGAL_MASK 0xffff #define MOVEFRC_MASK 0xffff @@ -170,7 +170,7 @@ #define TRAP_MASK ENCW(1,1,1,1, 1,1,1,1, 1,1,1,1, 0,0,0,0) #define TRAP_INST ENCW(0,1,0,0, 1,1,1,0, 0,1,0,0, 0,0,0,0) - + #define DIVSL_MASK ENCW(1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0) #define DIVUL_MASK ENCW(1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0) #define JMP_MASK ENCW(1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0) @@ -326,14 +326,14 @@ #define ABCDD_MASK ENCW(1,1,1,1, 0,0,0,1, 1,1,1,1, 1,0,0,0) #define ABCDA_INST ENCW(1,1,0,0, 0,0,0,1, 0,0,0,0, 1,0,0,0) #define ABCDD_INST ENCW(1,1,0,0, 0,0,0,1, 0,0,0,0, 0,0,0,0) - + #define MULSW_MASK ENCW(1,1,1,1, 0,0,0,1, 1,1,0,0, 0,0,0,0) #define MULUW_MASK ENCW(1,1,1,1, 0,0,0,1, 1,1,0,0, 0,0,0,0) #define MULSW_INST ENCW(1,1,0,0, 0,0,0,1, 1,1,0,0, 0,0,0,0) #define MULUW_INST ENCW(1,1,0,0, 0,0,0,0, 1,1,0,0, 0,0,0,0) #define EXG_MASK ENCW(1,1,1,1, 0,0,0,1, 0,0,1,1, 0,0,0,0) -#define EXG_INST ENCW(1,1,0,0, 0,0,0,1, 0,0,0,0, 0,0,0,0) +#define EXG_INST ENCW(1,1,0,0, 0,0,0,1, 0,0,0,0, 0,0,0,0) #define AND_MASK ENCW(1,1,1,1, 0,0,0,0, 0,0,0,0, 0,0,0,0) #define AND_INST ENCW(1,1,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0) Index: src/sys/arch/m68k/m68k/m68k_machdep.c diff -u src/sys/arch/m68k/m68k/m68k_machdep.c:1.10 src/sys/arch/m68k/m68k/m68k_machdep.c:1.11 --- src/sys/arch/m68k/m68k/m68k_machdep.c:1.10 Sat Apr 6 03:06:26 2019 +++ src/sys/arch/m68k/m68k/m68k_machdep.c Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: m68k_machdep.c,v 1.10 2019/04/06 03:06:26 thorpej Exp $ */ +/* $NetBSD: m68k_machdep.c,v 1.11 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m68k_machdep.c,v 1.10 2019/04/06 03:06:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m68k_machdep.c,v 1.11 2023/09/26 12:46:30 tsutsui Exp $"); #include "opt_compat_sunos.h" @@ -87,7 +87,7 @@ extern short exframesize[]; /* * Set registers on exec. */ -void +void setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack) { struct trapframe *tf = (struct trapframe *)l->l_md.md_regs; Index: src/sys/arch/m68k/m68k/db_memrw.c diff -u src/sys/arch/m68k/m68k/db_memrw.c:1.7 src/sys/arch/m68k/m68k/db_memrw.c:1.8 --- src/sys/arch/m68k/m68k/db_memrw.c:1.7 Mon Apr 28 20:23:27 2008 +++ src/sys/arch/m68k/m68k/db_memrw.c Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: db_memrw.c,v 1.7 2008/04/28 20:23:27 martin Exp $ */ +/* $NetBSD: db_memrw.c,v 1.8 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,29 +28,29 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -/* +/* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or software.distribut...@cs.cmu.edu * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.7 2008/04/28 20:23:27 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.8 2023/09/26 12:46:30 tsutsui Exp $"); #include <sys/param.h> Index: src/sys/arch/m68k/m68k/db_trace.c diff -u src/sys/arch/m68k/m68k/db_trace.c:1.61 src/sys/arch/m68k/m68k/db_trace.c:1.62 --- src/sys/arch/m68k/m68k/db_trace.c:1.61 Tue Jul 26 16:51:42 2022 +++ src/sys/arch/m68k/m68k/db_trace.c Tue Sep 26 12:46:30 2023 @@ -1,33 +1,33 @@ -/* $NetBSD: db_trace.c,v 1.61 2022/07/26 16:51:42 chs Exp $ */ +/* $NetBSD: db_trace.c,v 1.62 2023/09/26 12:46:30 tsutsui Exp $ */ -/* +/* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or software.distribut...@cs.cmu.edu * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.61 2022/07/26 16:51:42 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.62 2023/09/26 12:46:30 tsutsui Exp $"); #include <sys/param.h> #include <sys/proc.h> Index: src/sys/arch/m68k/m68k/oc_cksum.s diff -u src/sys/arch/m68k/m68k/oc_cksum.s:1.9 src/sys/arch/m68k/m68k/oc_cksum.s:1.10 --- src/sys/arch/m68k/m68k/oc_cksum.s:1.9 Sat Sep 7 19:06:29 2013 +++ src/sys/arch/m68k/m68k/oc_cksum.s Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -| $NetBSD: oc_cksum.s,v 1.9 2013/09/07 19:06:29 chs Exp $ +| $NetBSD: oc_cksum.s,v 1.10 2023/09/26 12:46:30 tsutsui Exp $ | Copyright (c) 1988 Regents of the University of California. | All rights reserved. @@ -69,14 +69,14 @@ | that 16 was better than 8 for a count of 20. It's not obvious to | me why.) So, since 16 was good for both large and small counts, | the loop below is unrolled 16 times. -| +| | The processors tested and their average time to checksum 1024 bytes | of random data were: | Sun 3/50 (15MHz) 190 us/KB | Sun 3/180 (16.6MHz) 175 us/KB | Sun 3/60 (20MHz) 134 us/KB | Sun 3/280 (25MHz) 95 us/KB -| +| | The cost of calling this routine was typically 10% of the per- | kilobyte cost. E.g., checksumming zero bytes on a 3/60 cost 9us | and each additional byte cost 125ns. With the high fixed cost, @@ -172,7 +172,7 @@ ENTRY(oc_cksum) #ifdef __mcoldfire__ mvzw %d1,%d1 | zero extend %d1 (doesn't affect X) mvzw %d0,%d0 | zero extend %d0 (doesn't affect X) - addxl %d1,%d0 | + addxl %d1,%d0 | jcc .L4 addql #1,%d0 #else Index: src/sys/arch/m68k/m68k/pmap_motorola.c diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.77 src/sys/arch/m68k/m68k/pmap_motorola.c:1.78 --- src/sys/arch/m68k/m68k/pmap_motorola.c:1.77 Sun Jul 31 17:11:41 2022 +++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_motorola.c,v 1.77 2022/07/31 17:11:41 chs Exp $ */ +/* $NetBSD: pmap_motorola.c,v 1.78 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ #include "opt_m68k_arch.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.77 2022/07/31 17:11:41 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.78 2023/09/26 12:46:30 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -298,7 +298,7 @@ pa_to_pvh(paddr_t pa) { uvm_physseg_t bank = 0; /* XXX gcc4 -Wuninitialized */ psize_t pg = 0; - + bank = uvm_physseg_find(atop((pa)), &pg); return &uvm_physseg_get_pmseg(bank)->pvheader[pg]; } @@ -1076,7 +1076,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd if (pmap->pm_ptab == NULL) { pmap->pm_ptab = (pt_entry_t *) uvm_km_alloc(pt_map, M68K_MAX_PTSIZE, 0, - UVM_KMF_VAONLY | + UVM_KMF_VAONLY | (can_fail ? UVM_KMF_NOWAIT : UVM_KMF_WAITVA)); if (pmap->pm_ptab == NULL) return ENOMEM; Index: src/sys/arch/m68k/m68k/switch_subr.s diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.34 src/sys/arch/m68k/m68k/switch_subr.s:1.35 --- src/sys/arch/m68k/m68k/switch_subr.s:1.34 Wed Jan 8 20:59:18 2020 +++ src/sys/arch/m68k/m68k/switch_subr.s Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: switch_subr.s,v 1.34 2020/01/08 20:59:18 skrll Exp $ */ +/* $NetBSD: switch_subr.s,v 1.35 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation. @@ -109,21 +109,21 @@ ENTRY(cpu_switchto) #if defined(M68020) || defined(M68030) || defined(M68040) #if defined(M68060) cmpl #FPU_68060,_C_LABEL(fputype) - jeq .Lcpu_switch_savfp60 -#endif + jeq .Lcpu_switch_savfp60 +#endif tstb (%a2) | null state frame? jeq .Lcpu_switch_nofpsave | yes, all done fmovem %fp0-%fp7,FPF_REGS(%a2) | save FP general registers fmovem %fpcr/%fpsr/%fpi,FPF_FPCR(%a2) | save FP control registers #if defined(M68060) - jra .Lcpu_switch_nofpsave -#endif -#endif + jra .Lcpu_switch_nofpsave +#endif +#endif #if defined(M68060) .Lcpu_switch_savfp60: tstb 2(%a2) | null state frame? - jeq .Lcpu_switch_nofpsave | yes, all done - fmovem %fp0-%fp7,FPF_REGS(%a2) | save FP general registers + jeq .Lcpu_switch_nofpsave | yes, all done + fmovem %fp0-%fp7,FPF_REGS(%a2) | save FP general registers fmovem %fpcr,FPF_FPCR(%a2) | save FP control registers fmovem %fpsr,FPF_FPSR(%a2) fmovem %fpi,FPF_FPI(%a2) @@ -220,7 +220,7 @@ ENTRY(cpu_switchto) #if defined(M68060) cmpl #FPU_68060,_C_LABEL(fputype) jeq .Lcpu_switch_resfp60rest1 -#endif +#endif tstb (%a0) | null state frame? jeq .Lcpu_switch_resfprest | yes, easy fmovem FPF_FPCR(%a0),%fpcr/%fpsr/%fpi | restore FP control registers @@ -277,7 +277,7 @@ ENTRY(savectx) #if defined(M68060) cmpl #FPU_68060,_C_LABEL(fputype) jeq .Lsavectx_savfp60 -#endif +#endif tstb (%a0) | null state frame? jeq .Lsavectx_nofpsave | yes, all done fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers @@ -285,7 +285,7 @@ ENTRY(savectx) #if defined(M68060) jra .Lsavectx_nofpsave #endif -#endif +#endif #if defined(M68060) .Lsavectx_savfp60: tstb 2(%a0) | null state frame? @@ -294,7 +294,7 @@ ENTRY(savectx) fmovem %fpcr,FPF_FPCR(%a0) | save FP control registers fmovem %fpsr,FPF_FPSR(%a0) fmovem %fpi,FPF_FPI(%a0) -#endif +#endif .Lsavectx_nofpsave: #endif /* FPCOPROC */ #endif /* !_M68K_CUSTOM_FPU_CTX */ @@ -345,7 +345,7 @@ ENTRY(m68881_save) cmpl #FPU_68060,_C_LABEL(fputype) jeq .Lm68060fpsave #endif -.Lm68881fpsave: +.Lm68881fpsave: tstb (%a0) | null state frame? jeq .Lm68881sdone | yes, all done fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers @@ -359,11 +359,11 @@ ENTRY(m68881_save) jeq .Lm68060sdone | yes, all done fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers fmovem %fpcr,FPF_FPCR(%a0) | save FP control registers - fmovem %fpsr,FPF_FPSR(%a0) + fmovem %fpsr,FPF_FPSR(%a0) fmovem %fpi,FPF_FPI(%a0) -.Lm68060sdone: +.Lm68060sdone: rts -#endif +#endif ENTRY(m68881_restore) movl 4(%sp),%a0 | save area pointer Index: src/sys/arch/m68k/m68k/trap_subr.s diff -u src/sys/arch/m68k/m68k/trap_subr.s:1.15 src/sys/arch/m68k/m68k/trap_subr.s:1.16 --- src/sys/arch/m68k/m68k/trap_subr.s:1.15 Thu Aug 1 13:42:52 2013 +++ src/sys/arch/m68k/m68k/trap_subr.s Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.s,v 1.15 2013/08/01 13:42:52 matt Exp $ */ +/* $NetBSD: trap_subr.s,v 1.16 2023/09/26 12:46:30 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -76,11 +76,11 @@ ASENTRY(faultstkadj) /* for new 68060 Branch Prediction Error handler */ _ASM_LABEL(faultstkadjnotrap2): movl FR_SP(%sp),%a0 | restore user SP - movl %a0,%usp | from save area + movl %a0,%usp | from save area movw FR_ADJ(%sp),%d0 | need to adjust stack? - jne 1f | yes, go to it + jne 1f | yes, go to it moveml (%sp)+,#0x7FFF | no, restore most user regs - addql #8,%sp | toss SSP and stkadj + addql #8,%sp | toss SSP and stkadj jra _ASM_LABEL(rei) | all done 1: lea FR_HW(%sp),%a1 | pointer to HW frame Index: src/sys/arch/m68k/m68k/w16copy.s diff -u src/sys/arch/m68k/m68k/w16copy.s:1.3 src/sys/arch/m68k/m68k/w16copy.s:1.4 --- src/sys/arch/m68k/m68k/w16copy.s:1.3 Thu Aug 1 13:42:52 2013 +++ src/sys/arch/m68k/m68k/w16copy.s Tue Sep 26 12:46:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: w16copy.s,v 1.3 2013/08/01 13:42:52 matt Exp $ */ +/* $NetBSD: w16copy.s,v 1.4 2023/09/26 12:46:30 tsutsui Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ /* - * Function to zero a region of memory using only + * Function to zero a region of memory using only * properly aligned 8- and 16-bit accesses. */ ENTRY(w16zero) @@ -82,7 +82,7 @@ ENTRY(w16zero) /* * Function to copy a region of memory to a nonoverlapping - * region of memory using only properly aligned 8- and + * region of memory using only properly aligned 8- and * 16-bit accesses. */ ENTRY(w16copy) @@ -103,7 +103,7 @@ ENTRY(w16copy) btst #0, %d1 | is %a1 even? bne 4f | if not, skip ahead -| %a1 is also aligned to a 16-bit boundary, so we can copy +| %a1 is also aligned to a 16-bit boundary, so we can copy | the easy way, 32 bits at a time: movl %d0, %d1 | copy count into %d1 lsrl #2, %d1 | turn %d1 into long count