From owner-svn-src-projects@FreeBSD.ORG Sun Jan 12 12:14:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 414302D3; Sun, 12 Jan 2014 12:14:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D5661D31; Sun, 12 Jan 2014 12:14:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CCEdLl098798; Sun, 12 Jan 2014 12:14:39 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CCEdFG098797; Sun, 12 Jan 2014 12:14:39 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201401121214.s0CCEdFG098797@svn.freebsd.org> From: "Cherry G. Mathew" Date: Sun, 12 Jan 2014 12:14:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260560 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 12:14:39 -0000 Author: cherry Date: Sun Jan 12 12:14:38 2014 New Revision: 260560 URL: http://svnweb.freebsd.org/changeset/base/260560 Log: Revert the first part of r259097. 32bit ops on registers automatically clear out the top 32bits of its 64bits. Suggested by: jilles@ Approved by: gibbs@ (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/exception.S Sun Jan 12 11:44:28 2014 (r260559) +++ projects/amd64_xen_pv/sys/amd64/xen/exception.S Sun Jan 12 12:14:38 2014 (r260560) @@ -220,7 +220,7 @@ movq PCPU(CURTHREAD),%rdi ;\ movq %rsp, TD_FRAME(%rdi) ;\ movl TF_RFLAGS(%rsp),%esi ;\ - andq $PSL_T, %rsi ;\ + andl $PSL_T,%esi ;\ call amd64_syscall #define SYSRET \ From owner-svn-src-projects@FreeBSD.ORG Sun Jan 12 12:31:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C926E98C; Sun, 12 Jan 2014 12:31:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B619C1E70; Sun, 12 Jan 2014 12:31:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CCVESq004142; Sun, 12 Jan 2014 12:31:14 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CCVEeL004140; Sun, 12 Jan 2014 12:31:14 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201401121231.s0CCVEeL004140@svn.freebsd.org> From: "Cherry G. Mathew" Date: Sun, 12 Jan 2014 12:31:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260561 - in projects/amd64_xen_pv/sys/amd64: amd64 xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 12:31:14 -0000 Author: cherry Date: Sun Jan 12 12:31:14 2014 New Revision: 260561 URL: http://svnweb.freebsd.org/changeset/base/260561 Log: Disable the kernel's use of 'xsave' under XEN pv Approved by: gibbs@ (implicit) Modified: projects/amd64_xen_pv/sys/amd64/amd64/fpu.c projects/amd64_xen_pv/sys/amd64/xen/machdep.c Modified: projects/amd64_xen_pv/sys/amd64/amd64/fpu.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/amd64/fpu.c Sun Jan 12 12:14:38 2014 (r260560) +++ projects/amd64_xen_pv/sys/amd64/amd64/fpu.c Sun Jan 12 12:31:14 2014 (r260561) @@ -172,10 +172,12 @@ fpuinit_bsp1(void) u_int cp[4]; uint64_t xsave_mask_user; +#ifndef XEN /* XEN pv doesn't support xsave yet */ if ((cpu_feature2 & CPUID2_XSAVE) != 0) { use_xsave = 1; TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); } +#endif if (!use_xsave) return; Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sun Jan 12 12:14:38 2014 (r260560) +++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sun Jan 12 12:31:14 2014 (r260561) @@ -586,10 +586,10 @@ initxen(struct start_info *si) /* Enable write permissions for code patching */ static vm_offset_t xsave_cpage; xsave_cpage = (vm_offset_t) ctx_switch_xsave & ~PAGE_MASK; - PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U | PG_RW); + if (use_xsave) + PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U | PG_RW); fpuinit(); - PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U); - + if (use_xsave) PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U); /* * Set up thread0 pcb after fpuinit calculated pcb + fpu save From owner-svn-src-projects@FreeBSD.ORG Sun Jan 12 12:48:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DED4BF3; Sun, 12 Jan 2014 12:48:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E2EB1F17; Sun, 12 Jan 2014 12:48:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CCmpaw010483; Sun, 12 Jan 2014 12:48:51 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CCmo5Q010482; Sun, 12 Jan 2014 12:48:50 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201401121248.s0CCmo5Q010482@svn.freebsd.org> From: "Cherry G. Mathew" Date: Sun, 12 Jan 2014 12:48:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260562 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 12:48:51 -0000 Author: cherry Date: Sun Jan 12 12:48:50 2014 New Revision: 260562 URL: http://svnweb.freebsd.org/changeset/base/260562 Log: re-implement pmap_enter_quick_locked() Do not assume that cleared pte entries are zeroed under XEN. Test for PG_V instead. Approved by: gibbs@ (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Sun Jan 12 12:31:14 2014 (r260561) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Sun Jan 12 12:48:50 2014 (r260562) @@ -1231,6 +1231,117 @@ pmap_enter(pmap_t pmap, vm_offset_t va, PMAP_UNLOCK(pmap); } +static void +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) +{ + + pt_entry_t *pte; + pt_entry_t newpte, origpte; + vm_paddr_t pa; + + va = trunc_page(va); + + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", + va)); + + KASSERT(VM_PAGE_TO_PHYS(m) != 0, + ("VM_PAGE_TO_PHYS(m) == 0x%lx\n", VM_PAGE_TO_PHYS(m))); + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + pa = VM_PAGE_TO_PHYS(m); + newpte = (pt_entry_t)(xpmap_ptom(pa) | PG_V | PG_U); + + if ((prot & VM_PROT_EXECUTE) == 0) + newpte |= pg_nx; + + /* + * In the case that a page table page is not + * resident, we are creating it here. + */ + + KASSERT(tsz != 0, ("tsz != 0")); + + char tbuf[tsz]; /* Safe to do this on the stack since tsz is + * effectively const. + */ + + mmu_map_t tptr = tbuf; + + pte = pmap_vtopte_hold(pmap, va, &tptr); + + /* XXX: if (pte == NULL) bail; */ + + origpte = *pte; + + /* + * Is the specified virtual address already mapped? We're done. + */ + if ((origpte & PG_V) != 0) { + goto done; + + } + + /* + * Enter on the PV list if part of our managed memory. + */ + + if ((m->oflags & VPO_UNMANAGED) == 0) { + bool pvunmanaged = false; + newpte |= PG_MANAGED; + pvunmanaged = pmap_put_pv_entry(pmap, va, m); + + if (pvunmanaged != true) { + /* already managed entry - we're done */ + goto done; + } + } + + /* + * Increment the counters. + */ + pmap_resident_count_inc(pmap, 1); + + /* + * Update the PTE. + */ + PT_SET_VA_MA(pte, newpte, true); + + /* Sync the kernel's view of the pmap */ + if (pmap != kernel_pmap && + PCPU_GET(curpmap) == pmap) { + /* XXX: this can be optimised to a single entry update */ + pmap_xen_userload(pmap); + } + +done: + pmap_vtopte_release(pmap, va, &tptr); +} + +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) +{ + /* RO and unwired */ + prot = (prot & ~VM_PROT_WRITE) | VM_PROT_READ; + + va = trunc_page(va); + + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("%s: toobig", __func__)); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("%s: invalid to pmap_enter page table pages (va: 0x%lx)", __func__, va)); + + KASSERT(VM_PAGE_TO_PHYS(m) != 0, + ("VM_PAGE_TO_PHYS(m) == 0x%lx\n", VM_PAGE_TO_PHYS(m))); + + PMAP_LOCK(pmap); + + pmap_enter_quick_locked(pmap, va, m, prot); + + PMAP_UNLOCK(pmap); +} + /* * Maps a sequence of resident pages belonging to the same object. * The sequence begins with the given page m_start. This page is @@ -1261,37 +1372,13 @@ pmap_enter_object(pmap_t pmap, vm_offset while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { va = start + ptoa(diff); - pmap_enter_locked(pmap, va, prot, m, prot, false); + pmap_enter_quick_locked(pmap, va, m, prot); m = TAILQ_NEXT(m, listq); } PMAP_UNLOCK(pmap); } -void -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) -{ - /* RO and unwired */ - prot = (prot & ~VM_PROT_WRITE) | VM_PROT_READ; - - va = trunc_page(va); - - KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); - KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, - ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", - va)); - - KASSERT(VM_PAGE_TO_PHYS(m) != 0, - ("VM_PAGE_TO_PHYS(m) == 0x%lx\n", VM_PAGE_TO_PHYS(m))); - - PMAP_LOCK(pmap); - - /* XXX: do we care about "speed" ? */ - pmap_enter_locked(pmap, va, prot, m, prot, false); - - PMAP_UNLOCK(pmap); -} - void * pmap_kenter_temporary(vm_paddr_t pa, int i) { @@ -1320,6 +1407,7 @@ pmap_remove_pte(pmap_t pmap, vm_offset_t { /* XXX: there's no way to make this atomic ? */ oldpte = *ptq; + KASSERT(oldpte & PG_V, ("Invalid pte\n")); if (oldpte & PG_FRAME) { /* Optimise */ PT_CLEAR_VA(ptq, TRUE); } @@ -1420,6 +1508,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva pte = mmu_map_pt(tptr) + pt_index(sva); pmap_remove_page(pmap, sva, pte); + mmu_map_release_va(pmap, tptr, sva); goto out; } @@ -1462,13 +1551,14 @@ pmap_remove(pmap_t pmap, vm_offset_t sva for (pte = (mmu_map_pt(tptr) + pt_index(sva)); sva != va_next;pte++, sva += PAGE_SIZE) { - if (*pte == 0) { + if ((*pte & PG_V) == 0) { if (va != va_next) { pmap_invalidate_range(pmap, sva, va); va = va_next; } continue; } + /* * XXX: PG_G is set on *user* entries unlike * native, where it is set on kernel entries @@ -1479,6 +1569,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva va = sva; pmap_remove_pte(pmap, sva, pte); + mmu_map_release_va(pmap, tptr, sva); } if (va != va_next) { pmap_invalidate_range(pmap, sva, va); @@ -1524,6 +1615,8 @@ pv_remove(pmap_t pmap, vm_offset_t va, v /* XXX: Tell mmu_xxx about backing page */ pmap_vtopte_release(pmap, va, &tptr); + pmap_resident_count_dec(pmap, 1); + pmap_invalidate_page(pmap, va); PMAP_UNLOCK(pmap); @@ -2031,7 +2124,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm } dst_pte = mmu_map_pt(dtptr) + pt_index(addr); - if (*dst_pte == 0 && + if ((*dst_pte & PG_V) == 0 && pmap_put_pv_entry(dst_pmap, addr, MACH_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* From owner-svn-src-projects@FreeBSD.ORG Tue Jan 14 16:18:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9CC5CB90; Tue, 14 Jan 2014 16:18:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8282415D1; Tue, 14 Jan 2014 16:18:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EGIr9F038763; Tue, 14 Jan 2014 16:18:53 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EGImhI038735; Tue, 14 Jan 2014 16:18:48 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401141618.s0EGImhI038735@svn.freebsd.org> From: Justin Hibbits Date: Tue, 14 Jan 2014 16:18:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260631 - in projects/pmac_pmu: . bin/cat bin/pax bin/pax/tests bin/ps bin/sh bin/sh/tests bin/sh/tests/parameters bin/test/tests cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolar... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:18:53 -0000 Author: jhibbits Date: Tue Jan 14 16:18:45 2014 New Revision: 260631 URL: http://svnweb.freebsd.org/changeset/base/260631 Log: MFC@r260604 Added: projects/pmac_pmu/bin/pax/tests/Kyuafile - copied unchanged from r260605, head/bin/pax/tests/Kyuafile projects/pmac_pmu/bin/sh/tests/Kyuafile - copied unchanged from r260605, head/bin/sh/tests/Kyuafile projects/pmac_pmu/bin/sh/tests/parameters/optind2.0 - copied unchanged from r260605, head/bin/sh/tests/parameters/optind2.0 projects/pmac_pmu/bin/test/tests/Kyuafile - copied unchanged from r260605, head/bin/test/tests/Kyuafile projects/pmac_pmu/contrib/atf/atf-c++/atf-c++.pc.in - copied unchanged from r260605, head/contrib/atf/atf-c++/atf-c++.pc.in projects/pmac_pmu/contrib/atf/atf-c/atf-c.pc.in - copied unchanged from r260605, head/contrib/atf/atf-c/atf-c.pc.in projects/pmac_pmu/contrib/atf/atf-sh/atf-sh.pc.in - copied unchanged from r260605, head/contrib/atf/atf-sh/atf-sh.pc.in projects/pmac_pmu/contrib/gcc/ChangeLog.apple - copied unchanged from r260605, head/contrib/gcc/ChangeLog.apple projects/pmac_pmu/contrib/gcc/cp/ChangeLog.apple - copied unchanged from r260605, head/contrib/gcc/cp/ChangeLog.apple projects/pmac_pmu/contrib/gcclibs/libcpp/ChangeLog.apple - copied unchanged from r260605, head/contrib/gcclibs/libcpp/ChangeLog.apple projects/pmac_pmu/etc/rc.d/casperd - copied unchanged from r260605, head/etc/rc.d/casperd projects/pmac_pmu/lib/atf/common.mk - copied unchanged from r260605, head/lib/atf/common.mk projects/pmac_pmu/lib/atf/libatf-c++/tests/Makefile.inc - copied unchanged from r260605, head/lib/atf/libatf-c++/tests/Makefile.inc projects/pmac_pmu/lib/atf/libatf-c++/tests/detail/ - copied from r260605, head/lib/atf/libatf-c++/tests/detail/ projects/pmac_pmu/lib/atf/libatf-c/tests/Makefile.inc - copied unchanged from r260605, head/lib/atf/libatf-c/tests/Makefile.inc projects/pmac_pmu/lib/atf/libatf-c/tests/detail/ - copied from r260605, head/lib/atf/libatf-c/tests/detail/ projects/pmac_pmu/lib/clang/include/PPCGenAsmMatcher.inc - copied unchanged from r260605, head/lib/clang/include/PPCGenAsmMatcher.inc projects/pmac_pmu/lib/clang/libllvmpowerpcasmparser/ - copied from r260605, head/lib/clang/libllvmpowerpcasmparser/ projects/pmac_pmu/lib/libc/sys/aio_fsync.2 - copied unchanged from r260605, head/lib/libc/sys/aio_fsync.2 projects/pmac_pmu/lib/msun/ld128/k_expl.h - copied unchanged from r260605, head/lib/msun/ld128/k_expl.h projects/pmac_pmu/lib/msun/ld80/k_expl.h - copied unchanged from r260605, head/lib/msun/ld80/k_expl.h projects/pmac_pmu/lib/msun/src/e_coshl.c - copied unchanged from r260605, head/lib/msun/src/e_coshl.c projects/pmac_pmu/lib/msun/src/e_sinhl.c - copied unchanged from r260605, head/lib/msun/src/e_sinhl.c projects/pmac_pmu/lib/msun/src/s_tanhl.c - copied unchanged from r260605, head/lib/msun/src/s_tanhl.c projects/pmac_pmu/release/scripts/FreeBSD_install_cdrom.conf - copied unchanged from r260605, head/release/scripts/FreeBSD_install_cdrom.conf projects/pmac_pmu/sbin/fsck_ffs/globs.c - copied unchanged from r260605, head/sbin/fsck_ffs/globs.c projects/pmac_pmu/share/man/man4/geom_uncompress.4 - copied unchanged from r260605, head/share/man/man4/geom_uncompress.4 projects/pmac_pmu/sys/amd64/vmm/io/vlapic_priv.h - copied unchanged from r260605, head/sys/amd64/vmm/io/vlapic_priv.h projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_fbd.c - copied unchanged from r260605, head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/pmac_pmu/sys/arm/freescale/imx/imx51_ipuv3_fbd.c - copied unchanged from r260605, head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c - copied unchanged from r260605, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h - copied unchanged from r260605, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h projects/pmac_pmu/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu - copied unchanged from r260605, head/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu projects/pmac_pmu/sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu - copied unchanged from r260605, head/sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu projects/pmac_pmu/sys/dev/aic7xxx/aic79xx_reg.h - copied unchanged from r260605, head/sys/dev/aic7xxx/aic79xx_reg.h projects/pmac_pmu/sys/dev/aic7xxx/aic79xx_reg_print.c - copied unchanged from r260605, head/sys/dev/aic7xxx/aic79xx_reg_print.c projects/pmac_pmu/sys/dev/aic7xxx/aic79xx_seq.h - copied unchanged from r260605, head/sys/dev/aic7xxx/aic79xx_seq.h projects/pmac_pmu/sys/dev/aic7xxx/aic7xxx_reg.h - copied unchanged from r260605, head/sys/dev/aic7xxx/aic7xxx_reg.h projects/pmac_pmu/sys/dev/aic7xxx/aic7xxx_reg_print.c - copied unchanged from r260605, head/sys/dev/aic7xxx/aic7xxx_reg_print.c projects/pmac_pmu/sys/dev/aic7xxx/aic7xxx_seq.h - copied unchanged from r260605, head/sys/dev/aic7xxx/aic7xxx_seq.h projects/pmac_pmu/sys/dev/netmap/netmap_freebsd.c - copied unchanged from r260605, head/sys/dev/netmap/netmap_freebsd.c projects/pmac_pmu/sys/dev/netmap/netmap_generic.c - copied unchanged from r260605, head/sys/dev/netmap/netmap_generic.c projects/pmac_pmu/sys/dev/netmap/netmap_mbq.c - copied unchanged from r260605, head/sys/dev/netmap/netmap_mbq.c projects/pmac_pmu/sys/dev/netmap/netmap_mbq.h - copied unchanged from r260605, head/sys/dev/netmap/netmap_mbq.h projects/pmac_pmu/sys/dev/netmap/netmap_vale.c - copied unchanged from r260605, head/sys/dev/netmap/netmap_vale.c projects/pmac_pmu/sys/modules/iwnfw/iwn105/ - copied from r260605, head/sys/modules/iwnfw/iwn105/ projects/pmac_pmu/sys/modules/iwnfw/iwn135/ - copied from r260605, head/sys/modules/iwnfw/iwn135/ projects/pmac_pmu/sys/sys/sf_base.h - copied unchanged from r260605, head/sys/sys/sf_base.h projects/pmac_pmu/usr.sbin/bhyve/pm.c - copied unchanged from r260605, head/usr.sbin/bhyve/pm.c Deleted: projects/pmac_pmu/sys/arm/tegra/bus_space.c projects/pmac_pmu/sys/dev/fdt/fdt_pci.c projects/pmac_pmu/sys/i386/i386/symbols.raw projects/pmac_pmu/sys/powerpc/include/fdt.h Modified: projects/pmac_pmu/COPYRIGHT projects/pmac_pmu/Makefile.inc1 projects/pmac_pmu/ObsoleteFiles.inc projects/pmac_pmu/UPDATING projects/pmac_pmu/bin/cat/cat.c projects/pmac_pmu/bin/pax/pax.1 projects/pmac_pmu/bin/pax/tests/Makefile projects/pmac_pmu/bin/ps/ps.1 projects/pmac_pmu/bin/sh/input.c projects/pmac_pmu/bin/sh/sh.1 projects/pmac_pmu/bin/sh/tests/Makefile projects/pmac_pmu/bin/sh/tests/parameters/Makefile projects/pmac_pmu/bin/sh/var.c projects/pmac_pmu/bin/sh/var.h projects/pmac_pmu/bin/test/tests/Makefile projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.8 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zhack/zhack.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1 projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/pmac_pmu/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py projects/pmac_pmu/contrib/atf/FREEBSD-Xlist projects/pmac_pmu/contrib/atf/atf-c++/detail/test_helpers.cpp projects/pmac_pmu/contrib/binutils/gas/config/tc-ia64.c projects/pmac_pmu/contrib/binutils/opcodes/ia64-asmtab.c projects/pmac_pmu/contrib/byacc/CHANGES projects/pmac_pmu/contrib/byacc/VERSION projects/pmac_pmu/contrib/byacc/aclocal.m4 projects/pmac_pmu/contrib/byacc/config.guess projects/pmac_pmu/contrib/byacc/config.sub projects/pmac_pmu/contrib/byacc/configure projects/pmac_pmu/contrib/byacc/configure.in projects/pmac_pmu/contrib/byacc/defs.h projects/pmac_pmu/contrib/byacc/main.c projects/pmac_pmu/contrib/byacc/makefile.in projects/pmac_pmu/contrib/byacc/output.c projects/pmac_pmu/contrib/byacc/package/byacc.spec projects/pmac_pmu/contrib/byacc/package/debian/changelog projects/pmac_pmu/contrib/byacc/reader.c projects/pmac_pmu/contrib/byacc/skeleton.c projects/pmac_pmu/contrib/byacc/test/calc.tab.c projects/pmac_pmu/contrib/byacc/test/calc1.tab.c projects/pmac_pmu/contrib/byacc/test/calc2.tab.c projects/pmac_pmu/contrib/byacc/test/calc3.tab.c projects/pmac_pmu/contrib/byacc/test/code_calc.code.c projects/pmac_pmu/contrib/byacc/test/code_calc.tab.c projects/pmac_pmu/contrib/byacc/test/code_error.code.c projects/pmac_pmu/contrib/byacc/test/code_error.tab.c projects/pmac_pmu/contrib/byacc/test/error.tab.c projects/pmac_pmu/contrib/byacc/test/ftp.tab.c projects/pmac_pmu/contrib/byacc/test/grammar.tab.c projects/pmac_pmu/contrib/byacc/test/pure_calc.tab.c projects/pmac_pmu/contrib/byacc/test/pure_error.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc-s.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc2-s.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc2.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc3-s.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc3.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc4-s.tab.c projects/pmac_pmu/contrib/byacc/test/quote_calc4.tab.c projects/pmac_pmu/contrib/byacc/yacc.1 projects/pmac_pmu/contrib/diff/man/diff3.1 projects/pmac_pmu/contrib/file/compress.c projects/pmac_pmu/contrib/gcc/ChangeLog.gcc43 projects/pmac_pmu/contrib/gcc/attribs.c projects/pmac_pmu/contrib/gcc/c-common.c projects/pmac_pmu/contrib/gcc/c-common.h projects/pmac_pmu/contrib/gcc/c-convert.c projects/pmac_pmu/contrib/gcc/c-cppbuiltin.c projects/pmac_pmu/contrib/gcc/c-decl.c projects/pmac_pmu/contrib/gcc/c-incpath.c projects/pmac_pmu/contrib/gcc/c-objc-common.h projects/pmac_pmu/contrib/gcc/c-opts.c projects/pmac_pmu/contrib/gcc/c-parser.c projects/pmac_pmu/contrib/gcc/c-pretty-print.c projects/pmac_pmu/contrib/gcc/c-pretty-print.h projects/pmac_pmu/contrib/gcc/c-tree.h projects/pmac_pmu/contrib/gcc/c-typeck.c projects/pmac_pmu/contrib/gcc/c.opt projects/pmac_pmu/contrib/gcc/calls.c projects/pmac_pmu/contrib/gcc/cfg.c projects/pmac_pmu/contrib/gcc/cgraph.h projects/pmac_pmu/contrib/gcc/cgraphunit.c projects/pmac_pmu/contrib/gcc/collect2.c projects/pmac_pmu/contrib/gcc/combine.c projects/pmac_pmu/contrib/gcc/config/arm/arm.c projects/pmac_pmu/contrib/gcc/config/arm/arm.md projects/pmac_pmu/contrib/gcc/config/arm/freebsd.h projects/pmac_pmu/contrib/gcc/config/darwin.c projects/pmac_pmu/contrib/gcc/config/darwin.h projects/pmac_pmu/contrib/gcc/config/rs6000/rs6000.c projects/pmac_pmu/contrib/gcc/convert.c projects/pmac_pmu/contrib/gcc/convert.h projects/pmac_pmu/contrib/gcc/cp/ChangeLog.gcc43 projects/pmac_pmu/contrib/gcc/cp/Make-lang.in projects/pmac_pmu/contrib/gcc/cp/call.c projects/pmac_pmu/contrib/gcc/cp/class.c projects/pmac_pmu/contrib/gcc/cp/cp-gimplify.c projects/pmac_pmu/contrib/gcc/cp/cp-objcp-common.c projects/pmac_pmu/contrib/gcc/cp/cp-objcp-common.h projects/pmac_pmu/contrib/gcc/cp/cp-tree.def projects/pmac_pmu/contrib/gcc/cp/cp-tree.h projects/pmac_pmu/contrib/gcc/cp/cvt.c projects/pmac_pmu/contrib/gcc/cp/decl.c projects/pmac_pmu/contrib/gcc/cp/decl.h projects/pmac_pmu/contrib/gcc/cp/decl2.c projects/pmac_pmu/contrib/gcc/cp/dump.c projects/pmac_pmu/contrib/gcc/cp/error.c projects/pmac_pmu/contrib/gcc/cp/init.c projects/pmac_pmu/contrib/gcc/cp/mangle.c projects/pmac_pmu/contrib/gcc/cp/method.c projects/pmac_pmu/contrib/gcc/cp/name-lookup.c projects/pmac_pmu/contrib/gcc/cp/name-lookup.h projects/pmac_pmu/contrib/gcc/cp/parser.c projects/pmac_pmu/contrib/gcc/cp/pt.c projects/pmac_pmu/contrib/gcc/cp/rtti.c projects/pmac_pmu/contrib/gcc/cp/semantics.c projects/pmac_pmu/contrib/gcc/cp/tree.c projects/pmac_pmu/contrib/gcc/cp/typeck.c projects/pmac_pmu/contrib/gcc/dbxout.c projects/pmac_pmu/contrib/gcc/doc/cppopts.texi projects/pmac_pmu/contrib/gcc/doc/extend.texi projects/pmac_pmu/contrib/gcc/doc/invoke.texi projects/pmac_pmu/contrib/gcc/doc/tm.texi projects/pmac_pmu/contrib/gcc/dwarf2.h projects/pmac_pmu/contrib/gcc/dwarf2out.c projects/pmac_pmu/contrib/gcc/emit-rtl.c projects/pmac_pmu/contrib/gcc/expmed.c projects/pmac_pmu/contrib/gcc/expr.c projects/pmac_pmu/contrib/gcc/final.c projects/pmac_pmu/contrib/gcc/fold-const.c projects/pmac_pmu/contrib/gcc/function.c projects/pmac_pmu/contrib/gcc/function.h projects/pmac_pmu/contrib/gcc/gcc.c projects/pmac_pmu/contrib/gcc/gcov.c projects/pmac_pmu/contrib/gcc/ggc-common.c projects/pmac_pmu/contrib/gcc/ggc.h projects/pmac_pmu/contrib/gcc/langhooks-def.h projects/pmac_pmu/contrib/gcc/langhooks.c projects/pmac_pmu/contrib/gcc/langhooks.h projects/pmac_pmu/contrib/gcc/print-rtl.c projects/pmac_pmu/contrib/gcc/print-tree.c projects/pmac_pmu/contrib/gcc/reload1.c projects/pmac_pmu/contrib/gcc/rtl.def projects/pmac_pmu/contrib/gcc/rtl.h projects/pmac_pmu/contrib/gcc/sched-vis.c projects/pmac_pmu/contrib/gcc/stmt.c projects/pmac_pmu/contrib/gcc/stor-layout.c projects/pmac_pmu/contrib/gcc/stub-objc.c projects/pmac_pmu/contrib/gcc/target-def.h projects/pmac_pmu/contrib/gcc/target.h projects/pmac_pmu/contrib/gcc/targhooks.c projects/pmac_pmu/contrib/gcc/tlink.c projects/pmac_pmu/contrib/gcc/toplev.c projects/pmac_pmu/contrib/gcc/toplev.h projects/pmac_pmu/contrib/gcc/tree-cfg.c projects/pmac_pmu/contrib/gcc/tree-dump.c projects/pmac_pmu/contrib/gcc/tree-gimple.h projects/pmac_pmu/contrib/gcc/tree-nested.c projects/pmac_pmu/contrib/gcc/tree.c projects/pmac_pmu/contrib/gcc/tree.def projects/pmac_pmu/contrib/gcc/tree.h projects/pmac_pmu/contrib/gcc/varasm.c projects/pmac_pmu/contrib/gcc/version.c projects/pmac_pmu/contrib/gcclibs/include/libiberty.h projects/pmac_pmu/contrib/gcclibs/libcpp/charset.c projects/pmac_pmu/contrib/gcclibs/libcpp/directives.c projects/pmac_pmu/contrib/gcclibs/libcpp/include/cpplib.h projects/pmac_pmu/contrib/gcclibs/libcpp/init.c projects/pmac_pmu/contrib/gcclibs/libcpp/internal.h projects/pmac_pmu/contrib/gcclibs/libcpp/lex.c projects/pmac_pmu/contrib/gcclibs/libiberty/physmem.c projects/pmac_pmu/contrib/gperf/doc/gperf.1 projects/pmac_pmu/contrib/gperf/lib/getline.cc projects/pmac_pmu/contrib/gperf/src/options.cc projects/pmac_pmu/contrib/gperf/src/options.h projects/pmac_pmu/contrib/gperf/src/options.icc projects/pmac_pmu/contrib/gperf/src/output.cc projects/pmac_pmu/contrib/libc++/include/type_traits projects/pmac_pmu/contrib/libpcap/ieee80211.h projects/pmac_pmu/contrib/llvm/lib/Target/X86/X86InstrMMX.td projects/pmac_pmu/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/pmac_pmu/contrib/tcpdump/addrtoname.c projects/pmac_pmu/contrib/tcpdump/tcpdump.c projects/pmac_pmu/contrib/tzcode/stdtime/tzfile.5 projects/pmac_pmu/contrib/tzdata/asia projects/pmac_pmu/contrib/tzdata/northamerica projects/pmac_pmu/contrib/unbound/util/configparser.c projects/pmac_pmu/crypto/openssl/ssl/d1_both.c projects/pmac_pmu/crypto/openssl/ssl/s3_both.c projects/pmac_pmu/crypto/openssl/ssl/s3_lib.c projects/pmac_pmu/crypto/openssl/ssl/ssl_locl.h projects/pmac_pmu/crypto/openssl/ssl/t1_enc.c projects/pmac_pmu/etc/defaults/rc.conf projects/pmac_pmu/etc/devd/usb.conf projects/pmac_pmu/etc/mtree/BSD.tests.dist projects/pmac_pmu/etc/ntp.conf projects/pmac_pmu/etc/rc.d/Makefile projects/pmac_pmu/gnu/lib/csu/Makefile projects/pmac_pmu/gnu/lib/libgcc/Makefile projects/pmac_pmu/gnu/lib/libstdc++/Makefile projects/pmac_pmu/gnu/lib/libsupc++/Makefile projects/pmac_pmu/gnu/usr.bin/gdb/kgdb/Makefile projects/pmac_pmu/gnu/usr.bin/gdb/kgdb/main.c projects/pmac_pmu/gnu/usr.bin/gdb/kgdb/trgt.c projects/pmac_pmu/kerberos5/lib/Makefile projects/pmac_pmu/kerberos5/lib/libkafs5/Makefile projects/pmac_pmu/lib/atf/Makefile.inc projects/pmac_pmu/lib/atf/libatf-c++/Makefile projects/pmac_pmu/lib/atf/libatf-c++/tests/Makefile projects/pmac_pmu/lib/atf/libatf-c/Makefile projects/pmac_pmu/lib/atf/libatf-c/tests/Makefile projects/pmac_pmu/lib/clang/Makefile projects/pmac_pmu/lib/clang/include/llvm/Config/AsmParsers.def projects/pmac_pmu/lib/libc/gen/fts.3 projects/pmac_pmu/lib/libc/gen/fts.c projects/pmac_pmu/lib/libc/net/sctp_sys_calls.c projects/pmac_pmu/lib/libc/sys/Makefile.inc projects/pmac_pmu/lib/libc/sys/accept.2 projects/pmac_pmu/lib/libc/sys/aio_mlock.2 projects/pmac_pmu/lib/libc/sys/chflags.2 projects/pmac_pmu/lib/libc/sys/pipe.2 projects/pmac_pmu/lib/libc/sys/shm_open.2 projects/pmac_pmu/lib/libc/sys/swapon.2 projects/pmac_pmu/lib/libcam/Makefile projects/pmac_pmu/lib/libcasper/libcasper.c projects/pmac_pmu/lib/libcxxrt/Version.map projects/pmac_pmu/lib/libdevstat/devstat.c projects/pmac_pmu/lib/libiconv/Makefile projects/pmac_pmu/lib/libiconv_modules/BIG5/Makefile projects/pmac_pmu/lib/libiconv_modules/BIG5/citrus_big5.c projects/pmac_pmu/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/pmac_pmu/lib/libiconv_modules/EUC/Makefile projects/pmac_pmu/lib/libiconv_modules/EUC/citrus_euc.c projects/pmac_pmu/lib/libiconv_modules/EUCTW/Makefile projects/pmac_pmu/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/pmac_pmu/lib/libiconv_modules/GBK2K/Makefile projects/pmac_pmu/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/pmac_pmu/lib/libiconv_modules/HZ/citrus_hz.c projects/pmac_pmu/lib/libiconv_modules/ISO2022/Makefile projects/pmac_pmu/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/pmac_pmu/lib/libiconv_modules/JOHAB/Makefile projects/pmac_pmu/lib/libiconv_modules/JOHAB/citrus_johab.c projects/pmac_pmu/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/pmac_pmu/lib/libiconv_modules/UES/Makefile projects/pmac_pmu/lib/libiconv_modules/UES/citrus_ues.c projects/pmac_pmu/lib/libiconv_modules/UTF1632/Makefile projects/pmac_pmu/lib/libiconv_modules/UTF7/Makefile projects/pmac_pmu/lib/libiconv_modules/UTF7/citrus_utf7.c projects/pmac_pmu/lib/libiconv_modules/UTF8/citrus_utf8.c projects/pmac_pmu/lib/libiconv_modules/VIQR/citrus_viqr.c projects/pmac_pmu/lib/libiconv_modules/ZW/citrus_zw.c projects/pmac_pmu/lib/libiconv_modules/iconv_std/Makefile projects/pmac_pmu/lib/libiconv_modules/mapper_parallel/Makefile projects/pmac_pmu/lib/libiconv_modules/mapper_serial/Makefile projects/pmac_pmu/lib/libiconv_modules/mapper_std/Makefile projects/pmac_pmu/lib/libiconv_modules/mapper_zone/Makefile projects/pmac_pmu/lib/libkvm/Makefile projects/pmac_pmu/lib/libkvm/kvm.c projects/pmac_pmu/lib/libkvm/kvm_ia64.c projects/pmac_pmu/lib/libmd/sha256.h projects/pmac_pmu/lib/libmd/sha256c.c projects/pmac_pmu/lib/libnetgraph/sock.c projects/pmac_pmu/lib/libnv/msgio.c projects/pmac_pmu/lib/libnv/msgio.h projects/pmac_pmu/lib/libnv/nvlist.c projects/pmac_pmu/lib/libprocstat/zfs/Makefile projects/pmac_pmu/lib/libstand/Makefile projects/pmac_pmu/lib/libstand/close.c projects/pmac_pmu/lib/libstand/dosfs.c projects/pmac_pmu/lib/libstand/dosfs.h projects/pmac_pmu/lib/libstand/environment.c projects/pmac_pmu/lib/libusb/Makefile projects/pmac_pmu/lib/libusb/libusb.3 projects/pmac_pmu/lib/libusb/libusb.h projects/pmac_pmu/lib/libusb/libusb10_io.c projects/pmac_pmu/lib/libvmmapi/vmmapi.c projects/pmac_pmu/lib/libvmmapi/vmmapi.h projects/pmac_pmu/lib/msun/Makefile projects/pmac_pmu/lib/msun/Symbol.map projects/pmac_pmu/lib/msun/ld128/s_expl.c projects/pmac_pmu/lib/msun/ld80/s_expl.c projects/pmac_pmu/lib/msun/man/cosh.3 projects/pmac_pmu/lib/msun/man/sinh.3 projects/pmac_pmu/lib/msun/man/tanh.3 projects/pmac_pmu/lib/msun/src/e_cosh.c projects/pmac_pmu/lib/msun/src/e_sinh.c projects/pmac_pmu/lib/msun/src/imprecise.c projects/pmac_pmu/lib/msun/src/math.h projects/pmac_pmu/lib/msun/src/s_tanh.c projects/pmac_pmu/release/Makefile projects/pmac_pmu/release/doc/Makefile projects/pmac_pmu/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/pmac_pmu/release/doc/share/xml/release.ent projects/pmac_pmu/release/picobsd/build/picobsd projects/pmac_pmu/release/rc.local projects/pmac_pmu/release/release.sh projects/pmac_pmu/sbin/camcontrol/camcontrol.8 projects/pmac_pmu/sbin/camcontrol/camcontrol.c projects/pmac_pmu/sbin/casperd/casperd.c projects/pmac_pmu/sbin/casperd/zygote.c projects/pmac_pmu/sbin/fsck_ffs/Makefile projects/pmac_pmu/sbin/fsck_ffs/dir.c projects/pmac_pmu/sbin/fsck_ffs/fsck.h projects/pmac_pmu/sbin/fsck_ffs/fsck_ffs.8 projects/pmac_pmu/sbin/fsck_ffs/fsutil.c projects/pmac_pmu/sbin/fsck_ffs/main.c projects/pmac_pmu/sbin/fsck_ffs/pass1.c projects/pmac_pmu/sbin/fsck_ffs/pass1b.c projects/pmac_pmu/sbin/fsck_ffs/suj.c projects/pmac_pmu/sbin/fsck_ffs/utilities.c projects/pmac_pmu/sbin/fsdb/Makefile projects/pmac_pmu/sbin/geom/class/eli/geom_eli.c projects/pmac_pmu/sbin/geom/class/mirror/geom_mirror.c projects/pmac_pmu/sbin/geom/class/mirror/gmirror.8 projects/pmac_pmu/sbin/geom/class/part/geom_part.c (contents, props changed) projects/pmac_pmu/sbin/ipfw/ipfw.8 projects/pmac_pmu/sbin/iscontrol/iscsi.conf.5 projects/pmac_pmu/sbin/kldload/kldload.c projects/pmac_pmu/sbin/nvmecontrol/devlist.c projects/pmac_pmu/sbin/pfctl/Makefile projects/pmac_pmu/sbin/pfctl/pfctl_altq.c projects/pmac_pmu/sbin/pfctl/pfctl_parser.c projects/pmac_pmu/sbin/pfctl/pfctl_parser.h projects/pmac_pmu/sbin/route/keywords projects/pmac_pmu/sbin/route/route.8 projects/pmac_pmu/sbin/route/route.c projects/pmac_pmu/sbin/swapon/swapon.c projects/pmac_pmu/share/i18n/esdb/UTF/UTF.alias projects/pmac_pmu/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 projects/pmac_pmu/share/man/man4/Makefile projects/pmac_pmu/share/man/man4/arcmsr.4 projects/pmac_pmu/share/man/man4/cxgbe.4 projects/pmac_pmu/share/man/man4/kld.4 projects/pmac_pmu/share/man/man4/netmap.4 projects/pmac_pmu/share/man/man4/run.4 projects/pmac_pmu/share/man/man5/hosts.5 projects/pmac_pmu/share/man/man5/hosts.equiv.5 projects/pmac_pmu/share/man/man5/nsswitch.conf.5 projects/pmac_pmu/share/man/man5/periodic.conf.5 projects/pmac_pmu/share/man/man5/rc.conf.5 projects/pmac_pmu/share/man/man5/resolver.5 projects/pmac_pmu/share/man/man7/hier.7 projects/pmac_pmu/share/man/man7/hostname.7 projects/pmac_pmu/share/man/man7/security.7 projects/pmac_pmu/share/man/man8/rc.8 projects/pmac_pmu/share/man/man9/Makefile projects/pmac_pmu/share/man/man9/ieee80211_crypto.9 projects/pmac_pmu/share/man/man9/mbuf.9 projects/pmac_pmu/share/man/man9/sglist.9 projects/pmac_pmu/share/misc/committers-ports.dot projects/pmac_pmu/share/misc/committers-src.dot projects/pmac_pmu/share/mk/bsd.own.mk projects/pmac_pmu/share/mk/bsd.sys.mk projects/pmac_pmu/share/mk/bsd.test.mk projects/pmac_pmu/sys/Makefile projects/pmac_pmu/sys/amd64/amd64/identcpu.c projects/pmac_pmu/sys/amd64/amd64/machdep.c projects/pmac_pmu/sys/amd64/amd64/mp_machdep.c projects/pmac_pmu/sys/amd64/amd64/pmap.c projects/pmac_pmu/sys/amd64/conf/NOTES projects/pmac_pmu/sys/amd64/include/cpu.h projects/pmac_pmu/sys/amd64/include/pmap.h projects/pmac_pmu/sys/amd64/include/vmm.h (contents, props changed) projects/pmac_pmu/sys/amd64/include/vmm_dev.h (contents, props changed) projects/pmac_pmu/sys/amd64/vmm/amd/amdv.c projects/pmac_pmu/sys/amd64/vmm/intel/ept.c projects/pmac_pmu/sys/amd64/vmm/intel/ept.h projects/pmac_pmu/sys/amd64/vmm/intel/vmcs.c projects/pmac_pmu/sys/amd64/vmm/intel/vmcs.h projects/pmac_pmu/sys/amd64/vmm/intel/vmx.c projects/pmac_pmu/sys/amd64/vmm/intel/vmx.h projects/pmac_pmu/sys/amd64/vmm/intel/vmx_controls.h projects/pmac_pmu/sys/amd64/vmm/intel/vmx_genassym.c projects/pmac_pmu/sys/amd64/vmm/intel/vmx_support.S projects/pmac_pmu/sys/amd64/vmm/io/ppt.c projects/pmac_pmu/sys/amd64/vmm/io/ppt.h projects/pmac_pmu/sys/amd64/vmm/io/vhpet.c projects/pmac_pmu/sys/amd64/vmm/io/vioapic.c projects/pmac_pmu/sys/amd64/vmm/io/vlapic.c projects/pmac_pmu/sys/amd64/vmm/io/vlapic.h projects/pmac_pmu/sys/amd64/vmm/vmm.c projects/pmac_pmu/sys/amd64/vmm/vmm_dev.c projects/pmac_pmu/sys/amd64/vmm/vmm_ipi.c projects/pmac_pmu/sys/amd64/vmm/vmm_ipi.h projects/pmac_pmu/sys/amd64/vmm/vmm_lapic.c projects/pmac_pmu/sys/amd64/vmm/vmm_lapic.h projects/pmac_pmu/sys/arm/allwinner/a10_machdep.c projects/pmac_pmu/sys/arm/arm/bus_space_generic.c projects/pmac_pmu/sys/arm/arm/cpufunc.c projects/pmac_pmu/sys/arm/arm/devmap.c projects/pmac_pmu/sys/arm/arm/elf_trampoline.c projects/pmac_pmu/sys/arm/arm/gic.c projects/pmac_pmu/sys/arm/arm/identcpu.c projects/pmac_pmu/sys/arm/arm/intr.c projects/pmac_pmu/sys/arm/arm/locore.S projects/pmac_pmu/sys/arm/arm/machdep.c projects/pmac_pmu/sys/arm/arm/nexus.c projects/pmac_pmu/sys/arm/arm/pmap-v6.c projects/pmac_pmu/sys/arm/arm/swtch.S projects/pmac_pmu/sys/arm/arm/trap.c projects/pmac_pmu/sys/arm/at91/at91.c projects/pmac_pmu/sys/arm/at91/uart_dev_at91usart.c projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/pmac_pmu/sys/arm/broadcom/bcm2835/files.bcm2835 projects/pmac_pmu/sys/arm/conf/AC100 projects/pmac_pmu/sys/arm/conf/ARMADAXP projects/pmac_pmu/sys/arm/conf/ARNDALE projects/pmac_pmu/sys/arm/conf/ATMEL projects/pmac_pmu/sys/arm/conf/AVILA projects/pmac_pmu/sys/arm/conf/BWCT projects/pmac_pmu/sys/arm/conf/CAMBRIA projects/pmac_pmu/sys/arm/conf/CNS11XXNAS projects/pmac_pmu/sys/arm/conf/COSMIC projects/pmac_pmu/sys/arm/conf/CUBIEBOARD projects/pmac_pmu/sys/arm/conf/CUBIEBOARD2 projects/pmac_pmu/sys/arm/conf/DB-78XXX projects/pmac_pmu/sys/arm/conf/DB-88F5XXX projects/pmac_pmu/sys/arm/conf/DB-88F6XXX projects/pmac_pmu/sys/arm/conf/DIGI-CCWMX53 projects/pmac_pmu/sys/arm/conf/DOCKSTAR projects/pmac_pmu/sys/arm/conf/EA3250 projects/pmac_pmu/sys/arm/conf/EB9200 projects/pmac_pmu/sys/arm/conf/EFIKA_MX projects/pmac_pmu/sys/arm/conf/ETHERNUT5 projects/pmac_pmu/sys/arm/conf/HL200 projects/pmac_pmu/sys/arm/conf/HL201 projects/pmac_pmu/sys/arm/conf/IMX53-QSB projects/pmac_pmu/sys/arm/conf/KB920X projects/pmac_pmu/sys/arm/conf/LN2410SBC projects/pmac_pmu/sys/arm/conf/NSLU projects/pmac_pmu/sys/arm/conf/PANDABOARD projects/pmac_pmu/sys/arm/conf/QILA9G20 projects/pmac_pmu/sys/arm/conf/RADXA projects/pmac_pmu/sys/arm/conf/RPI-B projects/pmac_pmu/sys/arm/conf/SAM9260EK projects/pmac_pmu/sys/arm/conf/SAM9G20EK projects/pmac_pmu/sys/arm/conf/SAM9X25EK projects/pmac_pmu/sys/arm/conf/SHEEVAPLUG projects/pmac_pmu/sys/arm/conf/SN9G45 projects/pmac_pmu/sys/arm/conf/TS7800 projects/pmac_pmu/sys/arm/conf/ZEDBOARD projects/pmac_pmu/sys/arm/freescale/imx/files.imx51 projects/pmac_pmu/sys/arm/freescale/imx/imx51_ipuv3.c projects/pmac_pmu/sys/arm/include/armreg.h projects/pmac_pmu/sys/arm/include/cpuconf.h projects/pmac_pmu/sys/arm/include/cpufunc.h projects/pmac_pmu/sys/arm/include/devmap.h projects/pmac_pmu/sys/arm/include/fdt.h projects/pmac_pmu/sys/arm/include/intr.h projects/pmac_pmu/sys/arm/include/md_var.h projects/pmac_pmu/sys/arm/include/ofw_machdep.h projects/pmac_pmu/sys/arm/include/psl.h projects/pmac_pmu/sys/arm/lpc/lpc_gpio.c projects/pmac_pmu/sys/arm/lpc/lpc_machdep.c projects/pmac_pmu/sys/arm/lpc/lpc_mmc.c projects/pmac_pmu/sys/arm/lpc/lpcreg.h projects/pmac_pmu/sys/arm/mv/mv_machdep.c projects/pmac_pmu/sys/arm/mv/mv_pci.c projects/pmac_pmu/sys/arm/mv/mvvar.h projects/pmac_pmu/sys/arm/tegra/files.tegra2 projects/pmac_pmu/sys/arm/tegra/tegra2_machdep.c projects/pmac_pmu/sys/arm/ti/am335x/am335x_dmtimer.c projects/pmac_pmu/sys/arm/ti/ti_machdep.c projects/pmac_pmu/sys/arm/versatile/sp804.c projects/pmac_pmu/sys/boot/fdt/dts/cubieboard.dts projects/pmac_pmu/sys/boot/fdt/dts/cubieboard2.dts projects/pmac_pmu/sys/boot/fdt/dts/dockstar.dts projects/pmac_pmu/sys/boot/ficl/Makefile projects/pmac_pmu/sys/boot/i386/Makefile.inc projects/pmac_pmu/sys/boot/i386/boot2/Makefile projects/pmac_pmu/sys/boot/i386/gptboot/Makefile projects/pmac_pmu/sys/boot/i386/gptzfsboot/Makefile projects/pmac_pmu/sys/boot/i386/zfsboot/Makefile projects/pmac_pmu/sys/boot/ia64/efi/version projects/pmac_pmu/sys/boot/pc98/Makefile.inc projects/pmac_pmu/sys/boot/pc98/boot2/Makefile projects/pmac_pmu/sys/boot/usb/Makefile projects/pmac_pmu/sys/boot/usb/Makefile.test projects/pmac_pmu/sys/boot/userboot/ficl/Makefile projects/pmac_pmu/sys/boot/userboot/libstand/Makefile projects/pmac_pmu/sys/boot/zfs/Makefile projects/pmac_pmu/sys/boot/zfs/zfsimpl.c projects/pmac_pmu/sys/cam/cam.h projects/pmac_pmu/sys/cam/cam_ccb.h projects/pmac_pmu/sys/cam/cam_compat.c projects/pmac_pmu/sys/cam/cam_compat.h projects/pmac_pmu/sys/cam/cam_debug.h projects/pmac_pmu/sys/cam/cam_periph.c projects/pmac_pmu/sys/cam/cam_periph.h projects/pmac_pmu/sys/cam/cam_xpt.c projects/pmac_pmu/sys/cam/scsi/scsi_da.c projects/pmac_pmu/sys/cam/scsi/scsi_low.c projects/pmac_pmu/sys/cam/scsi/scsi_xpt.c projects/pmac_pmu/sys/cddl/boot/zfs/zfsimpl.h projects/pmac_pmu/sys/cddl/compat/opensolaris/sys/time.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/pmac_pmu/sys/cddl/dev/dtrace/dtrace_load.c projects/pmac_pmu/sys/cddl/dev/fbt/fbt_powerpc.c projects/pmac_pmu/sys/compat/freebsd32/freebsd32_misc.c projects/pmac_pmu/sys/conf/files projects/pmac_pmu/sys/conf/files.arm projects/pmac_pmu/sys/conf/kern.mk projects/pmac_pmu/sys/conf/kern.pre.mk projects/pmac_pmu/sys/conf/options projects/pmac_pmu/sys/conf/options.arm projects/pmac_pmu/sys/dev/aac/aac.c projects/pmac_pmu/sys/dev/aacraid/aacraid.c projects/pmac_pmu/sys/dev/advansys/adwcam.c projects/pmac_pmu/sys/dev/ae/if_ae.c projects/pmac_pmu/sys/dev/ahci/ahci.c projects/pmac_pmu/sys/dev/aic7xxx/aic79xx.c projects/pmac_pmu/sys/dev/aic7xxx/aic7xxx.c projects/pmac_pmu/sys/dev/ale/if_ale.c projects/pmac_pmu/sys/dev/an/if_an.c projects/pmac_pmu/sys/dev/an/if_an_pccard.c projects/pmac_pmu/sys/dev/arcmsr/arcmsr.c projects/pmac_pmu/sys/dev/arcmsr/arcmsr.h projects/pmac_pmu/sys/dev/ath/if_ath_rx_edma.c projects/pmac_pmu/sys/dev/ath/if_ath_tx.c projects/pmac_pmu/sys/dev/bge/if_bge.c projects/pmac_pmu/sys/dev/bwi/if_bwi.c projects/pmac_pmu/sys/dev/bwn/if_bwn.c projects/pmac_pmu/sys/dev/bxe/bxe.c projects/pmac_pmu/sys/dev/bxe/ecore_hsi.h projects/pmac_pmu/sys/dev/bxe/ecore_sp.c projects/pmac_pmu/sys/dev/cxgb/common/cxgb_mc5.c projects/pmac_pmu/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/pmac_pmu/sys/dev/cxgbe/adapter.h projects/pmac_pmu/sys/dev/cxgbe/t4_main.c projects/pmac_pmu/sys/dev/cxgbe/t4_sge.c projects/pmac_pmu/sys/dev/cxgbe/tom/t4_listen.c projects/pmac_pmu/sys/dev/cxgbe/tom/t4_tom.h projects/pmac_pmu/sys/dev/drm/mach64_dma.c projects/pmac_pmu/sys/dev/drm2/drm_edid.c projects/pmac_pmu/sys/dev/drm2/radeon/radeon_fence.c projects/pmac_pmu/sys/dev/drm2/radeon/radeon_sa.c projects/pmac_pmu/sys/dev/drm2/ttm/ttm_bo.c projects/pmac_pmu/sys/dev/drm2/ttm/ttm_bo_vm.c projects/pmac_pmu/sys/dev/drm2/ttm/ttm_lock.c projects/pmac_pmu/sys/dev/e1000/if_em.c projects/pmac_pmu/sys/dev/e1000/if_igb.c projects/pmac_pmu/sys/dev/e1000/if_lem.c projects/pmac_pmu/sys/dev/ed/if_ed.c projects/pmac_pmu/sys/dev/ed/if_ed_3c503.c projects/pmac_pmu/sys/dev/ed/if_ed_pccard.c projects/pmac_pmu/sys/dev/ed/if_ed_rtl80x9.c projects/pmac_pmu/sys/dev/ed/if_edreg.h projects/pmac_pmu/sys/dev/ed/if_edvar.h projects/pmac_pmu/sys/dev/ed/tc5299jreg.h projects/pmac_pmu/sys/dev/en/midway.c projects/pmac_pmu/sys/dev/fb/boot_font.c projects/pmac_pmu/sys/dev/fb/fbd.c projects/pmac_pmu/sys/dev/fb/gallant12x22.c projects/pmac_pmu/sys/dev/fdt/fdt_common.c projects/pmac_pmu/sys/dev/fdt/fdt_common.h projects/pmac_pmu/sys/dev/fdt/fdt_mips.c projects/pmac_pmu/sys/dev/fdt/fdt_powerpc.c projects/pmac_pmu/sys/dev/fdt/fdt_x86.c projects/pmac_pmu/sys/dev/fdt/fdtbus.c projects/pmac_pmu/sys/dev/fdt/simplebus.c projects/pmac_pmu/sys/dev/ffec/if_ffec.c projects/pmac_pmu/sys/dev/firewire/if_fwe.c projects/pmac_pmu/sys/dev/hwpmc/hwpmc_core.c projects/pmac_pmu/sys/dev/hwpmc/hwpmc_core.h projects/pmac_pmu/sys/dev/hwpmc/hwpmc_intel.c projects/pmac_pmu/sys/dev/hwpmc/hwpmc_powerpc.c projects/pmac_pmu/sys/dev/ie/if_ie.c projects/pmac_pmu/sys/dev/ipw/if_ipw.c projects/pmac_pmu/sys/dev/ipw/if_ipwvar.h projects/pmac_pmu/sys/dev/iscsi/icl.c projects/pmac_pmu/sys/dev/isp/isp.c projects/pmac_pmu/sys/dev/isp/isp_freebsd.c projects/pmac_pmu/sys/dev/iwi/if_iwi.c projects/pmac_pmu/sys/dev/iwi/if_iwivar.h projects/pmac_pmu/sys/dev/iwn/if_iwn.c projects/pmac_pmu/sys/dev/iwn/if_iwn_chip_cfg.h projects/pmac_pmu/sys/dev/iwn/if_iwn_devid.h projects/pmac_pmu/sys/dev/iwn/if_iwnvar.h projects/pmac_pmu/sys/dev/ixgbe/ixgbe.c projects/pmac_pmu/sys/dev/malo/if_malo.c projects/pmac_pmu/sys/dev/mcd/mcd.c projects/pmac_pmu/sys/dev/mfi/mfi_cam.c projects/pmac_pmu/sys/dev/mpt/mpt.h projects/pmac_pmu/sys/dev/mpt/mpt_cam.c projects/pmac_pmu/sys/dev/mpt/mpt_pci.c projects/pmac_pmu/sys/dev/mpt/mpt_raid.c projects/pmac_pmu/sys/dev/mwl/if_mwl.c projects/pmac_pmu/sys/dev/my/if_my.c projects/pmac_pmu/sys/dev/nand/nand_id.c projects/pmac_pmu/sys/dev/nand/nandbus.c projects/pmac_pmu/sys/dev/netmap/if_em_netmap.h projects/pmac_pmu/sys/dev/netmap/if_igb_netmap.h projects/pmac_pmu/sys/dev/netmap/if_lem_netmap.h projects/pmac_pmu/sys/dev/netmap/if_re_netmap.h projects/pmac_pmu/sys/dev/netmap/ixgbe_netmap.h projects/pmac_pmu/sys/dev/netmap/netmap.c projects/pmac_pmu/sys/dev/netmap/netmap_kern.h projects/pmac_pmu/sys/dev/netmap/netmap_mem2.c projects/pmac_pmu/sys/dev/netmap/netmap_mem2.h projects/pmac_pmu/sys/dev/nmdm/nmdm.c projects/pmac_pmu/sys/dev/nvme/nvme_ctrlr.c projects/pmac_pmu/sys/dev/oce/oce_if.c projects/pmac_pmu/sys/dev/ofw/ofw_bus_subr.c projects/pmac_pmu/sys/dev/ofw/ofw_bus_subr.h projects/pmac_pmu/sys/dev/ofw/ofw_console.c projects/pmac_pmu/sys/dev/pci/vga_pci.c projects/pmac_pmu/sys/dev/ral/if_ral_pci.c projects/pmac_pmu/sys/dev/ral/rt2560.c projects/pmac_pmu/sys/dev/ral/rt2661.c projects/pmac_pmu/sys/dev/ral/rt2860.c projects/pmac_pmu/sys/dev/scc/scc_dev_z8530.c projects/pmac_pmu/sys/dev/sk/if_sk.c projects/pmac_pmu/sys/dev/sound/pci/maestro.c projects/pmac_pmu/sys/dev/sym/sym_hipd.c projects/pmac_pmu/sys/dev/syscons/scterm-teken.c projects/pmac_pmu/sys/dev/tpm/tpm.c projects/pmac_pmu/sys/dev/uart/uart_bus_fdt.c projects/pmac_pmu/sys/dev/uart/uart_bus_pci.c projects/pmac_pmu/sys/dev/uart/uart_cpu.h projects/pmac_pmu/sys/dev/uart/uart_dev_lpc.c projects/pmac_pmu/sys/dev/uart/uart_tty.c projects/pmac_pmu/sys/dev/usb/controller/ehci.c projects/pmac_pmu/sys/dev/usb/controller/uhci.c projects/pmac_pmu/sys/dev/usb/controller/xhci.c projects/pmac_pmu/sys/dev/usb/net/uhso.c projects/pmac_pmu/sys/dev/usb/quirk/usb_quirk.c projects/pmac_pmu/sys/dev/usb/serial/u3g.c projects/pmac_pmu/sys/dev/usb/serial/umcs.c projects/pmac_pmu/sys/dev/usb/usb_device.c projects/pmac_pmu/sys/dev/usb/usb_device.h projects/pmac_pmu/sys/dev/usb/usb_hub.c projects/pmac_pmu/sys/dev/usb/usb_hub.h projects/pmac_pmu/sys/dev/usb/usb_request.c projects/pmac_pmu/sys/dev/usb/usb_transfer.c projects/pmac_pmu/sys/dev/usb/usbdevs projects/pmac_pmu/sys/dev/usb/wlan/if_rsu.c projects/pmac_pmu/sys/dev/usb/wlan/if_rum.c projects/pmac_pmu/sys/dev/usb/wlan/if_run.c projects/pmac_pmu/sys/dev/usb/wlan/if_runreg.h projects/pmac_pmu/sys/dev/usb/wlan/if_runvar.h projects/pmac_pmu/sys/dev/usb/wlan/if_uath.c projects/pmac_pmu/sys/dev/usb/wlan/if_upgt.c projects/pmac_pmu/sys/dev/usb/wlan/if_ural.c projects/pmac_pmu/sys/dev/usb/wlan/if_urtw.c projects/pmac_pmu/sys/dev/usb/wlan/if_urtwn.c projects/pmac_pmu/sys/dev/usb/wlan/if_zyd.c projects/pmac_pmu/sys/dev/virtio/block/virtio_blk.c projects/pmac_pmu/sys/dev/virtio/scsi/virtio_scsi.c projects/pmac_pmu/sys/dev/vt/font/vt_font_default.c projects/pmac_pmu/sys/dev/vt/hw/fb/vt_fb.c projects/pmac_pmu/sys/dev/vt/hw/vga/vga.c projects/pmac_pmu/sys/dev/vt/hw/xboxfb/xboxfb.c projects/pmac_pmu/sys/dev/vt/vt.h projects/pmac_pmu/sys/dev/vt/vt_consolectl.c projects/pmac_pmu/sys/dev/vt/vt_core.c projects/pmac_pmu/sys/dev/vt/vt_font.c projects/pmac_pmu/sys/dev/vt/vt_sysmouse.c projects/pmac_pmu/sys/dev/vxge/vxgehal/vxgehal-ring.c projects/pmac_pmu/sys/dev/wi/if_wi.c projects/pmac_pmu/sys/dev/wpi/if_wpi.c projects/pmac_pmu/sys/dev/wpi/if_wpivar.h projects/pmac_pmu/sys/fs/ext2fs/ext2_hash.c projects/pmac_pmu/sys/fs/ext2fs/ext2_inode_cnv.c projects/pmac_pmu/sys/fs/fifofs/fifo_vnops.c projects/pmac_pmu/sys/fs/nfs/nfs_commonsubs.c projects/pmac_pmu/sys/fs/nfs/nfs_var.h projects/pmac_pmu/sys/fs/nfs/nfsrvcache.h projects/pmac_pmu/sys/fs/nfsclient/nfs_clstate.c projects/pmac_pmu/sys/fs/nfsserver/nfs_fha_new.c projects/pmac_pmu/sys/fs/nfsserver/nfs_nfsdcache.c projects/pmac_pmu/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/pmac_pmu/sys/fs/nfsserver/nfs_nfsdport.c projects/pmac_pmu/sys/fs/nfsserver/nfs_nfsdstate.c projects/pmac_pmu/sys/fs/nfsserver/nfs_nfsdsubs.c projects/pmac_pmu/sys/geom/eli/g_eli.c projects/pmac_pmu/sys/geom/eli/g_eli_crypto.c projects/pmac_pmu/sys/geom/mirror/g_mirror.c projects/pmac_pmu/sys/geom/mirror/g_mirror.h projects/pmac_pmu/sys/geom/mirror/g_mirror_ctl.c projects/pmac_pmu/sys/geom/part/g_part.c projects/pmac_pmu/sys/geom/part/g_part.h projects/pmac_pmu/sys/geom/part/g_part_gpt.c projects/pmac_pmu/sys/geom/uncompress/g_uncompress.c projects/pmac_pmu/sys/i386/i386/identcpu.c projects/pmac_pmu/sys/ia64/ia64/dump_machdep.c projects/pmac_pmu/sys/ia64/include/atomic.h projects/pmac_pmu/sys/kern/capabilities.conf projects/pmac_pmu/sys/kern/init_sysent.c projects/pmac_pmu/sys/kern/kern_clocksource.c projects/pmac_pmu/sys/kern/kern_cons.c projects/pmac_pmu/sys/kern/kern_descrip.c projects/pmac_pmu/sys/kern/kern_event.c projects/pmac_pmu/sys/kern/kern_exit.c projects/pmac_pmu/sys/kern/kern_fork.c projects/pmac_pmu/sys/kern/kern_jail.c projects/pmac_pmu/sys/kern/kern_linker.c projects/pmac_pmu/sys/kern/kern_rwlock.c projects/pmac_pmu/sys/kern/makesyscalls.sh projects/pmac_pmu/sys/kern/sched_4bsd.c projects/pmac_pmu/sys/kern/sched_ule.c projects/pmac_pmu/sys/kern/subr_sglist.c projects/pmac_pmu/sys/kern/subr_terminal.c projects/pmac_pmu/sys/kern/subr_trap.c projects/pmac_pmu/sys/kern/subr_witness.c projects/pmac_pmu/sys/kern/tty.c projects/pmac_pmu/sys/kern/uipc_syscalls.c projects/pmac_pmu/sys/kern/vfs_bio.c projects/pmac_pmu/sys/kern/vfs_cache.c projects/pmac_pmu/sys/kern/vfs_mountroot.c projects/pmac_pmu/sys/kern/vfs_vnops.c projects/pmac_pmu/sys/mips/conf/TP-WN1043ND.hints projects/pmac_pmu/sys/mips/include/fdt.h projects/pmac_pmu/sys/modules/aic7xxx/Makefile projects/pmac_pmu/sys/modules/aic7xxx/ahc/Makefile projects/pmac_pmu/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile projects/pmac_pmu/sys/modules/aic7xxx/ahc/ahc_isa/Makefile projects/pmac_pmu/sys/modules/aic7xxx/ahc/ahc_pci/Makefile projects/pmac_pmu/sys/modules/aic7xxx/ahd/Makefile projects/pmac_pmu/sys/modules/ath/Makefile projects/pmac_pmu/sys/modules/drm2/i915kms/Makefile projects/pmac_pmu/sys/modules/drm2/radeonkms/Makefile projects/pmac_pmu/sys/modules/geom/Makefile projects/pmac_pmu/sys/modules/geom/geom_uncompress/Makefile projects/pmac_pmu/sys/modules/ibcore/Makefile projects/pmac_pmu/sys/modules/ipfilter/Makefile projects/pmac_pmu/sys/modules/ipoib/Makefile projects/pmac_pmu/sys/modules/iwnfw/Makefile projects/pmac_pmu/sys/modules/mlx4/Makefile projects/pmac_pmu/sys/modules/mlx4ib/Makefile projects/pmac_pmu/sys/modules/mlxen/Makefile projects/pmac_pmu/sys/modules/mthca/Makefile projects/pmac_pmu/sys/modules/netmap/Makefile projects/pmac_pmu/sys/modules/wlan/Makefile projects/pmac_pmu/sys/net/ieee8023ad_lacp.c projects/pmac_pmu/sys/net/if.c projects/pmac_pmu/sys/net/if_lagg.c projects/pmac_pmu/sys/net/if_lagg.h projects/pmac_pmu/sys/net/if_tap.c projects/pmac_pmu/sys/net/if_tun.c projects/pmac_pmu/sys/net/netmap.h projects/pmac_pmu/sys/net/netmap_user.h projects/pmac_pmu/sys/net/radix.c projects/pmac_pmu/sys/net/radix.h projects/pmac_pmu/sys/net/radix_mpath.c projects/pmac_pmu/sys/net/route.c projects/pmac_pmu/sys/net/route.h projects/pmac_pmu/sys/net/rtsock.c projects/pmac_pmu/sys/net/sff8472.h projects/pmac_pmu/sys/net80211/ieee80211.h projects/pmac_pmu/sys/net80211/ieee80211_adhoc.c projects/pmac_pmu/sys/net80211/ieee80211_hostap.c projects/pmac_pmu/sys/net80211/ieee80211_mesh.c projects/pmac_pmu/sys/net80211/ieee80211_output.c projects/pmac_pmu/sys/net80211/ieee80211_proto.c projects/pmac_pmu/sys/net80211/ieee80211_sta.c projects/pmac_pmu/sys/net80211/ieee80211_wds.c projects/pmac_pmu/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/pmac_pmu/sys/netgraph/netflow/netflow.c projects/pmac_pmu/sys/netgraph/netflow/netflow_v9.c projects/pmac_pmu/sys/netgraph/netflow/ng_netflow.c projects/pmac_pmu/sys/netgraph/netflow/ng_netflow.h projects/pmac_pmu/sys/netgraph/ng_base.c projects/pmac_pmu/sys/netgraph/ng_ksocket.c projects/pmac_pmu/sys/netgraph/ng_l2tp.c projects/pmac_pmu/sys/netinet/if_ether.c projects/pmac_pmu/sys/netinet/in.c projects/pmac_pmu/sys/netinet/in.h projects/pmac_pmu/sys/netinet/in_mcast.c projects/pmac_pmu/sys/netinet/ip_carp.c projects/pmac_pmu/sys/netinet/ip_output.c projects/pmac_pmu/sys/netinet/libalias/alias.c projects/pmac_pmu/sys/netinet/libalias/alias_cuseeme.c projects/pmac_pmu/sys/netinet/libalias/alias_db.c projects/pmac_pmu/sys/netinet/libalias/alias_dummy.c projects/pmac_pmu/sys/netinet/libalias/alias_irc.c projects/pmac_pmu/sys/netinet/libalias/alias_mod.c projects/pmac_pmu/sys/netinet/libalias/alias_mod.h projects/pmac_pmu/sys/netinet/libalias/alias_nbt.c projects/pmac_pmu/sys/netinet/libalias/alias_pptp.c projects/pmac_pmu/sys/netinet/libalias/alias_skinny.c projects/pmac_pmu/sys/netinet/libalias/alias_smedia.c projects/pmac_pmu/sys/netinet/libalias/libalias.3 projects/pmac_pmu/sys/netinet/sctp_usrreq.c projects/pmac_pmu/sys/netinet/sctputil.c projects/pmac_pmu/sys/netinet/tcp_input.c projects/pmac_pmu/sys/netinet6/in6.c projects/pmac_pmu/sys/netinet6/in6_ifattach.c projects/pmac_pmu/sys/netinet6/in6_mcast.c projects/pmac_pmu/sys/netinet6/in6_src.c projects/pmac_pmu/sys/netinet6/in6_var.h projects/pmac_pmu/sys/netinet6/ip6_mroute.c projects/pmac_pmu/sys/netinet6/ip6_mroute.h projects/pmac_pmu/sys/netinet6/mld6.c projects/pmac_pmu/sys/netinet6/nd6.c projects/pmac_pmu/sys/netinet6/nd6_nbr.c projects/pmac_pmu/sys/netinet6/nd6_rtr.c projects/pmac_pmu/sys/netinet6/send.c projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_dynamic.c projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_table.c projects/pmac_pmu/sys/netpfil/pf/pf.c projects/pmac_pmu/sys/netpfil/pf/pf.h projects/pmac_pmu/sys/netpfil/pf/pf_lb.c projects/pmac_pmu/sys/nfs/nfs_fha.c projects/pmac_pmu/sys/nfs/nfs_fha.h projects/pmac_pmu/sys/nfsserver/nfs_fha_old.c projects/pmac_pmu/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/pmac_pmu/sys/ofed/drivers/net/mlx4/Makefile projects/pmac_pmu/sys/ofed/drivers/net/mlx4/en_netdev.c projects/pmac_pmu/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/pmac_pmu/sys/powerpc/aim/trap_subr32.S projects/pmac_pmu/sys/powerpc/aim/trap_subr64.S projects/pmac_pmu/sys/powerpc/include/pmc_mdep.h projects/pmac_pmu/sys/powerpc/ofw/ofw_pci.c projects/pmac_pmu/sys/powerpc/ofw/ofw_pcib_pci.c projects/pmac_pmu/sys/powerpc/powermac/atibl.c projects/pmac_pmu/sys/powerpc/powermac/macgpio.c projects/pmac_pmu/sys/powerpc/powerpc/bus_machdep.c projects/pmac_pmu/sys/powerpc/pseries/phyp_vscsi.c projects/pmac_pmu/sys/rpc/clnt_dg.c projects/pmac_pmu/sys/rpc/clnt_vc.c projects/pmac_pmu/sys/rpc/rpcb_clnt.c projects/pmac_pmu/sys/rpc/svc.c projects/pmac_pmu/sys/rpc/svc.h projects/pmac_pmu/sys/rpc/svc_dg.c projects/pmac_pmu/sys/rpc/svc_vc.c projects/pmac_pmu/sys/security/mac/mac_framework.c projects/pmac_pmu/sys/sparc64/ebus/ebus.c projects/pmac_pmu/sys/sparc64/isa/ofw_isa.c projects/pmac_pmu/sys/sparc64/pci/fire.c projects/pmac_pmu/sys/sparc64/pci/ofw_pcib_subr.c projects/pmac_pmu/sys/sparc64/pci/psycho.c projects/pmac_pmu/sys/sparc64/pci/schizo.c projects/pmac_pmu/sys/sys/consio.h projects/pmac_pmu/sys/sys/copyright.h projects/pmac_pmu/sys/sys/dtrace_bsd.h projects/pmac_pmu/sys/sys/event.h projects/pmac_pmu/sys/sys/fbio.h projects/pmac_pmu/sys/sys/gpt.h projects/pmac_pmu/sys/sys/param.h projects/pmac_pmu/sys/sys/pctrie.h projects/pmac_pmu/sys/sys/pmckern.h projects/pmac_pmu/sys/sys/sglist.h projects/pmac_pmu/sys/sys/terminal.h projects/pmac_pmu/sys/sys/tty.h projects/pmac_pmu/sys/sys/user.h projects/pmac_pmu/sys/teken/demo/teken_demo.c projects/pmac_pmu/sys/teken/teken.h projects/pmac_pmu/sys/teken/teken_subr.h projects/pmac_pmu/sys/ufs/ffs/ffs_alloc.c projects/pmac_pmu/sys/ufs/ufs/ufs_quota.c projects/pmac_pmu/sys/vm/vm_map.c projects/pmac_pmu/sys/vm/vm_page.c projects/pmac_pmu/sys/vm/vm_page.h projects/pmac_pmu/sys/vm/vm_pageout.c projects/pmac_pmu/sys/vm/vm_phys.c projects/pmac_pmu/sys/vm/vm_reserv.c projects/pmac_pmu/sys/x86/acpica/acpi_wakeup.c projects/pmac_pmu/sys/x86/include/fdt.h projects/pmac_pmu/sys/x86/include/ofw_machdep.h projects/pmac_pmu/sys/x86/x86/mca.c projects/pmac_pmu/tools/build/mk/OptionalObsoleteFiles.inc projects/pmac_pmu/tools/regression/capsicum/libcapsicum/Makefile projects/pmac_pmu/tools/regression/capsicum/libcapsicum/dns.c projects/pmac_pmu/tools/regression/capsicum/libcapsicum/grp.c projects/pmac_pmu/tools/regression/capsicum/libcapsicum/pwd.c projects/pmac_pmu/tools/regression/capsicum/libcapsicum/sysctl.c projects/pmac_pmu/tools/test/dtrace/Makefile projects/pmac_pmu/tools/tools/ath/athstats/Makefile projects/pmac_pmu/tools/tools/net80211/stumbler/stumbler.c projects/pmac_pmu/tools/tools/net80211/w00t/ap/ap.c projects/pmac_pmu/tools/tools/net80211/w00t/assoc/assoc.c projects/pmac_pmu/tools/tools/net80211/w00t/expand/expand.c projects/pmac_pmu/tools/tools/net80211/w00t/prga/prga.c projects/pmac_pmu/tools/tools/net80211/w00t/redir/redir.c projects/pmac_pmu/tools/tools/net80211/wesside/wesside/wesside.c projects/pmac_pmu/tools/tools/net80211/wlaninject/wlaninject.c projects/pmac_pmu/tools/tools/net80211/wlanstats/Makefile projects/pmac_pmu/tools/tools/netmap/bridge.c projects/pmac_pmu/tools/tools/netmap/nm_util.c projects/pmac_pmu/tools/tools/netmap/nm_util.h projects/pmac_pmu/tools/tools/netmap/pcap.c projects/pmac_pmu/tools/tools/netmap/pkt-gen.c projects/pmac_pmu/tools/tools/netmap/vale-ctl.c projects/pmac_pmu/tools/tools/usbtest/usb_msc_test.c projects/pmac_pmu/tools/tools/usbtest/usb_msc_test.h projects/pmac_pmu/tools/tools/vt/fontcvt/fontcvt.c projects/pmac_pmu/tools/tools/vt/mkkfont/mkkfont.c projects/pmac_pmu/tools/tools/vt/setfont/setfont.c projects/pmac_pmu/usr.bin/atf/atf-sh/Makefile projects/pmac_pmu/usr.bin/atf/atf-sh/tests/Makefile projects/pmac_pmu/usr.bin/clang/clang/Makefile projects/pmac_pmu/usr.bin/clang/llc/Makefile projects/pmac_pmu/usr.bin/clang/lldb/Makefile projects/pmac_pmu/usr.bin/clang/llvm-mc/Makefile projects/pmac_pmu/usr.bin/clang/llvm-objdump/Makefile projects/pmac_pmu/usr.bin/clang/llvm-rtdyld/Makefile projects/pmac_pmu/usr.bin/clang/opt/Makefile projects/pmac_pmu/usr.bin/find/find.1 projects/pmac_pmu/usr.bin/find/function.c projects/pmac_pmu/usr.bin/iscsictl/iscsictl.8 projects/pmac_pmu/usr.bin/kdump/Makefile projects/pmac_pmu/usr.bin/kdump/kdump.c projects/pmac_pmu/usr.bin/mkcsmapper/Makefile.inc projects/pmac_pmu/usr.bin/netstat/if.c projects/pmac_pmu/usr.bin/netstat/main.c projects/pmac_pmu/usr.bin/netstat/mroute.c projects/pmac_pmu/usr.bin/netstat/mroute6.c projects/pmac_pmu/usr.bin/netstat/netgraph.c projects/pmac_pmu/usr.bin/netstat/netstat.1 projects/pmac_pmu/usr.bin/netstat/netstat.h projects/pmac_pmu/usr.bin/netstat/route.c projects/pmac_pmu/usr.bin/rpcgen/rpc_main.c projects/pmac_pmu/usr.bin/sort/radixsort.c projects/pmac_pmu/usr.bin/whois/whois.c projects/pmac_pmu/usr.sbin/bhyve/Makefile projects/pmac_pmu/usr.sbin/bhyve/acpi.c projects/pmac_pmu/usr.sbin/bhyve/acpi.h projects/pmac_pmu/usr.sbin/bhyve/atpic.c projects/pmac_pmu/usr.sbin/bhyve/bhyve.8 projects/pmac_pmu/usr.sbin/bhyve/bhyverun.c projects/pmac_pmu/usr.sbin/bhyve/elcr.c projects/pmac_pmu/usr.sbin/bhyve/inout.h projects/pmac_pmu/usr.sbin/bhyve/mevent.c projects/pmac_pmu/usr.sbin/bhyve/mevent.h projects/pmac_pmu/usr.sbin/bhyve/mptbl.c projects/pmac_pmu/usr.sbin/bhyve/pci_emul.c projects/pmac_pmu/usr.sbin/bhyve/pci_emul.h projects/pmac_pmu/usr.sbin/bhyve/pci_lpc.c projects/pmac_pmu/usr.sbin/bhyve/pci_lpc.h projects/pmac_pmu/usr.sbin/bhyve/pci_passthru.c projects/pmac_pmu/usr.sbin/bhyve/pit_8254.c projects/pmac_pmu/usr.sbin/bhyve/pmtmr.c projects/pmac_pmu/usr.sbin/bhyve/post.c projects/pmac_pmu/usr.sbin/bhyve/rtc.c projects/pmac_pmu/usr.sbin/bhyve/virtio.c projects/pmac_pmu/usr.sbin/bhyve/xmsr.c projects/pmac_pmu/usr.sbin/bhyve/xmsr.h projects/pmac_pmu/usr.sbin/bhyvectl/bhyvectl.c projects/pmac_pmu/usr.sbin/bsdconfig/share/packages/index.subr projects/pmac_pmu/usr.sbin/bsdinstall/scripts/auto projects/pmac_pmu/usr.sbin/bsdinstall/scripts/config projects/pmac_pmu/usr.sbin/bsdinstall/scripts/wlanconfig projects/pmac_pmu/usr.sbin/bsdinstall/scripts/zfsboot projects/pmac_pmu/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt projects/pmac_pmu/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c projects/pmac_pmu/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def projects/pmac_pmu/usr.sbin/crashinfo/crashinfo.sh projects/pmac_pmu/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/pmac_pmu/usr.sbin/makefs/cd9660/iso9660_rrip.h projects/pmac_pmu/usr.sbin/mfiutil/Makefile projects/pmac_pmu/usr.sbin/ndiscvt/ndisgen.sh projects/pmac_pmu/usr.sbin/pkg/pkg.c projects/pmac_pmu/usr.sbin/rpc.lockd/kern.c projects/pmac_pmu/usr.sbin/rpc.lockd/lock_proc.c projects/pmac_pmu/usr.sbin/rpc.lockd/lockd.c projects/pmac_pmu/usr.sbin/tcpdump/tcpdump/Makefile projects/pmac_pmu/usr.sbin/ypbind/yp_ping.c Directory Properties: projects/pmac_pmu/ (props changed) projects/pmac_pmu/cddl/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/pmac_pmu/contrib/atf/ (props changed) projects/pmac_pmu/contrib/binutils/ (props changed) projects/pmac_pmu/contrib/byacc/ (props changed) projects/pmac_pmu/contrib/file/ (props changed) projects/pmac_pmu/contrib/gcc/ (props changed) projects/pmac_pmu/contrib/libc++/ (props changed) projects/pmac_pmu/contrib/libpcap/ (props changed) projects/pmac_pmu/contrib/llvm/ (props changed) projects/pmac_pmu/contrib/llvm/tools/clang/ (props changed) projects/pmac_pmu/contrib/tcpdump/ (props changed) projects/pmac_pmu/contrib/tzcode/stdtime/ (props changed) projects/pmac_pmu/contrib/tzdata/ (props changed) projects/pmac_pmu/crypto/openssl/ (props changed) projects/pmac_pmu/etc/ (props changed) projects/pmac_pmu/gnu/lib/ (props changed) projects/pmac_pmu/gnu/usr.bin/gdb/ (props changed) projects/pmac_pmu/lib/libc/ (props changed) projects/pmac_pmu/lib/libvmmapi/ (props changed) projects/pmac_pmu/sbin/ (props changed) projects/pmac_pmu/sbin/ipfw/ (props changed) projects/pmac_pmu/share/man/man4/ (props changed) projects/pmac_pmu/sys/ (props changed) projects/pmac_pmu/sys/amd64/vmm/ (props changed) projects/pmac_pmu/sys/boot/ (props changed) projects/pmac_pmu/sys/boot/ia64/efi/ (props changed) projects/pmac_pmu/sys/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/sys/conf/ (props changed) projects/pmac_pmu/usr.sbin/bhyve/ (props changed) projects/pmac_pmu/usr.sbin/bhyvectl/ (props changed) projects/pmac_pmu/usr.sbin/ndiscvt/ (props changed) Modified: projects/pmac_pmu/COPYRIGHT ============================================================================== --- projects/pmac_pmu/COPYRIGHT Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/COPYRIGHT Tue Jan 14 16:18:45 2014 (r260631) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2013 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2014 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/pmac_pmu/Makefile.inc1 ============================================================================== --- projects/pmac_pmu/Makefile.inc1 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/Makefile.inc1 Tue Jan 14 16:18:45 2014 (r260631) @@ -1369,15 +1369,6 @@ kernel-tools: .MAKE mkdir -p ${MAKEOBJDIRPREFIX}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${MAKEOBJDIRPREFIX}/usr >/dev/null -.for _tool in \ - sys/dev/aic7xxx/aicasm - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ - ${MAKE} DIRPRFX=${_tool}/ all && \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install -.endfor # # cross-tools: Build cross-building tools Modified: projects/pmac_pmu/ObsoleteFiles.inc ============================================================================== --- projects/pmac_pmu/ObsoleteFiles.inc Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/ObsoleteFiles.inc Tue Jan 14 16:18:45 2014 (r260631) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131215: libcam version bumped +OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6 # 20131202: libcapsicum and libcasper moved to /lib/ OLD_LIBS+=usr/lib/libcapsicum.so.0 OLD_LIBS+=usr/lib/libcasper.so.0 Modified: projects/pmac_pmu/UPDATING ============================================================================== --- projects/pmac_pmu/UPDATING Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/UPDATING Tue Jan 14 16:18:45 2014 (r260631) @@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140110: + If a Makefile in a tests/ directory was auto-generating a Kyuafile + instead of providing an explicit one, this would prevent such + Makefile from providing its own Kyuafile in the future during + NO_CLEAN builds. This has been fixed in the Makefiles but manual + intervention is needed to clean an objdir if you use NO_CLEAN: + # find /usr/obj -name Kyuafile | xargs rm -f + +20131213: + The behavior of gss_pseudo_random() for the krb5 mechanism + has changed, for applications requesting a longer random string + than produced by the underlying enctype's pseudo-random() function. + In particular, the random string produced from a session key of + enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will + be different at the 17th octet and later, after this change. + The counter used in the PRF+ construction is now encoded as a + big-endian integer in accordance with RFC 4402. + __FreeBSD_version is bumped to 1100004. + 20131108: The WITHOUT_ATF build knob has been removed and its functionality has been subsumed into the more generic WITHOUT_TESTS. If you were @@ -1932,7 +1951,7 @@ COMMON ITEMS: make buildkernel KERNCONF=YOUR_KERNEL_HERE - make installworld DESTDIR=${CURRENT_ROOT} + make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd Modified: projects/pmac_pmu/bin/cat/cat.c ============================================================================== --- projects/pmac_pmu/bin/cat/cat.c Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/cat/cat.c Tue Jan 14 16:18:45 2014 (r260631) @@ -316,6 +316,7 @@ udom_open(const char *path, int flags) sou.sun_family = AF_UNIX; if ((len = strlcpy(sou.sun_path, path, sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + close(fd); errno = ENAMETOOLONG; return (-1); } Modified: projects/pmac_pmu/bin/pax/pax.1 ============================================================================== --- projects/pmac_pmu/bin/pax/pax.1 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/pax/pax.1 Tue Jan 14 16:18:45 2014 (r260631) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 29, 2010 +.Dd December 21, 2013 .Dt PAX 1 .Os .Sh NAME @@ -587,6 +587,16 @@ precedence. For example, if .Dl Fl p Ar eme is specified, file modification times are still preserved. +.Pp +File flags set by +.Xr chflags 1 +are not understood by +.Nm , +however +.Xr tar 1 +and +.Xr dump 1 +will preserve these. .It Fl s Ar replstr Modify the file or archive member names specified by the .Ar pattern @@ -1195,3 +1205,11 @@ at the University of California, San Die The .Nm utility does not recognize multibyte characters. +.Pp +File flags set by +.Xr chflags 1 +are not preserved by +.Nm . +The BUGS section of +.Xr chflags 1 +has a list of utilities that are unaware of flags. Copied: projects/pmac_pmu/bin/pax/tests/Kyuafile (from r260605, head/bin/pax/tests/Kyuafile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pmac_pmu/bin/pax/tests/Kyuafile Tue Jan 14 16:18:45 2014 (r260631, copy of r260605, head/bin/pax/tests/Kyuafile) @@ -0,0 +1,7 @@ +-- $FreeBSD$ + +syntax(2) + +test_suite("FreeBSD") + +tap_test_program{name="legacy_test", required_programs="/usr/bin/perl"} Modified: projects/pmac_pmu/bin/pax/tests/Makefile ============================================================================== --- projects/pmac_pmu/bin/pax/tests/Makefile Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/pax/tests/Makefile Tue Jan 14 16:18:45 2014 (r260631) @@ -3,6 +3,7 @@ .include TESTSDIR= ${TESTSBASE}/bin/pax +KYUAFILE= yes TAP_TESTS_SH= legacy_test Modified: projects/pmac_pmu/bin/ps/ps.1 ============================================================================== --- projects/pmac_pmu/bin/ps/ps.1 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/ps/ps.1 Tue Jan 14 16:18:45 2014 (r260631) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd March 15, 2013 +.Dd December 27, 2013 .Dt PS 1 .Os .Sh NAME @@ -416,8 +416,9 @@ The process has reduced CPU scheduling p .It Li s The process is a session leader. .It Li V -The process is suspended during a -.Xr vfork 2 . +The process' parent is suspended during a +.Xr vfork 2 , +waiting for the process to exec or exit. .It Li W The process is swapped out. .It Li X Modified: projects/pmac_pmu/bin/sh/input.c ============================================================================== --- projects/pmac_pmu/bin/sh/input.c Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/input.c Tue Jan 14 16:18:45 2014 (r260631) @@ -228,7 +228,6 @@ preadbuffer(void) { char *p, *q; int more; - int something; char savec; if (parsefile->strpush) { @@ -252,24 +251,18 @@ again: q = p = parsefile->buf + (parsenextc - parsefile->buf); /* delete nul characters */ - something = 0; for (more = 1; more;) { switch (*p) { case '\0': p++; /* Skip nul */ goto check; - case '\t': - case ' ': - break; - case '\n': parsenleft = q - parsenextc; more = 0; /* Stop processing here */ break; default: - something = 1; break; } @@ -288,7 +281,8 @@ check: *q = '\0'; #ifndef NO_HISTORY - if (parsefile->fd == 0 && hist && something) { + if (parsefile->fd == 0 && hist && + parsenextc[strspn(parsenextc, " \t\n")] != '\0') { HistEvent he; INTOFF; history(hist, &he, whichprompt == 1 ? H_ENTER : H_ADD, Modified: projects/pmac_pmu/bin/sh/sh.1 ============================================================================== --- projects/pmac_pmu/bin/sh/sh.1 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/sh.1 Tue Jan 14 16:18:45 2014 (r260631) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 1, 2013 +.Dd January 3, 2014 .Dt SH 1 .Os .Sh NAME @@ -235,10 +235,16 @@ or .Dq Li || operator; or if the command is a pipeline preceded by the .Ic !\& -operator. +keyword. If a shell function is executed and its exit status is explicitly tested, all commands of the function are considered to be tested as well. +.Pp +It is recommended to check for failures explicitly +instead of relying on +.Fl e +because it tends to behave in unexpected ways, +particularly in larger scripts. .It Fl f Li noglob Disable pathname expansion. .It Fl h Li trackall Copied: projects/pmac_pmu/bin/sh/tests/Kyuafile (from r260605, head/bin/sh/tests/Kyuafile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pmac_pmu/bin/sh/tests/Kyuafile Tue Jan 14 16:18:45 2014 (r260631, copy of r260605, head/bin/sh/tests/Kyuafile) @@ -0,0 +1,12 @@ +-- $FreeBSD$ + +syntax(2) + +test_suite("FreeBSD") + +-- Some tests in here are silently not run when the tests are executed as +-- root. Explicitly tell Kyua to drop privileges. +-- +-- TODO(jmmv): Kyua needs to do this by default, not only when explicitly +-- requested. See https://code.google.com/p/kyua/issues/detail?id=6 +tap_test_program{name="legacy_test", required_user="unprivileged"} Modified: projects/pmac_pmu/bin/sh/tests/Makefile ============================================================================== --- projects/pmac_pmu/bin/sh/tests/Makefile Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/tests/Makefile Tue Jan 14 16:18:45 2014 (r260631) @@ -3,6 +3,7 @@ .include TESTSDIR= ${TESTSBASE}/bin/sh +KYUAFILE= yes TAP_TESTS_SH= legacy_test TAP_TESTS_SH_SED_legacy_test= -e 's,__SH__,/bin/sh,g' Modified: projects/pmac_pmu/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/pmac_pmu/bin/sh/tests/parameters/Makefile Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/tests/parameters/Makefile Tue Jan 14 16:18:45 2014 (r260631) @@ -10,6 +10,7 @@ FILES+= exitstatus1.0 FILES+= mail1.0 FILES+= mail2.0 FILES+= optind1.0 +FILES+= optind2.0 FILES+= positional1.0 FILES+= positional2.0 FILES+= pwd1.0 Copied: projects/pmac_pmu/bin/sh/tests/parameters/optind2.0 (from r260605, head/bin/sh/tests/parameters/optind2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pmac_pmu/bin/sh/tests/parameters/optind2.0 Tue Jan 14 16:18:45 2014 (r260631, copy of r260605, head/bin/sh/tests/parameters/optind2.0) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +[ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ] Modified: projects/pmac_pmu/bin/sh/var.c ============================================================================== --- projects/pmac_pmu/bin/sh/var.c Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/var.c Tue Jan 14 16:18:45 2014 (r260631) @@ -88,11 +88,9 @@ struct var vifs; struct var vmail; struct var vmpath; struct var vpath; -struct var vppid; struct var vps1; struct var vps2; struct var vps4; -struct var vvers; static struct var voptind; struct var vdisvfork; @@ -111,8 +109,6 @@ static const struct varinit varinit[] = NULL }, { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VUNSET, "PPID=", - NULL }, /* * vps1 depends on uid */ @@ -180,15 +176,14 @@ initvar(void) vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } - if ((vppid.flags & VEXPORT) == 0) { - fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); - setvarsafe("PPID", ppid, 0); - } + fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); + setvarsafe("PPID", ppid, 0); for (envp = environ ; *envp ; envp++) { if (strchr(*envp, '=')) { setvareq(*envp, VEXPORT|VTEXTFIXED); } } + setvareq("OPTIND=1", VTEXTFIXED); } /* Modified: projects/pmac_pmu/bin/sh/var.h ============================================================================== --- projects/pmac_pmu/bin/sh/var.h Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/sh/var.h Tue Jan 14 16:18:45 2014 (r260631) @@ -75,7 +75,6 @@ extern struct var vifs; extern struct var vmail; extern struct var vmpath; extern struct var vpath; -extern struct var vppid; extern struct var vps1; extern struct var vps2; extern struct var vps4; Copied: projects/pmac_pmu/bin/test/tests/Kyuafile (from r260605, head/bin/test/tests/Kyuafile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/pmac_pmu/bin/test/tests/Kyuafile Tue Jan 14 16:18:45 2014 (r260631, copy of r260605, head/bin/test/tests/Kyuafile) @@ -0,0 +1,12 @@ +-- $FreeBSD$ + +syntax(2) + +test_suite("FreeBSD") + +-- Some tests in here are silently not run when the tests are executed as +-- root. Explicitly tell Kyua to drop privileges. +-- +-- TODO(jmmv): Kyua needs to do this by default, not only when explicitly +-- requested. See https://code.google.com/p/kyua/issues/detail?id=6 +tap_test_program{name="legacy_test", required_user="unprivileged"} Modified: projects/pmac_pmu/bin/test/tests/Makefile ============================================================================== --- projects/pmac_pmu/bin/test/tests/Makefile Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/bin/test/tests/Makefile Tue Jan 14 16:18:45 2014 (r260631) @@ -3,6 +3,7 @@ .include TESTSDIR= ${TESTSBASE}/bin/test +KYUAFILE= yes TAP_TESTS_SH= legacy_test Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.8 ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jan 14 16:18:45 2014 (r260631) @@ -14,11 +14,12 @@ .\" .\" Copyright 2012, Richard Lowe. .\" Copyright (c) 2012, Marcelo Araujo . +.\" Copyright (c) 2012 by Delphix. All rights reserved. .\" All Rights Reserved. .\" .\" $FreeBSD$ .\" -.Dd May 10, 2012 +.Dd December 31, 2013 .Dt ZDB 8 .Os .Sh NAME @@ -29,27 +30,35 @@ .Op Fl CumdibcsDvhLXFPA .Op Fl e Op Fl p Ar path... .Op Fl t Ar txg +.Op Fl U Ar cache +.Op Fl M Ar inflight I/Os .Ar poolname .Op Ar object ... .Nm .Op Fl divPA .Op Fl e Op Fl p Ar path... +.Op Fl U Ar cache .Ar dataset .Op Ar object ... .Nm .Fl m Op Fl LXFPA .Op Fl t Ar txg .Op Fl e Op Fl p Ar path... +.Op Fl U Ar cache .Ar poolname .Nm .Fl R Op Fl A .Op Fl e Op Fl p Ar path... +.Op Fl U Ar cache +.Ar poolname .Ar poolname .Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags .Nm .Fl S .Op Fl AP .Op Fl e Op Fl p Ar path... +.Op Fl U Ar cache +.Ar poolname .Ar poolname .Nm .Fl l @@ -205,6 +214,11 @@ flag specifies the path under which devi .It Fl F Attempt to make an unreadable pool readable by trying progressively older transactions. +.It Fl M Ar inflight I/Os +Limit the number of outstanding checksum I/Os to the specified value. +The default value is 200. This option affects the performance of the +.Fl c +option. .It Fl P Print numbers in an unscaled form more amenable to parsing, eg. 1000000 rather than 1M. @@ -218,9 +232,7 @@ options for a means to see the available transaction numbers. .It Fl U Ar cachefile Use a cache file other than -.Pa /etc/zfs/zpool.cache . -This option is only valid with -.Fl C +.Pa /boot/zfs/zpool.cache . .It Fl v Enable verbosity. Specify multiple times for increased verbosity. Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jan 14 16:18:45 2014 (r260631) @@ -89,6 +89,7 @@ extern void dump_intent_log(zilog_t *); uint64_t *zopt_object = NULL; int zopt_objects = 0; libzfs_handle_t *g_zfs; +uint64_t max_inflight = 200; /* * These libumem hooks provide a reasonable set of defaults for the allocator's @@ -110,16 +111,17 @@ static void usage(void) { (void) fprintf(stderr, - "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]]" - "poolname [object...]\n" - " %s [-divPA] [-e -p path...] dataset [object...]\n" - " %s -m [-LXFPA] [-t txg] [-e [-p path...]]" - "poolname [vdev [metaslab...]]\n" - " %s -R [-A] [-e [-p path...]] poolname " - "vdev:offset:size[:flags]\n" - " %s -S [-PA] [-e [-p path...]] poolname\n" - " %s -l [-uA] device\n" - " %s -C [-A] [-U config]\n\n", + "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]] " + "[-U config] [-M inflight I/Os] poolname [object...]\n" + " %s [-divPA] [-e -p path...] [-U config] dataset " + "[object...]\n" + " %s -m [-LXFPA] [-t txg] [-e [-p path...]] [-U config] " + "poolname [vdev [metaslab...]]\n" + " %s -R [-A] [-e [-p path...]] poolname " + "vdev:offset:size[:flags]\n" + " %s -S [-PA] [-e [-p path...]] [-U config] poolname\n" + " %s -l [-uA] device\n" + " %s -C [-A] [-U config]\n\n", cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname); (void) fprintf(stderr, " Dataset name must include at least one " @@ -164,6 +166,8 @@ usage(void) (void) fprintf(stderr, " -P print numbers in parseable form\n"); (void) fprintf(stderr, " -t -- highest txg to use when " "searching for uberblocks\n"); + (void) fprintf(stderr, " -M -- " + "specify the maximum number of checksumming I/Os [default is 200]"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); @@ -559,16 +563,20 @@ get_metaslab_refcount(vdev_t *vd) static int verify_spacemap_refcounts(spa_t *spa) { - int expected_refcount, actual_refcount; + uint64_t expected_refcount = 0; + uint64_t actual_refcount; - expected_refcount = spa_feature_get_refcount(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]); + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM], + &expected_refcount); actual_refcount = get_dtl_refcount(spa->spa_root_vdev); actual_refcount += get_metaslab_refcount(spa->spa_root_vdev); if (expected_refcount != actual_refcount) { - (void) printf("space map refcount mismatch: expected %d != " - "actual %d\n", expected_refcount, actual_refcount); + (void) printf("space map refcount mismatch: expected %lld != " + "actual %lld\n", + (longlong_t)expected_refcount, + (longlong_t)actual_refcount); return (2); } return (0); @@ -670,8 +678,7 @@ dump_metaslab(metaslab_t *msp) } if (dump_opt['m'] > 1 && sm != NULL && - spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) { + spa_feature_is_active(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) { /* * The space map histogram represents free space in chunks * of sm_shift (i.e. bucket 0 refers to 2^sm_shift). @@ -757,7 +764,7 @@ dump_dde(const ddt_t *ddt, const ddt_ent if (ddp->ddp_phys_birth == 0) continue; ddt_bp_create(ddt->ddt_checksum, ddk, ddp, &blk); - sprintf_blkptr(blkbuf, &blk); + snprintf_blkptr(blkbuf, sizeof (blkbuf), &blk); (void) printf("index %llx refcnt %llu %s %s\n", (u_longlong_t)index, (u_longlong_t)ddp->ddp_refcnt, types[p], blkbuf); @@ -1017,31 +1024,39 @@ blkid2offset(const dnode_phys_t *dnp, co } static void -sprintf_blkptr_compact(char *blkbuf, const blkptr_t *bp) +snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp) { const dva_t *dva = bp->blk_dva; int ndvas = dump_opt['d'] > 5 ? BP_GET_NDVAS(bp) : 1; if (dump_opt['b'] >= 6) { - sprintf_blkptr(blkbuf, bp); + snprintf_blkptr(blkbuf, buflen, bp); return; } blkbuf[0] = '\0'; for (int i = 0; i < ndvas; i++) - (void) sprintf(blkbuf + strlen(blkbuf), "%llu:%llx:%llx ", + (void) snprintf(blkbuf + strlen(blkbuf), + buflen - strlen(blkbuf), "%llu:%llx:%llx ", (u_longlong_t)DVA_GET_VDEV(&dva[i]), (u_longlong_t)DVA_GET_OFFSET(&dva[i]), (u_longlong_t)DVA_GET_ASIZE(&dva[i])); - (void) sprintf(blkbuf + strlen(blkbuf), - "%llxL/%llxP F=%llu B=%llu/%llu", - (u_longlong_t)BP_GET_LSIZE(bp), - (u_longlong_t)BP_GET_PSIZE(bp), - (u_longlong_t)bp->blk_fill, - (u_longlong_t)bp->blk_birth, - (u_longlong_t)BP_PHYSICAL_BIRTH(bp)); + if (BP_IS_HOLE(bp)) { + (void) snprintf(blkbuf + strlen(blkbuf), + buflen - strlen(blkbuf), "B=%llu", + (u_longlong_t)bp->blk_birth); + } else { + (void) snprintf(blkbuf + strlen(blkbuf), + buflen - strlen(blkbuf), + "%llxL/%llxP F=%llu B=%llu/%llu", + (u_longlong_t)BP_GET_LSIZE(bp), + (u_longlong_t)BP_GET_PSIZE(bp), + (u_longlong_t)bp->blk_fill, + (u_longlong_t)bp->blk_birth, + (u_longlong_t)BP_PHYSICAL_BIRTH(bp)); + } } static void @@ -1066,7 +1081,7 @@ print_indirect(blkptr_t *bp, const zbook } } - sprintf_blkptr_compact(blkbuf, bp); + snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), bp); (void) printf("%s\n", blkbuf); } @@ -1081,7 +1096,7 @@ visit_indirect(spa_t *spa, const dnode_p print_indirect(bp, zb, dnp); - if (BP_GET_LEVEL(bp) > 0) { + if (BP_GET_LEVEL(bp) > 0 && !BP_IS_HOLE(bp)) { uint32_t flags = ARC_WAIT; int i; blkptr_t *cbp; @@ -1206,7 +1221,7 @@ dump_dsl_dataset(objset_t *os, uint64_t zdb_nicenum(ds->ds_compressed_bytes, compressed); zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed); zdb_nicenum(ds->ds_unique_bytes, unique); - sprintf_blkptr(blkbuf, &ds->ds_bp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), &ds->ds_bp); (void) printf("\t\tdir_obj = %llu\n", (u_longlong_t)ds->ds_dir_obj); @@ -1251,7 +1266,7 @@ dump_bptree_cb(void *arg, const blkptr_t char blkbuf[BP_SPRINTF_LEN]; if (bp->blk_birth != 0) { - sprintf_blkptr(blkbuf, bp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); (void) printf("\t%s\n", blkbuf); } return (0); @@ -1289,7 +1304,7 @@ dump_bpobj_cb(void *arg, const blkptr_t char blkbuf[BP_SPRINTF_LEN]; ASSERT(bp->blk_birth != 0); - sprintf_blkptr_compact(blkbuf, bp); + snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), bp); (void) printf("\t%s\n", blkbuf); return (0); } @@ -1788,8 +1803,9 @@ dump_dir(objset_t *os) zdb_nicenum(refdbytes, numbuf); if (verbosity >= 4) { - (void) sprintf(blkbuf, ", rootbp "); - (void) sprintf_blkptr(blkbuf + strlen(blkbuf), os->os_rootbp); + (void) snprintf(blkbuf, sizeof (blkbuf), ", rootbp "); + (void) snprintf_blkptr(blkbuf + strlen(blkbuf), + sizeof (blkbuf) - strlen(blkbuf), os->os_rootbp); } else { blkbuf[0] = '\0'; } @@ -1819,7 +1835,7 @@ dump_dir(objset_t *os) if (verbosity < 2) return; - if (os->os_rootbp->blk_birth == 0) + if (BP_IS_HOLE(os->os_rootbp)) return; dump_object(os, 0, verbosity, &print_header); @@ -1860,7 +1876,7 @@ dump_uberblock(uberblock_t *ub, const ch (u_longlong_t)ub->ub_timestamp, asctime(localtime(×tamp))); if (dump_opt['u'] >= 3) { char blkbuf[BP_SPRINTF_LEN]; - sprintf_blkptr(blkbuf, &ub->ub_rootbp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), &ub->ub_rootbp); (void) printf("\trootbp = %s\n", blkbuf); } (void) printf(footer ? footer : ""); @@ -2151,16 +2167,68 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t * bp, NULL, NULL, ZIO_FLAG_CANFAIL)), ==, 0); } +/* ARGSUSED */ +static void +zdb_blkptr_done(zio_t *zio) +{ + spa_t *spa = zio->io_spa; + blkptr_t *bp = zio->io_bp; + int ioerr = zio->io_error; + zdb_cb_t *zcb = zio->io_private; + zbookmark_t *zb = &zio->io_bookmark; + + zio_data_buf_free(zio->io_data, zio->io_size); + + mutex_enter(&spa->spa_scrub_lock); + spa->spa_scrub_inflight--; + cv_broadcast(&spa->spa_scrub_io_cv); + + if (ioerr && !(zio->io_flags & ZIO_FLAG_SPECULATIVE)) { + char blkbuf[BP_SPRINTF_LEN]; + + zcb->zcb_haderrors = 1; + zcb->zcb_errors[ioerr]++; + + if (dump_opt['b'] >= 2) + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); + else + blkbuf[0] = '\0'; + + (void) printf("zdb_blkptr_cb: " + "Got error %d reading " + "<%llu, %llu, %lld, %llx> %s -- skipping\n", + ioerr, + (u_longlong_t)zb->zb_objset, + (u_longlong_t)zb->zb_object, + (u_longlong_t)zb->zb_level, + (u_longlong_t)zb->zb_blkid, + blkbuf); + } + mutex_exit(&spa->spa_scrub_lock); +} + +/* ARGSUSED */ static int zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) { zdb_cb_t *zcb = arg; - char blkbuf[BP_SPRINTF_LEN]; dmu_object_type_t type; boolean_t is_metadata; - if (bp == NULL) + if (dump_opt['b'] >= 5 && bp->blk_birth > 0) { + char blkbuf[BP_SPRINTF_LEN]; + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); + (void) printf("objset %llu object %llu " + "level %lld offset 0x%llx %s\n", + (u_longlong_t)zb->zb_objset, + (u_longlong_t)zb->zb_object, + (longlong_t)zb->zb_level, + (u_longlong_t)blkid2offset(dnp, bp, zb), + blkbuf); + } + + if (BP_IS_HOLE(bp)) return (0); type = BP_GET_TYPE(bp); @@ -2171,53 +2239,26 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type)); if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) { - int ioerr; size_t size = BP_GET_PSIZE(bp); - void *data = malloc(size); + void *data = zio_data_buf_alloc(size); int flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCRUB | ZIO_FLAG_RAW; /* If it's an intent log block, failure is expected. */ if (zb->zb_level == ZB_ZIL_LEVEL) flags |= ZIO_FLAG_SPECULATIVE; - ioerr = zio_wait(zio_read(NULL, spa, bp, data, size, - NULL, NULL, ZIO_PRIORITY_ASYNC_READ, flags, zb)); - - free(data); - if (ioerr && !(flags & ZIO_FLAG_SPECULATIVE)) { - zcb->zcb_haderrors = 1; - zcb->zcb_errors[ioerr]++; + mutex_enter(&spa->spa_scrub_lock); + while (spa->spa_scrub_inflight > max_inflight) + cv_wait(&spa->spa_scrub_io_cv, &spa->spa_scrub_lock); + spa->spa_scrub_inflight++; + mutex_exit(&spa->spa_scrub_lock); - if (dump_opt['b'] >= 2) - sprintf_blkptr(blkbuf, bp); - else - blkbuf[0] = '\0'; - - (void) printf("zdb_blkptr_cb: " - "Got error %d reading " - "<%llu, %llu, %lld, %llx> %s -- skipping\n", - ioerr, - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (u_longlong_t)zb->zb_level, - (u_longlong_t)zb->zb_blkid, - blkbuf); - } + zio_nowait(zio_read(NULL, spa, bp, data, size, + zdb_blkptr_done, zcb, ZIO_PRIORITY_ASYNC_READ, flags, zb)); } zcb->zcb_readfails = 0; - if (dump_opt['b'] >= 5) { - sprintf_blkptr(blkbuf, bp); - (void) printf("objset %llu object %llu " - "level %lld offset 0x%llx %s\n", - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (longlong_t)zb->zb_level, - (u_longlong_t)blkid2offset(dnp, bp, zb), - blkbuf); - } - if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) && gethrtime() > zcb->zcb_lastprint + NANOSEC) { uint64_t now = gethrtime(); @@ -2374,7 +2415,7 @@ count_block_cb(void *arg, const blkptr_t if (dump_opt['b'] >= 5) { char blkbuf[BP_SPRINTF_LEN]; - sprintf_blkptr(blkbuf, bp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); (void) printf("[%s] %s\n", "deferred free", blkbuf); } @@ -2417,8 +2458,7 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } - if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + if (spa_feature_is_active(spa, SPA_FEATURE_ASYNC_DESTROY)) { VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, &zcb, NULL)); @@ -2431,6 +2471,18 @@ dump_block_stats(spa_t *spa) zcb.zcb_start = zcb.zcb_lastprint = gethrtime(); zcb.zcb_haderrors |= traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb); + /* + * If we've traversed the data blocks then we need to wait for those + * I/Os to complete. We leverage "The Godfather" zio to wait on + * all async I/Os to complete. + */ + if (dump_opt['c']) { + (void) zio_wait(spa->spa_async_zio_root); + spa->spa_async_zio_root = zio_root(spa, NULL, NULL, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | + ZIO_FLAG_GODFATHER); + } + if (zcb.zcb_haderrors) { (void) printf("\nError counts:\n\n"); (void) printf("\t%5s %s\n", "errno", "count"); @@ -2597,7 +2649,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo avl_index_t where; zdb_ddt_entry_t *zdde, zdde_search; - if (bp == NULL) + if (BP_IS_HOLE(bp)) return (0); if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) { @@ -2719,7 +2771,7 @@ dump_zpool(spa_t *spa) } if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + SPA_FEATURE_ASYNC_DESTROY)) { dump_bptree(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, "Pool dataset frees"); @@ -2764,7 +2816,7 @@ zdb_print_blkptr(blkptr_t *bp, int flags if (flags & ZDB_FLAG_BSWAP) byteswap_uint64_array((void *)bp, sizeof (blkptr_t)); - sprintf_blkptr(blkbuf, bp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); (void) printf("%s\n", blkbuf); } @@ -3200,7 +3252,7 @@ main(int argc, char **argv) dprintf_setup(&argc, argv); - while ((c = getopt(argc, argv, "bcdhilmsuCDRSAFLXevp:t:U:P")) != -1) { + while ((c = getopt(argc, argv, "bcdhilmM:suCDRSAFLXevp:t:U:P")) != -1) { switch (c) { case 'b': case 'c': @@ -3229,6 +3281,15 @@ main(int argc, char **argv) case 'v': verbose++; break; + case 'M': + max_inflight = strtoull(optarg, NULL, 0); + if (max_inflight == 0) { + (void) fprintf(stderr, "maximum number " + "of inflight I/Os must be greater " + "than 0\n"); + usage(); + } + break; case 'p': if (searchdirs == NULL) { searchdirs = umem_alloc(sizeof (char *), Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c Tue Jan 14 16:18:45 2014 (r260631) @@ -24,6 +24,10 @@ */ /* + * Copyright (c) 2013 by Delphix. All rights reserved. + */ + +/* * Print intent log header and statistics. */ @@ -47,7 +51,7 @@ print_log_bp(const blkptr_t *bp, const c { char blkbuf[BP_SPRINTF_LEN]; - sprintf_blkptr(blkbuf, bp); + snprintf_blkptr(blkbuf, sizeof (blkbuf), bp); (void) printf("%s%s\n", prefix, blkbuf); } @@ -132,6 +136,7 @@ zil_prt_rec_write(zilog_t *zilog, int tx if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) { (void) printf("%shas blkptr, %s\n", prefix, + !BP_IS_HOLE(bp) && bp->blk_birth >= spa_first_txg(zilog->zl_spa) ? "will claim" : "won't claim"); print_log_bp(bp, prefix); @@ -139,8 +144,6 @@ zil_prt_rec_write(zilog_t *zilog, int tx if (BP_IS_HOLE(bp)) { (void) printf("\t\t\tLSIZE 0x%llx\n", (u_longlong_t)BP_GET_LSIZE(bp)); - } - if (bp->blk_birth == 0) { bzero(buf, sizeof (buf)); (void) printf("%s\n", prefix); return; @@ -313,7 +316,8 @@ print_log_block(zilog_t *zilog, blkptr_t if (verbose >= 5) { (void) strcpy(blkbuf, ", "); - sprintf_blkptr(blkbuf + strlen(blkbuf), bp); + snprintf_blkptr(blkbuf + strlen(blkbuf), + sizeof (blkbuf) - strlen(blkbuf), bp); } else { blkbuf[0] = '\0'; } @@ -361,7 +365,7 @@ dump_intent_log(zilog_t *zilog) int verbose = MAX(dump_opt['d'], dump_opt['i']); int i; - if (zh->zh_log.blk_birth == 0 || verbose < 1) + if (BP_IS_HOLE(&zh->zh_log) || verbose < 1) return; (void) printf("\n ZIL header: claim_txg %llu, " Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Jan 14 15:21:19 2014 (r260630) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Jan 14 16:18:45 2014 (r260631) @@ -18,7 +18,7 @@ .\" information: Portions Copyright [yyyy] [name of copyright owner] .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright (c) 2012 by Delphix. All rights reserved. +.\" Copyright (c) 2013 by Delphix. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek .\" Copyright (c) 2012, Glen Barber .\" Copyright (c) 2012, Bryan Drewery @@ -26,10 +26,11 @@ .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2013, Joyent, Inc. All rights reserved. .\" Copyright (c) 2013, Steven Hartland +.\" Copyright (c) 2014, Xin LI .\" .\" $FreeBSD$ .\" -.Dd October 23, 2013 +.Dd January 2, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -57,11 +58,16 @@ .Cm destroy .Op Fl dnpRrv .Sm off -.Ar snapshot -.Op % Ns Ar snapname +.Ar filesystem Ns | Ns volume +.Ns @snap +.Op % Ns Ar snap +.Op , Ns Ar snap Op % Ns Ar snap .Op , Ns ... .Sm on .Nm +.Cm destroy +.Ar filesystem Ns | Ns Ar volume Ns # Ns Ar bookmark +.Nm .Cm snapshot Ns | Ns Cm snap .Op Fl r .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... @@ -102,7 +108,7 @@ .Nm .Cm list .Op Fl r Ns | Ns Fl d Ar depth -.Op Fl H +.Op Fl Hp .Op Fl o Ar property Ns Oo , Ns property Ns Oc Ns ... .Op Fl t Ar type Ns Oo , Ns type Ns Oc Ns ... .Oo Fl s Ar property Oc Ns ... @@ -168,11 +174,19 @@ .Cm unshare .Fl a | Ar filesystem Ns | Ns Ar mountpoint .Nm +.Cm bookmark +.Ar snapshot +.Ar bookmark +.Nm .Cm send .Op Fl DnPpRv .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Jan 15 04:25:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F30078E; Wed, 15 Jan 2014 04:25:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 79F511329; Wed, 15 Jan 2014 04:25:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0F4PuRg038421; Wed, 15 Jan 2014 04:25:56 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0F4Ps8m038406; Wed, 15 Jan 2014 04:25:54 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401150425.s0F4Ps8m038406@svn.freebsd.org> From: Justin Hibbits Date: Wed, 15 Jan 2014 04:25:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260668 - in projects/pmac_pmu/sys: dev/pci kern powerpc/ofw powerpc/powermac sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 04:25:56 -0000 Author: jhibbits Date: Wed Jan 15 04:25:54 2014 New Revision: 260668 URL: http://svnweb.freebsd.org/changeset/base/260668 Log: Various updates that I had made against head: * Add the 'Buffer A with handshake update' #define for PMU, for completeness. * Mark OpenPIC as BUS_PASS_INTERRUPT, so it's suspended later and resumed earlier. * Add two new bus methods: bus_suspend_child()/bus_resume_child(), and use those in the bus_generic_suspend()/bus_generic_resume() implementation. * This, in turn, allows us to move all bus recursion logic into the generic functions, allowing the drivers to suspend/resume _only_ themselves. * Make use of these in the PCI driver. Modified: projects/pmac_pmu/sys/dev/pci/pci.c projects/pmac_pmu/sys/dev/pci/pci_private.h projects/pmac_pmu/sys/kern/bus_if.m projects/pmac_pmu/sys/kern/subr_bus.c projects/pmac_pmu/sys/powerpc/ofw/openpic_ofw.c projects/pmac_pmu/sys/powerpc/powermac/maciovar.h projects/pmac_pmu/sys/powerpc/powermac/pmu.c projects/pmac_pmu/sys/powerpc/powermac/viareg.h projects/pmac_pmu/sys/sys/bus.h Modified: projects/pmac_pmu/sys/dev/pci/pci.c ============================================================================== --- projects/pmac_pmu/sys/dev/pci/pci.c Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/dev/pci/pci.c Wed Jan 15 04:25:54 2014 (r260668) @@ -127,8 +127,6 @@ static device_method_t pci_methods[] = { DEVMETHOD(device_attach, pci_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, pci_suspend), - DEVMETHOD(device_resume, pci_resume), /* Bus interface */ DEVMETHOD(bus_print_child, pci_print_child), @@ -138,6 +136,8 @@ static device_method_t pci_methods[] = { DEVMETHOD(bus_driver_added, pci_driver_added), DEVMETHOD(bus_setup_intr, pci_setup_intr), DEVMETHOD(bus_teardown_intr, pci_teardown_intr), + DEVMETHOD(bus_suspend_child, pci_suspend_child), + DEVMETHOD(bus_resume_child, pci_resume_child), DEVMETHOD(bus_get_dma_tag, pci_get_dma_tag), DEVMETHOD(bus_get_resource_list,pci_get_resource_list), @@ -3364,12 +3364,11 @@ pci_attach(device_t dev) } static void -pci_set_power_children(device_t dev, device_t *devlist, int numdevs, - int state) +pci_set_power_child(device_t dev, device_t child, int state) { - device_t child, pcib; + device_t pcib; struct pci_devinfo *dinfo; - int dstate, i; + int dstate; /* * Set the device to the given state. If the firmware suggests @@ -3379,101 +3378,46 @@ pci_set_power_children(device_t dev, dev * are handled separately. */ pcib = device_get_parent(dev); - for (i = 0; i < numdevs; i++) { - child = devlist[i]; - dinfo = device_get_ivars(child); - dstate = state; - if (device_is_attached(child) && - PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0) - pci_set_powerstate(child, dstate); - } + dinfo = device_get_ivars(child); + dstate = state; + if (device_is_attached(child) && + PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0) + pci_set_powerstate(child, dstate); } int -pci_suspend(device_t dev) +pci_suspend_child(device_t dev, device_t child) { - device_t child, *devlist; struct pci_devinfo *dinfo; - int error, i, numdevs; + int error; - /* - * Save the PCI configuration space for each child and set the - * device in the appropriate power state for this sleep state. - */ - if ((error = device_get_children(dev, &devlist, &numdevs)) != 0) - return (error); - for (i = 0; i < numdevs; i++) { - child = devlist[i]; - dinfo = device_get_ivars(child); - pci_cfg_save(child, dinfo, 0); - } + dinfo = device_get_ivars(child); + pci_cfg_save(child, dinfo, 0); + + error = DEVICE_SUSPEND(child); - /* Suspend devices before potentially powering them down. */ - error = bus_generic_suspend(dev); - if (error) { - free(devlist, M_TEMP); + if (error) return (error); - } + if (pci_do_power_suspend) - pci_set_power_children(dev, devlist, numdevs, - PCI_POWERSTATE_D3); - free(devlist, M_TEMP); + pci_set_power_child(dev, child, PCI_POWERSTATE_D3); + return (0); } int -pci_resume(device_t dev) +pci_resume_child(device_t dev, device_t child) { - device_t child, *devlist; struct pci_devinfo *dinfo; - int error, i, numdevs; + int error; - /* - * Set each child to D0 and restore its PCI configuration space. - */ - if ((error = device_get_children(dev, &devlist, &numdevs)) != 0) - return (error); if (pci_do_power_resume) - pci_set_power_children(dev, devlist, numdevs, - PCI_POWERSTATE_D0); - - /* Now the device is powered up, restore its config space. */ - for (i = 0; i < numdevs; i++) { - child = devlist[i]; - dinfo = device_get_ivars(child); + pci_set_power_child(dev, child, PCI_POWERSTATE_D0); + error = DEVICE_RESUME(child); - pci_cfg_restore(child, dinfo); - if (!device_is_attached(child)) - pci_cfg_save(child, dinfo, 1); - } + dinfo = device_get_ivars(child); + pci_cfg_restore(child, dinfo); - /* - * Resume critical devices first, then everything else later. - */ - for (i = 0; i < numdevs; i++) { - child = devlist[i]; - switch (pci_get_class(child)) { - case PCIC_DISPLAY: - case PCIC_MEMORY: - case PCIC_BRIDGE: - case PCIC_BASEPERIPH: - error = DEVICE_RESUME(child); - break; - } - } - for (i = 0; i < numdevs; i++) { - child = devlist[i]; - switch (pci_get_class(child)) { - case PCIC_DISPLAY: - case PCIC_MEMORY: - case PCIC_BRIDGE: - case PCIC_BASEPERIPH: - break; - default: - error = DEVICE_RESUME(child); - } - } - free(devlist, M_TEMP); return (error); } Modified: projects/pmac_pmu/sys/dev/pci/pci_private.h ============================================================================== --- projects/pmac_pmu/sys/dev/pci/pci_private.h Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/dev/pci/pci_private.h Wed Jan 15 04:25:54 2014 (r260668) @@ -114,8 +114,8 @@ int pci_child_location_str_method(devic int pci_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); int pci_assign_interrupt_method(device_t dev, device_t child); -int pci_resume(device_t dev); -int pci_suspend(device_t dev); +int pci_resume_child(device_t dev, device_t child); +int pci_suspend_child(device_t dev, device_t child); bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev); /** Restore the config register state. The state must be previously Modified: projects/pmac_pmu/sys/kern/bus_if.m ============================================================================== --- projects/pmac_pmu/sys/kern/bus_if.m Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/kern/bus_if.m Wed Jan 15 04:25:54 2014 (r260668) @@ -670,3 +670,25 @@ METHOD int remap_intr { device_t _child; u_int _irq; } DEFAULT null_remap_intr; + +/** + * @brief Resume a child of the bus + * + * @param _dev the bus device + * @param _child the child device + */ +METHOD int resume_child { + device_t _dev; + device_t _child; +} DEFAULT bus_generic_resume_child; + +/** + * @brief Suspend a child of the bus + * + * @param _dev the bus device + * @param _child the child device + */ +METHOD int suspend_child { + device_t _dev; + device_t _child; +} DEFAULT bus_generic_suspend_child; Modified: projects/pmac_pmu/sys/kern/subr_bus.c ============================================================================== --- projects/pmac_pmu/sys/kern/subr_bus.c Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/kern/subr_bus.c Wed Jan 15 04:25:54 2014 (r260668) @@ -91,7 +91,6 @@ struct devclass { device_t *devices; /* array of devices indexed by unit */ int maxunit; /* size of devices array */ int flags; - int pass; #define DC_HAS_CHILDREN 1 struct sysctl_ctx_list sysctl_ctx; @@ -125,6 +124,7 @@ struct device { char* nameunit; /**< name+unit e.g. foodev0 */ char* desc; /**< driver specific description */ int busy; /**< count of calls to device_busy() */ + int pass; /**< pass number this device was attached at */ device_state_t state; /**< current device state */ uint32_t devflags; /**< api level flags for device_get_flags() */ u_int flags; /**< internal device flags */ @@ -136,7 +136,6 @@ struct device { #define DF_DONENOMATCH 0x20 /* don't execute DEVICE_NOMATCH again */ #define DF_EXTERNALSOFTC 0x40 /* softc not allocated by us */ #define DF_REBID 0x80 /* Can rebid after attach */ -#define DF_SUSPENDED 0x100 /* Device is suspended. */ u_int order; /**< order from device_add_child_ordered() */ void *ivars; /**< instance variables */ void *softc; /**< current driver's variables */ @@ -1086,7 +1085,6 @@ devclass_add_driver(devclass_t dc, drive TAILQ_INSERT_TAIL(&dc->drivers, dl, link); driver->refs++; /* XXX: kobj_mtx */ dl->pass = pass; - (*dcp)->pass = pass; /* Used in suspend/resume. */ driver_register_pass(dl); devclass_driver_added(dc, driver); @@ -2815,6 +2813,7 @@ device_attach(device_t dev) else dev->state = DS_ATTACHED; dev->flags &= ~DF_DONENOMATCH; + dev->pass = bus_current_pass; devadded(dev); return (0); } @@ -3587,6 +3586,38 @@ bus_generic_shutdown(device_t dev) } /** + * @brief Helper function for implementing DEVICE_SUSPEND_CHILD() + * + * This function can be used to help implement the DEVICE_SUSPEND_CHILD() + * for a bus. It calls DEVICE_SUSPEND() for the given child. + */ +int +bus_generic_suspend_child(device_t dev, device_t child) +{ + int error; + + error = DEVICE_SUSPEND(child); + + return (error); +} + +/** + * @brief Helper function for implementing DEVICE_RESUME_CHILD() + * + * This function can be used to help implement the DEVICE_RESUME_CHILD() + * for a bus. It calls DEVICE_RESUME() for the given child. + */ +int +bus_generic_resume_child(device_t dev, device_t child) +{ + int error; + + error = DEVICE_RESUME(child); + + return (error); +} + +/** * @brief Helper function for implementing DEVICE_SUSPEND() * * This function can be used to help implement the DEVICE_SUSPEND() @@ -3598,30 +3629,41 @@ bus_generic_shutdown(device_t dev) int bus_generic_suspend(device_t dev) { - int error; - int again = 0; + int error = 0; device_t child, child2; + if (dev->state == DS_SUSPENDED) + return (0); + TAILQ_FOREACH(child, &dev->children, link) { - if (!(child->flags & DF_SUSPENDED)) { - error = DEVICE_SUSPEND(child); - if (error && error != EAGAIN) { - for (child2 = TAILQ_FIRST(&dev->children); - child2 && child2 != child; - child2 = TAILQ_NEXT(child2, link)) { - DEVICE_RESUME(child2); - child2->flags &= ~DF_SUSPENDED; - } - return (error); + if (child->state != DS_SUSPENDED) + error = bus_generic_suspend(child); + if (error == 0) { + /* We won't busy ourselves with busy devices. */ + if (child->state == DS_BUSY) + error = (EBUSY); + else if (child->pass >= bus_current_pass && child->state == DS_ATTACHED) { + printf("Suspending %s, child of %s\n", child->nameunit, dev->nameunit); + error = BUS_SUSPEND_CHILD(dev, child); + if (error != 0) + printf("Error suspending child %s: %d\n", child->nameunit, error); + if (error == 0) + child->state = DS_SUSPENDED; } - if (error == EAGAIN) { - again = EAGAIN; - continue; + } + + if (error) { + for (child2 = TAILQ_FIRST(&dev->children); + child2 && child2 != child; + child2 = TAILQ_NEXT(child2, link)) { + BUS_RESUME_CHILD(dev, child2); + bus_generic_resume(child2); } - child->flags |= DF_SUSPENDED; + return (error); } } - return (again); + + return (error); } /** @@ -3634,31 +3676,23 @@ int bus_generic_resume(device_t dev) { device_t child; - int error = 0; TAILQ_FOREACH(child, &dev->children, link) { - if (child->flags & DF_SUSPENDED) { - if (child->devclass->pass > bus_current_pass) { - if (bootverbose) - printf("Skipping: %s: %d, %d\n", - child->nameunit, - child->devclass->pass, - bus_current_pass); - error = EAGAIN; - continue; - } - if (DEVICE_RESUME(child) == EAGAIN) { - error = EAGAIN; - continue; - } + if (child->pass == bus_current_pass && child->state == DS_SUSPENDED) { + printf("Resuming %s, child of %s\n", child->nameunit, dev->nameunit); + BUS_RESUME_CHILD(dev, child); + /* if resume fails, there's nothing we can usefully do... */ - child->flags &= ~DF_SUSPENDED; + /* Re-mark the child as attached. */ + child->state = DS_ATTACHED; + } + + /* Recurse through the child, resuming all its children. */ + if (child->pass <= bus_current_pass) { + bus_generic_resume(child); } - else - if (bootverbose) - printf("Skipping %s: already resumed\n", child->nameunit); } - return (error); + return (0); } /** @@ -4465,18 +4499,22 @@ root_resume(device_t dev) { struct driverlink *dl; int error = 0; + int rv = 0; TAILQ_FOREACH(dl, &passes, passlink) { + /* + * Raise the pass level to the next level and rescan + * the tree. + */ bus_current_pass = dl->pass; error = bus_generic_resume(dev); - - if (error != EAGAIN) - break; + if (error != 0) + rv = error; } - if (error == 0) + if (rv == 0) devctl_notify("kern", "power", "resume", NULL); - return (error); + return (rv); } static int @@ -4487,11 +4525,25 @@ root_suspend(device_t dev) TAILQ_FOREACH_REVERSE(dl, &passes, driver_list, passlink) { bus_current_pass = dl->pass; + printf("New pass: %d\n", bus_current_pass); error = bus_generic_suspend(dev); - if (error != EAGAIN) + if (error != 0) break; } + if (error != 0) { + printf("Error %d\n", error); + TAILQ_FOREACH_FROM(dl, &passes, passlink) { + if (dl->pass <= bus_current_pass) + continue; + + bus_current_pass = dl->pass; + error = bus_generic_resume(dev); + if (error != 0) + break; + } + } + return (error); } Modified: projects/pmac_pmu/sys/powerpc/ofw/openpic_ofw.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/ofw/openpic_ofw.c Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/powerpc/ofw/openpic_ofw.c Wed Jan 15 04:25:54 2014 (r260668) @@ -95,7 +95,7 @@ static driver_t openpic_ofw_driver = { DRIVER_MODULE(openpic, nexus, openpic_ofw_driver, openpic_devclass, 0, 0); DRIVER_MODULE(openpic, simplebus, openpic_ofw_driver, openpic_devclass, 0, 0); -DRIVER_MODULE(openpic, macio, openpic_ofw_driver, openpic_devclass, 0, 0); +EARLY_DRIVER_MODULE(openpic, macio, openpic_ofw_driver, openpic_devclass, 0, 0, BUS_PASS_INTERRUPT); static int openpic_ofw_probe(device_t dev) Modified: projects/pmac_pmu/sys/powerpc/powermac/maciovar.h ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/maciovar.h Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/powerpc/powermac/maciovar.h Wed Jan 15 04:25:54 2014 (r260668) @@ -48,6 +48,12 @@ #define KEYLARGO_FCR4 0x48 #define KEYLARGO_FCR5 0x4c +#define K2_FCR10 0x24 +#define K2_FCR9 0x28 +#define K2_FCR8 0x2c +#define K2_FCR7 0x30 +#define K2_FCR6 0x34 + #define FCR_ENET_ENABLE 0x60000000 #define FCR_ENET_RESET 0x80000000 @@ -112,6 +118,230 @@ #define FCR3_I2S0_CLK18_ENABLE 0x00004000 #define FCR3_VIA_CLK16_ENABLE 0x00008000 +#define KEYLARGO_MEDIABAY 0x34 +#define KEYLARGO_MB0_DEV_ENABLE 0x00001000 +#define KEYLARGO_MB0_DEV_POWER 0x00000400 +#define KEYLARGO_MB0_DEV_RESET 0x00000200 +#define KEYLARGO_MB0_ENABLE 0x00000100 +#define KEYLARGO_MB1_DEV_ENABLE 0x10000000 +#define KEYLARGO_MB1_DEV_POWER 0x04000000 +#define KEYLARGO_MB1_DEV_RESET 0x02000000 +#define KEYLARGO_MB1_ENABLE 0x01000000 + +#define FCR0_CHOOSE_SCCB 0x00000001 +#define FCR0_CHOOSE_SCCA 0x00000002 +#define FCR0_SLOW_SCC_PCLK 0x00000004 +#define FCR0_RESET_SCC 0x00000008 +#define FCR0_SCCA_ENABLE 0x00000010 +#define FCR0_SCCB_ENABLE 0x00000020 +#define FCR0_SCC_CELL_ENABLE 0x00000040 +#define FCR0_CHOOSE_VIA 0x00000080 +#define FCR0_HIGH_BAND_FOR_1MB 0x00000080 +#define FCR0_USE_IR_SOURCE_2 0x00000200 /* KeyLargo */ +#define FCR0_USE_IR_SOURCE_1 0x00000400 /* KeyLargo */ +#define FCR0_USB0_PMI_ENABLE 0x00000400 /* Pangea and Intrepid */ +#define FCR0_IRDA_SWRESET 0x00000800 /* KeyLargo */ +#define FCR0_USB0_REF_SUSPEND_SEL 0x00000800 /* Pangea and Intrepid */ +#define FCR0_IRDA_DEFAULT1 0x00001000 /* KeyLargo */ +#define FCR0_USB0_REF_SUSPEND 0x00001000 /* Pangea and Intrepid */ +#define FCR0_IRDA_DEFAULT0 0x00002000 /* KeyLargo */ +#define FCR0_USB0_PAD_SUSPEND_SEL 0x00002000 /* Pangea and Intrepid */ +#define FCR0_IRDA_FAST_CON 0x00004000 /* KeyLargo */ +#define FCR0_USB1_PMI_ENABLE 0x00004000 /* Pangea and Intrepid */ +#define FCR0_IRDA_ENABLE 0x00008000 +#define FCR0_USB1_REF_SUSPEND_SEL 0x00008000 +#define FCR0_IRDA_CLK32_ENABLE 0x00010000 +#define FCR0_USB1_REF_SUSPEND 0x00010000 +#define FCR0_IRDA_CLK19_ENABLE 0x00020000 +#define FCR0_USB1_PAD_SUSPEND_SEL 0x00020000 +#define FCR0_USB0_PAD_SUSPEND_0 0x00040000 +#define FCR0_USB0_PAD_SUSPEND_1 0x00080000 +#define FCR0_USB0_CELL_ENABLE 0x00100000 +#define FCR0_USB1_PAD_SUSPEND_0 0x00400000 +#define FCR0_USB1_PAD_SUSPEND_1 0x00800000 +#define FCR0_USB1_CELL_ENABLE 0x01000000 +#define FCR0_USB_REF_SUSPEND 0x10000000 + +#define FCR1_USB2_PMI_ENABLE 0x00000001 +#define FCR1_AUDIO_SEL_22MCLK 0x00000002 +#define FCR1_USB2_REF_SUSPEND_SEL 0x00000002 +#define FCR1_USB2_REF_SUSPEND 0x00000002 +#define FCR1_AUDIO_CLK_ENABLE 0x00000008 +#define FCR1_USB2_PAD_SUSPEND_SEL 0x00000008 +#define FCR1_USB2_PAD_SUSPEND0 0x00000010 +#define FCR1_AUDIO_CLKOUT_ENABLE 0x00000020 +#define FCR1_USB2_PAD_SUSPEND1 0x00000020 +#define FCR1_AUDIO_CELL_ENABLE 0x00000040 +#define FCR1_USB2_CELL_ENABLE 0x00000040 +#define FCR1_CHOOSE_AUDIO 0x00000080 +#define FCR1_CHOOSE_I2S0 0x00000400 +#define FCR1_I2S0_CELL_ENABLE 0x00000400 +#define FCR1_I2S0_CLK_ENABLE 0x00001000 +#define FCR1_I2S0_ENABLE 0x00002000 +#define FCR1_I2S1_CELL_ENABLE 0x00020000 +#define FCR1_I2S1_CLK_ENABLE 0x00080000 +#define FCR1_I2S1_ENABLE 0x00100000 +#define FCR1_EIDE0_ENABLE 0x00800000 +#define FCR1_EIDE0_RESET 0x01000000 +#define FCR1_EIDE1_ENABLE 0x04000000 +#define FCR1_EIDE1_RESET 0x08000000 +#define FCR1_UIDE_ENABLE 0x20000000 +#define FCR1_UIDE_RESET 0x40000000 + +#define FCR2_IOBUS_ENABLE 0x00000002 +#define FCR2_SLEEP_STATE 0x00000100 +#define FCR2_STOP_ALL_KL_CLOCKS 0x00000100 +#define FCR2_MPIC_ENABLE 0x00020000 +#define FCR2_CARD_SLOT_RESET 0x00040000 +#define FCR2_ALT_DATA_OUT 0x02000000 + +#define FCR3_SHUTDOWN_PLL_TOTAL 0x00000001 +#define FCR3_SHUTDOWN_PLL_KW6 0x00000002 +#define FCR3_SHUTDOWN_PLL3 0x00000002 +#define FCR3_SHUTDOWN_PLL_KW4 0x00000004 +#define FCR3_SHUTDOWN_PLL2 0x00000004 +#define FCR3_SHUTDOWN_PLL_KW35 0x00000008 +#define FCR3_SHUTDOWN_PLL1 0x00000008 +#define FCR3_SHUTDOWN_PLL_KW12 0x00000010 +#define FCR3_ENABLE_PLL3_SHUTDOWN 0x00000010 +#define FCR3_ENABLE_PLL2_SHUTDOWN 0x00000020 +#define FCR3_ENABLE_PLL1_SHUTDOWN 0x00000040 +#define FCR3_SHUTDOWN_PLL_2X 0x00000080 +#define FCR3_CLK_66_ENABLE 0x00000100 +#define FCR3_CLK_49_ENABLE 0x00000200 +#define FCR3_CLK_45_ENABLE 0x00000400 +#define FCR3_CLK_31_ENABLE 0x00000800 +#define FCR3_TMR_CLK18_ENABLE 0x00001000 +#define FCR3_I2S1_CLK18_ENABLE 0x00002000 +#define FCR3_I2S0_CLK18_ENABLE 0x00004000 +#define FCR3_VIA_CLK16_ENABLE 0x00008000 +#define FCR3_VIA_CLK32_ENABLE 0x00008000 +#define FCR3_PORT5_DISCONNECT_SELECT 0x00010000 +#define FCR3_PORT5_CONNECT_SELECT 0x00020000 +#define FCR3_PORT5_RESUME_SELECT 0x00040000 +#define FCR3_PORT5_ENABLE 0x00080000 +#define FCR3_STOPPING_33_ENABLED 0x00080000 +#define FCR3_PLL_ENABLE_TEST 0x00080000 +#define FCR3_PORT5_DISCONNECT 0x00100000 +#define FCR3_PORT5_CONNECT 0x00200000 +#define FCR3_PORT5_RESUME 0x00400000 +#define FCR3_PORT6_DISCONNECT_SELECT 0x00800000 +#define FCR3_PORT6_CONNECT_SELECT 0x02000000 +#define FCR3_PORT6_RESUME_SELECT 0x04000000 +#define FCR3_PORT6_ENABLE 0x08000000 +#define FCR3_PORT6_DISCONNECT 0x10000000 +#define FCR3_PORT6_CONNECT 0x20000000 +#define FCR3_PORT6_RESUME 0x40000000 + +#define FCR4_PORT1_DISCONNECT_SELECT 0x00000001 +#define FCR4_PORT1_CONNECT_SELECT 0x00000002 +#define FCR4_PORT1_RESUME_SELECT 0x00000004 +#define FCR4_PORT1_ENABLE 0x00000008 +#define FCR4_PORT1_DISCONNECT 0x00000010 +#define FCR4_PORT1_CONNECT 0x00000020 +#define FCR4_PORT1_RESUME 0x00000040 +#define FCR4_PORT2_DISCONNECT_SELECT 0x00000100 +#define FCR4_PORT2_CONNECT_SELECT 0x00000200 +#define FCR4_PORT2_RESUME_SELECT 0x00000400 +#define FCR4_PORT2_ENABLE 0x00000800 +#define FCR4_PORT2_DISCONNECT 0x00001000 +#define FCR4_PORT2_CONNECT 0x00002000 +#define FCR4_PORT2_RESUME 0x00004000 +#define FCR4_PORT3_DISCONNECT_SELECT 0x00010000 +#define FCR4_PORT3_CONNECT_SELECT 0x00020000 +#define FCR4_PORT3_RESUME_SELECT 0x00040000 +#define FCR4_PORT3_ENABLE 0x00080000 +#define FCR4_PORT3_DISCONNECT 0x00100000 +#define FCR4_PORT3_CONNECT 0x00200000 +#define FCR4_PORT3_RESUME 0x00400000 +#define FCR4_PORT4_DISCONNECT_SELECT 0x01000000 +#define FCR4_PORT4_CONNECT_SELECT 0x02000000 +#define FCR4_PORT4_RESUME_SELECT 0x04000000 +#define FCR4_PORT4_ENABLE 0x08000000 +#define FCR4_PORT4_DISCONNECT 0x10000000 +#define FCR4_PORT4_CONNECT 0x20000000 +#define FCR4_PORT4_RESUME 0x40000000 + +#define FCR5_VIA_USE_CLK31 0x00000001 +#define FCR5_SCC_USE_CLK31 0x00000002 +#define FCR5_PWM_CLK32_ENABLE 0x00000004 +#define FCR5_CLK3_68_ENABLE 0x00000010 +#define FCR5_CLK32_ENABLE 0x00000020 + +/* + * K2 FCRs. + */ +#define FCR0_K2_USB0_SWRESET 0x00200000 +#define FCR0_K2_USB1_SWRESET 0x02000000 +#define FCR0_K2_RING_PME_DISABLE 0x08000000 + +#define FCR1_K2_I2S2_CELL_ENABLE 0x00000010 +#define FCR1_K2_I2S2_CLK_ENABLE 0x00000040 +#define FCR1_K2_I2S2_ENABLE 0x00000080 +#define FCR1_K2_PCI1_BUS_RESET 0x00000100 +#define FCR1_K2_PCI1_SLEEP_RESET_EN 0x00000200 +#define FCR1_K2_PCI1_CLK_ENABLE 0x00004000 +#define FCR1_K2_FW_CLK_ENABLE 0x00008000 +#define FCR1_K2_FW_RESET 0x00010000 +#define FCR1_K2_I2S1_SWRESET 0x00040000 +#define FCR1_K2_GB_CLK_ENABLE 0x00400000 +#define FCR1_GB_PWR_DOWN 0x00800000 +#define FCR1_K2_GB_RESET 0x01000000 +#define FCR1_K2_SATA_CLK_ENABLE 0x02000000 +#define FCR1_K2_SATA_PWR_DOWN 0x04000000 +#define FCR1_K2_SATA_RESET 0x08000000 +#define FCR1_K2_UATA_CLK_ENABLE 0x10000000 +#define FCR1_K2_UATA_RESET 0x40000000 +#define FCR1_K2_UATA_CHOOSE_CLK66 0x80000000 + +#define FCR2_K2_PWM0_AUTO_STOP_EN 0x00000010 +#define FCR2_K2_PWM1_AUTO_STOP_EN 0x00000020 +#define FCR2_K2_PWM2_AUTO_STOP_EN 0x00000040 +#define FCR2_K2_PWM3_AUTO_STOP_EN 0x00000080 +#define FCR2_K2_PWM0_OVER_TEMP_EN 0x00000100 +#define FCR2_K2_PWM1_OVER_TEMP_EN 0x00000200 +#define FCR2_K2_PWM2_OVER_TEMP_EN 0x00000400 +#define FCR2_K2_PWM3_OVER_TEMP_EN 0x00000800 +#define FCR2_K2_HT_ENABLE_INTERRUPTS 0x00008000 +#define FCR2_K2_SB_MPIC_ENABLE_OUTPUTS 0x00010000 +#define FCR2_K2_SB_MPIC_RESET 0x00010000 +#define FCR2_K2_FW_LINK_ON_INT_EN 0x00040000 +#define FCR2_K2_FW_ALT_LINK_ON_SEL 0x00080000 +#define FCR2_K2_PWMS_EN 0x00100000 +#define FCR2_K2_GB_WAKE_INT_EN 0x00200000 +#define FCR2_K2_GB_ENERGY_INT_EN 0x00400000 +#define FCR2_K2_BLOCK_EXT_GPIO1 0x00800000 +#define FCR2_K2_PCI0_BRIDGE_INT 0x01000000 +#define FCR2_K2_PCI1_BRIDGE_INT 0x02000000 +#define FCR2_K2_PCI2_BRIDGE_INT 0x04000000 +#define FCR2_K2_PCI3_BRIDGE_INT 0x08000000 +#define FCR2_K2_PCI4_BRIDGE_INT 0x10000000 +#define FCR2_K2_HT_NONFATAL_ERROR 0x40000000 +#define FCR2_K2_HT_FATAL_ERROR 0x80000000 + +#define FCR3_K2_ENABLE_OSC25_SHUTDOWN 0x00000001 +#define FCR3_K2_ENABLE_FW_PAD_PWRDOWN 0x00000002 +#define FCR3_K2_ENABLE_GBPAD_PWRDOWN 0x00000004 +#define FCR3_K2_ENABLE_PLL0_SHUTDOWN 0x00000080 +#define FCR3_K2_ENABLE_PLL6_SHUTDOWN 0x00000100 +#define FCR3_K2_DYN_CLK_STOP_ENABLE 0x00000800 +#define FCR3_K2_I2S2_CLK18_ENABLE 0x00008000 + +#define FCR9_K2_PCI1_CLK66_IS_STOPPED 0x00000001 +#define FCR9_K2_PCI2_CLK66_IS_STOPPED 0x00000002 +#define FCR9_K2_FW_CLK66_IS_STOPPED 0x00000004 +#define FCR9_K2_UATA_CLK66_IS_STOPPED 0x00000008 +#define FCR9_K2_UATA_CLK100_IS_STOPPED 0x00000010 +#define FCR9_K2_PCI3_CLK66_IS_STOPPED 0x00000020 +#define FCR9_K2_GB_CLK66_IS_STOPPED 0x00000040 +#define FCR9_K2_PCI4_CLK66_IS_STOPPED 0x00000080 +#define FCR9_K2_SATA_CLK66_IS_STOPPED 0x00000100 +#define FCR9_K2_USB0_CLK48_IS_STOPPED 0x00000200 +#define FCR9_K2_USB1_CLK48_IS_STOPPED 0x00000400 +#define FCR9_K2_CLK45_IS_STOPPED 0x00000800 +#define FCR9_K2_CLK49_IS_STOPPED 0x00001000 +#define FCR9_K2_OSC25_SHUTDOWN 0x00008000 + /* * Format of a macio reg property entry. */ Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Wed Jan 15 04:25:54 2014 (r260668) @@ -132,10 +132,10 @@ static device_method_t pmu_methods[] = /* Device interface */ DEVMETHOD(device_probe, pmu_probe), DEVMETHOD(device_attach, pmu_attach), - DEVMETHOD(device_detach, pmu_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, pmu_suspend), - DEVMETHOD(device_resume, pmu_resume), + DEVMETHOD(device_detach, pmu_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, pmu_suspend), + DEVMETHOD(device_resume, pmu_resume), /* ADB bus interface */ DEVMETHOD(adb_hb_send_raw_packet, pmu_adb_send), @@ -157,7 +157,7 @@ static driver_t pmu_driver = { static devclass_t pmu_devclass; -DRIVER_MODULE(pmu, macio, pmu_driver, pmu_devclass, 0, 0); +EARLY_DRIVER_MODULE(pmu, macio, pmu_driver, pmu_devclass, 0, 0, BUS_PASS_RESOURCE); DRIVER_MODULE(adb, pmu, adb_driver, adb_devclass, 0, 0); static int pmuextint_probe(device_t); @@ -431,6 +431,10 @@ pmu_attach(device_t dev) "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, pmu_sleep, "I", "Put the machine to sleep"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + pmu_sleep, "I", "Put the machine to sleep"); + if (sc->sc_batteries > 0) { struct sysctl_oid *oid, *battroot; char battnum[2]; @@ -540,43 +544,6 @@ pmu_write_reg(struct pmu_softc *sc, u_in bus_write_1(sc->sc_memr, offset, value); } -static void -pmu_save_state(struct pmu_softc *sc) -{ - sc->saved_regs[0] = pmu_read_reg(sc, vBufA); - sc->saved_regs[1] = pmu_read_reg(sc, vDirA); - sc->saved_regs[2] = pmu_read_reg(sc, vBufB); - sc->saved_regs[3] = pmu_read_reg(sc, vDirB); - sc->saved_regs[4] = pmu_read_reg(sc, vPCR); - sc->saved_regs[5] = pmu_read_reg(sc, vACR); - sc->saved_regs[6] = pmu_read_reg(sc, vIER); - sc->saved_regs[7] = pmu_read_reg(sc, vT1C); - sc->saved_regs[8] = pmu_read_reg(sc, vT1CH); -} - -static void -pmu_restore_state(struct pmu_softc *sc) -{ - pmu_write_reg(sc, vBufA, sc->saved_regs[0]); - eieio(); - pmu_write_reg(sc, vDirA, sc->saved_regs[1]); - eieio(); - pmu_write_reg(sc, vBufB, sc->saved_regs[2]); - eieio(); - pmu_write_reg(sc, vDirB, sc->saved_regs[3]); - eieio(); - pmu_write_reg(sc, vPCR, sc->saved_regs[4]); - eieio(); - pmu_write_reg(sc, vACR, sc->saved_regs[5]); - eieio(); - pmu_write_reg(sc, vIER, sc->saved_regs[6]); - eieio(); - pmu_write_reg(sc, vT1C, sc->saved_regs[7]); - eieio(); - pmu_write_reg(sc, vT1CH, sc->saved_regs[8]); - eieio(); -} - static int pmu_send_byte(struct pmu_softc *sc, uint8_t data) { @@ -1079,6 +1046,34 @@ pmu_settime(device_t dev, struct timespe return (0); } + +static void +pmu_save_state(struct pmu_softc *sc) +{ + sc->saved_regs[0] = pmu_read_reg(sc, vBufA); + sc->saved_regs[1] = pmu_read_reg(sc, vDirA); + sc->saved_regs[2] = pmu_read_reg(sc, vBufB); + sc->saved_regs[3] = pmu_read_reg(sc, vDirB); + sc->saved_regs[4] = pmu_read_reg(sc, vPCR); + sc->saved_regs[5] = pmu_read_reg(sc, vACR); + sc->saved_regs[6] = pmu_read_reg(sc, vIER); + sc->saved_regs[7] = pmu_read_reg(sc, vT1C); + sc->saved_regs[8] = pmu_read_reg(sc, vT1CH); +} + +static void +pmu_restore_state(struct pmu_softc *sc) +{ + pmu_write_reg(sc, vBufA, sc->saved_regs[0]); + pmu_write_reg(sc, vDirA, sc->saved_regs[1]); + pmu_write_reg(sc, vBufB, sc->saved_regs[2]); + pmu_write_reg(sc, vDirB, sc->saved_regs[3]); + pmu_write_reg(sc, vPCR, sc->saved_regs[4]); + pmu_write_reg(sc, vACR, sc->saved_regs[5]); + pmu_write_reg(sc, vIER, sc->saved_regs[6]); + pmu_write_reg(sc, vT1C, sc->saved_regs[7]); + pmu_write_reg(sc, vT1CH, sc->saved_regs[8]); +} static int pmu_suspend(device_t dev) @@ -1189,31 +1184,6 @@ void pmu_sleep_int(void) powerpc_sync(); } -static int -pmu_sleep(SYSCTL_HANDLER_ARGS) -{ - u_int sleep = 0; - int error; - - error = sysctl_handle_int(oidp, &sleep, 0, req); - - if (error || !req->newptr) - return (error); - - mtx_lock(&Giant); - error = DEVICE_SUSPEND(root_bus); - if (error == 0) { - spinlock_enter(); - pmu_sleep_int(); - - spinlock_exit(); - DEVICE_RESUME(root_bus); - } - mtx_unlock(&Giant); - - return (error); -} - int pmu_set_speed(int low_speed) { @@ -1240,3 +1210,29 @@ pmu_set_speed(int low_speed) return (0); } + +static int +pmu_sleep(SYSCTL_HANDLER_ARGS) +{ + u_int sleep = 0; + int error; + + error = sysctl_handle_int(oidp, &sleep, 0, req); + + if (error || !req->newptr) + return (error); + + mtx_lock(&Giant); + error = DEVICE_SUSPEND(root_bus); + if (error == 0) { + spinlock_enter(); + pmu_sleep_int(); + + spinlock_exit(); + DEVICE_RESUME(root_bus); + } + mtx_unlock(&Giant); + printf("Fully resumed.\n"); + + return (error); +} Modified: projects/pmac_pmu/sys/powerpc/powermac/viareg.h ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/viareg.h Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/powerpc/powermac/viareg.h Wed Jan 15 04:25:54 2014 (r260668) @@ -30,6 +30,7 @@ /* VIA interface registers */ #define vBufB 0x0000 /* register B */ +#define vBufAH 0x0200 /* register A (handshake) */ #define vDirB 0x0400 /* data direction register */ #define vDirA 0x0600 /* data direction register */ #define vT1C 0x0800 /* Timer 1 counter Lo */ Modified: projects/pmac_pmu/sys/sys/bus.h ============================================================================== --- projects/pmac_pmu/sys/sys/bus.h Wed Jan 15 04:16:45 2014 (r260667) +++ projects/pmac_pmu/sys/sys/bus.h Wed Jan 15 04:25:54 2014 (r260668) @@ -54,7 +54,8 @@ typedef enum device_state { DS_ALIVE = 20, /**< @brief probe succeeded */ DS_ATTACHING = 25, /**< @brief currently attaching */ DS_ATTACHED = 30, /**< @brief attach method called */ - DS_BUSY = 40 /**< @brief device is open */ + DS_BUSY = 40, /**< @brief device is open */ + DS_SUSPENDED = 50, /**< @brief device is suspended */ } device_state_t; /** @@ -340,6 +341,7 @@ int bus_generic_read_ivar(device_t dev, int bus_generic_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); int bus_generic_resume(device_t dev); +int bus_generic_resume_child(device_t dev, device_t child); int bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, driver_intr_t *intr, @@ -358,6 +360,7 @@ int bus_generic_rl_release_resource (dev int bus_generic_shutdown(device_t dev); int bus_generic_suspend(device_t dev); +int bus_generic_suspend_child(device_t dev, device_t child); int bus_generic_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); int bus_generic_write_ivar(device_t dev, device_t child, int which, From owner-svn-src-projects@FreeBSD.ORG Wed Jan 15 09:01:05 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0027B6F3; Wed, 15 Jan 2014 09:01:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C90D71A22; Wed, 15 Jan 2014 09:01:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0F914vj046505; Wed, 15 Jan 2014 09:01:04 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0F914GH046504; Wed, 15 Jan 2014 09:01:04 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401150901.s0F914GH046504@svn.freebsd.org> From: Kai Wang Date: Wed, 15 Jan 2014 09:01:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260687 - projects/elftoolchain X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 09:01:05 -0000 Author: kaiw Date: Wed Jan 15 09:01:04 2014 New Revision: 260687 URL: http://svnweb.freebsd.org/changeset/base/260687 Log: Create elftoolchain project for libelf and libdwarf integration experiments. Added: - copied from r260686, head/ Directory Properties: projects/elftoolchain/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Wed Jan 15 22:30:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B245AFF1; Wed, 15 Jan 2014 22:30:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8419D1DB5; Wed, 15 Jan 2014 22:30:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FMUmuZ058811; Wed, 15 Jan 2014 22:30:48 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FMUmI8058810; Wed, 15 Jan 2014 22:30:48 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401152230.s0FMUmI8058810@svn.freebsd.org> From: Kai Wang Date: Wed, 15 Jan 2014 22:30:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260697 - in projects/elftoolchain/contrib/elftoolchain: . common libdwarf libelf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 22:30:48 -0000 Author: kaiw Date: Wed Jan 15 22:30:48 2014 New Revision: 260697 URL: http://svnweb.freebsd.org/changeset/base/260697 Log: Copy libelf, libdwarf and common files from vendor/ to contrib/. Added: projects/elftoolchain/contrib/elftoolchain/ projects/elftoolchain/contrib/elftoolchain/common/ - copied from r260696, vendor/elftoolchain/dist/common/ projects/elftoolchain/contrib/elftoolchain/libdwarf/ - copied from r260695, vendor/elftoolchain/dist/libdwarf/ projects/elftoolchain/contrib/elftoolchain/libelf/ - copied from r260695, vendor/elftoolchain/dist/libelf/ From owner-svn-src-projects@FreeBSD.ORG Wed Jan 15 22:35:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B1217DD; Wed, 15 Jan 2014 22:35:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF71B1E12; Wed, 15 Jan 2014 22:35:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FMZtdC059985; Wed, 15 Jan 2014 22:35:55 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FMZt8k059984; Wed, 15 Jan 2014 22:35:55 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401152235.s0FMZt8k059984@svn.freebsd.org> From: Kai Wang Date: Wed, 15 Jan 2014 22:35:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260698 - projects/elftoolchain/lib/libelf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 22:35:56 -0000 Author: kaiw Date: Wed Jan 15 22:35:55 2014 New Revision: 260698 URL: http://svnweb.freebsd.org/changeset/base/260698 Log: Removed source code for the old libelf and build the new libelf from contrib/ instead. Deleted: projects/elftoolchain/lib/libelf/README projects/elftoolchain/lib/libelf/Version.map projects/elftoolchain/lib/libelf/_libelf.h projects/elftoolchain/lib/libelf/elf.3 projects/elftoolchain/lib/libelf/elf_begin.3 projects/elftoolchain/lib/libelf/elf_begin.c projects/elftoolchain/lib/libelf/elf_cntl.3 projects/elftoolchain/lib/libelf/elf_cntl.c projects/elftoolchain/lib/libelf/elf_data.c projects/elftoolchain/lib/libelf/elf_end.3 projects/elftoolchain/lib/libelf/elf_end.c projects/elftoolchain/lib/libelf/elf_errmsg.3 projects/elftoolchain/lib/libelf/elf_errmsg.c projects/elftoolchain/lib/libelf/elf_errno.c projects/elftoolchain/lib/libelf/elf_fill.3 projects/elftoolchain/lib/libelf/elf_fill.c projects/elftoolchain/lib/libelf/elf_flag.c projects/elftoolchain/lib/libelf/elf_flagdata.3 projects/elftoolchain/lib/libelf/elf_getarhdr.3 projects/elftoolchain/lib/libelf/elf_getarhdr.c projects/elftoolchain/lib/libelf/elf_getarsym.3 projects/elftoolchain/lib/libelf/elf_getarsym.c projects/elftoolchain/lib/libelf/elf_getbase.3 projects/elftoolchain/lib/libelf/elf_getbase.c projects/elftoolchain/lib/libelf/elf_getdata.3 projects/elftoolchain/lib/libelf/elf_getident.3 projects/elftoolchain/lib/libelf/elf_getident.c projects/elftoolchain/lib/libelf/elf_getphdrnum.3 projects/elftoolchain/lib/libelf/elf_getphnum.3 projects/elftoolchain/lib/libelf/elf_getscn.3 projects/elftoolchain/lib/libelf/elf_getshdrnum.3 projects/elftoolchain/lib/libelf/elf_getshdrstrndx.3 projects/elftoolchain/lib/libelf/elf_getshnum.3 projects/elftoolchain/lib/libelf/elf_getshstrndx.3 projects/elftoolchain/lib/libelf/elf_hash.3 projects/elftoolchain/lib/libelf/elf_hash.c projects/elftoolchain/lib/libelf/elf_kind.3 projects/elftoolchain/lib/libelf/elf_kind.c projects/elftoolchain/lib/libelf/elf_memory.3 projects/elftoolchain/lib/libelf/elf_memory.c projects/elftoolchain/lib/libelf/elf_next.3 projects/elftoolchain/lib/libelf/elf_next.c projects/elftoolchain/lib/libelf/elf_phnum.c projects/elftoolchain/lib/libelf/elf_rand.3 projects/elftoolchain/lib/libelf/elf_rand.c projects/elftoolchain/lib/libelf/elf_rawfile.3 projects/elftoolchain/lib/libelf/elf_rawfile.c projects/elftoolchain/lib/libelf/elf_scn.c projects/elftoolchain/lib/libelf/elf_shnum.c projects/elftoolchain/lib/libelf/elf_shstrndx.c projects/elftoolchain/lib/libelf/elf_strptr.3 projects/elftoolchain/lib/libelf/elf_strptr.c projects/elftoolchain/lib/libelf/elf_types.m4 projects/elftoolchain/lib/libelf/elf_update.3 projects/elftoolchain/lib/libelf/elf_update.c projects/elftoolchain/lib/libelf/elf_version.3 projects/elftoolchain/lib/libelf/elf_version.c projects/elftoolchain/lib/libelf/gelf.3 projects/elftoolchain/lib/libelf/gelf.h projects/elftoolchain/lib/libelf/gelf_cap.c projects/elftoolchain/lib/libelf/gelf_checksum.3 projects/elftoolchain/lib/libelf/gelf_checksum.c projects/elftoolchain/lib/libelf/gelf_dyn.c projects/elftoolchain/lib/libelf/gelf_ehdr.c projects/elftoolchain/lib/libelf/gelf_fsize.3 projects/elftoolchain/lib/libelf/gelf_fsize.c projects/elftoolchain/lib/libelf/gelf_getcap.3 projects/elftoolchain/lib/libelf/gelf_getclass.3 projects/elftoolchain/lib/libelf/gelf_getclass.c projects/elftoolchain/lib/libelf/gelf_getdyn.3 projects/elftoolchain/lib/libelf/gelf_getehdr.3 projects/elftoolchain/lib/libelf/gelf_getmove.3 projects/elftoolchain/lib/libelf/gelf_getphdr.3 projects/elftoolchain/lib/libelf/gelf_getrel.3 projects/elftoolchain/lib/libelf/gelf_getrela.3 projects/elftoolchain/lib/libelf/gelf_getshdr.3 projects/elftoolchain/lib/libelf/gelf_getsym.3 projects/elftoolchain/lib/libelf/gelf_getsyminfo.3 projects/elftoolchain/lib/libelf/gelf_getsymshndx.3 projects/elftoolchain/lib/libelf/gelf_move.c projects/elftoolchain/lib/libelf/gelf_newehdr.3 projects/elftoolchain/lib/libelf/gelf_newphdr.3 projects/elftoolchain/lib/libelf/gelf_phdr.c projects/elftoolchain/lib/libelf/gelf_rel.c projects/elftoolchain/lib/libelf/gelf_rela.c projects/elftoolchain/lib/libelf/gelf_shdr.c projects/elftoolchain/lib/libelf/gelf_sym.c projects/elftoolchain/lib/libelf/gelf_syminfo.c projects/elftoolchain/lib/libelf/gelf_symshndx.c projects/elftoolchain/lib/libelf/gelf_update_ehdr.3 projects/elftoolchain/lib/libelf/gelf_xlate.c projects/elftoolchain/lib/libelf/gelf_xlatetof.3 projects/elftoolchain/lib/libelf/libelf.c projects/elftoolchain/lib/libelf/libelf.h projects/elftoolchain/lib/libelf/libelf_align.c projects/elftoolchain/lib/libelf/libelf_allocate.c projects/elftoolchain/lib/libelf/libelf_ar.c projects/elftoolchain/lib/libelf/libelf_ar_util.c projects/elftoolchain/lib/libelf/libelf_checksum.c projects/elftoolchain/lib/libelf/libelf_convert.m4 projects/elftoolchain/lib/libelf/libelf_data.c projects/elftoolchain/lib/libelf/libelf_ehdr.c projects/elftoolchain/lib/libelf/libelf_extended.c projects/elftoolchain/lib/libelf/libelf_fsize.m4 projects/elftoolchain/lib/libelf/libelf_msize.m4 projects/elftoolchain/lib/libelf/libelf_phdr.c projects/elftoolchain/lib/libelf/libelf_shdr.c projects/elftoolchain/lib/libelf/libelf_xlate.c Modified: projects/elftoolchain/lib/libelf/Makefile Modified: projects/elftoolchain/lib/libelf/Makefile ============================================================================== --- projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:30:48 2014 (r260697) +++ projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:35:55 2014 (r260698) @@ -1,8 +1,19 @@ # $FreeBSD$ +.include + +TOP= ${.CURDIR}/../../contrib/elftoolchain +SRCDIR= ${TOP}/libelf + +CFLAGS+= -I. # OBJDIR +CFLAGS+= -I${SRCDIR} # Sources +CFLAGS+= -I${TOP}/common # common code + +.PATH: ${SRCDIR} LIB= elf -SRCS= elf_begin.c \ +SRCS= elf.c \ + elf_begin.c \ elf_cntl.c \ elf_end.c elf_errmsg.c elf_errno.c \ elf_data.c \ @@ -16,6 +27,7 @@ SRCS= elf_begin.c \ elf_kind.c \ elf_memory.c \ elf_next.c \ + elf_open.c \ elf_rand.c \ elf_rawfile.c \ elf_phnum.c \ @@ -40,7 +52,6 @@ SRCS= elf_begin.c \ gelf_syminfo.c \ gelf_symshndx.c \ gelf_xlate.c \ - libelf.c \ libelf_align.c \ libelf_allocate.c \ libelf_ar.c \ @@ -49,28 +60,18 @@ SRCS= elf_begin.c \ libelf_data.c \ libelf_ehdr.c \ libelf_extended.c \ + libelf_memory.c \ + libelf_open.c \ libelf_phdr.c \ libelf_shdr.c \ libelf_xlate.c \ ${GENSRCS} -INCS= libelf.h gelf.h -# -# We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes -# problems when a header file in sys depends on a file in another -# part of the tree, e.g. a machine dependent header. -# -SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h +INCS= libelf.h gelf.h +INCSDIR= /usr/include GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} -CLEANDIRS= sys -CFLAGS+= -I${.CURDIR} -I. - -sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} - mkdir -p ${.OBJDIR}/sys - ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} SHLIB_MAJOR= 1 @@ -97,6 +98,7 @@ MAN= elf.3 \ elf_kind.3 \ elf_memory.3 \ elf_next.3 \ + elf_open.3 \ elf_rawfile.3 \ elf_rand.3 \ elf_strptr.3 \ @@ -124,6 +126,7 @@ MAN= elf.3 \ MLINKS+= \ elf_errmsg.3 elf_errno.3 \ + elf_flagdata.3 elf_flagarhdr.3 \ elf_flagdata.3 elf_flagehdr.3 \ elf_flagdata.3 elf_flagelf.3 \ elf_flagdata.3 elf_flagphdr.3 \ @@ -135,6 +138,7 @@ MLINKS+= \ elf_getscn.3 elf_newscn.3 \ elf_getscn.3 elf_nextscn.3 \ elf_getshstrndx.3 elf_setshstrndx.3 \ + elf_open.3 elf_openmemory.3 \ gelf_getcap.3 gelf_update_cap.3 \ gelf_getdyn.3 gelf_update_dyn.3 \ gelf_getmove.3 gelf_update_move.3 \ @@ -160,12 +164,7 @@ MLINKS+= \ gelf_xlatetof.3 elf${E}_xlatetom.3 .endfor -VERSION_MAP= ${.CURDIR}/Version.map - -LIBELF_TEST_HOOKS?= 1 -.if defined(LIBELF_TEST_HOOKS) && (${LIBELF_TEST_HOOKS} > 0) -CFLAGS+= -DLIBELF_TEST_HOOKS -.endif +VERSION_MAP= ${SRCDIR}/Version.map libelf_convert.c: elf_types.m4 libelf_convert.m4 libelf_fsize.c: elf_types.m4 libelf_fsize.m4 @@ -176,4 +175,5 @@ libelf_msize.c: elf_types.m4 libelf_msi # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: - m4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET} + m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} + From owner-svn-src-projects@FreeBSD.ORG Wed Jan 15 22:47:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBE22F78; Wed, 15 Jan 2014 22:47:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B80A01EF5; Wed, 15 Jan 2014 22:47:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FMlrgs064308; Wed, 15 Jan 2014 22:47:53 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FMlr29064307; Wed, 15 Jan 2014 22:47:53 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401152247.s0FMlr29064307@svn.freebsd.org> From: Kai Wang Date: Wed, 15 Jan 2014 22:47:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260699 - projects/elftoolchain/lib/libelf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 22:47:53 -0000 Author: kaiw Date: Wed Jan 15 22:47:53 2014 New Revision: 260699 URL: http://svnweb.freebsd.org/changeset/base/260699 Log: Set CFLAGS in just one line. Modified: projects/elftoolchain/lib/libelf/Makefile Modified: projects/elftoolchain/lib/libelf/Makefile ============================================================================== --- projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:35:55 2014 (r260698) +++ projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:47:53 2014 (r260699) @@ -4,10 +4,6 @@ TOP= ${.CURDIR}/../../contrib/elftoolchain SRCDIR= ${TOP}/libelf -CFLAGS+= -I. # OBJDIR -CFLAGS+= -I${SRCDIR} # Sources -CFLAGS+= -I${TOP}/common # common code - .PATH: ${SRCDIR} LIB= elf @@ -72,6 +68,7 @@ INCSDIR= /usr/include GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} +CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common SHLIB_MAJOR= 1 From owner-svn-src-projects@FreeBSD.ORG Thu Jan 16 21:47:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 901D2E45; Thu, 16 Jan 2014 21:47:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BF711D1A; Thu, 16 Jan 2014 21:47:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GLlSVG016045; Thu, 16 Jan 2014 21:47:28 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GLlSV5016044; Thu, 16 Jan 2014 21:47:28 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401162147.s0GLlSV5016044@svn.freebsd.org> From: Kai Wang Date: Thu, 16 Jan 2014 21:47:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260792 - projects/elftoolchain/contrib/elftoolchain/libelf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:47:28 -0000 Author: kaiw Date: Thu Jan 16 21:47:27 2014 New Revision: 260792 URL: http://svnweb.freebsd.org/changeset/base/260792 Log: Use FreeBSD's ELF headers instead of the elfdefinitions.h header which comes with elftoolchain. This version of libelf doesn't need to be portable; using FreeBSD's own ELF headers will avoid conflicts and make integration easier. Modified: projects/elftoolchain/contrib/elftoolchain/libelf/libelf.h Modified: projects/elftoolchain/contrib/elftoolchain/libelf/libelf.h ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libelf/libelf.h Thu Jan 16 21:46:43 2014 (r260791) +++ projects/elftoolchain/contrib/elftoolchain/libelf/libelf.h Thu Jan 16 21:47:27 2014 (r260792) @@ -30,8 +30,8 @@ #define _LIBELF_H_ #include - -#include +#include +#include /* Library private data structures */ typedef struct _Elf Elf; From owner-svn-src-projects@FreeBSD.ORG Thu Jan 16 21:50:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E767F43; Thu, 16 Jan 2014 21:50:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B69B1D2B; Thu, 16 Jan 2014 21:50:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GLoRfm016819; Thu, 16 Jan 2014 21:50:27 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GLoRAP016818; Thu, 16 Jan 2014 21:50:27 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401162150.s0GLoRAP016818@svn.freebsd.org> From: Kai Wang Date: Thu, 16 Jan 2014 21:50:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260793 - projects/elftoolchain/sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:50:27 -0000 Author: kaiw Date: Thu Jan 16 21:50:26 2014 New Revision: 260793 URL: http://svnweb.freebsd.org/changeset/base/260793 Log: Define SHT_GNU_LIBLIST and R_MIPS_64, which is needed for libelf and libdwarf. Modified: projects/elftoolchain/sys/sys/elf_common.h Modified: projects/elftoolchain/sys/sys/elf_common.h ============================================================================== --- projects/elftoolchain/sys/sys/elf_common.h Thu Jan 16 21:47:27 2014 (r260792) +++ projects/elftoolchain/sys/sys/elf_common.h Thu Jan 16 21:50:26 2014 (r260793) @@ -280,6 +280,7 @@ typedef struct { #define SHT_SUNW_cap 0x6ffffff5 #define SHT_SUNW_SIGNATURE 0x6ffffff6 #define SHT_GNU_HASH 0x6ffffff6 +#define SHT_GNU_LIBLIST 0x6ffffff7 #define SHT_SUNW_ANNOTATE 0x6ffffff7 #define SHT_SUNW_DEBUGSTR 0x6ffffff8 #define SHT_SUNW_DEBUG 0x6ffffff9 @@ -769,6 +770,7 @@ typedef struct { #define R_MIPS_PC16 10 /* PC relative 16 bit */ #define R_MIPS_CALL16 11 /* 16 bit GOT entry for function */ #define R_MIPS_GPREL32 12 /* GP relative 32 bit */ +#define R_MIPS_64 18 /* Direct 64 bit */ #define R_MIPS_GOTHI16 21 /* GOT HI 16 bit */ #define R_MIPS_GOTLO16 22 /* GOT LO 16 bit */ #define R_MIPS_CALLHI16 30 /* upper 16 bit GOT entry for function */ From owner-svn-src-projects@FreeBSD.ORG Thu Jan 16 21:52:10 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3939EEA; Thu, 16 Jan 2014 21:52:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23E1A1D9B; Thu, 16 Jan 2014 21:52:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GLqAbh019168; Thu, 16 Jan 2014 21:52:10 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GLq92u019167; Thu, 16 Jan 2014 21:52:09 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401162152.s0GLq92u019167@svn.freebsd.org> From: Kai Wang Date: Thu, 16 Jan 2014 21:52:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260794 - projects/elftoolchain/lib/libdwarf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:52:10 -0000 Author: kaiw Date: Thu Jan 16 21:52:09 2014 New Revision: 260794 URL: http://svnweb.freebsd.org/changeset/base/260794 Log: Remove the old libdwarf and bring in the new libdwarf in contrib/. Deleted: projects/elftoolchain/lib/libdwarf/_libdwarf.h projects/elftoolchain/lib/libdwarf/dwarf.h projects/elftoolchain/lib/libdwarf/dwarf_abbrev.c projects/elftoolchain/lib/libdwarf/dwarf_attr.c projects/elftoolchain/lib/libdwarf/dwarf_attrval.c projects/elftoolchain/lib/libdwarf/dwarf_cu.c projects/elftoolchain/lib/libdwarf/dwarf_dealloc.c projects/elftoolchain/lib/libdwarf/dwarf_die.c projects/elftoolchain/lib/libdwarf/dwarf_dump.c projects/elftoolchain/lib/libdwarf/dwarf_errmsg.c projects/elftoolchain/lib/libdwarf/dwarf_errno.c projects/elftoolchain/lib/libdwarf/dwarf_finish.c projects/elftoolchain/lib/libdwarf/dwarf_form.c projects/elftoolchain/lib/libdwarf/dwarf_func.c projects/elftoolchain/lib/libdwarf/dwarf_init.c projects/elftoolchain/lib/libdwarf/dwarf_loc.c projects/elftoolchain/lib/libdwarf/libdwarf.h Modified: projects/elftoolchain/lib/libdwarf/Makefile Modified: projects/elftoolchain/lib/libdwarf/Makefile ============================================================================== --- projects/elftoolchain/lib/libdwarf/Makefile Thu Jan 16 21:50:26 2014 (r260793) +++ projects/elftoolchain/lib/libdwarf/Makefile Thu Jan 16 21:52:09 2014 (r260794) @@ -1,9 +1,16 @@ # $FreeBSD$ +.include + +TOP= ${.CURDIR}/../../contrib/elftoolchain +SRCDIR= ${TOP}/libdwarf + +.PATH: ${SRCDIR} LIB= dwarf SRCS= \ dwarf_abbrev.c \ + dwarf_arange.c \ dwarf_attr.c \ dwarf_attrval.c \ dwarf_cu.c \ @@ -11,19 +18,317 @@ SRCS= \ dwarf_die.c \ dwarf_dump.c \ dwarf_errmsg.c \ - dwarf_errno.c \ dwarf_finish.c \ dwarf_form.c \ - dwarf_func.c \ + dwarf_frame.c \ + dwarf_funcs.c \ dwarf_init.c \ - dwarf_loc.c + dwarf_lineno.c \ + dwarf_loclist.c \ + dwarf_macinfo.c \ + dwarf_pro_arange.c \ + dwarf_pro_attr.c \ + dwarf_pro_die.c \ + dwarf_pro_expr.c \ + dwarf_pro_finish.c \ + dwarf_pro_frame.c \ + dwarf_pro_funcs.c \ + dwarf_pro_init.c \ + dwarf_pro_lineno.c \ + dwarf_pro_macinfo.c \ + dwarf_pro_pubnames.c \ + dwarf_pro_reloc.c \ + dwarf_pro_sections.c \ + dwarf_pro_types.c \ + dwarf_pro_vars.c \ + dwarf_pro_weaks.c \ + dwarf_pubnames.c \ + dwarf_pubtypes.c \ + dwarf_ranges.c \ + dwarf_reloc.c \ + dwarf_seterror.c \ + dwarf_str.c \ + dwarf_types.c \ + dwarf_vars.c \ + dwarf_weaks.c \ + libdwarf.c \ + libdwarf_abbrev.c \ + libdwarf_arange.c \ + libdwarf_attr.c \ + libdwarf_die.c \ + libdwarf_error.c \ + libdwarf_elf_access.c \ + libdwarf_elf_init.c \ + libdwarf_frame.c \ + libdwarf_info.c \ + libdwarf_init.c \ + libdwarf_lineno.c \ + libdwarf_loc.c \ + libdwarf_loclist.c \ + libdwarf_macinfo.c \ + libdwarf_nametbl.c \ + libdwarf_ranges.c \ + libdwarf_reloc.c \ + libdwarf_rw.c \ + libdwarf_sections.c \ + libdwarf_str.c -INCS= dwarf.h libdwarf.h +INCS= dwarf.h libdwarf.h +INCSDIR= /usr/include -CFLAGS+= -I${.CURDIR} +GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \ + dwarf_funcs.c dwarf_vars.c dwarf_types.c \ + dwarf_pro_pubnames.c dwarf_pro_weaks.c \ + dwarf_pro_funcs.c dwarf_pro_types.c \ + dwarf_pro_vars.c +CLEANFILES= ${GENSRCS} +CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf + +LDADD+= -lelf +DPADD+= ${LIBELF} SHLIB_MAJOR= 3 -WITHOUT_MAN= +MAN= dwarf.3 \ + dwarf_add_arange.3 \ + dwarf_add_AT_comp_dir.3 \ + dwarf_add_AT_const_value_string.3 \ + dwarf_add_AT_dataref.3 \ + dwarf_add_AT_flag.3 \ + dwarf_add_AT_location_expr.3 \ + dwarf_add_AT_name.3 \ + dwarf_add_AT_producer.3 \ + dwarf_add_AT_ref_address.3 \ + dwarf_add_AT_reference.3 \ + dwarf_add_AT_signed_const.3 \ + dwarf_add_AT_string.3 \ + dwarf_add_AT_targ_address.3 \ + dwarf_add_die_to_debug.3 \ + dwarf_add_directory_decl.3 \ + dwarf_add_expr_addr.3 \ + dwarf_add_expr_gen.3 \ + dwarf_add_fde_inst.3 \ + dwarf_add_file_decl.3 \ + dwarf_add_frame_cie.3 \ + dwarf_add_frame_fde.3 \ + dwarf_add_funcname.3 \ + dwarf_add_line_entry.3 \ + dwarf_add_pubname.3 \ + dwarf_add_typename.3 \ + dwarf_add_varname.3 \ + dwarf_add_weakname.3 \ + dwarf_attr.3 \ + dwarf_attrlist.3 \ + dwarf_attrval_signed.3 \ + dwarf_child.3 \ + dwarf_dealloc.3 \ + dwarf_def_macro.3 \ + dwarf_die_abbrev_code.3 \ + dwarf_die_link.3 \ + dwarf_diename.3 \ + dwarf_dieoffset.3 \ + dwarf_end_macro_file.3 \ + dwarf_errmsg.3 \ + dwarf_errno.3 \ + dwarf_expand_frame_instructions.3 \ + dwarf_expr_current_offset.3 \ + dwarf_expr_into_block.3 \ + dwarf_fde_cfa_offset.3 \ + dwarf_find_macro_value_start.3 \ + dwarf_finish.3 \ + dwarf_formaddr.3 \ + dwarf_formblock.3 \ + dwarf_formexprloc.3 \ + dwarf_formflag.3 \ + dwarf_formref.3 \ + dwarf_formsig8.3 \ + dwarf_formstring.3 \ + dwarf_formudata.3 \ + dwarf_get_abbrev.3 \ + dwarf_get_abbrev_children_flag.3 \ + dwarf_get_abbrev_code.3 \ + dwarf_get_abbrev_entry.3 \ + dwarf_get_abbrev_tag.3 \ + dwarf_get_address_size.3 \ + dwarf_get_arange.3 \ + dwarf_get_arange_info.3 \ + dwarf_get_aranges.3 \ + dwarf_get_AT_name.3 \ + dwarf_get_cie_index.3 \ + dwarf_get_cie_info.3 \ + dwarf_get_cie_of_fde.3 \ + dwarf_get_cu_die_offset.3 \ + dwarf_get_elf.3 \ + dwarf_get_fde_at_pc.3 \ + dwarf_get_fde_info_for_all_regs.3 \ + dwarf_get_fde_info_for_all_regs3.3 \ + dwarf_get_fde_info_for_cfa_reg3.3 \ + dwarf_get_fde_info_for_reg.3 \ + dwarf_get_fde_info_for_reg3.3 \ + dwarf_get_fde_instr_bytes.3 \ + dwarf_get_fde_list.3 \ + dwarf_get_fde_n.3 \ + dwarf_get_fde_range.3 \ + dwarf_get_form_class.3 \ + dwarf_get_funcs.3 \ + dwarf_get_globals.3 \ + dwarf_get_loclist_entry.3 \ + dwarf_get_macro_details.3 \ + dwarf_get_pubtypes.3 \ + dwarf_get_ranges.3 \ + dwarf_get_relocation_info.3 \ + dwarf_get_relocation_info_count.3 \ + dwarf_get_section_bytes.3 \ + dwarf_get_str.3 \ + dwarf_get_types.3 \ + dwarf_get_vars.3 \ + dwarf_get_weaks.3 \ + dwarf_hasattr.3 \ + dwarf_hasform.3 \ + dwarf_highpc.3 \ + dwarf_init.3 \ + dwarf_lineno.3 \ + dwarf_lne_end_sequence.3 \ + dwarf_lne_set_address.3 \ + dwarf_loclist.3 \ + dwarf_loclist_from_expr.3 \ + dwarf_new_die.3 \ + dwarf_new_expr.3 \ + dwarf_new_fde.3 \ + dwarf_next_cu_header.3 \ + dwarf_object_init.3 \ + dwarf_producer_init.3 \ + dwarf_producer_set_isa.3 \ + dwarf_reset_section_bytes.3 \ + dwarf_seterrarg.3 \ + dwarf_set_frame_cfa_value.3 \ + dwarf_set_reloc_application.3 \ + dwarf_srcfiles.3 \ + dwarf_srclines.3 \ + dwarf_start_macro_file.3 \ + dwarf_tag.3 \ + dwarf_transform_to_disk_form.3 \ + dwarf_undef_macro.3 \ + dwarf_vendor_ext.3 \ + dwarf_whatattr.3 + +MLINKS+= \ + dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_signedint.3 \ + dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_unsignedint.3 \ + dwarf_add_AT_signed_const.3 dwarf_add_AT_unsigned_const.3 \ + dwarf_add_AT_targ_address.3 dwarf_add_AT_targ_address_b.3 \ + dwarf_add_arange.3 dwarf_add_arange_b.3 \ + dwarf_add_expr_addr.3 dwarf_add_expr_addr_b.3 \ + dwarf_add_frame_fde.3 dwarf_add_frame_fde_b.3 \ + dwarf_attrval_signed.3 dwarf_attrval_flag.3 \ + dwarf_attrval_signed.3 dwarf_attrval_string.3 \ + dwarf_attrval_signed.3 dwarf_attrval_unsigned.3 \ + dwarf_child.3 dwarf_offdie.3 \ + dwarf_child.3 dwarf_siblingof.3 \ + dwarf_dealloc.3 dwarf_fde_cie_list_dealloc.3 \ + dwarf_dealloc.3 dwarf_funcs_dealloc.3 \ + dwarf_dealloc.3 dwarf_globals_dealloc.3 \ + dwarf_dealloc.3 dwarf_pubtypes_dealloc.3 \ + dwarf_dealloc.3 dwarf_types_dealloc.3 \ + dwarf_dealloc.3 dwarf_vars_dealloc.3 \ + dwarf_dealloc.3 dwarf_weaks_dealloc.3 \ + dwarf_dealloc.3 dwarf_ranges_dealloc.3 \ + dwarf_dealloc.3 dwarf_srclines_dealloc.3 \ + dwarf_init.3 dwarf_elf_init.3 \ + dwarf_dieoffset.3 dwarf_die_CU_offset.3 \ + dwarf_dieoffset.3 dwarf_die_CU_offset_range.3 \ + dwarf_dieoffset.3 dwarf_get_cu_die_offset_given_cu_header_offset.3 \ + dwarf_finish.3 dwarf_object_finish.3 \ + dwarf_formref.3 dwarf_global_formref.3 \ + dwarf_formudata.3 dwarf_formsdata.3 \ + dwarf_get_AT_name.3 dwarf_get_ACCESS_name.3 \ + dwarf_get_AT_name.3 dwarf_get_ATE_name.3 \ + dwarf_get_AT_name.3 dwarf_get_CC_name.3 \ + dwarf_get_AT_name.3 dwarf_get_CFA_name.3 \ + dwarf_get_AT_name.3 dwarf_get_CHILDREN_name.3 \ + dwarf_get_AT_name.3 dwarf_get_DS_name.3 \ + dwarf_get_AT_name.3 dwarf_get_DSC_name.3 \ + dwarf_get_AT_name.3 dwarf_get_EH_name.3 \ + dwarf_get_AT_name.3 dwarf_get_END_name.3 \ + dwarf_get_AT_name.3 dwarf_get_FORM_name.3 \ + dwarf_get_AT_name.3 dwarf_get_ID_name.3 \ + dwarf_get_AT_name.3 dwarf_get_INL_name.3 \ + dwarf_get_AT_name.3 dwarf_get_LANG_name.3 \ + dwarf_get_AT_name.3 dwarf_get_LNE_name.3 \ + dwarf_get_AT_name.3 dwarf_get_LNS_name.3 \ + dwarf_get_AT_name.3 dwarf_get_MACINFO_name.3 \ + dwarf_get_AT_name.3 dwarf_get_OP_name.3 \ + dwarf_get_AT_name.3 dwarf_get_ORD_name.3 \ + dwarf_get_AT_name.3 dwarf_get_TAG_name.3 \ + dwarf_get_AT_name.3 dwarf_get_VIRTUALITY_name.3 \ + dwarf_get_AT_name.3 dwarf_get_VIS_name.3 \ + dwarf_get_cu_die_offset.3 dwarf_get_arange_cu_header_offset.3 \ + dwarf_get_fde_list.3 dwarf_get_fde_list_eh.3 \ + dwarf_get_funcs.3 dwarf_func_die_offset.3 \ + dwarf_get_funcs.3 dwarf_func_cu_offset.3 \ + dwarf_get_funcs.3 dwarf_func_name_offsets.3 \ + dwarf_get_funcs.3 dwarf_funcname.3 \ + dwarf_get_globals.3 dwarf_global_die_offset.3 \ + dwarf_get_globals.3 dwarf_global_cu_offset.3 \ + dwarf_get_globals.3 dwarf_global_name_offsets.3 \ + dwarf_get_globals.3 dwarf_globname.3 \ + dwarf_get_pubtypes.3 dwarf_pubtype_die_offset.3 \ + dwarf_get_pubtypes.3 dwarf_pubtype_cu_offset.3 \ + dwarf_get_pubtypes.3 dwarf_pubtype_name_offsets.3 \ + dwarf_get_pubtypes.3 dwarf_pubtypename.3 \ + dwarf_get_ranges.3 dwarf_get_ranges_a.3 \ + dwarf_get_types.3 dwarf_type_die_offset.3 \ + dwarf_get_types.3 dwarf_type_cu_offset.3 \ + dwarf_get_types.3 dwarf_type_name_offsets.3 \ + dwarf_get_types.3 dwarf_typename.3 \ + dwarf_get_vars.3 dwarf_var_die_offset.3 \ + dwarf_get_vars.3 dwarf_var_cu_offset.3 \ + dwarf_get_vars.3 dwarf_var_name_offsets.3 \ + dwarf_get_vars.3 dwarf_varname.3 \ + dwarf_get_weaks.3 dwarf_weak_die_offset.3 \ + dwarf_get_weaks.3 dwarf_weak_cu_offset.3 \ + dwarf_get_weaks.3 dwarf_weak_name_offsets.3 \ + dwarf_get_weaks.3 dwarf_weakname.3 \ + dwarf_hasform.3 dwarf_whatform.3 \ + dwarf_hasform.3 dwarf_whatform_direct.3 \ + dwarf_highpc.3 dwarf_arrayorder.3 \ + dwarf_highpc.3 dwarf_bitoffset.3 \ + dwarf_highpc.3 dwarf_bitsize.3 \ + dwarf_highpc.3 dwarf_bytesize.3 \ + dwarf_highpc.3 dwarf_lowpc.3 \ + dwarf_highpc.3 dwarf_srclang.3 \ + dwarf_lineno.3 dwarf_lineaddr.3 \ + dwarf_lineno.3 dwarf_linebeginstatement.3 \ + dwarf_lineno.3 dwarf_lineblock.3 \ + dwarf_lineno.3 dwarf_lineendsequence.3 \ + dwarf_lineno.3 dwarf_lineoff.3 \ + dwarf_lineno.3 dwarf_linesrc.3 \ + dwarf_lineno.3 dwarf_line_srcfileno.3 \ + dwarf_loclist.3 dwarf_loclist_n.3 \ + dwarf_loclist_from_expr.3 dwarf_loclist_from_expr_a.3 \ + dwarf_producer_init.3 dwarf_producer_init_b.3 \ + dwarf_seterrarg.3 dwarf_seterrhand.3 \ + dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_initial_value.3 \ + dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_table_size.3 \ + dwarf_set_frame_cfa_value.3 dwarf_set_frame_same_value.3 \ + dwarf_set_frame_cfa_value.3 dwarf_set_frame_undefined_value.3 + +dwarf_pubnames.c: dwarf_nametbl.m4 dwarf_pubnames.m4 +dwarf_pubtypes.c: dwarf_nametbl.m4 dwarf_pubtypes.m4 +dwarf_weaks.c: dwarf_nametbl.m4 dwarf_weaks.m4 +dwarf_funcs.c: dwarf_nametbl.m4 dwarf_funcs.m4 +dwarf_vars.c: dwarf_nametbl.m4 dwarf_vars.m4 +dwarf_types.c: dwarf_nametbl.m4 dwarf_types.m4 +dwarf_pro_pubnames.c: dwarf_pro_nametbl.m4 dwarf_pro_pubnames.m4 +dwarf_pro_weaks.c: dwarf_pro_nametbl.m4 dwarf_pro_weaks.m4 +dwarf_pro_funcs.c: dwarf_pro_nametbl.m4 dwarf_pro_funcs.m4 +dwarf_pro_types.c: dwarf_pro_nametbl.m4 dwarf_pro_types.m4 +dwarf_pro_vars.c: dwarf_pro_nametbl.m4 dwarf_pro_vars.m4 .include + +# Keep the .SUFFIXES line after the include of bsd.lib.mk +.SUFFIXES: .m4 .c +.m4.c: + m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} + From owner-svn-src-projects@FreeBSD.ORG Thu Jan 16 21:56:06 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26A331FD; Thu, 16 Jan 2014 21:56:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 121981DB6; Thu, 16 Jan 2014 21:56:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GLu5DE019651; Thu, 16 Jan 2014 21:56:05 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GLu518019650; Thu, 16 Jan 2014 21:56:05 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401162156.s0GLu518019650@svn.freebsd.org> From: Kai Wang Date: Thu, 16 Jan 2014 21:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260795 - projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:56:06 -0000 Author: kaiw Date: Thu Jan 16 21:56:05 2014 New Revision: 260795 URL: http://svnweb.freebsd.org/changeset/base/260795 Log: Convert ctfconvert to use the new libdwarf API. Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Thu Jan 16 21:52:09 2014 (r260794) +++ projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Thu Jan 16 21:56:05 2014 (r260795) @@ -271,7 +271,7 @@ die_off(dwarf_t *dw, Dwarf_Die die) return (off); terminate("failed to get offset for die: %s\n", - dwarf_errmsg(&dw->dw_err)); + dwarf_errmsg(dw->dw_err)); /*NOTREACHED*/ return (0); } @@ -289,7 +289,7 @@ die_sibling(dwarf_t *dw, Dwarf_Die die) return (NULL); terminate("die %llu: failed to find type sibling: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); /*NOTREACHED*/ return (NULL); } @@ -306,7 +306,7 @@ die_child(dwarf_t *dw, Dwarf_Die die) return (NULL); terminate("die %llu: failed to find type child: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); /*NOTREACHED*/ return (NULL); } @@ -320,7 +320,7 @@ die_tag(dwarf_t *dw, Dwarf_Die die) return (tag); terminate("die %llu: failed to get tag for type: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); /*NOTREACHED*/ return (0); } @@ -343,7 +343,7 @@ die_attr(dwarf_t *dw, Dwarf_Die die, Dwa } terminate("die %llu: failed to get attribute for type: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); /*NOTREACHED*/ return (NULL); } @@ -353,10 +353,10 @@ die_signed(dwarf_t *dw, Dwarf_Die die, D int req) { *valp = 0; - if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DW_DLV_OK) { if (req) terminate("die %llu: failed to get signed: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); return (0); } @@ -368,10 +368,10 @@ die_unsigned(dwarf_t *dw, Dwarf_Die die, int req) { *valp = 0; - if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) != DW_DLV_OK) { if (req) terminate("die %llu: failed to get unsigned: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); return (0); } @@ -383,10 +383,10 @@ die_bool(dwarf_t *dw, Dwarf_Die die, Dwa { *valp = 0; - if (dwarf_attrval_flag(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (dwarf_attrval_flag(die, name, valp, &dw->dw_err) != DW_DLV_OK) { if (req) terminate("die %llu: failed to get flag: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); return (0); } @@ -398,11 +398,11 @@ die_string(dwarf_t *dw, Dwarf_Die die, D { const char *str = NULL; - if (dwarf_attrval_string(die, name, &str, &dw->dw_err) != DWARF_E_NONE || + if (dwarf_attrval_string(die, name, &str, &dw->dw_err) != DW_DLV_OK || str == NULL) { if (req) terminate("die %llu: failed to get string: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); else *strp = NULL; return (0); @@ -417,9 +417,9 @@ die_attr_ref(dwarf_t *dw, Dwarf_Die die, { Dwarf_Off off; - if (dwarf_attrval_unsigned(die, name, &off, &dw->dw_err) != DWARF_E_NONE) { + if (dwarf_attrval_unsigned(die, name, &off, &dw->dw_err) != DW_DLV_OK) { terminate("die %llu: failed to get ref: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + die_off(dw, die), dwarf_errmsg(dw->dw_err)); } return (off); @@ -489,8 +489,12 @@ die_mem_offset(dwarf_t *dw, Dwarf_Die di { Dwarf_Locdesc *loc = NULL; Dwarf_Signed locnum = 0; + Dwarf_Attribute at; - if (dwarf_locdesc(die, name, &loc, &locnum, &dw->dw_err) != DW_DLV_OK) + if ((at = die_attr(dw, die, name, 0)) == NULL) + return (0); + + if (dwarf_loclist(at, &loc, &locnum, &dw->dw_err) != DW_DLV_OK) return (0); if (locnum != 1 || loc->ld_s->lr_atom != DW_OP_plus_uconst) { @@ -500,10 +504,10 @@ die_mem_offset(dwarf_t *dw, Dwarf_Die di *valp = loc->ld_s->lr_number; - if (loc != NULL) - if (dwarf_locdesc_free(loc, &dw->dw_err) != DW_DLV_OK) - terminate("die %llu: cannot free location descriptor: %s\n", - die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + if (loc != NULL) { + dwarf_dealloc(dw->dw_dw, loc->ld_s, DW_DLA_LOC_BLOCK); + dwarf_dealloc(dw->dw_dw, loc, DW_DLA_LOCDESC); + } return (1); } @@ -1852,7 +1856,7 @@ int dw_read(tdata_t *td, Elf *elf, char *filename __unused) { Dwarf_Unsigned abboff, hdrlen, nxthdr; - Dwarf_Half vers, addrsz; + Dwarf_Half vers, addrsz, offsz; Dwarf_Die cu = 0; Dwarf_Die child = 0; dwarf_t dw; @@ -1869,7 +1873,7 @@ dw_read(tdata_t *td, Elf *elf, char *fil dw.dw_enumhash = hash_new(TDESC_HASH_BUCKETS, tdesc_namehash, tdesc_namecmp); - if ((rc = dwarf_elf_init(elf, DW_DLC_READ, &dw.dw_dw, + if ((rc = dwarf_elf_init(elf, DW_DLC_READ, NULL, NULL, &dw.dw_dw, &dw.dw_err)) == DW_DLV_NO_ENTRY) { if (should_have_dwarf(elf)) { errno = ENOENT; @@ -1878,7 +1882,7 @@ dw_read(tdata_t *td, Elf *elf, char *fil return (0); } } else if (rc != DW_DLV_OK) { - if (dwarf_errno(&dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { + if (dwarf_errno(dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { /* * There's no type data in the DWARF section, but * libdwarf is too clever to handle that properly. @@ -1887,12 +1891,12 @@ dw_read(tdata_t *td, Elf *elf, char *fil } terminate("failed to initialize DWARF: %s\n", - dwarf_errmsg(&dw.dw_err)); + dwarf_errmsg(dw.dw_err)); } - if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff, - &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK) - terminate("rc = %d %s\n", rc, dwarf_errmsg(&dw.dw_err)); + if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff, + &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK) + terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err)); if ((cu = die_sibling(&dw, NULL)) == NULL || (((child = die_child(&dw, cu)) == NULL) && @@ -1930,11 +1934,11 @@ dw_read(tdata_t *td, Elf *elf, char *fil if ((child = die_child(&dw, cu)) != NULL) die_create(&dw, child); - if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff, - &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_NO_ENTRY) + if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff, + &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_NO_ENTRY) terminate("multiple compilation units not supported\n"); - (void) dwarf_finish(&dw.dw_dw, &dw.dw_err); + (void) dwarf_finish(dw.dw_dw, &dw.dw_err); die_resolve(&dw); From owner-svn-src-projects@FreeBSD.ORG Thu Jan 16 22:28:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 721BBAF1; Thu, 16 Jan 2014 22:28:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5E1FC1FE9; Thu, 16 Jan 2014 22:28:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GMSYXv031707; Thu, 16 Jan 2014 22:28:34 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GMSY9Q031706; Thu, 16 Jan 2014 22:28:34 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401162228.s0GMSY9Q031706@svn.freebsd.org> From: Kai Wang Date: Thu, 16 Jan 2014 22:28:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260797 - projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 22:28:34 -0000 Author: kaiw Date: Thu Jan 16 22:28:33 2014 New Revision: 260797 URL: http://svnweb.freebsd.org/changeset/base/260797 Log: If function die_name() finds a DIE without a name, set its name to "__anon__". This hack is used to workaround a issue that compilers like GCC could generate DW_TAG_base_type DIE without a name. Note that we didn't need this before because the old libdwarf internally set all the unnamed DIE's name to "__anon__". Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Thu Jan 16 22:14:54 2014 (r260796) +++ projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Thu Jan 16 22:28:33 2014 (r260797) @@ -431,6 +431,8 @@ die_name(dwarf_t *dw, Dwarf_Die die) char *str = NULL; (void) die_string(dw, die, DW_AT_name, &str, 0); + if (str == NULL) + str = xstrdup("__anon__"); return (str); } From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 06:43:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D728569; Fri, 17 Jan 2014 06:43:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A63D13C9; Fri, 17 Jan 2014 06:43:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0H6havF028790; Fri, 17 Jan 2014 06:43:36 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0H6haUf028789; Fri, 17 Jan 2014 06:43:36 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401170643.s0H6haUf028789@svn.freebsd.org> From: Justin Hibbits Date: Fri, 17 Jan 2014 06:43:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260807 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 06:43:36 -0000 Author: jhibbits Date: Fri Jan 17 06:43:35 2014 New Revision: 260807 URL: http://svnweb.freebsd.org/changeset/base/260807 Log: Fix a mis-merge, and remove an unnecessary initialization. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Fri Jan 17 05:26:55 2014 (r260806) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Fri Jan 17 06:43:35 2014 (r260807) @@ -431,10 +431,6 @@ pmu_attach(device_t dev) "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, pmu_sleep, "I", "Put the machine to sleep"); - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, - "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, - pmu_sleep, "I", "Put the machine to sleep"); - if (sc->sc_batteries > 0) { struct sysctl_oid *oid, *battroot; char battnum[2]; @@ -492,7 +488,6 @@ pmu_attach(device_t dev) } } - sc->lid_closed = 0; /* * Set up LED interface */ From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 08:44:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4922F87E; Fri, 17 Jan 2014 08:44:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35A771D30; Fri, 17 Jan 2014 08:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0H8iDK4076477; Fri, 17 Jan 2014 08:44:13 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0H8iDqx076476; Fri, 17 Jan 2014 08:44:13 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401170844.s0H8iDqx076476@svn.freebsd.org> From: Kai Wang Date: Fri, 17 Jan 2014 08:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260809 - projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 08:44:13 -0000 Author: kaiw Date: Fri Jan 17 08:44:12 2014 New Revision: 260809 URL: http://svnweb.freebsd.org/changeset/base/260809 Log: We should not set the unnamed DIE's name to "__anon__" since that will bring back a known issue with DTrace regarding type name comparison. Instead, we can set the name to an empty string. Pointed out by: avg Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Modified: projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Jan 17 08:21:09 2014 (r260808) +++ projects/elftoolchain/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Jan 17 08:44:12 2014 (r260809) @@ -432,7 +432,7 @@ die_name(dwarf_t *dw, Dwarf_Die die) (void) die_string(dw, die, DW_AT_name, &str, 0); if (str == NULL) - str = xstrdup("__anon__"); + str = xstrdup(""); return (str); } From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 11:17:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3BF84B4; Fri, 17 Jan 2014 11:17:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0B2517EA; Fri, 17 Jan 2014 11:17:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HBHSA6038339; Fri, 17 Jan 2014 11:17:28 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HBHSto038338; Fri, 17 Jan 2014 11:17:28 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401171117.s0HBHSto038338@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 17 Jan 2014 11:17:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260821 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 11:17:29 -0000 Author: glebius Date: Fri Jan 17 11:17:28 2014 New Revision: 260821 URL: http://svnweb.freebsd.org/changeset/base/260821 Log: Fix logic error from r259821. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:13:45 2014 (r260820) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:17:28 2014 (r260821) @@ -938,7 +938,7 @@ sbflush_internal(struct sockbuf *sb) * Don't call sbdrop(sb, 0) if the leading mbuf is non-empty: * we would loop forever. Panic instead. */ - if (sb->sb_ccc > 0 && (sb->sb_mb == NULL || sb->sb_mb->m_len)) + if (sb->sb_ccc == 0 && (sb->sb_mb == NULL || sb->sb_mb->m_len)) break; m_freem(sbcut_internal(sb, (int)sb->sb_ccc)); } From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 11:18:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA1AB5B0; Fri, 17 Jan 2014 11:18:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D72CB1810; Fri, 17 Jan 2014 11:18:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HBIdoF038525; Fri, 17 Jan 2014 11:18:39 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HBIdmn038524; Fri, 17 Jan 2014 11:18:39 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401171118.s0HBIdmn038524@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 17 Jan 2014 11:18:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260822 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 11:18:40 -0000 Author: glebius Date: Fri Jan 17 11:18:39 2014 New Revision: 260822 URL: http://svnweb.freebsd.org/changeset/base/260822 Log: Fix xfsize() for a case when file ends exactly at page boundary. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Fri Jan 17 11:17:28 2014 (r260821) +++ projects/sendfile/sys/kern/uipc_syscalls.c Fri Jan 17 11:18:39 2014 (r260822) @@ -2113,7 +2113,7 @@ xfsize(int i, int n, off_t off, off_t le if (i == 0) return (omin(PAGE_SIZE - (off & PAGE_MASK), len)); - if (i == n - 1) + if (i == n - 1 && ((off + len) & PAGE_MASK) > 0) return ((off + len) & PAGE_MASK); return (PAGE_SIZE); From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 11:23:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 942EFA2A; Fri, 17 Jan 2014 11:23:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64C6318AC; Fri, 17 Jan 2014 11:23:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HBNPdd041834; Fri, 17 Jan 2014 11:23:25 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HBNPop041831; Fri, 17 Jan 2014 11:23:25 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401171123.s0HBNPop041831@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 17 Jan 2014 11:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260824 - in projects/sendfile/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 11:23:25 -0000 Author: glebius Date: Fri Jan 17 11:23:24 2014 New Revision: 260824 URL: http://svnweb.freebsd.org/changeset/base/260824 Log: sbready() function tells that 'count' mbufs starting from the 'm' in the buffer 'sb' are now ready. Function returns 0 if 'm' was the first one, and now socket has data to send, otherwise EWOULDBLOCK. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/sys/sockbuf.h Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:20:23 2014 (r260823) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:23:24 2014 (r260824) @@ -84,6 +84,44 @@ sb_shift_nrdy(struct sockbuf *sb, struct sb->sb_fnrdy = m; } +int +sbready(struct sockbuf *sb, struct mbuf *m, int count) +{ + u_int blocker; + + SOCKBUF_LOCK(sb); + + KASSERT(sb->sb_fnrdy != NULL, ("%s: sb %p NULL fnrdy", __func__, sb)); + + blocker = (sb->sb_fnrdy == m) ? M_BLOCKED : 0; + + for (int i = 0; i < count; i++, m = m->m_next) { + KASSERT(m->m_flags & M_NOTREADY, + ("%s: m %p !M_NOTREADY", __func__, m)); + m->m_flags &= ~(M_NOTREADY | blocker); + sb->sb_acc += m->m_len; + } + + if (!blocker) { + SOCKBUF_UNLOCK(sb); + return (EWOULDBLOCK); + } + + /* This one was blocking all the queue. */ + for (; m && (m->m_flags & M_NOTREADY) == 0; m = m->m_next) { + KASSERT(m->m_flags & M_BLOCKED, + ("%s: m %p !M_BLOCKED", __func__, m)); + m->m_flags &= ~M_BLOCKED; + sb->sb_acc += m->m_len; + } + + sb->sb_fnrdy = m; + + SOCKBUF_UNLOCK(sb); + + return (0); +} + /* * Adjust sockbuf state reflecting allocation of m. */ Modified: projects/sendfile/sys/sys/sockbuf.h ============================================================================== --- projects/sendfile/sys/sys/sockbuf.h Fri Jan 17 11:20:23 2014 (r260823) +++ projects/sendfile/sys/sys/sockbuf.h Fri Jan 17 11:23:24 2014 (r260824) @@ -173,6 +173,7 @@ void sbunlock(struct sockbuf *sb); void sballoc(struct sockbuf *, struct mbuf *); void sbfree(struct sockbuf *, struct mbuf *); void sbmtrim(struct sockbuf *, struct mbuf *, int); +int sbready(struct sockbuf *, struct mbuf *, int); static inline u_int sbavail(struct sockbuf *sb) From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 11:31:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03A4DC58; Fri, 17 Jan 2014 11:31:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CADE41939; Fri, 17 Jan 2014 11:31:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HBVf3h045622; Fri, 17 Jan 2014 11:31:41 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HBVfLA045621; Fri, 17 Jan 2014 11:31:41 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401171131.s0HBVfLA045621@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 17 Jan 2014 11:31:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260825 - projects/sendfile/sys/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 11:31:42 -0000 Author: glebius Date: Fri Jan 17 11:31:41 2014 New Revision: 260825 URL: http://svnweb.freebsd.org/changeset/base/260825 Log: Improve vnode_if.awk so that function pointers can be passed as VOP_* arguments. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/tools/vnode_if.awk Modified: projects/sendfile/sys/tools/vnode_if.awk ============================================================================== --- projects/sendfile/sys/tools/vnode_if.awk Fri Jan 17 11:23:24 2014 (r260824) +++ projects/sendfile/sys/tools/vnode_if.awk Fri Jan 17 11:31:41 2014 (r260825) @@ -254,16 +254,26 @@ while ((getline < srcfile) > 0) { if (sub(/;$/, "") < 1) die("Missing end-of-line ; in \"%s\".", $0); - # pick off variable name - if ((argp = match($0, /[A-Za-z0-9_]+$/)) < 1) - die("Missing var name \"a_foo\" in \"%s\".", $0); - args[numargs] = substr($0, argp); - $0 = substr($0, 1, argp - 1); - - # what is left must be type - # remove trailing space (if any) - sub(/ $/, ""); - types[numargs] = $0; + # pick off argument name + if ((argp = match($0, /[A-Za-z0-9_]+$/)) > 0) { + args[numargs] = substr($0, argp); + $0 = substr($0, 1, argp - 1); + sub(/ $/, ""); + delete fargs[numargs]; + types[numargs] = $0; + } else { # try to parse a function pointer argument + if ((argp = match($0, + /\(\*[A-Za-z0-9_]+\)\([A-Za-z0-9_*, ]+\)$/)) < 1) + die("Missing var name \"a_foo\" in \"%s\".", + $0); + args[numargs] = substr($0, argp + 2); + sub(/\).+/, "", args[numargs]); + fargs[numargs] = substr($0, argp); + sub(/^\([^)]+\)/, "", fargs[numargs]); + $0 = substr($0, 1, argp - 1); + sub(/ $/, ""); + types[numargs] = $0; + } } if (numargs > 4) ctrargs = 4; @@ -286,8 +296,13 @@ while ((getline < srcfile) > 0) { if (hfile) { # Print out the vop_F_args structure. printh("struct "name"_args {\n\tstruct vop_generic_args a_gen;"); - for (i = 0; i < numargs; ++i) - printh("\t" t_spc(types[i]) "a_" args[i] ";"); + for (i = 0; i < numargs; ++i) { + if (fargs[i]) { + printh("\t" t_spc(types[i]) "(*a_" args[i] \ + ")" fargs[i] ";"); + } else + printh("\t" t_spc(types[i]) "a_" args[i] ";"); + } printh("};"); printh(""); @@ -301,8 +316,14 @@ while ((getline < srcfile) > 0) { printh(""); printh("static __inline int " uname "("); for (i = 0; i < numargs; ++i) { - printh("\t" t_spc(types[i]) args[i] \ - (i < numargs - 1 ? "," : ")")); + if (fargs[i]) { + printh("\t" t_spc(types[i]) "(*" args[i] \ + ")" fargs[i] \ + (i < numargs - 1 ? "," : ")")); + } else { + printh("\t" t_spc(types[i]) args[i] \ + (i < numargs - 1 ? "," : ")")); + } } printh("{"); printh("\tstruct " name "_args a;"); From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 03:48:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1A6A13F; Sat, 18 Jan 2014 03:48:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 923E61791; Sat, 18 Jan 2014 03:48:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0I3mY9t046301; Sat, 18 Jan 2014 03:48:34 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0I3mYxp046300; Sat, 18 Jan 2014 03:48:34 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401180348.s0I3mYxp046300@svn.freebsd.org> From: Justin Hibbits Date: Sat, 18 Jan 2014 03:48:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260841 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 03:48:34 -0000 Author: jhibbits Date: Sat Jan 18 03:48:34 2014 New Revision: 260841 URL: http://svnweb.freebsd.org/changeset/base/260841 Log: Be consistent in softc member names, use the sc_ prefix. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sat Jan 18 03:45:07 2014 (r260840) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sat Jan 18 03:48:34 2014 (r260841) @@ -727,16 +727,16 @@ pmu_intr(void *arg) } if (resp[1] & PMU_INT_ENVIRONMENT) { /* if the lid was just closed, notify devd. */ - if ((resp[2] & PMU_ENV_LID_CLOSED) && (!sc->lid_closed)) { - sc->lid_closed = 1; + if ((resp[2] & PMU_ENV_LID_CLOSED) && (!sc->sc_lid_closed)) { + sc->sc_lid_closed = 1; if (devctl_process_running()) devctl_notify("PMU", "lid", "close", NULL); } - else if (!(resp[2] & PMU_ENV_LID_CLOSED) && (sc->lid_closed)) { + else if (!(resp[2] & PMU_ENV_LID_CLOSED) && (sc->sc_lid_closed)) { /* if the lid was just opened, notify devd. */ if (devctl_process_running()) devctl_notify("PMU", "lid", "open", NULL); - sc->lid_closed = 0; + sc->sc_lid_closed = 0; } } } @@ -1045,29 +1045,29 @@ pmu_settime(device_t dev, struct timespe static void pmu_save_state(struct pmu_softc *sc) { - sc->saved_regs[0] = pmu_read_reg(sc, vBufA); - sc->saved_regs[1] = pmu_read_reg(sc, vDirA); - sc->saved_regs[2] = pmu_read_reg(sc, vBufB); - sc->saved_regs[3] = pmu_read_reg(sc, vDirB); - sc->saved_regs[4] = pmu_read_reg(sc, vPCR); - sc->saved_regs[5] = pmu_read_reg(sc, vACR); - sc->saved_regs[6] = pmu_read_reg(sc, vIER); - sc->saved_regs[7] = pmu_read_reg(sc, vT1C); - sc->saved_regs[8] = pmu_read_reg(sc, vT1CH); + sc->sc_saved_regs[0] = pmu_read_reg(sc, vBufA); + sc->sc_saved_regs[1] = pmu_read_reg(sc, vDirA); + sc->sc_saved_regs[2] = pmu_read_reg(sc, vBufB); + sc->sc_saved_regs[3] = pmu_read_reg(sc, vDirB); + sc->sc_saved_regs[4] = pmu_read_reg(sc, vPCR); + sc->sc_saved_regs[5] = pmu_read_reg(sc, vACR); + sc->sc_saved_regs[6] = pmu_read_reg(sc, vIER); + sc->sc_saved_regs[7] = pmu_read_reg(sc, vT1C); + sc->sc_saved_regs[8] = pmu_read_reg(sc, vT1CH); } static void pmu_restore_state(struct pmu_softc *sc) { - pmu_write_reg(sc, vBufA, sc->saved_regs[0]); - pmu_write_reg(sc, vDirA, sc->saved_regs[1]); - pmu_write_reg(sc, vBufB, sc->saved_regs[2]); - pmu_write_reg(sc, vDirB, sc->saved_regs[3]); - pmu_write_reg(sc, vPCR, sc->saved_regs[4]); - pmu_write_reg(sc, vACR, sc->saved_regs[5]); - pmu_write_reg(sc, vIER, sc->saved_regs[6]); - pmu_write_reg(sc, vT1C, sc->saved_regs[7]); - pmu_write_reg(sc, vT1CH, sc->saved_regs[8]); + pmu_write_reg(sc, vBufA, sc->sc_saved_regs[0]); + pmu_write_reg(sc, vDirA, sc->sc_saved_regs[1]); + pmu_write_reg(sc, vBufB, sc->sc_saved_regs[2]); + pmu_write_reg(sc, vDirB, sc->sc_saved_regs[3]); + pmu_write_reg(sc, vPCR, sc->sc_saved_regs[4]); + pmu_write_reg(sc, vACR, sc->sc_saved_regs[5]); + pmu_write_reg(sc, vIER, sc->sc_saved_regs[6]); + pmu_write_reg(sc, vT1C, sc->sc_saved_regs[7]); + pmu_write_reg(sc, vT1CH, sc->sc_saved_regs[8]); } static int From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 10:13:05 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64E8862F; Sat, 18 Jan 2014 10:13:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 519B8131F; Sat, 18 Jan 2014 10:13:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IAD5Sa093654; Sat, 18 Jan 2014 10:13:05 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IAD5D6093653; Sat, 18 Jan 2014 10:13:05 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401181013.s0IAD5D6093653@svn.freebsd.org> From: Kai Wang Date: Sat, 18 Jan 2014 10:13:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260848 - projects/elftoolchain/contrib/elftoolchain/libelf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 10:13:05 -0000 Author: kaiw Date: Sat Jan 18 10:13:04 2014 New Revision: 260848 URL: http://svnweb.freebsd.org/changeset/base/260848 Log: Apply r241720 by ed: Fix warnings found by -Wmising-variable-declarations. Modified: projects/elftoolchain/contrib/elftoolchain/libelf/elf_errmsg.c Modified: projects/elftoolchain/contrib/elftoolchain/libelf/elf_errmsg.c ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libelf/elf_errmsg.c Sat Jan 18 06:14:38 2014 (r260847) +++ projects/elftoolchain/contrib/elftoolchain/libelf/elf_errmsg.c Sat Jan 18 10:13:04 2014 (r260848) @@ -38,7 +38,7 @@ ELFTC_VCSID("$Id: elf_errmsg.c 2225 2011 * Retrieve a human readable translation for an error message. */ -const char *_libelf_errors[] = { +static const char *_libelf_errors[] = { #define DEFINE_ERROR(N,S) [ELF_E_##N] = S DEFINE_ERROR(NONE, "No Error"), DEFINE_ERROR(ARCHIVE, "Malformed ar(1) archive"), From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 17:47:06 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E07EEA90; Sat, 18 Jan 2014 17:47:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCA7F1323; Sat, 18 Jan 2014 17:47:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IHl6BL063655; Sat, 18 Jan 2014 17:47:06 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IHl6QL063654; Sat, 18 Jan 2014 17:47:06 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401181747.s0IHl6QL063654@svn.freebsd.org> From: Kai Wang Date: Sat, 18 Jan 2014 17:47:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260853 - projects/elftoolchain/contrib/elftoolchain/libdwarf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 17:47:06 -0000 Author: kaiw Date: Sat Jan 18 17:47:06 2014 New Revision: 260853 URL: http://svnweb.freebsd.org/changeset/base/260853 Log: Fix a warning in libdwarf found by -Wmissing-variable-declarations. Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_errmsg.c Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_errmsg.c ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_errmsg.c Sat Jan 18 15:57:43 2014 (r260852) +++ projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_errmsg.c Sat Jan 18 17:47:06 2014 (r260853) @@ -28,7 +28,7 @@ ELFTC_VCSID("$Id: dwarf_errmsg.c 2576 2012-09-13 09:16:11Z jkoshy $"); -const char *_libdwarf_errors[] = { +static const char *_libdwarf_errors[] = { #define DEFINE_ERROR(N,S) [DW_DLE_##N] = S DEFINE_ERROR(NONE, "No Error"), DEFINE_ERROR(ERROR, "An error"), From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 17:49:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D18C7B83; Sat, 18 Jan 2014 17:49:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BDBB91331; Sat, 18 Jan 2014 17:49:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IHnWuO063924; Sat, 18 Jan 2014 17:49:32 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IHnWq3063923; Sat, 18 Jan 2014 17:49:32 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401181749.s0IHnWq3063923@svn.freebsd.org> From: Kai Wang Date: Sat, 18 Jan 2014 17:49:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260854 - projects/elftoolchain/contrib/elftoolchain/libdwarf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 17:49:32 -0000 Author: kaiw Date: Sat Jan 18 17:49:32 2014 New Revision: 260854 URL: http://svnweb.freebsd.org/changeset/base/260854 Log: Fix typo: the public API dwarf_child() should return DW_DLV_NO_ENTRY instead of DW_DLE_NO_ENTRY when a child DIE is not found. Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_die.c Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_die.c ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_die.c Sat Jan 18 17:47:06 2014 (r260853) +++ projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_die.c Sat Jan 18 17:49:32 2014 (r260854) @@ -44,7 +44,7 @@ dwarf_child(Dwarf_Die die, Dwarf_Die *re } if (die->die_ab->ab_children == DW_CHILDREN_no) - return (DW_DLE_NO_ENTRY); + return (DW_DLV_NO_ENTRY); dbg = die->die_dbg; cu = die->die_cu; From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 17:59:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 448F8EB9; Sat, 18 Jan 2014 17:59:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16F5113C1; Sat, 18 Jan 2014 17:59:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IHxMOn067716; Sat, 18 Jan 2014 17:59:22 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IHxMJK067711; Sat, 18 Jan 2014 17:59:22 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201401181759.s0IHxMJK067711@svn.freebsd.org> From: Kai Wang Date: Sat, 18 Jan 2014 17:59:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260855 - projects/elftoolchain/contrib/elftoolchain/libdwarf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 17:59:23 -0000 Author: kaiw Date: Sat Jan 18 17:59:22 2014 New Revision: 260855 URL: http://svnweb.freebsd.org/changeset/base/260855 Log: API dwarf_attrval_flag() should properly handle an attribute with (DWARF4) form DW_FORM_flag_present which implicitly indicates the presence of the attribute. Manual page is updated to reflect this change. Note that this was previously fixed in the old libdwarf. Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval.c ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval.c Sat Jan 18 17:49:32 2014 (r260854) +++ projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval.c Sat Jan 18 17:59:22 2014 (r260855) @@ -50,6 +50,7 @@ dwarf_attrval_flag(Dwarf_Die die, Dwarf_ switch (at->at_form) { case DW_FORM_flag: + case DW_FORM_flag_present: *valp = (Dwarf_Bool) (!!at->u[0].u64); break; default: Modified: projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 ============================================================================== --- projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 Sat Jan 18 17:49:32 2014 (r260854) +++ projects/elftoolchain/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 Sat Jan 18 17:59:22 2014 (r260855) @@ -24,7 +24,7 @@ .\" .\" $Id: dwarf_attrval_signed.3 2072 2011-10-27 03:26:49Z jkoshy $ .\" -.Dd January 29, 2011 +.Dd January 18, 2014 .Os .Dt DWARF_ATTRVAL_SIGNED 3 .Sh NAME @@ -84,13 +84,28 @@ Function .Fn dwarf_attrval_flag sets the location pointed to by argument .Ar ret -to 1 if the attribute named by argument +to either 0 or 1. If the form of the attribute named by argument .Ar attr -has a non-zero value, or to 0 otherwise. -The form of the attribute named by argument +is +.Dv DW_FORM_flag , +function +.Fn dwarf_attrval_flag +sets the location pointed to by argument +.Ar ret +to 1 if the attribute has a non-zero value, or to 0 otherwise. +If the form of the attribute named by argument .Ar attr -must be -.Dv DW_FORM_flag . +is +.Dv DW_FORM_flag_present , +function +.Fn dwarf_attrval_flag +unconditionally sets the location pointed to by argument +.Ar ret +to 1. +The form of the attribute must be one of +.Dv DW_FORM_flag +or +.Dv DW_FORM_flag_present . .Pp Function .Fn dwarf_attrval_signed @@ -122,7 +137,7 @@ attribute named by argument The form of the attribute must be one of .Dv DW_FORM_string or -.Dv DW_FORM_strp . +.Dv DW_FORM_strp . .Pp Function .Fn dwarf_attrval_unsigned From owner-svn-src-projects@FreeBSD.ORG Sat Jan 18 22:32:49 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AE3CB4E; Sat, 18 Jan 2014 22:32:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D050416CE; Sat, 18 Jan 2014 22:32:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IMWmAu074858; Sat, 18 Jan 2014 22:32:48 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IMWmvK074856; Sat, 18 Jan 2014 22:32:48 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401182232.s0IMWmvK074856@svn.freebsd.org> From: Justin Hibbits Date: Sat, 18 Jan 2014 22:32:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260865 - projects/pmac_pmu/sys/dev/adb X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 22:32:49 -0000 Author: jhibbits Date: Sat Jan 18 22:32:48 2014 New Revision: 260865 URL: http://svnweb.freebsd.org/changeset/base/260865 Log: No need to check if devd is running before posting an event. Modified: projects/pmac_pmu/sys/dev/adb/adb_buttons.c projects/pmac_pmu/sys/dev/adb/adb_kbd.c Modified: projects/pmac_pmu/sys/dev/adb/adb_buttons.c ============================================================================== --- projects/pmac_pmu/sys/dev/adb/adb_buttons.c Sat Jan 18 21:57:38 2014 (r260864) +++ projects/pmac_pmu/sys/dev/adb/adb_buttons.c Sat Jan 18 22:32:48 2014 (r260865) @@ -118,37 +118,32 @@ abtn_receive_packet(device_t dev, u_char switch (cmd) { case 0x0a: /* decrease brightness */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "brightness", - "notify=down"); + devctl_notify("PMU", "keys", "brightness", + "notify=down"); break; case 0x09: /* increase brightness */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "brightness", "notify=up"); + devctl_notify("PMU", "keys", "brightness", "notify=up"); break; case 0x08: /* mute */ case 0x01: /* mute, AV hardware */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "mute", NULL); + devctl_notify("PMU", "keys", "mute", NULL); break; case 0x07: /* decrease volume */ case 0x02: /* decrease volume, AV hardware */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "volume", "notify=down"); + devctl_notify("PMU", "keys", "volume", "notify=down"); break; case 0x06: /* increase volume */ case 0x03: /* increase volume, AV hardware */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "volume", "notify=up"); + devctl_notify("PMU", "keys", "volume", "notify=up"); break; case 0x0c: /* mirror display key */ /* Need callback to do something with this */ break; case 0x0b: /* eject tray */ - if (devctl_process_running()) - devctl_notify("PMU", "keys", "eject", NULL); + devctl_notify("PMU", "keys", "eject", NULL); + break; case 0x7f: /* numlock */ /* Need callback to do something with this */ break; Modified: projects/pmac_pmu/sys/dev/adb/adb_kbd.c ============================================================================== --- projects/pmac_pmu/sys/dev/adb/adb_kbd.c Sat Jan 18 21:57:38 2014 (r260864) +++ projects/pmac_pmu/sys/dev/adb/adb_kbd.c Sat Jan 18 22:32:48 2014 (r260865) @@ -424,7 +424,7 @@ adb_kbd_receive_packet(device_t dev, u_c mtx_lock(&sc->sc_mutex); /* 0x7f is always the power button */ - if (data[0] == 0x7f && devctl_process_running()) { + if (data[0] == 0x7f) { devctl_notify("PMU", "Button", "pressed", NULL); mtx_unlock(&sc->sc_mutex); return (0);