Date: Fri, 6 Sep 2013 05:55:03 +0000 (UTC) From: Neel Natu <neel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255291 - in projects/bhyve_npt_pmap: . bin/sh contrib/binutils/gas/config contrib/binutils/opcodes contrib/bmake contrib/gcc contrib/gcc/config/arm contrib/gcc/config/i386 contrib/gcc/... Message-ID: <201309060555.r865t3sT024285@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: neel Date: Fri Sep 6 05:55:02 2013 New Revision: 255291 URL: http://svnweb.freebsd.org/changeset/base/255291 Log: IFC @255217 Added: projects/bhyve_npt_pmap/gnu/usr.bin/cc/include/__wmmintrin_aes.h - copied unchanged from r255217, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h projects/bhyve_npt_pmap/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h - copied unchanged from r255217, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h projects/bhyve_npt_pmap/lib/libc/include/errlst.h - copied unchanged from r255217, head/lib/libc/include/errlst.h projects/bhyve_npt_pmap/sys/arm/conf/DIGI-CCWMX53 - copied unchanged from r255217, head/sys/arm/conf/DIGI-CCWMX53 projects/bhyve_npt_pmap/sys/arm/freescale/imx/files.imx53 - copied unchanged from r255217, head/sys/arm/freescale/imx/files.imx53 projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx53_machdep.c - copied unchanged from r255217, head/sys/arm/freescale/imx/imx53_machdep.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/std.imx53 - copied unchanged from r255217, head/sys/arm/freescale/imx/std.imx53 projects/bhyve_npt_pmap/sys/boot/fdt/dts/digi-ccwmx53.dts - copied unchanged from r255217, head/sys/boot/fdt/dts/digi-ccwmx53.dts projects/bhyve_npt_pmap/sys/boot/fdt/dts/imx53x.dtsi - copied unchanged from r255217, head/sys/boot/fdt/dts/imx53x.dtsi projects/bhyve_npt_pmap/sys/crypto/aesni/aesencdec.h - copied unchanged from r255217, head/sys/crypto/aesni/aesencdec.h projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_mpc7xxx.c - copied unchanged from r255217, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_powerpc.h - copied unchanged from r255217, head/sys/dev/hwpmc/hwpmc_powerpc.h projects/bhyve_npt_pmap/sys/dev/xen/timer/ - copied from r255217, head/sys/dev/xen/timer/ projects/bhyve_npt_pmap/sys/mips/conf/GXEMUL32 - copied unchanged from r255217, head/sys/mips/conf/GXEMUL32 projects/bhyve_npt_pmap/sys/mips/conf/PICOSTATION_M2HP - copied unchanged from r255217, head/sys/mips/conf/PICOSTATION_M2HP projects/bhyve_npt_pmap/sys/mips/conf/PICOSTATION_M2HP.hints - copied unchanged from r255217, head/sys/mips/conf/PICOSTATION_M2HP.hints projects/bhyve_npt_pmap/sys/mips/malta/gt_pci_bus_space.c - copied unchanged from r255217, head/sys/mips/malta/gt_pci_bus_space.c projects/bhyve_npt_pmap/sys/mips/malta/gt_pci_bus_space.h - copied unchanged from r255217, head/sys/mips/malta/gt_pci_bus_space.h projects/bhyve_npt_pmap/sys/sys/_unrhdr.h - copied unchanged from r255217, head/sys/sys/_unrhdr.h projects/bhyve_npt_pmap/sys/x86/xen/ - copied from r255217, head/sys/x86/xen/ projects/bhyve_npt_pmap/sys/xen/evtchn/evtchnvar.h - copied unchanged from r255217, head/sys/xen/evtchn/evtchnvar.h projects/bhyve_npt_pmap/sys/xen/xen-os.h - copied unchanged from r255217, head/sys/xen/xen-os.h projects/bhyve_npt_pmap/tools/regression/bin/sh/builtins/return8.0 - copied unchanged from r255217, head/tools/regression/bin/sh/builtins/return8.0 projects/bhyve_npt_pmap/tools/regression/bin/sh/builtins/type3.0 - copied unchanged from r255217, head/tools/regression/bin/sh/builtins/type3.0 Deleted: projects/bhyve_npt_pmap/gnu/usr.bin/patch/ projects/bhyve_npt_pmap/sys/crypto/aesni/aesencdec_amd64.S projects/bhyve_npt_pmap/sys/crypto/aesni/aesencdec_i386.S projects/bhyve_npt_pmap/sys/dev/xen/xenpci/evtchn.c projects/bhyve_npt_pmap/sys/i386/include/xen/xen_clock_util.h projects/bhyve_npt_pmap/sys/i386/xen/xen_clock_util.c projects/bhyve_npt_pmap/sys/i386/xen/xen_rtc.c projects/bhyve_npt_pmap/sys/xen/evtchn/evtchn.c Modified: projects/bhyve_npt_pmap/Makefile.inc1 projects/bhyve_npt_pmap/ObsoleteFiles.inc projects/bhyve_npt_pmap/bin/sh/eval.c projects/bhyve_npt_pmap/bin/sh/eval.h projects/bhyve_npt_pmap/bin/sh/exec.c projects/bhyve_npt_pmap/bin/sh/jobs.c projects/bhyve_npt_pmap/bin/sh/jobs.h projects/bhyve_npt_pmap/bin/sh/main.c projects/bhyve_npt_pmap/bin/sh/parser.c projects/bhyve_npt_pmap/bin/sh/parser.h projects/bhyve_npt_pmap/bin/sh/sh.1 projects/bhyve_npt_pmap/bin/sh/trap.c projects/bhyve_npt_pmap/bin/sh/trap.h projects/bhyve_npt_pmap/contrib/binutils/gas/config/tc-i386.c projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-dis.c projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-opc.tbl projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-tbl.h projects/bhyve_npt_pmap/contrib/bmake/compat.c projects/bhyve_npt_pmap/contrib/gcc/ChangeLog.gcc43 projects/bhyve_npt_pmap/contrib/gcc/config/arm/libunwind.S projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.c projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.h projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.c projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.h projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.opt projects/bhyve_npt_pmap/contrib/gcc/doc/extend.texi projects/bhyve_npt_pmap/contrib/gcc/doc/invoke.texi projects/bhyve_npt_pmap/contrib/gcc/opth-gen.awk projects/bhyve_npt_pmap/contrib/gcclibs/libcpp/expr.c projects/bhyve_npt_pmap/contrib/gcclibs/libcpp/include/cpplib.h projects/bhyve_npt_pmap/contrib/libcxxrt/exception.cc projects/bhyve_npt_pmap/contrib/libexecinfo/backtrace.3 projects/bhyve_npt_pmap/contrib/libexecinfo/backtrace.c projects/bhyve_npt_pmap/contrib/libexecinfo/execinfo.h (contents, props changed) projects/bhyve_npt_pmap/contrib/libexecinfo/symtab.c projects/bhyve_npt_pmap/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/bhyve_npt_pmap/etc/defaults/periodic.conf projects/bhyve_npt_pmap/etc/devd/usb.conf projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist projects/bhyve_npt_pmap/etc/rc.d/routing projects/bhyve_npt_pmap/gnu/usr.bin/Makefile projects/bhyve_npt_pmap/gnu/usr.bin/cc/include/Makefile projects/bhyve_npt_pmap/lib/Makefile projects/bhyve_npt_pmap/lib/libc++/Makefile projects/bhyve_npt_pmap/lib/libc/gen/errlst.c projects/bhyve_npt_pmap/lib/libc/gen/signal.3 projects/bhyve_npt_pmap/lib/libc/stdio/xprintf_errno.c projects/bhyve_npt_pmap/lib/libc/stdlib/system.c projects/bhyve_npt_pmap/lib/libc/string/strerror.c projects/bhyve_npt_pmap/lib/libcompiler_rt/Makefile projects/bhyve_npt_pmap/lib/libelf/libelf_data.c projects/bhyve_npt_pmap/lib/libexecinfo/Makefile projects/bhyve_npt_pmap/lib/libutil/expand_number.c projects/bhyve_npt_pmap/sbin/etherswitchcfg/etherswitchcfg.8 projects/bhyve_npt_pmap/share/examples/scsi_target/scsi_target.c projects/bhyve_npt_pmap/share/man/man4/vmx.4 projects/bhyve_npt_pmap/share/man/man4/vtnet.4 projects/bhyve_npt_pmap/share/man/man5/periodic.conf.5 projects/bhyve_npt_pmap/share/man/man5/src.conf.5 projects/bhyve_npt_pmap/share/man/man9/Makefile projects/bhyve_npt_pmap/share/misc/committers-ports.dot projects/bhyve_npt_pmap/share/misc/committers-src.dot projects/bhyve_npt_pmap/share/mk/bsd.libnames.mk projects/bhyve_npt_pmap/sys/amd64/amd64/apic_vector.S projects/bhyve_npt_pmap/sys/amd64/amd64/cpu_switch.S projects/bhyve_npt_pmap/sys/amd64/amd64/db_disasm.c projects/bhyve_npt_pmap/sys/amd64/amd64/genassym.c projects/bhyve_npt_pmap/sys/amd64/amd64/machdep.c projects/bhyve_npt_pmap/sys/amd64/amd64/mp_machdep.c projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c projects/bhyve_npt_pmap/sys/amd64/amd64/vm_machdep.c projects/bhyve_npt_pmap/sys/amd64/include/apicvar.h projects/bhyve_npt_pmap/sys/amd64/include/cpufunc.h projects/bhyve_npt_pmap/sys/amd64/include/intr_machdep.h projects/bhyve_npt_pmap/sys/amd64/include/pcpu.h projects/bhyve_npt_pmap/sys/amd64/include/pmap.h projects/bhyve_npt_pmap/sys/amd64/include/smp.h projects/bhyve_npt_pmap/sys/amd64/include/xen/hypercall.h projects/bhyve_npt_pmap/sys/amd64/include/xen/xen-os.h projects/bhyve_npt_pmap/sys/arm/arm/machdep.c projects/bhyve_npt_pmap/sys/arm/arm/stdatomic.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx51_ccm.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx51_gpio.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx51_iomux.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx_gpt.c projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx_wdog.c projects/bhyve_npt_pmap/sys/cam/cam_debug.h projects/bhyve_npt_pmap/sys/cam/cam_periph.c projects/bhyve_npt_pmap/sys/cam/cam_xpt.c projects/bhyve_npt_pmap/sys/cam/cam_xpt.h projects/bhyve_npt_pmap/sys/cam/ctl/scsi_ctl.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_ch.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_enc.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_targ_bh.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_target.c projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/bhyve_npt_pmap/sys/cddl/dev/fbt/fbt_powerpc.c projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.amd64 projects/bhyve_npt_pmap/sys/conf/files.i386 projects/bhyve_npt_pmap/sys/crypto/aesni/aeskeys_amd64.S projects/bhyve_npt_pmap/sys/crypto/aesni/aesni.c projects/bhyve_npt_pmap/sys/crypto/aesni/aesni.h projects/bhyve_npt_pmap/sys/crypto/aesni/aesni_wrap.c projects/bhyve_npt_pmap/sys/dev/acpica/acpi_thermal.c projects/bhyve_npt_pmap/sys/dev/atkbdc/psm.c projects/bhyve_npt_pmap/sys/dev/cfi/cfi_bus_nexus.c projects/bhyve_npt_pmap/sys/dev/cfi/cfi_core.c projects/bhyve_npt_pmap/sys/dev/cfi/cfi_dev.c projects/bhyve_npt_pmap/sys/dev/cfi/cfi_disk.c projects/bhyve_npt_pmap/sys/dev/cfi/cfi_reg.h projects/bhyve_npt_pmap/sys/dev/cfi/cfi_var.h projects/bhyve_npt_pmap/sys/dev/cxgbe/adapter.h projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_sge.c projects/bhyve_npt_pmap/sys/dev/cxgbe/tom/t4_listen.c projects/bhyve_npt_pmap/sys/dev/drm2/drmP.h projects/bhyve_npt_pmap/sys/dev/drm2/drm_atomic.h projects/bhyve_npt_pmap/sys/dev/drm2/drm_context.c projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo.c projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo_util.c projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo_vm.c projects/bhyve_npt_pmap/sys/dev/gxemul/cons/gxemul_cons.c projects/bhyve_npt_pmap/sys/dev/gxemul/disk/gxemul_disk.c projects/bhyve_npt_pmap/sys/dev/gxemul/disk/gxemul_diskreg.h projects/bhyve_npt_pmap/sys/dev/gxemul/ether/gxreg.h projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_mod.c projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_powerpc.c projects/bhyve_npt_pmap/sys/dev/md/md.c projects/bhyve_npt_pmap/sys/dev/uart/uart_dev_ns8250.c projects/bhyve_npt_pmap/sys/dev/usb/serial/uftdi.c projects/bhyve_npt_pmap/sys/dev/usb/usbdevs projects/bhyve_npt_pmap/sys/dev/virtio/network/if_vtnet.c projects/bhyve_npt_pmap/sys/dev/virtio/network/if_vtnetvar.h projects/bhyve_npt_pmap/sys/dev/virtio/network/virtio_net.h projects/bhyve_npt_pmap/sys/dev/virtio/pci/virtio_pci.c projects/bhyve_npt_pmap/sys/dev/virtio/virtio_if.m projects/bhyve_npt_pmap/sys/dev/virtio/virtqueue.c projects/bhyve_npt_pmap/sys/dev/virtio/virtqueue.h projects/bhyve_npt_pmap/sys/dev/vmware/vmxnet3/if_vmx.c projects/bhyve_npt_pmap/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/bhyve_npt_pmap/sys/dev/xen/balloon/balloon.c projects/bhyve_npt_pmap/sys/dev/xen/blkback/blkback.c projects/bhyve_npt_pmap/sys/dev/xen/blkfront/blkfront.c projects/bhyve_npt_pmap/sys/dev/xen/blkfront/block.h projects/bhyve_npt_pmap/sys/dev/xen/console/console.c projects/bhyve_npt_pmap/sys/dev/xen/console/xencons_ring.c projects/bhyve_npt_pmap/sys/dev/xen/control/control.c projects/bhyve_npt_pmap/sys/dev/xen/netback/netback.c projects/bhyve_npt_pmap/sys/dev/xen/netfront/netfront.c projects/bhyve_npt_pmap/sys/dev/xen/xenpci/xenpci.c projects/bhyve_npt_pmap/sys/dev/xen/xenpci/xenpcivar.h projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clkrpc.c projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clvfsops.c projects/bhyve_npt_pmap/sys/geom/eli/g_eli.c projects/bhyve_npt_pmap/sys/i386/i386/apic_vector.s projects/bhyve_npt_pmap/sys/i386/i386/machdep.c projects/bhyve_npt_pmap/sys/i386/i386/mp_machdep.c projects/bhyve_npt_pmap/sys/i386/include/apicvar.h projects/bhyve_npt_pmap/sys/i386/include/intr_machdep.h projects/bhyve_npt_pmap/sys/i386/include/pcpu.h projects/bhyve_npt_pmap/sys/i386/include/pmap.h projects/bhyve_npt_pmap/sys/i386/include/xen/xen-os.h projects/bhyve_npt_pmap/sys/i386/include/xen/xenfunc.h projects/bhyve_npt_pmap/sys/i386/include/xen/xenvar.h projects/bhyve_npt_pmap/sys/i386/isa/npx.c projects/bhyve_npt_pmap/sys/i386/xen/clock.c projects/bhyve_npt_pmap/sys/i386/xen/exception.s projects/bhyve_npt_pmap/sys/i386/xen/mp_machdep.c projects/bhyve_npt_pmap/sys/i386/xen/mptable.c projects/bhyve_npt_pmap/sys/i386/xen/xen_machdep.c projects/bhyve_npt_pmap/sys/kern/kern_physio.c projects/bhyve_npt_pmap/sys/kern/kern_synch.c projects/bhyve_npt_pmap/sys/kern/subr_unit.c projects/bhyve_npt_pmap/sys/kern/subr_witness.c projects/bhyve_npt_pmap/sys/kern/uipc_debug.c projects/bhyve_npt_pmap/sys/kern/uipc_sockbuf.c projects/bhyve_npt_pmap/sys/kern/uipc_socket.c projects/bhyve_npt_pmap/sys/kern/vfs_mount.c projects/bhyve_npt_pmap/sys/mips/conf/DIR-825 projects/bhyve_npt_pmap/sys/mips/conf/MALTA projects/bhyve_npt_pmap/sys/mips/conf/MALTA64 projects/bhyve_npt_pmap/sys/mips/gxemul/mpreg.h projects/bhyve_npt_pmap/sys/mips/include/_stdint.h projects/bhyve_npt_pmap/sys/mips/malta/files.malta projects/bhyve_npt_pmap/sys/mips/malta/gt_pci.c projects/bhyve_npt_pmap/sys/mips/malta/malta_machdep.c projects/bhyve_npt_pmap/sys/mips/mips/pmap.c projects/bhyve_npt_pmap/sys/modules/aesni/Makefile projects/bhyve_npt_pmap/sys/modules/cam/Makefile projects/bhyve_npt_pmap/sys/modules/hwpmc/Makefile projects/bhyve_npt_pmap/sys/modules/send/Makefile projects/bhyve_npt_pmap/sys/modules/virtio/network/Makefile projects/bhyve_npt_pmap/sys/net/if_lagg.c projects/bhyve_npt_pmap/sys/net/if_lagg.h projects/bhyve_npt_pmap/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/bhyve_npt_pmap/sys/netgraph/netflow/ng_netflow.h projects/bhyve_npt_pmap/sys/netinet/sctp_auth.c projects/bhyve_npt_pmap/sys/netinet/sctp_auth.h projects/bhyve_npt_pmap/sys/netinet/sctp_indata.c projects/bhyve_npt_pmap/sys/netinet/sctp_os_bsd.h projects/bhyve_npt_pmap/sys/netinet/sctp_output.c projects/bhyve_npt_pmap/sys/netinet/sctp_structs.h projects/bhyve_npt_pmap/sys/netinet/sctp_timer.c projects/bhyve_npt_pmap/sys/netinet/sctp_uio.h projects/bhyve_npt_pmap/sys/netinet/sctputil.c projects/bhyve_npt_pmap/sys/netpfil/pf/pf_lb.c projects/bhyve_npt_pmap/sys/powerpc/aim/trap.c projects/bhyve_npt_pmap/sys/powerpc/include/_stdint.h projects/bhyve_npt_pmap/sys/powerpc/include/pmc_mdep.h projects/bhyve_npt_pmap/sys/powerpc/powermac/atibl.c projects/bhyve_npt_pmap/sys/powerpc/powermac/nvbl.c projects/bhyve_npt_pmap/sys/sys/bitset.h projects/bhyve_npt_pmap/sys/sys/cpuset.h projects/bhyve_npt_pmap/sys/sys/kernel.h projects/bhyve_npt_pmap/sys/sys/mbuf.h projects/bhyve_npt_pmap/sys/sys/mount.h projects/bhyve_npt_pmap/sys/sys/mouse.h projects/bhyve_npt_pmap/sys/sys/param.h projects/bhyve_npt_pmap/sys/sys/sockbuf.h projects/bhyve_npt_pmap/sys/sys/sysctl.h projects/bhyve_npt_pmap/sys/sys/systm.h projects/bhyve_npt_pmap/sys/sys/time.h projects/bhyve_npt_pmap/sys/vm/uma_core.c projects/bhyve_npt_pmap/sys/x86/include/segments.h projects/bhyve_npt_pmap/sys/x86/x86/local_apic.c projects/bhyve_npt_pmap/sys/xen/evtchn.h projects/bhyve_npt_pmap/sys/xen/evtchn/evtchn_dev.c projects/bhyve_npt_pmap/sys/xen/features.c projects/bhyve_npt_pmap/sys/xen/gnttab.c projects/bhyve_npt_pmap/sys/xen/gnttab.h projects/bhyve_npt_pmap/sys/xen/hvm.h projects/bhyve_npt_pmap/sys/xen/interface/event_channel.h projects/bhyve_npt_pmap/sys/xen/xen_intr.h projects/bhyve_npt_pmap/sys/xen/xenbus/xenbus.c projects/bhyve_npt_pmap/sys/xen/xenbus/xenbus_if.m projects/bhyve_npt_pmap/sys/xen/xenbus/xenbusb_front.c projects/bhyve_npt_pmap/sys/xen/xenbus/xenbusvar.h projects/bhyve_npt_pmap/sys/xen/xenstore/xenstore.c projects/bhyve_npt_pmap/sys/xen/xenstore/xenstore_dev.c projects/bhyve_npt_pmap/sys/xen/xenstore/xenstorevar.h projects/bhyve_npt_pmap/tools/tools/bus_autoconf/bus_load_file.c projects/bhyve_npt_pmap/usr.bin/dig/Makefile projects/bhyve_npt_pmap/usr.bin/host/Makefile projects/bhyve_npt_pmap/usr.bin/nslookup/Makefile projects/bhyve_npt_pmap/usr.sbin/periodic/periodic.sh projects/bhyve_npt_pmap/usr.sbin/rtadvd/if.c Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/contrib/binutils/ (props changed) projects/bhyve_npt_pmap/contrib/bmake/ (props changed) projects/bhyve_npt_pmap/contrib/gcc/ (props changed) projects/bhyve_npt_pmap/contrib/libcxxrt/ (props changed) projects/bhyve_npt_pmap/contrib/libexecinfo/ (props changed) projects/bhyve_npt_pmap/contrib/llvm/ (props changed) projects/bhyve_npt_pmap/lib/libc/ (props changed) projects/bhyve_npt_pmap/lib/libutil/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/amd64/include/xen/ (props changed) projects/bhyve_npt_pmap/sys/boot/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/usr.sbin/rtadvd/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile.inc1 ============================================================================== --- projects/bhyve_npt_pmap/Makefile.inc1 Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/Makefile.inc1 Fri Sep 6 05:55:02 2013 (r255291) @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -814,7 +814,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -888,7 +888,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc ============================================================================== --- projects/bhyve_npt_pmap/ObsoleteFiles.inc Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/ObsoleteFiles.inc Fri Sep 6 05:55:02 2013 (r255291) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20130903: gnupatch is no more +OLD_FILES+=usr/bin/gnupatch +OLD_FILES+=usr/share/man/man1/gnupatch.1.gz +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz # 20130822: bind 9.9.3-P2 import OLD_LIBS+=usr/lib/liblwres.so.80 # 20130814: vm_page_busy(9) Modified: projects/bhyve_npt_pmap/bin/sh/eval.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/eval.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/eval.c Fri Sep 6 05:55:02 2013 (r255291) @@ -324,7 +324,7 @@ skipping: if (evalskip == SKIPCONT && } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; - if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + if (evalskip == SKIPRETURN) status = exitstatus; break; } @@ -1068,7 +1068,7 @@ evalcommand(union node *cmd, int flags, funcnest--; popredir(); INTON; - if (evalskip == SKIPFUNC) { + if (evalskip == SKIPRETURN) { evalskip = 0; skipcount = 0; } @@ -1305,14 +1305,8 @@ returncmd(int argc, char **argv) { int ret = argc > 1 ? number(argv[1]) : oexitstatus; - if (funcnest) { - evalskip = SKIPFUNC; - skipcount = 1; - } else { - /* skip the rest of the file */ - evalskip = SKIPFILE; - skipcount = 1; - } + evalskip = SKIPRETURN; + skipcount = 1; return ret; } Modified: projects/bhyve_npt_pmap/bin/sh/eval.h ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/eval.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/eval.h Fri Sep 6 05:55:02 2013 (r255291) @@ -67,5 +67,4 @@ extern int skipcount; /* reasons for skipping commands (see comment on breakcmd routine) */ #define SKIPBREAK 1 #define SKIPCONT 2 -#define SKIPFUNC 3 -#define SKIPFILE 4 +#define SKIPRETURN 3 Modified: projects/bhyve_npt_pmap/bin/sh/exec.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/exec.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/exec.c Fri Sep 6 05:55:02 2013 (r255291) @@ -762,5 +762,7 @@ typecmd_impl(int argc, char **argv, int int typecmd(int argc, char **argv) { + if (argc > 2 && strcmp(argv[1], "--") == 0) + argc--, argv++; return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Modified: projects/bhyve_npt_pmap/bin/sh/jobs.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/jobs.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/jobs.c Fri Sep 6 05:55:02 2013 (r255291) @@ -83,13 +83,12 @@ static struct job *bgjob = NULL; /* last static struct job *jobmru; /* most recently used job list */ static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif -int in_waitcmd = 0; /* are we in waitcmd()? */ -volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */ static int ttyfd = -1; /* mode flags for dowait */ #define DOWAIT_BLOCK 0x1 /* wait until a child exits */ -#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on signals */ +#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */ +#define DOWAIT_SIG_ANY 0x4 /* if DOWAIT_SIG, abort on any signal */ #if JOBS static void restartjob(struct job *); @@ -484,7 +483,7 @@ waitcmd(int argc __unused, char **argv _ static int waitcmdloop(struct job *job) { - int status, retval; + int status, retval, sig; struct job *jp; /* @@ -492,7 +491,6 @@ waitcmdloop(struct job *job) * received. */ - in_waitcmd++; do { if (job != NULL) { if (job->state == JOBDONE) { @@ -508,7 +506,6 @@ waitcmdloop(struct job *job) if (job == bgjob) bgjob = NULL; } - in_waitcmd--; return retval; } } else { @@ -524,7 +521,6 @@ waitcmdloop(struct job *job) } for (jp = jobtab ; ; jp++) { if (jp >= jobtab + njobs) { /* no running procs */ - in_waitcmd--; return 0; } if (jp->used && jp->state == 0) @@ -532,9 +528,10 @@ waitcmdloop(struct job *job) } } } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); - in_waitcmd--; - return pendingsig + 128; + sig = pendingsig_waitcmd; + pendingsig_waitcmd = 0; + return sig + 128; } @@ -990,7 +987,8 @@ waitforjob(struct job *jp, int *origstat INTOFF; TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) - if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG : 0), jp) == -1) + if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG | + DOWAIT_SIG_ANY : 0), jp) == -1) dotrap(); #if JOBS if (jp->jobctl) { @@ -1081,12 +1079,17 @@ dowait(int mode, struct job *job) pid = wait3(&status, wflags, (struct rusage *)NULL); TRACE(("wait returns %d, status=%d\n", (int)pid, status)); if (pid == 0 && (mode & DOWAIT_SIG) != 0) { - sigsuspend(&omask); pid = -1; + if (((mode & DOWAIT_SIG_ANY) != 0 ? + pendingsig : pendingsig_waitcmd) != 0) { + errno = EINTR; + break; + } + sigsuspend(&omask); if (int_pending()) break; } - } while (pid == -1 && errno == EINTR && breakwaitcmd == 0); + } while (pid == -1 && errno == EINTR); if (pid == -1 && errno == ECHILD && job != NULL) job->state = JOBDONE; if ((mode & DOWAIT_SIG) != 0) { @@ -1095,11 +1098,6 @@ dowait(int mode, struct job *job) sigprocmask(SIG_SETMASK, &omask, NULL); INTON; } - if (breakwaitcmd != 0) { - breakwaitcmd = 0; - if (pid <= 0) - return -1; - } if (pid <= 0) return pid; INTOFF; Modified: projects/bhyve_npt_pmap/bin/sh/jobs.h ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/jobs.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/jobs.h Fri Sep 6 05:55:02 2013 (r255291) @@ -83,8 +83,6 @@ enum { }; extern int job_warning; /* user was warned about stopped jobs */ -extern int in_waitcmd; /* are we in waitcmd()? */ -extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */ void setjobctl(int); void showjobs(int, int); Modified: projects/bhyve_npt_pmap/bin/sh/main.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/main.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/main.c Fri Sep 6 05:55:02 2013 (r255291) @@ -231,7 +231,7 @@ cmdloop(int top) popstackmark(&smark); setstackmark(&smark); if (evalskip != 0) { - if (evalskip == SKIPFILE) + if (evalskip == SKIPRETURN) evalskip = 0; break; } Modified: projects/bhyve_npt_pmap/bin/sh/parser.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/parser.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/parser.c Fri Sep 6 05:55:02 2013 (r255291) @@ -96,7 +96,7 @@ static struct heredoc *heredoclist; /* l static int doprompt; /* if set, prompt the user */ static int needprompt; /* true if interactive and at start of line */ static int lasttoken; /* last token read */ -int tokpushback; /* last token pushed back */ +static int tokpushback; /* last token pushed back */ static char *wordtext; /* text of last word returned by readtoken */ static int checkkwd; static struct nodelist *backquotelist; @@ -108,12 +108,13 @@ static int funclinno; /* line # where t static struct parser_temp *parser_temp; -static union node *list(int, int); +static union node *list(int); static union node *andor(void); static union node *pipeline(void); static union node *command(void); static union node *simplecmd(union node **, union node *); static union node *makename(void); +static union node *makebinary(int type, union node *n1, union node *n2); static void parsefname(void); static void parseheredoc(void); static int peektoken(void); @@ -121,6 +122,7 @@ static int readtoken(void); static int xxreadtoken(void); static int readtoken1(int, const char *, const char *, int); static int noexpand(char *); +static void consumetoken(int); static void synexpect(int) __dead2; static void synerror(const char *) __dead2; static void setprompt(int); @@ -223,18 +225,18 @@ parsecmd(int interact) if (t == TNL) return NULL; tokpushback++; - return list(1, 1); + return list(1); } static union node * -list(int nlflag, int erflag) +list(int nlflag) { union node *ntop, *n1, *n2, *n3; int tok; checkkwd = CHKNL | CHKKWD | CHKALIAS; - if (!nlflag && !erflag && tokendlist[peektoken()]) + if (!nlflag && tokendlist[peektoken()]) return NULL; ntop = n1 = NULL; for (;;) { @@ -256,17 +258,11 @@ list(int nlflag, int erflag) if (ntop == NULL) ntop = n2; else if (n1 == NULL) { - n1 = (union node *)stalloc(sizeof (struct nbinary)); - n1->type = NSEMI; - n1->nbinary.ch1 = ntop; - n1->nbinary.ch2 = n2; + n1 = makebinary(NSEMI, ntop, n2); ntop = n1; } else { - n3 = (union node *)stalloc(sizeof (struct nbinary)); - n3->type = NSEMI; - n3->nbinary.ch1 = n1->nbinary.ch2; - n3->nbinary.ch2 = n2; + n3 = makebinary(NSEMI, n1->nbinary.ch2, n2); n1->nbinary.ch2 = n3; n1 = n3; } @@ -287,8 +283,7 @@ list(int nlflag, int erflag) tokpushback++; } checkkwd = CHKNL | CHKKWD | CHKALIAS; - if (!nlflag && (erflag ? peektoken() == TEOF : - tokendlist[peektoken()])) + if (!nlflag && tokendlist[peektoken()]) return ntop; break; case TEOF: @@ -298,7 +293,7 @@ list(int nlflag, int erflag) pungetc(); /* push back EOF on input */ return ntop; default: - if (nlflag || erflag) + if (nlflag) synexpect(-1); tokpushback++; return ntop; @@ -311,10 +306,10 @@ list(int nlflag, int erflag) static union node * andor(void) { - union node *n1, *n2, *n3; + union node *n; int t; - n1 = pipeline(); + n = pipeline(); for (;;) { if ((t = readtoken()) == TAND) { t = NAND; @@ -322,14 +317,9 @@ andor(void) t = NOR; } else { tokpushback++; - return n1; + return n; } - n2 = pipeline(); - n3 = (union node *)stalloc(sizeof (struct nbinary)); - n3->type = t; - n3->nbinary.ch1 = n1; - n3->nbinary.ch2 = n2; - n1 = n3; + n = makebinary(t, n, pipeline()); } } @@ -411,49 +401,39 @@ command(void) case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); n1->type = NIF; - if ((n1->nif.test = list(0, 0)) == NULL) + if ((n1->nif.test = list(0)) == NULL) synexpect(-1); - if (readtoken() != TTHEN) - synexpect(TTHEN); - n1->nif.ifpart = list(0, 0); + consumetoken(TTHEN); + n1->nif.ifpart = list(0); n2 = n1; while (readtoken() == TELIF) { n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif)); n2 = n2->nif.elsepart; n2->type = NIF; - if ((n2->nif.test = list(0, 0)) == NULL) + if ((n2->nif.test = list(0)) == NULL) synexpect(-1); - if (readtoken() != TTHEN) - synexpect(TTHEN); - n2->nif.ifpart = list(0, 0); + consumetoken(TTHEN); + n2->nif.ifpart = list(0); } if (lasttoken == TELSE) - n2->nif.elsepart = list(0, 0); + n2->nif.elsepart = list(0); else { n2->nif.elsepart = NULL; tokpushback++; } - if (readtoken() != TFI) - synexpect(TFI); + consumetoken(TFI); checkkwd = CHKKWD | CHKALIAS; break; case TWHILE: - case TUNTIL: { - int got; - n1 = (union node *)stalloc(sizeof (struct nbinary)); - n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL; - if ((n1->nbinary.ch1 = list(0, 0)) == NULL) + case TUNTIL: + t = lasttoken; + if ((n1 = list(0)) == NULL) synexpect(-1); - if ((got=readtoken()) != TDO) { -TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); - synexpect(TDO); - } - n1->nbinary.ch2 = list(0, 0); - if (readtoken() != TDONE) - synexpect(TDONE); + consumetoken(TDO); + n1 = makebinary((t == TWHILE)? NWHILE : NUNTIL, n1, list(0)); + consumetoken(TDONE); checkkwd = CHKKWD | CHKALIAS; break; - } case TFOR: if (readtoken() != TWORD || quoteflag || ! goodname(wordtext)) synerror("Bad for loop variable"); @@ -465,10 +445,7 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) { app = ≈ while (readtoken() == TWORD) { - n2 = (union node *)stalloc(sizeof (struct narg)); - n2->type = NARG; - n2->narg.text = wordtext; - n2->narg.backquote = backquotelist; + n2 = makename(); *app = n2; app = &n2->narg.next; } @@ -500,21 +477,15 @@ TRACE(("expecting DO got %s %s\n", tokna t = TEND; else synexpect(-1); - n1->nfor.body = list(0, 0); - if (readtoken() != t) - synexpect(t); + n1->nfor.body = list(0); + consumetoken(t); checkkwd = CHKKWD | CHKALIAS; break; case TCASE: n1 = (union node *)stalloc(sizeof (struct ncase)); n1->type = NCASE; - if (readtoken() != TWORD) - synexpect(TWORD); - n1->ncase.expr = n2 = (union node *)stalloc(sizeof (struct narg)); - n2->type = NARG; - n2->narg.text = wordtext; - n2->narg.backquote = backquotelist; - n2->narg.next = NULL; + consumetoken(TWORD); + n1->ncase.expr = makename(); while (readtoken() == TNL); if (lasttoken != TWORD || ! equal(wordtext, "in")) synerror("expecting \"in\""); @@ -527,10 +498,7 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken == TLP) readtoken(); for (;;) { - *app = ap = (union node *)stalloc(sizeof (struct narg)); - ap->type = NARG; - ap->narg.text = wordtext; - ap->narg.backquote = backquotelist; + *app = ap = makename(); checkkwd = CHKNL | CHKKWD; if (readtoken() != TPIPE) break; @@ -540,7 +508,7 @@ TRACE(("expecting DO got %s %s\n", tokna ap->narg.next = NULL; if (lasttoken != TRP) synexpect(TRP); - cp->nclist.body = list(0, 0); + cp->nclist.body = list(0); checkkwd = CHKNL | CHKKWD | CHKALIAS; if ((t = readtoken()) != TESAC) { @@ -560,17 +528,15 @@ TRACE(("expecting DO got %s %s\n", tokna case TLP: n1 = (union node *)stalloc(sizeof (struct nredir)); n1->type = NSUBSHELL; - n1->nredir.n = list(0, 0); + n1->nredir.n = list(0); n1->nredir.redirect = NULL; - if (readtoken() != TRP) - synexpect(TRP); + consumetoken(TRP); checkkwd = CHKKWD | CHKALIAS; is_subshell = 1; break; case TBEGIN: - n1 = list(0, 0); - if (readtoken() != TEND) - synexpect(TEND); + n1 = list(0); + consumetoken(TEND); checkkwd = CHKKWD | CHKALIAS; break; /* A simple command must have at least one redirection or word. */ @@ -644,10 +610,7 @@ simplecmd(union node **rpp, union node * for (;;) { checkkwd = savecheckkwd; if (readtoken() == TWORD) { - n = (union node *)stalloc(sizeof (struct narg)); - n->type = NARG; - n->narg.text = wordtext; - n->narg.backquote = backquotelist; + n = makename(); *app = n; app = &n->narg.next; if (savecheckkwd != 0 && !isassignment(wordtext)) @@ -659,8 +622,7 @@ simplecmd(union node **rpp, union node * } else if (lasttoken == TLP && app == &args->narg.next && rpp == orig_rpp) { /* We have a function */ - if (readtoken() != TRP) - synexpect(TRP); + consumetoken(TRP); funclinno = plinno; /* * - Require plain text. @@ -708,6 +670,18 @@ makename(void) return n; } +static union node * +makebinary(int type, union node *n1, union node *n2) +{ + union node *n; + + n = (union node *)stalloc(sizeof (struct nbinary)); + n->type = type; + n->nbinary.ch1 = n1; + n->nbinary.ch2 = n2; + return (n); +} + void fixredir(union node *n, const char *text, int err) { @@ -734,8 +708,7 @@ parsefname(void) { union node *n = redirnode; - if (readtoken() != TWORD) - synexpect(-1); + consumetoken(TWORD); if (n->type == NHERE) { struct heredoc *here = heredoc; struct heredoc *p; @@ -786,11 +759,7 @@ parseheredoc(void) } readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX, here->eofmark, here->striptabs); - n = (union node *)stalloc(sizeof (struct narg)); - n->narg.type = NARG; - n->narg.next = NULL; - n->narg.text = wordtext; - n->narg.backquote = backquotelist; + n = makename(); here->here->nhere.doc = n; } } @@ -1090,14 +1059,14 @@ done: doprompt = 0; } - n = list(0, oldstyle); + n = list(0); - if (oldstyle) + if (oldstyle) { + if (peektoken() != TEOF) + synexpect(-1); doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } + } else + consumetoken(TRP); (*nlpp)->n = n; if (oldstyle) { @@ -1880,6 +1849,14 @@ isassignment(const char *p) } +static void +consumetoken(int token) +{ + if (readtoken() != token) + synexpect(token); +} + + /* * Called when an unexpected token is read during the parse. The argument * is the token that is expected, or -1 if more than one type of token can Modified: projects/bhyve_npt_pmap/bin/sh/parser.h ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/parser.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/parser.h Fri Sep 6 05:55:02 2013 (r255291) @@ -68,11 +68,9 @@ /* * NEOF is returned by parsecmd when it encounters an end of file. It - * must be distinct from NULL, so we use the address of a variable that - * happens to be handy. + * must be distinct from NULL. */ -extern int tokpushback; -#define NEOF ((union node *)&tokpushback) +#define NEOF ((union node *)-1) extern int whichprompt; /* 1 == PS1, 2 == PS2 */ extern const char *const parsekwd[]; Modified: projects/bhyve_npt_pmap/bin/sh/sh.1 ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/sh.1 Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/sh.1 Fri Sep 6 05:55:02 2013 (r255291) @@ -1145,8 +1145,10 @@ command is .Pp .D1 Ic return Op Ar exitstatus .Pp -It terminates the current executional scope, returning from the previous -nested function, sourced script, or shell instance, in that order. +It terminates the current executional scope, returning from the closest +nested function or sourced script; +if no function or sourced script is being executed, +it exits the shell instance. The .Ic return command is implemented as a special built-in command. Modified: projects/bhyve_npt_pmap/bin/sh/trap.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/trap.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/trap.c Fri Sep 6 05:55:02 2013 (r255291) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); static char sigmode[NSIG]; /* current value of signal */ volatile sig_atomic_t pendingsig; /* indicates some signal received */ +volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT received */ int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; @@ -389,23 +390,13 @@ onsig(int signo) } /* If we are currently in a wait builtin, prepare to break it */ - if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) { - breakwaitcmd = 1; - pendingsig = signo; - } + if (signo == SIGINT || signo == SIGQUIT) + pendingsig_waitcmd = signo; if (trap[signo] != NULL && trap[signo][0] != '\0' && (signo != SIGCHLD || !ignore_sigchld)) { gotsig[signo] = 1; pendingsig = signo; - - /* - * If a trap is set, not ignored and not the null command, we - * need to make sure traps are executed even when a child - * blocks signals. - */ - if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0')) - breakwaitcmd = 1; } #ifndef NO_HISTORY @@ -428,6 +419,7 @@ dotrap(void) in_dotrap++; for (;;) { pendingsig = 0; + pendingsig_waitcmd = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; Modified: projects/bhyve_npt_pmap/bin/sh/trap.h ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/trap.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/bin/sh/trap.h Fri Sep 6 05:55:02 2013 (r255291) @@ -34,6 +34,7 @@ */ extern volatile sig_atomic_t pendingsig; +extern volatile sig_atomic_t pendingsig_waitcmd; extern int in_dotrap; extern volatile sig_atomic_t gotwinch; Modified: projects/bhyve_npt_pmap/contrib/binutils/gas/config/tc-i386.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/gas/config/tc-i386.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/binutils/gas/config/tc-i386.c Fri Sep 6 05:55:02 2013 (r255291) @@ -3990,7 +3990,8 @@ output_insn (void) goto check_prefix; } } - else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881) + else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881 + || i.tm.base_opcode == 0x660f3882) { /* invept and invvpid are 3 byte instructions with a mandatory prefix. */ @@ -4040,7 +4041,8 @@ output_insn (void) *p++ = (i.tm.base_opcode >> 16) & 0xff; } else if (i.tm.base_opcode == 0x660f3880 || - i.tm.base_opcode == 0x660f3881) + i.tm.base_opcode == 0x660f3881 || + i.tm.base_opcode == 0x660f3882) { p = frag_more (3); *p++ = (i.tm.base_opcode >> 16) & 0xff; Modified: projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-dis.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-dis.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-dis.c Fri Sep 6 05:55:02 2013 (r255291) @@ -550,6 +550,7 @@ fetch_data (struct disassemble_info *inf #define PREGRP104 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 104 } } #define PREGRP105 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 105 } } #define PREGRP106 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 106 } } +#define PREGRP107 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 107 } } #define X86_64_0 NULL, { { NULL, X86_64_SPECIAL }, { NULL, 0 } } @@ -2668,6 +2669,14 @@ static const struct dis386 prefix_user_t { "pclmulqdq", { XM, EXx, Ib } }, { "(bad)", { XX } }, }, + + /* PREGRP107 */ + { + { "(bad)", { XX } }, + { "(bad)", { XX } }, + { "invpcid",{ Gm, Mo } }, + { "(bad)", { XX } }, + }, }; static const struct dis386 x86_64_table[][2] = { @@ -2839,7 +2848,7 @@ static const struct dis386 three_byte_ta /* 80 */ { PREGRP98 }, { PREGRP99 }, - { "(bad)", { XX } }, + { PREGRP107 }, { "(bad)", { XX } }, { "(bad)", { XX } }, { "(bad)", { XX } }, Modified: projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-opc.tbl ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 6 05:55:02 2013 (r255291) @@ -1498,3 +1498,7 @@ xsetbv, 0, 0xf01, 0xd1, CpuXSAVE, No_bSu xsave, 1, 0xfae, 0x4, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } xsaveopt, 1, 0xfae, 0x6, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } + +// INVPCID +invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 } +invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 } Modified: projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-tbl.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-tbl.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/binutils/opcodes/i386-tbl.h Fri Sep 6 05:55:02 2013 (r255291) @@ -3641,6 +3641,14 @@ const template i386_optab[] = Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 } }, + { "invpcid", 2, 0x660f3882, None, CpuNo64, + Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, + { BaseIndex|Disp8|Disp16|Disp32|Disp32S, + Reg32 } }, + { "invpcid", 2, 0x660f3882, None, Cpu64, + Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, + { BaseIndex|Disp8|Disp16|Disp32|Disp32S, + Reg64 } }, { "vmcall", 0, 0xf01, 0xc1, CpuVMX, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { 0 } }, Modified: projects/bhyve_npt_pmap/contrib/bmake/compat.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/compat.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/bmake/compat.c Fri Sep 6 05:55:02 2013 (r255291) @@ -340,7 +340,7 @@ again: /* * The following work for any of the builtin shell specs. */ - if (shellErrFlag) { + if (errCheck && shellErrFlag) { shargv[shargc++] = shellErrFlag; } if (DEBUG(SHELL)) Modified: projects/bhyve_npt_pmap/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/ChangeLog.gcc43 Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/ChangeLog.gcc43 Fri Sep 6 05:55:02 2013 (r255291) @@ -1,3 +1,9 @@ +2007-06-05 Joerg Wunsch <j.gnu@uriah.heep.sax.de> (r23479) + + PR preprocessor/23479 + * doc/extend.texi: Document the 0b-prefixed binary integer + constant extension. + 2007-05-01 Dwarakanath Rajagopal <dwarak.rajagopal@amd.com> (r124341) * doc/invoke.texi: Fix typo, 'AMD Family 10h core' instead of Modified: projects/bhyve_npt_pmap/contrib/gcc/config/arm/libunwind.S ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/arm/libunwind.S Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/arm/libunwind.S Fri Sep 6 05:55:02 2013 (r255291) @@ -116,5 +116,6 @@ UNWIND_WRAPPER _Unwind_RaiseException 1 UNWIND_WRAPPER _Unwind_Resume 1 UNWIND_WRAPPER _Unwind_Resume_or_Rethrow 1 UNWIND_WRAPPER _Unwind_ForcedUnwind 3 +UNWIND_WRAPPER _Unwind_Backtrace 2 -#endif /* __symbian__ */ +#endif /* ndef __symbian__ */ Modified: projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.c Fri Sep 6 05:55:02 2013 (r255291) @@ -747,6 +747,66 @@ _Unwind_DeleteException (_Unwind_Excepti } +/* Perform stack backtrace through unwind data. */ +_Unwind_Reason_Code +__gnu_Unwind_Backtrace(_Unwind_Trace_Fn trace, void * trace_argument, + phase2_vrs * entry_vrs); +_Unwind_Reason_Code +__gnu_Unwind_Backtrace(_Unwind_Trace_Fn trace, void * trace_argument, + phase2_vrs * entry_vrs) +{ + phase1_vrs saved_vrs; + _Unwind_Reason_Code code; + + _Unwind_Control_Block ucb; + _Unwind_Control_Block *ucbp = &ucb; + + /* Set the pc to the call site. */ + entry_vrs->core.r[R_PC] = entry_vrs->core.r[R_LR]; + + /* Save the core registers. */ + saved_vrs.core = entry_vrs->core; + /* Set demand-save flags. */ + saved_vrs.demand_save_flags = ~(_uw) 0; + + do + { + /* Find the entry for this routine. */ + if (get_eit_entry (ucbp, saved_vrs.core.r[R_PC]) != _URC_OK) + { + code = _URC_FAILURE; + break; + } + + /* The dwarf unwinder assumes the context structure holds things + like the function and LSDA pointers. The ARM implementation + caches these in the exception header (UCB). To avoid + rewriting everything we make the virtual IP register point at + the UCB. */ + _Unwind_SetGR((_Unwind_Context *)&saved_vrs, 12, (_Unwind_Ptr) ucbp); + + /* Call trace function. */ + if ((*trace) ((_Unwind_Context *) &saved_vrs, trace_argument) + != _URC_NO_REASON) + { + code = _URC_FAILURE; + break; + } + + /* Call the pr to decide what to do. */ + code = ((personality_routine) UCB_PR_ADDR (ucbp)) + (_US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND, + ucbp, (void *) &saved_vrs); + } + while (code != _URC_END_OF_STACK + && code != _URC_FAILURE); + + finish: + restore_non_core_regs (&saved_vrs); + return code; +} + + /* Common implementation for ARM ABI defined personality routines. ID is the index of the personality routine, other arguments are as defined by __aeabi_unwind_cpp_pr{0,1,2}. */ @@ -1014,3 +1074,19 @@ _Unwind_GetTextRelBase (_Unwind_Context { abort (); } + +#ifdef __FreeBSD__ +/* FreeBSD expects these to be functions */ +_Unwind_Ptr +_Unwind_GetIP (struct _Unwind_Context *context) +{ + return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; +} + +_Unwind_Ptr +_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn) +{ + *ip_before_insn = 0; + return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; +} +#endif Modified: projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/arm/unwind-arm.h Fri Sep 6 05:55:02 2013 (r255291) @@ -205,6 +205,13 @@ extern "C" { _Unwind_Control_Block *, struct _Unwind_Context *, void *); _Unwind_Reason_Code _Unwind_ForcedUnwind (_Unwind_Control_Block *, _Unwind_Stop_Fn, void *); + /* @@@ Use unwind data to perform a stack backtrace. The trace callback + is called for every stack frame in the call chain, but no cleanup + actions are performed. */ + typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn) (_Unwind_Context *, void *); + _Unwind_Reason_Code _Unwind_Backtrace(_Unwind_Trace_Fn, + void*); + _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *); void _Unwind_Complete(_Unwind_Control_Block *ucbp); void _Unwind_DeleteException (_Unwind_Exception *); @@ -246,12 +253,17 @@ extern "C" { return val; } +#ifndef __FreeBSD__ /* Return the address of the instruction, not the actual IP value. */ #define _Unwind_GetIP(context) \ (_Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) #define _Unwind_GetIPInfo(context, ip_before_insn) \ (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) +#else + _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); + _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); +#endif static inline void _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) Modified: projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.c Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.c Fri Sep 6 05:55:02 2013 (r255291) @@ -1684,6 +1684,14 @@ ix86_handle_option (size_t code, const c } return true; + case OPT_maes: + if (!value) + { + target_flags &= ~MASK_AES; + target_flags_explicit |= MASK_AES; + } + return true; + default: return true; } @@ -2187,6 +2195,10 @@ override_options (void) if (TARGET_SSE3) target_flags |= MASK_SSE2; + /* Turn on SSE2 builtins for -maes. */ + if (TARGET_AES) + target_flags |= MASK_SSE2; + /* Turn on SSE builtins for -msse2. */ if (TARGET_SSE2) target_flags |= MASK_SSE; Modified: projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.h Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.h Fri Sep 6 05:55:02 2013 (r255291) @@ -428,6 +428,8 @@ extern const char *host_detect_local_cpu builtin_define ("__SSSE3__"); \ if (TARGET_SSE4A) \ builtin_define ("__SSE4A__"); \ + if (TARGET_AES) \ + builtin_define ("__AES__"); \ if (TARGET_SSE_MATH && TARGET_SSE) \ builtin_define ("__SSE_MATH__"); \ if (TARGET_SSE_MATH && TARGET_SSE2) \ Modified: projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.opt ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.opt Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/config/i386/i386.opt Fri Sep 6 05:55:02 2013 (r255291) @@ -205,6 +205,10 @@ msse4a Target Report Mask(SSE4A) Support MMX, SSE, SSE2, SSE3 and SSE4A built-in functions and code generation +maes +Target Report Mask(AES) +Support AES built-in functions and code generation. + mpopcnt Target Report Mask(POPCNT) Support code generation of popcount instruction for popcount built-ins Modified: projects/bhyve_npt_pmap/contrib/gcc/doc/extend.texi ============================================================================== --- projects/bhyve_npt_pmap/contrib/gcc/doc/extend.texi Fri Sep 6 05:38:20 2013 (r255290) +++ projects/bhyve_npt_pmap/contrib/gcc/doc/extend.texi Fri Sep 6 05:55:02 2013 (r255291) @@ -81,6 +81,7 @@ extensions, accepted by GCC in C89 mode * Pragmas:: Pragmas accepted by GCC. * Unnamed Fields:: Unnamed struct/union fields within structs/unions. * Thread-Local:: Per-thread variables. +* Binary constants:: Binary constants using the @samp{0b} prefix. @end menu @node Statement Exprs @@ -10424,6 +10425,28 @@ Non-@code{static} members shall not be @ @end quotation @end itemize +@node Binary constants +@section Binary constants using the @samp{0b} prefix +@cindex Binary constants using the @samp{0b} prefix + +Integer constants can be written as binary constants, consisting of a +sequence of @samp{0} and @samp{1} digits, prefixed by @samp{0b} or +@samp{0B}. This is particularly useful in environments that operate a +lot on the bit-level (like microcontrollers). + +The following statements are identical: + +@smallexample *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309060555.r865t3sT024285>