PERFORCE change 136261 for review
Warner Losh
imp at FreeBSD.org
Tue Feb 26 15:36:17 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=136261
Change 136261 by imp at imp_paco-paco on 2008/02/26 15:35:39
IFC @136255
Affected files ...
.. //depot/projects/arm/src/Makefile.inc1#34 integrate
.. //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#5 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ar/Makefile#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#10 integrate
.. //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#5 integrate
.. //depot/projects/arm/src/lib/msun/src/e_rem_pio2.c#3 integrate
.. //depot/projects/arm/src/lib/msun/src/e_rem_pio2f.c#3 integrate
.. //depot/projects/arm/src/lib/msun/src/k_rem_pio2.c#3 integrate
.. //depot/projects/arm/src/lib/msun/src/math_private.h#3 integrate
.. //depot/projects/arm/src/lib/msun/src/s_cosf.c#3 integrate
.. //depot/projects/arm/src/lib/msun/src/s_sinf.c#3 integrate
.. //depot/projects/arm/src/lib/msun/src/s_tanf.c#3 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/pass1.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/pass2.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/setup.c#3 integrate
.. //depot/projects/arm/src/sbin/ping6/ping6.c#5 integrate
.. //depot/projects/arm/src/share/man/man9/VOP_LOCK.9#3 integrate
.. //depot/projects/arm/src/share/man/man9/lock.9#7 integrate
.. //depot/projects/arm/src/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#26 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#25 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#57 integrate
.. //depot/projects/arm/src/sys/conf/files#82 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#9 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#11 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/arm/src/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete
.. //depot/projects/arm/src/sys/fs/coda/TODO#3 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#22 integrate
.. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate
.. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#12 integrate
.. //depot/projects/arm/src/sys/fs/nullfs/null_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#8 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#12 integrate
.. //depot/projects/arm/src/sys/i386/i386/identcpu.c#24 integrate
.. //depot/projects/arm/src/sys/i386/i386/initcpu.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_lock.c#14 integrate
.. //depot/projects/arm/src/sys/kern/vfs_cache.c#12 integrate
.. //depot/projects/arm/src/sys/kern/vfs_default.c#14 integrate
.. //depot/projects/arm/src/sys/kern/vfs_lookup.c#21 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#40 integrate
.. //depot/projects/arm/src/sys/kern/vnode_if.src#11 integrate
.. //depot/projects/arm/src/sys/modules/cxgb/Makefile#9 integrate
.. //depot/projects/arm/src/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/arm/src/sys/netgraph/ng_base.c#15 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_conn.c#8 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_conn.c#7 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_iod.c#4 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#11 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#11 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#18 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.c#22 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_arg.c#16 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#16 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#9 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_private.h#11 integrate
.. //depot/projects/arm/src/sys/sys/buf.h#9 integrate
.. //depot/projects/arm/src/sys/sys/lockmgr.h#9 integrate
.. //depot/projects/arm/src/sys/sys/param.h#39 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_rawread.c#7 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#15 integrate
.. //depot/projects/arm/src/usr.bin/ar/Makefile#3 integrate
.. //depot/projects/arm/src/usr.bin/du/du.1#3 integrate
.. //depot/projects/arm/src/usr.bin/du/du.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/pkg_install/add/main.c#6 integrate
Differences ...
==== //depot/projects/arm/src/Makefile.inc1#34 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -873,6 +873,14 @@
.endif
.endif
+.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+_ar= usr.bin/ar
+.endif
+
+.if ${BOOTSTRAPPING} < 800013
+_mklocale= usr.bin/mklocale
+.endif
+
.if ${BOOTSTRAPPING} < 700018
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
@@ -882,18 +890,15 @@
_crunchgen= usr.sbin/crunch/crunchgen
.endif
-.if ${BOOTSTRAPPING} < 800013
-_mklocale= usr.bin/mklocale
-.endif
-
bootstrap-tools:
.for _tool in \
- ${_mklocale} \
${_strfile} \
${_gperf} \
${_groff} \
+ ${_ar} \
usr.bin/lorder \
usr.bin/makewhatis \
+ ${_mklocale} \
usr.bin/rpcgen \
usr.bin/xinstall \
${_gensnmptree} \
@@ -969,6 +974,10 @@
.endif
.endif
+.if make(cross-tools) && ${BOOTSTRAPPING} < 700044
+.MAKEFLAGS+= -D_WITH_GNUAR
+.endif
+
cross-tools:
.for _tool in \
gnu/usr.bin/binutils \
==== //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */
/*
* Copyright (c) 2001
* Fortress Technologies, Inc. All rights reserved.
@@ -1186,9 +1186,9 @@
break;
case IEEE80211_RADIOTAP_RATE:
if (u.u8 & 0x80)
+ PRINT_HT_RATE("", u.u8, " Mb/s ");
+ else
PRINT_RATE("", u.u8, " Mb/s ");
- else
- PRINT_HT_RATE("", u.u8, " Mb/s ");
break;
case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
printf("%ddB signal ", u.i8);
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ====
@@ -1,15 +1,18 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $
.include "../Makefile.inc0"
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
-.if defined(WITH_BSDAR)
-PROG= gnu-ar
-#MAN= gnu-ar.1
-.else
+.if !defined(_WITH_GNUAR)
+PROGNAME= gnu-ar
+MAN= gnu-ar.1
+gnu-ar.1: ar.1
+ cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gnu-ar.1
+.endif
+
PROG= ar
-.endif
SRCS= ar.c not-ranlib.c
CFLAGS+= -D_GNU_SOURCE
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ====
@@ -1,15 +1,18 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $
.include "../Makefile.inc0"
.PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
-.if defined(WITH_BSDAR)
-PROG= gnu-ranlib
-#MAN= gnu-ranlib.1
-.else
+.if !defined(_WITH_GNUAR)
+PROGNAME= gnu-ranlib
+MAN= gnu-ranlib.1
+gnu-ranlib.1: ranlib.1
+ cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gnu-ranlib.1
+.endif
+
PROG= ranlib
-.endif
SRCS= ar.c is-ranlib.c
CFLAGS+= -D_GNU_SOURCE
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $
*/
#ifndef _KGDB_H_
@@ -49,7 +49,6 @@
extern struct kthr *curkthr;
void kgdb_add_kld_cmd(char *, int);
-void kgdb_auto_load_klds(void);
void kgdb_kld_init(void);
void kgdb_target(void);
void kgdb_trgt_fetch_registers(int);
==== //depot/projects/arm/src/lib/libarchive/archive_endian.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $
+ * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $
*
* Borrowed from FreeBSD's <sys/endian.h>
*/
@@ -34,7 +34,7 @@
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
static inline uint16_t
-be16dec(const void *pp)
+archive_be16dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
@@ -42,7 +42,7 @@
}
static inline uint32_t
-be32dec(const void *pp)
+archive_be32dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
@@ -50,15 +50,15 @@
}
static inline uint64_t
-be64dec(const void *pp)
+archive_be64dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
- return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
+ return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4));
}
static inline uint16_t
-le16dec(const void *pp)
+archive_le16dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
@@ -66,7 +66,7 @@
}
static inline uint32_t
-le32dec(const void *pp)
+archive_le32dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
@@ -74,15 +74,15 @@
}
static inline uint64_t
-le64dec(const void *pp)
+archive_le64dec(const void *pp)
{
unsigned char const *p = (unsigned char const *)pp;
- return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
+ return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p));
}
static inline void
-be16enc(void *pp, uint16_t u)
+archive_be16enc(void *pp, uint16_t u)
{
unsigned char *p = (unsigned char *)pp;
@@ -91,7 +91,7 @@
}
static inline void
-be32enc(void *pp, uint32_t u)
+archive_be32enc(void *pp, uint32_t u)
{
unsigned char *p = (unsigned char *)pp;
@@ -102,16 +102,16 @@
}
static inline void
-be64enc(void *pp, uint64_t u)
+archive_be64enc(void *pp, uint64_t u)
{
unsigned char *p = (unsigned char *)pp;
- be32enc(p, u >> 32);
- be32enc(p + 4, u & 0xffffffff);
+ archive_be32enc(p, u >> 32);
+ archive_be32enc(p + 4, u & 0xffffffff);
}
static inline void
-le16enc(void *pp, uint16_t u)
+archive_le16enc(void *pp, uint16_t u)
{
unsigned char *p = (unsigned char *)pp;
@@ -120,7 +120,7 @@
}
static inline void
-le32enc(void *pp, uint32_t u)
+archive_le32enc(void *pp, uint32_t u)
{
unsigned char *p = (unsigned char *)pp;
@@ -131,12 +131,12 @@
}
static inline void
-le64enc(void *pp, uint64_t u)
+archive_le64enc(void *pp, uint64_t u)
{
unsigned char *p = (unsigned char *)pp;
- le32enc(p, u & 0xffffffff);
- le32enc(p + 4, u >> 32);
+ archive_le32enc(p, u & 0xffffffff);
+ archive_le32enc(p + 4, u >> 32);
}
#endif
==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#10 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.21 2008/02/26 07:17:47 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -278,8 +278,8 @@
zip->version = p->version[0];
zip->system = p->version[1];
- zip->flags = le16dec(p->flags);
- zip->compression = le16dec(p->compression);
+ zip->flags = archive_le16dec(p->flags);
+ zip->compression = archive_le16dec(p->compression);
if (zip->compression <
sizeof(compression_names)/sizeof(compression_names[0]))
zip->compression_name = compression_names[zip->compression];
@@ -291,11 +291,11 @@
zip->mode = 0;
zip->uid = 0;
zip->gid = 0;
- zip->crc32 = le32dec(p->crc32);
- zip->filename_length = le16dec(p->filename_length);
- zip->extra_length = le16dec(p->extra_length);
- zip->uncompressed_size = le32dec(p->uncompressed_size);
- zip->compressed_size = le32dec(p->compressed_size);
+ zip->crc32 = archive_le32dec(p->crc32);
+ zip->filename_length = archive_le16dec(p->filename_length);
+ zip->extra_length = archive_le16dec(p->extra_length);
+ zip->uncompressed_size = archive_le32dec(p->uncompressed_size);
+ zip->compressed_size = archive_le32dec(p->compressed_size);
(a->decompressor->consume)(a, sizeof(struct zip_file_header));
@@ -397,9 +397,9 @@
"Truncated ZIP end-of-file record");
return (ARCHIVE_FATAL);
}
- zip->crc32 = le32dec(p + 4);
- zip->compressed_size = le32dec(p + 8);
- zip->uncompressed_size = le32dec(p + 12);
+ zip->crc32 = archive_le32dec(p + 4);
+ zip->compressed_size = archive_le32dec(p + 8);
+ zip->uncompressed_size = archive_le32dec(p + 12);
(a->decompressor->consume)(a, 16);
}
@@ -707,8 +707,8 @@
const char *p = (const char *)extra;
while (offset < zip->extra_length - 4)
{
- unsigned short headerid = le16dec(p + offset);
- unsigned short datasize = le16dec(p + offset + 2);
+ unsigned short headerid = archive_le16dec(p + offset);
+ unsigned short datasize = archive_le16dec(p + offset + 2);
offset += 4;
if (offset + datasize > zip->extra_length)
break;
@@ -720,9 +720,9 @@
case 0x0001:
/* Zip64 extended information extra field. */
if (datasize >= 8)
- zip->uncompressed_size = le64dec(p + offset);
+ zip->uncompressed_size = archive_le64dec(p + offset);
if (datasize >= 16)
- zip->compressed_size = le64dec(p + offset + 8);
+ zip->compressed_size = archive_le64dec(p + offset + 8);
break;
case 0x5455:
{
@@ -735,11 +735,12 @@
{
#ifdef DEBUG
fprintf(stderr, "mtime: %lld -> %d\n",
- (long long)zip->mtime, le32dec(p + offset));
+ (long long)zip->mtime,
+ archive_le32dec(p + offset));
#endif
if (datasize < 4)
break;
- zip->mtime = le32dec(p + offset);
+ zip->mtime = archive_le32dec(p + offset);
offset += 4;
datasize -= 4;
}
@@ -747,7 +748,7 @@
{
if (datasize < 4)
break;
- zip->atime = le32dec(p + offset);
+ zip->atime = archive_le32dec(p + offset);
offset += 4;
datasize -= 4;
}
@@ -755,7 +756,7 @@
{
if (datasize < 4)
break;
- zip->ctime = le32dec(p + offset);
+ zip->ctime = archive_le32dec(p + offset);
offset += 4;
datasize -= 4;
}
@@ -765,12 +766,13 @@
/* Info-ZIP Unix Extra Field (type 2) "Ux". */
#ifdef DEBUG
fprintf(stderr, "uid %d gid %d\n",
- le16dec(p + offset), le16dec(p + offset + 2));
+ archive_le16dec(p + offset),
+ archive_le16dec(p + offset + 2));
#endif
if (datasize >= 2)
- zip->uid = le16dec(p + offset);
+ zip->uid = archive_le16dec(p + offset);
if (datasize >= 4)
- zip->gid = le16dec(p + offset + 2);
+ zip->gid = archive_le16dec(p + offset + 2);
break;
default:
break;
==== //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#5 (text+ko) ====
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $
.\"
.Dd November 4, 2006
.Dt CLOCK_GETTIME 2
@@ -52,8 +52,8 @@
.Fn clock_gettime
and
.Fn clock_settime
-allow the calling process to retrieve or set the value used by a clock
-which is specified by
+system calls allow the calling process to retrieve or set the value
+used by a clock which is specified by
.Fa clock_id .
.Pp
The
==== //depot/projects/arm/src/lib/msun/src/e_rem_pio2.c#3 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $");
/* __ieee754_rem_pio2(x,y)
*
@@ -56,7 +56,7 @@
__ieee754_rem_pio2(double x, double *y)
{
double z,w,t,r,fn;
- double tx[3];
+ double tx[3],ty[2];
int32_t e0,i,j,nx,n,ix,hx;
u_int32_t low;
@@ -182,7 +182,7 @@
tx[2] = z;
nx = 3;
while(tx[nx-1]==zero) nx--; /* skip zero term */
- n = __kernel_rem_pio2(tx,y,e0,nx,2);
- if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;}
- return n;
+ n = __kernel_rem_pio2(tx,ty,e0,nx,1);
+ if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;}
+ y[0] = ty[0]; y[1] = ty[1]; return n;
}
==== //depot/projects/arm/src/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ====
@@ -15,12 +15,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $");
/* __ieee754_rem_pio2f(x,y)
*
- * return the remainder of x rem pi/2 in y[0]+y[1]
- * use double precision internally
+ * return the remainder of x rem pi/2 in *y
+ * use double precision for everything except passing x
* use __kernel_rem_pio2() for large x
*/
@@ -41,11 +41,14 @@
pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */
pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */
+#ifdef INLINE_REM_PIO2F
+extern inline
+#endif
int
-__ieee754_rem_pio2f(float x, float *y)
+__ieee754_rem_pio2f(float x, double *y)
{
double w,r,fn;
- double tx[1],ty[2];
+ double tx[1],ty[1];
float z;
int32_t e0,n,ix,hx;
@@ -63,23 +66,20 @@
#endif
r = x-fn*pio2_1;
w = fn*pio2_1t;
- y[0] = r-w;
- y[1] = (r-y[0])-w;
+ *y = r-w;
return n;
}
/*
* all other (large) arguments
*/
if(ix>=0x7f800000) { /* x is inf or NaN */
- y[0]=y[1]=x-x; return 0;
+ *y=x-x; return 0;
}
/* set z = scalbn(|x|,ilogb(|x|)-23) */
e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */
SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23)));
tx[0] = z;
- n = __kernel_rem_pio2(tx,ty,e0,1,1);
- y[0] = ty[0];
- y[1] = ty[0] - y[0];
- if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;}
- return n;
+ n = __kernel_rem_pio2(tx,ty,e0,1,0);
+ if(hx<0) {*y = -ty[0]; return -n;}
+ *y = ty[0]; return n;
}
==== //depot/projects/arm/src/lib/msun/src/k_rem_pio2.c#3 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $");
/*
* __kernel_rem_pio2(x,y,e0,nx,prec)
@@ -78,8 +78,13 @@
* Here is the description of some local variables:
*
* jk jk+1 is the initial number of terms of ipio2[] needed
- * in the computation. The recommended value is 2,3,4,
- * 6 for single, double, extended,and quad.
+ * in the computation. The minimum and recommended value
+ * for jk is 3,4,4,6 for single, double, extended, and quad.
+ * jk+1 must be 2 larger than you might expect so that our
+ * recomputation test works. (Up to 24 bits in the integer
+ * part (the 24 bits of it that we compute) and 23 bits in
+ * the fraction part may be lost to cancelation before we
+ * recompute.)
*
* jz local integer variable indicating the number of
* terms of ipio2[] used.
@@ -129,7 +134,7 @@
#include "math.h"
#include "math_private.h"
-static const int init_jk[] = {2,3,4,6}; /* initial value for jk */
+static const int init_jk[] = {3,4,4,6}; /* initial value for jk */
/*
* Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
==== //depot/projects/arm/src/lib/msun/src/math_private.h#3 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $
+ * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $
*/
#ifndef _MATH_PRIVATE_H_
@@ -320,7 +320,7 @@
double __kernel_tan(double,double,int);
/* float precision kernel functions */
-int __ieee754_rem_pio2f(float,float*);
+int __ieee754_rem_pio2f(float,double*);
float __kernel_sindf(double);
float __kernel_cosdf(double);
float __kernel_tandf(double,int);
==== //depot/projects/arm/src/lib/msun/src/s_cosf.c#3 (text+ko) ====
@@ -15,12 +15,16 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $");
+
+#include <float.h>
#include "math.h"
#define INLINE_KERNEL_COSDF
#define INLINE_KERNEL_SINDF
+#define INLINE_REM_PIO2F
#include "math_private.h"
+#include "e_rem_pio2f.c"
#include "k_cosf.c"
#include "k_sinf.c"
@@ -34,7 +38,7 @@
float
cosf(float x)
{
- float y[2];
+ double y;
int32_t n, hx, ix;
GET_FLOAT_WORD(hx,x);
@@ -71,13 +75,13 @@
/* general argument reduction needed */
else {
- n = __ieee754_rem_pio2f(x,y);
+ n = __ieee754_rem_pio2f(x,&y);
switch(n&3) {
- case 0: return __kernel_cosdf((double)y[0]+y[1]);
- case 1: return __kernel_sindf(-(double)y[0]-y[1]);
- case 2: return -__kernel_cosdf((double)y[0]+y[1]);
+ case 0: return __kernel_cosdf(y);
+ case 1: return __kernel_sindf(-y);
+ case 2: return -__kernel_cosdf(y);
default:
- return __kernel_sindf((double)y[0]+y[1]);
+ return __kernel_sindf(y);
}
}
}
==== //depot/projects/arm/src/lib/msun/src/s_sinf.c#3 (text+ko) ====
@@ -15,12 +15,16 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
+
+#include <float.h>
#include "math.h"
#define INLINE_KERNEL_COSDF
#define INLINE_KERNEL_SINDF
+#define INLINE_REM_PIO2F
#include "math_private.h"
+#include "e_rem_pio2f.c"
#include "k_cosf.c"
#include "k_sinf.c"
@@ -34,7 +38,7 @@
float
sinf(float x)
{
- float y[2];
+ double y;
int32_t n, hx, ix;
GET_FLOAT_WORD(hx,x);
@@ -69,13 +73,13 @@
/* general argument reduction needed */
else {
- n = __ieee754_rem_pio2f(x,y);
+ n = __ieee754_rem_pio2f(x,&y);
switch(n&3) {
- case 0: return __kernel_sindf((double)y[0]+y[1]);
- case 1: return __kernel_cosdf((double)y[0]+y[1]);
- case 2: return __kernel_sindf(-(double)y[0]-y[1]);
+ case 0: return __kernel_sindf(y);
+ case 1: return __kernel_cosdf(y);
+ case 2: return __kernel_sindf(-y);
default:
- return -__kernel_cosdf((double)y[0]+y[1]);
+ return -__kernel_cosdf(y);
}
}
}
==== //depot/projects/arm/src/lib/msun/src/s_tanf.c#3 (text+ko) ====
@@ -15,11 +15,15 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
+
+#include <float.h>
#include "math.h"
#define INLINE_KERNEL_TANDF
+#define INLINE_REM_PIO2F
#include "math_private.h"
+#include "e_rem_pio2f.c"
#include "k_tanf.c"
/* Small multiples of pi/2 rounded to double precision. */
@@ -32,7 +36,7 @@
float
tanf(float x)
{
- float y[2];
+ double y;
int32_t n, hx, ix;
GET_FLOAT_WORD(hx,x);
@@ -61,8 +65,8 @@
/* general argument reduction needed */
else {
- n = __ieee754_rem_pio2f(x,y);
+ n = __ieee754_rem_pio2f(x,&y);
/* integer parameter: 1 -- n even; -1 -- n odd */
- return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1));
+ return __kernel_tandf(y,1-((n&1)<<1));
}
}
==== //depot/projects/arm/src/sbin/fsck_ffs/pass1.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -93,9 +93,11 @@
inumber = c * sblock.fs_ipg;
setinodebuf(inumber);
getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize);
- if (sblock.fs_magic == FS_UFS2_MAGIC)
+ if (sblock.fs_magic == FS_UFS2_MAGIC) {
inosused = cgrp.cg_initediblk;
- else
+ if (inosused > sblock.fs_ipg)
+ inosused = sblock.fs_ipg;
+ } else
inosused = sblock.fs_ipg;
if (got_siginfo) {
printf("%s: phase 1: cyl group %d of %d (%d%%)\n",
==== //depot/projects/arm/src/sbin/fsck_ffs/pass2.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $");
#include <sys/param.h>
@@ -242,6 +242,8 @@
/*
* check for "."
*/
+ if (dirp->d_ino > maxino)
+ goto chk2;
if (idesc->id_entryno != 0)
goto chk1;
if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) {
==== //depot/projects/arm/src/sbin/fsck_ffs/setup.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -349,7 +349,7 @@
sblock.fs_sblockloc == sblock_try[i])) &&
sblock.fs_ncg >= 1 &&
sblock.fs_bsize >= MINBSIZE &&
- sblock.fs_bsize >= sizeof(struct fs))
+ sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize))
break;
}
if (sblock_try[i] == -1) {
==== //depot/projects/arm/src/sbin/ping6/ping6.c#5 (text+ko) ====
@@ -78,7 +78,7 @@
static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $";
+ "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $";
#endif /* not lint */
/*
@@ -457,9 +457,9 @@
if (interval.tv_sec < 0)
errx(1, "illegal timing interval %s", optarg);
/* less than 1/hz does not make sense */
- if (interval.tv_sec == 0 && interval.tv_usec < 10000) {
- warnx("too small interval, raised to 0.01");
- interval.tv_usec = 10000;
+ if (interval.tv_sec == 0 && interval.tv_usec < 1) {
+ warnx("too small interval, raised to .000001");
+ interval.tv_usec = 1;
}
options |= F_INTERVAL;
break;
==== //depot/projects/arm/src/share/man/man9/VOP_LOCK.9#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.23 2008/02/25 19:12:01 attilio Exp $
.\"
-.Dd January 19, 2008
+.Dd February 25, 2008
.Os
.Dt VOP_LOCK 9
.Sh NAME
@@ -46,7 +46,7 @@
.Ft int
.Fn VOP_UNLOCK "struct vnode *vp" "int flags"
.Ft int
-.Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td"
+.Fn VOP_ISLOCKED "struct vnode *vp"
.Ft int
.Fn vn_lock "struct vnode *vp" "int flags"
.Sh DESCRIPTION
@@ -101,9 +101,6 @@
.It Dv LK_RETRY
Retry until locked.
.El
-.It Fa td
-Thread context to use for the locks.
-.El
.Pp
Kernel code should use
.Fn vn_lock
==== //depot/projects/arm/src/share/man/man9/lock.9#7 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $
.\"
-.Dd February 13, 2008
+.Dd February 25, 2008
.Dt LOCK 9
.Os
.Sh NAME
@@ -49,7 +49,7 @@
.Ft int
.Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp"
.Ft int
-.Fn lockstatus "struct lock *lkp" "struct thread *td"
+.Fn lockstatus "struct lock *lkp"
.Ft void
.Fn lockmgr_disown "struct lock *lkp"
.Ft void
@@ -180,20 +180,11 @@
.Pp
The
.Fn lockstatus
-function returns the status of the lock in relation to the
-.Vt thread
-passed to it.
-Note that if
-.Fa td
-is
-.Dv NULL
-and an exclusive lock is held,
-.Dv LK_EXCLUSIVE
-will be returned.
+function returns the status of the lock in relation to the current thread.
.Pp
The
.Fn lockmgr_disown
-function switches the owner from curthread to be
+function switches the owner from the current thread to be
.Dv LK_KERNPROC,
if the lock is already held.
.Pp
@@ -283,11 +274,9 @@
function returns:
.Bl -tag -width ".Dv LK_EXCLUSIVE"
.It Dv LK_EXCLUSIVE
-An exclusive lock is held by the thread
-.Fa td .
+An exclusive lock is held by the current thread.
.It Dv LK_EXCLOTHER
-An exclusive lock is held by someone other than the thread
-.Fa td .
+An exclusive lock is held by someone other than the current thread.
.It Dv LK_SHARED
A shared lock is held.
.It Li 0
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list