Module Name: src
Committed By: tsutsui
Date: Tue Sep 26 14:33:55 UTC 2023
Modified Files:
src/sys/arch/m68k/include: cacheops_60.h cpuframe.h db_machdep.h
frame.h m68k.h pcb.h
src/sys/arch/m68k/m68k: copy.s db_disasm.c db_trace.c oc_cksum.s
pmap_motorola.c sunos_machdep.c sunos_sigcode.s switch_subr.s
vm_machdep.c
Log Message:
TAB/space cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/include/cacheops_60.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/cpuframe.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/include/db_machdep.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/include/frame.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/m68k/include/m68k.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/include/pcb.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/m68k/m68k/copy.s
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/m68k/m68k/db_disasm.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/m68k/m68k/db_trace.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/m68k/oc_cksum.s
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/m68k/m68k/sunos_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/m68k/sunos_sigcode.s
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/m68k/m68k/switch_subr.s
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/m68k/vm_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/m68k/include/cacheops_60.h
diff -u src/sys/arch/m68k/include/cacheops_60.h:1.13 src/sys/arch/m68k/include/cacheops_60.h:1.14
--- src/sys/arch/m68k/include/cacheops_60.h:1.13 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/m68k/include/cacheops_60.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops_60.h,v 1.13 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: cacheops_60.h,v 1.14 2023/09/26 14:33:55 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ TBIAS_60(void)
" movc %%cacr,%0;"
" orl %1,%0;"
" movc %0,%%cacr" /* clear all branch cache
- entries */
+ entries */
: "=d" (tmp) : "i" (IC60_CABC) );
}
@@ -93,7 +93,7 @@ TBIAU_60(void)
" movc %%cacr,%0;"
" orl %1,%0;"
" movc %0,%%cacr" /* clear all branch cache
- entries */
+ entries */
: "=d" (tmp) : "i" (IC60_CUBC) );
}
Index: src/sys/arch/m68k/include/cpuframe.h
diff -u src/sys/arch/m68k/include/cpuframe.h:1.9 src/sys/arch/m68k/include/cpuframe.h:1.10
--- src/sys/arch/m68k/include/cpuframe.h:1.9 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/include/cpuframe.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuframe.h,v 1.9 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: cpuframe.h,v 1.10 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -64,8 +64,8 @@ struct frame {
u_int f_fa;
u_int f_fslw;
/* for 060FP type 4 FP disabled frames: */
-#define f_fea f_fa
-#define f_pcfi f_fslw
+#define f_fea f_fa
+#define f_pcfi f_fslw
} F_fmt4;
struct fmt7 {
Index: src/sys/arch/m68k/include/db_machdep.h
diff -u src/sys/arch/m68k/include/db_machdep.h:1.34 src/sys/arch/m68k/include/db_machdep.h:1.35
--- src/sys/arch/m68k/include/db_machdep.h:1.34 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/include/db_machdep.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.34 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: db_machdep.h,v 1.35 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Mach Operating System
@@ -102,7 +102,7 @@ typedef long kgdb_reg_t;
void Debugger(void); /* XXX */
void kdb_kintr(db_regs_t *);
-int kdb_trap(int, db_regs_t *);
+int kdb_trap(int, db_regs_t *);
#endif /* _KERNEL */
Index: src/sys/arch/m68k/include/frame.h
diff -u src/sys/arch/m68k/include/frame.h:1.32 src/sys/arch/m68k/include/frame.h:1.33
--- src/sys/arch/m68k/include/frame.h:1.32 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/include/frame.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.32 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: frame.h,v 1.33 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -147,17 +147,17 @@
#define FSLW_PBE 0x00004000
#define FSLW_SBE 0x00002000
#define FSLW_PTA 0x00001000
-#define FSLW_PTB 0x00000800
-#define FSLW_IL 0x00000400
-#define FSLW_PF 0x00000200
-#define FSLW_SP 0x00000100
-#define FSLW_WP 0x00000080
-#define FSLW_TWE 0x00000040
-#define FSLW_RE 0x00000020
-#define FSLW_WE 0x00000010
-#define FSLW_TTR 0x00000008
-#define FSLW_BPE 0x00000004
-#define FSLW_SEE 0x00000001
+#define FSLW_PTB 0x00000800
+#define FSLW_IL 0x00000400
+#define FSLW_PF 0x00000200
+#define FSLW_SP 0x00000100
+#define FSLW_WP 0x00000080
+#define FSLW_TWE 0x00000040
+#define FSLW_RE 0x00000020
+#define FSLW_WE 0x00000010
+#define FSLW_TTR 0x00000008
+#define FSLW_BPE 0x00000004
+#define FSLW_SEE 0x00000001
/* struct fpframe060 */
#define FPF6_FMT_NULL 0x00
@@ -236,7 +236,7 @@ do { \
if (! CLKF_USERMODE(cfp) && \
(CLKF_PC(cfp) < (u_long)&_atomic_cas_ras_end && \
CLKF_PC(cfp) > (u_long)&_atomic_cas_ras_start)) { \
- (cfp)->cf_pc = (u_long)&_atomic_cas_ras_start; \
+ (cfp)->cf_pc = (u_long)&_atomic_cas_ras_start; \
} \
} while (/*CONSTCOND*/0)
#else
Index: src/sys/arch/m68k/include/m68k.h
diff -u src/sys/arch/m68k/include/m68k.h:1.25 src/sys/arch/m68k/include/m68k.h:1.26
--- src/sys/arch/m68k/include/m68k.h:1.25 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/include/m68k.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k.h,v 1.25 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: m68k.h,v 1.26 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -58,7 +58,7 @@
* All m68k ports must provide these globals.
*/
extern int cputype; /* CPU on this host */
-extern int ectype; /* external cache on this host */
+extern int ectype; /* external cache on this host */
extern int fputype; /* FPU on this host */
extern int mmutype; /* MMU on this host */
#endif /* _KERNEL */
@@ -104,8 +104,8 @@ void copypage(void *fromaddr, void *toad
void zeropage(void *addr);
/* support.s */
-int getdfc(void);
-int getsfc(void);
+int getdfc(void);
+int getsfc(void);
/* switch_subr.s */
void lwp_trampoline(void);
Index: src/sys/arch/m68k/include/pcb.h
diff -u src/sys/arch/m68k/include/pcb.h:1.10 src/sys/arch/m68k/include/pcb.h:1.11
--- src/sys/arch/m68k/include/pcb.h:1.10 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/include/pcb.h Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.10 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: pcb.h,v 1.11 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -49,7 +49,7 @@
*/
struct pcb {
short pcb_flags; /* misc. process flags */
- short pcb_ps; /* processor status word */
+ short pcb_ps; /* processor status word */
int __pcb_spare0;
int pcb_usp; /* user stack pointer */
int pcb_regs[12]; /* D2-D7, A2-A7 */
Index: src/sys/arch/m68k/m68k/copy.s
diff -u src/sys/arch/m68k/m68k/copy.s:1.49 src/sys/arch/m68k/m68k/copy.s:1.50
--- src/sys/arch/m68k/m68k/copy.s:1.49 Tue Jun 30 16:20:01 2020
+++ src/sys/arch/m68k/m68k/copy.s Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.s,v 1.49 2020/06/30 16:20:01 maxv Exp $ */
+/* $NetBSD: copy.s,v 1.50 2023/09/26 14:33:55 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2019 The NetBSD Foundation, Inc.
@@ -392,5 +392,5 @@ ENTRY(_ustore_32)
.Lufetchstore_success:
clrl %d0 | return 0
.Lufetchstore_fault:
- clrl PCB_ONFAULT(%a1) | clear fault handler
+ clrl PCB_ONFAULT(%a1) | clear fault handler
rts
Index: src/sys/arch/m68k/m68k/db_disasm.c
diff -u src/sys/arch/m68k/m68k/db_disasm.c:1.46 src/sys/arch/m68k/m68k/db_disasm.c:1.47
--- src/sys/arch/m68k/m68k/db_disasm.c:1.46 Sat Jul 24 21:31:33 2021
+++ src/sys/arch/m68k/m68k/db_disasm.c Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.46 2021/07/24 21:31:33 andvar Exp $ */
+/* $NetBSD: db_disasm.c,v 1.47 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.46 2021/07/24 21:31:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.47 2023/09/26 14:33:55 tsutsui Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -242,7 +242,7 @@ opcode_bitmanip(dis_buffer_t *dbuf, u_sh
break;
case ORITOSR_INST:
tmp = "oriw\t";
- break;
+ break;
}
if (tmp) {
addstr(dbuf, tmp);
@@ -2789,7 +2789,7 @@ make_cond(dis_buffer_t *dbuf, int bit, c
static void
print_fcond(dis_buffer_t *dbuf, char cp)
{
- addstr(dbuf,fpcc_table[cp&31]); /* XXX - not 63 ?*/
+ addstr(dbuf,fpcc_table[cp&31]); /* XXX - not 63 ?*/
}
static void
Index: src/sys/arch/m68k/m68k/db_trace.c
diff -u src/sys/arch/m68k/m68k/db_trace.c:1.62 src/sys/arch/m68k/m68k/db_trace.c:1.63
--- src/sys/arch/m68k/m68k/db_trace.c:1.62 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/m68k/db_trace.c Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.62 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: db_trace.c,v 1.63 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.62 2023/09/26 12:46:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.63 2023/09/26 14:33:55 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -66,7 +66,7 @@ const struct db_variable db_regs[] = {
{ "a6", (long *)&ddb_regs.tf_regs[8+6], FCN_NULL, NULL },
{ "sp", (long *)&ddb_regs.tf_regs[8+7], FCN_NULL, NULL },
/* misc. */
- { "pc", (long *)&ddb_regs.tf_pc, FCN_NULL, NULL },
+ { "pc", (long *)&ddb_regs.tf_pc, FCN_NULL, NULL },
{ "sr", (long *)&ddb_regs.tf_sr, db_var_short, NULL }
};
const struct db_variable * const db_eregs =
Index: src/sys/arch/m68k/m68k/oc_cksum.s
diff -u src/sys/arch/m68k/m68k/oc_cksum.s:1.10 src/sys/arch/m68k/m68k/oc_cksum.s:1.11
--- src/sys/arch/m68k/m68k/oc_cksum.s:1.10 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/m68k/oc_cksum.s Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-| $NetBSD: oc_cksum.s,v 1.10 2023/09/26 12:46:30 tsutsui Exp $
+| $NetBSD: oc_cksum.s,v 1.11 2023/09/26 14:33:55 tsutsui Exp $
| Copyright (c) 1988 Regents of the University of California.
| All rights reserved.
@@ -72,10 +72,10 @@
|
| 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
+| 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
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.78 src/sys/arch/m68k/m68k/pmap_motorola.c:1.79
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.78 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.78 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.79 2023/09/26 14:33:55 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.78 2023/09/26 12:46:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.79 2023/09/26 14:33:55 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -863,7 +863,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
/*
* In a couple of cases, we don't need to worry about flushing
* the VAC:
- * 1. if this is a kernel mapping,
+ * 1. if this is a kernel mapping,
* we have already done it
* 2. if it is a user mapping not for the current process,
* it won't be there
@@ -1495,7 +1495,7 @@ pmap_kremove(vaddr_t va, vsize_t size)
/*
* In a couple of cases, we don't need to worry about flushing
* the VAC:
- * 1. if this is a kernel mapping,
+ * 1. if this is a kernel mapping,
* we have already done it
* 2. if it is a user mapping not for the current process,
* it won't be there
Index: src/sys/arch/m68k/m68k/sunos_machdep.c
diff -u src/sys/arch/m68k/m68k/sunos_machdep.c:1.38 src/sys/arch/m68k/m68k/sunos_machdep.c:1.39
--- src/sys/arch/m68k/m68k/sunos_machdep.c:1.38 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/sunos_machdep.c Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_machdep.c,v 1.38 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: sunos_machdep.c,v 1.39 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.38 2011/02/08 20:20:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.39 2023/09/26 14:33:55 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ extern int sigpid;
/* sigh.. I guess it's too late to change now, but "our" sigcontext
is plain vax, not very 68000 (ap, for example..) */
struct sunos_sigcontext {
- int sc_onstack; /* sigstack state to restore */
+ int sc_onstack; /* sigstack state to restore */
int sc_mask; /* signal mask to restore */
int sc_sp; /* sp to restore */
int sc_pc; /* pc to restore */
Index: src/sys/arch/m68k/m68k/sunos_sigcode.s
diff -u src/sys/arch/m68k/m68k/sunos_sigcode.s:1.6 src/sys/arch/m68k/m68k/sunos_sigcode.s:1.7
--- src/sys/arch/m68k/m68k/sunos_sigcode.s:1.6 Thu Aug 1 13:42:52 2013
+++ src/sys/arch/m68k/m68k/sunos_sigcode.s Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_sigcode.s,v 1.6 2013/08/01 13:42:52 matt Exp $ */
+/* $NetBSD: sunos_sigcode.s,v 1.7 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -48,8 +48,8 @@
* #endif
*/
- .data
- .align 2
+ .data
+ .align 2
GLOBAL(sunos_sigcode)
movl 12(%sp),%a0 | signal handler addr (4 bytes)
jsr (%a0) | call signal handler (2 bytes)
Index: src/sys/arch/m68k/m68k/switch_subr.s
diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.35 src/sys/arch/m68k/m68k/switch_subr.s:1.36
--- src/sys/arch/m68k/m68k/switch_subr.s:1.35 Tue Sep 26 12:46:30 2023
+++ src/sys/arch/m68k/m68k/switch_subr.s Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: switch_subr.s,v 1.35 2023/09/26 12:46:30 tsutsui Exp $ */
+/* $NetBSD: switch_subr.s,v 1.36 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation.
@@ -154,7 +154,7 @@ ENTRY(cpu_switchto)
#else
/* Use this inline version on sun3x when not debugging the pmap. */
lea _C_LABEL(kernel_crp),%a3 | our CPU Root Ptr. (CRP)
- movl VM_PMAP(%a2),%a2 | pmap = vm->vm_map.pmap
+ movl VM_PMAP(%a2),%a2 | pmap = vm->vm_map.pmap
movl PM_A_PHYS(%a2),%d0 | phys = pmap->pm_a_phys
cmpl 4(%a3),%d0 | == kernel_crp.rp_addr ?
jeq .Lsame_mmuctx | skip loadcrp/flush
Index: src/sys/arch/m68k/m68k/vm_machdep.c
diff -u src/sys/arch/m68k/m68k/vm_machdep.c:1.39 src/sys/arch/m68k/m68k/vm_machdep.c:1.40
--- src/sys/arch/m68k/m68k/vm_machdep.c:1.39 Fri Oct 25 20:53:02 2013
+++ src/sys/arch/m68k/m68k/vm_machdep.c Tue Sep 26 14:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.39 2013/10/25 20:53:02 martin Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.40 2023/09/26 14:33:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.39 2013/10/25 20:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.40 2023/09/26 14:33:55 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,7 +152,7 @@ vmapbuf(struct buf *bp, vsize_t len)
struct pmap *upmap, *kpmap __unused;
vaddr_t uva; /* User VA (map from) */
vaddr_t kva; /* Kernel VA (new to) */
- paddr_t pa; /* physical address */
+ paddr_t pa; /* physical address */
vsize_t off;
if ((bp->b_flags & B_PHYS) == 0)
