CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu May 15 06:58:19 UTC 2014
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Use onoff() macro.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/pci/pci_subr.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/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.111 src/sys/dev/pci/pci_subr.c:1.112
--- src/sys/dev/pci/pci_subr.c:1.111 Tue May 13 18:07:24 2014
+++ src/sys/dev/pci/pci_subr.c Thu May 15 06:58:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.111 2014/05/13 18:07:24 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.112 2014/05/15 06:58:19 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.111 2014/05/13 18:07:24 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.112 2014/05/15 06:58:19 msaitoh Exp $);
#ifdef _KERNEL_OPT
#include opt_pci.h
@@ -461,9 +461,9 @@ pci_aprint_devinfo_fancy(const struct pc
#define i2o(i) ((i) * 4)
#define o2i(o) ((o) / 4)
-#define onoff2(str, bit, onstr, offstr) \
- printf( %s: %s\n, (str), (rval (bit)) ? onstr : offstr);
-#define onoff(str, bit) onoff2(str, bit, on, off)
+#define onoff2(str, rval, bit, onstr, offstr) \
+ printf( %s: %s\n, (str), ((rval) (bit)) ? onstr : offstr);
+#define onoff(str, rval, bit) onoff2(str, rval, bit, on, off)
static void
pci_conf_print_common(
@@ -493,25 +493,25 @@ pci_conf_print_common(
rval = regs[o2i(PCI_COMMAND_STATUS_REG)];
printf(Command register: 0x%04x\n, rval 0x);
- onoff(I/O space accesses, PCI_COMMAND_IO_ENABLE);
- onoff(Memory space accesses, PCI_COMMAND_MEM_ENABLE);
- onoff(Bus mastering, PCI_COMMAND_MASTER_ENABLE);
- onoff(Special cycles, PCI_COMMAND_SPECIAL_ENABLE);
- onoff(MWI transactions, PCI_COMMAND_INVALIDATE_ENABLE);
- onoff(Palette snooping, PCI_COMMAND_PALETTE_ENABLE);
- onoff(Parity error checking, PCI_COMMAND_PARITY_ENABLE);
- onoff(Address/data stepping, PCI_COMMAND_STEPPING_ENABLE);
- onoff(System error (SERR), PCI_COMMAND_SERR_ENABLE);
- onoff(Fast back-to-back transactions, PCI_COMMAND_BACKTOBACK_ENABLE);
- onoff(Interrupt disable, PCI_COMMAND_INTERRUPT_DISABLE);
+ onoff(I/O space accesses, rval, PCI_COMMAND_IO_ENABLE);
+ onoff(Memory space accesses, rval, PCI_COMMAND_MEM_ENABLE);
+ onoff(Bus mastering, rval, PCI_COMMAND_MASTER_ENABLE);
+ onoff(Special cycles, rval, PCI_COMMAND_SPECIAL_ENABLE);
+ onoff(MWI transactions, rval, PCI_COMMAND_INVALIDATE_ENABLE);
+ onoff(Palette snooping, rval, PCI_COMMAND_PALETTE_ENABLE);
+ onoff(Parity error checking, rval, PCI_COMMAND_PARITY_ENABLE);
+ onoff(Address/data stepping, rval, PCI_COMMAND_STEPPING_ENABLE);
+ onoff(System error (SERR), rval, PCI_COMMAND_SERR_ENABLE);
+ onoff(Fast back-to-back transactions, rval, PCI_COMMAND_BACKTOBACK_ENABLE);
+ onoff(Interrupt disable, rval, PCI_COMMAND_INTERRUPT_DISABLE);
printf(Status register: 0x%04x\n, (rval 16) 0x);
- onoff2(Interrupt status, PCI_STATUS_INT_STATUS, active, inactive);
- onoff(Capability List support, PCI_STATUS_CAPLIST_SUPPORT);
- onoff(66 MHz capable, PCI_STATUS_66MHZ_SUPPORT);
- onoff(User Definable Features (UDF) support, PCI_STATUS_UDF_SUPPORT);
- onoff(Fast back-to-back capable, PCI_STATUS_BACKTOBACK_SUPPORT);
- onoff(Data parity error detected, PCI_STATUS_PARITY_ERROR);
+ onoff2(Interrupt status, rval, PCI_STATUS_INT_STATUS, active, inactive);
+ onoff(Capability List support, rval, PCI_STATUS_CAPLIST_SUPPORT);
+ onoff(66 MHz capable, rval, PCI_STATUS_66MHZ_SUPPORT);
+ onoff(User Definable Features (UDF) support, rval, PCI_STATUS_UDF_SUPPORT);
+ onoff(Fast back-to-back capable, rval, PCI_STATUS_BACKTOBACK_SUPPORT);
+ onoff(Data parity error detected, rval, PCI_STATUS_PARITY_ERROR);
printf( DEVSEL timing: );
switch (rval PCI_STATUS_DEVSEL_MASK) {
@@ -530,11 +530,11 @@ pci_conf_print_common(
}
printf( (0x%x)\n, (rval PCI_STATUS_DEVSEL_MASK) 25);
- onoff(Slave signaled Target Abort, PCI_STATUS_TARGET_TARGET_ABORT);
- onoff(Master received Target Abort, PCI_STATUS_MASTER_TARGET_ABORT);
- onoff(Master received Master Abort, PCI_STATUS_MASTER_ABORT);
- onoff(Asserted System Error (SERR), PCI_STATUS_SPECIAL_ERROR);
- onoff(Parity error detected, PCI_STATUS_PARITY_DETECT);
+ onoff(Slave signaled Target Abort, rval, PCI_STATUS_TARGET_TARGET_ABORT);
+ onoff(Master received Target Abort, rval, PCI_STATUS_MASTER_TARGET_ABORT);
+ onoff(Master received Master Abort, rval, PCI_STATUS_MASTER_ABORT);
+ onoff(Asserted System Error (SERR), rval, PCI_STATUS_SPECIAL_ERROR);
+ onoff(Parity error detected, rval, PCI_STATUS_PARITY_DETECT);
rval = regs[o2i(PCI_CLASS_REG)];
for (classp = pci_class; classp-name != NULL; classp++) {
@@ -972,62 +972,43 @@ pci_conf_print_pcie_cap(const pcireg_t *
CVS commit: src/sys/sys
Module Name:src Committed By: uebayasi Date: Thu May 15 07:11:30 UTC 2014 Modified Files: src/sys/sys: signalvar.h Log Message: sigexit() calls either exit1() or panic() and never returns. Mark it as __dead. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/sys/signalvar.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/sys/signalvar.h diff -u src/sys/sys/signalvar.h:1.85 src/sys/sys/signalvar.h:1.86 --- src/sys/sys/signalvar.h:1.85 Wed Jan 1 18:57:16 2014 +++ src/sys/sys/signalvar.h Thu May 15 07:11:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: signalvar.h,v 1.85 2014/01/01 18:57:16 dsl Exp $ */ +/* $NetBSD: signalvar.h,v 1.86 2014/05/15 07:11:30 uebayasi Exp $ */ /* * Copyright (c) 1991, 1993 @@ -130,7 +130,7 @@ void kpsignal(struct proc *, struct ksig void child_psignal(struct proc *, int); void siginit(struct proc *); void trapsignal(struct lwp *, struct ksiginfo *); -void sigexit(struct lwp *, int); +void sigexit(struct lwp *, int) __dead; void killproc(struct proc *, const char *); void setsigvec(struct proc *, int, struct sigaction *); int killpg1(struct lwp *, struct ksiginfo *, int, int);
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Thu May 15 07:35:38 UTC 2014
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Usually schednetisr() is called after enqueueing a packet with IF_ENQUEUE().
In some functions, they do it in reverse order. It's not a bug because
the pair is protected with splnet()/splx(s). It's not good for readability
and someone might mistake when modifing a code. Yes, I'm one of the person :-(
Save a NETISR_* value in a variable and call schednetisr() after enqueue
a packet for readability and future modification.
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/net/if_ethersubr.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/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.197 src/sys/net/if_ethersubr.c:1.198
--- src/sys/net/if_ethersubr.c:1.197 Tue May 13 19:36:16 2014
+++ src/sys/net/if_ethersubr.c Thu May 15 07:35:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.197 2014/05/13 19:36:16 bouyer Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.198 2014/05/15 07:35:38 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.197 2014/05/13 19:36:16 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.198 2014/05/15 07:35:38 msaitoh Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -579,6 +579,7 @@ ether_input(struct ifnet *ifp, struct mb
uint16_t etype;
struct ether_header *eh;
size_t ehlen;
+ int isr = 0;
#if defined (LLC) || defined(NETATALK)
struct llc *l;
#endif
@@ -839,12 +840,12 @@ ether_input(struct ifnet *ifp, struct mb
if (ipflow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
case ETHERTYPE_ARP:
- schednetisr(NETISR_ARP);
+ isr = NETISR_ARP;
inq = arpintrq;
break;
@@ -862,19 +863,19 @@ ether_input(struct ifnet *ifp, struct mb
if (ip6flow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
inq = ip6intrq;
break;
#endif
#ifdef IPX
case ETHERTYPE_IPX:
- schednetisr(NETISR_IPX);
+ isr = NETISR_IPX;
inq = ipxintrq;
break;
#endif
#ifdef NETATALK
case ETHERTYPE_ATALK:
- schednetisr(NETISR_ATALK);
+ isr = NETISR_ATALK;
inq = atintrq1;
break;
case ETHERTYPE_AARP:
@@ -884,7 +885,7 @@ ether_input(struct ifnet *ifp, struct mb
#endif /* NETATALK */
#ifdef MPLS
case ETHERTYPE_MPLS:
- schednetisr(NETISR_MPLS);
+ isr = NETISR_MPLS;
inq = mplsintrq;
break;
#endif
@@ -911,7 +912,7 @@ ether_input(struct ifnet *ifp, struct mb
inq = atintrq2;
m_adj(m, sizeof(struct ether_header)
+ sizeof(struct llc));
- schednetisr(NETISR_ATALK);
+ isr = NETISR_ATALK;
break;
}
@@ -945,8 +946,10 @@ ether_input(struct ifnet *ifp, struct mb
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+ schednetisr(isr);
+ }
}
/*
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Thu May 15 07:48:41 UTC 2014 Modified Files: src/sys/net: if_mpls.c Log Message: Put schednetisr(NETISR_IP) into splnet()/splx() pair. This avoid extra ipintr() call with empty queue. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/net/if_mpls.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/net/if_mpls.c diff -u src/sys/net/if_mpls.c:1.11 src/sys/net/if_mpls.c:1.12 --- src/sys/net/if_mpls.c:1.11 Fri Oct 25 09:25:32 2013 +++ src/sys/net/if_mpls.c Thu May 15 07:48:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mpls.c,v 1.11 2013/10/25 09:25:32 kefren Exp $ */ +/* $NetBSD: if_mpls.c,v 1.12 2014/05/15 07:48:41 msaitoh Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.11 2013/10/25 09:25:32 kefren Exp $); +__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.12 2014/05/15 07:48:41 msaitoh Exp $); #include opt_inet.h #include opt_mpls.h @@ -540,8 +540,8 @@ mpls_unlabel_inet(struct mbuf *m) return ENOBUFS; } IF_ENQUEUE(inq, m); - splx(s); schednetisr(NETISR_IP); + splx(s); return 0; }
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Thu May 15 08:36:34 UTC 2014
Modified Files:
src/sys/net: if_hippisubr.c
Log Message:
Put schednetisr(NETISR_IP) into splnet()/splx() pair.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/net/if_hippisubr.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/net/if_hippisubr.c
diff -u src/sys/net/if_hippisubr.c:1.39 src/sys/net/if_hippisubr.c:1.40
--- src/sys/net/if_hippisubr.c:1.39 Mon Apr 5 07:22:23 2010
+++ src/sys/net/if_hippisubr.c Thu May 15 08:36:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hippisubr.c,v 1.39 2010/04/05 07:22:23 joerg Exp $ */
+/* $NetBSD: if_hippisubr.c,v 1.40 2014/05/15 08:36:34 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_hippisubr.c,v 1.39 2010/04/05 07:22:23 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_hippisubr.c,v 1.40 2014/05/15 08:36:34 msaitoh Exp $);
#include opt_inet.h
@@ -238,6 +238,7 @@ hippi_input(struct ifnet *ifp, struct mb
struct llc *l;
uint16_t htype;
struct hippi_header *hh;
+ int isr = 0;
int s;
if ((ifp-if_flags IFF_UP) == 0) {
@@ -273,13 +274,13 @@ hippi_input(struct ifnet *ifp, struct mb
switch (htype) {
#ifdef INET
case ETHERTYPE_IP:
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
#endif
#ifdef INET6
case ETHERTYPE_IPV6:
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
inq = ip6intrq;
break;
#endif
@@ -292,8 +293,10 @@ hippi_input(struct ifnet *ifp, struct mb
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+ schednetisr(isr);
+ }
splx(s);
}
@@ -308,15 +311,16 @@ hippi_ip_input(struct ifnet *ifp, struct
struct ifqueue *inq;
int s;
- schednetisr(NETISR_IP);
inq = ipintrq;
s = splnet();
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+ schednetisr(NETISR_IP);
+ }
splx(s);
}
#endif
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Thu May 15 09:04:03 UTC 2014
Modified Files:
src/sys/net: if_arcsubr.c if_atmsubr.c if_ecosubr.c if_fddisubr.c
if_ieee1394subr.c
Log Message:
Put schednetisr() into splnet()/splx() pair.
This might avoids delay of processing a packet.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.50 -r1.51 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.38 -r1.39 src/sys/net/if_ecosubr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.45 -r1.46 src/sys/net/if_ieee1394subr.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/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.64 src/sys/net/if_arcsubr.c:1.65
--- src/sys/net/if_arcsubr.c:1.64 Mon Sep 24 03:05:53 2012
+++ src/sys/net/if_arcsubr.c Thu May 15 09:04:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.65 2014/05/15 09:04:03 msaitoh Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.65 2014/05/15 09:04:03 msaitoh Exp $);
#include opt_inet.h
@@ -527,6 +527,7 @@ arc_input(struct ifnet *ifp, struct mbuf
struct arc_header *ah;
struct ifqueue *inq;
uint8_t atype;
+ int isr = 0;
int s;
if ((ifp-if_flags IFF_UP) == 0) {
@@ -553,19 +554,19 @@ arc_input(struct ifnet *ifp, struct mbuf
#ifdef INET
case ARCTYPE_IP:
m_adj(m, ARC_HDRNEWLEN);
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
case ARCTYPE_IP_OLD:
m_adj(m, ARC_HDRLEN);
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
case ARCTYPE_ARP:
m_adj(m, ARC_HDRNEWLEN);
- schednetisr(NETISR_ARP);
+ isr = NETISR_ARP;
inq = arpintrq;
#ifdef ARCNET_ALLOW_BROKEN_ARP
mtod(m, struct arphdr *)-ar_pro = htons(ETHERTYPE_IP);
@@ -574,7 +575,7 @@ arc_input(struct ifnet *ifp, struct mbuf
case ARCTYPE_ARP_OLD:
m_adj(m, ARC_HDRLEN);
- schednetisr(NETISR_ARP);
+ isr = NETISR_ARP;
inq = arpintrq;
#ifdef ARCNET_ALLOW_BROKEN_ARP
mtod(m, struct arphdr *)-ar_pro = htons(ETHERTYPE_IP);
@@ -584,7 +585,7 @@ arc_input(struct ifnet *ifp, struct mbuf
#ifdef INET6
case ARCTYPE_INET6:
m_adj(m, ARC_HDRNEWLEN);
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
inq = ip6intrq;
break;
#endif
@@ -597,8 +598,10 @@ arc_input(struct ifnet *ifp, struct mbuf
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+ schednetisr(isr);
+ }
splx(s);
}
Index: src/sys/net/if_atmsubr.c
diff -u src/sys/net/if_atmsubr.c:1.50 src/sys/net/if_atmsubr.c:1.51
--- src/sys/net/if_atmsubr.c:1.50 Thu Oct 11 20:05:50 2012
+++ src/sys/net/if_atmsubr.c Thu May 15 09:04:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atmsubr.c,v 1.50 2012/10/11 20:05:50 christos Exp $ */
+/* $NetBSD: if_atmsubr.c,v 1.51 2014/05/15 09:04:03 msaitoh Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atmsubr.c,v 1.50 2012/10/11 20:05:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atmsubr.c,v 1.51 2014/05/15 09:04:03 msaitoh Exp $);
#include opt_inet.h
#include opt_gateway.h
@@ -228,6 +228,7 @@ atm_input(struct ifnet *ifp, struct atm_
{
struct ifqueue *inq;
uint16_t etype = ETHERTYPE_IP; /* default */
+ int isr = 0;
int s;
if ((ifp-if_flags IFF_UP) == 0) {
@@ -242,7 +243,7 @@ atm_input(struct ifnet *ifp, struct atm_
s = splnet(); /* in case 2 atm cards @ diff lvls */
npcb-npcb_inq++; /* count # in queue */
splx(s);
- schednetisr(NETISR_NATM);
+ isr = NETISR_NATM;
inq = natmintrq;
m-m_pkthdr.rcvif = rxhand; /* XXX: overload */
#else
@@ -281,7 +282,7 @@ atm_input(struct ifnet *ifp, struct atm_
if (ipflow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
#endif /* INET */
@@ -291,9 +292,9 @@ atm_input(struct ifnet *ifp, struct atm_
if (ip6flow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IPV6);
- inq = ip6intrq;
- break;
+ isr = NETISR_IPV6;
+ inq = ip6intrq;
+ break;
#endif
default:
m_freem(m);
@@ -305,8 +306,10 @@ atm_input(struct ifnet *ifp, struct atm_
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+ schednetisr(isr);
+ }
splx(s);
}
Index: src/sys/net/if_ecosubr.c
diff -u src/sys/net/if_ecosubr.c:1.38 src/sys/net/if_ecosubr.c:1.39
--- src/sys/net/if_ecosubr.c:1.38 Sun Aug 4 07:05:15 2013
+++ src/sys/net/if_ecosubr.c Thu May 15 09:04:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ecosubr.c,v
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Thu May 15 09:23:03 UTC 2014
Modified Files:
src/sys/net: if_ppp.c if_spppsubr.c if_tokensubr.c
Log Message:
Save a NETISR_* value in a variable and call schednetisr() after enqueue
a packet for readability and future modification.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/net/if_ppp.c
cvs rdiff -u -r1.127 -r1.128 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.62 -r1.63 src/sys/net/if_tokensubr.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/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.141 src/sys/net/if_ppp.c:1.142
--- src/sys/net/if_ppp.c:1.141 Wed Sep 18 23:34:55 2013
+++ src/sys/net/if_ppp.c Thu May 15 09:23:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.141 2013/09/18 23:34:55 rmind Exp $ */
+/* $NetBSD: if_ppp.c,v 1.142 2014/05/15 09:23:03 msaitoh Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.141 2013/09/18 23:34:55 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ppp.c,v 1.142 2014/05/15 09:23:03 msaitoh Exp $);
#include ppp.h
@@ -1395,6 +1395,7 @@ ppp_inproc(struct ppp_softc *sc, struct
int s, ilen, proto, rv;
u_char *cp, adrs, ctrl;
struct mbuf *mp, *dmp = NULL;
+int isr = 0;
#ifdef VJC
int xlen;
u_char *iphdr;
@@ -1625,7 +1626,7 @@ ppp_inproc(struct ppp_softc *sc, struct
if (ipflow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
break;
#endif
@@ -1648,7 +1649,7 @@ ppp_inproc(struct ppp_softc *sc, struct
if (ip6flow_fastforward(m))
return;
#endif
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
inq = ip6intrq;
break;
#endif
@@ -1675,6 +1676,7 @@ ppp_inproc(struct ppp_softc *sc, struct
goto bad;
}
IF_ENQUEUE(inq, m);
+schednetisr(isr);
splx(s);
ifp-if_ipackets++;
ifp-if_ibytes += ilen;
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.127 src/sys/net/if_spppsubr.c:1.128
--- src/sys/net/if_spppsubr.c:1.127 Sat Jun 29 21:06:58 2013
+++ src/sys/net/if_spppsubr.c Thu May 15 09:23:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.127 2013/06/29 21:06:58 rmind Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.128 2014/05/15 09:23:03 msaitoh Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_spppsubr.c,v 1.127 2013/06/29 21:06:58 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_spppsubr.c,v 1.128 2014/05/15 09:23:03 msaitoh Exp $);
#if defined(_KERNEL_OPT)
#include opt_inet.h
@@ -471,6 +471,7 @@ sppp_input(struct ifnet *ifp, struct mbu
int s;
struct sppp *sp = (struct sppp *)ifp;
int debug = ifp-if_flags IFF_DEBUG;
+ int isr = 0;
if (ifp-if_flags IFF_UP) {
/* Count received bytes, add hardware framing */
@@ -538,19 +539,19 @@ sppp_input(struct ifnet *ifp, struct mbu
return;
#ifdef INET
case ETHERTYPE_IP:
-schednetisr(NETISR_IP);
+isr = NETISR_IP;
inq = ipintrq;
break;
#endif
#ifdef INET6
case ETHERTYPE_IPV6:
-schednetisr(NETISR_IPV6);
+isr = NETISR_IPV6;
inq = ip6intrq;
break;
#endif
#ifdef IPX
case ETHERTYPE_IPX:
-schednetisr(NETISR_IPX);
+isr = NETISR_IPX;
inq = ipxintrq;
break;
#endif
@@ -605,7 +606,7 @@ sppp_input(struct ifnet *ifp, struct mbu
return;
case PPP_IP:
if (sp-state[IDX_IPCP] == STATE_OPENED) {
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
inq = ipintrq;
sp-pp_last_activity = time_uptime;
}
@@ -620,7 +621,7 @@ sppp_input(struct ifnet *ifp, struct mbu
case PPP_IPV6:
if (sp-state[IDX_IPV6CP] == STATE_OPENED) {
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
inq = ip6intrq;
sp-pp_last_activity = time_uptime;
}
@@ -630,7 +631,7 @@ sppp_input(struct ifnet *ifp, struct mbu
case PPP_IPX:
/* IPX IPXCP not implemented yet */
if (sp-pp_phase == SPPP_PHASE_NETWORK) {
- schednetisr(NETISR_IPX);
+ isr = NETISR_IPX;
inq = ipxintrq;
}
break;
@@ -653,6 +654,7 @@ queue_pkt:
goto drop;
}
IF_ENQUEUE(inq, m);
+ schednetisr(isr);
splx(s);
}
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.62 src/sys/net/if_tokensubr.c:1.63
--- src/sys/net/if_tokensubr.c:1.62 Fri Mar 1 18:25:57 2013
+++ src/sys/net/if_tokensubr.c Thu May 15 09:23:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.62 2013/03/01 18:25:57 joerg Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.63 2014/05/15 09:23:03 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.62 2013/03/01 18:25:57 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.63 2014/05/15 09:23:03 msaitoh Exp $);
#include opt_inet.h
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Thu May 15 09:23:52 UTC 2014
Modified Files:
src/sys/dev/ic: hd64570.c
src/sys/dev/qbus: if_dmc.c
src/sys/dev/usb: if_upl.c
Log Message:
Save a NETISR_* value in a variable and call schednetisr() after enqueue
a packet for readability and future modification.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/qbus/if_dmc.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/if_upl.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/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.45 src/sys/dev/ic/hd64570.c:1.46
--- src/sys/dev/ic/hd64570.c:1.45 Sat Sep 14 13:09:18 2013
+++ src/sys/dev/ic/hd64570.c Thu May 15 09:23:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.45 2013/09/14 13:09:18 joerg Exp $ */
+/* $NetBSD: hd64570.c,v 1.46 2014/05/15 09:23:52 msaitoh Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hd64570.c,v 1.45 2013/09/14 13:09:18 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: hd64570.c,v 1.46 2014/05/15 09:23:52 msaitoh Exp $);
#include opt_inet.h
@@ -1536,6 +1536,7 @@ sca_frame_process(sca_port_t *scp)
u_int8_t *bufp;
u_int16_t len;
u_int32_t t;
+ int isr = 0;
t = time_uptime * 1000;
desc = scp-sp_rxdesc[scp-sp_rxstart];
@@ -1587,7 +1588,7 @@ sca_frame_process(sca_port_t *scp)
m-m_data += sizeof(struct hdlc_header);
m-m_len -= sizeof(struct hdlc_header);
ifq = ipintrq;
- schednetisr(NETISR_IP);
+ isr = NETISR_IP;
break;
#endif /* INET */
#ifdef INET6
@@ -1598,7 +1599,7 @@ sca_frame_process(sca_port_t *scp)
m-m_data += sizeof(struct hdlc_header);
m-m_len -= sizeof(struct hdlc_header);
ifq = ip6intrq;
- schednetisr(NETISR_IPV6);
+ isr = NETISR_IPV6;
break;
#endif /* INET6 */
case CISCO_KEEPALIVE:
@@ -1691,6 +1692,7 @@ sca_frame_process(sca_port_t *scp)
/* queue the packet */
if (!IF_QFULL(ifq)) {
IF_ENQUEUE(ifq, m);
+ schednetisr(isr);
} else {
IF_DROP(ifq);
scp-sp_if.if_iqdrops++;
Index: src/sys/dev/qbus/if_dmc.c
diff -u src/sys/dev/qbus/if_dmc.c:1.21 src/sys/dev/qbus/if_dmc.c:1.22
--- src/sys/dev/qbus/if_dmc.c:1.21 Sat Oct 27 17:18:37 2012
+++ src/sys/dev/qbus/if_dmc.c Thu May 15 09:23:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.21 2012/10/27 17:18:37 chs Exp $ */
+/* $NetBSD: if_dmc.c,v 1.22 2014/05/15 09:23:52 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_dmc.c,v 1.21 2012/10/27 17:18:37 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_dmc.c,v 1.22 2014/05/15 09:23:52 msaitoh Exp $);
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -560,6 +560,7 @@ dmcxint(void *a)
struct ifxmt *ifxp;
struct dmc_header *dh;
char buf[64];
+ int isr = 0;
ifp = sc-sc_if;
@@ -627,7 +628,7 @@ dmcxint(void *a)
#ifdef INET
case DMC_IPTYPE:
-schednetisr(NETISR_IP);
+isr = NETISR_IP;
inq = ipintrq;
break;
#endif
@@ -640,8 +641,10 @@ dmcxint(void *a)
if (IF_QFULL(inq)) {
IF_DROP(inq);
m_freem(m);
- } else
+ } else {
IF_ENQUEUE(inq, m);
+schednetisr(isr);
+ }
splx(s);
setup:
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.44 src/sys/dev/usb/if_upl.c:1.45
--- src/sys/dev/usb/if_upl.c:1.44 Sat Jan 5 01:30:16 2013
+++ src/sys/dev/usb/if_upl.c Thu May 15 09:23:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.44 2013/01/05 01:30:16 christos Exp $ */
+/* $NetBSD: if_upl.c,v 1.45 2014/05/15 09:23:52 msaitoh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_upl.c,v 1.44 2013/01/05 01:30:16 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_upl.c,v 1.45 2014/05/15 09:23:52 msaitoh Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -1038,7 +1038,6 @@ upl_input(struct ifnet *ifp, struct mbuf
/* XXX Assume all traffic is IP */
- schednetisr(NETISR_IP);
inq = ipintrq;
s = splnet();
@@ -1053,6 +1052,7 @@ upl_input(struct ifnet *ifp, struct mbuf
return;
}
IF_ENQUEUE(inq, m);
+ schednetisr(NETISR_IP);
splx(s);
#endif
ifp-if_ipackets++;
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: njoly
Date: Thu May 15 09:54:06 UTC 2014
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
Fix setcontext signature, which has a single argument not three.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.99 src/sys/compat/netbsd32/syscalls.master:1.100
--- src/sys/compat/netbsd32/syscalls.master:1.99 Wed Apr 30 17:23:45 2014
+++ src/sys/compat/netbsd32/syscalls.master Thu May 15 09:54:06 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.99 2014/04/30 17:23:45 njoly Exp $
+ $NetBSD: syscalls.master,v 1.100 2014/05/15 09:54:06 njoly Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -630,8 +630,7 @@
306 STD { int|netbsd32||utrace(netbsd32_charp label, \
netbsd32_voidp addr, netbsd32_size_t len); }
307 STD { int|netbsd32||getcontext(netbsd32_ucontextp ucp); }
-308 STD { int|netbsd32||setcontext(netbsd32_ucontextp ucp, \
- uint32_t flags, netbsd32_lwpidp new_lwp); }
+308 STD { int|netbsd32||setcontext(netbsd32_ucontextp ucp); }
309 STD { int|netbsd32||_lwp_create(netbsd32_ucontextp ucp, \
netbsd32_u_long flags, netbsd32_lwpidp new_lwp); }
310 NOARGS { int|sys||_lwp_exit(void); }
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: njoly
Date: Thu May 15 09:55:11 UTC 2014
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_sysent.c
Log Message:
Regen for setcontext signature.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.106 -r1.107 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.107 src/sys/compat/netbsd32/netbsd32_syscall.h:1.108
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.107 Wed Apr 30 17:24:20 2014
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu May 15 09:55:11 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.107 2014/04/30 17:24:20 njoly Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.108 2014/05/15 09:55:11 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.99 2014/04/30 17:23:45 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.100 2014/05/15 09:54:06 njoly Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -831,7 +831,7 @@
/* syscall: netbsd32_getcontext ret: int args: netbsd32_ucontextp */
#define NETBSD32_SYS_netbsd32_getcontext 307
-/* syscall: netbsd32_setcontext ret: int args: netbsd32_ucontextp uint32_t netbsd32_lwpidp */
+/* syscall: netbsd32_setcontext ret: int args: netbsd32_ucontextp */
#define NETBSD32_SYS_netbsd32_setcontext 308
/* syscall: netbsd32__lwp_create ret: int args: netbsd32_ucontextp netbsd32_u_long netbsd32_lwpidp */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.107 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.108
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.107 Wed Apr 30 17:24:20 2014
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu May 15 09:55:11 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.107 2014/04/30 17:24:20 njoly Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.108 2014/05/15 09:55:11 njoly Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.99 2014/04/30 17:23:45 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.100 2014/05/15 09:54:06 njoly Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -1551,8 +1551,6 @@ check_syscall_args(netbsd32_getcontext)
struct netbsd32_setcontext_args {
syscallarg(netbsd32_ucontextp) ucp;
- syscallarg(uint32_t) flags;
- syscallarg(netbsd32_lwpidp) new_lwp;
};
check_syscall_args(netbsd32_setcontext)
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.106 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.107
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.106 Wed Apr 30 17:24:20 2014
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu May 15 09:55:11 2014
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.106 2014/04/30 17:24:20 njoly Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.107 2014/05/15 09:55:11 njoly Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.99 2014/04/30 17:23:45 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.100 2014/05/15 09:54:06 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.106 2014/04/30 17:24:20 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.107 2014/05/15 09:55:11 njoly Exp $);
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.106 src/sys/compat/netbsd32/netbsd32_sysent.c:1.107
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.106 Wed Apr 30 17:24:20 2014
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Thu May 15 09:55:11 2014
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.106 2014/04/30 17:24:20 njoly Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.107 2014/05/15 09:55:11 njoly Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.99 2014/04/30 17:23:45 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.100 2014/05/15 09:54:06 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.106 2014/04/30 17:24:20 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.107 2014/05/15 09:55:11 njoly Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
CVS commit: src/crypto/external/bsd/openssl/dist/ssl
Module Name:src Committed By: christos Date: Thu May 15 12:53:52 UTC 2014 Modified Files: src/crypto/external/bsd/openssl/dist/ssl: s3_pkt.c Log Message: Avoid NULL dereference. (FreeBSD SA14:10) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c diff -u src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.14 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.15 --- src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c:1.14 Sun Apr 13 09:14:15 2014 +++ src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c Thu May 15 08:53:52 2014 @@ -658,6 +658,10 @@ static int do_ssl3_write(SSL *s, int typ if (i = 0) return(i); /* if it went, fall through and send more stuff */ + /* we may have released our buffer, so get it again */ + if (wb-buf == NULL) + if (!ssl3_setup_write_buffer(s)) +return -1; } if (len == 0 !create_empty_fragment)
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: joerg
Date: Thu May 15 14:37:08 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Log Message:
Skip assembler helpers when using HAVE_LIBGCC_EH=no. Always use the
generic unwind.h version in that case, even on ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libsupc++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.26 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.27
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.26 Sat May 3 16:43:10 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/05/03 16:43:10 martin Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -92,11 +92,13 @@ LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
.if ${HAVE_LIBGCC_EH} == no
-LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c}
+LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
+LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
-.endif
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
+.endif
# We have to weed out any existing func.S file that may exist
# from the list of files we create.
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.11 src/external/gpl3/gcc/lib/libobjc/Makefile:1.12
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.11 Fri Mar 14 12:17:53 2014
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/03/14 12:17:53 christos Exp $
+# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -76,6 +76,10 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.
${SRCS}: tconfig.h options.h
+.if ${HAVE_LIBGCC_EH} == no
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != no
.if defined(G_CONFIGLINKS) !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.9 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.10
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.9 Sat Mar 1 10:00:45 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/01 10:00:45 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -110,6 +110,10 @@ BUILDSYMLINKS+= \
${DIST}/libiberty/cp-demangle.c cp-demangle.c \
${DIST}/libiberty/cp-demangle.h cp-demangle.h
+.if ${HAVE_LIBGCC_EH} == no
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != no
.if defined(G_CONFIGLINKS) !empty(G_CONFIGLINKS)
BUILDSYMLINKS+=${G_CONFIGLINKS}
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.7 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.8
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.7 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:48 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -27,6 +27,10 @@ CXXFLAGS+= ${G_SECTION_FLAGS}
COPTS.cp-demangle.c = -Wno-stack-protector
+.if ${HAVE_LIBGCC_EH} == no
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != no
.if defined(G_CONFIGLINKS) !empty(G_CONFIGLINKS)
BUILDSYMLINKS+=${G_CONFIGLINKS}
CVS commit: src/tests/fs/cd9660
Module Name:src
Committed By: martin
Date: Thu May 15 14:53:05 UTC 2014
Modified Files:
src/tests/fs/cd9660: t_high_ino_big_file.sh
Log Message:
Set a bigger timeout - this test needs 3000s on my shark (mostly for
unpacking the test image)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/cd9660/t_high_ino_big_file.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/cd9660/t_high_ino_big_file.sh
diff -u src/tests/fs/cd9660/t_high_ino_big_file.sh:1.1 src/tests/fs/cd9660/t_high_ino_big_file.sh:1.2
--- src/tests/fs/cd9660/t_high_ino_big_file.sh:1.1 Sat May 10 14:15:25 2014
+++ src/tests/fs/cd9660/t_high_ino_big_file.sh Thu May 15 14:53:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_high_ino_big_file.sh,v 1.1 2014/05/10 14:15:25 martin Exp $
+# $NetBSD: t_high_ino_big_file.sh,v 1.2 2014/05/15 14:53:05 martin Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -72,6 +72,7 @@ pr_kern_48787_head() {
atf_set descr Verifies 32bit overflow isssues from PR kern/48787 are fixed
atf_set require.user root
atf_set require.progs rump_cd9660 bunzip2 stat
+ atf_set timeout 6000
}
pr_kern_48787_body() {
CVS commit: src/sys/arch/evbarm/odroid
Module Name:src Committed By: reinoud Date: Thu May 15 15:28:26 UTC 2014 Modified Files: src/sys/arch/evbarm/odroid: odroid_machdep.c Log Message: This can't be right; must be a cp bug To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/odroid/odroid_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/evbarm/odroid/odroid_machdep.c diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.16 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.17 --- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.16 Wed May 14 09:03:09 2014 +++ src/sys/arch/evbarm/odroid/odroid_machdep.c Thu May 15 15:28:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: odroid_machdep.c,v 1.16 2014/05/14 09:03:09 reinoud Exp $ */ +/* $NetBSD: odroid_machdep.c,v 1.17 2014/05/15 15:28:26 reinoud Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.16 2014/05/14 09:03:09 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.17 2014/05/15 15:28:26 reinoud Exp $); #include opt_evbarm_boardtype.h #include opt_exynos.h @@ -296,7 +296,6 @@ initarm(void *arg) case EXYNOS5_PRODUCT_FAMILY: devmap = e5_devmap; rambase = EXYNOS5_SDRAM_PBASE; - rambase = EXYNOS4_SDRAM_PBASE; break; #endif default:
CVS commit: src/sys/arch/evbarm/odroid
Module Name:src Committed By: reinoud Date: Thu May 15 15:31:10 UTC 2014 Modified Files: src/sys/arch/evbarm/odroid: odroid_machdep.c Log Message: DMA is initialized later in the bootstrap. No need for this comment To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/odroid/odroid_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/evbarm/odroid/odroid_machdep.c diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.17 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.18 --- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.17 Thu May 15 15:28:26 2014 +++ src/sys/arch/evbarm/odroid/odroid_machdep.c Thu May 15 15:31:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: odroid_machdep.c,v 1.17 2014/05/15 15:28:26 reinoud Exp $ */ +/* $NetBSD: odroid_machdep.c,v 1.18 2014/05/15 15:31:10 reinoud Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.17 2014/05/15 15:28:26 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.18 2014/05/15 15:31:10 reinoud Exp $); #include opt_evbarm_boardtype.h #include opt_exynos.h @@ -381,13 +381,6 @@ curcpu()-ci_data.cpu_cc_freq = 1*1000*1 } } #endif - - /* - * Configure DMA tags - */ - /* XXX dma not implemented yet */ - // exynos_dma_bootstrap(ram_size); - bootconfig.dram[0].pages = ram_size / PAGE_SIZE; #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
CVS commit: src/sys/arch/evbarm/odroid
Module Name:src Committed By: reinoud Date: Thu May 15 15:35:38 UTC 2014 Modified Files: src/sys/arch/evbarm/odroid: odroid_machdep.c Log Message: Change hexidecimal bit notation into binary for easier modifying To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/odroid/odroid_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/evbarm/odroid/odroid_machdep.c diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.18 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.19 --- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.18 Thu May 15 15:31:10 2014 +++ src/sys/arch/evbarm/odroid/odroid_machdep.c Thu May 15 15:35:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: odroid_machdep.c,v 1.18 2014/05/15 15:31:10 reinoud Exp $ */ +/* $NetBSD: odroid_machdep.c,v 1.19 2014/05/15 15:35:37 reinoud Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.18 2014/05/15 15:31:10 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.19 2014/05/15 15:35:37 reinoud Exp $); #include opt_evbarm_boardtype.h #include opt_exynos.h @@ -488,54 +488,54 @@ odroid_exynos4_gpio_ncs(device_t self, p * generated by the gpio bootstrap and the values substracted are * explicitly allowed */ - prop_dictionary_set_uint32(dict, nc-GPA0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPA1, 0x3f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPB, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPC0, 0x1f - 0x00); + prop_dictionary_set_uint32(dict, nc-GPA0, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPA1, 0x3f - 0b); + prop_dictionary_set_uint32(dict, nc-GPB, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPC0, 0x1f - 0b); /* blue led at bit 0 : */ - prop_dictionary_set_uint32(dict, nc-GPC1, 0x1f - 0x01); - prop_dictionary_set_uint32(dict, nc-GPD0, 0x0f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPD1, 0x0f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPF0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPF1, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPF2, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPF3, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPJ0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPJ1, 0x1f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPK0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPK1, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPK2, 0x7f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPK3, 0x7f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPL0, 0x7f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPL1, 0x03 - 0x00); - prop_dictionary_set_uint32(dict, nc-GPL2, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY0, 0x3f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY1, 0x0f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY2, 0x3f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY3, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY4, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY5, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPY6, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-ETC0, 0x3f - 0x00); - prop_dictionary_set_uint32(dict, nc-ETC6, 0x7f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPM0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPM1, 0x7f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPM2, 0x1f - 0x00); - prop_dictionary_set_uint32(dict, nc-GPM3, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPM4, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPX0, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPX1, 0xff - 0x00); - prop_dictionary_set_uint32(dict, nc-GPX2, 0xff - 0x00); + prop_dictionary_set_uint32(dict, nc-GPC1, 0x1f - 0b0001); + prop_dictionary_set_uint32(dict, nc-GPD0, 0x0f - 0b); + prop_dictionary_set_uint32(dict, nc-GPD1, 0x0f - 0b); + prop_dictionary_set_uint32(dict, nc-GPF0, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPF1, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPF2, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPF3, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPJ0, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPJ1, 0x1f - 0b); + prop_dictionary_set_uint32(dict, nc-GPK0, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPK1, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPK2, 0x7f - 0b); + prop_dictionary_set_uint32(dict, nc-GPK3, 0x7f - 0b); + prop_dictionary_set_uint32(dict, nc-GPL0, 0x7f - 0b); + prop_dictionary_set_uint32(dict, nc-GPL1, 0x03 - 0b); + prop_dictionary_set_uint32(dict, nc-GPL2, 0xff - 0b); + prop_dictionary_set_uint32(dict, nc-GPY0, 0x3f - 0b); +
CVS import: src/share/zoneinfo
Module Name:src Committed By: apb Date: Thu May 15 15:42:14 UTC 2014 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv23892 Log Message: Import tzdata2014c from ftp://ftp.iana.org/tz/releases/tzcode2014c.tar.gz Changes from tzdata2013i to tzdata2014a: Turkey begins DST on 2014-03-31, not 03-30. Fiji ended DST on 2014-01-19 at 02:00, not 03:00. Ukraine switched from Moscow to Eastern European time on 1990-07-01 (not 1992-01-01), and observed DST during the entire next winter. In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03. Also some changes affecting commentary and documentation Changes from tzdata2014a to tzdata2014b: Crimea switches to Moscow time on 2014-03-30 at 02:00 local time. New entry for Troll station, Antarctica. Also some changes affecting commentary and documentation Changes from tzdata2014b to tzdata2014c: Egypt observes DST starting 2014-05-15 at 24:00. Guess that DST will stop during the same Ramadan dates as Morocco, and make some other guesses. Also some changes affecting commentary and documentation Status: Vendor Tag: TZDATA Release Tags: TZDATA2014C U src/share/zoneinfo/antarctica C src/share/zoneinfo/Makefile U src/share/zoneinfo/README U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/northamerica U src/share/zoneinfo/europe U src/share/zoneinfo/leapseconds.awk U src/share/zoneinfo/southamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera U src/share/zoneinfo/backward U src/share/zoneinfo/systemv U src/share/zoneinfo/factory U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/zone.tab U src/share/zoneinfo/leapseconds U src/share/zoneinfo/leap-seconds.list U src/share/zoneinfo/yearistype.sh 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTZDATA:yesterday -jTZDATA src/share/zoneinfo
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Thu May 15 16:01:18 UTC 2014 Modified Files: src/share/zoneinfo: australasia Log Message: Merge tzdata2014c. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.34 src/share/zoneinfo/australasia:1.35 --- src/share/zoneinfo/australasia:1.34 Thu Dec 26 17:09:39 2013 +++ src/share/zoneinfo/australasia Thu May 15 16:01:18 2014 @@ -354,16 +354,18 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155 # From the Fijian Government Media Center (2013-08-30) via David Wheeler: -# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am -# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# Fiji will start daylight savings on Sunday 27th October, 2013 ... +# move clocks forward by one hour from 2am # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx -# -# From Paul Eggert (2013-09-09): + +# From Steffen Thorsen (2013-01-10): +# Fiji will end DST on 2014-01-19 02:00: +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx + +# From Paul Eggert (2014-01-10): # For now, guess that Fiji springs forward the Sunday before the fourth -# Monday in October. This matches both recent practice and -# timeanddate.com's current spring-forward prediction. -# For the January 2014 transition we guessed right while timeanddate.com -# guessed wrong, so leave the fall-back prediction alone. +# Monday in October, and springs back the penultimate Sunday in January. +# This is ad hoc, but matches recent practice. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun=1 2:00 1:00 S @@ -372,7 +374,8 @@ Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - Rule Fiji 2010 max - Oct Sun=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun=1 3:00 0 - -Rule Fiji 2012 max - Jan Sun=18 3:00 0 - +Rule Fiji 2012 2013 - Jan Sun=18 3:00 0 - +Rule Fiji 2014 max - Jan Sun=18 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -760,14 +763,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind. +# Details are uncertain. We have no data for Johnston after 1970, so +# treat it like Hawaii for now. +# # In his memoirs of June 6th to October 4, 1945 # http://www.315bw.org/Herb_Bach.htm (2005), Herbert C. Bach writes, # We started our letdown to Kwajalein Atoll and landed there at 5:00 AM # Johnston time, 1:30 AM Kwajalein time. This was in June 1945, and # confirms that Johnston kept the same time as Honolulu in summer 1945. -# We have no better information, so for now, assume this has been true -# indefinitely into the past. +# +# From Lyle McElhaney (2014-03-11): +# [W]hen JI was being used for that [atomic bomb] testing, the time being used +# was not Hawaiian time but rather the same time being used on the ships, +# which had a GMT offset of -11 hours. This apparently applied to at least the +# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last +# Operation Fishbowl shot (Tightrope, 1962-11-04) [See] Herman Hoerlin, +# The United States High-Altitude Test Experience: A Review Emphasizing the +# Impact on the Environment, Los Alamos LA-6405, Oct 1976 +# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf. +# See the table on page 4 where he lists GMT and local times for the tests; a +# footnote for the JI tests reads that local time is JI time = Hawaii Time +# Minus One Hour. # # See 'northamerica' for Pacific/Johnston.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: apb Date: Thu May 15 16:06:38 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add ./usr/share/zoneinfo/Antarctica/Troll for tzdat2014c To generate a diff of this commit: cvs rdiff -u -r1.1066 -r1.1067 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1066 src/distrib/sets/lists/base/mi:1.1067 --- src/distrib/sets/lists/base/mi:1.1066 Tue Apr 15 22:09:27 2014 +++ src/distrib/sets/lists/base/mi Thu May 15 16:06:38 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1066 2014/04/15 22:09:27 ginsbach Exp $ +# $NetBSD: mi,v 1.1067 2014/05/15 16:06:38 apb Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -5032,6 +5032,7 @@ ./usr/share/zoneinfo/Antarctica/Rothera base-sys-share share ./usr/share/zoneinfo/Antarctica/South_Pole base-sys-share share ./usr/share/zoneinfo/Antarctica/Syowa base-sys-share share +./usr/share/zoneinfo/Antarctica/Troll base-sys-share share ./usr/share/zoneinfo/Antarctica/Vostok base-sys-share share ./usr/share/zoneinfo/Arctic base-sys-share ./usr/share/zoneinfo/Arctic/Longyearbyen base-sys-share share
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Thu May 15 16:32:07 UTC 2014
Modified Files:
src/distrib/sets: Makefile
Log Message:
Teach make sortlists to ignore .#* files (sometimes created by cvs),
and to squeeze multiple blank lines.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.94 src/distrib/sets/Makefile:1.95
--- src/distrib/sets/Makefile:1.94 Mon Jan 27 21:37:17 2014
+++ src/distrib/sets/Makefile Thu May 15 16:32:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile,v 1.95 2014/05/15 16:32:07 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -306,12 +306,13 @@ makedeps: .PHONY
# Sort the lists files
sortlists: .PHONY
- find ${.CURDIR}/lists \! \( -name CVS -prune \) -type f -print \
+ find ${.CURDIR}/lists \! \( -name CVS -prune \) \! -name .#\* \
+ -type f -print \
| while read f ; do \
${_MKSHMSG} sorting $${f#${.CURDIR}/} ; \
{ grep '^#' $$f ; \
grep -v '^#' $$f | sort ; \
- } $$f.tmp; \
+ } | cat -s $$f.tmp; \
if cmp $$f $$f.tmp /dev/null; then \
: $$f is unchanged ; \
rm $$f.tmp ; \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: apb Date: Thu May 15 16:32:28 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips ad.powerpc md.amd64 md.playstation2 md.sparc64 mi src/distrib/sets/lists/debug: ad.powerpc md.amd64 shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/modules: md.evbppc.powerpc mi src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xbase: mi src/distrib/sets/lists/xcomp: md.amd64 md.i386 mi Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.231 -r1.232 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.218 -r1.219 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.700 -r1.701 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.218 -r1.219 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.playstation2 cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1891 -r1.1892 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1472 -r1.1473 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/modules/md.evbppc.powerpc cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.568 -r1.569 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.41 src/distrib/sets/lists/base/ad.arm:1.42 --- src/distrib/sets/lists/base/ad.arm:1.41 Fri Mar 21 17:00:18 2014 +++ src/distrib/sets/lists/base/ad.arm Thu May 15 16:32:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.41 2014/03/21 17:00:18 christos Exp $ +# $NetBSD: ad.arm,v 1.42 2014/05/15 16:32:28 apb Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -146,8 +146,8 @@ ./usr/lib/oabi/libgnumalloc.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/libgnumalloc.so.1.0 base-compat-shlib compat,pic ./usr/lib/oabi/libgomp.so.1 base-compat-shlib compat,pic,gcc=45 -./usr/lib/oabi/libgomp.so.1.0 base-compat-shlib compat,pic,gcc=45 ./usr/lib/oabi/libgomp.so.1 base-compat-shlib compat,pic,gcc=48 +./usr/lib/oabi/libgomp.so.1.0 base-compat-shlib compat,pic,gcc=45 ./usr/lib/oabi/libgomp.so.1.1 base-compat-shlib compat,pic,gcc=48 ./usr/lib/oabi/libgssapi.so.10 base-compat-shlib compat,pic,kerberos ./usr/lib/oabi/libgssapi.so.10.0 base-compat-shlib compat,pic,kerberos @@ -223,9 +223,9 @@ ./usr/lib/oabi/libnpf.so.0.0 base-compat-shlib compat,pic,npf ./usr/lib/oabi/libobjc.so.3 base-compat-shlib compat,pic,gcccmds,gcc=4 ./usr/lib/oabi/libobjc.so.3 base-compat-shlib compat,pic,gcccmds,gcc=45 -./usr/lib/oabi/libobjc.so.4 base-compat-shlib compat,pic,gcccmds,gcc=48 ./usr/lib/oabi/libobjc.so.3.0 base-compat-shlib compat,pic,gcccmds,gcc=4 ./usr/lib/oabi/libobjc.so.3.0 base-compat-shlib compat,pic,gcccmds,gcc=45 +./usr/lib/oabi/libobjc.so.4 base-compat-shlib compat,pic,gcccmds,gcc=48 ./usr/lib/oabi/libobjc.so.4.0 base-compat-shlib compat,pic,gcccmds,gcc=48 ./usr/lib/oabi/libopcodes.so.6 base-compat-shlib compat,pic,binutils ./usr/lib/oabi/libopcodes.so.6.0 base-compat-shlib compat,pic,binutils Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.37 src/distrib/sets/lists/base/ad.mips:1.38 --- src/distrib/sets/lists/base/ad.mips:1.37 Fri Mar 21 17:00:18 2014 +++ src/distrib/sets/lists/base/ad.mips Thu May 15 16:32:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.37 2014/03/21 17:00:18 christos Exp $ +# $NetBSD: ad.mips,v 1.38 2014/05/15 16:32:28 apb Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic,arch64 @@ -146,8 +146,8 @@ ./usr/lib/64/libgnumalloc.so.1 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libgnumalloc.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libgomp.so.1 base-compat-shlib
CVS commit: src/sys/arch/evbarm/cubie
Module Name:src
Committed By: matt
Date: Thu May 15 17:05:16 UTC 2014
Modified Files:
src/sys/arch/evbarm/cubie: cubie_machdep.c
Log Message:
Don't access cbar on a cortex-a8
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/cubie/cubie_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/evbarm/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.18 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.19
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.18 Sun Apr 20 10:06:08 2014
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c Thu May 15 17:05:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cubie_machdep.c,v 1.18 2014/04/20 10:06:08 martin Exp $ */
+/* $NetBSD: cubie_machdep.c,v 1.19 2014/05/15 17:05:15 matt Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.18 2014/04/20 10:06:08 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.19 2014/05/15 17:05:15 matt Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -342,7 +342,9 @@ initarm(void *arg)
printf(initarm: Configuring system ...\n);
#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA9) || defined(CPU_CORTEXA15)
- printf(initarm: cbar=%#x\n, armreg_cbar_read());
+ if (!CPU_ID_CORTEX_A8_P(curcpu()-ci_arm_cpuid)) {
+ printf(initarm: cbar=%#x\n, armreg_cbar_read());
+ }
#endif
#endif
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: manu
Date: Thu May 15 18:25:35 UTC 2014
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
Fix cases where count = 0 (thanks to Maxime Villard for raising this)
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/compat/netbsd32/netbsd32_netbsd.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/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.186 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.187
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.186 Wed Apr 30 17:23:45 2014
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Thu May 15 18:25:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.186 2014/04/30 17:23:45 njoly Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.187 2014/05/15 18:25:35 manu Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.186 2014/04/30 17:23:45 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.187 2014/05/15 18:25:35 manu Exp $);
#if defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -1763,6 +1763,12 @@ netbsd32_swapctl_stats(struct lwp *l, st
int i, error = 0;
size_t ksep_len;
+ if (count 0)
+ return EINVAL;
+
+ if (count == 0 || uvmexp.nswapdev == 0)
+ return 0;
+
/* Make sure userland cannot exhaust kernel memory */
if ((size_t)count (size_t)uvmexp.nswapdev)
count = uvmexp.nswapdev;
@@ -1774,9 +1780,6 @@ netbsd32_swapctl_stats(struct lwp *l, st
uvm_swap_stats(SWAP_STATS, ksep, count, retval);
count = *retval;
- if (count 1)
- goto out;
-
for (i = 0; i count; i++) {
se32.se_dev = ksep[i].se_dev;
se32.se_flags = ksep[i].se_flags;
@@ -1791,8 +1794,6 @@ netbsd32_swapctl_stats(struct lwp *l, st
break;
}
-
-out:
kmem_free(ksep, ksep_len);
return error;
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu May 15 19:37:22 UTC 2014
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
be a bit more verbose about why we think a note is bad.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/exec_elf.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/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.65 src/sys/kern/exec_elf.c:1.66
--- src/sys/kern/exec_elf.c:1.65 Sat Mar 22 03:27:21 2014
+++ src/sys/kern/exec_elf.c Thu May 15 15:37:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.65 2014/03/22 07:27:21 maxv Exp $ */
+/* $NetBSD: exec_elf.c,v 1.66 2014/05/15 19:37:22 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.65 2014/03/22 07:27:21 maxv Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.66 2014/05/15 19:37:22 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -870,6 +870,12 @@ netbsd_elf_signature(struct lwp *l, stru
int error;
int isnetbsd = 0;
char *ndata, *ndesc;
+#ifdef DIAGNOSTIC
+ const char *badnote;
+#define BADNOTE(n) badnote = (n)
+#else
+#define BADNOTE(n)
+#endif
epp-ep_pax_flags = 0;
if (eh-e_shnum MAXSHNUM || eh-e_shnum == 0)
@@ -905,12 +911,16 @@ netbsd_elf_signature(struct lwp *l, stru
* Ensure this size is consistent with what is indicated
* in sh_size. The first check avoids integer overflows.
*/
- if (np-n_namesz shp-sh_size || np-n_descsz shp-sh_size)
+ if (np-n_namesz shp-sh_size || np-n_descsz shp-sh_size) {
+ BADNOTE(note size limit);
goto bad;
+ }
nsize = sizeof(*np) + roundup(np-n_namesz, 4) +
roundup(np-n_descsz, 4);
- if (nsize != shp-sh_size)
+ if (nsize != shp-sh_size) {
+ BADNOTE(note size);
goto bad;
+ }
ndesc = ndata + roundup(np-n_namesz, 4);
switch (np-n_type) {
@@ -934,7 +944,7 @@ netbsd_elf_signature(struct lwp *l, stru
memcmp(ndata, ELF_NOTE_SUSE_NAME,
ELF_NOTE_SUSE_NAMESZ) == 0)
break;
-
+ BADNOTE(NetBSD tag);
goto bad;
case ELF_NOTE_TYPE_PAX_TAG:
@@ -946,6 +956,7 @@ netbsd_elf_signature(struct lwp *l, stru
sizeof(epp-ep_pax_flags));
break;
}
+ BADNOTE(PaX tag);
goto bad;
case ELF_NOTE_TYPE_MARCH_TAG:
@@ -954,19 +965,24 @@ netbsd_elf_signature(struct lwp *l, stru
memcmp(ndata, ELF_NOTE_MARCH_NAME,
ELF_NOTE_MARCH_NAMESZ) == 0) {
/* Do not truncate the buffer */
-if (np-n_descsz sizeof(epp-ep_machine_arch))
+if (np-n_descsz sizeof(epp-ep_machine_arch)) {
+ BADNOTE(description size limit);
goto bad;
+}
/*
* Ensure ndesc is NUL-terminated and of the
* expected length.
*/
if (strnlen(ndesc, np-n_descsz) + 1 !=
-np-n_descsz)
+np-n_descsz) {
+ BADNOTE(description size);
goto bad;
+}
strlcpy(epp-ep_machine_arch, ndesc,
sizeof(epp-ep_machine_arch));
break;
}
+ BADNOTE(march tag);
goto bad;
case ELF_NOTE_TYPE_MCMODEL_TAG:
@@ -978,6 +994,7 @@ netbsd_elf_signature(struct lwp *l, stru
ELF_MD_MCMODEL_CHECK(epp, ndesc, np-n_descsz);
break;
}
+ BADNOTE(mcmodel tag);
goto bad;
#endif
break;
@@ -986,6 +1003,7 @@ netbsd_elf_signature(struct lwp *l, stru
break;
default:
+ BADNOTE(unknown tag);
bad:
#ifdef DIAGNOSTIC
/* Ignore GNU tags */
@@ -995,9 +1013,9 @@ bad:
break;
int ns = MIN(np-n_namesz, shp-sh_size - sizeof(*np));
- printf(%s: Unknown elf note type %d:
- [namesz=%d, descsz=%d name=%*.*s]\n,
- epp-ep_kname, np-n_type, np-n_namesz,
+ printf(%s: Unknown elf note type %d (%s):
+ [namesz=%d, descsz=%d name=%-*.*s]\n,
+ epp-ep_kname, np-n_type, badnote, np-n_namesz,
np-n_descsz, ns, ns, ndata);
#endif
break;
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Thu May 15 22:20:08 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Refactor bpfjit code.
- Implement Array Bounds Check Elimination for packet bytes.
- Track initialization of registers and memwords.
- Remove bj_ prefix from struct members.
- Shorten BPFJIT_ prefix to BJ_.
- Other small improvements.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/bpfjit.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/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.6 src/sys/net/bpfjit.c:1.7
--- src/sys/net/bpfjit.c:1.6 Sun Dec 15 21:18:01 2013
+++ src/sys/net/bpfjit.c Thu May 15 22:20:08 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: bpfjit.c,v 1.6 2013/12/15 21:18:01 pooka Exp $ */
+/* $NetBSD: bpfjit.c,v 1.7 2014/05/15 22:20:08 alnsn Exp $ */
/*-
- * Copyright (c) 2011-2012 Alexander Nasonov.
+ * Copyright (c) 2011-2014 Alexander Nasonov.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,30 +31,33 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.6 2013/12/15 21:18:01 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.7 2014/05/15 22:20:08 alnsn Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.6 2013/12/15 21:18:01 pooka Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.7 2014/05/15 22:20:08 alnsn Exp $);
#endif
#include sys/types.h
#include sys/queue.h
#ifndef _KERNEL
-#include stdlib.h
#include assert.h
-#define BPFJIT_ALLOC(sz) malloc(sz)
-#define BPFJIT_FREE(p, sz) free(p)
-#define BPFJIT_ASSERT(c) assert(c)
+#define BJ_ASSERT(c) assert(c)
+#else
+#define BJ_ASSERT(c) KASSERT(c)
+#endif
+
+#ifndef _KERNEL
+#include stdlib.h
+#define BJ_ALLOC(sz) malloc(sz)
+#define BJ_FREE(p, sz) free(p)
#else
#include sys/kmem.h
-#define BPFJIT_ALLOC(sz) kmem_alloc(sz, KM_SLEEP)
-#define BPFJIT_FREE(p, sz) kmem_free(p, sz)
-#define BPFJIT_ASSERT(c) KASSERT(c)
+#define BJ_ALLOC(sz) kmem_alloc(sz, KM_SLEEP)
+#define BJ_FREE(p, sz) kmem_free(p, sz)
#endif
#ifndef _KERNEL
#include limits.h
-#include stdio.h
#include stdbool.h
#include stddef.h
#include stdint.h
@@ -68,28 +71,50 @@ __RCSID($NetBSD: bpfjit.c,v 1.6 2013/12
#include net/bpfjit.h
#include sljitLir.h
-#define BPFJIT_A SLJIT_TEMPORARY_REG1
-#define BPFJIT_X SLJIT_TEMPORARY_EREG1
-#define BPFJIT_TMP1 SLJIT_TEMPORARY_REG2
-#define BPFJIT_TMP2 SLJIT_TEMPORARY_REG3
-#define BPFJIT_BUF SLJIT_SAVED_REG1
-#define BPFJIT_WIRELEN SLJIT_SAVED_REG2
-#define BPFJIT_BUFLEN SLJIT_SAVED_REG3
-#define BPFJIT_KERN_TMP SLJIT_TEMPORARY_EREG2
+#if !defined(_KERNEL) defined(SLJIT_VERBOSE) SLJIT_VERBOSE
+#include stdio.h /* for stderr */
+#endif
+
+/*
+ * Permanent register assignments.
+ */
+#define BJ_BUF SLJIT_SAVED_REG1
+#define BJ_WIRELEN SLJIT_SAVED_REG2
+#define BJ_BUFLEN SLJIT_SAVED_REG3
+#define BJ_AREG SLJIT_TEMPORARY_REG1
+#define BJ_TMP1REG SLJIT_TEMPORARY_REG2
+#define BJ_TMP2REG SLJIT_TEMPORARY_REG3
+#define BJ_XREG SLJIT_TEMPORARY_EREG1
+#define BJ_TMP3REG SLJIT_TEMPORARY_EREG2
+
+typedef unsigned int bpfjit_init_mask_t;
+#define BJ_INIT_NOBITS 0u
+#define BJ_INIT_MBIT(k) (1u (k))
+#define BJ_INIT_MMASK (BJ_INIT_MBIT(BPF_MEMWORDS) - 1u)
+#define BJ_INIT_ABITBJ_INIT_MBIT(BPF_MEMWORDS)
+#define BJ_INIT_XBITBJ_INIT_MBIT(BPF_MEMWORDS + 1)
-/*
- * Flags for bpfjit_optimization_hints().
+struct bpfjit_stack
+{
+ uint32_t mem[BPF_MEMWORDS];
+#ifdef _KERNEL
+ void *tmp;
+#endif
+};
+
+/*
+ * Data for BPF_JMP instruction.
+ * Forward declaration for struct bpfjit_jump.
*/
-#define BPFJIT_INIT_X 0x1
-#define BPFJIT_INIT_A 0x2
+struct bpfjit_jump_data;
/*
- * Node of bj_jumps list.
+ * Node of bjumps list.
*/
struct bpfjit_jump {
- struct sljit_jump *bj_jump;
- SLIST_ENTRY(bpfjit_jump) bj_entries;
- uint32_t bj_safe_length;
+ struct sljit_jump *sjump;
+ SLIST_ENTRY(bpfjit_jump) entries;
+ struct bpfjit_jump_data *jdata;
};
/*
@@ -97,11 +122,19 @@ struct bpfjit_jump {
*/
struct bpfjit_jump_data {
/*
- * These entries make up bj_jumps list:
- * bj_jtf[0] - when coming from jt path,
- * bj_jtf[1] - when coming from jf path.
+ * These entries make up bjumps list:
+ * jtf[0] - when coming from jt path,
+ * jtf[1] - when coming from jf path.
*/
- struct bpfjit_jump bj_jtf[2];
+ struct bpfjit_jump jtf[2];
+ /*
+ * Length calculated by Array Bounds Check Elimination (ABC) pass.
+ */
+ uint32_t abc_length;
+ /*
+ * Length checked by the last out-of-bounds check.
+ */
+ uint32_t checked_length;
};
/*
@@ -110,11 +143,16 @@ struct bpfjit_jump_data {
*/
struct bpfjit_read_pkt_data {
/*
- * If positive, emit if (buflen bj_check_length) return 0.
+ * Length calculated by Array Bounds Check Elimination (ABC) pass.
+ */
+ uint32_t abc_length;
+ /*
+ * If positive, emit if (buflen check_length) return 0
+ * out-of-bounds check.
* We
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: wiz Date: Thu May 15 23:52:32 UTC 2014 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Wording, typo fixes. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/npf/npfctl/npf.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.40 src/usr.sbin/npf/npfctl/npf.conf.5:1.41 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.40 Thu May 15 02:34:29 2014 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu May 15 23:52:32 2014 @@ -1,4 +1,4 @@ -.\$NetBSD: npf.conf.5,v 1.40 2014/05/15 02:34:29 rmind Exp $ +.\$NetBSD: npf.conf.5,v 1.41 2014/05/15 23:52:32 wiz Exp $ .\ .\ Copyright (c) 2009-2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -168,10 +168,10 @@ precaution. In both cases, a full TCP state tracking is performed for TCP connections and a limited tracking for message-based protocols (UDP and ICMP). .Pp -By default, stateful rule implies SYN-only flag check (flags S/SAFR) +By default, a stateful rule implies SYN-only flag check (flags S/SAFR) for the TCP packets. -It is not advisable to change this behavior, however, -it can be overriden with +It is not advisable to change this behavior; however, +it can be overridden with the .Cd flags keyword. .Ss Map
CVS import: src/external/bsd/libc++/dist/libcxxrt
Module Name:src Committed By: joerg Date: Thu May 15 23:56:01 UTC 2014 Update of /cvsroot/src/external/bsd/libc++/dist/libcxxrt In directory ivanova.netbsd.org:/tmp/cvs-serv197 Log Message: Import libcxxrt revision 4eb349088dda15d2de9a8c7b144c3f2d5f390269. Restore support for 32bit architectures without 64bit CAS. Support DWARF exception handling on ARM. Status: Vendor Tag: PATHSCALE Release Tags: libcxxrt-4eb349088dda15d2de9a8c7b144c3f2d5f390269 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/share/man/man9
Module Name:src Committed By: wiz Date: Thu May 15 23:59:05 UTC 2014 Modified Files: src/share/man/man9: pcu.9 Log Message: More markup. Better table width. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/pcu.9 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/man9/pcu.9 diff -u src/share/man/man9/pcu.9:1.5 src/share/man/man9/pcu.9:1.6 --- src/share/man/man9/pcu.9:1.5 Mon May 12 08:47:49 2014 +++ src/share/man/man9/pcu.9 Thu May 15 23:59:05 2014 @@ -1,6 +1,6 @@ -.\ $NetBSD: pcu.9,v 1.5 2014/05/12 08:47:49 martin Exp $ +.\ $NetBSD: pcu.9,v 1.6 2014/05/15 23:59:05 wiz Exp $ .\ -.\ Copyright (c) 2012 The NetBSD Foundation, Inc. +.\ Copyright (c) 2012-2014 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ This code is derived from software contributed to The NetBSD Foundation @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 22, 2014 +.Dd May 12, 2014 .Dt PCU 9 .Os .Sh NAME @@ -67,14 +67,14 @@ The PCU operations take a .Ar flags parameter which is a bitmask that always can have one of the general bits set: -.Bl -tag -width PCU_KERNEL -.It PCU_USER +.Bl -tag -width PCU_KERNELXXX +.It Dv PCU_USER PCU state is for the user -.It PCU_KERNEL +.It Dv PCU_KERNEL PCU state is for the kernel .El .Pp -.Bl -tag -width compact +.Bl -tag -width pcu_state_saveXXX .It Fn pcu_state_save save the current CPU's state into the given LWP's MD storage. .It Fn pcu_state_load @@ -83,12 +83,12 @@ The .Ar flags is a combination of the above general flags and one or more of the following: -.Bl -tag -width PCU_LOADED -.It PCU_RELOAD +.Bl -tag -width PCU_LOADEDXXX +.It Dv PCU_RELOAD Load registers into the PCU -.It PCU_ENABLE +.It Dv PCU_ENABLE Enable the PCU -.It PCU_LOADED +.It Dv PCU_LOADED the current LWP has used this PCU before .El .It Fn pcu_state_release @@ -100,7 +100,7 @@ For example, this would often be the cha trap on the execution of one of the PCU's instructions. .El .Sh FUNCTIONS -.Bl -tag -width compact +.Bl -tag -width pcu_save_allXXX .It Fn pcu_load Load (initialize) the PCU state of the current LWP on the current CPU. .It Fn pcu_save @@ -108,7 +108,7 @@ Save the specified PCU state to the give .It Fn pcu_discard Discard the specified PCU state of the current LWP. .It Fn pcu_used_p -Return true if PCU was used (i.e. +Return true if PCU was used (i.e., .Fn pcu_load was called) by the LWP. Otherwise, return false.
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri May 16 00:11:30 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Prepare in case we want to hook up the profile init code later.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 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.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.18 src/lib/libc/compiler_rt/Makefile.inc:1.19
--- src/lib/libc/compiler_rt/Makefile.inc:1.18 Fri May 16 00:10:57 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri May 16 00:11:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2014/05/16 00:10:57 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.19 2014/05/16 00:11:30 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -213,9 +213,11 @@ GENERIC_SRCS+= \
SRCS+= ${src:R}.S
. else
SRCS+= ${src}
+.if ${src:E} != cc
COPTS.${src}+= -Wno-missing-prototypes \
-Wno-old-style-definition \
-Wno-strict-prototypes \
-Wno-uninitialized
+.endif
. endif
.endfor
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Fri May 16 00:04:24 UTC 2014 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25171 Log Message: Import compiler-rt r208593. Fix a build bug in __clear_cache by not explicitly forcing the ABI. Add first part of IEEE 754 quad support. Status: Vendor Tag: LLVM Release Tags: compiler-rt-208593 N src/sys/external/bsd/compiler_rt/dist/CODE_OWNERS.TXT U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/adddf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashldi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashlti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/assembly.h U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/cmpdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/cmpti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparedf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparesf2.c N src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparetf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmodsi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divxc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/enable_execute_stack.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/eprintf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendsfdf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdixf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatsisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattixf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundixf.c U
CVS commit: src/sys/external/bsd/compiler_rt
Module Name:src Committed By: joerg Date: Fri May 16 00:08:17 UTC 2014 Modified Files: src/sys/external/bsd/compiler_rt: prepare-import.sh Log Message: Clean up a few more directories. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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. Modified files: Index: src/sys/external/bsd/compiler_rt/prepare-import.sh diff -u src/sys/external/bsd/compiler_rt/prepare-import.sh:1.3 src/sys/external/bsd/compiler_rt/prepare-import.sh:1.4 --- src/sys/external/bsd/compiler_rt/prepare-import.sh:1.3 Wed Feb 26 22:37:56 2014 +++ src/sys/external/bsd/compiler_rt/prepare-import.sh Fri May 16 00:08:17 2014 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.3 2014/02/26 22:37:56 joerg Exp $ +# $NetBSD: prepare-import.sh,v 1.4 2014/05/16 00:08:17 joerg Exp $ # # Checkout compiler_rt into dist. # Run this script and check for additional files and directories to prune, @@ -9,7 +9,7 @@ set -e cd dist rm -rf .svn -rm -rf SDKs cmake include make third_party unittests www +rm -rf SDKs android cmake include make third_party unittests www rm -f .arcconfig .gitignore CMakeLists.txt Makefile rm -rf lib/BlocksRuntime lib/asan lib/dfsan lib/interception lib/lsan rm -rf lib/msan lib/msandr lib/sanitizer_common lib/tsan lib/ubsan
CVS commit: src/external/bsd/libc++
Module Name:src Committed By: joerg Date: Thu May 15 23:59:12 UTC 2014 Modified Files: src/external/bsd/libc++: prepare-import.sh Log Message: Remove some more CMakeLists.txt files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libc++/prepare-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libc++/prepare-import.sh diff -u src/external/bsd/libc++/prepare-import.sh:1.1 src/external/bsd/libc++/prepare-import.sh:1.2 --- src/external/bsd/libc++/prepare-import.sh:1.1 Fri May 17 23:00:22 2013 +++ src/external/bsd/libc++/prepare-import.sh Thu May 15 23:59:12 2014 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.1 2013/05/17 23:00:22 joerg Exp $ +# $NetBSD: prepare-import.sh,v 1.2 2014/05/15 23:59:12 joerg Exp $ # # Checkout libc++ and libcxxrt in the corresponding subdirectories of # dist. Run this script and check for additional files and @@ -9,7 +9,7 @@ set -e cd dist/libcxx rm -rf .svn cmake Makefile CMakeLists.txt lib src/support www .arcconfig -rm -rf include/support +rm -rf include/support */CMakeLists.txt cd ../libcxxrt rm -rf .git CMakeLists.txt */CMakeLists.txt src/doxygen_config
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri May 16 00:19:00 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Mark unwinding as supported for eARM.
To generate a diff of this commit:
cvs rdiff -u -r1.803 -r1.804 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.803 src/share/mk/bsd.own.mk:1.804
--- src/share/mk/bsd.own.mk:1.803 Thu May 8 13:58:34 2014
+++ src/share/mk/bsd.own.mk Fri May 16 00:19:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.803 2014/05/08 13:58:34 phx Exp $
+# $NetBSD: bsd.own.mk,v 1.804 2014/05/16 00:19:00 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -93,6 +93,10 @@ HAVE_LIBGCC?= no
HAVE_LIBGCC?= yes
.endif
+.if !empty(MACHINE_ARCH:Mearm*)
+_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}= yes
+.endif
+
_LIBC_UNWIND_SUPPORT.alpha= yes
_LIBC_UNWIND_SUPPORT.hppa= yes
_LIBC_UNWIND_SUPPORT.i386= yes
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Fri May 16 00:10:57 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Deal with PGO rename.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.17 src/lib/libc/compiler_rt/Makefile.inc:1.18
--- src/lib/libc/compiler_rt/Makefile.inc:1.17 Wed Mar 19 20:30:53 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Fri May 16 00:10:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2014/03/19 20:30:53 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.18 2014/05/16 00:10:57 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -171,7 +171,10 @@ GENERIC_SRCS+= \
GENERIC_SRCS+= \
GCDAProfiling.c \
- PGOProfiling.c
+ InstrProfiling.c \
+ InstrProfilingBuffer.c \
+ InstrProfilingFile.c \
+ InstrProfilingPlatformOther.c
.if ${LIBC_MACHINE_ARCH} == powerpc
GENERIC_SRCS+= \
CVS commit: src
Module Name:src Committed By: rmind Date: Fri May 16 00:48:41 UTC 2014 Modified Files: src/share/man/man9: pcu.9 src/sys/arch/alpha/alpha: fp_complete.c src/sys/arch/alpha/include: alpha.h src/sys/arch/amd64/amd64: locore.S src/sys/arch/arm/vfp: vfp_init.c src/sys/arch/mips/mips: mips_dsp.c mips_fpu.c src/sys/arch/powerpc/booke: spe.c src/sys/arch/powerpc/oea: altivec.c src/sys/arch/powerpc/powerpc: fpu.c src/sys/kern: subr_pcu.c src/sys/sys: pcu.h Log Message: pcu(9): - Remove PCU_KERNEL (hi matt!) and significantly simplify the code. This experimental feature was tried on ARM did not meet the expectations. It may be revived one day, but it should be done in a much simpler way. - Add a message structure for xcall function, pass the LWP ower and thus optimise a race condition: if LWP is discarding its state on a remote CPU, but another LWP already did it - do not cause an unecessary re-faulting. - Reduce the variety of flags for PCU operations (only PCU_VALID and PCU_REENABLE are used now), pass them only to the pcu_state_load(). - Rename pcu_used_p() to pcu_valid_p(); hopefully it is less confusing. - pcu_save_all_on_cpu: SPL ought to be used here. - Update and improve the pcu(9) man page; it needs wizd(8) though. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/pcu.9 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/alpha/fp_complete.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/include/alpha.h cvs rdiff -u -r1.75 -r1.76 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/vfp/vfp_init.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/mips_dsp.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/mips/mips_fpu.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/booke/spe.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/oea/altivec.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/fpu.c cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_pcu.c cvs rdiff -u -r1.11 -r1.12 src/sys/sys/pcu.h 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/man9/pcu.9 diff -u src/share/man/man9/pcu.9:1.6 src/share/man/man9/pcu.9:1.7 --- src/share/man/man9/pcu.9:1.6 Thu May 15 23:59:05 2014 +++ src/share/man/man9/pcu.9 Fri May 16 00:48:41 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcu.9,v 1.6 2014/05/15 23:59:05 wiz Exp $ +.\ $NetBSD: pcu.9,v 1.7 2014/05/16 00:48:41 rmind Exp $ .\ .\ Copyright (c) 2012-2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 12, 2014 +.Dd May 15, 2014 .Dt PCU 9 .Os .Sh NAME @@ -42,14 +42,14 @@ .Ft void .Fn pcu_save_all lwp_t *l .Ft void -.Fn pcu_discard const pcu_ops_t *pcu +.Fn pcu_discard const pcu_ops_t *pcu bool valid .Ft bool -.Fn pcu_used_p const pcu_ops_t *pcu +.Fn pcu_valid_p const pcu_ops_t *pcu .\ - .Sh DESCRIPTION Per CPU Unit (PCU) is an interface to manage synchronization of any per-CPU context (unit) tied to an LWP context. -Typical use of PCU is for lazy-switch synchronisation of FPU state. +Typical use of PCU is for lazy-switch synchronization of the FPU state. Each PCU has its operations defined by a .Vt pcu_ops_t structure. @@ -58,62 +58,55 @@ Members of are .Bd -literal u_int pcu_id; -void (*pcu_state_save)(lwp_t *l, u_int flags); +void (*pcu_state_save)(lwp_t *l); void (*pcu_state_load)(lwp_t *l, u_int flags); -void (*pcu_state_release)(lwp_t *l, u_int flags); +void (*pcu_state_release)(lwp_t *l); .Ed .Pp -The PCU operations take a -.Ar flags -parameter which is a bitmask that always can have one of the general -bits set: -.Bl -tag -width PCU_KERNELXXX -.It Dv PCU_USER -PCU state is for the user -.It Dv PCU_KERNEL -PCU state is for the kernel -.El -.Pp -.Bl -tag -width pcu_state_saveXXX .It Fn pcu_state_save -save the current CPU's state into the given LWP's MD storage. +indicate to MD code that the PCU state on the current CPU should be +saved into the given LWP's MD storage. .It Fn pcu_state_load load PCU state from the given LWP's MD storage to the current CPU. The .Ar flags -is a combination of the above general flags and one or more of -the following: -.Bl -tag -width PCU_LOADEDXXX -.It Dv PCU_RELOAD -Load registers into the PCU -.It Dv PCU_ENABLE -Enable the PCU -.It Dv PCU_LOADED -the current LWP has used this PCU before +is a combination of one or more of the following: +.Bl -tag -width PCU_VALIDXXX +.It Dv PCU_VALID +Indicates that the PCU state is considered valid and need not be initialized +This is a case if the PCU state was already used (and thus loaded) by the LWP +and has not been discarded since. +.It Dv PCU_REENABLE +Indicates that a fault reoccurred while the PCU state is loaded,
