Date: Thu, 20 Jun 2002 00:50:28 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13199 for review Message-ID: <200206200750.g5K7oSs20248@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13199 Change 13199 by peter@peter_ia64 on 2002/06/20 00:49:29 IFC @13198 Affected files ... ... //depot/projects/ia64/MAINTAINERS#10 integrate ... //depot/projects/ia64/bin/ed/buf.c#3 integrate ... //depot/projects/ia64/bin/rcp/extern.h#3 integrate ... //depot/projects/ia64/bin/rcp/rcp.c#4 integrate ... //depot/projects/ia64/share/doc/papers/fsinterface/fsinterface.ms#2 integrate ... //depot/projects/ia64/share/man/man9/uio.9#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/support.s#5 integrate ... //depot/projects/ia64/sys/alpha/include/runq.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#6 integrate ... //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#5 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#4 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#5 integrate ... //depot/projects/ia64/sys/gnu/i386/fpemul/load_store.c#2 integrate ... //depot/projects/ia64/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/math_emulate.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/support.s#6 integrate ... //depot/projects/ia64/sys/i386/i386/vm86.c#5 integrate ... //depot/projects/ia64/sys/i386/include/runq.h#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/ia64/sys/ia64/ia64/support.s#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#30 integrate ... //depot/projects/ia64/sys/ia64/include/runq.h#2 integrate ... //depot/projects/ia64/sys/kern/kern_subr.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_switch.c#6 integrate ... //depot/projects/ia64/sys/powerpc/include/runq.h#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#7 integrate ... //depot/projects/ia64/sys/sparc64/include/runq.h#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/support.s#7 integrate ... //depot/projects/ia64/sys/sys/systm.h#15 integrate ... //depot/projects/ia64/sys/sys/uio.h#4 integrate ... //depot/projects/ia64/usr.bin/time/time.1#3 integrate ... //depot/projects/ia64/usr.bin/time/time.c#5 integrate ... //depot/projects/ia64/usr.bin/who/who.c#7 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.35 2002/06/17 08:58:29 anholt Exp $ +$FreeBSD: src/MAINTAINERS,v 1.36 2002/06/20 07:06:21 jmallett Exp $ subsystem login notes ----------------------------- @@ -69,3 +69,5 @@ ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. +xargs jmallett Willing to handle problems. appreciate heads-up + but just try not to break it. ==== //depot/projects/ia64/bin/ed/buf.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/ed/buf.c,v 1.20 2002/02/02 06:36:49 imp Exp $"; + "$FreeBSD: src/bin/ed/buf.c,v 1.21 2002/06/20 07:15:55 jmallett Exp $"; #endif /* not lint */ #include <sys/file.h> @@ -193,7 +193,7 @@ int open_sbuf(void) { - int fd = -1; + int fd; int u; isbinary = newline_added = 0; ==== //depot/projects/ia64/bin/rcp/extern.h#3 (text+ko) ==== @@ -31,11 +31,11 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/rcp/extern.h,v 1.7 2002/02/02 06:48:10 imp Exp $ + * $FreeBSD: src/bin/rcp/extern.h,v 1.8 2002/06/20 06:00:51 jmallett Exp $ */ typedef struct { - int cnt; + size_t cnt; char *buf; } BUF; ==== //depot/projects/ia64/bin/rcp/rcp.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/rcp/rcp.c,v 1.31 2002/05/08 00:41:48 des Exp $"; + "$FreeBSD: src/bin/rcp/rcp.c,v 1.32 2002/06/20 06:00:51 jmallett Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -670,14 +670,17 @@ if (*cp++ != ' ') SCREWUP("size not delimited"); if (targisdir) { - static char *namebuf; - static int cursize; + static char *namebuf = NULL; + static size_t cursize; size_t need; need = strlen(targ) + strlen(cp) + 250; if (need > cursize) { + if (namebuf != NULL) + free(namebuf); if (!(namebuf = malloc(need))) run_err("%s", strerror(errno)); + cursize = need; } (void)snprintf(namebuf, need, "%s%s%s", targ, *targ ? "/" : "", cp); ==== //depot/projects/ia64/share/doc/papers/fsinterface/fsinterface.ms#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsinterface.ms 1.4 (Berkeley) 4/16/91 -.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.8 2000/11/27 18:16:24 ru Exp $ +.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.9 2002/06/20 07:09:23 peter Exp $ .\" .nr UX 0 .de UX @@ -755,14 +755,13 @@ }; .DE .DS -.ta .5i +\w'UIO_USERISPACE\0\0\0\0\0'u +.ta .5i +\w'UIO_USERSPACE\0\0\0\0\0'u /* * Segment flag values. */ enum uio_seg { UIO_USERSPACE, /* from user data space */ UIO_SYSSPACE, /* from system space */ - UIO_USERISPACE /* from user I space */ }; .DE .NH ==== //depot/projects/ia64/share/man/man9/uio.9#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/uio.9,v 1.12 2001/11/21 12:02:28 ru Exp $ +.\" $FreeBSD: src/share/man/man9/uio.9,v 1.13 2002/06/20 07:09:24 peter Exp $ .\" .Dd February 2, 1997 .Os @@ -90,14 +90,11 @@ The number of bytes to process. .It Va uio_segflg One of the following flags: -.Bl -tag -width ".Dv UIO_USERISPACE" +.Bl -tag -width ".Dv UIO_USERSPACE" .It Dv UIO_USERSPACE The I/O vector points into a process's address space. .It Dv UIO_SYSSPACE The I/O vector points into the kernel address space. -.It Dv UIO_USERISPACE -The I/O vector points into the instruction area of a process's address -space. .It Dv UIO_NOCOPY Don't copy, already in object. .El ==== //depot/projects/ia64/sys/alpha/alpha/support.s#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/ia64/sys/alpha/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.5 2001/11/19 07:09:47 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include <stand.h> ==== //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.32 2002/01/04 07:59:27 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include <stand.h> @@ -53,6 +53,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.5 2001/11/19 07:05:09 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include <stand.h> @@ -54,6 +54,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include <stand.h> @@ -61,6 +61,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/gnu/i386/fpemul/load_store.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.13 1999/08/28 00:42:52 peter Exp $ + * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.14 2002/06/20 07:23:08 peter Exp $ * */ @@ -201,7 +201,7 @@ break; case 024: /* fldcw */ REENTRANT_CHECK(OFF); - control_word = fusword((unsigned short *) FPU_data_address); + control_word = fuword16((unsigned short *) FPU_data_address); REENTRANT_CHECK(ON); #ifdef NO_UNDERFLOW_TRAP if (!(control_word & EX_Underflow)) { @@ -242,7 +242,7 @@ case 034: /* fstcw m16int */ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, FPU_data_address, 2);*/ - susword( (short *) FPU_data_address,control_word); + suword16( (short *) FPU_data_address,control_word); REENTRANT_CHECK(ON); /* We want no net effect: */ FPU_data_address = (void *) (intptr_t ) data_operand_offset; @@ -258,7 +258,7 @@ status_word |= (top & 7) << SW_Top_Shift; REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, FPU_data_address, 2);*/ - susword( (short *) FPU_data_address,status_word); + suword16( (short *) FPU_data_address,status_word); REENTRANT_CHECK(ON); /* We want no net effect: */ FPU_data_address = (void *) (intptr_t) data_operand_offset; ==== //depot/projects/ia64/sys/gnu/i386/fpemul/reg_ld_str.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.13 1999/08/28 00:42:56 peter Exp $ + * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.14 2002/06/20 07:23:08 peter Exp $ * */ @@ -110,7 +110,7 @@ * hence re-entrancy problems can arise */ sigl = fuword((unsigned long *) s); sigh = fuword(1 + (unsigned long *) s); - exp = fusword(4 + (unsigned short *) s); + exp = fuword16(4 + (unsigned short *) s); REENTRANT_CHECK(ON); FPU_loaded_data.sigl = sigl; @@ -361,7 +361,7 @@ REENTRANT_CHECK(OFF); /* Cast as short to get the sign extended. */ - s = (short) fusword((unsigned short *) _s); + s = (short) fuword16((unsigned short *) _s); REENTRANT_CHECK(ON); if (s == 0) { @@ -527,7 +527,7 @@ /* verify_area(VERIFY_WRITE, d, 10); */ suword((unsigned long *) d, ls); suword(1 + (unsigned long *) d, ms); - susword(4 + (short *) d, (unsigned short) e | sign); + suword16(4 + (short *) d, (unsigned short) e | sign); REENTRANT_CHECK(ON); return 1; @@ -1001,7 +1001,7 @@ /* Put out the QNaN indefinite */ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, d, 2);*/ - susword((unsigned short *) d, 0x8000); + suword16((unsigned short *) d, 0x8000); REENTRANT_CHECK(ON); return 1; } else @@ -1025,7 +1025,7 @@ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, d, 2); */ - susword((short *) d, (short) t.sigl); + suword16((short *) d, (short) t.sigl); REENTRANT_CHECK(ON); return 1; @@ -1164,9 +1164,9 @@ int i; REENTRANT_CHECK(OFF); - control_word = fusword((unsigned short *) s); - status_word = fusword((unsigned short *) (s + 4)); - tag_word = fusword((unsigned short *) (s + 8)); + control_word = fuword16((unsigned short *) s); + status_word = fuword16((unsigned short *) (s + 4)); + tag_word = fuword16((unsigned short *) (s + 8)); ip_offset = fuword((unsigned long *) (s + 0x0c)); cs_selector = fuword((unsigned long *) (s + 0x10)); data_operand_offset = fuword((unsigned long *) (s + 0x14)); @@ -1285,9 +1285,9 @@ #endif /****/ REENTRANT_CHECK(OFF); - susword((unsigned short *) d, control_word); - susword((unsigned short *) (d + 4), (status_word & ~SW_Top) | ((top & 7) << SW_Top_Shift)); - susword((unsigned short *) (d + 8), tag_word()); + suword16((unsigned short *) d, control_word); + suword16((unsigned short *) (d + 4), (status_word & ~SW_Top) | ((top & 7) << SW_Top_Shift)); + suword16((unsigned short *) (d + 8), tag_word()); suword((unsigned long *) (d + 0x0c), ip_offset); suword((unsigned long *) (d + 0x10), cs_selector); suword((unsigned long *) (d + 0x14), data_operand_offset); @@ -1378,7 +1378,7 @@ } e |= rp->sign == SIGN_POS ? 0 : 0x8000; REENTRANT_CHECK(OFF); - susword((unsigned short *) (d + i * 10 + 8), e); + suword16((unsigned short *) (d + i * 10 + 8), e); REENTRANT_CHECK(ON); } ==== //depot/projects/ia64/sys/i386/i386/math_emulate.c#4 (text+ko) ==== @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.40 2001/11/28 01:42:16 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.41 2002/06/20 07:23:08 peter Exp $ */ /* @@ -71,7 +71,7 @@ static unsigned short get_fs_word(unsigned short *adr) - { return(fuword(adr)); } + { return(fuword16(adr)); } static u_int32_t get_fs_long(u_int32_t *adr) @@ -83,7 +83,7 @@ static void put_fs_word(unsigned short val, short *adr) - { (void)susword(adr,val); } + { (void)suword16(adr,val); } static void put_fs_long(u_long val, u_int32_t *adr) ==== //depot/projects/ia64/sys/i386/i386/support.s#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.89 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.90 2002/06/20 07:13:33 peter Exp $ */ #include "opt_npx.h" @@ -1204,9 +1204,9 @@ ret /* - * fusword - MP SAFE + * fuword16 - MP SAFE */ -ENTRY(fusword) +ENTRY(fuword16) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx @@ -1293,9 +1293,9 @@ jmp suword /* - * susword - MP SAFE (if not I386_CPU) + * suword16 - MP SAFE (if not I386_CPU) */ -ENTRY(susword) +ENTRY(suword16) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx @@ -1339,9 +1339,8 @@ ret /* - * su[i]byte - MP SAFE (if not I386_CPU) + * subyte - MP SAFE (if not I386_CPU) */ -ALTENTRY(suibyte) ENTRY(subyte) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) ==== //depot/projects/ia64/sys/i386/i386/vm86.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.45 2002/04/04 21:03:19 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.46 2002/06/20 07:23:08 peter Exp $ */ #include <sys/param.h> @@ -98,7 +98,7 @@ PUSH(u_short x, struct vm86frame *vmf) { vmf->vmf_sp -= 2; - susword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); + suword16(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); } static __inline void @@ -111,7 +111,7 @@ static __inline u_short POP(struct vm86frame *vmf) { - u_short x = fusword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); + u_short x = fuword16(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); vmf->vmf_sp += 2; return (x); ==== //depot/projects/ia64/sys/i386/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/runq.h,v 1.1 2002/05/25 01:12:16 jake Exp $ + * $FreeBSD: src/sys/i386/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1 << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word)) +#define RQB_FFS(word) (ffs(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#23 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.61 2002/05/04 12:21:32 dfr Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.63 2002/06/20 06:25:22 peter Exp $ */ /* ==== //depot/projects/ia64/sys/ia64/ia64/support.s#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/support.s,v 1.12 2002/04/10 19:26:49 dfr Exp $ + * $FreeBSD: src/sys/ia64/ia64/support.s,v 1.15 2002/06/20 07:40:53 peter Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -359,11 +359,6 @@ END(fubyte) -ENTRY(suibyte, 2) - mov ret0=-1 - br.ret.sptk.few rp -END(suibyte) - ENTRY(fusufault, 0) st8 [r15]=r0 ;; // r15 points at onfault mov ret0=r0 @@ -371,8 +366,8 @@ END(fusufault) ENTRY(fswintrberr, 0) -XENTRY(fuswintr) /* XXX what is a 'word'? */ -XENTRY(suswintr) /* XXX what is a 'word'? */ +XENTRY(fuswintr) /* XXX 16 bit short for profiling */ +XENTRY(suswintr) /* XXX 16 bit short for profiling */ mov ret0=-1 br.ret.sptk.few rp END(fswintrberr) ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.55 2002/06/07 05:47:35 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.57 2002/06/20 06:47:44 peter Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/ia64/sys/ia64/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/runq.h,v 1.1 2002/05/25 01:12:19 jake Exp $ + * $FreeBSD: src/sys/ia64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/kern/kern_subr.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.52 2002/05/05 22:42:40 alc Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.53 2002/06/20 07:08:43 peter Exp $ */ #include <sys/param.h> @@ -96,7 +96,6 @@ switch (uio->uio_segflg) { case UIO_USERSPACE: - case UIO_USERISPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) uio_yield(); if (uio->uio_rw == UIO_READ) @@ -168,7 +167,6 @@ switch (uio->uio_segflg) { case UIO_USERSPACE: - case UIO_USERISPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) uio_yield(); if (uio->uio_rw == UIO_READ) { @@ -311,10 +309,6 @@ *iov->iov_base = c; break; - case UIO_USERISPACE: - if (suibyte(iov->iov_base, c) < 0) - return (EFAULT); - break; case UIO_NOCOPY: break; } ==== //depot/projects/ia64/sys/kern/kern_switch.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.27 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.28 2002/06/20 06:21:20 peter Exp $ */ #include <sys/param.h> @@ -129,8 +129,7 @@ rqb = &rq->rq_status; for (i = 0; i < RQB_LEN; i++) if (rqb->rqb_bits[i]) { - pri = (RQB_FFS(rqb->rqb_bits[i]) - 1) + - (i << RQB_L2BPW); + pri = RQB_FFS(rqb->rqb_bits[i]) + (i << RQB_L2BPW); CTR3(KTR_RUNQ, "runq_findbit: bits=%#x i=%d pri=%d", rqb->rqb_bits[i], i, pri); return (pri); ==== //depot/projects/ia64/sys/powerpc/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.1 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1 << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word)) +#define RQB_FFS(word) (ffs(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#7 (text+ko) ==== @@ -55,7 +55,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.5 2002/05/27 10:50:47 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.6 2002/06/20 07:13:34 peter Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -233,13 +233,6 @@ } int -suibyte(void *addr, int byte) -{ - - return (subyte(addr, byte)); -} - -int suword(void *addr, long word) { struct thread *td; ==== //depot/projects/ia64/sys/sparc64/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.1 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/sparc64/sparc64/support.s#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/support.s,v 1.13 2002/05/26 16:03:13 dfr Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/support.s,v 1.14 2002/06/20 07:13:35 peter Exp $ */ #include <machine/asi.h> @@ -536,18 +536,6 @@ END(subyte) /* - * int suibyte(const void *base, int byte) - */ -ENTRY(suibyte) -#if KTR_COMPILE & KTR_CT1 - CATR(KTR_CT1, "suibyte: base=%#lx", %g1, %g2, %g3, 7, 8, 9) - stx %o0, [%g1 + KTR_PARM1] -9: -#endif - SU_ALIGNED(stba, fsbail) -END(suibyte) - -/* * int susword(const void *base, int word) */ ENTRY(susword) ==== //depot/projects/ia64/sys/sys/systm.h#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.175 2002/06/12 02:08:17 kbyanc Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.177 2002/06/20 07:23:08 peter Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -180,16 +180,15 @@ int copyout(const void *kaddr, void *udaddr, size_t len); int fubyte(const void *base); -int subyte(void *base, int byte); -int suibyte(void *base, int byte); +long fuword(const void *base); +int fuword16(void *base); int32_t fuword32(const void *base); int64_t fuword64(const void *base); -long fuword(const void *base); +int subyte(void *base, int byte); int suword(void *base, long word); +int suword16(void *base, int word); int suword32(void *base, int32_t word); int suword64(void *base, int64_t word); -int fusword(void *base); -int susword(void *base, int word); void realitexpire(void *); ==== //depot/projects/ia64/sys/sys/uio.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $FreeBSD: src/sys/sys/uio.h,v 1.19 2002/05/06 06:20:03 alc Exp $ + * $FreeBSD: src/sys/sys/uio.h,v 1.20 2002/06/20 07:08:43 peter Exp $ */ #ifndef _SYS_UIO_H_ @@ -52,7 +52,6 @@ enum uio_seg { UIO_USERSPACE, /* from user data space */ UIO_SYSSPACE, /* from system space */ - UIO_USERISPACE, /* from user I space */ UIO_NOCOPY /* don't copy, already in object */ }; ==== //depot/projects/ia64/usr.bin/time/time.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)time.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/time/time.1,v 1.17 2002/06/03 14:54:04 tjr Exp $ +.\" $FreeBSD: src/usr.bin/time/time.1,v 1.19 2002/06/20 07:12:34 tjr Exp $ .\" .Dd June 6, 1993 .Dt TIME 1 @@ -43,27 +43,23 @@ .Op Fl al .Op Fl h | Fl p .Op Fl o Ar file -.Ar command +.Ar utility Op Ar argument ... .Sh DESCRIPTION The .Nm utility executes and -times -.Ar command -by initiating a timer and passing the -.Ar command -to the -shell. +times the specified +.Ar utility . After the -.Ar command +.Ar utility finishes, .Nm writes to the standard error stream, (in seconds): the total time elapsed, the time used to execute the -.Ar command +.Ar utility process and the time consumed by system overhead. .Pp Available options: @@ -103,16 +99,16 @@ manual page. .Sh DIAGNOSTICS If -.Ar command +.Ar utility could be timed successfully, its exit status is returned. If -.Ar command +.Ar utility terminated abnormally, a warning message is output to stderr. If the -.Ar command +.Ar utility was found but could not be run, the exit status is 126. If no -.Ar command +.Ar utility could be found at all, the exit status is 127. If .Nm ==== //depot/projects/ia64/usr.bin/time/time.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/time/time.c,v 1.21 2002/05/25 03:32:23 tjr Exp $"; + "$FreeBSD: src/usr.bin/time/time.c,v 1.22 2002/06/20 07:07:00 tjr Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -225,7 +225,8 @@ static void usage() { - fprintf(stderr, "usage: time [-al] [-h|-p] [-o file] command\n"); + fprintf(stderr, + "usage: time [-al] [-h|-p] [-o file] utility [argument ...]\n"); exit(1); } ==== //depot/projects/ia64/usr.bin/who/who.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.16 2002/06/04 09:52:30 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.17 2002/06/20 07:36:22 tjr Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -132,7 +132,7 @@ exit(0); } -void +static void usage(void) { @@ -140,7 +140,7 @@ exit(1); } -void +static void heading(void) { @@ -155,7 +155,7 @@ putchar('\n'); } -void +static void row(struct utmp *ut) { char buf[80], tty[sizeof(_PATH_DEV) + UT_LINESIZE]; @@ -201,7 +201,7 @@ putchar('\n'); } -void +static void process_utmp(FILE *fp) { struct utmp ut; @@ -211,7 +211,7 @@ row(&ut); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206200750.g5K7oSs20248>