CVS commit: src/lib/libm/noieee_src
Module Name:src
Committed By: martin
Date: Fri Nov 22 10:59:31 UTC 2013
Modified Files:
src/lib/libm/noieee_src: n_fmod.c
Log Message:
Fix stupid bug in previous (fixing fmodf)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/noieee_src/n_fmod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/noieee_src/n_fmod.c
diff -u src/lib/libm/noieee_src/n_fmod.c:1.6 src/lib/libm/noieee_src/n_fmod.c:1.7
--- src/lib/libm/noieee_src/n_fmod.c:1.6 Thu Nov 21 10:48:11 2013
+++ src/lib/libm/noieee_src/n_fmod.c Fri Nov 22 10:59:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: n_fmod.c,v 1.6 2013/11/21 10:48:11 martin Exp $ */
+/* $NetBSD: n_fmod.c,v 1.7 2013/11/22 10:59:31 martin Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -103,9 +103,9 @@ fmod(double x, double y)
}
float
-fmodf(float x)
+fmodf(float x, float y)
{
- return fmod(x);
+ return fmod(x, y);
}
#ifdef TEST_FMOD
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Fri Nov 22 11:13:54 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Fix /dev population of the evbarm images by using MAKEDEV -s and appending
to the mtree spec file passed to makefs.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.12 src/distrib/utils/embedded/conf/evbarm.conf:1.13
--- src/distrib/utils/embedded/conf/evbarm.conf:1.12 Fri Jul 5 15:45:17 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Fri Nov 22 11:13:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.12 2013/07/05 15:45:17 matt Exp $
+# $NetBSD: evbarm.conf,v 1.13 2013/11/22 11:13:54 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -124,7 +124,8 @@ EOF
exit 1
fi
echo ${bar} running MAKEDEV ${bar}
- (cd ${mnt}/dev ${HOST_SH} ${release}/dev/MAKEDEV all)
+ ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
+ $tmp/selected_sets
echo ${bar} creating directories ${bar}
mkdir ${mnt}/proc ${mnt}/kern
CVS commit: src/lib/libm
Module Name:src
Committed By: martin
Date: Fri Nov 22 13:37:24 UTC 2013
Modified Files:
src/lib/libm: Makefile
src/lib/libm/src: e_sqrtl.c
Log Message:
Try to fix the build (again): move e_sqrtl.c to common soure, but
move the include of fenv.h into the #ifdef __HAVE_LONG_DOUBLE block
and also provide a -DHAVE_FENV_H from the makefile for archs that have
it - leaving out exception settings on architectures that do not provide
it.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/lib/libm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/e_sqrtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.151 src/lib/libm/Makefile:1.152
--- src/lib/libm/Makefile:1.151 Thu Nov 21 11:21:54 2013
+++ src/lib/libm/Makefile Fri Nov 22 13:37:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2013/11/21 11:21:54 martin Exp $
+# $NetBSD: Makefile,v 1.152 2013/11/22 13:37:24 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -53,6 +53,7 @@ ARCH_SRCS = s_copysign.S s_copysignf.S l
.elif (${MACHINE_CPU} == arm)
.PATH: ${.CURDIR}/arch/arm
COMMON_SRCS+= fenv.c
+COPTS.e_sqrtl.c += -DHAVE_FENV_H
.if (${MKSOFTFLOAT} == no)
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
.else
@@ -63,11 +64,13 @@ ${i} ${i:.o=.po} ${i:.o=.pico} ${i:.o=.g
.elif (${MACHINE_ARCH} == sparc)
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
+COPTS.e_sqrtl.c += -DHAVE_FENV_H
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${MACHINE_ARCH} == sparc64)
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c s_nexttowardf.c \
- s_nearbyint.c s_rintl.c e_sqrtl.c
+ s_nearbyint.c s_rintl.c
+COPTS.e_sqrtl.c += -DHAVE_FENV_H
.ifndef _COMPAT_M32_MK_
COMMON_SRCS+= s_nexttoward.c
.endif
@@ -80,8 +83,9 @@ COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.PATH: ${.CURDIR}/arch/i387
COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
- s_nearbyint.c s_rintl.c e_sqrtl.c
+ s_nearbyint.c s_rintl.c
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
+COPTS.e_sqrtl.c += -DHAVE_FENV_H
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
e_logf.S e_log10.S e_log10f.S e_log2.S e_log2f.S e_remainder.S \
@@ -156,7 +160,7 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
e_j1.c e_j1f.c e_jn.c e_jnf.c e_lgamma_r.c e_lgammaf_r.c e_log.c \
e_log2.c e_log10.c e_log10f.c e_log2f.c e_logf.c e_pow.c e_powf.c \
e_rem_pio2.c e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c \
- e_scalbf.c e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c \
+ e_scalbf.c e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c e_sqrtl.c \
k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \
k_standard.c k_tan.c k_tanf.c \
ldbl_dummy.c \
Index: src/lib/libm/src/e_sqrtl.c
diff -u src/lib/libm/src/e_sqrtl.c:1.2 src/lib/libm/src/e_sqrtl.c:1.3
--- src/lib/libm/src/e_sqrtl.c:1.2 Wed Nov 20 21:12:30 2013
+++ src/lib/libm/src/e_sqrtl.c Fri Nov 22 13:37:24 2013
@@ -28,10 +28,9 @@
#if 0
__FBSDID($FreeBSD: head/lib/msun/src/e_sqrtl.c 176720 2008-03-02 01:47:58Z das $);
#endif
-__RCSID($NetBSD: e_sqrtl.c,v 1.2 2013/11/20 21:12:30 martin Exp $);
+__RCSID($NetBSD: e_sqrtl.c,v 1.3 2013/11/22 13:37:24 martin Exp $);
#include machine/ieee.h
-#include fenv.h
#include float.h
#include math.h
@@ -39,6 +38,10 @@ __RCSID($NetBSD: e_sqrtl.c,v 1.2 2013/1
#ifdef __HAVE_LONG_DOUBLE
+#ifdef HAVE_FENV_H
+#include fenv.h
+#endif
+
#ifdef LDBL_IMPLICIT_NBIT
#define LDBL_NBIT 0
#endif
@@ -84,7 +87,9 @@ __ieee754_sqrtl(long double x)
union ieee_ext_u ux = { .extu_ld = x, };
int k, r;
long double lo, xn;
+#ifdef HAVE_FENV_H
fenv_t env;
+#endif
/* If x = NaN, then sqrt(x) = NaN. */
/* If x = Inf, then sqrt(x) = Inf. */
@@ -100,7 +105,9 @@ __ieee754_sqrtl(long double x)
if (ux.extu_sign)
return ((x - x) / (x - x));
+#ifdef HAVE_FENV_H
feholdexcept(env);
+#endif
if (ux.extu_exp == 0) {
/* Adjust subnormal numbers. */
@@ -143,7 +150,9 @@ __ieee754_sqrtl(long double x)
if (!fetestexcept(FE_INEXACT)) { /* Quotient is exact. */
if (xn == ux.extu_ld) {
+#ifdef HAVE_FENV_H
fesetenv(env);
+#endif
return (ux.extu_ld);
}
/* Round correctly for inputs like x = y**2 - ulp. */
@@ -157,7 +166,9 @@ __ieee754_sqrtl(long double x)
xn = inc(xn); /* xn = xn + ulp. */
}
ux.extu_ld = ux.extu_ld + xn; /* Chopped sum. */
+#ifdef HAVE_FENV_H
feupdateenv(env); /* Restore env and raise inexact */
+#endif
ux.extu_exp--;
return (ux.extu_ld);
}
CVS import: src/external/bsd/nvi/dist
Module Name:src Committed By: christos Date: Fri Nov 22 14:55:22 UTC 2013 Update of /cvsroot/src/external/bsd/nvi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3870 Log Message: Import nvi-1.81.6 + HEAD-2013-11-20 from git://repo.or.cz/nvi.git Status: Vendor Tag: NVI Release Tags: nvi-20131120 N src/external/bsd/nvi/dist/README.1st N src/external/bsd/nvi/dist/Changes N src/external/bsd/nvi/dist/LICENSE N src/external/bsd/nvi/dist/README N src/external/bsd/nvi/dist/README.DB3 N src/external/bsd/nvi/dist/TODO N src/external/bsd/nvi/dist/build.unix/README.LynxOS N src/external/bsd/nvi/dist/build.unix/README N src/external/bsd/nvi/dist/build.unix/README.Solaris N src/external/bsd/nvi/dist/catalog/dutch.base N src/external/bsd/nvi/dist/catalog/Makefile N src/external/bsd/nvi/dist/catalog/README N src/external/bsd/nvi/dist/catalog/dump.c N src/external/bsd/nvi/dist/catalog/english.check N src/external/bsd/nvi/dist/catalog/dutch.owner N src/external/bsd/nvi/dist/catalog/english N src/external/bsd/nvi/dist/catalog/ru_SU.KOI8-R.base N src/external/bsd/nvi/dist/catalog/english.owner N src/external/bsd/nvi/dist/catalog/french.base N src/external/bsd/nvi/dist/catalog/german.base N src/external/bsd/nvi/dist/catalog/german.owner N src/external/bsd/nvi/dist/catalog/ru_SU.KOI8-R.owner N src/external/bsd/nvi/dist/catalog/spanish.base N src/external/bsd/nvi/dist/catalog/spell.ok N src/external/bsd/nvi/dist/catalog/swedish.base N src/external/bsd/nvi/dist/catalog/swedish.owner N src/external/bsd/nvi/dist/cl/README.signal N src/external/bsd/nvi/dist/cl/cl.h N src/external/bsd/nvi/dist/cl/cl_bsd.c N src/external/bsd/nvi/dist/cl/cl_funcs.c N src/external/bsd/nvi/dist/cl/cl_main.c N src/external/bsd/nvi/dist/cl/cl_read.c N src/external/bsd/nvi/dist/cl/cl_screen.c N src/external/bsd/nvi/dist/cl/cl_term.c N src/external/bsd/nvi/dist/clib/gethostname.c N src/external/bsd/nvi/dist/clib/bsearch.c N src/external/bsd/nvi/dist/clib/env.c N src/external/bsd/nvi/dist/clib/iswblank.c N src/external/bsd/nvi/dist/clib/memchr.c N src/external/bsd/nvi/dist/clib/memset.c N src/external/bsd/nvi/dist/clib/mkstemp.c N src/external/bsd/nvi/dist/clib/mmap.c N src/external/bsd/nvi/dist/clib/snprintf.c N src/external/bsd/nvi/dist/clib/strdup.c N src/external/bsd/nvi/dist/clib/strpbrk.c N src/external/bsd/nvi/dist/clib/strsep.c N src/external/bsd/nvi/dist/clib/strtol.c N src/external/bsd/nvi/dist/clib/strtoul.c N src/external/bsd/nvi/dist/clib/vsnprintf.c N src/external/bsd/nvi/dist/common/multibyte.h N src/external/bsd/nvi/dist/common/api.c N src/external/bsd/nvi/dist/common/args.h N src/external/bsd/nvi/dist/common/common.h N src/external/bsd/nvi/dist/common/conv.c N src/external/bsd/nvi/dist/common/conv.h N src/external/bsd/nvi/dist/common/cut.c N src/external/bsd/nvi/dist/common/cut.h N src/external/bsd/nvi/dist/common/delete.c N src/external/bsd/nvi/dist/common/dldb.c N src/external/bsd/nvi/dist/common/exf.c N src/external/bsd/nvi/dist/common/exf.h N src/external/bsd/nvi/dist/common/gs.c N src/external/bsd/nvi/dist/common/gs.h N src/external/bsd/nvi/dist/common/key.c N src/external/bsd/nvi/dist/common/key.h N src/external/bsd/nvi/dist/common/log.c N src/external/bsd/nvi/dist/common/log.h N src/external/bsd/nvi/dist/common/log1.c N src/external/bsd/nvi/dist/common/log4.c N src/external/bsd/nvi/dist/common/main.c N src/external/bsd/nvi/dist/common/mark.c N src/external/bsd/nvi/dist/common/mark.h N src/external/bsd/nvi/dist/common/mem.h N src/external/bsd/nvi/dist/common/msg.c N src/external/bsd/nvi/dist/common/msg.h N src/external/bsd/nvi/dist/common/nothread.c N src/external/bsd/nvi/dist/common/options.awk N src/external/bsd/nvi/dist/common/put.c N src/external/bsd/nvi/dist/common/options.c N src/external/bsd/nvi/dist/common/options.h N src/external/bsd/nvi/dist/common/options_f.c N src/external/bsd/nvi/dist/common/pthread.c N src/external/bsd/nvi/dist/common/recover.c N src/external/bsd/nvi/dist/common/screen.c N src/external/bsd/nvi/dist/common/screen.h N src/external/bsd/nvi/dist/common/search.c N src/external/bsd/nvi/dist/common/seq.c N src/external/bsd/nvi/dist/common/seq.h N src/external/bsd/nvi/dist/common/trace.c N src/external/bsd/nvi/dist/common/util.c N src/external/bsd/nvi/dist/common/util.h N src/external/bsd/nvi/dist/common/vi_db.c N src/external/bsd/nvi/dist/common/vi_db1.c N src/external/bsd/nvi/dist/common/util2.c N src/external/bsd/nvi/dist/common/vi.src N src/external/bsd/nvi/dist/common/vi_auto.c N src/external/bsd/nvi/dist/common/vi_auto.h N src/external/bsd/nvi/dist/common/vi_db.h N src/external/bsd/nvi/dist/common/vi_rec.c N src/external/bsd/nvi/dist/dist/Makefile.am N src/external/bsd/nvi/dist/dist/INSTALL N src/external/bsd/nvi/dist/dist/configure.in N src/external/bsd/nvi/dist/dist/compile N src/external/bsd/nvi/dist/dist/findconfig N src/external/bsd/nvi/dist/dist/depcomp N src/external/bsd/nvi/dist/dist/distrib N src/external/bsd/nvi/dist/dist/export N
CVS commit: src/usr.bin
Module Name:src Committed By: christos Date: Fri Nov 22 16:10:25 UTC 2013 Modified Files: src/usr.bin: Makefile Log Message: switch to the nv in external/bsd To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/usr.bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.213 src/usr.bin/Makefile:1.214 --- src/usr.bin/Makefile:1.213 Mon Feb 11 12:24:21 2013 +++ src/usr.bin/Makefile Fri Nov 22 11:10:25 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.213 2013/02/11 17:24:21 christos Exp $ +# $NetBSD: Makefile,v 1.214 2013/11/22 16:10:25 christos Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include bsd.own.mk @@ -18,7 +18,7 @@ SUBDIR= apply asa at audio audiocfg \ machine mail make man menuc mesg midiplay mixerctl mkcsmapper \ mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage moduli \ msgc msgs \ - nbperf netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \ + nbperf netgroup netstat newgrp newsyslog nfsstat nice nl nohup \ pagesize passwd paste patch pathchk pkill pmap pmc pr \ printenv printf progress pwhash qsubst quota radioctl rdist \ renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh \
CVS commit: src/external/bsd/nvi/catalog
Module Name:src
Committed By: christos
Date: Fri Nov 22 16:11:08 UTC 2013
Modified Files:
src/external/bsd/nvi/catalog: Makefile
Log Message:
don't install an empty file
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/catalog/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/bsd/nvi/catalog/Makefile
diff -u src/external/bsd/nvi/catalog/Makefile:1.1 src/external/bsd/nvi/catalog/Makefile:1.2
--- src/external/bsd/nvi/catalog/Makefile:1.1 Fri Nov 22 11:00:45 2013
+++ src/external/bsd/nvi/catalog/Makefile Fri Nov 22 11:11:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/22 16:11:08 christos Exp $
#
# @(#)Makefile 8.29 (Berkeley) 10/19/96
@@ -8,8 +8,7 @@ NOMAN= # defined
.PATH: ${DIST}/catalog
-CATALOG= dutch english french german ru_RU.KOI8-R ru_SU.KOI8-R \
- spanish swedish
+CATALOG= dutch english french german ru_RU.KOI8-R spanish swedish
VI_FILES= ${DIST}/cl/*.c ${DIST}/common/*.c \
${DIST}/ex/*.c ${DIST}/vi/*.c
CVS commit: src/external/bsd
Module Name:src Committed By: christos Date: Fri Nov 22 16:10:04 UTC 2013 Modified Files: src/external/bsd: Makefile Log Message: switch to new nvi To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/external/bsd/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/bsd/Makefile diff -u src/external/bsd/Makefile:1.43 src/external/bsd/Makefile:1.44 --- src/external/bsd/Makefile:1.43 Sat Apr 27 20:14:14 2013 +++ src/external/bsd/Makefile Fri Nov 22 11:10:04 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/04/28 00:14:14 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2013/11/22 16:10:04 christos Exp $ .include bsd.own.mk @@ -35,6 +35,6 @@ SUBDIR+= llvm SUBDIR+= pcc .endif -SUBDIR+= pdisk dhcp +SUBDIR+= pdisk dhcp nvi .include bsd.subdir.mk
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Fri Nov 22 16:25:02 UTC 2013
Modified Files:
src/include: mpool.h
Log Message:
use a TAILQ instead of a CIRCLEQ, from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/include/mpool.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/mpool.h
diff -u src/include/mpool.h:1.13 src/include/mpool.h:1.14
--- src/include/mpool.h:1.13 Tue Aug 26 17:18:38 2008
+++ src/include/mpool.h Fri Nov 22 11:25:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpool.h,v 1.13 2008/08/26 21:18:38 joerg Exp $ */
+/* $NetBSD: mpool.h,v 1.14 2013/11/22 16:25:01 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -49,8 +49,8 @@
/* The BKT structures are the elements of the queues. */
typedef struct _bkt {
- CIRCLEQ_ENTRY(_bkt) hq; /* hash queue */
- CIRCLEQ_ENTRY(_bkt) q; /* lru queue */
+ TAILQ_ENTRY(_bkt) hq; /* hash queue */
+ TAILQ_ENTRY(_bkt) q; /* lru queue */
void*page; /* page */
pgno_t pgno; /* page number */
@@ -60,9 +60,9 @@ typedef struct _bkt {
} BKT;
typedef struct MPOOL {
- CIRCLEQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */
+ TAILQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */
/* hash queue array */
- CIRCLEQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
+ TAILQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
pgno_t curcache; /* current number of cached pages */
pgno_t maxcache; /* max number of cached pages */
pgno_t npages; /* number of pages in the file */
CVS commit: src/lib/libc/db/mpool
Module Name:src
Committed By: christos
Date: Fri Nov 22 16:25:51 UTC 2013
Modified Files:
src/lib/libc/db/mpool: mpool.c
Log Message:
switch from circleq to tailq, from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/db/mpool/mpool.c
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/db/mpool/mpool.c
diff -u src/lib/libc/db/mpool/mpool.c:1.19 src/lib/libc/db/mpool/mpool.c:1.20
--- src/lib/libc/db/mpool/mpool.c:1.19 Wed Apr 22 14:44:06 2009
+++ src/lib/libc/db/mpool/mpool.c Fri Nov 22 11:25:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpool.c,v 1.19 2009/04/22 18:44:06 christos Exp $ */
+/* $NetBSD: mpool.c,v 1.20 2013/11/22 16:25:51 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mpool.c,v 1.19 2009/04/22 18:44:06 christos Exp $);
+__RCSID($NetBSD: mpool.c,v 1.20 2013/11/22 16:25:51 christos Exp $);
#include namespace.h
#include sys/queue.h
@@ -93,9 +93,9 @@ mpool_open(void *key, int fd, pgno_t pag
/* Allocate and initialize the MPOOL cookie. */
if ((mp = (MPOOL *)calloc(1, sizeof(MPOOL))) == NULL)
return (NULL);
- CIRCLEQ_INIT(mp-lqh);
+ TAILQ_INIT(mp-lqh);
for (entry = 0; entry HASHSIZE; ++entry)
- CIRCLEQ_INIT(mp-hqh[entry]);
+ TAILQ_INIT(mp-hqh[entry]);
mp-maxcache = maxcache;
mp-npages = (pgno_t)(sb.st_size / pagesize);
mp-pagesize = pagesize;
@@ -144,8 +144,8 @@ mpool_new( MPOOL *mp, pgno_t *pgnoaddr)
bp-flags = MPOOL_PINNED;
head = mp-hqh[HASHKEY(bp-pgno)];
- CIRCLEQ_INSERT_HEAD(head, bp, hq);
- CIRCLEQ_INSERT_TAIL(mp-lqh, bp, q);
+ TAILQ_INSERT_HEAD(head, bp, hq);
+ TAILQ_INSERT_TAIL(mp-lqh, bp, q);
return (bp-page);
}
@@ -186,10 +186,10 @@ mpool_get(MPOOL *mp, pgno_t pgno, u_int
* of the lru chain.
*/
head = mp-hqh[HASHKEY(bp-pgno)];
- CIRCLEQ_REMOVE(head, bp, hq);
- CIRCLEQ_INSERT_HEAD(head, bp, hq);
- CIRCLEQ_REMOVE(mp-lqh, bp, q);
- CIRCLEQ_INSERT_TAIL(mp-lqh, bp, q);
+ TAILQ_REMOVE(head, bp, hq);
+ TAILQ_INSERT_HEAD(head, bp, hq);
+ TAILQ_REMOVE(mp-lqh, bp, q);
+ TAILQ_INSERT_TAIL(mp-lqh, bp, q);
/* Return a pinned page. */
bp-flags |= MPOOL_PINNED;
@@ -220,8 +220,8 @@ mpool_get(MPOOL *mp, pgno_t pgno, u_int
* of the lru chain.
*/
head = mp-hqh[HASHKEY(bp-pgno)];
- CIRCLEQ_INSERT_HEAD(head, bp, hq);
- CIRCLEQ_INSERT_TAIL(mp-lqh, bp, q);
+ TAILQ_INSERT_HEAD(head, bp, hq);
+ TAILQ_INSERT_TAIL(mp-lqh, bp, q);
/* Run through the user's filter. */
if (mp-pgin != NULL)
@@ -266,8 +266,9 @@ mpool_close(MPOOL *mp)
BKT *bp;
/* Free up any space allocated to the lru pages. */
- while ((bp = mp-lqh.cqh_first) != (void *)mp-lqh) {
- CIRCLEQ_REMOVE(mp-lqh, mp-lqh.cqh_first, q);
+ while (!TAILQ_EMPTY(mp-lqh)) {
+ bp = TAILQ_FIRST(mp-lqh);
+ TAILQ_REMOVE(mp-lqh, bp, q);
free(bp);
}
@@ -286,8 +287,7 @@ mpool_sync(MPOOL *mp)
BKT *bp;
/* Walk the lru chain, flushing any dirty pages to disk. */
- for (bp = mp-lqh.cqh_first;
- bp != (void *)mp-lqh; bp = bp-q.cqe_next)
+ TAILQ_FOREACH(bp, mp-lqh, q)
if (bp-flags MPOOL_DIRTY
mpool_write(mp, bp) == RET_ERROR)
return (RET_ERROR);
@@ -316,8 +316,7 @@ mpool_bkt(MPOOL *mp)
* off any lists. If we don't find anything we grow the cache anyway.
* The cache never shrinks.
*/
- for (bp = mp-lqh.cqh_first;
- bp != (void *)mp-lqh; bp = bp-q.cqe_next)
+ TAILQ_FOREACH(bp, mp-lqh, q)
if (!(bp-flags MPOOL_PINNED)) {
/* Flush if dirty. */
if (bp-flags MPOOL_DIRTY
@@ -328,8 +327,8 @@ mpool_bkt(MPOOL *mp)
#endif
/* Remove from the hash and lru queues. */
head = mp-hqh[HASHKEY(bp-pgno)];
- CIRCLEQ_REMOVE(head, bp, hq);
- CIRCLEQ_REMOVE(mp-lqh, bp, q);
+ TAILQ_REMOVE(head, bp, hq);
+ TAILQ_REMOVE(mp-lqh, bp, q);
#ifdef DEBUG
{
void *spage = bp-page;
@@ -399,7 +398,7 @@ mpool_look(MPOOL *mp, pgno_t pgno)
BKT *bp;
head = mp-hqh[HASHKEY(pgno)];
- for (bp = head-cqh_first; bp != (void *)head; bp = bp-hq.cqe_next)
+ TAILQ_FOREACH(bp, head, hq)
if (bp-pgno == pgno) {
#ifdef STATISTICS
++mp-cachehit;
@@ -443,8 +442,7 @@ mpool_stat(mp)
sep = ;
cnt = 0;
- for (bp = mp-lqh.cqh_first;
- bp != (void *)mp-lqh; bp = bp-q.cqe_next) {
+ TAILQ_FOREACH(bp, mp-lqh, q) {
(void)fprintf(stderr, %s%d, sep, bp-pgno);
if (bp-flags MPOOL_DIRTY)
(void)fprintf(stderr, d);
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Nov 22 16:26:52 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new nvi To generate a diff of this commit: cvs rdiff -u -r1.1063 -r1.1064 src/doc/3RDPARTY cvs rdiff -u -r1.1861 -r1.1862 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1063 src/doc/3RDPARTY:1.1064 --- src/doc/3RDPARTY:1.1063 Sat Nov 16 11:19:09 2013 +++ src/doc/3RDPARTY Fri Nov 22 11:26:52 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1063 2013/11/16 16:19:09 alnsn Exp $ +# $NetBSD: 3RDPARTY,v 1.1064 2013/11/22 16:26:52 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -839,11 +839,11 @@ Notes: See /usr/src/dist/ntp/ntp2netbsd for update instructions. Package: nvi -Version: 1.81.6 +Version: 1.81.6, HEAD as of 2013-11-20 Current Vers: 1.81.6 Maintainer: Keith Bostic bos...@bsdi.com -Archive Site: ftp://ftp.bostic.com/pub/ -Home Page: http://www.bostic.com/vi/ +Archive Site: git://repo.or.cz/nvi.git, ftp://ftp.bostic.com/pub/ +Home Page: https://repo.or.cz/w/nvi.git http://www.bostic.com/vi/ Mailing List: Responsible: aymeric, christos License: BSD (3/4-clause) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1861 src/doc/CHANGES:1.1862 --- src/doc/CHANGES:1.1861 Tue Nov 12 17:19:57 2013 +++ src/doc/CHANGES Fri Nov 22 11:26:52 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1861 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1862 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -304,3 +304,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: OpenSSH: Imported 6.4 [christos 20131108] zless(1): Added via lastest version of zmore(1) from OpenBSD [pettai 20131112] + nvi(1): Upgrade to the latest git source [christos 20131122]
CVS commit: src/lib/libc/softfloat/bits64
Module Name:src Committed By: martin Date: Fri Nov 22 17:04:24 UTC 2013 Modified Files: src/lib/libc/softfloat/bits64: softfloat.c Log Message: Fix a cast from the lint cleanup that made small exponents (i.e. values 1) sign extend wrong and overflow, causing an underflow in all 128 bit sqrt calculations. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/softfloat/bits64/softfloat.c 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/softfloat/bits64/softfloat.c diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.12 src/lib/libc/softfloat/bits64/softfloat.c:1.13 --- src/lib/libc/softfloat/bits64/softfloat.c:1.12 Thu Jan 10 08:16:11 2013 +++ src/lib/libc/softfloat/bits64/softfloat.c Fri Nov 22 17:04:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: softfloat.c,v 1.12 2013/01/10 08:16:11 matt Exp $ */ +/* $NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $ */ /* * This version hacked for use with gcc -msoft-float by bjh21. @@ -46,7 +46,7 @@ this code that are retained. #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: softfloat.c,v 1.12 2013/01/10 08:16:11 matt Exp $); +__RCSID($NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $); #endif /* LIBC_SCCS and not lint */ #ifdef SOFTFLOAT_FOR_GCC @@ -5261,7 +5261,7 @@ float128 float128_sqrt( float128 a ) if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( 0, 0, 0, 0 ); normalizeFloat128Subnormal( aSig0, aSig1, aExp, aSig0, aSig1 ); } -zExp = ( (unsigned int)(aExp - 0x3FFF) 1) + 0x3FFE; +zExp = (int32) ( (aExp - 0x3FFF) 1) + 0x3FFE; aSig0 |= LIT64( 0x0001 ); zSig0 = estimateSqrt32((int16)aExp, (bits32)(aSig017)); shortShift128Left( aSig0, aSig1, 13 - ( aExp 1 ), aSig0, aSig1 );
CVS commit: src/external/bsd/nvi/dist/catalog
Module Name:src Committed By: christos Date: Fri Nov 22 17:16:05 UTC 2013 Removed Files: src/external/bsd/nvi/dist/catalog: english.base Log Message: english.base is auto-generated To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/bsd/nvi/dist/catalog/english.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Fri Nov 22 17:19:14 UTC 2013
Modified Files:
src/tests/lib/libm: t_sqrt.c
Log Message:
Adjust expected epsilon for sqrtl - powl comparisions for defects in
powl (which actually is pow for now)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_sqrt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_sqrt.c
diff -u src/tests/lib/libm/t_sqrt.c:1.4 src/tests/lib/libm/t_sqrt.c:1.5
--- src/tests/lib/libm/t_sqrt.c:1.4 Tue Nov 19 19:24:33 2013
+++ src/tests/lib/libm/t_sqrt.c Fri Nov 22 17:19:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sqrt.c,v 1.4 2013/11/19 19:24:33 joerg Exp $ */
+/* $NetBSD: t_sqrt.c,v 1.5 2013/11/22 17:19:14 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,10 +29,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_sqrt.c,v 1.4 2013/11/19 19:24:33 joerg Exp $);
+__RCSID($NetBSD: t_sqrt.c,v 1.5 2013/11/22 17:19:14 martin Exp $);
#include atf-c.h
#include math.h
+#include float.h
#include stdio.h
/*
@@ -288,7 +289,7 @@ ATF_TC_BODY(sqrtl_powl, tc)
{
#ifndef __vax__
const long double x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, . };
- const long double eps = 1.0e-30;
+ const long double eps = 5.0*DBL_EPSILON; /* XXX powl == pow for now */
volatile long double y, z;
size_t i;
CVS commit: xsrc/external/mit/xsetroot/dist/man
Module Name:xsrc Committed By: wiz Date: Fri Nov 22 17:39:51 UTC 2013 Modified Files: xsrc/external/mit/xsetroot/dist/man: xsetroot.man Log Message: Fix typo, reported by Henning Petersen in PR 48396. (already fixed upstream in a bigger commit) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xsetroot/dist/man/xsetroot.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xsetroot/dist/man/xsetroot.man diff -u xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.1.1.1 xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.2 --- xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.1.1.1 Fri May 31 07:51:29 2013 +++ xsrc/external/mit/xsetroot/dist/man/xsetroot.man Fri Nov 22 17:39:51 2013 @@ -58,7 +58,7 @@ Only one of the background color/tiling The various options are as follows: .IP \fB-help\fP Print a usage message and exit. -.IP \fB-verson\fP +.IP \fB-version\fP Print a version message and exit. .IP \fB-def\fP Reset unspecified attributes to the default values. (Restores the background
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Fri Nov 22 18:42:02 UTC 2013
Modified Files:
src/usr.sbin/npf/npfctl: npf_show.c
Log Message:
npfctl: need to rewind the list after calling print_table(). XXX libnpf.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npfctl/npf_show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_show.c
diff -u src/usr.sbin/npf/npfctl/npf_show.c:1.7 src/usr.sbin/npf/npfctl/npf_show.c:1.8
--- src/usr.sbin/npf/npfctl/npf_show.c:1.7 Fri Nov 22 00:25:51 2013
+++ src/usr.sbin/npf/npfctl/npf_show.c Fri Nov 22 18:42:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_show.c,v 1.7 2013/11/22 00:25:51 rmind Exp $ */
+/* $NetBSD: npf_show.c,v 1.8 2013/11/22 18:42:02 rmind Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_show.c,v 1.7 2013/11/22 00:25:51 rmind Exp $);
+__RCSID($NetBSD: npf_show.c,v 1.8 2013/11/22 18:42:02 rmind Exp $);
#include sys/socket.h
#include netinet/in.h
@@ -155,15 +155,16 @@ print_table(npf_conf_info_t *ctx, const
{
unsigned tid = words[0];
nl_table_t *tl;
- char *p;
+ char *p = NULL;
+ /* XXX: Iterating all as we need to rewind for the next call. */
while ((tl = npf_table_iterate(ctx-conf)) != NULL) {
- if (npf_table_getid(tl) == tid) {
+ if (!p npf_table_getid(tl) == tid) {
easprintf(p, %s, npf_table_getname(tl));
- return p;
}
}
- abort();
+ assert(p != NULL);
+ return p;
}
static char *
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: riz Date: Fri Nov 22 18:55:42 UTC 2013 Modified Files: src/sys/dev/raidframe: rf_evenodd_dagfuncs.c Log Message: Move two RF_ASSERT()s into the protection of RAID_DIAGNOSTIC to avoid a case where we get undeclared variables. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/raidframe/rf_evenodd_dagfuncs.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/raidframe/rf_evenodd_dagfuncs.c diff -u src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.20 src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.21 --- src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.20 Sat Mar 14 15:36:20 2009 +++ src/sys/dev/raidframe/rf_evenodd_dagfuncs.c Fri Nov 22 18:55:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.20 2009/03/14 15:36:20 dsl Exp $ */ +/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.21 2013/11/22 18:55:42 riz Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rf_evenodd_dagfuncs.c,v 1.20 2009/03/14 15:36:20 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: rf_evenodd_dagfuncs.c,v 1.21 2013/11/22 18:55:42 riz Exp $); #include rf_archs.h @@ -114,10 +114,10 @@ rf_RegularONEFunc(RF_DagNode_t *node) RF_PhysDiskAddr_t *EPDA = (RF_PhysDiskAddr_t *) node-params[EpdaIndex].p; int ESUOffset = rf_StripeUnitOffset(layoutPtr, EPDA-startSector); -#endif /* RAID_DIAGNOSTIC */ RF_ASSERT(EPDA-type == RF_PDA_TYPE_Q); RF_ASSERT(ESUOffset == 0); +#endif /* RAID_DIAGNOSTIC */ RF_ETIMER_START(timer);
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: riz Date: Fri Nov 22 18:56:27 UTC 2013 Modified Files: src/sys/dev/raidframe: rf_parityloggingdags.c Log Message: Remove RAID_DIAGNOSTIC around a variable and mark __unused instead. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/raidframe/rf_parityloggingdags.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/raidframe/rf_parityloggingdags.c diff -u src/sys/dev/raidframe/rf_parityloggingdags.c:1.19 src/sys/dev/raidframe/rf_parityloggingdags.c:1.20 --- src/sys/dev/raidframe/rf_parityloggingdags.c:1.19 Tue Nov 18 14:29:55 2008 +++ src/sys/dev/raidframe/rf_parityloggingdags.c Fri Nov 22 18:56:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_parityloggingdags.c,v 1.19 2008/11/18 14:29:55 ad Exp $ */ +/* $NetBSD: rf_parityloggingdags.c,v 1.20 2013/11/22 18:56:27 riz Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rf_parityloggingdags.c,v 1.19 2008/11/18 14:29:55 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: rf_parityloggingdags.c,v 1.20 2013/11/22 18:56:27 riz Exp $); #ifdef _KERNEL_OPT #include opt_raid_diagnostic.h @@ -342,9 +342,7 @@ rf_CommonCreateParityLoggingSmallWriteDA int (*qfunc) (RF_DagNode_t * node); const char *name, *qname; RF_StripeNum_t parityStripeID = rf_RaidAddressToParityStripeID((raidPtr-Layout), asmap-raidAddress, which_ru); -#ifdef RAID_DIAGNOSTIC - longnfaults = qfuncs ? 2 : 1; -#endif /* RAID_DIAGNOSTIC */ + longnfaults __unused = qfuncs ? 2 : 1; if (rf_dagDebug) printf([Creating parity-logging small-write DAG]\n);
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riz Date: Fri Nov 22 18:58:01 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Comment out npf for now, as we can't have both NPF and PF in the same kernel - rmind has said he'll address this eventually, and for now PF is more likely to have unnoticed breakage. ALL now builds again! To generate a diff of this commit: cvs rdiff -u -r1.364 -r1.365 src/sys/arch/i386/conf/ALL 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.364 src/sys/arch/i386/conf/ALL:1.365 --- src/sys/arch/i386/conf/ALL:1.364 Sat Oct 26 09:16:20 2013 +++ src/sys/arch/i386/conf/ALL Fri Nov 22 18:58:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.364 2013/10/26 09:16:20 nonaka Exp $ +# $NetBSD: ALL,v 1.365 2013/11/22 18:58:01 riz Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.364 $ +#ident ALL-$Revision: 1.365 $ maxusers 64 # estimated number of users @@ -1719,7 +1719,7 @@ pseudo-device agr # IEEE 802.3ad link pseudo-device pf # PF packet filter pseudo-device pflog # PF log if pseudo-device pfsync # PF sync if -pseudo-device npf # NPF packet filter +#pseudo-device npf # NPF packet filter pseudo-device kttcp pseudo-device etherip # EtherIP # srt is EXPERIMENTAL
CVS commit: src/external/bsd/nvi/dist
Module Name:src
Committed By: martin
Date: Fri Nov 22 19:59:36 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/ip: ip_read.c
src/external/bsd/nvi/dist/ipc: ip_run.c
Log Message:
Quell warnings from gcc 4.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/ip/ip_read.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/ipc/ip_run.c
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/nvi/dist/ip/ip_read.c
diff -u src/external/bsd/nvi/dist/ip/ip_read.c:1.2 src/external/bsd/nvi/dist/ip/ip_read.c:1.3
--- src/external/bsd/nvi/dist/ip/ip_read.c:1.2 Fri Nov 22 15:52:05 2013
+++ src/external/bsd/nvi/dist/ip/ip_read.c Fri Nov 22 19:59:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_read.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: ip_read.c,v 1.3 2013/11/22 19:59:36 martin Exp $ */
/*-
* Copyright (c) 1996
* Keith Bostic. All rights reserved.
@@ -140,7 +140,7 @@ ip_wevent(WIN *wp, SCR *sp, EVENT *evp,
IP_PRIVATE *ipp;
struct timeval t, *tp;
int termread;
- int nr;
+ int nr = 0;
if (LF_ISSET(EC_INTERRUPT)) { /* XXX */
evp-e_event = E_TIMEOUT;
Index: src/external/bsd/nvi/dist/ipc/ip_run.c
diff -u src/external/bsd/nvi/dist/ipc/ip_run.c:1.2 src/external/bsd/nvi/dist/ipc/ip_run.c:1.3
--- src/external/bsd/nvi/dist/ipc/ip_run.c:1.2 Fri Nov 22 15:52:05 2013
+++ src/external/bsd/nvi/dist/ipc/ip_run.c Fri Nov 22 19:59:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_run.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: ip_run.c,v 1.3 2013/11/22 19:59:36 martin Exp $ */
/*-
* Copyright (c) 1996
* Rob Zimmermann. All rights reserved.
@@ -212,7 +212,7 @@ channel(int rpipe[2], int wpipe[2])
static void
arg_format(char *execp, int *argcp, char **argvp[], int i_fd, int o_fd)
{
- char *iarg, **largv, *p, **p_av, **t_av;
+ char *iarg, **largv = NULL /* XXX gcc */, *p, **p_av, **t_av;
/* Get space for the argument array and the -I argument. */
if ((iarg = malloc(64)) == NULL ||
CVS commit: src/lib/libm/src
Module Name:src
Committed By: martin
Date: Fri Nov 22 20:15:06 UTC 2013
Modified Files:
src/lib/libm/src: e_sqrtl.c
Log Message:
For the non-fenv archs: just use double - punt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/e_sqrtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/e_sqrtl.c
diff -u src/lib/libm/src/e_sqrtl.c:1.3 src/lib/libm/src/e_sqrtl.c:1.4
--- src/lib/libm/src/e_sqrtl.c:1.3 Fri Nov 22 13:37:24 2013
+++ src/lib/libm/src/e_sqrtl.c Fri Nov 22 20:15:06 2013
@@ -28,7 +28,7 @@
#if 0
__FBSDID($FreeBSD: head/lib/msun/src/e_sqrtl.c 176720 2008-03-02 01:47:58Z das $);
#endif
-__RCSID($NetBSD: e_sqrtl.c,v 1.3 2013/11/22 13:37:24 martin Exp $);
+__RCSID($NetBSD: e_sqrtl.c,v 1.4 2013/11/22 20:15:06 martin Exp $);
#include machine/ieee.h
#include float.h
@@ -46,6 +46,8 @@ __RCSID($NetBSD: e_sqrtl.c,v 1.3 2013/1
#define LDBL_NBIT 0
#endif
+#ifdef HAVE_FENV_H
+
/* Return (x + ulp) for normal positive x. Assumes no overflow. */
static inline long double
inc(long double x)
@@ -87,9 +89,7 @@ __ieee754_sqrtl(long double x)
union ieee_ext_u ux = { .extu_ld = x, };
int k, r;
long double lo, xn;
-#ifdef HAVE_FENV_H
fenv_t env;
-#endif
/* If x = NaN, then sqrt(x) = NaN. */
/* If x = Inf, then sqrt(x) = Inf. */
@@ -105,9 +105,7 @@ __ieee754_sqrtl(long double x)
if (ux.extu_sign)
return ((x - x) / (x - x));
-#ifdef HAVE_FENV_H
feholdexcept(env);
-#endif
if (ux.extu_exp == 0) {
/* Adjust subnormal numbers. */
@@ -150,9 +148,7 @@ __ieee754_sqrtl(long double x)
if (!fetestexcept(FE_INEXACT)) { /* Quotient is exact. */
if (xn == ux.extu_ld) {
-#ifdef HAVE_FENV_H
fesetenv(env);
-#endif
return (ux.extu_ld);
}
/* Round correctly for inputs like x = y**2 - ulp. */
@@ -166,11 +162,23 @@ __ieee754_sqrtl(long double x)
xn = inc(xn); /* xn = xn + ulp. */
}
ux.extu_ld = ux.extu_ld + xn; /* Chopped sum. */
-#ifdef HAVE_FENV_H
feupdateenv(env); /* Restore env and raise inexact */
-#endif
ux.extu_exp--;
return (ux.extu_ld);
}
+#else
+
+/*
+ * No fenv support:
+ * poor man's version: just use double
+ */
+long double
+__ieee754_sqrtl(long double x)
+{
+ return __ieee754_sqrt((double)x);
+}
+
+#endif
+
#endif
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Fri Nov 22 21:04:11 UTC 2013
Modified Files:
src/sys/kern: kern_exec.c kern_fork.c kern_hook.c kern_lwp.c kern_sig.c
subr_vmem.c
src/sys/sys: siginfo.h signalvar.h vmem_impl.h
Log Message:
convert vmem, signals, powerhooks from CIRCLEQ - TAILQ.
To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.192 -r1.193 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/kern_hook.c
cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.318 -r1.319 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.86 -r1.87 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/siginfo.h
cvs rdiff -u -r1.83 -r1.84 src/sys/sys/signalvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/vmem_impl.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.365 src/sys/kern/kern_exec.c:1.366
--- src/sys/kern/kern_exec.c:1.365 Thu Nov 14 11:53:51 2013
+++ src/sys/kern/kern_exec.c Fri Nov 22 16:04:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.365 2013/11/14 16:53:51 martin Exp $ */
+/* $NetBSD: kern_exec.c,v 1.366 2013/11/22 21:04:11 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.365 2013/11/14 16:53:51 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.366 2013/11/22 21:04:11 christos Exp $);
#include opt_exec.h
#include opt_execfmt.h
@@ -2226,7 +2226,7 @@ do_posix_spawn(struct lwp *l1, pid_t *pi
(unsigned) ((char *)p2-p_endcopy - (char *)p2-p_startcopy));
p2-p_vmspace = proc0.p_vmspace;
- CIRCLEQ_INIT(p2-p_sigpend.sp_info);
+ TAILQ_INIT(p2-p_sigpend.sp_info);
LIST_INIT(p2-p_lwps);
LIST_INIT(p2-p_sigwaiters);
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.192 src/sys/kern/kern_fork.c:1.193
--- src/sys/kern/kern_fork.c:1.192 Sat Jun 8 21:13:47 2013
+++ src/sys/kern/kern_fork.c Fri Nov 22 16:04:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.192 2013/06/09 01:13:47 riz Exp $ */
+/* $NetBSD: kern_fork.c,v 1.193 2013/11/22 21:04:11 christos Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.192 2013/06/09 01:13:47 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.193 2013/11/22 21:04:11 christos Exp $);
#include opt_ktrace.h
@@ -291,7 +291,7 @@ fork1(struct lwp *l1, int flags, int exi
memcpy(p2-p_startcopy, p1-p_startcopy,
(unsigned) ((char *)p2-p_endcopy - (char *)p2-p_startcopy));
- CIRCLEQ_INIT(p2-p_sigpend.sp_info);
+ TAILQ_INIT(p2-p_sigpend.sp_info);
LIST_INIT(p2-p_lwps);
LIST_INIT(p2-p_sigwaiters);
Index: src/sys/kern/kern_hook.c
diff -u src/sys/kern/kern_hook.c:1.5 src/sys/kern/kern_hook.c:1.6
--- src/sys/kern/kern_hook.c:1.5 Sat Oct 27 13:18:39 2012
+++ src/sys/kern/kern_hook.c Fri Nov 22 16:04:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_hook.c,v 1.5 2012/10/27 17:18:39 chs Exp $ */
+/* $NetBSD: kern_hook.c,v 1.6 2013/11/22 21:04:11 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_hook.c,v 1.5 2012/10/27 17:18:39 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_hook.c,v 1.6 2013/11/22 21:04:11 christos Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -314,14 +314,14 @@ docritpollhooks(void)
* registration order, when powering up in registration order.
*/
struct powerhook_desc {
- CIRCLEQ_ENTRY(powerhook_desc) sfd_list;
+ TAILQ_ENTRY(powerhook_desc) sfd_list;
void (*sfd_fn)(int, void *);
void *sfd_arg;
char sfd_name[16];
};
-static CIRCLEQ_HEAD(, powerhook_desc) powerhook_list =
-CIRCLEQ_HEAD_INITIALIZER(powerhook_list);
+static TAILQ_HEAD(powerhook_head, powerhook_desc) powerhook_list =
+TAILQ_HEAD_INITIALIZER(powerhook_list);
void *
powerhook_establish(const char *name, void (*fn)(int, void *), void *arg)
@@ -336,7 +336,7 @@ powerhook_establish(const char *name, vo
ndp-sfd_fn = fn;
ndp-sfd_arg = arg;
strlcpy(ndp-sfd_name, name, sizeof(ndp-sfd_name));
- CIRCLEQ_INSERT_HEAD(powerhook_list, ndp, sfd_list);
+ TAILQ_INSERT_HEAD(powerhook_list, ndp, sfd_list);
aprint_error(%s: WARNING: powerhook_establish is deprecated\n, name);
return (ndp);
@@ -348,14 +348,14 @@ powerhook_disestablish(void *vhook)
#ifdef DIAGNOSTIC
struct powerhook_desc *dp;
- CIRCLEQ_FOREACH(dp, powerhook_list, sfd_list)
+ TAILQ_FOREACH(dp, powerhook_list, sfd_list)
if (dp == vhook)
goto found;
panic(powerhook_disestablish: hook %p not established, vhook);
found:
#endif
- CIRCLEQ_REMOVE(powerhook_list, (struct powerhook_desc
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: christos
Date: Fri Nov 22 21:56:24 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: signals.c
Log Message:
we now use TAILQ
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpkern/signals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/signals.c
diff -u src/sys/rump/librump/rumpkern/signals.c:1.11 src/sys/rump/librump/rumpkern/signals.c:1.12
--- src/sys/rump/librump/rumpkern/signals.c:1.11 Mon Apr 29 20:03:53 2013
+++ src/sys/rump/librump/rumpkern/signals.c Fri Nov 22 16:56:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: signals.c,v 1.11 2013/04/30 00:03:53 pooka Exp $ */
+/* $NetBSD: signals.c,v 1.12 2013/11/22 21:56:24 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.11 2013/04/30 00:03:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.12 2013/11/22 21:56:24 christos Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -234,7 +234,7 @@ void
ksiginfo_queue_drain0(ksiginfoq_t *kq)
{
- if (!(CIRCLEQ_EMPTY(kq)))
+ if (!(TAILQ_EMPTY(kq)))
panic(how did that get there?);
}
