Date: Sat, 4 Dec 2004 16:46:45 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66404 for review Message-ID: <200412041646.iB4GkjMC064046@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=66404 Change 66404 by rwatson@rwatson_paprika on 2004/12/04 16:45:57 Integrate netperf_socket from FreeBSD CVS: - kgdb fixage for amd64 - shutdown on boot processor for amd64 - easier to test ficl stuff in userspace - Real structures and sparse initialization for vnode operation vector; vnode operation invocation much simplified - APCI upgrade - umtx bug fixes - cleanups to domain initialization on protocol attach - MSG_DONTWAIT added - MSG_SOCALLBCK added - ng_callout - TCP window length bugfix - scope6 locking cleanup - pcn driver work Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#6 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#10 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#12 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#19 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acinterp.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmwalk.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exdump.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwgpe.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsutils.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmisc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_sparc64.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/netperf_socket/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#12 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lock.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_param.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#29 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/netperf_socket/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/net/if.c#25 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet6/scope6.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/netperf_socket/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/domain.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/file.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/filedesc.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/pioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/reboot.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#15 integrate .. //depot/projects/netperf_socket/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#12 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/netperf_socket/sys/alpha/include/gdb_machdep.h#2 (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/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -46,7 +46,7 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.63 2004/11/21 06:28:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.64 2004/11/29 14:49:27 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -277,7 +277,7 @@ } if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) - || newtag->alignment > 1 || newtag->boundary > 0) + || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && ==== //depot/projects/netperf_socket/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,49 +36,58 @@ #include <machine/frame.h> #include <machine/gdb_machdep.h> +#include <machine/pcb.h> #include <machine/psl.h> #include <machine/reg.h> #include <machine/trap.h> +#include <machine/frame.h> +#include <machine/endian.h> #include <gdb/gdb.h> void * gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); + + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&kdb_frame->tf_rax); + case 2: return (&kdb_frame->tf_rcx); + case 3: return (&kdb_frame->tf_rdx); + case 4: return (&kdb_frame->tf_rsi); + case 5: return (&kdb_frame->tf_rdi); + case 8: return (&kdb_frame->tf_r8); + case 9: return (&kdb_frame->tf_r9); + case 10: return (&kdb_frame->tf_r10); + case 11: return (&kdb_frame->tf_r11); + case 18: return (&kdb_frame->tf_cs); + case 19: return (&kdb_frame->tf_ss); + } + } switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rbx); - case 2: return (&tf->tf_rcx); - case 3: return (&tf->tf_rdx); - case 4: return (&tf->tf_rsi); - case 5: return (&tf->tf_rdi); - case 6: return (&tf->tf_rbp); - case 7: return (&tf->tf_rsp); - case 8: return (&tf->tf_r8); - case 9: return (&tf->tf_r9); - case 10: return (&tf->tf_r10); - case 11: return (&tf->tf_r11); - case 12: return (&tf->tf_r12); - case 13: return (&tf->tf_r13); - case 14: return (&tf->tf_r14); - case 15: return (&tf->tf_r15); - case 16: return (&tf->tf_rip); - case 17: return (&tf->tf_rflags); - case 18: return (&tf->tf_cs); - case 19: return (&tf->tf_ss); + case 1: return (&kdb_thrctx->pcb_rbx); + case 6: return (&kdb_thrctx->pcb_rbp); + case 7: return (&kdb_thrctx->pcb_rsp); + case 12: return (&kdb_thrctx->pcb_r12); + case 13: return (&kdb_thrctx->pcb_r13); + case 14: return (&kdb_thrctx->pcb_r14); + case 15: return (&kdb_thrctx->pcb_r15); + case 16: return (&kdb_thrctx->pcb_rip); + case 17: return (&kdb_thrctx->pcb_rflags); } return (NULL); } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { - struct trapframe *tf = kdb_frame; switch (regnum) { - case GDB_REG_PC: tf->tf_rip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_rip = *(register_t *)val; + if (kdb_thread == curthread) + kdb_frame->tf_rip = *(register_t *)val; } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.625 2004/11/29 23:27:07 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -589,8 +589,7 @@ * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the * BSP. See the comments there about why we set them. */ - cr0 |= CR0_MP | CR0_NE | CR0_TS; - cr0 |= CR0_WP | CR0_AM; + cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM; load_cr0(cr0); } ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#31 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.510 2004/12/02 04:06:40 alc Exp $"); /* * Manages physical address maps. @@ -318,18 +318,26 @@ /* Return a pointer to the PT slot that corresponds to a VA */ static __inline pt_entry_t * +pmap_pde_to_pte(pd_entry_t *pde, vm_offset_t va) +{ + pt_entry_t *pte; + + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + +/* Return a pointer to the PT slot that corresponds to a VA */ +static __inline pt_entry_t * pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return NULL; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -337,7 +345,6 @@ pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) @@ -345,8 +352,7 @@ *ptepde = *pde; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -1630,9 +1636,9 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { - pte = pmap_pte(pmap, sva); - if (pte == NULL || *pte == 0) + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { + if (*pte == 0) continue; anyvalid = 1; if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) @@ -1722,6 +1728,7 @@ pml4_entry_t *pml4e; pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; + pt_entry_t *pte; int anychanged; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { @@ -1777,14 +1784,11 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { pt_entry_t obits, pbits; - pt_entry_t *pte; vm_page_t m; - pte = pmap_pte(pmap, sva); - if (pte == NULL) - continue; retry: obits = pbits = *pte; if (pbits & PG_MANAGED) { ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#13 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.240 2004/11/30 20:25:46 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -79,11 +79,6 @@ #include <amd64/isa/isa.h> static void cpu_reset_real(void); -#ifdef SMP -static void cpu_reset_proxy(void); -static u_int cpu_reset_proxyid; -static volatile u_int cpu_reset_proxy_active; -#endif /* * Finish a fork operation, with process p2 nearly set up. @@ -331,22 +326,6 @@ /* * Force reset the processor by invalidating the entire address space! */ - -#ifdef SMP -static void -cpu_reset_proxy() -{ - - cpu_reset_proxy_active = 1; - while (cpu_reset_proxy_active == 1) - ; /* Wait for other cpu to see that we've started */ - stop_cpus((1<<cpu_reset_proxyid)); - printf("cpu_reset_proxy: Stopped CPU %d\n", cpu_reset_proxyid); - DELAY(1000000); - cpu_reset_real(); -} -#endif - void cpu_reset() { @@ -355,42 +334,17 @@ cpu_reset_real(); /* NOTREACHED */ } else { + u_int map; - u_int map; - int cnt; printf("cpu_reset called on cpu#%d\n", PCPU_GET(cpuid)); - map = PCPU_GET(other_cpus) & ~ stopped_cpus; - if (map != 0) { printf("cpu_reset: Stopping other CPUs\n"); stop_cpus(map); /* Stop all other CPUs */ } - - if (PCPU_GET(cpuid) == 0) { - DELAY(1000000); - cpu_reset_real(); - /* NOTREACHED */ - } else { - /* We are not BSP (CPU #0) */ - - cpu_reset_proxyid = PCPU_GET(cpuid); - cpustop_restartfunc = cpu_reset_proxy; - cpu_reset_proxy_active = 0; - printf("cpu_reset: Restarting BSP\n"); - started_cpus = (1<<0); /* Restart CPU #0 */ - - cnt = 0; - while (cpu_reset_proxy_active == 0 && cnt < 10000000) - cnt++; /* Wait for BSP to announce restart */ - if (cpu_reset_proxy_active == 0) - printf("cpu_reset: Failed to restart BSP\n"); - enable_intr(); - cpu_reset_proxy_active = 2; - - while (1); - /* NOTREACHED */ - } + DELAY(1000000); + cpu_reset_real(); + /* NOTREACHED */ } #else cpu_reset_real(); ==== //depot/projects/netperf_socket/sys/amd64/include/gdb_machdep.h#2 (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/sys/amd64/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:21 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:34 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -52,6 +52,6 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/netperf_socket/sys/arm/arm/trap.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $"); #include <sys/types.h> @@ -94,6 +94,7 @@ #include <sys/mutex.h> #include <sys/syscall.h> #include <sys/sysent.h> +#include <sys/signalvar.h> #ifdef KTRACE #include <sys/uio.h> #include <sys/ktrace.h> ==== //depot/projects/netperf_socket/sys/boot/common/loader.8#10 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $ .\" .Dd October 15, 2004 .Dt LOADER 8 @@ -352,10 +352,6 @@ Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. -Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $"); #include <stand.h> #include <string.h> @@ -53,7 +53,6 @@ } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -86,9 +85,6 @@ case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; ==== //depot/projects/netperf_socket/sys/boot/ficl/ficl.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -1114,7 +1114,6 @@ extern void ficlInb(FICL_VM *pVM); #endif -#if !defined(TESTMAIN) extern void ficlSetenv(FICL_VM *pVM); extern void ficlSetenvq(FICL_VM *pVM); extern void ficlGetenv(FICL_VM *pVM); @@ -1122,9 +1121,10 @@ extern void ficlCopyin(FICL_VM *pVM); extern void ficlCopyout(FICL_VM *pVM); extern void ficlFindfile(FICL_VM *pVM); +extern void ficlCcall(FICL_VM *pVM); +#if !defined(TESTMAIN) extern void ficlPnpdevices(FICL_VM *pVM); extern void ficlPnphandlers(FICL_VM *pVM); -extern void ficlCcall(FICL_VM *pVM); #endif /* ==== //depot/projects/netperf_socket/sys/boot/ficl/loader.c#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/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $ */ /******************************************************************* @@ -56,11 +56,13 @@ * .# ( value -- ) */ -#ifndef TESTMAIN void ficlSetenv(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values; #if FICL_ROBUST > 1 @@ -71,6 +73,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -85,6 +88,7 @@ setenv(name, value, 1); ficlFree(name); ficlFree(value); +#endif return; } @@ -92,7 +96,10 @@ void ficlSetenvq(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values, overwrite; #if FICL_ROBUST > 1 @@ -104,6 +111,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -118,6 +126,7 @@ setenv(name, value, overwrite); ficlFree(name); ficlFree(value); +#endif return; } @@ -125,7 +134,10 @@ void ficlGetenv(FICL_VM *pVM) { - char *namep, *name, *value; +#ifndef TESTMAIN + char *name; +#endif + char *namep, *value; int names; #if FICL_ROBUST > 1 @@ -134,6 +146,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -147,6 +160,7 @@ stackPushPtr(pVM->pStack, value); stackPushINT(pVM->pStack, strlen(value)); } else +#endif stackPushINT(pVM->pStack, -1); return; @@ -155,7 +169,10 @@ void ficlUnsetenv(FICL_VM *pVM) { - char *namep, *name; +#ifndef TESTMAIN + char *name; +#endif + char *namep; int names; #if FICL_ROBUST > 1 @@ -164,6 +181,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -172,6 +190,7 @@ unsetenv(name); ficlFree(name); +#endif return; } @@ -191,7 +210,9 @@ dest = stackPopINT(pVM->pStack); src = stackPopPtr(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyin(src, dest, len); +#endif return; } @@ -211,7 +232,9 @@ dest = stackPopPtr(pVM->pStack); src = stackPopINT(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyout(src, dest, len); +#endif return; } @@ -219,7 +242,10 @@ void ficlFindfile(FICL_VM *pVM) { - char *name, *type, *namep, *typep; +#ifndef TESTMAIN + char *name; +#endif + char *type, *namep, *typep; struct preloaded_file* fp; int names, types; @@ -231,6 +257,7 @@ typep = (char*) stackPopPtr(pVM->pStack); names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -243,11 +270,15 @@ type[types] = '\0'; fp = file_findfile(name, type); +#else + fp = NULL; +#endif stackPushPtr(pVM->pStack, fp); return; } +#ifndef TESTMAIN #ifdef HAVE_PNP void @@ -637,11 +668,6 @@ dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT); dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT); -#ifndef TESTMAIN -#ifdef __i386__ - dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); - dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); -#endif dictAppendWord(dp, "setenv", ficlSetenv, FW_DEFAULT); dictAppendWord(dp, "setenv?", ficlSetenvq, FW_DEFAULT); dictAppendWord(dp, "getenv", ficlGetenv, FW_DEFAULT); @@ -649,11 +675,16 @@ dictAppendWord(dp, "copyin", ficlCopyin, FW_DEFAULT); dictAppendWord(dp, "copyout", ficlCopyout, FW_DEFAULT); dictAppendWord(dp, "findfile", ficlFindfile, FW_DEFAULT); + dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); +#ifndef TESTMAIN +#ifdef __i386__ + dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); + dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); +#endif #ifdef HAVE_PNP dictAppendWord(dp, "pnpdevices",ficlPnpdevices, FW_DEFAULT); dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT); #endif - dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); #endif #if defined(PC98) ==== //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#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/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412041646.iB4GkjMC064046>