Date: Fri, 17 May 2002 16:14:08 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11457 for review Message-ID: <200205172314.g4HNE8h21577@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11457 Change 11457 by jhb@jhb_laptop on 2002/05/17 16:13:52 IFC. The ppc trap code has completely changed back to being NetBSD code instead of FreeBSD code. It doesn't call userret() or cred_free_thread() or anything, so I've given up trying to keep it up to date with changes to other archs. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/clock.c#6 integrate ... //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#16 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#32 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#18 integrate ... //depot/projects/smpng/sys/alpha/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/param.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/smpng/sys/arm/include/ansi.h#9 integrate ... //depot/projects/smpng/sys/arm/include/param.h#2 integrate ... //depot/projects/smpng/sys/boot/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#4 integrate ... //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/arc/lib/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/common/load_elf.c#5 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiprot.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#8 integrate ... //depot/projects/smpng/sys/boot/ficl/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/ficl/i386/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/ficl/ia64/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/forth/loader.4th.8#3 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf.5#4 integrate ... //depot/projects/smpng/sys/boot/i386/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#9 integrate ... //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/i386/libi386/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#3 integrate ... //depot/projects/smpng/sys/boot/i386/loader/Makefile#7 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#3 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#4 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#4 integrate ... //depot/projects/smpng/sys/boot/pc98/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/boot.h#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/io.c#3 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/start.S#2 integrate ... //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/pc98/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#7 integrate ... //depot/projects/smpng/sys/coda/README#2 integrate ... //depot/projects/smpng/sys/coda/cnode.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_io.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_namecache.c#4 integrate ... //depot/projects/smpng/sys/coda/coda_namecache.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_pioctl.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_psdev.c#7 integrate ... //depot/projects/smpng/sys/coda/coda_subr.c#5 integrate ... //depot/projects/smpng/sys/coda/coda_vfsops.c#8 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.c#7 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.h#5 integrate ... //depot/projects/smpng/sys/compat/linux/linux_mib.c#5 integrate ... //depot/projects/smpng/sys/conf/NOTES#9 integrate ... //depot/projects/smpng/sys/conf/files#38 integrate ... //depot/projects/smpng/sys/conf/files.alpha#14 integrate ... //depot/projects/smpng/sys/conf/files.i386#22 integrate ... //depot/projects/smpng/sys/conf/files.ia64#15 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#8 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#10 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#11 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#10 integrate ... //depot/projects/smpng/sys/conf/options#22 integrate ... //depot/projects/smpng/sys/conf/options.alpha#6 integrate ... //depot/projects/smpng/sys/conf/options.i386#14 integrate ... //depot/projects/smpng/sys/conf/options.pc98#15 integrate ... //depot/projects/smpng/sys/ddb/db_elf.c#1 branch ... //depot/projects/smpng/sys/ddb/db_kld.c#2 integrate ... //depot/projects/smpng/sys/dev/aac/aac.c#14 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#3 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#14 integrate ... //depot/projects/smpng/sys/dev/aac/aacreg.h#8 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#26 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#5 integrate ... //depot/projects/smpng/sys/dev/ar/if_ar.c#4 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#12 integrate ... //depot/projects/smpng/sys/dev/asr/dptalign.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/dptsig.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/i2oadptr.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2obscsi.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2odep.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2odpt.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2oexec.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2omsg.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/i2otypes.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2outil.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/osd_defs.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/osd_unix.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/osd_util.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/sys_info.h#4 integrate ... //depot/projects/smpng/sys/dev/bktr/CHANGELOG.TXT#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_card.h#2 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#14 integrate ... //depot/projects/smpng/sys/dev/drm/drm_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/smpng/sys/dev/em/if_em.c#7 integrate ... //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir.c#3 integrate ... //depot/projects/smpng/sys/dev/md/md.c#19 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/amphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#8 integrate ... //depot/projects/smpng/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/e1000phy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/lxtphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/mii_physubr.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/miivar.h#5 integrate ... //depot/projects/smpng/sys/dev/mii/mlphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/nsphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#7 integrate ... //depot/projects/smpng/sys/dev/mii/tdkphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/tlphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/xmphy.c#5 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#4 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#13 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#9 integrate ... //depot/projects/smpng/sys/dev/sound/pci/ich.c#14 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#19 integrate ... //depot/projects/smpng/sys/dev/usb/ufm.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/ugen.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/ulpt.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/urio.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#11 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#8 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#7 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumobj.h#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#6 integrate ... //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#5 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#15 integrate ... //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#12 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#5 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#4 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#7 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#4 integrate ... //depot/projects/smpng/sys/fs/nwfs/nwfs_mount.h#2 integrate ... //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#6 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#13 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#11 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs.h#3 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#4 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/fs/udf/udf_vnops.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#14 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#8 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/fs.h#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/inode.h#1 branch ... //depot/projects/smpng/sys/gnu/i386/fpemul/polynomial.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_div.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_round.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_add.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_div.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_mul.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_sub.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/wm_sqrt.s#2 integrate ... //depot/projects/smpng/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/smpng/sys/i386/conf/GENERIC#20 integrate ... //depot/projects/smpng/sys/i386/conf/Makefile#4 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#36 integrate ... //depot/projects/smpng/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/smpng/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/smpng/sys/i386/i386/bios.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/i386/i386/i386dump.c#3 delete ... //depot/projects/smpng/sys/i386/i386/machdep.c#38 integrate ... //depot/projects/smpng/sys/i386/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/i386/include/param.h#5 integrate ... //depot/projects/smpng/sys/i386/include/stdarg.h#4 integrate ... //depot/projects/smpng/sys/i386/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/ipl.s#7 integrate ... //depot/projects/smpng/sys/i386/isa/wt.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/wtreg.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/smpng/sys/ia64/acpica/madt.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/clock.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#5 delete ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#11 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#30 integrate ... //depot/projects/smpng/sys/ia64/ia64/sal.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#10 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#13 integrate ... //depot/projects/smpng/sys/ia64/include/asm.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#8 integrate ... //depot/projects/smpng/sys/ia64/include/ieeefp.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/mca.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/md_var.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/param.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/pcb.h#4 integrate ... //depot/projects/smpng/sys/ia64/include/reg.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/smp.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/stdarg.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/isa/fd.c#12 integrate ... //depot/projects/smpng/sys/isa/fdreg.h#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#5 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#13 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#4 integrate ... //depot/projects/smpng/sys/kern/init_main.c#18 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#39 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#62 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#36 integrate ... //depot/projects/smpng/sys/kern/kern_subr.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#11 integrate ... //depot/projects/smpng/sys/kern/makeobjops.pl#5 delete ... //depot/projects/smpng/sys/kern/subr_diskslice.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_log.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#14 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#49 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#13 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#17 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#17 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#14 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#13 integrate ... //depot/projects/smpng/sys/kern/tty.c#21 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#21 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#23 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#21 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#12 integrate ... //depot/projects/smpng/sys/kern/vfs_cluster.c#9 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_lookup.c#10 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#25 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#37 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#25 integrate ... //depot/projects/smpng/sys/kern/vnode_if.src#6 integrate ... //depot/projects/smpng/sys/modules/Makefile#27 integrate ... //depot/projects/smpng/sys/modules/ext2fs/Makefile#3 integrate ... //depot/projects/smpng/sys/net/bpf.c#15 integrate ... //depot/projects/smpng/sys/net/bridge.c#10 integrate ... //depot/projects/smpng/sys/net/if_dl.h#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#16 integrate ... //depot/projects/smpng/sys/net/if_iso88025subr.c#5 integrate ... //depot/projects/smpng/sys/net/if_media.h#5 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#8 integrate ... //depot/projects/smpng/sys/net/if_tap.c#14 integrate ... //depot/projects/smpng/sys/net/if_tun.c#13 integrate ... //depot/projects/smpng/sys/net/if_var.h#11 integrate ... //depot/projects/smpng/sys/net/iso88025.h#2 integrate ... //depot/projects/smpng/sys/net/zlib.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.h#4 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#9 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_ether.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.c#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.h#3 integrate ... //depot/projects/smpng/sys/netinet/icmp6.h#4 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#13 integrate ... //depot/projects/smpng/sys/netinet/igmp.c#4 integrate ... //depot/projects/smpng/sys/netinet/in.h#13 integrate ... //depot/projects/smpng/sys/netinet/ip_dummynet.c#7 integrate ... //depot/projects/smpng/sys/netinet/ip_dummynet.h#5 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.c#14 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.h#7 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#18 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#22 integrate ... //depot/projects/smpng/sys/netinet/tcp_syncache.c#10 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_core.c#3 integrate ... //depot/projects/smpng/sys/netinet6/mld6.c#2 integrate ... //depot/projects/smpng/sys/netncp/ncp_lib.h#3 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#13 integrate ... //depot/projects/smpng/sys/nfsserver/nfs.h#6 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#17 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#20 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#34 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#11 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dcreg.h#7 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#12 integrate ... //depot/projects/smpng/sys/pci/if_rlreg.h#6 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#6 integrate ... //depot/projects/smpng/sys/powerpc/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/powerpc/include/asm.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/float.h#1 branch ... //depot/projects/smpng/sys/powerpc/include/fpu.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/ieeefp.h#1 branch ... //depot/projects/smpng/sys/powerpc/include/param.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcb.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcpu.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pte.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/spr.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/stdarg.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/trap.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#23 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#17 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/sigcode.S#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#11 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#18 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#9 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs_vnops.c#5 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#13 integrate ... //depot/projects/smpng/sys/sparc64/include/ansi.h#13 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/instr.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/param.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/proc.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/reg.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#18 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#33 integrate ... //depot/projects/smpng/sys/sys/acl.h#6 integrate ... //depot/projects/smpng/sys/sys/bio.h#8 integrate ... //depot/projects/smpng/sys/sys/blist.h#2 integrate ... //depot/projects/smpng/sys/sys/buf.h#10 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#12 integrate ... //depot/projects/smpng/sys/sys/consio.h#5 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#16 integrate ... //depot/projects/smpng/sys/sys/errno.h#6 integrate ... //depot/projects/smpng/sys/sys/extattr.h#4 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#12 integrate ... //depot/projects/smpng/sys/sys/jail.h#6 integrate ... //depot/projects/smpng/sys/sys/kernel.h#15 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#4 integrate ... //depot/projects/smpng/sys/sys/mount.h#11 integrate ... //depot/projects/smpng/sys/sys/mtio.h#3 integrate ... //depot/projects/smpng/sys/sys/namei.h#7 integrate ... //depot/projects/smpng/sys/sys/param.h#23 integrate ... //depot/projects/smpng/sys/sys/proc.h#48 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#19 integrate ... //depot/projects/smpng/sys/sys/stat.h#4 integrate ... //depot/projects/smpng/sys/sys/sun_disklabel.h#1 branch ... //depot/projects/smpng/sys/sys/syscall.h#14 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#14 integrate ... //depot/projects/smpng/sys/sys/sysctl.h#9 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#16 integrate ... //depot/projects/smpng/sys/sys/time.h#8 integrate ... //depot/projects/smpng/sys/sys/timetc.h#8 integrate ... //depot/projects/smpng/sys/sys/types.h#13 integrate ... //depot/projects/smpng/sys/sys/uio.h#6 integrate ... //depot/projects/smpng/sys/sys/unpcb.h#4 integrate ... //depot/projects/smpng/sys/sys/user.h#11 integrate ... //depot/projects/smpng/sys/sys/vnode.h#18 integrate ... //depot/projects/smpng/sys/tools/vnode_if.awk#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#11 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#4 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#6 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#12 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#12 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#3 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#23 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#5 integrate ... //depot/projects/smpng/sys/ufs/ffs/fs.h#6 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/README.acls#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/README.extattr#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/dinode.h#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/extattr.h#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#15 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#5 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#14 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#4 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#8 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#16 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#12 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.30 2002/05/16 21:21:16 trhodes Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -482,7 +482,7 @@ struct timespec ts; if (base < 5*SECYR) { - printf("WARNING: preposterous time in file system"); + printf("WARNING: preposterous time in filesystem"); /* read the system clock anyway */ base = 6*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -509,7 +509,7 @@ if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* - * Believe the time in the file system for lack of + * Believe the time in the filesystem for lack of * anything better, resetting the TODR. */ s = splclock(); ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#16 (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/mp_machdep.c,v 1.38 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.39 2002/05/08 23:12:00 mjacob Exp $ */ #include <sys/param.h> @@ -532,7 +532,7 @@ static void release_aps(void *dummy __unused) { - if (bootverbose) + if (bootverbose && mp_ncpus > 1) printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#32 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.93 2002/05/16 00:03:32 gallatin Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -968,6 +968,11 @@ extern int alpha_unaligned_print, alpha_unaligned_fix; extern int alpha_unaligned_sigbus; +struct unaligned_fixup_data { + const char *type; /* opcode name */ + int size; /* size, 0 if fixup not supported */ +}; + int unaligned_fixup(va, opcode, reg, td) unsigned long va, opcode, reg; @@ -979,10 +984,11 @@ struct proc *p; unsigned long *regptr, longdata, uac; int intdata; /* signed to get extension when storing */ - struct { - const char *type; /* opcode name */ - int size; /* size, 0 if fixup not supported */ - } tab[0x10] = { + u_int16_t worddata; /* unsigned to _avoid_ extension */ + const struct unaligned_fixup_data tab_0c[0x2] = { + { "ldwu", 2 }, { "stw", 2 }, + }; + const struct unaligned_fixup_data tab_20[0x10] = { #ifdef FIX_UNALIGNED_VAX_FP { "ldf", 4 }, { "ldg", 8 }, #else @@ -1022,9 +1028,12 @@ * Find out which opcode it is. Arrange to have the opcode * printed if it's an unknown opcode. */ - if (opcode >= 0x20 && opcode <= 0x2f) { - type = tab[opcode - 0x20].type; - size = tab[opcode - 0x20].size; + if (opcode >= 0x0c && opcode <= 0x0d) { + type = tab_0c[opcode - 0x0c].type; + size = tab_0c[opcode - 0x0c].size; + } else if (opcode >= 0x20 && opcode <= 0x2f) { + type = tab_20[opcode - 0x20].type; + size = tab_20[opcode - 0x20].size; } else { type = "0x%lx"; size = 0; @@ -1067,6 +1076,15 @@ signal = SIGBUS; if (dofix && size != 0) { switch (opcode) { + case 0x0c: /* ldwu */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_load_integer(worddata); + break; + + case 0x0d: /* stw */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_store_integer(worddata); + break; #ifdef FIX_UNALIGNED_VAX_FP case 0x20: /* ldf */ unaligned_load_floating(intdata, Ffloat_to_reg); ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#18 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/smpng/sys/alpha/include/ansi.h#12 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.29 2002/05/10 02:21:05 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -72,7 +72,7 @@ #define _BSD_OFF_T_ long /* file offset */ #define _BSD_PID_T_ int /* process [group] */ -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95) +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ #else typedef struct { ==== //depot/projects/smpng/sys/alpha/include/atomic.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/atomic.h,v 1.11 2001/06/22 21:13:20 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.14 2002/05/17 05:45:39 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -367,7 +367,7 @@ "3:\tbr 1b\n" /* try again */ ".previous\n" : "=&r" (ret), "=m" (*p) - : "r" (cmpval), "r" (newval), "m" (*p) + : "r" ((long)(int)cmpval), "r" (newval), "m" (*p) : "memory"); return ret; ==== //depot/projects/smpng/sys/alpha/include/param.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.26 2001/09/12 22:00:06 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.28 2002/05/14 20:35:25 phk Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -116,16 +116,6 @@ #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1<<DEV_BSHIFT) - -#ifndef BLKDEV_IOSIZE -#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */ -#endif -#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ -#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */ -#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE) - #define CLSIZE 1 #define CLSIZELOG2 0 @@ -139,38 +129,6 @@ #define KSTACK_GUARD /* compile in kstack guard page */ /* - * Constants related to network buffer management. - * MCLBYTES must be no larger than PAGE_SIZE. - */ -#ifndef MSIZE -#define MSIZE 256 /* size of an mbuf */ -#endif /* MSIZE */ - -#ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ -#endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of a mbuf cluster */ - -/* pages ("clicks") to disk blocks */ -#define ctod(x) ((x) << (PAGE_SHIFT - DEV_BSHIFT)) -#define dtoc(x) ((x) >> (PAGE_SHIFT - DEV_BSHIFT)) - -/* pages to bytes */ -#define ctob(x) ((x) << PAGE_SHIFT) -#define btoc(x) (((x) + PAGE_MASK) >> PAGE_SHIFT) - -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT) -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) ==== //depot/projects/smpng/sys/alpha/include/stdarg.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.2 1999/08/28 00:38:52 peter Exp $ */ -/* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -34,6 +32,8 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 + * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_STDARG_H_ @@ -41,13 +41,26 @@ #include <machine/ansi.h> +typedef _BSD_VA_LIST_ va_list; + +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#define va_start(ap, last) \ + __builtin_stdarg_start((ap), (last)) + +#define va_arg(ap, type) \ + __builtin_va_arg((ap), type) + +#define va_end(ap) \ + __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #ifdef __lint__ #define __builtin_saveregs() (0) #define __builtin_classify_type(t) (0) #endif -typedef _BSD_VA_LIST_ va_list; - #define __va_size(type) \ (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) @@ -65,4 +78,6 @@ #define va_end(ap) ((void)0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_STDARG_H_ */ ==== //depot/projects/smpng/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/varargs.h,v 1.2 1999/08/28 00:38:53 peter Exp $ */ -/* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. @@ -39,11 +37,28 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 + * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_VARARGS_H_ #define _ALPHA_VARARGS_H_ +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#include <machine/ansi.h> + +typedef _BSD_VA_LIST_ va_list; +typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); + +#define va_alist __builtin_va_alist +#define va_dcl __builtin_va_alist_t __builtin_va_alist; ... +#define va_start(ap) __builtin_varargs_start(ap) +#define va_arg(ap, type) __builtin_va_arg((ap), type) +#define va_end(ap) __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #include <machine/stdarg.h> #if __GNUC__ == 1 @@ -59,4 +74,6 @@ #define va_start(ap) \ ((ap) = *(va_list *)__builtin_saveregs(), (ap).__pad = 0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_VARARGS_H_ */ ==== //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#3 (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/pci/irongate_pci.c,v 1.7 2002/02/28 18:18:41 gallatin Exp $ + * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.8 2002/05/10 16:56:14 gallatin Exp $ */ #include <sys/param.h> @@ -132,7 +132,7 @@ irongate_check_abort(); \ return ~0; \ } \ - data = ##op##(va); \ + data = op(va); \ if (irongate_check_abort()) \ return ~0; \ return data; \ @@ -144,7 +144,7 @@ irongate_clear_abort(); \ if (badaddr((caddr_t)va, width)) \ return; \ - ##op##(va, data); \ + op(va, data); \ irongate_check_abort(); \ } while (0) ==== //depot/projects/smpng/sys/arm/include/ansi.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.16 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.17 2002/05/10 02:20:33 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -69,7 +69,7 @@ #define _BSD_OFF_T_ __int64_t /* file offset */ #define _BSD_PID_T_ int /* process [group] */ -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95) +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ #else #define _BSD_VA_LIST_ char * /* va_list */ ==== //depot/projects/smpng/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.1 2001/01/04 05:23:06 obrien Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.3 2002/05/14 20:35:27 phk Exp $ */ /* @@ -100,62 +100,10 @@ #define KERNBASE 0x100000 /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1 << DEV_BSHIFT) - -#ifndef BLKDEV_IOSIZE -#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */ -#endif -#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ -#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */ -#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE) - #define UPAGES 2 /* pages of u-area */ #define USPACE (UPAGES * PAGE_SIZE) /* total size of u-area */ /* - * Constants related to network buffer management. - * MCLBYTES must be no larger than PAGE_SIZE. - */ -#ifndef MSIZE -#define MSIZE 256 /* size of an mbuf */ -#endif /* MSIZE */ - -#ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ -#endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */ - -/* - * Some macros for units conversion - */ - -/* pages ("clicks") to bytes */ -#define ctob(x) ((x) << PAGE_SHIFT) - -/* bytes to clicks */ -#define btoc(x) (((unsigned)(x) + PAGE_MASK) >> PAGE_SHIFT) - -/* pages ("clicks") to disk blocks */ -#define ctod(x) ((x) << (PAGE_SHIFT - DEV_BSHIFT)) -#define dtoc(x) ((x) >> (PAGE_SHIFT - DEV_BSHIFT)) - -/* bytes to disk blocks */ -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (sizeof (bytes) > sizeof(long) \ - ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \ - : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT)) - -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* * Mach derived conversion macros */ #define trunc_page(x) ((x) & ~PAGE_MASK) ==== //depot/projects/smpng/sys/boot/Makefile#5 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.12 2002/03/28 01:37:10 obrien Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.13 2002/05/09 20:33:22 obrien Exp $ # Build the add-in FORTH interpreter +.if ${MACHINE_ARCH} != "sparc64" SUBDIR+= ficl +.endif # Build OpenFirmware library .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.11 2000/07/21 22:36:42 jhb Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.12 2002/05/10 09:26:27 obrien Exp $ .include <../Makefile.inc> @@ -8,12 +8,12 @@ .PATH: ${.CURDIR}/../libalpha SRCS= start.S boot1.c sys.c -CFLAGS+= -mno-fp-regs +CFLAGS+= -ffreestanding -mno-fp-regs +CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL +CFLAGS+= -DBOOT1 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL -CFLAGS+= -DBOOT1 NOMAN=1 STRIP= BINDIR?= /boot ==== //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd * fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp - * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.6 2002/01/18 21:54:02 iedowse Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.8 2002/05/16 21:21:46 trhodes Exp $ */ #include <string.h> @@ -37,6 +37,7 @@ #include <ufs/ufs/inode.h> #include <sys/dirent.h> +#include <sys/disklabel.h> #define COMPAT_UFS @@ -185,7 +186,7 @@ #define max(a, b) ((a) > (b) ? (a) : (b)) /* - * Sanity checks for old file systems. + * Sanity checks for old filesystems. * * XXX - goes away some day. */ ==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.6 2001/08/10 22:31:05 obrien Exp $ >>> 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?200205172314.g4HNE8h21577>