From owner-svn-src-projects@freebsd.org Sun Feb 2 12:54:40 2020
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DCFE22DC7C
for <svn-src-projects@mailman.nyi.freebsd.org>;
Sun, 2 Feb 2020 12:54:40 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 489WBS3SfTz4729;
Sun, 2 Feb 2020 12:54:40 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CF18182DC;
Sun, 2 Feb 2020 12:54:40 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 012Cse35056286;
Sun, 2 Feb 2020 12:54:40 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 012Csd3q056280;
Sun, 2 Feb 2020 12:54:39 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <202002021254.012Csd3q056280@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 2 Feb 2020 12:54:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r357408 - in projects/clang1000-import: . share/man/man4
share/man/man9 sys/arm/arm sys/arm/conf sys/arm/include sys/arm/mv
sys/arm/mv/discovery sys/arm/mv/kirkwood sys/arm/mv/orion sys...
X-SVN-Group: projects
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: in projects/clang1000-import: . share/man/man4
share/man/man9 sys/arm/arm sys/arm/conf sys/arm/include sys/arm/mv
sys/arm/mv/discovery sys/arm/mv/kirkwood sys/arm/mv/orion sys/arm/ralink
sys/conf sys/...
X-SVN-Commit-Revision: 357408
X-SVN-Commit-Repository: base
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.29
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Feb 2020 12:54:40 -0000
Author: dim
Date: Sun Feb 2 12:54:38 2020
New Revision: 357408
URL: https://svnweb.freebsd.org/changeset/base/357408
Log:
Merge ^/head r357389 through r357407.
Added:
projects/clang1000-import/sys/arm/arm/busdma_machdep.c
- copied unchanged from r357407, head/sys/arm/arm/busdma_machdep.c
Deleted:
projects/clang1000-import/share/man/man4/vpo.4
projects/clang1000-import/sys/arm/arm/busdma_machdep-v4.c
projects/clang1000-import/sys/arm/arm/busdma_machdep-v6.c
projects/clang1000-import/sys/arm/conf/DB-78XXX
projects/clang1000-import/sys/arm/conf/DB-88F5XXX
projects/clang1000-import/sys/arm/conf/DB-88F6XXX
projects/clang1000-import/sys/arm/conf/DOCKSTAR
projects/clang1000-import/sys/arm/conf/DREAMPLUG-1001
projects/clang1000-import/sys/arm/conf/NOTES.armv7
projects/clang1000-import/sys/arm/conf/RT1310
projects/clang1000-import/sys/arm/conf/SHEEVAPLUG
projects/clang1000-import/sys/arm/conf/TS7800
projects/clang1000-import/sys/arm/conf/genboardid.awk
projects/clang1000-import/sys/arm/conf/mach-types
projects/clang1000-import/sys/arm/conf/std.arm
projects/clang1000-import/sys/arm/include/board.h
projects/clang1000-import/sys/arm/mv/armv5_machdep.c
projects/clang1000-import/sys/arm/mv/discovery/discovery.c
projects/clang1000-import/sys/arm/mv/discovery/files.db78xxx
projects/clang1000-import/sys/arm/mv/discovery/std.db78xxx
projects/clang1000-import/sys/arm/mv/files.mv
projects/clang1000-import/sys/arm/mv/kirkwood/files.kirkwood
projects/clang1000-import/sys/arm/mv/kirkwood/kirkwood.c
projects/clang1000-import/sys/arm/mv/kirkwood/std.db88f6xxx
projects/clang1000-import/sys/arm/mv/kirkwood/std.kirkwood
projects/clang1000-import/sys/arm/mv/orion/db88f5xxx.c
projects/clang1000-import/sys/arm/mv/orion/files.db88f5xxx
projects/clang1000-import/sys/arm/mv/orion/files.ts7800
projects/clang1000-import/sys/arm/mv/orion/orion.c
projects/clang1000-import/sys/arm/mv/orion/std.db88f5xxx
projects/clang1000-import/sys/arm/mv/orion/std.ts7800
projects/clang1000-import/sys/arm/ralink/files.ralink
projects/clang1000-import/sys/arm/ralink/if_fv.c
projects/clang1000-import/sys/arm/ralink/if_fvreg.h
projects/clang1000-import/sys/arm/ralink/rt1310_gpio.c
projects/clang1000-import/sys/arm/ralink/rt1310_intc.c
projects/clang1000-import/sys/arm/ralink/rt1310_machdep.c
projects/clang1000-import/sys/arm/ralink/rt1310_timer.c
projects/clang1000-import/sys/arm/ralink/rt1310reg.h
projects/clang1000-import/sys/arm/ralink/rt1310var.h
projects/clang1000-import/sys/arm/ralink/std.ralink
projects/clang1000-import/sys/dev/ppbus/immio.c
projects/clang1000-import/sys/dev/ppbus/vpo.c
projects/clang1000-import/sys/dev/ppbus/vpoio.c
projects/clang1000-import/sys/dev/ppbus/vpoio.h
projects/clang1000-import/sys/modules/vpo/Makefile
Modified:
projects/clang1000-import/Makefile
projects/clang1000-import/Makefile.inc1
projects/clang1000-import/ObsoleteFiles.inc
projects/clang1000-import/share/man/man4/Makefile
projects/clang1000-import/share/man/man4/ppbus.4
projects/clang1000-import/share/man/man9/microseq.9
projects/clang1000-import/sys/arm/conf/NOTES
projects/clang1000-import/sys/conf/NOTES
projects/clang1000-import/sys/conf/files
projects/clang1000-import/sys/conf/files.amd64
projects/clang1000-import/sys/conf/files.arm
projects/clang1000-import/sys/conf/files.i386
projects/clang1000-import/sys/conf/files.powerpc
projects/clang1000-import/sys/conf/files.x86
projects/clang1000-import/sys/conf/kern.pre.mk
projects/clang1000-import/sys/conf/makeLINT.mk
projects/clang1000-import/sys/conf/options
projects/clang1000-import/sys/conf/options.arm
projects/clang1000-import/sys/dev/tpm/tpm_crb.c
projects/clang1000-import/sys/fs/nullfs/null_vnops.c
projects/clang1000-import/sys/kern/kern_descrip.c
projects/clang1000-import/sys/kern/vfs_subr.c
projects/clang1000-import/sys/kern/vnode_if.src
projects/clang1000-import/sys/modules/Makefile
projects/clang1000-import/sys/sys/vnode.h
projects/clang1000-import/sys/vm/uma_core.c
projects/clang1000-import/sys/x86/iommu/intel_gas.c
Directory Properties:
projects/clang1000-import/ (props changed)
Modified: projects/clang1000-import/Makefile
==============================================================================
--- projects/clang1000-import/Makefile Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/Makefile Sun Feb 2 12:54:38 2020 (r357408)
@@ -89,7 +89,7 @@
#
# See src/UPDATING `COMMON ITEMS' for more complete information.
#
-# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can
+# If TARGET=machine (e.g. powerpc, arm64, ...) is specified you can
# cross build world for other machine types using the buildworld target,
# and once the world is built you can cross build a kernel using the
# buildkernel target.
@@ -488,7 +488,7 @@ worlds: .PHONY
# In all cases, if the user specifies TARGETS on the command line,
# honor that most of all.
#
-TARGETS?=amd64 arm arm64 i386 mips powerpc riscv sparc64
+TARGETS?=amd64 arm arm64 i386 mips powerpc riscv
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= armv6 armv7
TARGET_ARCHES_arm64?= aarch64
@@ -501,14 +501,12 @@ TARGET_ARCHES_${target}?= ${target}
.endfor
MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6
-MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6
TOOLCHAINS_mips= mips-gcc6
-TOOLCHAINS_sparc64= sparc64-gcc6
# Remove architectures only supported by external toolchain from
# universe if required toolchain packages are missing.
-.for target in mips sparc64
+.for target in mips
.if ${_UNIVERSE_TARGETS:M${target}}
.for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk)
Modified: projects/clang1000-import/Makefile.inc1
==============================================================================
--- projects/clang1000-import/Makefile.inc1 Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/Makefile.inc1 Sun Feb 2 12:54:38 2020 (r357408)
@@ -153,8 +153,7 @@ KNOWN_ARCHES?= aarch64/arm64 \
powerpc64/powerpc \
powerpcspe/powerpc \
riscv64/riscv \
- riscv64sf/riscv \
- sparc64
+ riscv64sf/riscv
.if ${TARGET} == ${TARGET_ARCH}
_t= ${TARGET}
@@ -2290,8 +2289,6 @@ _basic_bootstrap_tools_multilink+=bin/test test,[
_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \
usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \
usr.bin/truncate usr.bin/tsort
-# elf2aout is required for sparc64 build
-_basic_bootstrap_tools+=usr.bin/elf2aout
# file2c is required for building usr.sbin/config:
_basic_bootstrap_tools+=usr.bin/file2c
# uuencode/uudecode required for share/tabset
@@ -2915,14 +2912,10 @@ _cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libctf__L: lib/libz__L
.endif
-# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
-# on select architectures though (see cddl/lib/Makefile)
-.if ${MACHINE_CPUARCH} != "sparc64"
_prebuild_libs+= lib/libprocstat lib/libproc lib/librtld_db
lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L
lib/libproc__L: lib/libprocstat__L
lib/librtld_db__L: lib/libprocstat__L
-.endif
.if ${MK_CRYPT} != "no"
.if ${MK_OPENSSL} != "no"
Modified: projects/clang1000-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang1000-import/ObsoleteFiles.inc Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/ObsoleteFiles.inc Sun Feb 2 12:54:38 2020 (r357408)
@@ -272,6 +272,10 @@ OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt
OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/9.0.1/lib
OLD_DIRS+=usr/lib/clang/9.0.1
+# 20200127: vpo removed
+OLD_FILES+=usr/share/man/man4/imm.4.gz
+OLD_FILES+=usr/share/man/man4/vpo.4.gz
+
# 20200104: gcc libssp removed
OLD_FILES+=usr/include/ssp/ssp.h
OLD_FILES+=usr/include/ssp/stdio.h
Modified: projects/clang1000-import/share/man/man4/Makefile
==============================================================================
--- projects/clang1000-import/share/man/man4/Makefile Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/share/man/man4/Makefile Sun Feb 2 12:54:38 2020 (r357408)
@@ -553,7 +553,6 @@ MAN= aac.4 \
${_vmd.4} \
${_vmm.4} \
${_vmx.4} \
- vpo.4 \
vr.4 \
vt.4 \
vte.4 \
@@ -740,7 +739,6 @@ MLINKS+=vge.4 if_vge.4
MLINKS+=vlan.4 if_vlan.4
MLINKS+=vxlan.4 if_vxlan.4
MLINKS+=${_vmx.4} ${_if_vmx.4}
-MLINKS+=vpo.4 imm.4
MLINKS+=vr.4 if_vr.4
MLINKS+=vte.4 if_vte.4
MLINKS+=${_vtnet.4} ${_if_vtnet.4}
Modified: projects/clang1000-import/share/man/man4/ppbus.4
==============================================================================
--- projects/clang1000-import/share/man/man4/ppbus.4 Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/share/man/man4/ppbus.4 Sun Feb 2 12:54:38 2020 (r357408)
@@ -33,8 +33,6 @@
.Sh SYNOPSIS
.Cd "device ppbus"
.Pp
-.Cd "device vpo"
-.Pp
.Cd "device lpt"
.Cd "device plip"
.Cd "device ppi"
@@ -66,8 +64,6 @@ and non-standard software:
.Pp
.Bl -column "Driver" -compact
.It Em Driver Ta Em Description
-.It Sy vpo Ta "VPI0 parallel to Adaptec AIC-7110 SCSI controller driver" .
-It uses standard and non-standard parallel port accesses.
.It Sy ppi Ta "Parallel port interface for general I/O"
.It Sy pps Ta "Pulse per second Timing Interface"
.It Sy lpbb Ta "Philips official parallel port I2C bit-banging interface"
@@ -336,22 +332,11 @@ operation (opcodes are described in
.Xr microseq 9 ) .
Standard I/O operations are implemented at ppbus level whereas basic I/O
operations and microseq language are coded at adapter level for efficiency.
-.Pp
-As an example, the
-.Xr vpo 4
-driver uses microsequences to implement:
-.Bl -bullet -offset indent
-.It
-a modified version of the NIBBLE transfer mode
-.It
-various I/O sequences to initialize, select and allocate the peripheral
-.El
.Sh SEE ALSO
.Xr lpt 4 ,
.Xr plip 4 ,
.Xr ppc 4 ,
.Xr ppi 4 ,
-.Xr vpo 4
.Sh HISTORY
The
.Nm
Modified: projects/clang1000-import/share/man/man9/microseq.9
==============================================================================
--- projects/clang1000-import/share/man/man9/microseq.9 Sun Feb 2 11:37:27 2020 (r357407)
+++ projects/clang1000-import/share/man/man9/microseq.9 Sun Feb 2 12:54:38 2020 (r357408)
@@ -51,7 +51,7 @@ efficient code
Before using microsequences, you are encouraged to look at
.Xr ppc 4
microsequencer implementation and an example of how using it in
-.Xr vpo 4 .
+.Xr ppi 4 .
.Sh PPBUS register model
.Ss Background
The parallel port model chosen for ppbus is the PC parallel port model.
@@ -477,7 +477,7 @@ executed at ppbus layer.
.Sh SEE ALSO
.Xr ppbus 4 ,
.Xr ppc 4 ,
-.Xr vpo 4
+.Xr ppi 4
.Sh HISTORY
The
.Nm
Copied: projects/clang1000-import/sys/arm/arm/busdma_machdep.c (from r357407, head/sys/arm/arm/busdma_machdep.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang1000-import/sys/arm/arm/busdma_machdep.c Sun Feb 2 12:54:38 2020 (r357408, copy of r357407, head/sys/arm/arm/busdma_machdep.c)
@@ -0,0 +1,1784 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2012-2015 Ian Lepore
+ * Copyright (c) 2010 Mark Tinguely
+ * Copyright (c) 2004 Olivier Houchard
+ * Copyright (c) 2002 Peter Grehan
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification, immediately at the beginning of the file.
+ * 2. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * From i386/busdma_machdep.c 191438 2009-04-23 20:24:19Z jhb
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/busdma_bufalloc.h>
+#include <sys/counter.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/memdesc.h>
+#include <sys/proc.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+#include <sys/uio.h>
+
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_page.h>
+#include <vm/vm_phys.h>
+#include <vm/vm_map.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/md_var.h>
+
+#define BUSDMA_DCACHE_ALIGN cpuinfo.dcache_line_size
+#define BUSDMA_DCACHE_MASK cpuinfo.dcache_line_mask
+
+#define MAX_BPAGES 64
+#define MAX_DMA_SEGMENTS 4096
+#define BUS_DMA_EXCL_BOUNCE BUS_DMA_BUS2
+#define BUS_DMA_ALIGN_BOUNCE BUS_DMA_BUS3
+#define BUS_DMA_COULD_BOUNCE (BUS_DMA_EXCL_BOUNCE | BUS_DMA_ALIGN_BOUNCE)
+#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4
+
+struct bounce_zone;
+
+struct bus_dma_tag {
+ bus_dma_tag_t parent;
+ bus_size_t alignment;
+ bus_addr_t boundary;
+ bus_addr_t lowaddr;
+ bus_addr_t highaddr;
+ bus_dma_filter_t *filter;
+ void *filterarg;
+ bus_size_t maxsize;
+ u_int nsegments;
+ bus_size_t maxsegsz;
+ int flags;
+ int ref_count;
+ int map_count;
+ bus_dma_lock_t *lockfunc;
+ void *lockfuncarg;
+ struct bounce_zone *bounce_zone;
+};
+
+struct bounce_page {
+ vm_offset_t vaddr; /* kva of bounce buffer */
+ bus_addr_t busaddr; /* Physical address */
+ vm_offset_t datavaddr; /* kva of client data */
+ vm_page_t datapage; /* physical page of client data */
+ vm_offset_t dataoffs; /* page offset of client data */
+ bus_size_t datacount; /* client data count */
+ STAILQ_ENTRY(bounce_page) links;
+};
+
+struct sync_list {
+ vm_offset_t vaddr; /* kva of client data */
+ bus_addr_t paddr; /* physical address */
+ vm_page_t pages; /* starting page of client data */
+ bus_size_t datacount; /* client data count */
+};
+
+int busdma_swi_pending;
+
+struct bounce_zone {
+ STAILQ_ENTRY(bounce_zone) links;
+ STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+ int total_bpages;
+ int free_bpages;
+ int reserved_bpages;
+ int active_bpages;
+ int total_bounced;
+ int total_deferred;
+ int map_count;
+ bus_size_t alignment;
+ bus_addr_t lowaddr;
+ char zoneid[8];
+ char lowaddrid[20];
+ struct sysctl_ctx_list sysctl_tree;
+ struct sysctl_oid *sysctl_tree_top;
+};
+
+static struct mtx bounce_lock;
+static int total_bpages;
+static int busdma_zonecount;
+static uint32_t tags_total;
+static uint32_t maps_total;
+static uint32_t maps_dmamem;
+static uint32_t maps_coherent;
+static counter_u64_t maploads_total;
+static counter_u64_t maploads_bounced;
+static counter_u64_t maploads_coherent;
+static counter_u64_t maploads_dmamem;
+static counter_u64_t maploads_mbuf;
+static counter_u64_t maploads_physmem;
+
+static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
+
+SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, tags_total, CTLFLAG_RD, &tags_total, 0,
+ "Number of active tags");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_total, CTLFLAG_RD, &maps_total, 0,
+ "Number of active maps");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_dmamem, CTLFLAG_RD, &maps_dmamem, 0,
+ "Number of active maps for bus_dmamem_alloc buffers");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_coherent, CTLFLAG_RD, &maps_coherent, 0,
+ "Number of active maps with BUS_DMA_COHERENT flag set");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_total, CTLFLAG_RD,
+ &maploads_total, "Number of load operations performed");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_bounced, CTLFLAG_RD,
+ &maploads_bounced, "Number of load operations that used bounce buffers");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_coherent, CTLFLAG_RD,
+ &maploads_dmamem, "Number of load operations on BUS_DMA_COHERENT memory");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_dmamem, CTLFLAG_RD,
+ &maploads_dmamem, "Number of load operations on bus_dmamem_alloc buffers");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_mbuf, CTLFLAG_RD,
+ &maploads_mbuf, "Number of load operations for mbufs");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_physmem, CTLFLAG_RD,
+ &maploads_physmem, "Number of load operations on physical buffers");
+SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
+ "Total bounce pages");
+
+struct bus_dmamap {
+ struct bp_list bpages;
+ int pagesneeded;
+ int pagesreserved;
+ bus_dma_tag_t dmat;
+ struct memdesc mem;
+ bus_dmamap_callback_t *callback;
+ void *callback_arg;
+ int flags;
+#define DMAMAP_COHERENT (1 << 0)
+#define DMAMAP_DMAMEM_ALLOC (1 << 1)
+#define DMAMAP_MBUF (1 << 2)
+ STAILQ_ENTRY(bus_dmamap) links;
+ bus_dma_segment_t *segments;
+ int sync_count;
+ struct sync_list slist[];
+};
+
+static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+
+static void init_bounce_pages(void *dummy);
+static int alloc_bounce_zone(bus_dma_tag_t dmat);
+static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
+static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+ int commit);
+static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map,
+ vm_offset_t vaddr, bus_addr_t addr, bus_size_t size);
+static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage);
+static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pmap,
+ bus_dmamap_t map, void *buf, bus_size_t buflen, int flags);
+static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
+ vm_paddr_t buf, bus_size_t buflen, int flags);
+static int _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+ int flags);
+static void dma_preread_safe(vm_offset_t va, vm_paddr_t pa, vm_size_t size);
+static void dma_dcache_sync(struct sync_list *sl, bus_dmasync_op_t op);
+
+static busdma_bufalloc_t coherent_allocator; /* Cache of coherent buffers */
+static busdma_bufalloc_t standard_allocator; /* Cache of standard buffers */
+
+MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata");
+MALLOC_DEFINE(M_BOUNCE, "bounce", "busdma bounce pages");
+
+static void
+busdma_init(void *dummy)
+{
+ int uma_flags;
+
+ maploads_total = counter_u64_alloc(M_WAITOK);
+ maploads_bounced = counter_u64_alloc(M_WAITOK);
+ maploads_coherent = counter_u64_alloc(M_WAITOK);
+ maploads_dmamem = counter_u64_alloc(M_WAITOK);
+ maploads_mbuf = counter_u64_alloc(M_WAITOK);
+ maploads_physmem = counter_u64_alloc(M_WAITOK);
+
+ uma_flags = 0;
+
+ /* Create a cache of buffers in standard (cacheable) memory. */
+ standard_allocator = busdma_bufalloc_create("buffer",
+ BUSDMA_DCACHE_ALIGN,/* minimum_alignment */
+ NULL, /* uma_alloc func */
+ NULL, /* uma_free func */
+ uma_flags); /* uma_zcreate_flags */
+
+#ifdef INVARIANTS
+ /*
+ * Force UMA zone to allocate service structures like
+ * slabs using own allocator. uma_debug code performs
+ * atomic ops on uma_slab_t fields and safety of this
+ * operation is not guaranteed for write-back caches
+ */
+ uma_flags = UMA_ZONE_NOTOUCH;
+#endif
+ /*
+ * Create a cache of buffers in uncacheable memory, to implement the
+ * BUS_DMA_COHERENT (and potentially BUS_DMA_NOCACHE) flag.
+ */
+ coherent_allocator = busdma_bufalloc_create("coherent",
+ BUSDMA_DCACHE_ALIGN,/* minimum_alignment */
+ busdma_bufalloc_alloc_uncacheable,
+ busdma_bufalloc_free_uncacheable,
+ uma_flags); /* uma_zcreate_flags */
+}
+
+/*
+ * This init historically used SI_SUB_VM, but now the init code requires
+ * malloc(9) using M_BUSDMA memory and the pcpu zones for counter(9), which get
+ * set up by SI_SUB_KMEM and SI_ORDER_LAST, so we'll go right after that by
+ * using SI_SUB_KMEM+1.
+ */
+SYSINIT(busdma, SI_SUB_KMEM+1, SI_ORDER_FIRST, busdma_init, NULL);
+
+/*
+ * This routine checks the exclusion zone constraints from a tag against the
+ * physical RAM available on the machine. If a tag specifies an exclusion zone
+ * but there's no RAM in that zone, then we avoid allocating resources to bounce
+ * a request, and we can use any memory allocator (as opposed to needing
+ * kmem_alloc_contig() just because it can allocate pages in an address range).
+ *
+ * Most tags have BUS_SPACE_MAXADDR or BUS_SPACE_MAXADDR_32BIT (they are the
+ * same value on 32-bit architectures) as their lowaddr constraint, and we can't
+ * possibly have RAM at an address higher than the highest address we can
+ * express, so we take a fast out.
+ */
+static int
+exclusion_bounce_check(vm_offset_t lowaddr, vm_offset_t highaddr)
+{
+ int i;
+
+ if (lowaddr >= BUS_SPACE_MAXADDR)
+ return (0);
+
+ for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) {
+ if ((lowaddr >= phys_avail[i] && lowaddr < phys_avail[i + 1]) ||
+ (lowaddr < phys_avail[i] && highaddr >= phys_avail[i]))
+ return (1);
+ }
+ return (0);
+}
+
+/*
+ * Return true if the tag has an exclusion zone that could lead to bouncing.
+ */
+static __inline int
+exclusion_bounce(bus_dma_tag_t dmat)
+{
+
+ return (dmat->flags & BUS_DMA_EXCL_BOUNCE);
+}
+
+/*
+ * Return true if the given address does not fall on the alignment boundary.
+ */
+static __inline int
+alignment_bounce(bus_dma_tag_t dmat, bus_addr_t addr)
+{
+
+ return (addr & (dmat->alignment - 1));
+}
+
+/*
+ * Return true if the DMA should bounce because the start or end does not fall
+ * on a cacheline boundary (which would require a partial cacheline flush).
+ * COHERENT memory doesn't trigger cacheline flushes. Memory allocated by
+ * bus_dmamem_alloc() is always aligned to cacheline boundaries, and there's a
+ * strict rule that such memory cannot be accessed by the CPU while DMA is in
+ * progress (or by multiple DMA engines at once), so that it's always safe to do
+ * full cacheline flushes even if that affects memory outside the range of a
+ * given DMA operation that doesn't involve the full allocated buffer. If we're
+ * mapping an mbuf, that follows the same rules as a buffer we allocated.
+ */
+static __inline int
+cacheline_bounce(bus_dmamap_t map, bus_addr_t addr, bus_size_t size)
+{
+
+ if (map->flags & (DMAMAP_DMAMEM_ALLOC | DMAMAP_COHERENT | DMAMAP_MBUF))
+ return (0);
+ return ((addr | size) & BUSDMA_DCACHE_MASK);
+}
+
+/*
+ * Return true if we might need to bounce the DMA described by addr and size.
+ *
+ * This is used to quick-check whether we need to do the more expensive work of
+ * checking the DMA page-by-page looking for alignment and exclusion bounces.
+ *
+ * Note that the addr argument might be either virtual or physical. It doesn't
+ * matter because we only look at the low-order bits, which are the same in both
+ * address spaces and maximum alignment of generic buffer is limited up to page
+ * size.
+ * Bouncing of buffers allocated by bus_dmamem_alloc()is not necessary, these
+ * always comply with the required rules (alignment, boundary, and address
+ * range).
+ */
+static __inline int
+might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t addr,
+ bus_size_t size)
+{
+
+ KASSERT(map->flags & DMAMAP_DMAMEM_ALLOC ||
+ dmat->alignment <= PAGE_SIZE,
+ ("%s: unsupported alignment (0x%08lx) for buffer not "
+ "allocated by bus_dmamem_alloc()",
+ __func__, dmat->alignment));
+
+ return (!(map->flags & DMAMAP_DMAMEM_ALLOC) &&
+ ((dmat->flags & BUS_DMA_EXCL_BOUNCE) ||
+ alignment_bounce(dmat, addr) ||
+ cacheline_bounce(map, addr, size)));
+}
+
+/*
+ * Return true if we must bounce the DMA described by paddr and size.
+ *
+ * Bouncing can be triggered by DMA that doesn't begin and end on cacheline
+ * boundaries, or doesn't begin on an alignment boundary, or falls within the
+ * exclusion zone of any tag in the ancestry chain.
+ *
+ * For exclusions, walk the chain of tags comparing paddr to the exclusion zone
+ * within each tag. If the tag has a filter function, use it to decide whether
+ * the DMA needs to bounce, otherwise any DMA within the zone bounces.
+ */
+static int
+must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr,
+ bus_size_t size)
+{
+
+ if (cacheline_bounce(map, paddr, size))
+ return (1);
+
+ /*
+ * The tag already contains ancestors' alignment restrictions so this
+ * check doesn't need to be inside the loop.
+ */
+ if (alignment_bounce(dmat, paddr))
+ return (1);
+
+ /*
+ * Even though each tag has an exclusion zone that is a superset of its
+ * own and all its ancestors' exclusions, the exclusion zone of each tag
+ * up the chain must be checked within the loop, because the busdma
+ * rules say the filter function is called only when the address lies
+ * within the low-highaddr range of the tag that filterfunc belongs to.
+ */
+ while (dmat != NULL && exclusion_bounce(dmat)) {
+ if ((paddr >= dmat->lowaddr && paddr <= dmat->highaddr) &&
+ (dmat->filter == NULL ||
+ dmat->filter(dmat->filterarg, paddr) != 0))
+ return (1);
+ dmat = dmat->parent;
+ }
+
+ return (0);
+}
+
+/*
+ * Convenience function for manipulating driver locks from busdma (during
+ * busdma_swi, for example). Drivers that don't provide their own locks
+ * should specify &Giant to dmat->lockfuncarg. Drivers that use their own
+ * non-mutex locking scheme don't have to use this at all.
+ */
+void
+busdma_lock_mutex(void *arg, bus_dma_lock_op_t op)
+{
+ struct mtx *dmtx;
+
+ dmtx = (struct mtx *)arg;
+ switch (op) {
+ case BUS_DMA_LOCK:
+ mtx_lock(dmtx);
+ break;
+ case BUS_DMA_UNLOCK:
+ mtx_unlock(dmtx);
+ break;
+ default:
+ panic("Unknown operation 0x%x for busdma_lock_mutex!", op);
+ }
+}
+
+/*
+ * dflt_lock should never get called. It gets put into the dma tag when
+ * lockfunc == NULL, which is only valid if the maps that are associated
+ * with the tag are meant to never be defered.
+ * XXX Should have a way to identify which driver is responsible here.
+ */
+static void
+dflt_lock(void *arg, bus_dma_lock_op_t op)
+{
+
+ panic("driver error: busdma dflt_lock called");
+}
+
+/*
+ * Allocate a device specific dma_tag.
+ */
+int
+bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
+ bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+ bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
+ int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+ void *lockfuncarg, bus_dma_tag_t *dmat)
+{
+ bus_dma_tag_t newtag;
+ int error = 0;
+
+ /* Basic sanity checking. */
+ KASSERT(boundary == 0 || powerof2(boundary),
+ ("dma tag boundary %lu, must be a power of 2", boundary));
+ KASSERT(boundary == 0 || boundary >= maxsegsz,
+ ("dma tag boundary %lu is < maxsegsz %lu\n", boundary, maxsegsz));
+ KASSERT(alignment != 0 && powerof2(alignment),
+ ("dma tag alignment %lu, must be non-zero power of 2", alignment));
+ KASSERT(maxsegsz != 0, ("dma tag maxsegsz must not be zero"));
+
+ /* Return a NULL tag on failure */
+ *dmat = NULL;
+
+ newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA,
+ M_ZERO | M_NOWAIT);
+ if (newtag == NULL) {
+ CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+ __func__, newtag, 0, error);
+ return (ENOMEM);
+ }
+
+ newtag->parent = parent;
+ newtag->alignment = alignment;
+ newtag->boundary = boundary;
+ newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1);
+ newtag->highaddr = trunc_page((vm_paddr_t)highaddr) +
+ (PAGE_SIZE - 1);
+ newtag->filter = filter;
+ newtag->filterarg = filterarg;
+ newtag->maxsize = maxsize;
+ newtag->nsegments = nsegments;
+ newtag->maxsegsz = maxsegsz;
+ newtag->flags = flags;
+ newtag->ref_count = 1; /* Count ourself */
+ newtag->map_count = 0;
+ if (lockfunc != NULL) {
+ newtag->lockfunc = lockfunc;
+ newtag->lockfuncarg = lockfuncarg;
+ } else {
+ newtag->lockfunc = dflt_lock;
+ newtag->lockfuncarg = NULL;
+ }
+
+ /* Take into account any restrictions imposed by our parent tag */
+ if (parent != NULL) {
+ newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
+ newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
+ newtag->alignment = MAX(parent->alignment, newtag->alignment);
+ newtag->flags |= parent->flags & BUS_DMA_COULD_BOUNCE;
+ newtag->flags |= parent->flags & BUS_DMA_COHERENT;
+ if (newtag->boundary == 0)
+ newtag->boundary = parent->boundary;
+ else if (parent->boundary != 0)
+ newtag->boundary = MIN(parent->boundary,
+ newtag->boundary);
+ if (newtag->filter == NULL) {
+ /*
+ * Short circuit to looking at our parent directly
+ * since we have encapsulated all of its information
+ */
+ newtag->filter = parent->filter;
+ newtag->filterarg = parent->filterarg;
+ newtag->parent = parent->parent;
+ }
+ if (newtag->parent != NULL)
+ atomic_add_int(&parent->ref_count, 1);
+ }
+
+ if (exclusion_bounce_check(newtag->lowaddr, newtag->highaddr))
+ newtag->flags |= BUS_DMA_EXCL_BOUNCE;
+ if (alignment_bounce(newtag, 1))
+ newtag->flags |= BUS_DMA_ALIGN_BOUNCE;
+
+ /*
+ * Any request can auto-bounce due to cacheline alignment, in addition
+ * to any alignment or boundary specifications in the tag, so if the
+ * ALLOCNOW flag is set, there's always work to do.
+ */
+ if ((flags & BUS_DMA_ALLOCNOW) != 0) {
+ struct bounce_zone *bz;
+ /*
+ * Round size up to a full page, and add one more page because
+ * there can always be one more boundary crossing than the
+ * number of pages in a transfer.
+ */
+ maxsize = roundup2(maxsize, PAGE_SIZE) + PAGE_SIZE;
+
+ if ((error = alloc_bounce_zone(newtag)) != 0) {
+ free(newtag, M_BUSDMA);
+ return (error);
+ }
+ bz = newtag->bounce_zone;
+
+ if (ptoa(bz->total_bpages) < maxsize) {
+ int pages;
+
+ pages = atop(maxsize) - bz->total_bpages;
+
+ /* Add pages to our bounce pool */
+ if (alloc_bounce_pages(newtag, pages) < pages)
+ error = ENOMEM;
+ }
+ /* Performed initial allocation */
+ newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
+ } else
+ newtag->bounce_zone = NULL;
+
+ if (error != 0) {
+ free(newtag, M_BUSDMA);
+ } else {
+ atomic_add_32(&tags_total, 1);
+ *dmat = newtag;
+ }
+ CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+ __func__, newtag, (newtag != NULL ? newtag->flags : 0), error);
+ return (error);
+}
+
+void
+bus_dma_template_init(bus_dma_tag_template_t *t, bus_dma_tag_t parent)
+{
+
+ if (t == NULL)
+ return;
+
+ t->parent = parent;
+ t->alignment = 1;
+ t->boundary = 0;
+ t->lowaddr = t->highaddr = BUS_SPACE_MAXADDR;
+ t->maxsize = t->maxsegsize = BUS_SPACE_MAXSIZE;
+ t->nsegments = BUS_SPACE_UNRESTRICTED;
+ t->lockfunc = NULL;
+ t->lockfuncarg = NULL;
+ t->flags = 0;
+}
+
+int
+bus_dma_template_tag(bus_dma_tag_template_t *t, bus_dma_tag_t *dmat)
+{
+
+ if (t == NULL || dmat == NULL)
+ return (EINVAL);
+
+ return (bus_dma_tag_create(t->parent, t->alignment, t->boundary,
+ t->lowaddr, t->highaddr, NULL, NULL, t->maxsize,
+ t->nsegments, t->maxsegsize, t->flags, t->lockfunc, t->lockfuncarg,
+ dmat));
+}
+
+void
+bus_dma_template_clone(bus_dma_tag_template_t *t, bus_dma_tag_t dmat)
+{
+
+ if (t == NULL || dmat == NULL)
+ return;
+
+ t->parent = dmat->parent;
+ t->alignment = dmat->alignment;
+ t->boundary = dmat->boundary;
+ t->lowaddr = dmat->lowaddr;
+ t->highaddr = dmat->highaddr;
+ t->maxsize = dmat->maxsize;
+ t->nsegments = dmat->nsegments;
+ t->maxsegsize = dmat->maxsegsz;
+ t->flags = dmat->flags;
+ t->lockfunc = dmat->lockfunc;
+ t->lockfuncarg = dmat->lockfuncarg;
+}
+
+int
+bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain)
+{
+
+ return (0);
+}
+
+int
+bus_dma_tag_destroy(bus_dma_tag_t dmat)
+{
+ bus_dma_tag_t dmat_copy;
+ int error;
+
+ error = 0;
+ dmat_copy = dmat;
+
+ if (dmat != NULL) {
+
+ if (dmat->map_count != 0) {
+ error = EBUSY;
+ goto out;
+ }
+
+ while (dmat != NULL) {
+ bus_dma_tag_t parent;
+
+ parent = dmat->parent;
+ atomic_subtract_int(&dmat->ref_count, 1);
+ if (dmat->ref_count == 0) {
+ atomic_subtract_32(&tags_total, 1);
+ free(dmat, M_BUSDMA);
+ /*
+ * Last reference count, so
+ * release our reference
+ * count on our parent.
+ */
+ dmat = parent;
+ } else
+ dmat = NULL;
+ }
+ }
+out:
+ CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error);
+ return (error);
+}
+
+static int
+allocate_bz_and_pages(bus_dma_tag_t dmat, bus_dmamap_t mapp)
+{
+ struct bounce_zone *bz;
+ int maxpages;
+ int error;
+
+ if (dmat->bounce_zone == NULL)
+ if ((error = alloc_bounce_zone(dmat)) != 0)
+ return (error);
+ bz = dmat->bounce_zone;
+ /* Initialize the new map */
+ STAILQ_INIT(&(mapp->bpages));
+
+ /*
+ * Attempt to add pages to our pool on a per-instance basis up to a sane
+ * limit. Even if the tag isn't flagged as COULD_BOUNCE due to
+ * alignment and boundary constraints, it could still auto-bounce due to
+ * cacheline alignment, which requires at most two bounce pages.
+ */
+ if (dmat->flags & BUS_DMA_COULD_BOUNCE)
+ maxpages = MAX_BPAGES;
+ else
+ maxpages = 2 * bz->map_count;
+ if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 ||
+ (bz->map_count > 0 && bz->total_bpages < maxpages)) {
+ int pages;
+
+ pages = atop(roundup2(dmat->maxsize, PAGE_SIZE)) + 1;
+ pages = MIN(maxpages - bz->total_bpages, pages);
+ pages = MAX(pages, 2);
+ if (alloc_bounce_pages(dmat, pages) < pages)
+ return (ENOMEM);
+
+ if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0)
+ dmat->flags |= BUS_DMA_MIN_ALLOC_COMP;
+ }
+ bz->map_count++;
+ return (0);
+}
+
+static bus_dmamap_t
+allocate_map(bus_dma_tag_t dmat, int mflags)
+{
+ int mapsize, segsize;
+ bus_dmamap_t map;
+
+ /*
+ * Allocate the map. The map structure ends with an embedded
+ * variable-sized array of sync_list structures. Following that
+ * we allocate enough extra space to hold the array of bus_dma_segments.
+ */
+ KASSERT(dmat->nsegments <= MAX_DMA_SEGMENTS,
+ ("cannot allocate %u dma segments (max is %u)",
+ dmat->nsegments, MAX_DMA_SEGMENTS));
+ segsize = sizeof(struct bus_dma_segment) * dmat->nsegments;
+ mapsize = sizeof(*map) + sizeof(struct sync_list) * dmat->nsegments;
+ map = malloc(mapsize + segsize, M_BUSDMA, mflags | M_ZERO);
+ if (map == NULL) {
+ CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM);
+ return (NULL);
+ }
+ map->segments = (bus_dma_segment_t *)((uintptr_t)map + mapsize);
+ STAILQ_INIT(&map->bpages);
+ return (map);
+}
+
+/*
+ * Allocate a handle for mapping from kva/uva/physical
+ * address space into bus device space.
+ */
+int
+bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
+{
+ bus_dmamap_t map;
+ int error = 0;
+
+ *mapp = map = allocate_map(dmat, M_NOWAIT);
+ if (map == NULL) {
+ CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM);
+ return (ENOMEM);
+ }
+
+ /*
+ * Bouncing might be required if the driver asks for an exclusion
+ * region, a data alignment that is stricter than 1, or DMA that begins
+ * or ends with a partial cacheline. Whether bouncing will actually
+ * happen can't be known until mapping time, but we need to pre-allocate
+ * resources now because we might not be allowed to at mapping time.
+ */
+ error = allocate_bz_and_pages(dmat, map);
+ if (error != 0) {
+ free(map, M_BUSDMA);
+ *mapp = NULL;
+ return (error);
+ }
+ if (map->flags & DMAMAP_COHERENT)
+ atomic_add_32(&maps_coherent, 1);
+ atomic_add_32(&maps_total, 1);
+ dmat->map_count++;
+
+ return (0);
+}
+
+/*
+ * Destroy a handle for mapping from kva/uva/physical
+ * address space into bus device space.
+ */
+int
+bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
+{
+
+ if (STAILQ_FIRST(&map->bpages) != NULL || map->sync_count != 0) {
+ CTR3(KTR_BUSDMA, "%s: tag %p error %d",
+ __func__, dmat, EBUSY);
+ return (EBUSY);
+ }
+ if (dmat->bounce_zone)
+ dmat->bounce_zone->map_count--;
+ if (map->flags & DMAMAP_COHERENT)
+ atomic_subtract_32(&maps_coherent, 1);
+ atomic_subtract_32(&maps_total, 1);
+ free(map, M_BUSDMA);
+ dmat->map_count--;
+ CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
+ return (0);
+}
+
+/*
+ * Allocate a piece of memory that can be efficiently mapped into bus device
+ * space based on the constraints listed in the dma tag. Returns a pointer to
+ * the allocated memory, and a pointer to an associated bus_dmamap.
+ */
+int
+bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
+ bus_dmamap_t *mapp)
+{
+ busdma_bufalloc_t ba;
+ struct busdma_bufzone *bufzone;
+ bus_dmamap_t map;
+ vm_memattr_t memattr;
+ int mflags;
+
+ if (flags & BUS_DMA_NOWAIT)
+ mflags = M_NOWAIT;
+ else
+ mflags = M_WAITOK;
+ if (flags & BUS_DMA_ZERO)
+ mflags |= M_ZERO;
+
+ *mapp = map = allocate_map(dmat, mflags);
+ if (map == NULL) {
+ CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
+ __func__, dmat, dmat->flags, ENOMEM);
+ return (ENOMEM);
+ }
+ map->flags = DMAMAP_DMAMEM_ALLOC;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Fri Feb 7 19:08:43 2020
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80BBC22B0D4
for <svn-src-projects@mailman.nyi.freebsd.org>;
Fri, 7 Feb 2020 19:08:43 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 48DlFl3WF7z3NmP;
Fri, 7 Feb 2020 19:08:43 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EF4693DF;
Fri, 7 Feb 2020 19:08:43 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 017J8hsM005211;
Fri, 7 Feb 2020 19:08:43 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 017J8cjg005187;
Fri, 7 Feb 2020 19:08:38 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <202002071908.017J8cjg005187@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 7 Feb 2020 19:08:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r357662 - in projects/clang1000-import: . bin/pwait
cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line
contrib/elftoolchain/elfcopy contrib/elftoolchain/libdwa...
X-SVN-Group: projects
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: in projects/clang1000-import: . bin/pwait
cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line
contrib/elftoolchain/elfcopy contrib/elftoolchain/libdwarf
contrib/elftoolchain/l...
X-SVN-Commit-Revision: 357662
X-SVN-Commit-Repository: base
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.29
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2020 19:08:43 -0000
Author: dim
Date: Fri Feb 7 19:08:37 2020
New Revision: 357662
URL: https://svnweb.freebsd.org/changeset/base/357662
Log:
Merge ^/head r357408 through r357661.
Added:
projects/clang1000-import/lib/libkvm/kvm_kerndisp.3
- copied unchanged from r357661, head/lib/libkvm/kvm_kerndisp.3
Deleted:
projects/clang1000-import/gnu/lib/csu/
projects/clang1000-import/sbin/Makefile.sparc64
projects/clang1000-import/sbin/sunlabel/Makefile
projects/clang1000-import/sbin/sunlabel/Makefile.depend
projects/clang1000-import/sbin/sunlabel/runtest.sh
projects/clang1000-import/sbin/sunlabel/sun_disklabel.h
projects/clang1000-import/sbin/sunlabel/sunlabel.8
projects/clang1000-import/sbin/sunlabel/sunlabel.c
projects/clang1000-import/sbin/sunlabel/sunlabel_enc.c
projects/clang1000-import/stand/ficl/sparc64/sysdep.c
projects/clang1000-import/stand/ficl/sparc64/sysdep.h
projects/clang1000-import/stand/libsa/sparc64/_setjmp.S
projects/clang1000-import/stand/sparc64/Makefile
projects/clang1000-import/stand/sparc64/Makefile.inc
projects/clang1000-import/stand/sparc64/boot1/Makefile
projects/clang1000-import/stand/sparc64/boot1/_start.s
projects/clang1000-import/stand/sparc64/boot1/boot1.c
projects/clang1000-import/stand/sparc64/loader/Makefile
projects/clang1000-import/stand/sparc64/loader/help.sparc64
projects/clang1000-import/stand/sparc64/loader/locore.S
projects/clang1000-import/stand/sparc64/loader/main.c
projects/clang1000-import/stand/sparc64/loader/version
projects/clang1000-import/stand/sparc64/zfsboot/Makefile
projects/clang1000-import/sys/conf/Makefile.sparc64
projects/clang1000-import/sys/conf/files.sparc64
projects/clang1000-import/sys/conf/ldscript.sparc64
projects/clang1000-import/sys/conf/options.sparc64
projects/clang1000-import/sys/dev/atkbdc/atkbdc_ebus.c
projects/clang1000-import/sys/dev/auxio/auxio.c
projects/clang1000-import/sys/dev/auxio/auxioreg.h
projects/clang1000-import/sys/dev/esp/esp_sbus.c
projects/clang1000-import/sys/dev/fb/creator.c
projects/clang1000-import/sys/dev/fb/creator_vt.c
projects/clang1000-import/sys/dev/fb/creatorreg.h
projects/clang1000-import/sys/dev/fb/machfb.c
projects/clang1000-import/sys/dev/fb/machfbreg.h
projects/clang1000-import/sys/dev/gem/if_gem_sbus.c
projects/clang1000-import/sys/dev/hme/if_hme_sbus.c
projects/clang1000-import/sys/dev/hwpmc/hwpmc_sparc64.c
projects/clang1000-import/sys/dev/isp/isp_sbus.c
projects/clang1000-import/sys/dev/ispfw/asm_1000.h
projects/clang1000-import/sys/dev/le/if_le_lebuffer.c
projects/clang1000-import/sys/dev/le/if_le_ledma.c
projects/clang1000-import/sys/dev/le/lebuffer_sbus.c
projects/clang1000-import/sys/dev/pcf/envctrl.c
projects/clang1000-import/sys/dev/pcf/pcf_ebus.c
projects/clang1000-import/sys/dev/scc/scc_bfe_ebus.c
projects/clang1000-import/sys/dev/scc/scc_bfe_sbus.c
projects/clang1000-import/sys/dev/sound/sbus/apcdmareg.h
projects/clang1000-import/sys/dev/sound/sbus/cs4231.c
projects/clang1000-import/sys/dev/sound/sbus/cs4231.h
projects/clang1000-import/sys/dev/uart/uart_bus_ebus.c
projects/clang1000-import/sys/dev/uart/uart_cpu_sparc64.c
projects/clang1000-import/sys/dev/uart/uart_kbd_sun.c
projects/clang1000-import/sys/dev/uart/uart_kbd_sun.h
projects/clang1000-import/sys/dev/uart/uart_kbd_sun_tables.h
projects/clang1000-import/sys/modules/auxio/Makefile
projects/clang1000-import/sys/modules/epic/Makefile
projects/clang1000-import/sys/modules/sound/driver/audiocs/Makefile
projects/clang1000-import/sys/sparc64/
projects/clang1000-import/tools/build/options/WITHOUT_HTTPD
projects/clang1000-import/tools/build/options/WITH_HTTPD
projects/clang1000-import/usr.bin/Makefile.sparc64
projects/clang1000-import/usr.bin/elf2aout/Makefile
projects/clang1000-import/usr.bin/elf2aout/Makefile.depend
projects/clang1000-import/usr.bin/elf2aout/elf2aout.1
projects/clang1000-import/usr.bin/elf2aout/elf2aout.c
projects/clang1000-import/usr.sbin/simple_httpd/
Modified:
projects/clang1000-import/Makefile.inc1
projects/clang1000-import/ObsoleteFiles.inc
projects/clang1000-import/RELNOTES
projects/clang1000-import/bin/pwait/pwait.c
projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c
projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c
projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c
projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c
projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c
projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c
projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
projects/clang1000-import/contrib/elftoolchain/size/size.c
projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
projects/clang1000-import/contrib/sqlite3/Makefile.msc
projects/clang1000-import/contrib/sqlite3/configure
projects/clang1000-import/contrib/sqlite3/configure.ac
projects/clang1000-import/contrib/sqlite3/shell.c
projects/clang1000-import/contrib/sqlite3/sqlite3.c
projects/clang1000-import/contrib/sqlite3/sqlite3.h
projects/clang1000-import/contrib/sqlite3/sqlite3ext.h
projects/clang1000-import/contrib/sqlite3/tea/configure
projects/clang1000-import/contrib/sqlite3/tea/configure.ac
projects/clang1000-import/contrib/sqlite3/tea/generic/tclsqlite3.c
projects/clang1000-import/contrib/sqlite3/tea/win/makefile.vc
projects/clang1000-import/contrib/xz/src/common/tuklib_physmem.c
projects/clang1000-import/contrib/xz/src/xz/hardware.c
projects/clang1000-import/contrib/xz/src/xz/xz.1
projects/clang1000-import/include/stdio.h
projects/clang1000-import/lib/libc/Makefile
projects/clang1000-import/lib/libc/net/rcmd.c
projects/clang1000-import/lib/libc/riscv/gen/_set_tp.c
projects/clang1000-import/lib/libc/rpc/rpcb_st_xdr.c
projects/clang1000-import/lib/libc/stdio/Symbol.map
projects/clang1000-import/lib/libc/stdio/fputc.c
projects/clang1000-import/lib/libc/sys/open.2
projects/clang1000-import/lib/libc/tests/c063/Makefile
projects/clang1000-import/lib/libc/xdr/xdr_array.c
projects/clang1000-import/lib/libc/xdr/xdr_reference.c
projects/clang1000-import/lib/libfetch/fetch.c
projects/clang1000-import/lib/libkvm/Makefile
projects/clang1000-import/lib/libkvm/kvm.3
projects/clang1000-import/lib/libkvm/kvm.c
projects/clang1000-import/lib/libkvm/kvm.h
projects/clang1000-import/lib/libkvm/kvm_minidump_powerpc64.c
projects/clang1000-import/lib/libkvm/kvm_private.h
projects/clang1000-import/lib/libmemstat/memstat_uma.c
projects/clang1000-import/lib/libutil/login.conf.5
projects/clang1000-import/lib/libutil/login_class.c
projects/clang1000-import/lib/msun/powerpc/fenv.h
projects/clang1000-import/libexec/rc/rc.d/auditd
projects/clang1000-import/sbin/fsck_msdosfs/boot.c
projects/clang1000-import/sbin/init/init.c
projects/clang1000-import/share/man/man4/cxgbe.4
projects/clang1000-import/share/man/man5/make.conf.5
projects/clang1000-import/share/man/man5/rc.conf.5
projects/clang1000-import/share/man/man5/src.conf.5
projects/clang1000-import/share/man/man7/ports.7
projects/clang1000-import/share/man/man7/security.7
projects/clang1000-import/share/man/man9/zone.9
projects/clang1000-import/share/mk/bsd.linker.mk
projects/clang1000-import/share/mk/src.libnames.mk
projects/clang1000-import/share/mk/src.opts.mk
projects/clang1000-import/stand/common/metadata.c
projects/clang1000-import/stand/i386/libi386/biosdisk.c
projects/clang1000-import/stand/i386/zfsboot/zfsboot.c
projects/clang1000-import/stand/libofw/libofw.h
projects/clang1000-import/stand/libsa/zfs/zfsimpl.c
projects/clang1000-import/stand/loader.mk
projects/clang1000-import/stand/man/loader.8
projects/clang1000-import/sys/Makefile
projects/clang1000-import/sys/amd64/amd64/sys_machdep.c
projects/clang1000-import/sys/amd64/include/counter.h
projects/clang1000-import/sys/amd64/include/param.h
projects/clang1000-import/sys/amd64/linux/linux_dummy.c
projects/clang1000-import/sys/amd64/linux/linux_proto.h
projects/clang1000-import/sys/amd64/linux/linux_syscall.h
projects/clang1000-import/sys/amd64/linux/linux_syscalls.c
projects/clang1000-import/sys/amd64/linux/linux_sysent.c
projects/clang1000-import/sys/amd64/linux/linux_systrace_args.c
projects/clang1000-import/sys/amd64/linux/syscalls.master
projects/clang1000-import/sys/amd64/linux32/linux32_dummy.c
projects/clang1000-import/sys/amd64/linux32/linux32_proto.h
projects/clang1000-import/sys/amd64/linux32/linux32_syscall.h
projects/clang1000-import/sys/amd64/linux32/linux32_syscalls.c
projects/clang1000-import/sys/amd64/linux32/linux32_sysent.c
projects/clang1000-import/sys/amd64/linux32/linux32_systrace_args.c
projects/clang1000-import/sys/amd64/linux32/syscalls.master
projects/clang1000-import/sys/arm/include/param.h
projects/clang1000-import/sys/arm/linux/linux_proto.h
projects/clang1000-import/sys/arm/linux/linux_syscall.h
projects/clang1000-import/sys/arm/linux/linux_syscalls.c
projects/clang1000-import/sys/arm/linux/linux_sysent.c
projects/clang1000-import/sys/arm/linux/linux_systrace_args.c
projects/clang1000-import/sys/arm/linux/syscalls.master
projects/clang1000-import/sys/arm64/arm64/gicv3_its.c
projects/clang1000-import/sys/arm64/arm64/identcpu.c
projects/clang1000-import/sys/arm64/arm64/trap.c
projects/clang1000-import/sys/arm64/include/atomic.h
projects/clang1000-import/sys/arm64/include/param.h
projects/clang1000-import/sys/arm64/linux/linux_dummy.c
projects/clang1000-import/sys/cam/ata/ata_da.c
projects/clang1000-import/sys/cam/cam_xpt.c
projects/clang1000-import/sys/cam/mmc/mmc_da.c
projects/clang1000-import/sys/cam/nvme/nvme_da.c
projects/clang1000-import/sys/cam/scsi/scsi_cd.c
projects/clang1000-import/sys/cam/scsi/scsi_da.c
projects/clang1000-import/sys/cam/scsi/scsi_sa.c
projects/clang1000-import/sys/cddl/boot/zfs/zfsimpl.h
projects/clang1000-import/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
projects/clang1000-import/sys/cddl/compat/opensolaris/sys/atomic.h
projects/clang1000-import/sys/cddl/contrib/opensolaris/common/lz4/lz4.c
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/aggsum.c
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/aggsum.h
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h
projects/clang1000-import/sys/compat/cloudabi/cloudabi_vdso.c
projects/clang1000-import/sys/compat/linux/linux_socket.c
projects/clang1000-import/sys/compat/linux/linux_socket.h
projects/clang1000-import/sys/compat/linux/linux_time.c
projects/clang1000-import/sys/compat/linuxkpi/common/include/linux/file.h
projects/clang1000-import/sys/conf/Makefile.riscv
projects/clang1000-import/sys/conf/NOTES
projects/clang1000-import/sys/conf/config.mk
projects/clang1000-import/sys/conf/files
projects/clang1000-import/sys/conf/kern.mk
projects/clang1000-import/sys/conf/kern.opts.mk
projects/clang1000-import/sys/conf/ldscript.riscv
projects/clang1000-import/sys/conf/options.arm64
projects/clang1000-import/sys/contrib/ck/include/ck_md.h
projects/clang1000-import/sys/dev/aac/aac_disk.c
projects/clang1000-import/sys/dev/acpi_support/acpi_ibm.c
projects/clang1000-import/sys/dev/altera/avgen/altera_avgen.c
projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c
projects/clang1000-import/sys/dev/amr/amr.c
projects/clang1000-import/sys/dev/ata/ata-pci.c
projects/clang1000-import/sys/dev/ata/chipsets/ata-promise.c
projects/clang1000-import/sys/dev/atkbdc/atkbd.c
projects/clang1000-import/sys/dev/atkbdc/atkbdc.c
projects/clang1000-import/sys/dev/atkbdc/psm.c
projects/clang1000-import/sys/dev/bge/if_bge.c
projects/clang1000-import/sys/dev/cas/if_cas.c
projects/clang1000-import/sys/dev/cfi/cfi_disk.c
projects/clang1000-import/sys/dev/cxgbe/adapter.h
projects/clang1000-import/sys/dev/cxgbe/t4_main.c
projects/clang1000-import/sys/dev/cxgbe/t4_netmap.c
projects/clang1000-import/sys/dev/cxgbe/t4_sge.c
projects/clang1000-import/sys/dev/dc/if_dc.c
projects/clang1000-import/sys/dev/fb/fbreg.h
projects/clang1000-import/sys/dev/firewire/sbp.c
projects/clang1000-import/sys/dev/flash/at45d.c
projects/clang1000-import/sys/dev/flash/mx25l.c
projects/clang1000-import/sys/dev/flash/n25q.c
projects/clang1000-import/sys/dev/gem/if_gem_pci.c
projects/clang1000-import/sys/dev/hme/if_hme_pci.c
projects/clang1000-import/sys/dev/ida/ida_disk.c
projects/clang1000-import/sys/dev/ips/ips_disk.c
projects/clang1000-import/sys/dev/isp/isp_freebsd.h
projects/clang1000-import/sys/dev/isp/isp_pci.c
projects/clang1000-import/sys/dev/ispfw/ispfw.c
projects/clang1000-import/sys/dev/mfi/mfi.c
projects/clang1000-import/sys/dev/mlx/mlx_disk.c
projects/clang1000-import/sys/dev/mmc/mmcsd.c
projects/clang1000-import/sys/dev/mpr/mpr.c
projects/clang1000-import/sys/dev/mpr/mprvar.h
projects/clang1000-import/sys/dev/mps/mps.c
projects/clang1000-import/sys/dev/mps/mpsvar.h
projects/clang1000-import/sys/dev/mpt/mpt.h
projects/clang1000-import/sys/dev/mpt/mpt_pci.c
projects/clang1000-import/sys/dev/mthca/mthca_srq.c
projects/clang1000-import/sys/dev/mxge/if_mxge_var.h
projects/clang1000-import/sys/dev/nvme/nvme_ns.c
projects/clang1000-import/sys/dev/ofw/openfirm.h
projects/clang1000-import/sys/dev/proto/proto_core.c
projects/clang1000-import/sys/dev/pst/pst-raid.c
projects/clang1000-import/sys/dev/sfxge/common/efsys.h
projects/clang1000-import/sys/dev/sound/pci/t4dwave.c
projects/clang1000-import/sys/dev/sym/sym_hipd.c
projects/clang1000-import/sys/dev/syscons/scgfbrndr.c
projects/clang1000-import/sys/dev/syscons/schistory.c
projects/clang1000-import/sys/dev/syscons/scterm-dumb.c (contents, props changed)
projects/clang1000-import/sys/dev/syscons/scterm-sc.c (contents, props changed)
projects/clang1000-import/sys/dev/syscons/scterm-teken.c
projects/clang1000-import/sys/dev/syscons/scvtb.c
projects/clang1000-import/sys/dev/syscons/syscons.c
projects/clang1000-import/sys/dev/syscons/syscons.h
projects/clang1000-import/sys/dev/twe/twe.c
projects/clang1000-import/sys/dev/virtio/block/virtio_blk.c
projects/clang1000-import/sys/dev/virtio/pci/virtio_pci.c
projects/clang1000-import/sys/dev/vt/hw/fb/vt_early_fb.c
projects/clang1000-import/sys/dev/vt/hw/ofwfb/ofwfb.c
projects/clang1000-import/sys/dev/xdma/xdma.c
projects/clang1000-import/sys/dev/xdma/xdma.h
projects/clang1000-import/sys/dev/xen/blkfront/blkfront.c
projects/clang1000-import/sys/dev/xen/console/xen_console.c
projects/clang1000-import/sys/dev/xilinx/axidma.c
projects/clang1000-import/sys/dev/xilinx/axidma.h
projects/clang1000-import/sys/dev/xilinx/if_xae.c
projects/clang1000-import/sys/fs/devfs/devfs_vnops.c
projects/clang1000-import/sys/fs/fuse/fuse_vnops.c
projects/clang1000-import/sys/fs/nfsclient/nfs_clvnops.c
projects/clang1000-import/sys/fs/nullfs/null_subr.c
projects/clang1000-import/sys/fs/pseudofs/pseudofs_vnops.c
projects/clang1000-import/sys/fs/smbfs/smbfs_vnops.c
projects/clang1000-import/sys/fs/tmpfs/tmpfs.h
projects/clang1000-import/sys/fs/tmpfs/tmpfs_subr.c
projects/clang1000-import/sys/fs/tmpfs/tmpfs_vfsops.c
projects/clang1000-import/sys/fs/tmpfs/tmpfs_vnops.c
projects/clang1000-import/sys/geom/geom_vfs.c
projects/clang1000-import/sys/i386/i386/pmap.c
projects/clang1000-import/sys/i386/include/param.h
projects/clang1000-import/sys/i386/linux/linux_dummy.c
projects/clang1000-import/sys/i386/linux/linux_proto.h
projects/clang1000-import/sys/i386/linux/linux_syscall.h
projects/clang1000-import/sys/i386/linux/linux_syscalls.c
projects/clang1000-import/sys/i386/linux/linux_sysent.c
projects/clang1000-import/sys/i386/linux/linux_systrace_args.c
projects/clang1000-import/sys/i386/linux/syscalls.master
projects/clang1000-import/sys/kern/kern_descrip.c
projects/clang1000-import/sys/kern/kern_exit.c
projects/clang1000-import/sys/kern/kern_ktrace.c
projects/clang1000-import/sys/kern/kern_malloc.c
projects/clang1000-import/sys/kern/kern_mbuf.c
projects/clang1000-import/sys/kern/kern_sendfile.c
projects/clang1000-import/sys/kern/kern_sysctl.c
projects/clang1000-import/sys/kern/kern_thr.c
projects/clang1000-import/sys/kern/kern_time.c
projects/clang1000-import/sys/kern/link_elf.c
projects/clang1000-import/sys/kern/sched_ule.c
projects/clang1000-import/sys/kern/subr_capability.c
projects/clang1000-import/sys/kern/subr_param.c
projects/clang1000-import/sys/kern/subr_smr.c
projects/clang1000-import/sys/kern/subr_uio.c
projects/clang1000-import/sys/kern/subr_witness.c
projects/clang1000-import/sys/kern/sys_capability.c
projects/clang1000-import/sys/kern/sys_generic.c
projects/clang1000-import/sys/kern/sysv_sem.c
projects/clang1000-import/sys/kern/tty.c
projects/clang1000-import/sys/kern/vfs_bio.c
projects/clang1000-import/sys/kern/vfs_cache.c
projects/clang1000-import/sys/kern/vfs_lookup.c
projects/clang1000-import/sys/kern/vfs_subr.c
projects/clang1000-import/sys/kern/vfs_syscalls.c
projects/clang1000-import/sys/mips/beri/beri_mp.c
projects/clang1000-import/sys/modules/Makefile
projects/clang1000-import/sys/modules/bge/Makefile
projects/clang1000-import/sys/modules/cas/Makefile
projects/clang1000-import/sys/modules/dtrace/dtrace/Makefile
projects/clang1000-import/sys/modules/dtrace/fasttrap/Makefile
projects/clang1000-import/sys/modules/esp/Makefile
projects/clang1000-import/sys/modules/gem/Makefile
projects/clang1000-import/sys/modules/hme/Makefile
projects/clang1000-import/sys/modules/hwpmc/Makefile
projects/clang1000-import/sys/modules/i2c/controllers/pcf/Makefile
projects/clang1000-import/sys/modules/isp/Makefile
projects/clang1000-import/sys/modules/ispfw/Makefile
projects/clang1000-import/sys/modules/ix/Makefile
projects/clang1000-import/sys/modules/ixv/Makefile
projects/clang1000-import/sys/modules/le/Makefile
projects/clang1000-import/sys/modules/lio/Makefile
projects/clang1000-import/sys/modules/oce/Makefile
projects/clang1000-import/sys/modules/scc/Makefile
projects/clang1000-import/sys/modules/sound/driver/Makefile
projects/clang1000-import/sys/modules/syscons/Makefile
projects/clang1000-import/sys/modules/uart/Makefile
projects/clang1000-import/sys/modules/vmm/Makefile
projects/clang1000-import/sys/net/ethernet.h
projects/clang1000-import/sys/net/if.c
projects/clang1000-import/sys/netgraph/ng_base.c
projects/clang1000-import/sys/netgraph/ng_device.c
projects/clang1000-import/sys/netgraph/ng_socket.c
projects/clang1000-import/sys/netinet/libalias/alias_db.c
projects/clang1000-import/sys/netinet/sctp_constants.h
projects/clang1000-import/sys/netinet/sctp_indata.c
projects/clang1000-import/sys/netinet/sctp_pcb.c
projects/clang1000-import/sys/netinet/sctp_structs.h
projects/clang1000-import/sys/netinet/sctputil.c
projects/clang1000-import/sys/powerpc/aim/aim_machdep.c
projects/clang1000-import/sys/powerpc/aim/slb.c
projects/clang1000-import/sys/powerpc/booke/booke_machdep.c
projects/clang1000-import/sys/powerpc/include/param.h
projects/clang1000-import/sys/powerpc/powerpc/exec_machdep.c
projects/clang1000-import/sys/riscv/include/db_machdep.h
projects/clang1000-import/sys/riscv/include/param.h
projects/clang1000-import/sys/riscv/include/riscvreg.h
projects/clang1000-import/sys/riscv/riscv/db_trace.c
projects/clang1000-import/sys/riscv/riscv/machdep.c
projects/clang1000-import/sys/riscv/riscv/riscv_console.c
projects/clang1000-import/sys/riscv/riscv/trap.c
projects/clang1000-import/sys/sys/capsicum.h
projects/clang1000-import/sys/sys/fcntl.h
projects/clang1000-import/sys/sys/filedesc.h
projects/clang1000-import/sys/sys/ktrace.h
projects/clang1000-import/sys/sys/linker.h
projects/clang1000-import/sys/sys/namei.h
projects/clang1000-import/sys/sys/param.h
projects/clang1000-import/sys/sys/seqc.h
projects/clang1000-import/sys/sys/smr.h
projects/clang1000-import/sys/sys/syscallsubr.h
projects/clang1000-import/sys/sys/sysctl.h
projects/clang1000-import/sys/sys/types.h
projects/clang1000-import/sys/sys/vnode.h
projects/clang1000-import/sys/ufs/ffs/ffs_softdep.c
projects/clang1000-import/sys/ufs/ffs/ffs_vnops.c
projects/clang1000-import/sys/ufs/ffs/softdep.h
projects/clang1000-import/sys/vm/uma.h
projects/clang1000-import/sys/vm/uma_core.c
projects/clang1000-import/sys/vm/uma_int.h
projects/clang1000-import/sys/vm/vm_kern.c
projects/clang1000-import/sys/vm/vm_object.c
projects/clang1000-import/sys/vm/vm_object.h
projects/clang1000-import/sys/vm/vm_page.c
projects/clang1000-import/sys/vm/vm_page.h
projects/clang1000-import/sys/vm/vnode_pager.c
projects/clang1000-import/sys/xdr/xdr_array.c
projects/clang1000-import/sys/xdr/xdr_reference.c
projects/clang1000-import/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
projects/clang1000-import/tools/build/options/WITH_BINUTILS_BOOTSTRAP
projects/clang1000-import/usr.bin/Makefile
projects/clang1000-import/usr.bin/diff/TODO
projects/clang1000-import/usr.bin/diff/diff.1
projects/clang1000-import/usr.bin/diff/diff.c
projects/clang1000-import/usr.bin/diff/diff.h
projects/clang1000-import/usr.bin/diff/diffreg.c
projects/clang1000-import/usr.bin/diff/tests/diff_test.sh
projects/clang1000-import/usr.bin/env/Makefile
projects/clang1000-import/usr.bin/env/env.1
projects/clang1000-import/usr.bin/env/env.c
projects/clang1000-import/usr.bin/login/login.conf
projects/clang1000-import/usr.bin/ministat/ministat.c
projects/clang1000-import/usr.bin/units/units.1
projects/clang1000-import/usr.bin/units/units.c
projects/clang1000-import/usr.bin/wc/wc.c
projects/clang1000-import/usr.sbin/Makefile
projects/clang1000-import/usr.sbin/bsdinstall/bsdinstall.8
projects/clang1000-import/usr.sbin/cron/cron/do_command.c
projects/clang1000-import/usr.sbin/cron/crontab/crontab.5
projects/clang1000-import/usr.sbin/fstyp/hammer.c
projects/clang1000-import/usr.sbin/fstyp/hammer2.c
projects/clang1000-import/usr.sbin/mixer/tests/mixer_test.sh
projects/clang1000-import/usr.sbin/mpsutil/mps_cmd.c
projects/clang1000-import/usr.sbin/mpsutil/mps_show.c
projects/clang1000-import/usr.sbin/service/service.sh
Directory Properties:
projects/clang1000-import/ (props changed)
projects/clang1000-import/cddl/ (props changed)
projects/clang1000-import/cddl/contrib/opensolaris/ (props changed)
projects/clang1000-import/contrib/elftoolchain/ (props changed)
projects/clang1000-import/contrib/netbsd-tests/ (props changed)
projects/clang1000-import/contrib/sqlite3/ (props changed)
projects/clang1000-import/contrib/xz/ (props changed)
projects/clang1000-import/gnu/lib/ (props changed)
projects/clang1000-import/sys/cddl/contrib/opensolaris/ (props changed)
projects/clang1000-import/sys/contrib/ck/ (props changed)
Modified: projects/clang1000-import/Makefile.inc1
==============================================================================
--- projects/clang1000-import/Makefile.inc1 Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/Makefile.inc1 Fri Feb 7 19:08:37 2020 (r357662)
@@ -2912,6 +2912,7 @@ _cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libctf__L: lib/libz__L
.endif
+# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db
_prebuild_libs+= lib/libprocstat lib/libproc lib/librtld_db
lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L
lib/libproc__L: lib/libprocstat__L
Modified: projects/clang1000-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang1000-import/ObsoleteFiles.inc Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/ObsoleteFiles.inc Fri Feb 7 19:08:37 2020 (r357662)
@@ -272,6 +272,14 @@ OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt
OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/9.0.1/lib
OLD_DIRS+=usr/lib/clang/9.0.1
+
+# 20200206: Remove elf2aout
+OLD_FILES+=usr/bin/elf2aout
+OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
+
+# 20200204: simple_httpd removed
+OLD_FILES+=usr/sbin/simple_httpd
+
# 20200127: vpo removed
OLD_FILES+=usr/share/man/man4/imm.4.gz
OLD_FILES+=usr/share/man/man4/vpo.4.gz
Modified: projects/clang1000-import/RELNOTES
==============================================================================
--- projects/clang1000-import/RELNOTES Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/RELNOTES Fri Feb 7 19:08:37 2020 (r357662)
@@ -10,6 +10,18 @@ newline. Entries should be separated by a newline.
Changes to this file should not be MFCed.
+r357627:
+ remove elf2aout.
+
+r357560-r357565:
+ init(8), service(8), and cron(8) will now adopt user/class environment
+ variables (excluding PATH, by default, which will be overwritten) by
+ default. Notably, environment variables for all cron jobs and rc
+ services can now be set via login.conf(5).
+
+r357455:
+ sparc64 has been removed from FreeBSD.
+
r355677:
Adds support for NFSv4.2 (RFC-7862) and Extended Attributes
(RFC-8276) to the NFS client and server.
@@ -31,6 +43,9 @@ r355677:
server.
Setting vfs.nfsd.server_max_minorversion4 to 0 or 1 will disable NFSv4.2
on the server.
+
+r356263:
+ armv5 support has been removed from FreeBSD.
r354517:
iwm(4) now supports most Intel 9260, 9460 and 9560 Wi-Fi devices.
Modified: projects/clang1000-import/bin/pwait/pwait.c
==============================================================================
--- projects/clang1000-import/bin/pwait/pwait.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/bin/pwait/pwait.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
Modified: projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -687,6 +687,9 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, in
#elif defined(__mips__)
elf_file.ehdr.e_machine = EM_MIPS;
#elif defined(__powerpc64__)
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+ elf_file.ehdr.e_flags = 2;
+#endif
elf_file.ehdr.e_machine = EM_PPC64;
#elif defined(__sparc)
elf_file.ehdr.e_machine = EM_SPARCV9;
@@ -1276,7 +1279,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
static const char dt_symfmt[] = "%s%u.%s";
static const char dt_weaksymfmt[] = "%s.%s";
char probename[DTRACE_NAMELEN];
- int fd, i, ndx, eprobe, mod = 0;
+ int fd, i, ndx, eprobe, uses_funcdesc = 0, mod = 0;
Elf *elf = NULL;
GElf_Ehdr ehdr;
Elf_Scn *scn_rel, *scn_sym, *scn_str, *scn_tgt;
@@ -1328,6 +1331,9 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
emachine1 = emachine2 = EM_MIPS;
#elif defined(__powerpc__)
emachine1 = emachine2 = EM_PPC64;
+#if !defined(_CALL_ELF) || _CALL_ELF == 1
+ uses_funcdesc = 1;
+#endif
#elif defined(__sparc)
emachine1 = emachine2 = EM_SPARCV9;
#elif defined(__i386) || defined(__amd64)
@@ -1473,7 +1479,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
continue;
if (dt_symtab_lookup(data_sym, 0, isym, rela.r_offset,
- shdr_rel.sh_info, &fsym, (emachine1 == EM_PPC64),
+ shdr_rel.sh_info, &fsym, uses_funcdesc,
elf) != 0) {
dt_strtab_destroy(strtab);
goto err;
@@ -1644,7 +1650,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
if (dt_symtab_lookup(data_sym, osym, isym,
rela.r_offset, shdr_rel.sh_info, &fsym,
- (emachine1 == EM_PPC64), elf) == 0) {
+ uses_funcdesc, elf) == 0) {
if (fsym.st_name > data_str->d_size)
goto err;
@@ -1653,7 +1659,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
s = strchr(s, '.') + 1;
} else if (dt_symtab_lookup(data_sym, 0, osym,
rela.r_offset, shdr_rel.sh_info, &fsym,
- (emachine1 == EM_PPC64), elf) == 0) {
+ uses_funcdesc, elf) == 0) {
u_int bind;
bind = GELF_ST_BIND(fsym.st_info) == STB_WEAK ?
Modified: projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -25,6 +25,7 @@
*/
#include <sys/param.h>
+#include <sys/tree.h>
#include <capsicum_helpers.h>
#include <dwarf.h>
@@ -39,7 +40,6 @@
#include <stdlib.h>
#include <string.h>
-#include "uthash.h"
#include "_elftc.h"
ELFTC_VCSID("$Id: addr2line.c 3499 2016-11-25 16:06:29Z emaste $");
@@ -57,13 +57,14 @@ struct Func {
};
struct CU {
+ RB_ENTRY(CU) entry;
Dwarf_Off off;
Dwarf_Unsigned lopc;
Dwarf_Unsigned hipc;
char **srcfiles;
Dwarf_Signed nsrcfiles;
STAILQ_HEAD(, Func) funclist;
- UT_hash_handle hh;
+ Dwarf_Die die;
};
static struct option longopts[] = {
@@ -80,11 +81,23 @@ static struct option longopts[] = {
{"version", no_argument, NULL, 'V'},
{NULL, 0, NULL, 0}
};
+
static int demangle, func, base, inlines, print_addr, pretty_print;
static char unknown[] = { '?', '?', '\0' };
static Dwarf_Addr section_base;
-static struct CU *culist;
+/* Need a new curlopc that stores last lopc value. */
+static Dwarf_Unsigned curlopc = ~0ULL;
+static RB_HEAD(cutree, CU) cuhead = RB_INITIALIZER(&cuhead);
+static int
+lopccmp(struct CU *e1, struct CU *e2)
+{
+ return (e1->lopc < e2->lopc ? -1 : e1->lopc > e2->lopc);
+}
+
+RB_PROTOTYPE(cutree, CU, entry, lopccmp);
+RB_GENERATE(cutree, CU, entry, lopccmp)
+
#define USAGE_MESSAGE "\
Usage: %s [options] hexaddress...\n\
Map program addresses to source file names and line numbers.\n\n\
@@ -378,6 +391,26 @@ print_inlines(struct CU *cu, struct Func *f, Dwarf_Uns
f->call_line);
}
+static struct CU *
+culookup(Dwarf_Unsigned addr)
+{
+ struct CU find, *res;
+
+ find.lopc = addr;
+ res = RB_NFIND(cutree, &cuhead, &find);
+ if (res != NULL) {
+ if (res->lopc != addr)
+ res = RB_PREV(cutree, &cuhead, res);
+ if (res != NULL && addr >= res->lopc && addr < res->hipc)
+ return (res);
+ } else {
+ res = RB_MAX(cutree, &cuhead);
+ if (res != NULL && addr >= res->lopc && addr < res->hipc)
+ return (res);
+ }
+ return (NULL);
+}
+
static void
translate(Dwarf_Debug dbg, Elf *e, const char* addrstr)
{
@@ -400,11 +433,30 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
addr += section_base;
lineno = 0;
file = unknown;
- cu = NULL;
die = NULL;
+ ret = DW_DLV_OK;
- while ((ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
- &de)) == DW_DLV_OK) {
+ cu = culookup(addr);
+ if (cu != NULL) {
+ die = cu->die;
+ goto status_ok;
+ }
+
+ while (true) {
+ /*
+ * We resume the CU scan from the last place we found a match.
+ * Because when we have 2 sequential addresses, and the second
+ * one is of the next CU, it is faster to just go to the next CU
+ * instead of starting from the beginning.
+ */
+ ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
+ &de);
+ if (ret == DW_DLV_NO_ENTRY) {
+ if (curlopc == ~0ULL)
+ goto out;
+ ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL,
+ NULL, &de);
+ }
die = NULL;
while (dwarf_siblingof(dbg, die, &ret_die, &de) == DW_DLV_OK) {
if (die != NULL)
@@ -420,12 +472,15 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
if (tag == DW_TAG_compile_unit)
break;
}
+
if (ret_die == NULL) {
warnx("could not find DW_TAG_compile_unit die");
goto next_cu;
}
if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) ==
DW_DLV_OK) {
+ if (lopc == curlopc)
+ goto out;
if (dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc,
&de) == DW_DLV_OK) {
/*
@@ -440,31 +495,27 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
hipc = ~0ULL;
}
- /*
- * Record the CU in the hash table for faster lookup
- * later.
- */
if (dwarf_dieoffset(die, &off, &de) != DW_DLV_OK) {
warnx("dwarf_dieoffset failed: %s",
dwarf_errmsg(de));
goto out;
}
- HASH_FIND(hh, culist, &off, sizeof(off), cu);
- if (cu == NULL) {
+
+ if (addr >= lopc && addr < hipc) {
if ((cu = calloc(1, sizeof(*cu))) == NULL)
err(EXIT_FAILURE, "calloc");
cu->off = off;
cu->lopc = lopc;
cu->hipc = hipc;
+ cu->die = die;
STAILQ_INIT(&cu->funclist);
- HASH_ADD(hh, culist, off, sizeof(off), cu);
- }
+ RB_INSERT(cutree, &cuhead, cu);
- if (addr >= lopc && addr < hipc)
+ curlopc = lopc;
break;
+ }
}
-
- next_cu:
+next_cu:
if (die != NULL) {
dwarf_dealloc(dbg, die, DW_DLA_DIE);
die = NULL;
@@ -474,6 +525,7 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
if (ret != DW_DLV_OK || die == NULL)
goto out;
+status_ok:
switch (dwarf_srclines(die, &lbuf, &lcount, &de)) {
case DW_DLV_OK:
break;
@@ -572,21 +624,6 @@ out:
cu->srcfiles != NULL && f != NULL && f->inlined_caller != NULL)
print_inlines(cu, f->inlined_caller, f->call_file,
f->call_line);
-
- if (die != NULL)
- dwarf_dealloc(dbg, die, DW_DLA_DIE);
-
- /*
- * Reset internal CU pointer, so we will start from the first CU
- * next round.
- */
- while (ret != DW_DLV_NO_ENTRY) {
- if (ret == DW_DLV_ERROR)
- errx(EXIT_FAILURE, "dwarf_next_cu_header: %s",
- dwarf_errmsg(de));
- ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
- &de);
- }
}
static void
Modified: projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -587,15 +587,19 @@ copy_from_tempfile(const char *src, const char *dst, i
if ((tmpfd = open(dst, O_CREAT | O_TRUNC | O_WRONLY, 0755)) < 0)
return (-1);
- if (elftc_copyfile(infd, tmpfd) < 0)
+ if (elftc_copyfile(infd, tmpfd) < 0) {
+ (void) close(tmpfd);
return (-1);
+ }
/*
* Remove the temporary file from the file system
* namespace, and close its file descriptor.
*/
- if (unlink(src) < 0)
+ if (unlink(src) < 0) {
+ (void) close(tmpfd);
return (-1);
+ }
(void) close(infd);
Modified: projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -1137,7 +1137,7 @@ read_section(struct section *s, size_t *size)
if (b == NULL)
b = malloc(id->d_size);
else
- b = malloc(sz + id->d_size);
+ b = realloc(b, sz + id->d_size);
if (b == NULL)
err(EXIT_FAILURE, "malloc or realloc failed");
Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -46,8 +46,10 @@ dwarf_add_AT_location_expr(Dwarf_P_Debug dbg, Dwarf_P_
at->at_attrib = attr;
at->at_expr = loc_expr;
- if (_dwarf_expr_into_block(loc_expr, error) != DW_DLE_NONE)
+ if (_dwarf_expr_into_block(loc_expr, error) != DW_DLE_NONE) {
+ free(at);
return (DW_DLV_BADADDR);
+ }
at->u[0].u64 = loc_expr->pe_length;
at->u[1].u8p = loc_expr->pe_block;
if (loc_expr->pe_length <= UCHAR_MAX)
Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -36,10 +36,10 @@ _dwarf_add_expr(Dwarf_P_Expr expr, Dwarf_Small opcode,
Dwarf_Debug dbg;
int len;
- dbg = expr != NULL ? expr->pe_dbg : NULL;
+ dbg = expr->pe_dbg;
- if (_dwarf_loc_expr_add_atom(expr->pe_dbg, NULL, NULL, opcode, val1,
- val2, &len, error) != DW_DLE_NONE)
+ if (_dwarf_loc_expr_add_atom(dbg, NULL, NULL, opcode, val1, val2, &len,
+ error) != DW_DLE_NONE)
return (NULL);
assert(len > 0);
@@ -67,7 +67,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error
Dwarf_Debug dbg;
int len, pos, ret;
- dbg = expr != NULL ? expr->pe_dbg : NULL;
+ dbg = expr->pe_dbg;
if (expr->pe_block != NULL) {
free(expr->pe_block);
@@ -88,7 +88,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error
pos = 0;
STAILQ_FOREACH(ee, &expr->pe_eelist, ee_next) {
assert((Dwarf_Unsigned) pos < expr->pe_length);
- ret = _dwarf_loc_expr_add_atom(expr->pe_dbg,
+ ret = _dwarf_loc_expr_add_atom(dbg,
&expr->pe_block[pos], &expr->pe_block[expr->pe_length],
ee->ee_loc.lr_atom, ee->ee_loc.lr_number,
ee->ee_loc.lr_number2, &len, error);
Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -59,9 +59,7 @@ _dwarf_abbrev_add(Dwarf_CU cu, uint64_t entry, uint64_
HASH_ADD(ab_hh, cu->cu_abbrev_hash, ab_entry,
sizeof(ab->ab_entry), ab);
- if (abp != NULL)
- *abp = ab;
-
+ *abp = ab;
return (DW_DLE_NONE);
}
Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -468,9 +468,9 @@ _dwarf_frame_section_init(Dwarf_Debug dbg, Dwarf_Frame
if (length > ds->ds_size - offset ||
(length == 0 && !eh_frame)) {
- DWARF_SET_ERROR(dbg, error,
- DW_DLE_DEBUG_FRAME_LENGTH_BAD);
- return (DW_DLE_DEBUG_FRAME_LENGTH_BAD);
+ ret = DW_DLE_DEBUG_FRAME_LENGTH_BAD;
+ DWARF_SET_ERROR(dbg, error, ret);
+ goto fail_cleanup;
}
/* Check terminator for .eh_frame */
Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -203,11 +203,13 @@ cpp_demangle_ARM(const char *org)
break;
if ((arg = vector_str_substr(&d.vec, arg_begin, d.vec.size - 1,
- &arg_len)) == NULL)
+ &arg_len)) == NULL)
goto clean;
- if (vector_str_push(&d.arg, arg, arg_len) == false)
+ if (vector_str_push(&d.arg, arg, arg_len) == false) {
+ free(arg);
goto clean;
+ }
free(arg);
@@ -301,12 +303,11 @@ init_demangle_data(struct demangle_data *d)
d->type = ENCODE_FUNC;
- if (vector_str_init(&d->vec) == false)
+ if (!vector_str_init(&d->vec))
return (false);
- if (vector_str_init(&d->arg) == false) {
+ if (!vector_str_init(&d->arg)) {
vector_str_dest(&d->vec);
-
return (false);
}
@@ -956,7 +957,7 @@ read_op_user(struct demangle_data *d)
goto clean;
if (VEC_PUSH_STR(&d->vec, "::operator ") == false)
- return (false);
+ goto clean;
if (vector_str_push(&d->vec, to_str, to_len) == false)
goto clean;
Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -216,11 +216,13 @@ cpp_demangle_gnu2(const char *org)
break;
if ((arg = vector_str_substr(&d.vec, arg_begin, d.vec.size - 1,
- &arg_len)) == NULL)
+ &arg_len)) == NULL)
goto clean;
- if (vector_str_push(&d.arg, arg, arg_len) == false)
+ if (vector_str_push(&d.arg, arg, arg_len) == false) {
+ free(arg);
goto clean;
+ }
free(arg);
@@ -387,12 +389,11 @@ init_demangle_data(struct demangle_data *d)
d->type = ENCODE_FUNC;
- if (vector_str_init(&d->vec) == false)
+ if (!vector_str_init(&d->vec))
return (false);
- if (vector_str_init(&d->arg) == false) {
+ if (!vector_str_init(&d->arg)) {
vector_str_dest(&d->vec);
-
return (false);
}
Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -1659,7 +1659,8 @@ cpp_demangle_read_local_name(struct cpp_demangle_data
if (*(++ddata->cur) == '\0')
return (0);
- vector_str_init(&local_name);
+ if (!vector_str_init(&local_name))
+ return (0);
ddata->cur_output = &local_name;
if (!cpp_demangle_read_encoding(ddata)) {
@@ -3953,7 +3954,7 @@ vector_type_qualifier_init(struct vector_type_qualifie
assert(v->q_container != NULL);
- if (vector_str_init(&v->ext_name) == false) {
+ if (!vector_str_init(&v->ext_name)) {
free(v->q_container);
return (0);
}
Modified: projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -5964,6 +5964,7 @@ dump_dwarf_frame_regtable(struct readelf *re, Dwarf_Fd
for (; cur_pc < end_pc; cur_pc++) {
if (dwarf_get_fde_info_for_all_regs(fde, cur_pc, &rt, &row_pc,
&de) != DW_DLV_OK) {
+ free(vec);
warnx("dwarf_get_fde_info_for_all_regs failed: %s\n",
dwarf_errmsg(de));
return (-1);
@@ -6298,8 +6299,8 @@ search_loclist_at(struct readelf *re, Dwarf_Die die, D
if (*la_list_cap == *la_list_len) {
*la_list = realloc(*la_list,
*la_list_cap * 2 * sizeof(**la_list));
- if (la_list == NULL)
- errx(EXIT_FAILURE, "realloc failed");
+ if (*la_list == NULL)
+ err(EXIT_FAILURE, "realloc failed");
*la_list_cap *= 2;
}
la = &((*la_list)[*la_list_len]);
@@ -7247,7 +7248,6 @@ dump_object(struct readelf *re, int fd)
done:
elf_end(re->elf);
- close(fd);
}
static void
Modified: projects/clang1000-import/contrib/elftoolchain/size/size.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/size/size.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/elftoolchain/size/size.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -240,7 +240,7 @@ main(int argc, char **argv)
return (rc);
}
-static Elf_Data *
+static int
xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void *_dst,
Elf_Type type, size_t size)
{
@@ -253,7 +253,8 @@ xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void
dst.d_buf = _dst;
dst.d_version = elfhdr->e_version;
dst.d_size = size;
- return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]));
+ return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]) !=
+ NULL ? 0 : 1);
}
#define NOTE_OFFSET_32(nhdr, namesz, offset) \
@@ -314,12 +315,12 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
while (data != NULL && offset + sizeof(Elf32_Nhdr) < segment_end) {
nhdr = (Elf32_Nhdr *)(uintptr_t)((char*)data + offset);
memset(&nhdr_l, 0, sizeof(Elf32_Nhdr));
- if (!xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
- ELF_T_WORD, sizeof(Elf32_Word)) ||
- !xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
- ELF_T_WORD, sizeof(Elf32_Word)) ||
- !xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
- ELF_T_WORD, sizeof(Elf32_Word)))
+ if (xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+ xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+ xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0)
break;
if (offset + sizeof(Elf32_Nhdr) +
@@ -356,10 +357,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
pid = PID64(nhdr,
nhdr_l.n_namesz, 40);
}
- xlatetom(elf, elfhdr, &raw_size, &raw_size,
- ELF_T_WORD, sizeof(uint64_t));
- xlatetom(elf, elfhdr, &pid, &pid, ELF_T_WORD,
- sizeof(pid_t));
+ (void)xlatetom(elf, elfhdr, &raw_size,
+ &raw_size, ELF_T_WORD, sizeof(uint64_t));
+ (void)xlatetom(elf, elfhdr, &pid, &pid,
+ ELF_T_WORD, sizeof(pid_t));
}
if (raw_size != 0 && style == STYLE_SYSV) {
Modified: projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
==============================================================================
--- projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $ */
+/* $NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,13 +29,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $");
+__RCSID("$NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $");
#include <atf-c.h>
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/stat.h>
+#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
@@ -50,7 +51,7 @@ __RCSID("$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:
* until a decision is reached about the semantics of O_SEARCH and a
* non-broken implementation is available.
*/
-#if (O_MASK & O_SEARCH) != 0
+#if defined(__FreeBSD__) || (O_MASK & O_SEARCH) != 0
#define USE_O_SEARCH
#endif
@@ -257,11 +258,76 @@ ATF_TC_BODY(o_search_notdir, tc)
int fd;
ATF_REQUIRE(mkdir(DIR, 0755) == 0);
- ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_RDWR|O_SEARCH, 0644)) != -1);
+ ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_SEARCH, 0644)) != -1);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1);
ATF_REQUIRE(errno == ENOTDIR);
+ ATF_REQUIRE(close(dfd) == 0);
}
+#ifdef USE_O_SEARCH
+ATF_TC(o_search_nord);
+ATF_TC_HEAD(o_search_nord, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "See that openat succeeds with no read permission");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_nord, tc)
+{
+ int dfd, fd;
+
+ ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+ ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+ ATF_REQUIRE(close(fd) == 0);
+
+ ATF_REQUIRE(chmod(DIR, 0100) == 0);
+ ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+
+ ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) != -1);
+
+ ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_getdents);
+ATF_TC_HEAD(o_search_getdents, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "See that O_SEARCH forbids getdents");
+}
+ATF_TC_BODY(o_search_getdents, tc)
+{
+ char buf[1024];
+ int dfd;
+
+ ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+ ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+ ATF_REQUIRE(getdents(dfd, buf, sizeof(buf)) < 0);
+ ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_revokex);
+ATF_TC_HEAD(o_search_revokex, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "See that *at behaves after chmod -x");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_revokex, tc)
+{
+ int dfd, fd;
+ struct stat sb;
+
+ ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+ ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+ ATF_REQUIRE(close(fd) == 0);
+
+ ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+
+ /* Drop permissions. The kernel must still not check the exec bit. */
+ ATF_REQUIRE(chmod(DIR, 0000) == 0);
+ ATF_REQUIRE(fstatat(dfd, BASEFILE, &sb, 0) == 0);
+
+ ATF_REQUIRE(close(dfd) == 0);
+}
+#endif /* USE_O_SEARCH */
+
ATF_TP_ADD_TCS(tp)
{
@@ -276,6 +342,11 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, o_search_unpriv_flag2);
#endif
ATF_TP_ADD_TC(tp, o_search_notdir);
+#ifdef USE_O_SEARCH
+ ATF_TP_ADD_TC(tp, o_search_nord);
+ ATF_TP_ADD_TC(tp, o_search_getdents);
+ ATF_TP_ADD_TC(tp, o_search_revokex);
+#endif
return atf_no_error();
}
Modified: projects/clang1000-import/contrib/sqlite3/Makefile.msc
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/Makefile.msc Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/sqlite3/Makefile.msc Fri Feb 7 19:08:37 2020 (r357662)
@@ -210,12 +210,6 @@ OPTIMIZATIONS = 2
SESSION = 0
!ENDIF
-# Set this to non-0 to enable support for the rbu extension.
-#
-!IFNDEF RBU
-RBU = 0
-!ENDIF
-
# Set the source code file to be used by executables and libraries when
# they need the amalgamation.
#
@@ -288,6 +282,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENAB
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
!ENDIF
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -301,13 +296,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENAB
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
!ENDIF
-# Should the rbu extension be enabled? If so, add compilation options
-# to enable it.
-#
-!IF $(RBU)!=0
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1
-!ENDIF
-
# These are the "extended" SQLite compilation options used when compiling for
# the Windows 10 platform.
#
@@ -990,7 +978,7 @@ Replace.exe:
sqlite3.def: Replace.exe $(LIBOBJ)
echo EXPORTS > sqlite3.def
dumpbin /all $(LIBOBJ) \
- | .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser|rbu)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+ | .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
| sort >> sqlite3.def
$(SQLITE3EXE): shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
Modified: projects/clang1000-import/contrib/sqlite3/configure
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/configure Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/sqlite3/configure Fri Feb 7 19:08:37 2020 (r357662)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.31.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.30.1.
#
# Report bugs to <http://www.sqlite.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.31.0'
-PACKAGE_STRING='sqlite 3.31.0'
+PACKAGE_VERSION='3.30.1'
+PACKAGE_STRING='sqlite 3.30.1'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.31.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.30.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.31.0:";;
+ short | recursive ) echo "Configuration of sqlite 3.30.1:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.31.0
+sqlite configure 3.30.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.31.0, which was
+It was created by sqlite $as_me 3.30.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2818,7 +2818,7 @@ fi
# Define the identity of the package.
PACKAGE='sqlite'
- VERSION='3.31.0'
+ VERSION='3.30.1'
cat >>confdefs.h <<_ACEOF
@@ -13653,7 +13653,7 @@ else
fi
if test x"$enable_rtree" = "xyes"; then
- BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE"
fi
#-----------------------------------------------------------------------
@@ -14438,7 +14438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sqlite $as_me 3.31.0, which was
+This file was extended by sqlite $as_me 3.30.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14495,7 +14495,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sqlite config.status 3.31.0
+sqlite config.status 3.30.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: projects/clang1000-import/contrib/sqlite3/configure.ac
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/configure.ac Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/sqlite3/configure.ac Fri Feb 7 19:08:37 2020 (r357662)
@@ -10,7 +10,7 @@
#
AC_PREREQ(2.61)
-AC_INIT(sqlite, 3.31.0, http://www.sqlite.org)
+AC_INIT(sqlite, 3.30.1, http://www.sqlite.org)
AC_CONFIG_SRCDIR([sqlite3.c])
AC_CONFIG_AUX_DIR([.])
@@ -161,7 +161,7 @@ AC_ARG_ENABLE(rtree, [AS_HELP_STRING(
[--enable-rtree], [include rtree support [default=yes]])],
[], [enable_rtree=yes])
if test x"$enable_rtree" = "xyes"; then
- BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE"
fi
#-----------------------------------------------------------------------
Modified: projects/clang1000-import/contrib/sqlite3/shell.c
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/shell.c Fri Feb 7 19:04:27 2020 (r357661)
+++ projects/clang1000-import/contrib/sqlite3/shell.c Fri Feb 7 19:08:37 2020 (r357662)
@@ -2007,23 +2007,19 @@ int sqlite3_shathree_init(
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
(void)pzErrMsg; /* Unused parameter */
- rc = sqlite3_create_function(db, "sha3", 1,
- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
- 0, sha3Func, 0, 0);
+ rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
+ sha3Func, 0, 0);
if( rc==SQLITE_OK ){
- rc = sqlite3_create_function(db, "sha3", 2,
- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
- 0, sha3Func, 0, 0);
+ rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
+ sha3Func, 0, 0);
}
if( rc==SQLITE_OK ){
- rc = sqlite3_create_function(db, "sha3_query", 1,
- SQLITE_UTF8 | SQLITE_DIRECTONLY,
- 0, sha3QueryFunc, 0, 0);
+ rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
+ sha3QueryFunc, 0, 0);
}
if( rc==SQLITE_OK ){
- rc = sqlite3_create_function(db, "sha3_query", 2,
- SQLITE_UTF8 | SQLITE_DIRECTONLY,
- 0, sha3QueryFunc, 0, 0);
+ rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
+ sha3QueryFunc, 0, 0);
}
return rc;
}
@@ -2617,7 +2613,6 @@ static int fsdirConnect(
pNew = (fsdir_tab*)sqlite3_malloc( sizeof(*pNew) );
if( pNew==0 ) return SQLITE_NOMEM;
memset(pNew, 0, sizeof(*pNew));
- sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
}
*ppVtab = (sqlite3_vtab*)pNew;
return rc;
@@ -3011,12 +3006,10 @@ int sqlite3_fileio_init(
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
(void)pzErrMsg; /* Unused parameter */
- rc = sqlite3_create_function(db, "readfile", 1,
- SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+ rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
readfileFunc, 0, 0);
if( rc==SQLITE_OK ){
- rc = sqlite3_create_function(db, "writefile", -1,
- SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+ rc = sqlite3_create_function(db, "writefile", -1, SQLITE_UTF8, 0,
writefileFunc, 0, 0);
}
if( rc==SQLITE_OK ){
@@ -3151,7 +3144,6 @@ static int completionConnect(
#define COMPLETION_COLUMN_WHOLELINE 2 /* Entire line seen so far */
#define COMPLETION_COLUMN_PHASE 3 /* ePhase - used for debugging only */
- sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
rc = sqlite3_declare_vtab(db,
"CREATE TABLE x("
" candidate TEXT,"
@@ -4586,7 +4578,6 @@ static int zipfileConnect(
zipfileDequote(pNew->zFile);
}
}
- sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
*ppVtab = (sqlite3_vtab*)pNew;
return rc;
}
@@ -5199,25 +5190,25 @@ static int zipfileDeflate(
u8 **ppOut, int *pnOut, /* Output */
char **pzErr /* OUT: Error message */
){
- int rc = SQLITE_OK;
- sqlite3_int64 nAlloc;
- z_stream str;
+ sqlite3_int64 nAlloc = compressBound(nIn);
u8 *aOut;
+ int rc = SQLITE_OK;
- memset(&str, 0, sizeof(str));
- str.next_in = (Bytef*)aIn;
- str.avail_in = nIn;
- deflateInit2(&str, 9, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
-
- nAlloc = deflateBound(&str, nIn);
aOut = (u8*)sqlite3_malloc64(nAlloc);
if( aOut==0 ){
rc = SQLITE_NOMEM;
}else{
int res;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***