Date: Mon, 14 Apr 2008 23:12:53 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140051 for review Message-ID: <200804142312.m3ENCrlw077679@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140051 Change 140051 by julian@julian_trafmon1 on 2008/04/14 23:12:26 IFC to current Affected files ... .. //depot/projects/arp-v2/src/contrib/top/machine.h#3 integrate .. //depot/projects/arp-v2/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ppp#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/arp-v2/src/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/arp-v2/src/include/string.h#2 integrate .. //depot/projects/arp-v2/src/include/unistd.h#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/arp-v2/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/arp-v2/src/sbin/restore/tape.c#2 integrate .. //depot/projects/arp-v2/src/sbin/route/route.c#3 integrate .. //depot/projects/arp-v2/src/share/man/man4/Makefile#4 integrate .. //depot/projects/arp-v2/src/share/man/man4/ddb.4#4 integrate .. //depot/projects/arp-v2/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/arp-v2/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/arp-v2/src/share/man/man9/lock.9#4 integrate .. //depot/projects/arp-v2/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/arp-v2/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/files#5 integrate .. //depot/projects/arp-v2/src/sys/conf/files.amd64#4 integrate .. //depot/projects/arp-v2/src/sys/conf/files.i386#4 integrate .. //depot/projects/arp-v2/src/sys/conf/files.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/files.pc98#2 integrate .. //depot/projects/arp-v2/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/arp-v2/src/sys/conf/options#4 integrate .. //depot/projects/arp-v2/src/sys/conf/options.mips#1 branch .. //depot/projects/arp-v2/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/arp-v2/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/arp-v2/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/arp-v2/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/arp-v2/src/sys/isa/atrtc.c#1 branch .. //depot/projects/arp-v2/src/sys/isa/rtc.h#2 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/arp-v2/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/IDT#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_types.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/asm.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/clock.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/defs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/elf.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/endian.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/exec.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/float.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/frame.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/intr.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/limits.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/locore.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/param.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/proc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/profile.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/psl.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pte.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/queue.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/resource.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/runq.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/segments.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/signal.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/smp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/trap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/support.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/arp-v2/src/sys/modules/Makefile#4 integrate .. //depot/projects/arp-v2/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/net/radix.c#2 integrate .. //depot/projects/arp-v2/src/sys/net/radix.h#2 integrate .. //depot/projects/arp-v2/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/arp-v2/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/arp-v2/src/sys/net/route.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/route.h#3 integrate .. //depot/projects/arp-v2/src/sys/net/rtsock.c#4 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/arp-v2/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/arp-v2/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/arp-v2/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/arp-v2/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/arp-v2/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sys/ata.h#4 integrate .. //depot/projects/arp-v2/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/arp-v2/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/arp-v2/src/sys/sys/jail.h#2 integrate .. //depot/projects/arp-v2/src/sys/sys/lock.h#3 integrate .. //depot/projects/arp-v2/src/sys/sys/param.h#4 integrate .. //depot/projects/arp-v2/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/arp-v2/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/arp-v2/src/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/arp-v2/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/arp-v2/src/usr.bin/top/machine.c#4 integrate .. //depot/projects/arp-v2/src/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/arp-v2/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/rpc.lockd/lockd.c#3 integrate Differences ... ==== //depot/projects/arp-v2/src/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/arp-v2/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/arp-v2/src/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include <bsd.own.mk> @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/arp-v2/src/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.19 2008/04/06 20:39:33 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 ==== //depot/projects/arp-v2/src/etc/rc.d/wpa_supplicant#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.3 2008/04/08 18:54:42 sam Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} pidfile="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/arp-v2/src/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/arp-v2/src/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/arp-v2/src/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/arp-v2/src/lib/libc/gdtoa/_hdtoa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz <das@FreeBSD.ORG> + * Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include <float.h> #include <limits.h> #include <math.h> + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include <sys/types.h> #include <machine/fsr.h> @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804142312.m3ENCrlw077679>