diff options
Diffstat (limited to 'sys')
27 files changed, 125 insertions, 126 deletions
diff --git a/sys/arch/mips64/dev/clockvar.h b/sys/arch/mips64/dev/clockvar.h index 2f9da924407..5b6bd14c5a5 100644 --- a/sys/arch/mips64/dev/clockvar.h +++ b/sys/arch/mips64/dev/clockvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clockvar.h,v 1.1 2004/08/06 20:57:02 pefo Exp $ */ +/* $OpenBSD: clockvar.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -6,17 +6,17 @@ * * Author: Chris G. Demetriou * Adopted for r4400: Per Fogelstrom - * + * * 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 + * + * 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.Distribution@CS.CMU.EDU diff --git a/sys/arch/mips64/include/ansi.h b/sys/arch/mips64/include/ansi.h index c80b1bc0650..6cc8903a530 100644 --- a/sys/arch/mips64/include/ansi.h +++ b/sys/arch/mips64/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: ansi.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -69,7 +69,7 @@ * chosen over a long is that the is*() and to*() routines take ints (says * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you * lose a bit of ANSI conformance, but your programs will still work. - * + * * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains * defined for ctype.h. diff --git a/sys/arch/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index bb6bb2411b4..ab27bb3d9d3 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: arcbios.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -108,7 +108,7 @@ typedef struct arc_config u_int32_t affinity_mask; u_int32_t config_data_len; u_int32_t id_len; - char *id; + char *id; } arc_config_t; typedef enum arc_status @@ -215,7 +215,7 @@ typedef struct arc_calls volatile void (*return_from_main)(void); /* ReturnFromMain 9 */ arc_config_t *(*get_peer)( /* GetPeer 10 */ - arc_config_t *); /* Component */ + arc_config_t *); /* Component */ arc_config_t *(*get_child)( /* GetChild 11 */ arc_config_t *); /* Component */ @@ -288,7 +288,7 @@ typedef struct arc_calls arc_status_t (*seek)( /* Seek 29 */ u_int32_t, /* FileId */ int64_t *, /* Offset */ - arc_seek_mode_t); /* Mode */ + arc_seek_mode_t); /* Mode */ arc_status_t (*mount)( /* Mount 30 */ char *, /* Path */ @@ -320,7 +320,7 @@ typedef struct arc_calls #define ARC_PARAM_BLK_MAGIC 0x53435241 #define ARC_PARAM_BLK_MAGIC_BUG 0x41524353 /* This is wrong... but req */ -typedef struct arc_param_blk +typedef struct arc_param_blk { u_int32_t magic; /* Magic Number */ u_int32_t length; /* Length of parameter block */ diff --git a/sys/arch/mips64/include/archtype.h b/sys/arch/mips64/include/archtype.h index 1d87f2cd6a9..5e56d6aaaba 100644 --- a/sys/arch/mips64/include/archtype.h +++ b/sys/arch/mips64/include/archtype.h @@ -1,7 +1,7 @@ -/* $OpenBSD: archtype.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: archtype.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1997-2003 Opsycon AB, Sweden (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -77,8 +77,8 @@ #define WG8168 0x0056 /* Willowglen 8168 5231 VME card */ #define WG6000 0x0057 /* Willowglen CPU-6000 */ #define WG7000 0x0058 /* Willowglen CPU-7000 */ -#define WG8200 0x0059 /* Willowglen CPU-8200 */ -#define WG8232 0x005a /* Willowglen CPU-8232 */ +#define WG8200 0x0059 /* Willowglen CPU-8200 */ +#define WG8232 0x005a /* Willowglen CPU-8232 */ #define MISC_CLASS 0x00F0 /* Misc machines... */ #define LAGUNA 0x00F1 /* Heurikon Laguna VME board */ diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index 8816f1227c9..6efa9871642 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,8 +1,8 @@ -/* $OpenBSD: asm.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: asm.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -54,7 +54,7 @@ #error "__MIPSEL__ or __MIPSEB__ must be defined" #endif /* - * Define how to access unaligned data word + * Define how to access unaligned data word */ #if defined(__MIPSEL__) #define LWLO lwl @@ -181,7 +181,7 @@ */ #if defined(XGPROF) || defined(XPROF) #define MCOUNT \ - subu sp, sp, 32; \ + subu sp, sp, 32; \ SAVE_GP(16); \ sw ra, 28(sp); \ sw gp, 24(sp); \ diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 117c8aa194f..c181b418684 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: cpu.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -65,10 +65,10 @@ #define KSEG_SIZE 0x20000000 #define KSEG0_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) -#define KSEG1_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) +#define KSEG1_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) #define PHYS_TO_KSEG0(x) ((u_long)(x) | KSEG0_BASE) -#define PHYS_TO_KSEG1(x) ((u_long)(x) | KSEG1_BASE) -#define PHYS_TO_KSEG3(x) ((u_long)(x) | KSEG3_BASE) +#define PHYS_TO_KSEG1(x) ((u_long)(x) | KSEG1_BASE) +#define PHYS_TO_KSEG3(x) ((u_long)(x) | KSEG3_BASE) #ifdef _KERNEL diff --git a/sys/arch/mips64/include/cpustate.h b/sys/arch/mips64/include/cpustate.h index a94c7269ce4..178320c418c 100644 --- a/sys/arch/mips64/include/cpustate.h +++ b/sys/arch/mips64/include/cpustate.h @@ -1,8 +1,8 @@ -/* $OpenBSD: cpustate.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: cpustate.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -128,7 +128,7 @@ RESTORE_REG(t8, T8, frame, bo) ;\ RESTORE_REG(t9, T9, frame, bo) ;\ RESTORE_REG(gp, GP, frame, bo) ;\ - RESTORE_REG(ra, RA, frame, bo) + RESTORE_REG(ra, RA, frame, bo) /* * Restore 'callee save' registers diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h index 4502318d9af..731ec862147 100644 --- a/sys/arch/mips64/include/db_machdep.h +++ b/sys/arch/mips64/include/db_machdep.h @@ -1,8 +1,8 @@ -/* $OpenBSD: db_machdep.h,v 1.2 2004/08/10 20:07:15 pefo Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/endian.h b/sys/arch/mips64/include/endian.h index ddd520dcb9b..55c63a95ca4 100644 --- a/sys/arch/mips64/include/endian.h +++ b/sys/arch/mips64/include/endian.h @@ -1,8 +1,8 @@ -/* $OpenBSD: endian.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: endian.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/exception.h b/sys/arch/mips64/include/exception.h index 3fd4792f7b5..a4bf0439683 100644 --- a/sys/arch/mips64/include/exception.h +++ b/sys/arch/mips64/include/exception.h @@ -1,8 +1,8 @@ -/* $OpenBSD: exception.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: exception.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/frame.h b/sys/arch/mips64/include/frame.h index 21bb05b7940..5ee47861e7b 100644 --- a/sys/arch/mips64/include/frame.h +++ b/sys/arch/mips64/include/frame.h @@ -1,8 +1,8 @@ -/* $OpenBSD: frame.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: frame.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/ieeefp.h b/sys/arch/mips64/include/ieeefp.h index 5828b51e39e..b833c549bd3 100644 --- a/sys/arch/mips64/include/ieeefp.h +++ b/sys/arch/mips64/include/ieeefp.h @@ -1,6 +1,6 @@ -/* $OpenBSD: ieeefp.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ -/* +/* * Written by J.T. Conklin, Apr 11, 1995 * Public domain. */ diff --git a/sys/arch/mips64/include/link.h b/sys/arch/mips64/include/link.h index 6526a506204..99d6ef0bdf5 100644 --- a/sys/arch/mips64/include/link.h +++ b/sys/arch/mips64/include/link.h @@ -1,8 +1,8 @@ -/* $OpenBSD: link.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: link.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,7 +34,7 @@ #ifndef _MIPS_LINK_H_ #define _MIPS_LINK_H_ - + #include <elf_abi.h> #include <machine/elf_abi.h> @@ -46,9 +46,9 @@ struct r_debug { int r_version; /* Protocol version. */ - struct link_map *r_map; /* Head of list of loaded objects. */ + struct link_map *r_map; /* Head of list of loaded objects. */ - Elf32_Addr r_brk; + Elf32_Addr r_brk; enum { RT_CONSISTENT, /* Mapping change is complete. */ RT_ADD, /* Adding a new object. */ @@ -56,8 +56,7 @@ struct r_debug { } r_state; Elf32_Addr r_ldbase; /* Base address the linker is loaded at. */ -}; - +}; /* * Shared object map data used by the debugger. diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h index ead77486827..303fc110592 100644 --- a/sys/arch/mips64/include/param.h +++ b/sys/arch/mips64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.2 2004/08/06 22:31:31 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,13 +44,13 @@ #ifndef _MIPS_PARAM_H_ #define _MIPS_PARAM_H_ -#ifdef _KERNEL +#ifdef _KERNEL #ifdef _LOCORE -#include <machine/psl.h> -#else +#include <machine/psl.h> +#else #include <machine/cpu.h> -#endif -#endif +#endif +#endif /* * Round p (pointer or byte index) up to a correctly-aligned value for all diff --git a/sys/arch/mips64/include/pio.h b/sys/arch/mips64/include/pio.h index e8253b69c63..2f3677bf1fa 100644 --- a/sys/arch/mips64/include/pio.h +++ b/sys/arch/mips64/include/pio.h @@ -1,8 +1,8 @@ -/* $OpenBSD: pio.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: pio.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -82,7 +82,7 @@ __out16rb(a,v) _v_ = ((v >> 8) & 0xff) | (v << 8); out16(a, _v_); -} +} static __inline u_int32_t __in32rb(a) @@ -93,7 +93,7 @@ __in32rb(a) _v_ = in32(a); _v_ = _swap_(_v_); return _v_; -} +} static __inline u_int16_t __in16rb(a) diff --git a/sys/arch/mips64/include/pmap.h b/sys/arch/mips64/include/pmap.h index 1b7d8984070..f1ba4bf8e1c 100644 --- a/sys/arch/mips64/include/pmap.h +++ b/sys/arch/mips64/include/pmap.h @@ -1,6 +1,6 @@ -/* $OpenBSD: pmap.h,v 1.2 2004/08/06 22:39:13 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ -/* +/* * Copyright (c) 1987 Carnegie-Mellon University * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ * The user address space is mapped using a two level structure where * virtual address bits 30..22 are used to index into a segment table which * points to a page worth of PTEs (4096 page can hold 1024 PTEs). - * Bits 21..12 are then used to index a PTE which describes a page within + * Bits 21..12 are then used to index a PTE which describes a page within * a segment. * * The wired entries in the TLB will contain the following: diff --git a/sys/arch/mips64/include/regnum.h b/sys/arch/mips64/include/regnum.h index 0de6f8e9f7f..bfe12804725 100644 --- a/sys/arch/mips64/include/regnum.h +++ b/sys/arch/mips64/include/regnum.h @@ -1,8 +1,8 @@ -/* $OpenBSD: regnum.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: regnum.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/signal.h b/sys/arch/mips64/include/signal.h index 6af5d134bb6..e162ccf1aae 100644 --- a/sys/arch/mips64/include/signal.h +++ b/sys/arch/mips64/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: signal.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -68,7 +68,7 @@ struct sigcontext { f_register_t sc_fpregs[33]; /* fp regs 0 to 31 and csr */ long sc_fpused; /* fp has been used */ long sc_fpc_eir; /* floating point exception instruction reg */ - long xxx[8]; /* XXX reserved */ + long xxx[8]; /* XXX reserved */ }; #endif /* !_ANSI_SOURCE */ diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h index 0f2459456f7..65b02955390 100644 --- a/sys/arch/mips64/include/trap.h +++ b/sys/arch/mips64/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.2 2004/08/08 14:21:27 pefo Exp $ */ +/* $OpenBSD: trap.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -111,7 +111,7 @@ struct trapdebug { /* trap history buffer for debugging */ } #define TRAPSIZE 10 /* Trap log buffer length */ -extern struct trapdebug trapdebug[TRAPSIZE], *trp; +extern struct trapdebug trapdebug[TRAPSIZE], *trp; void trapDump __P((char *msg)); diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h index 581716a9c50..05dba28e58e 100644 --- a/sys/arch/mips64/include/vmparam.h +++ b/sys/arch/mips64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: vmparam.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */ /* @@ -99,7 +99,7 @@ * It is related to human patience and other factors which don't really * change over time. */ -#define MAXSLP 20 +#define MAXSLP 20 #define VM_PHYSSEG_MAX 8 /* Max number of physical memory segments */ #define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH @@ -137,6 +137,6 @@ vaddr_t virtual_end; struct pmap_physseg { struct pv_entry *pvent; /* pv list of this seg */ char *attrs; -}; +}; #endif /* !_MIPS_VMPARAM_H_ */ diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index 0382ce2e611..e64ec15b7ca 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.5 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -77,7 +77,7 @@ cpuattach(parent, dev, aux) switch(sys_config.cpu[cpuno].type) { case MIPS_R4000: - if(CpuPrimaryInstCacheSize == 16384) + if (CpuPrimaryInstCacheSize == 16384) printf("MIPS R4400 CPU"); else printf("MIPS R4000 CPU"); @@ -107,7 +107,7 @@ cpuattach(parent, dev, aux) printf("PMC-Sierra RM52X0 CPU"); break; case MIPS_RM7000: - if(sys_config.cpu[cpuno].vers_maj < 2) { + if (sys_config.cpu[cpuno].vers_maj < 2) { printf("PMC-Sierra RM7000 CPU"); } else { printf("PMC-Sierra RM7000A CPU"); @@ -182,7 +182,7 @@ cpuattach(parent, dev, aux) printf("1 way"); break; } - if(CpuSecondaryCacheSize != 0) { + if (CpuSecondaryCacheSize != 0) { switch(sys_config.cpu[cpuno].type) { case MIPS_RM7000: case MIPS_RM9000: @@ -195,7 +195,7 @@ cpuattach(parent, dev, aux) } } - if(CpuTertiaryCacheSize != 0) { + if (CpuTertiaryCacheSize != 0) { printf(", L3 %dKB direct", CpuTertiaryCacheSize / 1024); } printf("\n"); @@ -206,7 +206,7 @@ cpuattach(parent, dev, aux) printf("cpu%d: Alias mask 0x%x\n", cpuno, CpuCacheAliasMask); printf("cpu%d: Config Register %x\n", cpuno, CpuConfigRegister); printf("cpu%d: Cache type %x\n", cpuno, CpuCacheType); - if(fpu_id.cpu[cpuno].cp_imp == MIPS_RM7000) { + if (fpu_id.cpu[cpuno].cp_imp == MIPS_RM7000) { u_int tmp; tmp = CpuConfigRegister; printf("cpu%d: ", cpuno); diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c index 13ff6196f5d..ec0225315aa 100644 --- a/sys/arch/mips64/mips64/db_machdep.c +++ b/sys/arch/mips64/mips64/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) @@ -117,7 +117,7 @@ kdb_trap(type, fp) { switch(type) { case T_BREAK: /* breakpoint */ - if(db_get_value((fp)->pc, sizeof(int), FALSE) == BREAK_SOVER) { + if (db_get_value((fp)->pc, sizeof(int), FALSE) == BREAK_SOVER) { (fp)->pc += BKPT_SIZE; } break; @@ -128,7 +128,7 @@ kdb_trap(type, fp) if (!db_panic) return (0); #endif - if(db_recover != 0) { + if (db_recover != 0) { db_error("Caught exception in ddb.\n"); /*NOTREACHED*/ } @@ -190,10 +190,10 @@ db_write_bytes(addr, size, data) len -= sizeof(int); } - if(len) { + if (len) { kdbpokeb(ptr, *data++); } - if(addr < VM_MIN_KERNEL_ADDRESS) { + if (addr < VM_MIN_KERNEL_ADDRESS) { Mips_HitSyncDCache(addr, size); Mips_InvalidateICache(PHYS_TO_KSEG0(addr & 0xffff), size); } @@ -391,7 +391,7 @@ loop: } done: - if(symname == NULL) { + if (symname == NULL) { if (subr == (long)idle) (*pr)("idle "); else @@ -565,7 +565,7 @@ char *attr[] = { pid = -1; if (m[0] == 'p') { - if(have_addr && addr < 256) { + if (have_addr && addr < 256) { pid = addr; tlbno = 0; count = sys_config.cpu[0].tlbsize; @@ -587,7 +587,7 @@ if ((tlbp.tlb_hi == tlb.tlb_hi && (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V)) || } return; } else { - if(have_addr && addr < sys_config.cpu[0].tlbsize) { + if (have_addr && addr < sys_config.cpu[0].tlbsize) { tlbno = addr; } else { @@ -603,11 +603,11 @@ if ((tlbp.tlb_hi == tlb.tlb_hi && (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V)) || if (pid >= 0 && (tlb.tlb_hi & 0xff) != pid) continue; - if(tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V) { + if (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V) { printf("%2d v=0x%08x", tlbno, tlb.tlb_hi & ~0xff); printf("/%02x ", tlb.tlb_hi & 0xff); - if(tlb.tlb_lo0 & PG_V) { + if (tlb.tlb_lo0 & PG_V) { printf("0x%08x ", pfn_to_pad(tlb.tlb_lo0)); printf("%c", tlb.tlb_lo0 & PG_M ? 'M' : ' '); printf("%c", tlb.tlb_lo0 & PG_G ? 'G' : ' '); @@ -616,7 +616,7 @@ if ((tlbp.tlb_hi == tlb.tlb_hi && (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V)) || printf("invalid "); } - if(tlb.tlb_lo1 & PG_V) { + if (tlb.tlb_lo1 & PG_V) { printf("0x%08x ", pfn_to_pad(tlb.tlb_lo1)); printf("%c", tlb.tlb_lo1 & PG_M ? 'M' : ' '); printf("%c", tlb.tlb_lo1 & PG_G ? 'G' : ' '); diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index a9af7d2f7ef..20647dc7e02 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -143,7 +143,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) msg = "dos partition I/O error"; goto done; } - if(((int *)bp->b_data)[0] == 0x01084025 && + if (((int *)bp->b_data)[0] == 0x01084025 && ((int *)bp->b_data)[1] == 0x01294825) { goto nodoslabel; } @@ -430,8 +430,8 @@ writedisklabel(dev, strat, lp, osdep) if ((error = biowait(bp)) != 0) goto done; - if(((int *)bp->b_data)[0] == 0x01084025 && - ((int *)bp->b_data)[1] == 0x01294825) { + if (((int *)bp->b_data)[0] == 0x01084025 && + ((int *)bp->b_data)[1] == 0x01294825) { goto nodoslabel; } /* XXX how do we check veracity/bounds of this? */ diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c index 5aba8c827de..04f0eb54dcc 100644 --- a/sys/arch/mips64/mips64/pmap.c +++ b/sys/arch/mips64/mips64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: pmap.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -231,12 +231,12 @@ pmap_steal_memory(size, vstartp, vendp) va = 0; for(i = 0; i < vm_nphysseg && va == 0; i++) { - if(vm_physmem[i].avail_start != vm_physmem[i].start || + if (vm_physmem[i].avail_start != vm_physmem[i].start || vm_physmem[i].avail_start >= vm_physmem[i].avail_end) { continue; } - if((vm_physmem[i].avail_end - vm_physmem[i].avail_start) < npgs) { + if ((vm_physmem[i].avail_end - vm_physmem[i].avail_start) < npgs) { continue; } @@ -244,8 +244,8 @@ pmap_steal_memory(size, vstartp, vendp) vm_physmem[i].avail_start += npgs; vm_physmem[i].start += npgs; - if(vm_physmem[i].avail_start == vm_physmem[i].end) { - if(vm_nphysseg == 1) { + if (vm_physmem[i].avail_start == vm_physmem[i].end) { + if (vm_nphysseg == 1) { panic("pmap_steal_memory: out of memory!"); } @@ -254,17 +254,17 @@ pmap_steal_memory(size, vstartp, vendp) vm_physmem[x] = vm_physmem[x + 1]; } } - if(vstartp) { + if (vstartp) { *vstartp = round_page(virtual_start); } - if(vendp) { + if (vendp) { *vendp = virtual_end; } va = PHYS_TO_KSEG0(pa); memset((caddr_t)va, 0, size); } - if(va == 0) { + if (va == 0) { panic("pmap_steal_memory: no memory to steal"); } @@ -373,7 +373,7 @@ extern struct user *proc0paddr; } while (mem == NULL); pv = pa_to_pvh(VM_PAGE_TO_PHYS(mem)); - if(pv->pv_flags & PV_CACHED && + if (pv->pv_flags & PV_CACHED && ((pv->pv_va ^ PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(mem))) & CpuCacheAliasMask) != 0) { Mips_SyncDCachePage(pv->pv_va); } @@ -536,25 +536,25 @@ pmap_remove(pmap, sva, eva) stat_count(remove_stats.calls); - if(pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT)) { + if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT)) { printf("pmap_remove(%x, %x, %x)\n", pmap, sva, eva); } - if(pmap == NULL) { + if (pmap == NULL) { return; } - if(pmap == pmap_kernel()) { + if (pmap == pmap_kernel()) { pt_entry_t *pte; /* remove entries from kernel pmap */ #ifdef DIAGNOSTIC - if(sva < VM_MIN_KERNEL_ADDRESS || eva > virtual_end) + if (sva < VM_MIN_KERNEL_ADDRESS || eva > virtual_end) panic("pmap_remove: kva not in range"); #endif pte = kvtopte(sva); for(; sva < eva; sva += NBPG, pte++) { entry = pte->pt_entry; - if(!(entry & PG_V)) + if (!(entry & PG_V)) continue; pmap->pm_stats.resident_count--; pmap_remove_pv(pmap, sva, pfn_to_pad(entry)); @@ -593,7 +593,7 @@ pmap_remove(pmap, sva, eva) if (!(entry & PG_V)) continue; pmap->pm_stats.resident_count--; - if(!pfn_is_ext(entry)) {/* padr > 32 bits */ + if (!pfn_is_ext(entry)) {/* padr > 32 bits */ pmap_remove_pv(pmap, sva, pfn_to_pad(entry)); } pte->pt_entry = PG_NV; @@ -877,7 +877,7 @@ pmap_enter(pmap, va, pa, prot, stat) is_physaddr = IS_VM_PHYSADDR(pa); - if(is_physaddr) { + if (is_physaddr) { pv_entry_t pv, npv; int s; @@ -950,7 +950,7 @@ pmap_enter(pmap, va, pa, prot, stat) /* * Check cache aliasing incompatibility */ - if(((npv->pv_va ^ va) & CpuCacheAliasMask) != 0) { + if (((npv->pv_va ^ va) & CpuCacheAliasMask) != 0) { printf("pmap_enter: uncached mapping for pa %p, va %p != %p.\n", pa, npv->pv_va, va); pmap_page_cache(pa,PV_UNCACHED); Mips_SyncCache(); @@ -981,7 +981,7 @@ pmap_enter(pmap, va, pa, prot, stat) /* can this cause us to recurse forever? */ npv = pmap_pv_alloc(); - if(npv == NULL) { + if (npv == NULL) { panic("pmap_pv_alloc() failed"); } npv->pv_va = va; @@ -1016,7 +1016,7 @@ pmap_enter(pmap, va, pa, prot, stat) if (!(pte->pt_entry & PG_V)) { pmap->pm_stats.resident_count++; } - if(pa != pfn_to_pad(pte->pt_entry)) { + if (pa != pfn_to_pad(pte->pt_entry)) { pmap_remove(pmap, va, va + NBPG); stat_count(enter_stats.mchange); } @@ -1043,7 +1043,7 @@ pmap_enter(pmap, va, pa, prot, stat) } while (mem == NULL); pv = pa_to_pvh(VM_PAGE_TO_PHYS(mem)); - if(pv->pv_flags & PV_CACHED && + if (pv->pv_flags & PV_CACHED && ((pv->pv_va ^ PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(mem))) & CpuCacheAliasMask) != 0) { Mips_SyncDCachePage(pv->pv_va); } @@ -1073,7 +1073,7 @@ pmap_enter(pmap, va, pa, prot, stat) printf("\n"); } - if(pa != pfn_to_pad(pte->pt_entry)) { + if (pa != pfn_to_pad(pte->pt_entry)) { pmap_remove(pmap, va, va + NBPG); stat_count(enter_stats.mchange); } @@ -1319,7 +1319,7 @@ pmap_zero_page(struct vm_page *pg) p = (vaddr_t)PHYS_TO_KSEG0(phys); pv = pa_to_pvh(phys); - if(pv->pv_flags & PV_CACHED && + if (pv->pv_flags & PV_CACHED && ((pv->pv_va ^ (int)p) & CpuCacheAliasMask) != 0) { Mips_SyncDCachePage(pv->pv_va); } @@ -1361,12 +1361,12 @@ pmap_copy_page(struct vm_page *srcpg, struct vm_page *dstpg) d = (int *)PHYS_TO_KSEG0(dst); pv = pa_to_pvh(src); - if(pv->pv_flags & PV_CACHED && + if (pv->pv_flags & PV_CACHED && (sf = ((pv->pv_va ^ (int)s) & CpuCacheAliasMask) != 0)) { Mips_SyncDCachePage(pv->pv_va); } pv = pa_to_pvh(dst); - if(pv->pv_flags & PV_CACHED && + if (pv->pv_flags & PV_CACHED && (df = ((pv->pv_va ^ (int)d) & CpuCacheAliasMask) != 0)) { Mips_SyncDCachePage(pv->pv_va); } @@ -1379,11 +1379,11 @@ pmap_copy_page(struct vm_page *srcpg, struct vm_page *dstpg) d += 4; } while (s != end); - if(sf) { + if (sf) { Mips_HitSyncDCache((vaddr_t)PHYS_TO_KSEG0(src), PAGE_SIZE); } #if 0 /* XXX TODO: Why can't we trust the following? */ - if(df || (pv->pv_pmap == NULL) || (pv->pv_flags & PV_EXEC)) { + if (df || (pv->pv_pmap == NULL) || (pv->pv_flags & PV_EXEC)) { Mips_HitSyncDCachePage(dst); } #else @@ -1587,7 +1587,7 @@ pmap_pv_page_alloc(u_long size, int flags, int mtype) { paddr_t pg; - if(pmap_physpage_alloc(&pg)) + if (pmap_physpage_alloc(&pg)) return ((void *) PHYS_TO_KSEG0(pg)); return (NULL); } diff --git a/sys/arch/mips64/mips64/process_machdep.c b/sys/arch/mips64/mips64/process_machdep.c index 50984cc86c8..a3f9a8787b1 100644 --- a/sys/arch/mips64/mips64/process_machdep.c +++ b/sys/arch/mips64/mips64/process_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1994 Adam Glass @@ -40,7 +40,7 @@ * From: * Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel * - * $Id: process_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ + * $Id: process_machdep.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */ /* @@ -105,7 +105,7 @@ int process_sstep(p, sstep) struct proc *p; { - if(sstep) + if (sstep) cpu_singlestep(p); return (0); } diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index 543a220999d..04d82a4ebc4 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */ /* tracked to 1.23 */ /* @@ -440,7 +440,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr * quad alignment for the rest of the arguments. */ if (p->p_md.md_flags & MDP_O32) { - if(_QUAD_LOWWORD == 0) { + if (_QUAD_LOWWORD == 0) { code = locr0->a0; } else { code = locr0->a1; @@ -630,7 +630,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr if ((int)trapframe->cause & CR_BR_DELAY) va += 4; printf("watch exception @ %p\n", va); - if(rm7k_watchintr(trapframe)) { + if (rm7k_watchintr(trapframe)) { /* Return to user, don't add any more overhead */ return (trapframe->pc); } @@ -658,7 +658,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr else { locr0->pc += 4; } - if(instr == 0x040c0000) { /* Performance cntr trap */ + if (instr == 0x040c0000) { /* Performance cntr trap */ int result; result = rm7k_perfcntr(trapframe->a0, trapframe->a1, @@ -903,7 +903,7 @@ MipsEmulateBranch(framePtr, instPC, fpcCSR, instptr) ((unsigned long)InstPtr + 4 + ((short)inst.IType.imm << 2)) - if(instptr) { + if (instptr) { inst = *(InstFmt *)&instptr; } else { @@ -1059,7 +1059,7 @@ cpu_singlestep(p) procfs_domem(curproc, p, NULL, &uio); /* compute next address after current location */ - if(curinstr != 0) { + if (curinstr != 0) { va = MipsEmulateBranch(locr0, locr0->pc, locr0->fsr, curinstr); } else { diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c index 2f325085671..9c8eb5dee54 100644 --- a/sys/arch/mips64/mips64/vm_machdep.c +++ b/sys/arch/mips64/mips64/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -200,7 +200,7 @@ pagemove(from, to, size) panic("pagemove"); fpte = kvtopte(from); tpte = kvtopte(to); - if(((vaddr_t)from & CpuCacheAliasMask) != ((vaddr_t)to & CpuCacheAliasMask)) { + if (((vaddr_t)from & CpuCacheAliasMask) != ((vaddr_t)to & CpuCacheAliasMask)) { Mips_HitSyncDCache((vaddr_t)from, size); } while (size > 0) { |