Module Name: src Committed By: kiyohara Date: Tue Dec 13 11:03:53 UTC 2011
Modified Files: src/sys/arch/powerpc/ibm4xx: trap.c src/sys/arch/powerpc/include: cpu.h src/sys/arch/powerpc/powerpc: compat_13_machdep.c db_interface.c db_trace.c locore_subr.S syscall.c trap_subr.S Log Message: Remove white-spaces. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/powerpc/ibm4xx/trap.c cvs rdiff -u -r1.88 -r1.89 src/sys/arch/powerpc/include/cpu.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/powerpc/compat_13_machdep.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/powerpc/db_interface.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/powerpc/db_trace.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/powerpc/locore_subr.S cvs rdiff -u -r1.48 -r1.49 src/sys/arch/powerpc/powerpc/syscall.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/powerpc/powerpc/trap_subr.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/powerpc/ibm4xx/trap.c diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.62 src/sys/arch/powerpc/ibm4xx/trap.c:1.63 --- src/sys/arch/powerpc/ibm4xx/trap.c:1.62 Tue Jun 21 06:38:50 2011 +++ src/sys/arch/powerpc/ibm4xx/trap.c Tue Dec 13 11:03:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.62 2011/06/21 06:38:50 matt Exp $ */ +/* $NetBSD: trap.c,v 1.63 2011/12/13 11:03:53 kiyohara Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.62 2011/06/21 06:38:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63 2011/12/13 11:03:53 kiyohara Exp $"); #include "opt_altivec.h" #include "opt_ddb.h" @@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.6 #define NARGREG 8 /* 8 args are in registers */ #define MOREARGS(sp) ((void *)((int)(sp) + 8)) /* more args go here */ -static int fix_unaligned(struct lwp *l, struct trapframe *frame); +static int fix_unaligned(struct lwp *l, struct trapframe *tf); void trap(struct trapframe *); /* Called from locore / trap_subr */ /* Why are these not defined in a header? */ @@ -466,7 +466,7 @@ copyin(const void *udaddr, void *kaddr, " addi %[udaddr],%[udaddr],0x1;" /* next udaddr byte */ " sync; isync;" " mtpid %[pid]; sync;" - " stb %[tmp],0(%[kaddr]);" /* Store kernel byte */ + " stb %[tmp],0(%[kaddr]);" /* Store kernel byte */ " dcbf 0,%[kaddr];" /* flush cache */ " addi %[kaddr],%[kaddr],0x1;" " sync; isync;" @@ -570,7 +570,7 @@ copyout(const void *kaddr, void *udaddr, " b 3b;" "10:mtpid %[pid]; mtmsr %[msr]; sync; isync;" /* Restore PID and MSR */ : [msr] "=&r" (msr), [pid] "=&r" (pid), [tmp] "=&r" (tmp) - : [udaddr] "b" (udaddr), [ctx] "b" (ctx), [kaddr] "b" (kaddr), [len] "b" (len), [count] "b" (count)); + : [udaddr] "b" (udaddr), [ctx] "b" (ctx), [kaddr] "b" (kaddr), [len] "b" (len), [count] "b" (count)); curpcb->pcb_onfault = NULL; return 0; Index: src/sys/arch/powerpc/include/cpu.h diff -u src/sys/arch/powerpc/include/cpu.h:1.88 src/sys/arch/powerpc/include/cpu.h:1.89 --- src/sys/arch/powerpc/include/cpu.h:1.88 Thu Jun 30 00:52:59 2011 +++ src/sys/arch/powerpc/include/cpu.h Tue Dec 13 11:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.88 2011/06/30 00:52:59 matt Exp $ */ +/* $NetBSD: cpu.h,v 1.89 2011/12/13 11:03:52 kiyohara Exp $ */ /* * Copyright (C) 1999 Wolfgang Solfrank. @@ -405,7 +405,7 @@ void oea_init(void (*)(void)); void oea_startup(const char *); void oea_dumpsys(void); void oea_install_extint(void (*)(void)); -paddr_t kvtop(void *); +paddr_t kvtop(void *); extern paddr_t msgbuf_paddr; extern int cpu_altivec; Index: src/sys/arch/powerpc/powerpc/compat_13_machdep.c diff -u src/sys/arch/powerpc/powerpc/compat_13_machdep.c:1.20 src/sys/arch/powerpc/powerpc/compat_13_machdep.c:1.21 --- src/sys/arch/powerpc/powerpc/compat_13_machdep.c:1.20 Mon Jun 20 05:50:39 2011 +++ src/sys/arch/powerpc/powerpc/compat_13_machdep.c Tue Dec 13 11:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_13_machdep.c,v 1.20 2011/06/20 05:50:39 matt Exp $ */ +/* $NetBSD: compat_13_machdep.c,v 1.21 2011/12/13 11:03:52 kiyohara Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.20 2011/06/20 05:50:39 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.21 2011/12/13 11:03:52 kiyohara Exp $"); #ifdef _KERNEL_OPT #include "opt_ppcarch.h" @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_13_ma #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/mount.h> +#include <sys/mount.h> #include <sys/syscallargs.h> #include <uvm/uvm_extern.h> Index: src/sys/arch/powerpc/powerpc/db_interface.c diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.47 src/sys/arch/powerpc/powerpc/db_interface.c:1.48 --- src/sys/arch/powerpc/powerpc/db_interface.c:1.47 Mon Jun 20 05:59:06 2011 +++ src/sys/arch/powerpc/powerpc/db_interface.c Tue Dec 13 11:03:52 2011 @@ -1,8 +1,8 @@ -/* $NetBSD: db_interface.c,v 1.47 2011/06/20 05:59:06 matt Exp $ */ +/* $NetBSD: db_interface.c,v 1.48 2011/12/13 11:03:52 kiyohara Exp $ */ /* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.47 2011/06/20 05:59:06 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.48 2011/12/13 11:03:52 kiyohara Exp $"); #define USERACC @@ -133,7 +133,7 @@ const struct db_command db_machine_comma "Display instruction translation storage buffer information.", NULL,NULL) }, #endif /* PPC_BOOKE */ - { DDB_ADD_CMD(NULL, NULL, 0, + { DDB_ADD_CMD(NULL, NULL, 0, NULL,NULL,NULL) } }; @@ -476,7 +476,7 @@ db_ppc4xx_pv(db_expr_t addr, bool have_a pv = pa_to_pv(addr); db_printf("pv at %p\n", pv); while (pv && pv->pv_pm) { - db_printf("next %p va %p pmap %p\n", pv->pv_next, + db_printf("next %p va %p pmap %p\n", pv->pv_next, (void *)pv->pv_va, pv->pv_pm); pv = pv->pv_next; } @@ -499,7 +499,7 @@ db_ppc4xx_tf(db_expr_t addr, bool have_a if (have_addr) { tf = (struct trapframe *)addr; - db_printf("r0-r3: \t%8.8lx %8.8lx %8.8lx %8.8lx\n", + db_printf("r0-r3: \t%8.8lx %8.8lx %8.8lx %8.8lx\n", tf->tf_fixreg[0], tf->tf_fixreg[1], tf->tf_fixreg[2], tf->tf_fixreg[3]); db_printf("r4-r7: \t%8.8lx %8.8lx %8.8lx %8.8lx\n", @@ -567,7 +567,7 @@ db_ppc4xx_dumptlb(db_expr_t addr, bool h "mtpid %4;" "mtmsr %3;" "sync; isync" - : "=&r" (tlblo), "=&r" (tlbhi), "=r" (pid), + : "=&r" (tlblo), "=&r" (tlbhi), "=r" (pid), "=&r" (msr), "=&r" (opid) : "r" (i)); if (strchr(modif, 'v') && !(tlbhi & TLB_VALID)) Index: src/sys/arch/powerpc/powerpc/db_trace.c diff -u src/sys/arch/powerpc/powerpc/db_trace.c:1.56 src/sys/arch/powerpc/powerpc/db_trace.c:1.57 --- src/sys/arch/powerpc/powerpc/db_trace.c:1.56 Mon Jun 20 05:59:06 2011 +++ src/sys/arch/powerpc/powerpc/db_trace.c Tue Dec 13 11:03:52 2011 @@ -1,34 +1,34 @@ -/* $NetBSD: db_trace.c,v 1.56 2011/06/20 05:59:06 matt Exp $ */ +/* $NetBSD: db_trace.c,v 1.57 2011/12/13 11:03:52 kiyohara Exp $ */ /* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas 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.56 2011/06/20 05:59:06 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.57 2011/12/13 11:03:52 kiyohara Exp $"); #include "opt_ppcarch.h" @@ -250,7 +250,7 @@ db_stack_trace_print(db_expr_t addr, boo } else { (*pr)("trap %#x by ", tf->tf_exc); } - print_trap: + print_trap: lr = (db_addr_t) tf->tf_srr0; diff = 0; symname = NULL; Index: src/sys/arch/powerpc/powerpc/locore_subr.S diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.46 src/sys/arch/powerpc/powerpc/locore_subr.S:1.47 --- src/sys/arch/powerpc/powerpc/locore_subr.S:1.46 Tue Jun 21 05:14:26 2011 +++ src/sys/arch/powerpc/powerpc/locore_subr.S Tue Dec 13 11:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.46 2011/06/21 05:14:26 matt Exp $ */ +/* $NetBSD: locore_subr.S,v 1.47 2011/12/13 11:03:52 kiyohara Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -547,7 +547,7 @@ ENTRY(cpu_spinstart) clrldi %r0,%r0,32 mtmsrd %r0 mtspr SPR_ASR,%r0 -4: +4: lis %r5,_C_LABEL(cpu_spinstart_ack)@ha addi %r5,%r5,_C_LABEL(cpu_spinstart_ack)@l stw %r3,0(%r5) @@ -567,7 +567,7 @@ ENTRY(cpu_spinstart) /* * int do_ucas_32(int32_t *uptr, int32_t old, int32_t new, int32_t *ret); - */ + */ ENTRY(do_ucas_32) 1: lwarx %r10,0,%r3 Index: src/sys/arch/powerpc/powerpc/syscall.c diff -u src/sys/arch/powerpc/powerpc/syscall.c:1.48 src/sys/arch/powerpc/powerpc/syscall.c:1.49 --- src/sys/arch/powerpc/powerpc/syscall.c:1.48 Tue Apr 26 15:51:25 2011 +++ src/sys/arch/powerpc/powerpc/syscall.c Tue Dec 13 11:03:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.48 2011/04/26 15:51:25 joerg Exp $ */ +/* $NetBSD: syscall.c,v 1.49 2011/12/13 11:03:51 kiyohara Exp $ */ /* * Copyright (C) 2002 Matt Thomas @@ -64,7 +64,7 @@ #define EMULNAME(x) (x) #define EMULNAMEU(x) (x) -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.48 2011/04/26 15:51:25 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.49 2011/12/13 11:03:51 kiyohara Exp $"); void child_return(void *arg) @@ -133,7 +133,7 @@ EMULNAME(syscall_plain)(struct trapframe default: break; } - + callp = p->p_emul->e_sysent + (code & (EMULNAMEU(SYS_NSYSENT)-1)); } @@ -244,8 +244,8 @@ EMULNAME(syscall_fancy)(struct trapframe if (argsize > n * sizeof(register_t)) { memcpy(args, params, n * sizeof(register_t)); error = copyin(MOREARGS(tf->tf_fixreg[1]), - args + n, - argsize - n * sizeof(register_t)); + args + n, + argsize - n * sizeof(register_t)); if (error) goto bad; params = args; @@ -283,6 +283,7 @@ out: break; } trace_exit(realcode, rval, error); + userret(l, tf); } Index: src/sys/arch/powerpc/powerpc/trap_subr.S diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.71 src/sys/arch/powerpc/powerpc/trap_subr.S:1.72 --- src/sys/arch/powerpc/powerpc/trap_subr.S:1.71 Tue Jun 21 05:15:44 2011 +++ src/sys/arch/powerpc/powerpc/trap_subr.S Tue Dec 13 11:03:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.S,v 1.71 2011/06/21 05:15:44 matt Exp $ */ +/* $NetBSD: trap_subr.S,v 1.72 2011/12/13 11:03:51 kiyohara Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -976,7 +976,7 @@ intrleave: FRAME_LEAVE(CI_TEMPSAVE) RFI -/* +/* * Trap handler for syscalls (EXC_SC) */ /* LINTSTUB: Var: int sctrap[1], scsize[1]; */