Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Sep 2002 00:35:42 -0700
From:      Jon Mini <mini@freebsd.org>
To:        Julian Elischer <julian@FreeBSD.org>
Cc:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   Re: PERFORCE change 17981 for review
Message-ID:  <20020923073542.GJ7539@elvis.mu.org>
In-Reply-To: <200209230734.g8N7Y5jr082997@freefall.freebsd.org>
References:  <200209230734.g8N7Y5jr082997@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Julian Elischer [julian@FreeBSD.org] wrote :

> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17981
> 
> Change 17981 by julian@julian_jules1 on 2002/09/23 00:33:56
> 
> 	 MFC.. Mini! check the merge of the floating point and context stuff

Wilco.

> Affected files ...
> 
> .. //depot/projects/kse/bin/ps/extern.h#7 integrate
> .. //depot/projects/kse/bin/ps/keyword.c#9 integrate
> .. //depot/projects/kse/bin/ps/print.c#15 integrate
> .. //depot/projects/kse/bin/ps/ps.h#3 integrate
> .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate
> .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate
> .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 integrate
> .. //depot/projects/kse/include/Makefile#3 integrate
> .. //depot/projects/kse/include/fnmatch.h#2 integrate
> .. //depot/projects/kse/include/fts.h#2 integrate
> .. //depot/projects/kse/include/grp.h#3 integrate
> .. //depot/projects/kse/include/inttypes.h#5 integrate
> .. //depot/projects/kse/include/iso646.h#2 integrate
> .. //depot/projects/kse/include/langinfo.h#2 integrate
> .. //depot/projects/kse/include/limits.h#2 integrate
> .. //depot/projects/kse/include/link.h#3 integrate
> .. //depot/projects/kse/include/monetary.h#3 integrate
> .. //depot/projects/kse/include/nl_types.h#2 integrate
> .. //depot/projects/kse/include/stdlib.h#7 integrate
> .. //depot/projects/kse/include/unistd.h#4 integrate
> .. //depot/projects/kse/include/wchar.h#7 integrate
> .. //depot/projects/kse/lib/libc/alpha/gen/infinity.c#2 integrate
> .. //depot/projects/kse/lib/libc/gen/_pthread_stubs.c#2 integrate
> .. //depot/projects/kse/lib/libc/gen/confstr.c#2 integrate
> .. //depot/projects/kse/lib/libc/gen/dlfcn.c#3 integrate
> .. //depot/projects/kse/lib/libc/gen/fts.3#2 integrate
> .. //depot/projects/kse/lib/libc/gen/fts.c#2 integrate
> .. //depot/projects/kse/lib/libc/gen/getobjformat.c#2 integrate
> .. //depot/projects/kse/lib/libc/gen/swapcontext.c#7 integrate
> .. //depot/projects/kse/lib/libc/gen/sysconf.c#2 integrate
> .. //depot/projects/kse/lib/libc/gmon/gmon.c#2 integrate
> .. //depot/projects/kse/lib/libc/i386/SYS.h#2 integrate
> .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#3 integrate
> .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#8 integrate
> .. //depot/projects/kse/lib/libc/i386/gen/infinity.c#2 integrate
> .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#6 integrate
> .. //depot/projects/kse/lib/libc/ia64/gen/infinity.c#2 integrate
> .. //depot/projects/kse/lib/libc/locale/Makefile.inc#8 integrate
> .. //depot/projects/kse/lib/libc/locale/frune.c#2 integrate
> .. //depot/projects/kse/lib/libc/locale/mbrune.3#2 integrate
> .. //depot/projects/kse/lib/libc/locale/mbrune.c#2 integrate
> .. //depot/projects/kse/lib/libc/locale/rune.3#3 integrate
> .. //depot/projects/kse/lib/libc/locale/wcstoimax.c#1 branch
> .. //depot/projects/kse/lib/libc/locale/wcstol.3#3 integrate
> .. //depot/projects/kse/lib/libc/locale/wcstoll.c#1 branch
> .. //depot/projects/kse/lib/libc/locale/wcstoull.c#1 branch
> .. //depot/projects/kse/lib/libc/locale/wcstoumax.c#1 branch
> .. //depot/projects/kse/lib/libc/net/getnetbydns.c#4 integrate
> .. //depot/projects/kse/lib/libc/net/name6.c#4 integrate
> .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_create.3#3 integrate
> .. //depot/projects/kse/lib/libc/sparc64/gen/infinity.c#2 integrate
> .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#3 integrate
> .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#2 integrate
> .. //depot/projects/kse/lib/libc/stdio/fgetws.c#3 integrate
> .. //depot/projects/kse/lib/libc/stdio/fputwc.c#2 integrate
> .. //depot/projects/kse/lib/libc/stdio/fputws.c#3 integrate
> .. //depot/projects/kse/lib/libc/stdio/fwprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdio/local.h#4 integrate
> .. //depot/projects/kse/lib/libc/stdio/printf.3#4 integrate
> .. //depot/projects/kse/lib/libc/stdio/stdio.3#3 integrate
> .. //depot/projects/kse/lib/libc/stdio/swprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#2 integrate
> .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#5 integrate
> .. //depot/projects/kse/lib/libc/stdio/vfwprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#5 integrate
> .. //depot/projects/kse/lib/libc/stdio/vswprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdio/vwprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdio/wprintf.3#1 branch
> .. //depot/projects/kse/lib/libc/stdio/wprintf.c#1 branch
> .. //depot/projects/kse/lib/libc/stdlib/strfmon.3#2 integrate
> .. //depot/projects/kse/lib/libc/stdlib/strfmon.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcscat.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wcschr.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcscmp.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcscpy.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wcscspn.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcslcat.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcslcpy.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcslen.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcsncat.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wcsncmp.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcsncpy.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wcspbrk.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcsrchr.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcsspn.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wcsstr.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wmemchr.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wmemcmp.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wmemcpy.c#3 integrate
> .. //depot/projects/kse/lib/libc/string/wmemmove.c#2 integrate
> .. //depot/projects/kse/lib/libc/string/wmemset.c#2 integrate
> .. //depot/projects/kse/lib/libc/sys/Makefile.inc#2 integrate
> .. //depot/projects/kse/lib/libc/sys/sem.c#1 branch
> .. //depot/projects/kse/lib/libkvm/kvm_proc.c#24 integrate
> .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#8 integrate
> .. //depot/projects/kse/sys/alpha/alpha/db_trace.c#6 integrate
> .. //depot/projects/kse/sys/alpha/alpha/machdep.c#44 integrate
> .. //depot/projects/kse/sys/alpha/alpha/pmap.c#34 integrate
> .. //depot/projects/kse/sys/alpha/alpha/trap.c#35 integrate
> .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#30 integrate
> .. //depot/projects/kse/sys/alpha/include/asm.h#4 integrate
> .. //depot/projects/kse/sys/alpha/include/atomic.h#3 integrate
> .. //depot/projects/kse/sys/alpha/include/endian.h#8 integrate
> .. //depot/projects/kse/sys/alpha/include/param.h#7 integrate
> .. //depot/projects/kse/sys/alpha/include/stdarg.h#4 integrate
> .. //depot/projects/kse/sys/alpha/linux/linux_genassym.c#3 integrate
> .. //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#8 integrate
> .. //depot/projects/kse/sys/alpha/pci/tsunamireg.h#2 integrate
> .. //depot/projects/kse/sys/arm/include/param.h#3 integrate
> .. //depot/projects/kse/sys/boot/i386/boot0/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/i386/btx/btx/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/i386/btx/btxldr/Makefile#2 integrate
> .. //depot/projects/kse/sys/boot/i386/btx/lib/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/i386/cdboot/Makefile#2 integrate
> .. //depot/projects/kse/sys/boot/i386/kgzldr/Makefile#4 integrate
> .. //depot/projects/kse/sys/boot/i386/kgzldr/crt.s#2 integrate
> .. //depot/projects/kse/sys/boot/i386/kgzldr/kgzldr.m4#2 delete
> .. //depot/projects/kse/sys/boot/i386/kgzldr/sio.s#2 integrate
> .. //depot/projects/kse/sys/boot/i386/kgzldr/start.s#2 integrate
> .. //depot/projects/kse/sys/boot/i386/liloldr/Makefile#2 integrate
> .. //depot/projects/kse/sys/boot/i386/mbr/Makefile#2 integrate
> .. //depot/projects/kse/sys/boot/i386/pxeldr/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/ia64/skiload/main.c#2 integrate
> .. //depot/projects/kse/sys/boot/pc98/btx/btx/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/pc98/btx/btxldr/Makefile#2 integrate
> .. //depot/projects/kse/sys/boot/pc98/btx/lib/Makefile#3 integrate
> .. //depot/projects/kse/sys/boot/pc98/kgzldr/Makefile#4 integrate
> .. //depot/projects/kse/sys/boot/pc98/kgzldr/crt.s#3 integrate
> .. //depot/projects/kse/sys/cam/cam_xpt.c#11 integrate
> .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#12 integrate
> .. //depot/projects/kse/sys/cam/scsi/scsi_cd.c#9 integrate
> .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#23 integrate
> .. //depot/projects/kse/sys/coda/coda_namecache.h#3 integrate
> .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#20 integrate
> .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#19 integrate
> .. //depot/projects/kse/sys/compat/linux/linux_ioctl.h#4 integrate
> .. //depot/projects/kse/sys/compat/linux/linux_misc.c#21 integrate
> .. //depot/projects/kse/sys/compat/linux/linux_socket.c#8 integrate
> .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#6 integrate
> .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#16 integrate
> .. //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#8 integrate
> .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#12 integrate
> .. //depot/projects/kse/sys/conf/Makefile.powerpc#14 integrate
> .. //depot/projects/kse/sys/conf/NOTES#18 integrate
> .. //depot/projects/kse/sys/conf/files#51 integrate
> .. //depot/projects/kse/sys/conf/files.alpha#17 integrate
> .. //depot/projects/kse/sys/conf/files.powerpc#9 integrate
> .. //depot/projects/kse/sys/conf/kern.post.mk#14 integrate
> .. //depot/projects/kse/sys/conf/kern.pre.mk#15 integrate
> .. //depot/projects/kse/sys/conf/kmod.mk#13 integrate
> .. //depot/projects/kse/sys/conf/options#27 integrate
> .. //depot/projects/kse/sys/conf/options.powerpc#4 integrate
> .. //depot/projects/kse/sys/contrib/dev/fla/fla.c#5 integrate
> .. //depot/projects/kse/sys/ddb/db_command.c#6 integrate
> .. //depot/projects/kse/sys/ddb/ddb.h#4 integrate
> .. //depot/projects/kse/sys/dev/aac/aac_disk.c#14 integrate
> .. //depot/projects/kse/sys/dev/aac/aacvar.h#12 integrate
> .. //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#5 integrate
> .. //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#5 integrate
> .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate
> .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate
> .. //depot/projects/kse/sys/dev/amr/amr_disk.c#4 integrate
> .. //depot/projects/kse/sys/dev/amr/amrvar.h#4 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-card.c#6 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-disk.c#22 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-dma.c#25 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-isa.c#8 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-pci.c#26 integrate
> .. //depot/projects/kse/sys/dev/ata/ata-raid.c#14 integrate
> .. //depot/projects/kse/sys/dev/ata/atapi-fd.c#12 integrate
> .. //depot/projects/kse/sys/dev/awi/awi.c#7 integrate
> .. //depot/projects/kse/sys/dev/awi/awi_wep.c#6 integrate
> .. //depot/projects/kse/sys/dev/bge/if_bge.c#14 integrate
> .. //depot/projects/kse/sys/dev/ccd/ccd.c#15 integrate
> .. //depot/projects/kse/sys/dev/ct/ct_isa.c#4 integrate
> .. //depot/projects/kse/sys/dev/firewire/firewire.c#2 integrate
> .. //depot/projects/kse/sys/dev/firewire/firewire.h#2 integrate
> .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#2 integrate
> .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#2 integrate
> .. //depot/projects/kse/sys/dev/firewire/sbp.c#2 integrate
> .. //depot/projects/kse/sys/dev/ic/ns16550.h#2 integrate
> .. //depot/projects/kse/sys/dev/ida/ida_disk.c#6 integrate
> .. //depot/projects/kse/sys/dev/iicbus/iic.c#6 integrate
> .. //depot/projects/kse/sys/dev/iicbus/iic.h#1 branch
> .. //depot/projects/kse/sys/dev/iir/iir_ctrl.c#3 integrate
> .. //depot/projects/kse/sys/dev/isp/isp.c#24 integrate
> .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#16 integrate
> .. //depot/projects/kse/sys/dev/isp/isp_inline.h#10 integrate
> .. //depot/projects/kse/sys/dev/isp/isp_pci.c#14 integrate
> .. //depot/projects/kse/sys/dev/isp/isp_sbus.c#2 integrate
> .. //depot/projects/kse/sys/dev/isp/ispmbox.h#15 integrate
> .. //depot/projects/kse/sys/dev/isp/ispvar.h#15 integrate
> .. //depot/projects/kse/sys/dev/md/md.c#24 integrate
> .. //depot/projects/kse/sys/dev/mlx/mlx_disk.c#4 integrate
> .. //depot/projects/kse/sys/dev/mlx/mlxvar.h#5 integrate
> .. //depot/projects/kse/sys/dev/mpt/mpt.c#5 integrate
> .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#5 integrate
> .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#6 integrate
> .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#5 integrate
> .. //depot/projects/kse/sys/dev/ncv/ncr53c500_pccard.c#6 integrate
> .. //depot/projects/kse/sys/dev/nsp/nsp_pccard.c#7 integrate
> .. //depot/projects/kse/sys/dev/null/null.c#5 integrate
> .. //depot/projects/kse/sys/dev/ofw/ofw_disk.c#2 integrate
> .. //depot/projects/kse/sys/dev/ppbus/vpoio.c#3 integrate
> .. //depot/projects/kse/sys/dev/pst/pst-raid.c#3 integrate
> .. //depot/projects/kse/sys/dev/random/hash.c#4 integrate
> .. //depot/projects/kse/sys/dev/random/randomdev.c#8 integrate
> .. //depot/projects/kse/sys/dev/random/yarrow.c#6 integrate
> .. //depot/projects/kse/sys/dev/ray/if_raymib.h#2 integrate
> .. //depot/projects/kse/sys/dev/sio/sio.c#18 integrate
> .. //depot/projects/kse/sys/dev/smbus/smb.c#5 integrate
> .. //depot/projects/kse/sys/dev/smbus/smb.h#1 branch
> .. //depot/projects/kse/sys/dev/smbus/smbus.c#4 integrate
> .. //depot/projects/kse/sys/dev/stg/tmc18c30_isa.c#4 integrate
> .. //depot/projects/kse/sys/dev/stg/tmc18c30_pccard.c#7 integrate
> .. //depot/projects/kse/sys/dev/twe/twe_freebsd.c#8 integrate
> .. //depot/projects/kse/sys/dev/usb/usb.h#7 integrate
> .. //depot/projects/kse/sys/dev/vinum/vinumext.h#5 integrate
> .. //depot/projects/kse/sys/dev/vinum/vinumioctl.c#10 integrate
> .. //depot/projects/kse/sys/dev/vinum/vinumparser.c#2 integrate
> .. //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#6 integrate
> .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#17 integrate
> .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#11 integrate
> .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#17 integrate
> .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#13 integrate
> .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate
> .. //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#10 integrate
> .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#13 integrate
> .. //depot/projects/kse/sys/fs/procfs/procfs_status.c#15 integrate
> .. //depot/projects/kse/sys/fs/smbfs/smbfs.h#4 integrate
> .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.h#2 integrate
> .. //depot/projects/kse/sys/fs/smbfs/smbfs_smb.c#5 integrate
> .. //depot/projects/kse/sys/fs/smbfs/smbfs_subr.h#3 integrate
> .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#13 integrate
> .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#11 integrate
> .. //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#11 integrate
> .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#8 integrate
> .. //depot/projects/kse/sys/geom/geom_dev.c#8 integrate
> .. //depot/projects/kse/sys/geom/geom_disk.c#8 integrate
> .. //depot/projects/kse/sys/geom/geom_gpt.c#6 integrate
> .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#9 integrate
> .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#8 integrate
> .. //depot/projects/kse/sys/i386/apm/apm.c#7 integrate
> .. //depot/projects/kse/sys/i386/conf/NOTES#39 integrate
> .. //depot/projects/kse/sys/i386/i386/autoconf.c#11 integrate
> .. //depot/projects/kse/sys/i386/i386/bioscall.s#2 integrate
> .. //depot/projects/kse/sys/i386/i386/db_interface.c#13 integrate
> .. //depot/projects/kse/sys/i386/i386/db_trace.c#9 integrate
> .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#4 integrate
> .. //depot/projects/kse/sys/i386/i386/genassym.c#32 integrate
> .. //depot/projects/kse/sys/i386/i386/i686_mem.c#4 integrate
> .. //depot/projects/kse/sys/i386/i386/legacy.c#1 branch
> .. //depot/projects/kse/sys/i386/i386/locore.s#16 integrate
> .. //depot/projects/kse/sys/i386/i386/machdep.c#60 integrate
> .. //depot/projects/kse/sys/i386/i386/mem.c#8 integrate
> .. //depot/projects/kse/sys/i386/i386/mpapic.c#10 integrate
> .. //depot/projects/kse/sys/i386/i386/support.s#11 integrate
> .. //depot/projects/kse/sys/i386/i386/trap.c#62 integrate
> .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#67 integrate
> .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#15 integrate
> .. //depot/projects/kse/sys/i386/include/asm.h#3 integrate
> .. //depot/projects/kse/sys/i386/include/cpufunc.h#12 integrate
> .. //depot/projects/kse/sys/i386/include/endian.h#10 integrate
> .. //depot/projects/kse/sys/i386/include/iic.h#2 delete
> .. //depot/projects/kse/sys/i386/include/legacyvar.h#1 branch
> .. //depot/projects/kse/sys/i386/include/npx.h#7 integrate
> .. //depot/projects/kse/sys/i386/include/param.h#12 integrate
> .. //depot/projects/kse/sys/i386/include/pcb.h#8 integrate
> .. //depot/projects/kse/sys/i386/include/profile.h#6 integrate
> .. //depot/projects/kse/sys/i386/include/segments.h#4 integrate
> .. //depot/projects/kse/sys/i386/include/signal.h#5 integrate
> .. //depot/projects/kse/sys/i386/include/smb.h#2 delete
> .. //depot/projects/kse/sys/i386/include/stdarg.h#6 integrate
> .. //depot/projects/kse/sys/i386/include/tss.h#2 integrate
> .. //depot/projects/kse/sys/i386/include/ucontext.h#4 integrate
> .. //depot/projects/kse/sys/i386/isa/clock.c#13 integrate
> .. //depot/projects/kse/sys/i386/isa/npx.c#22 integrate
> .. //depot/projects/kse/sys/i386/linux/imgact_linux.c#8 integrate
> .. //depot/projects/kse/sys/i386/linux/linux_proto.h#10 integrate
> .. //depot/projects/kse/sys/i386/linux/linux_syscall.h#8 integrate
> .. //depot/projects/kse/sys/i386/linux/linux_sysent.c#8 integrate
> .. //depot/projects/kse/sys/i386/linux/syscalls.master#8 integrate
> .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#15 integrate
> .. //depot/projects/kse/sys/ia64/ia64/db_trace.c#7 integrate
> .. //depot/projects/kse/sys/ia64/ia64/interrupt.c#13 integrate
> .. //depot/projects/kse/sys/ia64/ia64/machdep.c#40 integrate
> .. //depot/projects/kse/sys/ia64/ia64/sscdisk.c#9 integrate
> .. //depot/projects/kse/sys/ia64/include/asm.h#5 integrate
> .. //depot/projects/kse/sys/ia64/include/endian.h#9 integrate
> .. //depot/projects/kse/sys/ia64/include/param.h#8 integrate
> .. //depot/projects/kse/sys/ia64/include/reg.h#9 integrate
> .. //depot/projects/kse/sys/ia64/include/signal.h#5 integrate
> .. //depot/projects/kse/sys/ia64/include/stdarg.h#5 integrate
> .. //depot/projects/kse/sys/isa/fd.c#12 integrate
> .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#8 integrate
> .. //depot/projects/kse/sys/kern/imgact_aout.c#18 integrate
> .. //depot/projects/kse/sys/kern/imgact_elf.c#25 integrate
> .. //depot/projects/kse/sys/kern/imgact_gzip.c#5 integrate
> .. //depot/projects/kse/sys/kern/init_main.c#50 integrate
> .. //depot/projects/kse/sys/kern/init_sysent.c#25 integrate
> .. //depot/projects/kse/sys/kern/kern_acct.c#17 integrate
> .. //depot/projects/kse/sys/kern/kern_alq.c#1 branch
> .. //depot/projects/kse/sys/kern/kern_conf.c#13 integrate
> .. //depot/projects/kse/sys/kern/kern_exec.c#41 integrate
> .. //depot/projects/kse/sys/kern/kern_exit.c#63 integrate
> .. //depot/projects/kse/sys/kern/kern_fork.c#82 integrate
> .. //depot/projects/kse/sys/kern/kern_intr.c#30 integrate
> .. //depot/projects/kse/sys/kern/kern_ktr.c#9 integrate
> .. //depot/projects/kse/sys/kern/kern_mac.c#6 integrate
> .. //depot/projects/kse/sys/kern/kern_malloc.c#13 integrate
> .. //depot/projects/kse/sys/kern/kern_proc.c#87 integrate
> .. //depot/projects/kse/sys/kern/kern_resource.c#24 integrate
> .. //depot/projects/kse/sys/kern/kern_shutdown.c#33 integrate
> .. //depot/projects/kse/sys/kern/kern_sig.c#68 integrate
> .. //depot/projects/kse/sys/kern/kern_switch.c#68 integrate
> .. //depot/projects/kse/sys/kern/kern_thread.c#111 integrate
> .. //depot/projects/kse/sys/kern/link_elf.c#16 integrate
> .. //depot/projects/kse/sys/kern/makesyscalls.sh#13 integrate
> .. //depot/projects/kse/sys/kern/subr_disk.c#12 integrate
> .. //depot/projects/kse/sys/kern/subr_disklabel.c#11 integrate
> .. //depot/projects/kse/sys/kern/subr_diskmbr.c#5 integrate
> .. //depot/projects/kse/sys/kern/subr_diskslice.c#12 integrate
> .. //depot/projects/kse/sys/kern/subr_mchain.c#6 integrate
> .. //depot/projects/kse/sys/kern/subr_sbuf.c#8 integrate
> .. //depot/projects/kse/sys/kern/subr_trap.c#77 integrate
> .. //depot/projects/kse/sys/kern/subr_witness.c#32 integrate
> .. //depot/projects/kse/sys/kern/sys_generic.c#35 integrate
> .. //depot/projects/kse/sys/kern/syscalls.c#24 integrate
> .. //depot/projects/kse/sys/kern/syscalls.master#24 integrate
> .. //depot/projects/kse/sys/kern/uipc_mbuf.c#10 integrate
> .. //depot/projects/kse/sys/kern/uipc_sem.c#1 branch
> .. //depot/projects/kse/sys/kern/uipc_socket2.c#21 integrate
> .. //depot/projects/kse/sys/kern/vfs_mount.c#4 integrate
> .. //depot/projects/kse/sys/kern/vfs_subr.c#44 integrate
> .. //depot/projects/kse/sys/kern/vfs_syscalls.c#36 integrate
> .. //depot/projects/kse/sys/kern/vnode_if.src#12 integrate
> .. //depot/projects/kse/sys/modules/Makefile#35 integrate
> .. //depot/projects/kse/sys/modules/nfsclient/Makefile#5 integrate
> .. //depot/projects/kse/sys/modules/oltr/Makefile#3 integrate
> .. //depot/projects/kse/sys/modules/sem/Makefile#1 branch
> .. //depot/projects/kse/sys/net/bpf.c#14 integrate
> .. //depot/projects/kse/sys/net/if_arc.h#4 integrate
> .. //depot/projects/kse/sys/net/if_ethersubr.c#20 integrate
> .. //depot/projects/kse/sys/net/if_gif.c#15 integrate
> .. //depot/projects/kse/sys/net/if_gre.c#3 integrate
> .. //depot/projects/kse/sys/net/if_gre.h#3 integrate
> .. //depot/projects/kse/sys/net/if_llc.h#4 integrate
> .. //depot/projects/kse/sys/net/if_ppp.c#12 integrate
> .. //depot/projects/kse/sys/net/if_spppsubr.c#10 integrate
> .. //depot/projects/kse/sys/net/if_stf.c#13 integrate
> .. //depot/projects/kse/sys/net/netisr.c#1 branch
> .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#4 integrate
> .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.h#1 branch
> .. //depot/projects/kse/sys/netatm/spans/spans_msg.c#5 integrate
> .. //depot/projects/kse/sys/netatm/spans/spans_xdr.x#2 integrate
> .. //depot/projects/kse/sys/netinet/icmp6.h#5 integrate
> .. //depot/projects/kse/sys/netinet/ip6.h#2 integrate
> .. //depot/projects/kse/sys/netinet/ip_gre.c#3 integrate
> .. //depot/projects/kse/sys/netinet/ip_input.c#25 integrate
> .. //depot/projects/kse/sys/netinet/ip_output.c#27 integrate
> .. //depot/projects/kse/sys/netinet/tcp_input.c#28 integrate
> .. //depot/projects/kse/sys/netinet/tcp_output.c#13 integrate
> .. //depot/projects/kse/sys/netinet6/in6_cksum.c#2 integrate
> .. //depot/projects/kse/sys/netns/idp_usrreq.c#5 integrate
> .. //depot/projects/kse/sys/netns/spp_usrreq.c#6 integrate
> .. //depot/projects/kse/sys/netsmb/smb.h#6 integrate
> .. //depot/projects/kse/sys/netsmb/smb_conn.h#7 integrate
> .. //depot/projects/kse/sys/netsmb/smb_rq.c#6 integrate
> .. //depot/projects/kse/sys/netsmb/smb_smb.c#4 integrate
> .. //depot/projects/kse/sys/netsmb/smb_tran.h#4 integrate
> .. //depot/projects/kse/sys/netsmb/smb_trantcp.c#9 integrate
> .. //depot/projects/kse/sys/netsmb/smb_trantcp.h#3 integrate
> .. //depot/projects/kse/sys/netsmb/smb_usr.c#2 integrate
> .. //depot/projects/kse/sys/nfsclient/nfs_diskless.c#1 branch
> .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#16 integrate
> .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#15 integrate
> .. //depot/projects/kse/sys/nfsclient/nfsdiskless.h#4 integrate
> .. //depot/projects/kse/sys/nfsserver/nfs_syscalls.c#8 integrate
> .. //depot/projects/kse/sys/pc98/apm/apm_bioscall.s#2 integrate
> .. //depot/projects/kse/sys/pc98/i386/machdep.c#35 integrate
> .. //depot/projects/kse/sys/pc98/pc98/clock.c#9 integrate
> .. //depot/projects/kse/sys/pc98/pc98/diskslice_machdep.c#4 integrate
> .. //depot/projects/kse/sys/pc98/pc98/fd.c#13 integrate
> .. //depot/projects/kse/sys/pc98/pc98/wd.c#5 integrate
> .. //depot/projects/kse/sys/pci/amdpm.c#5 integrate
> .. //depot/projects/kse/sys/pci/if_dc.c#21 integrate
> .. //depot/projects/kse/sys/pci/if_dcreg.h#8 integrate
> .. //depot/projects/kse/sys/pci/if_ste.c#11 integrate
> .. //depot/projects/kse/sys/pci/if_xl.c#12 integrate
> .. //depot/projects/kse/sys/pci/simos.c#3 integrate
> .. //depot/projects/kse/sys/posix4/_semaphore.h#1 branch
> .. //depot/projects/kse/sys/posix4/mqueue.h#3 integrate
> .. //depot/projects/kse/sys/posix4/posix4.h#6 integrate
> .. //depot/projects/kse/sys/posix4/posix4_mib.c#2 integrate
> .. //depot/projects/kse/sys/powerpc/conf/GENERIC#9 integrate
> .. //depot/projects/kse/sys/powerpc/include/asm.h#4 integrate
> .. //depot/projects/kse/sys/powerpc/include/atomic.h#3 integrate
> .. //depot/projects/kse/sys/powerpc/include/bus.h#4 integrate
> .. //depot/projects/kse/sys/powerpc/include/cpu.h#10 integrate
> .. //depot/projects/kse/sys/powerpc/include/cpufunc.h#10 integrate
> .. //depot/projects/kse/sys/powerpc/include/endian.h#8 integrate
> .. //depot/projects/kse/sys/powerpc/include/frame.h#6 integrate
> .. //depot/projects/kse/sys/powerpc/include/openpicvar.h#2 integrate
> .. //depot/projects/kse/sys/powerpc/include/param.h#5 integrate
> .. //depot/projects/kse/sys/powerpc/include/sigframe.h#3 integrate
> .. //depot/projects/kse/sys/powerpc/include/stdarg.h#5 integrate
> .. //depot/projects/kse/sys/powerpc/powermac/ata_macio.c#1 branch
> .. //depot/projects/kse/sys/powerpc/powermac/macio.c#1 branch
> .. //depot/projects/kse/sys/powerpc/powermac/maciovar.h#1 branch
> .. //depot/projects/kse/sys/powerpc/powermac/uninorth.c#2 integrate
> .. //depot/projects/kse/sys/powerpc/powermac/uninorthvar.h#2 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/autoconf.c#6 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/db_trace.c#2 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/genassym.c#16 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/interrupt.c#2 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/locore.s#10 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#25 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/nexus.c#3 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#6 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/openpic.c#2 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#21 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/sigcode.S#3 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/syncicache.c#3 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/trap.c#18 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#5 integrate
> .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#16 integrate
> .. //depot/projects/kse/sys/powerpc/psim/ata_iobus.c#1 branch
> .. //depot/projects/kse/sys/powerpc/psim/iobus.c#1 branch
> .. //depot/projects/kse/sys/powerpc/psim/iobusvar.h#1 branch
> .. //depot/projects/kse/sys/powerpc/psim/psim-tree#1 branch
> .. //depot/projects/kse/sys/powerpc/psim/sio_iobus.c#1 branch
> .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#5 integrate
> .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#5 integrate
> .. //depot/projects/kse/sys/sparc64/conf/GENERIC#20 integrate
> .. //depot/projects/kse/sys/sparc64/include/bus.h#7 integrate
> .. //depot/projects/kse/sys/sparc64/include/endian.h#10 integrate
> .. //depot/projects/kse/sys/sparc64/include/param.h#12 integrate
> .. //depot/projects/kse/sys/sparc64/include/stdarg.h#4 integrate
> .. //depot/projects/kse/sys/sparc64/sparc64/autoconf.c#7 integrate
> .. //depot/projects/kse/sys/sparc64/sparc64/db_trace.c#11 integrate
> .. //depot/projects/kse/sys/sparc64/sparc64/exception.S#3 integrate
> .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#37 integrate
> .. //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#27 integrate
> .. //depot/projects/kse/sys/sys/_posix.h#2 integrate
> .. //depot/projects/kse/sys/sys/_types.h#6 integrate
> .. //depot/projects/kse/sys/sys/alq.h#1 branch
> .. //depot/projects/kse/sys/sys/bio.h#10 integrate
> .. //depot/projects/kse/sys/sys/cdefs.h#18 integrate
> .. //depot/projects/kse/sys/sys/disk.h#5 integrate
> .. //depot/projects/kse/sys/sys/disklabel.h#14 integrate
> .. //depot/projects/kse/sys/sys/fcntl.h#4 integrate
> .. //depot/projects/kse/sys/sys/file.h#14 integrate
> .. //depot/projects/kse/sys/sys/imgact.h#9 integrate
> .. //depot/projects/kse/sys/sys/kse.h#21 integrate
> .. //depot/projects/kse/sys/sys/ktr.h#8 integrate
> .. //depot/projects/kse/sys/sys/linker_set.h#4 integrate
> .. //depot/projects/kse/sys/sys/mbuf.h#14 integrate
> .. //depot/projects/kse/sys/sys/mchain.h#4 integrate
> .. //depot/projects/kse/sys/sys/param.h#25 integrate
> .. //depot/projects/kse/sys/sys/proc.h#135 integrate
> .. //depot/projects/kse/sys/sys/syscall.h#24 integrate
> .. //depot/projects/kse/sys/sys/syscall.mk#24 integrate
> .. //depot/projects/kse/sys/sys/syslimits.h#2 integrate
> .. //depot/projects/kse/sys/sys/sysproto.h#28 integrate
> .. //depot/projects/kse/sys/sys/types.h#19 integrate
> .. //depot/projects/kse/sys/sys/ucontext.h#10 integrate
> .. //depot/projects/kse/sys/sys/unistd.h#6 integrate
> .. //depot/projects/kse/sys/tools/vnode_if.awk#6 integrate
> .. //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#14 integrate
> .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#15 integrate
> .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#19 integrate
> .. //depot/projects/kse/sys/vm/uma.h#8 integrate
> .. //depot/projects/kse/sys/vm/uma_core.c#14 integrate
> .. //depot/projects/kse/sys/vm/uma_dbg.c#5 integrate
> .. //depot/projects/kse/sys/vm/uma_dbg.h#3 integrate
> .. //depot/projects/kse/sys/vm/uma_int.h#7 integrate
> .. //depot/projects/kse/sys/vm/vm_glue.c#39 integrate
> .. //depot/projects/kse/sys/vm/vm_map.c#26 integrate
> .. //depot/projects/kse/sys/vm/vm_map.h#17 integrate
> .. //depot/projects/kse/sys/vm/vm_mmap.c#20 integrate
> .. //depot/projects/kse/sys/vm/vm_object.h#9 integrate
> .. //depot/projects/kse/sys/vm/vm_page.h#13 integrate
> .. //depot/projects/kse/sys/vm/vm_pageout.c#20 integrate
> .. //depot/projects/kse/sys/vm/vm_unix.c#8 integrate
> .. //depot/projects/kse/sys/x86_64/include/endian.h#3 integrate
> .. //depot/projects/kse/sys/x86_64/include/param.h#2 integrate
> .. //depot/projects/kse/sys/x86_64/include/stdarg.h#3 integrate
> 
> Differences ...
> 
> ==== //depot/projects/kse/bin/ps/extern.h#7 (text+ko) ====
> 
> @@ -31,7 +31,7 @@
>   * SUCH DAMAGE.
>   *
>   *	@(#)extern.h	8.3 (Berkeley) 4/2/94
> - * $FreeBSD: src/bin/ps/extern.h,v 1.24 2002/06/08 06:49:15 bde Exp $
> + * $FreeBSD: src/bin/ps/extern.h,v 1.26 2002/09/17 02:52:44 jmallett Exp $
>   */
>  
>  struct kinfo;
> @@ -79,7 +79,6 @@
>  void	 state(KINFO *, VARENT *);
>  void	 tdev(KINFO *, VARENT *);
>  void	 tname(KINFO *, VARENT *);
> -void	 tsize(KINFO *, VARENT *);
>  void	 ucomm(KINFO *, VARENT *);
>  void	 uname(KINFO *, VARENT *);
>  void	 vsize(KINFO *, VARENT *);
> 
> ==== //depot/projects/kse/bin/ps/keyword.c#9 (text+ko) ====
> 
> @@ -37,7 +37,7 @@
>  #endif /* not lint */
>  #endif
>  #include <sys/cdefs.h>
> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.50 2002/07/08 09:08:51 robert Exp $");
> +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.54 2002/09/17 17:13:52 jmallett Exp $");
>  
>  #include <sys/param.h>
>  #include <sys/time.h>
> @@ -57,15 +57,6 @@
>  static VAR *findvar(char *);
>  static int  vcmp(const void *, const void *);
>  
> -#ifdef NOTINUSE
> -int	utime(), stime(), ixrss(), idrss(), isrss();
> -	{{"utime"}, "UTIME", USER, utime, NULL, 4},
> -	{{"stime"}, "STIME", USER, stime, NULL, 4},
> -	{{"ixrss"}, "IXRSS", USER, ixrss, NULL, 4},
> -	{{"idrss"}, "IDRSS", USER, idrss, NULL, 4},
> -	{{"isrss"}, "ISRSS", USER, isrss, NULL, 4},
> -#endif
> -
>  /* Compute offset in common structures. */
>  #define	KOFF(x)	offsetof(struct kinfo_proc, x)
>  #define	ROFF(x)	offsetof(struct rusage, x)
> @@ -156,8 +147,7 @@
>  		UINT, UIDFMT, 0},
>  	{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
>  		USERLEN, 0, CHAR, NULL, 0},
> -	{"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d",
> -		0},
> +	{"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), PGTOK, "ld", 0},
>  	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
>  		NULL, 0},
>  	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
> @@ -190,7 +180,7 @@
>  		PIDFMT, 0},
>  	{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
>  		PIDFMT, 0},
> -	{"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4, 0, CHAR, NULL, 0},
> +	{"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0},
>  	{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
>  	{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
>  	{"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL,
> 
> ==== //depot/projects/kse/bin/ps/print.c#15 (text+ko) ====
> 
> @@ -37,7 +37,7 @@
>  #endif /* not lint */
>  #endif
>  #include <sys/cdefs.h>
> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.70 2002/09/13 07:13:33 peter Exp $");
> +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.73 2002/09/17 17:13:52 jmallett Exp $");
>  
>  #include <sys/param.h>
>  #include <sys/time.h>
> @@ -317,6 +317,7 @@
>  	    return (strlen(user_from_uid(k->ki_p->ki_ruid, 0)));
>  }
>  
> +
>  void
>  tdev(KINFO *k, VARENT *ve)
>  {
> @@ -620,15 +621,6 @@
>  }
>  
>  void
> -tsize(KINFO *k, VARENT *ve)
> -{
> -	VAR *v;
> -
> -	v = ve->var;
> -	(void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize));
> -}
> -
> -void
>  priorityr(KINFO *k, VARENT *ve)
>  {
>  	VAR *v;
> @@ -704,6 +696,9 @@
>  	case KPTR:
>  		(void)printf(ofmt, v->width, *(u_long *)bp);
>  		break;
> +	case PGTOK:
> +		(void)printf(ofmt, v->width, ps_pgtok(*(u_long *)bp));
> +		break;
>  	default:
>  		errx(1, "unknown type %d", v->type);
>  	}
> 
> ==== //depot/projects/kse/bin/ps/ps.h#3 (text+ko) ====
> 
> @@ -31,11 +31,11 @@
>   * SUCH DAMAGE.
>   *
>   *	@(#)ps.h	8.1 (Berkeley) 5/31/93
> - * $FreeBSD: src/bin/ps/ps.h,v 1.10 2002/02/03 14:43:04 markm Exp $
> + * $FreeBSD: src/bin/ps/ps.h,v 1.12 2002/09/17 17:13:52 jmallett Exp $
>   */
>  
>  #define	UNLIMITED	0	/* unlimited terminal width */
> -enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR };
> +enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK };
>  
>  typedef struct kinfo {
>  	struct kinfo_proc *ki_p;	/* kinfo_proc structure */
> 
> ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 (text+ko) ====
> 
> @@ -1,4 +1,4 @@
> -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.2 2002/07/10 07:48:45 obrien Exp $ */
> +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ */
>  
>  #ifndef FBSD_KGDB_I386_H
>  #define FBSD_KGDB_I386_H
> @@ -20,7 +20,7 @@
>  #undef  FRAME_SAVED_PC
>  #define FRAME_SAVED_PC(FRAME) \
>    (kernel_debugging \
> -    ? fbsd_kern_frame_saved_pc(FRAME) : \
> +    ? fbsd_kern_frame_saved_pc (FRAME) : \
>      (FRAME)->signal_handler_caller \
>        ? sigtramp_saved_pc (FRAME) \
>        : read_memory_integer ((FRAME)->frame + 4, 4))
> 
> ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 (text+ko) ====
> 
> @@ -1,5 +1,5 @@
>  /* Native-kernel debugging definitions for FreeBSD.
> - * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.2 2002/06/29 17:55:17 obrien Exp $ 
> + * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ 
>   */
>  
>  #ifndef FBSD_KGDB_H
> @@ -27,7 +27,7 @@
>  /* START_PROGRESS is called at the top of main */
>  #undef START_PROGRESS
>  #define START_PROGRESS(STR,N) \
> -  if (!strcmp(STR, "kgdb")) \
> +  if (!strcmp (STR, "kgdb")) \
>       kernel_debugging = 1;
>  
>  #endif /* FBSD_KGDB_H */
> 
> ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 (text+ko) ====
> 
> @@ -19,7 +19,7 @@
>  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>  */
>  
> -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.40 2002/07/28 18:46:49 peter Exp $ */
> +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.42 2002/09/18 16:19:05 obrien Exp $ */
>  
>  /*
>   * This works like "remote" but, you use it like this:
> @@ -29,6 +29,7 @@
>   *
>   * This way makes it easy to short-circut the whole bfd monster,
>   * and direct the inferior stuff to our libkvm implementation.
> + *
>   */
>  
>  #include <sys/param.h>
> @@ -57,19 +58,19 @@
>  #include "gdbcore.h"
>  
>  static void
> -kcore_files_info PARAMS ((struct target_ops *));
> +kcore_files_info (struct target_ops *);
>  
>  static void
> -kcore_close PARAMS ((int));
> +kcore_close (int);
>  
>  static void
> -get_kcore_registers PARAMS ((int));
> +get_kcore_registers (int);
>  
>  static int
> -xfer_mem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *));
> +xfer_mem (CORE_ADDR, char *, int, int, struct target_ops *);
>  
>  static int
> -xfer_umem PARAMS ((CORE_ADDR, char *, int, int));
> +xfer_umem (CORE_ADDR, char *, int, int);
>  
>  static char		*core_file;
>  static kvm_t		*core_kd;
> @@ -81,16 +82,15 @@
>  int kernel_debugging;
>  int kernel_writablecore;
>  
> -/*
> - * Read the "thing" at kernel address 'addr' into the space pointed to
> - * by point.  The length of the "thing" is determined by the type of p.
> - * Result is non-zero if transfer fails.
> - */
> +/* Read the "thing" at kernel address 'addr' into the space pointed to
> +   by point.  The length of the "thing" is determined by the type of p.
> +   Result is non-zero if transfer fails.  */
> +
>  #define kvread(addr, p) \
> -(target_read_memory((CORE_ADDR)(addr), (char *)(p), sizeof(*(p))))
> +  (target_read_memory ((CORE_ADDR) (addr), (char *) (p), sizeof (*(p))))
>  
>  static CORE_ADDR
> -ksym_kernbase()
> +ksym_kernbase (void)
>  {
>    static CORE_ADDR kernbase;
>    struct minimal_symbol *sym;
> @@ -107,94 +107,93 @@
>    return kernbase;
>  }
>  
> -#define	KERNOFF		(ksym_kernbase())
> +#define	KERNOFF		(ksym_kernbase ())
>  #define	INKERNEL(x)	((x) >= KERNOFF)
>  
> -
>  CORE_ADDR
> -ksym_lookup(name)
> -  const char *name;
> +ksym_lookup(const char *name)
>  {
>    struct minimal_symbol *sym;
>  
> -  sym = lookup_minimal_symbol(name, NULL, NULL);
> +  sym = lookup_minimal_symbol (name, NULL, NULL);
>    if (sym == NULL)
> -    error("kernel symbol `%s' not found.", name);
> +    error ("kernel symbol `%s' not found.", name);
>  
> -  return SYMBOL_VALUE_ADDRESS(sym);
> +  return SYMBOL_VALUE_ADDRESS (sym);
>  }
>  
> -/*
> - * Provide the address of an initial PCB to use.
> - * If this is a crash dump, try for "dumppcb".
> - * If no "dumppcb" or it's /dev/mem, use proc0.
> - * Return the core address of the PCB we found.
> - */
> +/* Provide the address of an initial PCB to use.
> +   If this is a crash dump, try for "dumppcb".
> +   If no "dumppcb" or it's /dev/mem, use proc0.
> +   Return the core address of the PCB we found.  */
> +
>  static CORE_ADDR
> -initial_pcb()
> +initial_pcb (void)
>  {
>    struct minimal_symbol *sym;
>    CORE_ADDR addr;
>    void *val;
>  
> -  /* Make sure things are open... */
> +  /* Make sure things are open...  */
>    if (!core_kd || !core_file)
>      return (0);
>  
> -  /* If this is NOT /dev/mem try for dumppcb. */
> -  if (strncmp(core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) {
> -    sym = lookup_minimal_symbol("dumppcb", NULL, NULL);
> -    if (sym != NULL) {
> -      addr = SYMBOL_VALUE_ADDRESS(sym);
> -      return (addr);
> -    }
> +  /* If this is NOT /dev/mem try for dumppcb.  */
> +  if (strncmp (core_file, _PATH_DEV, sizeof _PATH_DEV - 1))
> +    {
> +      sym = lookup_minimal_symbol ("dumppcb", NULL, NULL);
> +      if (sym != NULL)
> +	{
> +	  addr = SYMBOL_VALUE_ADDRESS (sym);
> +	  return (addr);
> +	}
>    }
>  
> -  /*
> -   * OK, just use thread0's pcb.  Note that curproc might
> -   * not exist, and if it does, it will point to gdb.
> -   * Therefore, just use proc0 and let the user set
> -   * some other context if they care about it.
> -   */
> -  addr = ksym_lookup("thread0");
> -  if (kvread(addr, &val)) {
> -    error("cannot read thread0 pointer at %x\n", addr);
> -    val = 0;
> -  } else {
> -    /* Read the PCB address in thread structure. */
> -    addr += offsetof(struct thread, td_pcb);
> -    if (kvread(addr, &val)) {
> -      error("cannot read thread0->td_pcb pointer at %x\n", addr);
> +  /* OK, just use thread0's pcb.  Note that curproc might
> +     not exist, and if it does, it will point to gdb.
> +     Therefore, just use proc0 and let the user set
> +     some other context if they care about it.  */
> +
> +  addr = ksym_lookup ("thread0");
> +  if (kvread (addr, &val))
> +    {
> +      error ("cannot read thread0 pointer at %x\n", addr);
>        val = 0;
>      }
> -  }
> +  else
> +    {
> +      /* Read the PCB address in thread structure.  */
> +      addr += offsetof (struct thread, td_pcb);
> +      if (kvread (addr, &val))
> +	{
> +	  error ("cannot read thread0->td_pcb pointer at %x\n", addr);
> +	  val = 0;
> +	}
> +    }
>  
> -  cur_proc = 0; /* thread0 is wholly in the kernel and cur_proc is
> -		 * only used for reading user mem, so no point 
> -		 * in setting this up */
> -		 
> +  /* thread0 is wholly in the kernel and cur_proc is only used for
> +     reading user mem, so no point in setting this up.  */
> +  cur_proc = 0;
>  
>    return ((CORE_ADDR)val);
>  }
>  
> -/*
> - * Set the current context to that of the PCB struct
> - * at the system address passed.
> - */
> +/* Set the current context to that of the PCB struct at the system address
> +   passed.  */
> +
>  static int
> -set_context(addr)
> -  CORE_ADDR addr;
> +set_context (CORE_ADDR addr)
>  {
>    CORE_ADDR procaddr = 0;
>  
> -  if (kvread(addr, &cur_pcb))
> -    error("cannot read pcb at %#x", addr);
> +  if (kvread (addr, &cur_pcb))
> +    error ("cannot read pcb at %#x", addr);
>  
> -  /* Fetch all registers from core file */
> +  /* Fetch all registers from core file.  */
>    target_fetch_registers (-1);
>  
> -  /* Now, set up the frame cache, and print the top of stack */
> -  flush_cached_frames();
> +  /* Now, set up the frame cache, and print the top of stack.  */
> +  flush_cached_frames ();
>    set_current_frame (create_new_frame (read_fp (), read_pc ()));
>    select_frame (get_current_frame (), 0);
>    return (0);
> @@ -205,28 +204,26 @@
>  
>  /* ARGSUSED */
>  static void
> -kcore_close (quitting)
> -     int quitting;
> +kcore_close (int quitting)
>  {
>  
> -  inferior_ptid = null_ptid;	/* Avoid confusion from thread stuff */
> +  inferior_ptid = null_ptid;	/* Avoid confusion from thread stuff.  */
>  
> -  if (core_kd) {
> -    kvm_close(core_kd);
> -    free(core_file);
> -    core_file = NULL;
> -    core_kd = NULL;
> -  }
> +  if (core_kd)
> +    {
> +      kvm_close (core_kd);
> +      free (core_file);
> +      core_file = NULL;
> +      core_kd = NULL;
> +    }
>  }
>  
>  /* This routine opens and sets up the core file bfd.  */
>  
>  static void
> -kcore_open (filename, from_tty)
> -     char *filename;	/* the core file */
> -     int from_tty;
> +kcore_open (char *filename /* the core file */, int from_tty)
>  {
> -  kvm_t		*kd;
> +  kvm_t *kd;
>    const char *p;
>    struct cleanup *old_chain;
>    char buf[256], *cp;
> @@ -235,61 +232,66 @@
>  
>    target_preopen (from_tty);
>  
> -  /* The exec file is required for symbols. */
> +  /* The exec file is required for symbols.  */
>    if (exec_bfd == NULL)
> -    error("No kernel exec file specified");
> +    error ("No kernel exec file specified");
>  
> -  if (core_kd) {
> -    error ("No core file specified."
> -	   "  (Use `detach' to stop debugging a core file.)");
> -    return;
> -  }
> +  if (core_kd)
> +    {
> +      error ("No core file specified."
> +	     "  (Use `detach' to stop debugging a core file.)");
> +      return;
> +    }
>  
> -  if (!filename) {
> -    error ("No core file specified.");
> -    return;
> -  }
> +  if (!filename)
> +    {
> +      error ("No core file specified.");
> +      return;
> +    }
>  
>    filename = tilde_expand (filename);
> -  if (filename[0] != '/') {
> -    cp = concat (current_directory, "/", filename, NULL);
> -    free (filename);
> -    filename = cp;
> -  }
> +  if (filename[0] != '/')
> +    {
> +      cp = concat (current_directory, "/", filename, NULL);
> +      free (filename);
> +      filename = cp;
> +    }
>  
>    old_chain = make_cleanup (free, filename);
>  
>    kd = kvm_open (bfd_get_filename(exec_bfd), filename, NULL,
>  		 kernel_writablecore ? O_RDWR: O_RDONLY, 0);
> -  if (kd == NULL) {
> -    perror_with_name (filename);
> -    return;
> -  }
> +  if (kd == NULL)
> +    {
> +      perror_with_name (filename);
> +      return;
> +    }
>  
>    /* Looks semi-reasonable.  Toss the old core file and work on the new.  */
>  
> -  discard_cleanups (old_chain);		/* Don't free filename any more */
> +  discard_cleanups (old_chain);		/* Don't free filename any more.  */
>    core_file = filename;
>    unpush_target (&kcore_ops);
>    ontop = !push_target (&kcore_ops);
>  
> -  /* Note unpush_target (above) calls kcore_close. */
> +  /* Note unpush_target (above) calls kcore_close.  */
>    core_kd = kd;
>  
> -  /* print out the panic string if there is one */
> -  if (kvread(ksym_lookup("panicstr"), &addr) == 0 &&
> +  /* Print out the panic string if there is one.  */
> +  if (kvread (ksym_lookup ("panicstr"), &addr) == 0 &&
>        addr != 0 && 
> -      target_read_memory(addr, buf, sizeof(buf)) == 0) {
> +      target_read_memory (addr, buf, sizeof(buf)) == 0)
> +    {
>  
> -    for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++)
> -      if (!isascii(*cp) || (!isprint(*cp) && !isspace(*cp)))
> -	*cp = '?';
> 
> >>> TRUNCATED FOR MAIL (1000 lines) <<<

-- 
Jonathan Mini <mini@freebsd.org>
http://www.freebsd.org/

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?20020923073542.GJ7539>