CVS commit: src/share/man/man4
Module Name:src
Committed By: msaitoh
Date: Thu Jul 4 09:26:14 UTC 2013
Modified Files:
src/share/man/man4: bge.4
Log Message:
Sync with {Open,Free}BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/bge.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/bge.4
diff -u src/share/man/man4/bge.4:1.12 src/share/man/man4/bge.4:1.13
--- src/share/man/man4/bge.4:1.12 Sat Sep 26 06:47:55 2009
+++ src/share/man/man4/bge.4 Thu Jul 4 09:26:14 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: bge.4,v 1.12 2009/09/26 06:47:55 wiz Exp $
+.\ $NetBSD: bge.4,v 1.13 2013/07/04 09:26:14 msaitoh Exp $
.\
.\ Copyright (c) 2003 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,12 +27,12 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd September 26, 2009
+.Dd July 4, 2013
.Dt BGE 4
.Os
.Sh NAME
.Nm bge
-.Nd Broadcom BCM570x family Gigabit Ethernet driver
+.Nd Broadcom BCM57xx/BCM590x 10/100/Gigabit Ethernet driver
.Sh SYNOPSIS
.Cd bge* at pci? dev ? function ?
.Pp
@@ -42,27 +42,88 @@ See
.Sh DESCRIPTION
The
.Nm
-device driver supports Gigabit Ethernet interfaces based on the Broadcom
-BCM570x family of Gigabit Ethernet chips and the BCM5906 chip.
-The interfaces supported by the
-.Nm
-driver include:
-.Bl -bullet
+driver provides support for various NICs based on the Broadcom BCM570x,
+571x, 572x, 575x, 576x, 578x, 5776x and 5778x Gigabit Ethernet controller
+chips and the 590x and 5779x Fast Ethernet controller chips,
+including the following:
+.Pp
+.Bl -bullet -compact
+.It
+3Com 3c996-T (10/100/1000baseT)
+.It
+3Com 3c996-SX (1000baseSX)
+.It
+3Com 3c996B-T (10/100/1000baseT)
+.It
+Allied-Telesis AT-2972LX10/LC
+.It
+Dell PowerEdge 1750 integrated BCM5704C NIC (10/100/1000baseT)
+.It
+Dell PowerEdge 2550 integrated BCM5700 NIC (10/100/1000baseT)
+.It
+Dell PowerEdge 2650 integrated BCM5703 NIC (10/100/1000baseT)
+.It
+Fujitsu PRIMEPOWER 250/450 LAN (10/100/1000baseT)
+.It
+Fujitsu PW0G8GE1U (1000baseSX)
+.It
+Fujitsu PW0G8GE2U (10/100/1000baseT)
+.It
+Fujitsu PW008GE4 (1000baseSX)
+.It
+Fujitsu PW008GE5 (10/100/1000baseT)
+.It
+Fujitsu PW008QG1U (10/100/1000baseT)
+.It
+HP ProLiant NC320T PCI-E Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC320m PCI-E Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC331T PCI-E Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC332T PCI-E Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC370F PCI-X Gigabit NIC (1000baseSX)
+.It
+HP ProLiant NC370T PCI-X Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC1020 PCI Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC6770 PCI-X Gigabit NIC (1000baseSX)
+.It
+HP ProLiant NC7760 embedded PCI Gigabit NIC (10/100/1000baseT)
+.It
+HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseT)
.It
-3Com 3c996-T (10BASE-T/100BASE-TX/1000BASE-T)
+HP ProLiant NC7771 PCI-X Gigabit NIC (10/100/1000baseT)
.It
-Dell PowerEdge 2550 integrated BCM5700 NIC (10BASE-T/100BASE-TX/1000BASE-T)
+HP ProLiant NC7780 embedded PCI-X Gigabit NIC (10/100/1000baseT)
.It
-IBM x235 server integrated BCM5703x NIC (10BASE-T/100BASE-TX/1000BASE-T)
+HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseT)
.It
-Netgear GA302T (10BASE-T/100BASE-TX/1000BASE-T)
+HP ProLiant NC7782 embedded PCI-X Gigabit NIC (10/100/1000baseT)
.It
-SysKonnect SK-9D21 (10BASE-T/100BASE-TX/1000BASE-T)
+IBM ThinkPad T43/T43p integrated BCM5751M NIC (10/100/1000baseT)
.It
-SysKonnect SK-9D41 (1000BASE-SX)
+IBM xSeries 235 integrated BCM5703X NIC (10/100/1000baseT)
+.It
+IBM xSeries 305 integrated BCM5703X NIC (10/100/1000baseT)
+.It
+Netgear GA302T (10/100/1000baseT)
+.It
+SysKonnect SK-9D21 (10/100/1000baseT)
+.It
+SysKonnect SK-9D41 (1000baseSX)
.El
.Pp
-The BCM570x family supports IPv4/TCP/UDP checksumming in hardware.
+The
+.Nm
+driver supports IPv4 IP, TCP, and UDP checksum offload for receive,
+IP checksum offload for transmit, VLAN tag insertion and stripping,
+as well as a 256-bit multicast hash filter.
+The BCM5717, BCM5718, BCM5723, BCM5754, BCM5755, BCM5761, BCM5764, BCM5784,
+BCM5785, BCM5787 and BCM577xx chips also support IPv6 receive TCP/UDP
+checksum offload.
The
.Nm
driver supports this feature of the chip.
@@ -70,6 +131,14 @@ See
.Xr ifconfig 8
for information on how to enable this feature.
.Pp
+The BCM5700, BCM5701, BCM5702, BCM5703, BCM5704, BCM5714, BCM5717, BCM5719,
+BCM5720, BCM5780, BCM57765 and BCM57766 also support jumbo frames, which can be
+configured via the
+interface MTU setting.
+Selecting an MTU larger than 1500 bytes with the
+.Xr ifconfig 8
+utility configures the adapter to receive and transmit Jumbo frames.
+.Pp
The level of interrupt mitigation for received packets can be adjusted
with the
.Li hw.bge.rx_lvl
@@ -81,9 +150,78 @@ interrrupt for every two full-sized Ethe
Each increment of the value
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Jul 4 09:39:48 UTC 2013 Modified Files: src/share/man/man4: bge.4 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/bge.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/bge.4 diff -u src/share/man/man4/bge.4:1.13 src/share/man/man4/bge.4:1.14 --- src/share/man/man4/bge.4:1.13 Thu Jul 4 09:26:14 2013 +++ src/share/man/man4/bge.4 Thu Jul 4 09:39:48 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: bge.4,v 1.13 2013/07/04 09:26:14 msaitoh Exp $ +.\ $NetBSD: bge.4,v 1.14 2013/07/04 09:39:48 wiz Exp $ .\ .\ Copyright (c) 2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -159,7 +159,7 @@ driver supports the following media type Enable autoselection of the media type and options. The user can manually override the autoselected mode by adding media options to the appropriate -.Xr hostname.if 5 +.Xr ifconfig.if 5 file. .It Cm 10baseT Set 10Mbps operation.
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Thu Jul 4 09:48:01 UTC 2013
Modified Files:
src/sys/rump/net/lib/libvirtif: rumpcomp_user.c
Log Message:
fix warnings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.6 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.7
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.6 Mon May 20 10:24:26 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.c Thu Jul 4 09:48:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcomp_user.c,v 1.6 2013/05/20 10:24:26 pooka Exp $ */
+/* $NetBSD: rumpcomp_user.c,v 1.7 2013/07/04 09:48:01 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -36,6 +36,7 @@
#include stdio.h
#include stdlib.h
#include string.h
+#include unistd.h
#ifdef __linux__
#include net/if.h
@@ -44,6 +45,8 @@
#include rump/rumpuser_component.h
+#include rumpcomp_user.h
+
struct virtif_user {
int viu_fd;
int viu_dying;
@@ -150,8 +153,11 @@ rumpcomp_virtif_recv(struct virtif_user
pfd.events = POLLIN;
for (;;) {
- if (viu-viu_dying)
+ if (viu-viu_dying) {
+ rv = 0;
+ *rcv = 0;
break;
+ }
prv = poll(pfd, 1, POLLTIMO_MS);
if (prv == 0)
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: pooka
Date: Thu Jul 4 09:58:28 UTC 2013
Modified Files:
src/sys/rump/net/lib/libsockin: rumpcomp_user.c
Log Message:
Avoid not-used warning on NetBSD
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libsockin/rumpcomp_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libsockin/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libsockin/rumpcomp_user.c:1.7 src/sys/rump/net/lib/libsockin/rumpcomp_user.c:1.8
--- src/sys/rump/net/lib/libsockin/rumpcomp_user.c:1.7 Sat Jun 1 11:46:14 2013
+++ src/sys/rump/net/lib/libsockin/rumpcomp_user.c Thu Jul 4 09:58:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcomp_user.c,v 1.7 2013/06/01 11:46:14 pooka Exp $ */
+/* $NetBSD: rumpcomp_user.c,v 1.8 2013/07/04 09:58:28 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -129,20 +129,6 @@ translate_domain(int domain)
}
#undef translate
-#define translate_back(_a_) case _a_: return RUMP_##_a_
-static int translate_domain_back(int);
-static int
-translate_domain_back(int domain)
-{
-
- switch (domain) {
- translate_back(AF_INET);
- translate_back(AF_INET6);
- default: return RUMP_AF_UNSPEC;
- }
-}
-
-#undef translate_back
static void
translate_sockopt(int *levelp, int *namep)
@@ -326,6 +312,20 @@ translate_sockaddr(const struct sockaddr
return laddr;
}
+#define translate_back(_a_) case _a_: return RUMP_##_a_
+static int translate_domain_back(int);
+static int
+translate_domain_back(int domain)
+{
+
+ switch (domain) {
+ translate_back(AF_INET);
+ translate_back(AF_INET6);
+ default: return RUMP_AF_UNSPEC;
+ }
+}
+#undef translate_back
+
static void
translate_sockaddr_back(const struct sockaddr *laddr,
struct rump_sockaddr *baddr,
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src Committed By: pooka Date: Thu Jul 4 10:09:55 UTC 2013 Modified Files: src/sys/rump/dev/lib/libugenhc: rumpcomp_user.c Log Message: Some systems provide ioctl() via unistd.h (not that this is going to work there, but at least we don't get unnecessary compiler warnings) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c diff -u src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.5 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.6 --- src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.5 Tue Apr 30 12:39:21 2013 +++ src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c Thu Jul 4 10:09:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpcomp_user.c,v 1.5 2013/04/30 12:39:21 pooka Exp $ */ +/* $NetBSD: rumpcomp_user.c,v 1.6 2013/07/04 10:09:55 pooka Exp $ */ /* * Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved. @@ -29,6 +29,7 @@ #include sys/ioctl.h #include errno.h +#include unistd.h #include rump/rumpuser_component.h
CVS commit: src/usr.bin/mklocale
Module Name:src
Committed By: joerg
Date: Thu Jul 4 11:36:17 UTC 2013
Modified Files:
src/usr.bin/mklocale: mklocaledb.c
Log Message:
Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and
_CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/mklocale/mklocaledb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mklocale/mklocaledb.c
diff -u src/usr.bin/mklocale/mklocaledb.c:1.2 src/usr.bin/mklocale/mklocaledb.c:1.3
--- src/usr.bin/mklocale/mklocaledb.c:1.2 Mon Jan 5 02:55:34 2009
+++ src/usr.bin/mklocale/mklocaledb.c Thu Jul 4 11:36:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mklocaledb.c,v 1.2 2009/01/05 02:55:34 dogcow Exp $ */
+/* $NetBSD: mklocaledb.c,v 1.3 2013/07/04 11:36:17 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: mklocaledb.c,v 1.2 2009/01/05 02:55:34 dogcow Exp $);
+__RCSID($NetBSD: mklocaledb.c,v 1.3 2013/07/04 11:36:17 joerg Exp $);
#endif /* not lint */
#include assert.h
@@ -136,8 +136,8 @@ static const category_t lc_monetary = {
{ _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES, save_as_uint8},
- { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE, save_as_uint8},
+ { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN,save_as_uint8},
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Thu Jul 4 11:46:51 UTC 2013
Modified Files:
src/sys/rump/net/lib/libvirtif: Makefile component.c if_virt.c
rumpcomp_user.c rumpcomp_user.h
Added Files:
src/sys/rump/net/lib/libvirtif: if_virt.h
Log Message:
Determine the interface name and the names of exported symbols based
on VIRTIF_BASE. This allows using various different packet-shoveling
backends in the same rump kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libvirtif/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libvirtif/component.c \
src/sys/rump/net/lib/libvirtif/rumpcomp_user.h
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/net/lib/libvirtif/if_virt.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libvirtif/if_virt.h
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libvirtif/Makefile
diff -u src/sys/rump/net/lib/libvirtif/Makefile:1.6 src/sys/rump/net/lib/libvirtif/Makefile:1.7
--- src/sys/rump/net/lib/libvirtif/Makefile:1.6 Fri Mar 15 11:30:23 2013
+++ src/sys/rump/net/lib/libvirtif/Makefile Thu Jul 4 11:46:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/03/15 11:30:23 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/04 11:46:51 pooka Exp $
#
LIB= rumpnet_virtif
@@ -7,8 +7,10 @@ SRCS= if_virt.c
SRCS+= component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpkern -I${.CURDIR}
+CPPFLAGS+= -DVIRTIF_BASE=virt
RUMPCOMP_USER= #defined
+RUMPCOMP_USER_CPPFLAGS+= -DVIRTIF_BASE=virt
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libvirtif/component.c
diff -u src/sys/rump/net/lib/libvirtif/component.c:1.3 src/sys/rump/net/lib/libvirtif/component.c:1.4
--- src/sys/rump/net/lib/libvirtif/component.c:1.3 Tue Oct 19 19:19:41 2010
+++ src/sys/rump/net/lib/libvirtif/component.c Thu Jul 4 11:46:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.3 2010/10/19 19:19:41 pooka Exp $ */
+/* $NetBSD: component.c,v 1.4 2013/07/04 11:46:51 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.3 2010/10/19 19:19:41 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.4 2013/07/04 11:46:51 pooka Exp $);
#include sys/param.h
#include sys/domain.h
@@ -38,10 +38,11 @@ __KERNEL_RCSID(0, $NetBSD: component.c,
#include rump_private.h
#include rump_net_private.h
+#include if_virt.h
RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
{
- extern struct if_clone virtif_cloner; /* XXX */
+ extern struct if_clone VIF_CLONER; /* XXX */
- if_clone_attach(virtif_cloner);
+ if_clone_attach(VIF_CLONER);
}
Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.h
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.3 src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.4
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.3 Tue Apr 30 00:03:54 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.h Thu Jul 4 11:46:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcomp_user.h,v 1.3 2013/04/30 00:03:54 pooka Exp $ */
+/* $NetBSD: rumpcomp_user.h,v 1.4 2013/07/04 11:46:51 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -27,9 +27,9 @@
struct virtif_user;
-int rumpcomp_virtif_create(int, struct virtif_user **);
-void rumpcomp_virtif_dying(struct virtif_user *);
-void rumpcomp_virtif_destroy(struct virtif_user *);
+int VIFHYPER_CREATE(int, struct virtif_user **);
+void VIFHYPER_DYING(struct virtif_user *);
+void VIFHYPER_DESTROY(struct virtif_user *);
-void rumpcomp_virtif_send(struct virtif_user *, struct iovec *, size_t);
-int rumpcomp_virtif_recv(struct virtif_user *, void *, size_t, size_t *);
+void VIFHYPER_SEND(struct virtif_user *, struct iovec *, size_t);
+int VIFHYPER_RECV(struct virtif_user *, void *, size_t, size_t *);
Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.35 src/sys/rump/net/lib/libvirtif/if_virt.c:1.36
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.35 Wed Jul 3 20:17:07 2013
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Thu Jul 4 11:46:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.35 2013/07/03 20:17:07 pooka Exp $ */
+/* $NetBSD: if_virt.c,v 1.36 2013/07/04 11:46:51 pooka Exp $ */
/*
* Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.35 2013/07/03 20:17:07 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.36 2013/07/04 11:46:51 pooka Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, $NetBSD: if_virt.c,v
#include rump_private.h
#include rump_net_private.h
+#include if_virt.h
#include rumpcomp_user.h
/*
@@ -61,10 +62,6 @@ __KERNEL_RCSID(0,
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: pooka Date: Thu Jul 4 11:58:11 UTC 2013 Modified Files: src/sys/rump/net/lib/libvirtif: if_virt.h Log Message: Add a note explaining why there's a homegrown __STRING, __CONCAT, etc. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libvirtif/if_virt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/lib/libvirtif/if_virt.h diff -u src/sys/rump/net/lib/libvirtif/if_virt.h:1.1 src/sys/rump/net/lib/libvirtif/if_virt.h:1.2 --- src/sys/rump/net/lib/libvirtif/if_virt.h:1.1 Thu Jul 4 11:46:51 2013 +++ src/sys/rump/net/lib/libvirtif/if_virt.h Thu Jul 4 11:58:11 2013 @@ -1,4 +1,8 @@ -/* $NetBSD: if_virt.h,v 1.1 2013/07/04 11:46:51 pooka Exp $ */ +/* $NetBSD: if_virt.h,v 1.2 2013/07/04 11:58:11 pooka Exp $ */ + +/* + * NOTE! This file is supposed to work on !NetBSD platforms. + */ #ifndef VIRTIF_BASE #error Define VIRTIF_BASE
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: pooka
Date: Thu Jul 4 17:46:14 UTC 2013
Modified Files:
src/sys/rump/net/lib/libshmif: rumpcomp_user.c
Log Message:
Use kqueue on *BSD, not just NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/lib/libshmif/rumpcomp_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libshmif/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.12 src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.13
--- src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.12 Tue Jun 4 14:54:34 2013
+++ src/sys/rump/net/lib/libshmif/rumpcomp_user.c Thu Jul 4 17:46:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcomp_user.c,v 1.12 2013/06/04 14:54:34 pooka Exp $ */
+/* $NetBSD: rumpcomp_user.c,v 1.13 2013/07/04 17:46:14 pooka Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -37,14 +37,16 @@
#define seterr(_v_) if ((_v_) == -1) *error = errno; else *error = 0;
/*
- * On NetBSD we use kqueue, on Linux we use inotify. The underlying
+ * On BSD we use kqueue, on Linux we use inotify. The underlying
* interface requirements aren't quite the same, but we have a very
* good chance of doing the fd-path mapping on Linux thanks to dcache,
* so just keep the existing interfaces for now.
*/
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
#include sys/event.h
+#include stdlib.h
+
int
rumpcomp_shmif_watchsetup(int *kqp, int fd)
{
CVS commit: src/common/lib/libc/arch/powerpc/string
Module Name:src Committed By: matt Date: Thu Jul 4 20:57:59 UTC 2013 Modified Files: src/common/lib/libc/arch/powerpc/string: memcmp.S Log Message: remove branch prediction hint from bdnzt To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/powerpc/string/memcmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/powerpc/string/memcmp.S diff -u src/common/lib/libc/arch/powerpc/string/memcmp.S:1.3 src/common/lib/libc/arch/powerpc/string/memcmp.S:1.4 --- src/common/lib/libc/arch/powerpc/string/memcmp.S:1.3 Sat Jan 15 07:31:12 2011 +++ src/common/lib/libc/arch/powerpc/string/memcmp.S Thu Jul 4 20:57:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: memcmp.S,v 1.3 2011/01/15 07:31:12 matt Exp $ */ +/* $NetBSD: memcmp.S,v 1.4 2013/07/04 20:57:59 matt Exp $ */ /* stropt/memcmp.S, pl_string_common, pl_linux 10/11/04 11:45:35 * == @@ -206,7 +206,7 @@ bbb: cmplw %r8, %r6 - bdnzt+ eq, bbb + bdnzt eq, bbb bne all_done
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Thu Jul 4 22:09:52 UTC 2013 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20162 Log Message: Initial import of a cut-down copy of compiler-rt revision r185671. Status: Vendor Tag: LLVM Release Tags: compiler-rt-185671 N src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT N src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT N src/sys/external/bsd/compiler_rt/dist/README.txt N src/sys/external/bsd/compiler_rt/dist/test/timing/ashrdi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/muldi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/modsi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/floatundidf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/umoddi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/udivdi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/lshrdi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/negdi2.c N src/sys/external/bsd/compiler_rt/dist/test/timing/floatdisf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/time N src/sys/external/bsd/compiler_rt/dist/test/timing/floatundisf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/moddi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/floatdixf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/divdi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/floatundixf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/ashldi3.c N src/sys/external/bsd/compiler_rt/dist/test/timing/floatdidf.c N src/sys/external/bsd/compiler_rt/dist/test/timing/timing.h N src/sys/external/bsd/compiler_rt/dist/test/Unit/unorddf2vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/negsf2vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunssfsi_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/subdf3vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/divti3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunssfti_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/muldf3vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/clear_cache_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/absvti2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/mulxc3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/negvsi2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/paritysi2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/ltdf2vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/powisf2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/trampoline_setup_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/addvsi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/negvdi2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/modsi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatundidf_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunsdfdi_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatsisfvfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/paritydi2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/lshrdi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/powidf2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/nedf2vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunssfsivfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/ffsdi2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/addvdi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatundisf_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/negvti2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatuntidf_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/moddi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/addsf3vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunsdfsi_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatundixf_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunsdfti_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunstfdi_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/parityti2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/fixunsxfdi_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/udivmodsi4_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/lesf2vfp_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/lshrti3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/powitf2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/ashrdi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/ffsti2_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/subvsi3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/addvti3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/floatuntisf_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/modti3_test.c N src/sys/external/bsd/compiler_rt/dist/test/Unit/mulvsi3_test.c N
CVS commit: src/sys/external/bsd/compiler_rt
Module Name:src Committed By: joerg Date: Thu Jul 4 22:12:40 UTC 2013 Added Files: src/sys/external/bsd/compiler_rt: prepare-import.sh Log Message: Add helper script for future imports. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/compiler_rt/prepare-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/compiler_rt/prepare-import.sh diff -u /dev/null src/sys/external/bsd/compiler_rt/prepare-import.sh:1.1 --- /dev/null Thu Jul 4 22:12:40 2013 +++ src/sys/external/bsd/compiler_rt/prepare-import.sh Thu Jul 4 22:12:40 2013 @@ -0,0 +1,18 @@ +#!/bin/sh +# $NetBSD: prepare-import.sh,v 1.1 2013/07/04 22:12:40 joerg Exp $ +# +# Checkout compiler_rt into dist. +# Run this script and check for additional files and directories to prune, +# only relevant content should be included. + +set -e + +cd dist +rm -rf .svn +rm -rf BlocksRuntime SDKs cmake include make www +rm -f .arcconfig .gitignore CMakeLists.txt Makefile +rm -rf lib/asan lib/interception lib/msan lib/msandr lib/sanitizer_common +rm -rf lib/tsan lib/ubsan +rm -f lib/*/Makefile.mk lib/Makefile.mk lib/CMakeLists.txt +rm -f lib/apple_versioning.c lib/lit.common.* lib/profile/CMakeLists.txt +rmdir lib/sparc64
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Thu Jul 4 22:14:43 UTC 2013
Added Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Build glue for including compiler-rt in libc, not hooked up yet.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u /dev/null src/lib/libc/compiler_rt/Makefile.inc:1.1
--- /dev/null Thu Jul 4 22:14:43 2013
+++ src/lib/libc/compiler_rt/Makefile.inc Thu Jul 4 22:14:43 2013
@@ -0,0 +1,166 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/07/04 22:14:43 joerg Exp $
+
+COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+
+.if ${MACHINE_ARCH} == powerpc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+.else
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+.endif
+
+
+.PATH: ${COMPILER_RT_CPU_DIR}
+.PATH: ${COMPILER_RT_ARCH_DIR}
+.PATH: ${COMPILER_RT_SRCDIR}/lib
+
+# Complex support needs parts of libm
+#GENERIC_SRCS+=
+# mulxc3.c \
+# mulsc3.c \
+# divxc3.c \
+# divdc3.c \
+# divsc3.c
+
+GENERIC_SRCS+= \
+ absvdi2.c \
+ absvsi2.c \
+ absvti2.c \
+ adddf3.c \
+ addsf3.c \
+ addvdi3.c \
+ addvsi3.c \
+ addvti3.c \
+ ashldi3.c \
+ ashlti3.c \
+ ashrdi3.c \
+ ashrti3.c \
+ atomic.c \
+ clzdi2.c \
+ clzsi2.c \
+ clzti2.c \
+ cmpdi2.c \
+ cmpti2.c \
+ comparedf2.c \
+ comparesf2.c \
+ ctzdi2.c \
+ ctzsi2.c \
+ ctzti2.c \
+ divdf3.c \
+ divdi3.c \
+ divmoddi4.c \
+ divmodsi4.c \
+ divsf3.c \
+ divsi3.c \
+ divti3.c \
+ extendsfdf2.c \
+ ffsdi2.c \
+ ffsti2.c \
+ fixdfdi.c \
+ fixdfsi.c \
+ fixdfti.c \
+ fixsfdi.c \
+ fixsfsi.c \
+ fixsfti.c \
+ fixunsdfdi.c \
+ fixunsdfsi.c \
+ fixunsdfti.c \
+ fixunssfdi.c \
+ fixunssfsi.c \
+ fixunssfti.c \
+ fixunsxfdi.c \
+ fixunsxfsi.c \
+ fixunsxfti.c \
+ fixxfdi.c \
+ fixxfti.c \
+ floatdidf.c \
+ floatdisf.c \
+ floatdixf.c \
+ floatsidf.c \
+ floatsisf.c \
+ floattidf.c \
+ floattisf.c \
+ floattixf.c \
+ floatundidf.c \
+ floatundisf.c \
+ floatundixf.c \
+ floatunsidf.c \
+ floatunsisf.c \
+ floatuntidf.c \
+ floatuntisf.c \
+ floatuntixf.c \
+ gcc_personality_v0.c \
+ int_util.c \
+ lshrdi3.c \
+ lshrti3.c \
+ moddi3.c \
+ modsi3.c \
+ modti3.c \
+ muldc3.c \
+ muldf3.c \
+ muldi3.c \
+ mulodi4.c \
+ mulosi4.c \
+ muloti4.c \
+ mulsf3.c \
+ multi3.c \
+ mulvdi3.c \
+ mulvsi3.c \
+ mulvti3.c \
+ negdf2.c \
+ negdi2.c \
+ negsf2.c \
+ negti2.c \
+ negvdi2.c \
+ negvsi2.c \
+ negvti2.c \
+ paritydi2.c \
+ paritysi2.c \
+ parityti2.c \
+ popcountdi2.c \
+ popcountsi2.c \
+ popcountti2.c \
+ powidf2.c \
+ powisf2.c \
+ powitf2.c \
+ powixf2.c \
+ subdf3.c \
+ subsf3.c \
+ subvdi3.c \
+ subvsi3.c \
+ subvti3.c \
+ truncdfsf2.c \
+ ucmpdi2.c \
+ ucmpti2.c \
+ udivdi3.c \
+ udivmoddi4.c \
+ udivmodsi4.c \
+ udivmodti4.c \
+ udivsi3.c \
+ udivti3.c \
+ umoddi3.c \
+ umodsi3.c \
+ umodti3.c
+
+.if ${MACHINE_ARCH} == powerpc
+GENERIC_SRCS+= \
+ fixtfdi.c \
+ fixunstfdi.c \
+ floatditf.c \
+ floatunditf.c \
+ gcc_qadd.c \
+ gcc_qdiv.c \
+ gcc_qmul.c \
+ gcc_qsub.c
+.endif
+
+.for src in ${GENERIC_SRCS}
+. if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \
+ exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S)
+SRCS+= ${src:R}.S
+. else
+SRCS+= ${src}
+COPTS.${src}+= -Wno-error=missing-prototypes
+. endif
+.endfor
CVS import: src/external/bsd/libc++/dist/libcxxrt
Module Name:src Committed By: joerg Date: Thu Jul 4 22:29:30 UTC 2013 Update of /cvsroot/src/external/bsd/libc++/dist/libcxxrt In directory ivanova.netbsd.org:/tmp/cvs-serv4784 Log Message: Import revision c61efa043b14378efbd69c9a2686d44ed46ae179 of libcxxrt. This adds __cxa_deleted_virtual, some explicit store barriers before lock releases and fixes ARM guard variable initialisation. Status: Vendor Tag: PATHSCALE Release Tags: libcxxrt-c61efa043b14378efbd69c9a2686d44ed46ae179 U src/external/bsd/libc++/dist/libcxxrt/AUTHORS U src/external/bsd/libc++/dist/libcxxrt/COPYRIGHT U src/external/bsd/libc++/dist/libcxxrt/LICENSE U src/external/bsd/libc++/dist/libcxxrt/README U src/external/bsd/libc++/dist/libcxxrt/src/abi_namespace.h U src/external/bsd/libc++/dist/libcxxrt/src/atomic.h U src/external/bsd/libc++/dist/libcxxrt/src/auxhelper.cc U src/external/bsd/libc++/dist/libcxxrt/src/cxa_atexit.c U src/external/bsd/libc++/dist/libcxxrt/src/cxa_finalize.c U src/external/bsd/libc++/dist/libcxxrt/src/cxxabi.h U src/external/bsd/libc++/dist/libcxxrt/src/dwarf_eh.h U src/external/bsd/libc++/dist/libcxxrt/src/dynamic_cast.cc U src/external/bsd/libc++/dist/libcxxrt/src/exception.cc U src/external/bsd/libc++/dist/libcxxrt/src/guard.cc U src/external/bsd/libc++/dist/libcxxrt/src/libelftc_dem_gnu3.c U src/external/bsd/libc++/dist/libcxxrt/src/memory.cc U src/external/bsd/libc++/dist/libcxxrt/src/stdexcept.cc U src/external/bsd/libc++/dist/libcxxrt/src/stdexcept.h U src/external/bsd/libc++/dist/libcxxrt/src/terminate.cc U src/external/bsd/libc++/dist/libcxxrt/src/typeinfo.cc U src/external/bsd/libc++/dist/libcxxrt/src/typeinfo.h U src/external/bsd/libc++/dist/libcxxrt/src/unwind-arm.h U src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h U src/external/bsd/libc++/dist/libcxxrt/src/unwind.h U src/external/bsd/libc++/dist/libcxxrt/test/run_test.sh U src/external/bsd/libc++/dist/libcxxrt/test/test.cc U src/external/bsd/libc++/dist/libcxxrt/test/test.h U src/external/bsd/libc++/dist/libcxxrt/test/test_exception.cc U src/external/bsd/libc++/dist/libcxxrt/test/test_guard.cc U src/external/bsd/libc++/dist/libcxxrt/test/test_typeinfo.cc No conflicts created by this import
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: joerg
Date: Thu Jul 4 22:59:58 UTC 2013
Modified Files:
src/sys/arch/powerpc/powerpc: db_interface.c
Log Message:
One const is good enough.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.51 src/sys/arch/powerpc/powerpc/db_interface.c:1.52
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.51 Wed Aug 1 21:30:24 2012
+++ src/sys/arch/powerpc/powerpc/db_interface.c Thu Jul 4 22:59:58 2013
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.51 2012/08/01 21:30:24 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.52 2013/07/04 22:59:58 joerg Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.51 2012/08/01 21:30:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.52 2013/07/04 22:59:58 joerg Exp $);
#define USERACC
@@ -254,7 +254,7 @@ kdb_trap(int type, void *v)
static void
print_battranslation(struct bat *bat, unsigned int blidx)
{
- static const char const batsizes[][6] = {
+ static const char batsizes[][6] = {
128KB,
256KB,
512KB,
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: joerg
Date: Thu Jul 4 22:59:28 UTC 2013
Modified Files:
src/sys/arch/powerpc/oea: oea_machdep.c
Log Message:
When trying to write into page 0, use volatile to force the compiler to
actually create this access.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/powerpc/oea/oea_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.64 src/sys/arch/powerpc/oea/oea_machdep.c:1.65
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.64 Thu Feb 16 07:59:46 2012
+++ src/sys/arch/powerpc/oea/oea_machdep.c Thu Jul 4 22:59:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.64 2012/02/16 07:59:46 matt Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.65 2013/07/04 22:59:27 joerg Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.64 2012/02/16 07:59:46 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.65 2013/07/04 22:59:27 joerg Exp $);
#include opt_ppcarch.h
#include opt_compat_netbsd.h
@@ -280,8 +280,8 @@ oea_init(void (*handler)(void))
* Install a branch absolute to trap0 to force a panic.
*/
if ((uintptr_t)trap0 0x200) {
- *(uint32_t *) 0 = 0x7c6802a6;
- *(uint32_t *) 4 = 0x4802 | (uintptr_t) trap0;
+ *(volatile uint32_t *) 0 = 0x7c6802a6;
+ *(volatile uint32_t *) 4 = 0x4802 | (uintptr_t) trap0;
}
/*
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: joerg Date: Thu Jul 4 23:00:23 UTC 2013 Modified Files: src/sys/arch/powerpc/powerpc: db_disasm.c Log Message: Don't use non-literal strings as format string. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/powerpc/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/powerpc/db_disasm.c diff -u src/sys/arch/powerpc/powerpc/db_disasm.c:1.27 src/sys/arch/powerpc/powerpc/db_disasm.c:1.28 --- src/sys/arch/powerpc/powerpc/db_disasm.c:1.27 Fri Mar 23 15:46:44 2012 +++ src/sys/arch/powerpc/powerpc/db_disasm.c Thu Jul 4 23:00:23 2013 @@ -1,8 +1,8 @@ -/* $NetBSD: db_disasm.c,v 1.27 2012/03/23 15:46:44 matt Exp $ */ +/* $NetBSD: db_disasm.c,v 1.28 2013/07/04 23:00:23 joerg Exp $ */ /* $OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.27 2012/03/23 15:46:44 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.28 2013/07/04 23:00:23 joerg Exp $); #include sys/param.h #include sys/proc.h @@ -628,7 +628,7 @@ disasm_fields(const struct opcode *popco pstr += len; \ } while(0) #define APP_PSTR(fmt, arg) ADD_LEN(snprintf(pstr, slen, (fmt), (arg))) -#define APP_PSTRS(fmt) ADD_LEN(snprintf(pstr, slen, (fmt))) +#define APP_PSTRS(fmt) ADD_LEN(snprintf(pstr, slen, %s, (fmt))) pstr = disasm_str;
CVS commit: src/tests/lib/libexecinfo
Module Name:src
Committed By: joerg
Date: Thu Jul 4 23:53:13 UTC 2013
Modified Files:
src/tests/lib/libexecinfo: Makefile t_backtrace.c
Log Message:
Use conditional calls to vfork() to prevent the compiler from inlining
the intermediate stack frames. Mark the __start frame as optional.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libexecinfo/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libexecinfo/t_backtrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libexecinfo/Makefile
diff -u src/tests/lib/libexecinfo/Makefile:1.2 src/tests/lib/libexecinfo/Makefile:1.3
--- src/tests/lib/libexecinfo/Makefile:1.2 Sun May 27 22:57:24 2012
+++ src/tests/lib/libexecinfo/Makefile Thu Jul 4 23:53:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/05/27 22:57:24 martin Exp $
+# $NetBSD: Makefile,v 1.3 2013/07/04 23:53:13 joerg Exp $
.include bsd.own.mk
@@ -8,6 +8,5 @@ TESTS_C+= t_backtrace
LDADD+= -lexecinfo -lelf
DPADD+= ${LIBEXECINFO} ${LIBELF}
-DBG=-O0 # prevent inlining, nothing else helps.
.include bsd.test.mk
Index: src/tests/lib/libexecinfo/t_backtrace.c
diff -u src/tests/lib/libexecinfo/t_backtrace.c:1.6 src/tests/lib/libexecinfo/t_backtrace.c:1.7
--- src/tests/lib/libexecinfo/t_backtrace.c:1.6 Thu Jun 6 17:40:09 2013
+++ src/tests/lib/libexecinfo/t_backtrace.c Thu Jul 4 23:53:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_backtrace.c,v 1.6 2013/06/06 17:40:09 joerg Exp $ */
+/* $NetBSD: t_backtrace.c,v 1.7 2013/07/04 23:53:13 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,29 +29,36 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_backtrace.c,v 1.6 2013/06/06 17:40:09 joerg Exp $);
+__RCSID($NetBSD: t_backtrace.c,v 1.7 2013/07/04 23:53:13 joerg Exp $);
#include atf-c.h
#include atf-c/config.h
#include string.h
#include stdlib.h
#include execinfo.h
+#include unistd.h
#ifndef __arraycount
#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
#endif
-static void __attribute__((__noinline__))
+volatile int prevent_inline;
+
+static void
myfunc3(size_t ncalls)
{
static const char *top[] = { myfunc, atfu_backtrace_fmt_basic_body,
atf_tc_run, atf_tp_run, atf_tp_main, main, ___start };
- static bool optional_frame[] = { false, false, false, true, false, false, false };
+ static bool optional_frame[] = { false, false, false, true, false,
+ false, true };
size_t j, nptrs, min_frames, max_frames;
void *buffer[ncalls + 10];
char **strings;
__CTASSERT(__arraycount(top) == __arraycount(optional_frame));
+ if (prevent_inline)
+ vfork();
+
min_frames = 0;
max_frames = 0;
for (j = 0; j __arraycount(optional_frame); ++j) {
@@ -83,24 +90,33 @@ myfunc3(size_t ncalls)
free(strings);
}
-static void __attribute__((__noinline__))
+static void
myfunc2(size_t ncalls)
{
+ if (prevent_inline)
+ vfork();
+
myfunc3(ncalls);
}
-static void __attribute__((__noinline__))
+static void
myfunc1(size_t origcalls, size_t ncalls)
{
+ if (prevent_inline)
+ vfork();
+
if (ncalls 1)
myfunc1(origcalls, ncalls - 1);
else
myfunc2(origcalls);
}
-static void __attribute__((__noinline__))
+static void
myfunc(size_t ncalls)
{
+ if (prevent_inline)
+ vfork();
+
myfunc1(ncalls, ncalls);
}
CVS commit: src/lib/csu/common
Module Name:src
Committed By: joerg
Date: Fri Jul 5 02:06:49 UTC 2013
Modified Files:
src/lib/csu/common: Makefile.inc
Log Message:
Only install crtbeginS.o, crtbeginT.o and crtendS.o when MKPIC=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/csu/common/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.12 src/lib/csu/common/Makefile.inc:1.13
--- src/lib/csu/common/Makefile.inc:1.12 Thu Jun 27 21:24:39 2013
+++ src/lib/csu/common/Makefile.inc Fri Jul 5 02:06:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2013/06/27 21:24:39 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2013/07/05 02:06:49 joerg Exp $
.include bsd.own.mk
@@ -8,7 +8,11 @@ COMMON_DIR:= ${.CURDIR}/common
CPPFLAGS+= -I${NETBSDSRCDIR}/libexec/ld.elf_so -I${COMMON_DIR} -I.
OBJS+= crt0.o gcrt0.o crti.o crtn.o
-OBJS+= crtbegin.o crtbeginS.o crtend.o
+OBJS+= crtbegin.o crtend.o
+
+.if ${MKPIC} == yes
+OBJS+= crtbeginS.o
+.endif
realall: ${OBJS}
@@ -92,7 +96,10 @@ crtn.o: crtn.S
FILES=${OBJS}
FILESDIR=${LIBDIR}
CLEANFILES+=${OBJS}
+
+.if ${MKPIC} == yes
SYMLINKS+= crtbegin.o ${LIBDIR}/crtbeginT.o
SYMLINKS+= crtend.o ${LIBDIR}/crtendS.o
+.endif
.include bsd.prog.mk
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: joerg Date: Fri Jul 5 02:11:59 UTC 2013 Modified Files: src/sys/arch/powerpc/include: rtas.h Log Message: Fix header guard. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/rtas.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/rtas.h diff -u src/sys/arch/powerpc/include/rtas.h:1.4 src/sys/arch/powerpc/include/rtas.h:1.5 --- src/sys/arch/powerpc/include/rtas.h:1.4 Mon Apr 28 20:23:32 2008 +++ src/sys/arch/powerpc/include/rtas.h Fri Jul 5 02:11:59 2013 @@ -28,7 +28,7 @@ */ #ifndef _POWERPC_RTAS_H_ -#define _POWERPC_RTAS_H +#define _POWERPC_RTAS_H_ #define RTAS_MAXARGS 16
