PERFORCE change 86431 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 7 11:23:21 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=86431
Change 86431 by peter at peter_daintree on 2005/11/07 19:22:18
IFC @86424
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#106 integrate
.. //depot/projects/hammer/lib/bind/bind/Makefile#4 integrate
.. //depot/projects/hammer/lib/bind/bind9/Makefile#4 integrate
.. //depot/projects/hammer/lib/bind/dns/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/isc/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/isccc/Makefile#4 integrate
.. //depot/projects/hammer/lib/bind/isccfg/Makefile#4 integrate
.. //depot/projects/hammer/lib/bind/lwres/Makefile#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_platform.h#13 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/configure.ac.in#8 integrate
.. //depot/projects/hammer/lib/msun/Makefile#30 integrate
.. //depot/projects/hammer/lib/msun/man/ieee_test.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/ilogb.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/math.3#13 integrate
.. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#4 integrate
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#43 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#82 integrate
.. //depot/projects/hammer/sys/arm/arm/machdep.c#15 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#27 integrate
.. //depot/projects/hammer/sys/arm/include/pmap.h#13 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#37 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#25 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#24 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#17 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#37 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#7 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#25 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#25 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_cam.c#13 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_pci.c#19 integrate
.. //depot/projects/hammer/sys/dev/amr/amrvar.h#16 integrate
.. //depot/projects/hammer/sys/dev/fb/boot_font.c#5 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#45 integrate
.. //depot/projects/hammer/sys/dev/puc/puc.c#18 integrate
.. //depot/projects/hammer/sys/dev/puc/pucdata.c#22 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#16 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/ubser.c#13 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#41 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#43 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#11 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#34 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#31 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#39 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#46 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#20 integrate
.. //depot/projects/hammer/tools/regression/sigqueue/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/sigqueue/sigqtest1/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/sigqueue/sigqtest1/sigqtest1.c#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate
.. //depot/projects/hammer/tools/sched/schedgraph.py#3 integrate
.. //depot/projects/hammer/tools/tools/aac/aac_checkq.c#2 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#17 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#19 integrate
.. //depot/projects/hammer/usr.sbin/config/configvers.h#8 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.8#6 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#106 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -493,6 +493,18 @@
SPECIAL_INSTALLCHECKS=
#
+# Require DESTDIR to be set if installing for a different architecture.
+#
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
+SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR
+installcheck_DESTDIR:
+.if !defined(DESTDIR) || empty(DESTDIR)
+ @echo "ERROR: Please set DESTDIR!"; \
+ false
+.endif
+.endif
+
+#
# installcheck
#
# Checks to be sure system is ready for installworld
==== //depot/projects/hammer/lib/bind/bind/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/bind/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
+# $FreeBSD: src/lib/bind/bind/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -62,9 +62,6 @@
res_mkquery.c res_mkupdate.c res_query.c \
res_send.c res_sendsigned.c res_update.c
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
#.if defined(WITH_BIND_LIBS)
#INCS= ${SRCDIR}/include/isc/assertions.h \
# ${SRCDIR}/include/isc/ctl.h \
==== //depot/projects/hammer/lib/bind/bind9/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
+# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -14,9 +14,6 @@
CFLAGS+= -I${SRCDIR}/include
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/bind9/check.h \
${SRCDIR}/include/bind9/getaddresses.h \
==== //depot/projects/hammer/lib/bind/dns/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/dns/Makefile,v 1.5 2005/03/17 08:35:21 dougb Exp $
+# $FreeBSD: src/lib/bind/dns/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -37,8 +37,8 @@
CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR}
CFLAGS+= -I${.CURDIR}
-DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD}
-LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+DPADD= ${CRYPTO_DPADD}
+LDADD= ${CRYPTO_LDADD}
.if defined(WITH_BIND_LIBS)
DNSINCS= ${SRCDIR}/include/dns/acl.h \
==== //depot/projects/hammer/lib/bind/isc/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $
+# $FreeBSD: src/lib/bind/isc/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -38,9 +38,6 @@
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isc/app.h \
${SRCDIR}/include/isc/assertions.h \
==== //depot/projects/hammer/lib/bind/isccc/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
+# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -16,9 +16,6 @@
CFLAGS+= -I${SRCDIR}/include
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isccc/alist.h \
${SRCDIR}/include/isccc/base64.h \
==== //depot/projects/hammer/lib/bind/isccfg/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $
+# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -14,9 +14,6 @@
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isccfg/cfg.h \
${SRCDIR}/include/isccfg/grammar.h \
==== //depot/projects/hammer/lib/bind/lwres/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7 2004/10/24 15:32:30 ru Exp $
+# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.8 2005/11/07 15:22:35 ru Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_REL= ..
@@ -24,9 +24,6 @@
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include
CFLAGS+= -I${.CURDIR}
-DPADD= ${PTHREAD_DPADD}
-LDADD= ${PTHREAD_LDADD}
-
.if defined(WITH_BIND_LIBS)
MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \
lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \
==== //depot/projects/hammer/lib/libarchive/archive_platform.h#13 (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/lib/libarchive/archive_platform.h,v 1.18 2005/10/12 03:28:38 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.19 2005/11/06 23:38:01 kientzle Exp $
*/
/*
@@ -93,6 +93,7 @@
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_WAIT_H 1
+#define HAVE_TIMEGM 1
#define HAVE_UNISTD_H 1
#define HAVE_WCHAR_H 1
#define HAVE_ZLIB_H 1
==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.10 2005/09/24 21:15:00 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.11 2005/11/06 23:38:01 kientzle Exp $");
#include <sys/stat.h>
@@ -179,6 +179,7 @@
struct archive_entry *);
static const char *build_pathname(struct archive_string *, struct file_info *);
static void dump_isodirrec(FILE *, const struct iso9660_directory_record *);
+static time_t time_from_tm(struct tm *);
static time_t isodate17(const void *);
static time_t isodate7(const void *);
static int isPVD(struct iso9660 *, const char *);
@@ -950,6 +951,7 @@
struct tm tm;
const unsigned char *v = (const unsigned char *)p;
int offset;
+ memset(&tm, 0, sizeof(tm));
tm.tm_year = v[0];
tm.tm_mon = v[1] - 1;
tm.tm_mday = v[2];
@@ -962,7 +964,7 @@
tm.tm_hour -= offset / 4;
tm.tm_min -= (offset % 4) * 15;
}
- return (timegm(&tm));
+ return (time_from_tm(&tm));
}
static time_t
@@ -971,6 +973,7 @@
struct tm tm;
const unsigned char *v = (const unsigned char *)p;
int offset;
+ memset(&tm, 0, sizeof(tm));
tm.tm_year = (v[0] - '0') * 1000 + (v[1] - '0') * 100
+ (v[2] - '0') * 10 + (v[3] - '0')
- 1900;
@@ -985,7 +988,44 @@
tm.tm_hour -= offset / 4;
tm.tm_min -= (offset % 4) * 15;
}
- return (timegm(&tm));
+ return (time_from_tm(&tm));
+}
+
+/*
+ * timegm() converts a struct tm to a time_t, except it isn't standard,
+ * so I provide my own function here that (ideally) is just a wrapper
+ * for timegm().
+ */
+static time_t
+time_from_tm(struct tm *t)
+{
+#if HAVE_TIMEGM
+ return (timegm(t));
+#else
+ /*
+ * Unfortunately, timegm() isn't standard. The standard
+ * mktime() function is a close match, except that it uses
+ * local timezone instead of GMT. Close enough for now.
+ * Note that it is not possible to emulate timegm() using
+ * standard interfaces:
+ * * ANSI C90 does not even guarantee that time_t is
+ * an arithmetic type, so time adjustments can only be
+ * done by manipulating struct tm elements. You cannot
+ * portably calculate time_t values.
+ * * POSIX does promise that time_t is an arithmetic type
+ * measured in seconds, so you can do time_t calculations
+ * while remaining POSIX-compliant.
+ * * Neither ANSI nor POSIX provides an easy way to measure
+ * the timezone offset, so you can't adjust mktime() to
+ * work like timegm().
+ * * POSIX does not promise that the epoch begins in 1970,
+ * so you can't write a portable timegm() function from
+ * scratch.
+ */
+ time_t result = mktime(t);
+ /* TODO: Find a way to improve this approximation to timegm(). */
+ return result;
+#endif
}
static const char *
==== //depot/projects/hammer/lib/libarchive/configure.ac.in#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.8 2005/10/13 05:51:38 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.9 2005/11/06 23:38:01 kientzle Exp $
#Process this file with autoconf to produce a configure script.
AC_INIT(libarchive, @VERSION@, kientzle at freebsd.org)
@@ -79,7 +79,7 @@
AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file])
AC_CHECK_FUNCS([chflags fchdir fchflags fchmod fchown futimes])
AC_CHECK_FUNCS([lchflags lchmod lchown lutimes memmove])
-AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr])
+AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr timegm])
# MacOS has an acl.h that isn't POSIX. It can be detected by
# checking for ACL_USER
==== //depot/projects/hammer/lib/msun/Makefile#30 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD: src/lib/msun/Makefile,v 1.72 2005/07/22 17:19:05 kensmith Exp $
+# $FreeBSD: src/lib/msun/Makefile,v 1.74 2005/11/06 17:59:40 bde Exp $
#
# ====================================================
# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -36,7 +36,7 @@
e_log.c e_log10.c e_log10f.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 fenv.c \
- k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \
+ k_cos.c k_cosf.c k_rem_pio2.c k_sin.c k_sinf.c \
k_tan.c k_tanf.c \
s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c \
s_ceil.c s_ceilf.c s_ceill.c \
@@ -129,10 +129,10 @@
fmax.3 fmin.3 fmax.3 fminf.3 fmax.3 fminl.3
MLINKS+=fmod.3 fmodf.3
MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 hypotf.3
-MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3
MLINKS+=ieee_test.3 scalb.3 ieee_test.3 scalbf.3
MLINKS+=ieee_test.3 significand.3 ieee_test.3 significandf.3
-MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3
+MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3 \
+ ilogb.3 logb.3 ilogb.3 logbf.3
MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3
MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3
MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 lgamma.3 tgamma.3
==== //depot/projects/hammer/lib/msun/man/ieee_test.3#3 (text+ko) ====
@@ -30,14 +30,12 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91
-.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.11 2004/06/12 04:40:47 das Exp $
+.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.12 2005/11/06 12:18:27 bde Exp $
.\"
-.Dd March 10, 1994
+.Dd Nov 6, 2005
.Dt IEEE_TEST 3
.Os
.Sh NAME
-.Nm logb ,
-.Nm logbf ,
.Nm scalb ,
.Nm scalbf ,
.Nm significand ,
@@ -48,10 +46,6 @@
.Sh SYNOPSIS
.In math.h
.Ft double
-.Fn logb "double x"
-.Ft float
-.Fn logbf "float x"
-.Ft double
.Fn scalb "double x" "double n"
.Ft float
.Fn scalbf "float x" "float n"
@@ -64,18 +58,6 @@
.St -ieee754 .
Their use is not otherwise recommended.
.Pp
-.Fn logb x
-and
-.Fn logbf x
-return
-.Fa x Ns 's exponent
-.Fa n ,
-a signed integer converted to double\-precision floating\-point.
-.Fn logb \*(Pm\*(If
-= +\*(If;
-.Fn logb 0
-= -\*(If with a division by zero exception.
-.Pp
.Fn scalb x n
and
.Fn scalbf x n
==== //depot/projects/hammer/lib/msun/man/ilogb.3#2 (text+ko) ====
@@ -30,15 +30,17 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91
-.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.1 2005/01/27 05:46:16 das Exp $
+.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.2 2005/11/06 12:18:27 bde Exp $
.\"
-.Dd January 26, 2005
+.Dd Nov 6, 2005
.Dt ILOGB 3
.Os
.Sh NAME
.Nm ilogb ,
.Nm ilogbf ,
-.Nm ilogbl
+.Nm ilogbl ,
+.Nm logb ,
+.Nm logbf
.Nd extract exponent
.Sh LIBRARY
.Lb libm
@@ -50,24 +52,40 @@
.Fn ilogbf "float x"
.Ft int
.Fn ilogbl "long double x"
+.Ft double
+.Fn logb "double x"
+.Ft float
+.Fn logbf "float x"
.Sh DESCRIPTION
.Fn ilogb ,
.Fn ilogbf
and
.Fn ilogbl
return
-.Fa x Ns 's exponent,
+.Fa x Ns 's exponent
in integer format.
.Fn ilogb \*(Pm\*(If
returns
.Dv INT_MAX ,
.Fn ilogb \*(Pm\*(Na
returns
-.Dv FP_ILOGBNAN
+.Dv FP_ILOGBNAN ,
and
.Fn ilogb 0
returns
.Dv FP_ILOGB0 .
+.Pp
+.Fn logb x
+and
+.Fn logbf x
+return
+.Fa x Ns 's exponent
+in floating\-point format with the same precision as
+.Fa x .
+.Fn logb \*(Pm\*(If
+returns +\*(If, and
+.Fn logb 0
+returns -\*(If with a division by zero exception.
.Sh SEE ALSO
.Xr frexp 3 ,
.Xr ieee 3 ,
@@ -77,19 +95,33 @@
The
.Fn ilogb ,
.Fn ilogbf ,
+.Fn ilogbl ,
+.Fn logb
and
-.Fn ilogbl
+.Fn logbf
routines conform to
.St -isoC-99 .
-They provide functionality similar to the Logb function recommended by
+.Fn logb
+and
+.Fn logbf
+implement the logb function recommended by
.St -ieee754 .
.Sh HISTORY
The
+.Fn logb
+function appeared in
+.Bx 4.3 .
+The
.Fn ilogb
+function appeared in
+.Fx 1.1.5 .
+The
+.Fn ilogbf
and
-.Fn ilogbf
+.Fn logbf
functions appeared in
-.Bx 4.3
-and
-.Fx 2.0 ,
-respectively.
+.Fx 2.0 .
+The
+.Fn ilogbl
+function appeared in
+.Fx 5.4 .
==== //depot/projects/hammer/lib/msun/man/math.3#13 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)math.3 6.10 (Berkeley) 5/6/91
-.\" $FreeBSD: src/lib/msun/man/math.3,v 1.25 2005/06/16 21:56:03 ru Exp $
+.\" $FreeBSD: src/lib/msun/man/math.3,v 1.26 2005/11/06 12:18:27 bde Exp $
.\"
-.Dd April 5, 2005
+.Dd Nov 6, 2005
.Dt MATH 3
.Os
.if n \{\
@@ -97,6 +97,7 @@
frexp extract exponent and mantissa
ilogb extract exponent
ldexp multiply by power of 2
+logb extract exponent
scalbln adjust exponent
scalbn adjust exponent
.El
==== //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#5 (text+ko) ====
@@ -15,7 +15,7 @@
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.14 2005/10/29 16:34:50 bde Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.15 2005/11/06 17:48:02 bde Exp $";
#endif
/* __ieee754_rem_pio2f(x,y)
@@ -55,6 +55,7 @@
half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
+pio2 = 1.57079632679489655700e+00, /* 0x3FF921FB, 0x54442d18 */
pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */
pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */
@@ -71,16 +72,45 @@
/* 33+53 bit pi is good enough for special and medium size cases */
if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */
if(hx>0) {
- z = x - pio2_1;
- y[0] = z - pio2_1t;
- y[1] = (z-y[0])-pio2_1t;
- return 1;
- } else { /* negative x */
- z = x + pio2_1;
- y[0] = z + pio2_1t;
- y[1] = (z-y[0])+pio2_1t;
- return -1;
+ z = x - pio2;
+ n = 1;
+ } else {
+ z = x + pio2;
+ n = 3;
+ }
+ y[0] = z;
+ y[1] = z - y[0];
+ return n;
+ }
+ if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */
+ if(hx>0)
+ z = x - 2*pio2;
+ else
+ z = x + 2*pio2;
+ y[0] = z;
+ y[1] = z - y[0];
+ return 2;
+ }
+ if(ix<0x40afeddf) { /* |x| < 7*pi/4, special case with n=+-3 */
+ if(hx>0) {
+ z = x - 3*pio2;
+ n = 3;
+ } else {
+ z = x + 3*pio2;
+ n = 1;
}
+ y[0] = z;
+ y[1] = z - y[0];
+ return n;
+ }
+ if(ix<0x40e231d6) { /* |x| < 9*pi/4, special case with n=+-4 */
+ if(hx>0)
+ z = x - 4*pio2;
+ else
+ z = x + 4*pio2;
+ y[0] = z;
+ y[1] = z - y[0];
+ return 0;
}
if(ix<=0x49490f80) { /* |x| ~<= 2^19*(pi/2), medium size */
t = fabsf(x);
==== //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.3 2005/07/15 17:35:26 hrs Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.4 2005/11/06 00:41:41 philip Exp $
.\"
.Dd March 20, 2005
.Dt ACPI_FUJITSU 4 i386
@@ -154,7 +154,7 @@
The
.Nm
driver was written by
-.An Sean Bullington Aq sean at stalker.org ,
+.An Sean Bullington Aq shegget at gmail.com ,
.An Anish Mistry Aq mistry.7 at osu.edu ,
and
.An Marc Santcroos Aq marks at ripe.net .
==== //depot/projects/hammer/sys/alpha/conf/GENERIC#31 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.188 2005/09/24 16:47:34 wilko Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.189 2005/11/05 19:48:53 marcel Exp $
machine alpha
cpu EV4
@@ -143,8 +143,9 @@
device mcclock # MC146818 real time clock device
-# Serial (COM) ports (required)
+# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -155,7 +156,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#43 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.18 2005/11/02 20:11:46 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.19 2005/11/04 23:02:28 peter Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#82 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.445 2005/11/01 22:59:02 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.446 2005/11/05 19:48:53 marcel Exp $
machine amd64
cpu HAMMER
@@ -164,6 +164,7 @@
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -175,7 +176,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
==== //depot/projects/hammer/sys/arm/arm/machdep.c#15 (text+ko) ====
@@ -44,7 +44,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.19 2005/11/06 16:10:28 cognet Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -244,6 +244,7 @@
cpu_setup("");
identify_arm_cpu();
thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1;
+ pmap_postinit();
#ifdef ARM_CACHE_LOCK_ENABLE
pmap_kenter_user(ARM_TP_ADDRESS, ARM_TP_ADDRESS);
arm_lock_cache_line(ARM_TP_ADDRESS);
==== //depot/projects/hammer/sys/arm/arm/pmap.c#27 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.39 2005/10/23 23:09:14 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.40 2005/11/06 16:10:28 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -398,11 +398,6 @@
*/
#define PV_BEEN_REFD(f) (((f) & PVF_REF) != 0)
-/*
- * Data for the pv entry allocation mechanism
- */
-#define MINPV 2048
-
#ifndef PMAP_SHPGPERPROC
#define PMAP_SHPGPERPROC 200
#endif
@@ -1949,6 +1944,7 @@
void
pmap_init(void)
{
+ int shpgperproc = PMAP_SHPGPERPROC;
PDEBUG(1, printf("pmap_init: phys_start = %08x\n"));
@@ -1957,12 +1953,24 @@
*/
pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- uma_prealloc(pvzone, MINPV);
/*
* Now it is safe to enable pv_table recording.
*/
PDEBUG(1, printf("pmap_init: done!\n"));
+ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc);
+
+ pv_entry_max = shpgperproc * maxproc + vm_page_array_size;
+ pv_entry_high_water = 9 * (pv_entry_max / 10);
+ l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor,
+ NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
+ l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR,
+ UMA_ZONE_VM | UMA_ZONE_NOFREE);
+
+ uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max);
+ uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max);
+
}
int
@@ -2190,15 +2198,14 @@
return (rv);
}
-/*
- * Initialize the address space (zone) for the pv_entries. Set a
- * high water mark so that the system can recover from excessive
- * numbers of pv entries.
- */
+void
+pmap_init2(void)
+{
+}
+
void
-pmap_init2()
+pmap_postinit(void)
{
- int shpgperproc = PMAP_SHPGPERPROC;
struct l2_bucket *l2b;
struct l1_ttable *l1;
pd_entry_t *pl1pt;
@@ -2206,21 +2213,6 @@
vm_offset_t va, eva;
u_int loop, needed;
- TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc);
-
- pv_entry_max = shpgperproc * maxproc + vm_page_array_size;
- pv_entry_high_water = 9 * (pv_entry_max / 10);
- l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor,
- NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- uma_prealloc(l2zone, 4096);
- l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable),
- NULL, NULL, NULL, NULL, UMA_ALIGN_PTR,
- UMA_ZONE_VM | UMA_ZONE_NOFREE);
- uma_prealloc(l2table_zone, 1024);
-
- uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max);
- uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max);
-
needed = (maxproc / PMAP_DOMAINS) + ((maxproc % PMAP_DOMAINS) ? 1 : 0);
needed -= 1;
l1 = malloc(sizeof(*l1) * needed, M_VMPMAP, M_WAITOK);
@@ -3787,8 +3779,7 @@
pv_entry_t ret_value;
pv_entry_count++;
- if (pv_entry_high_water &&
- (pv_entry_count > pv_entry_high_water) &&
+ if ((pv_entry_count > pv_entry_high_water) &&
(pmap_pagedaemon_waken == 0)) {
pmap_pagedaemon_waken = 1;
wakeup (&vm_pages_needed);
==== //depot/projects/hammer/sys/arm/include/pmap.h#13 (text+ko) ====
@@ -44,7 +44,7 @@
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
*
- * $FreeBSD: src/sys/arm/include/pmap.h,v 1.12 2005/10/04 16:29:31 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.13 2005/11/06 16:10:27 cognet Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -509,6 +509,8 @@
extern char *_tmppt;
+void pmap_postinit(void);
+
#ifdef ARM_USE_SMALL_ALLOC
void arm_add_smallalloc_pages(void *, void *, int, int);
void arm_busy_pages(void);
==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#37 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.46 2005/10/31 21:09:56 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.47 2005/11/06 18:12:43 ps Exp $");
#include "opt_compat.h"
@@ -1033,7 +1033,7 @@
error = freebsd32_copyoutmsghdr(&msg, uap->msg);
if (error == 0)
- error = freebsd32_copyoutiov(iov, iov->iov_len,
+ error = freebsd32_copyoutiov(iov, m32.msg_iovlen,
(struct iovec32 *)(uintptr_t)m32.msg_iov, EMSGSIZE);
}
free(iov, M_IOV);
==== //depot/projects/hammer/sys/compat/ndis/ndis_var.h#25 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.45 2005/11/02 18:01:04 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $
*/
#ifndef _NDIS_VAR_H_
@@ -1332,7 +1332,7 @@
typedef struct ndis_packet_pool ndis_packet_pool;
/* mbuf ext type for NDIS */
-#define EXT_NDIS 0x999
+#define EXT_NDIS EXT_NET_DRV
/* mtx type for NDIS */
#define MTX_NDIS_LOCK "NDIS lock"
==== //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#24 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.41 2005/10/26 06:52:57 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.42 2005/11/06 19:38:33 wpaul Exp $
*/
#ifndef _NTOSKRNL_VAR_H_
@@ -1196,6 +1196,7 @@
#define STATUS_MUTANT_NOT_OWNED 0xC0000046
#define STATUS_INVALID_PARAMETER_2 0xC00000F0
#define STATUS_INSUFFICIENT_RESOURCES 0xC000009A
+#define STATUS_NOT_FOUND 0xC0000225
#define STATUS_WAIT_0 0x00000000
==== //depot/projects/hammer/sys/compat/ndis/subr_hal.c#17 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.26 2005/10/21 05:23:20 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.27 2005/11/06 19:38:33 wpaul Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -78,6 +78,8 @@
static void READ_PORT_BUFFER_UCHAR(uint8_t *,
uint8_t *, uint32_t);
static uint64_t KeQueryPerformanceCounter(uint64_t *);
+static void _KeLowerIrql(uint8_t);
+static uint8_t KeRaiseIrqlToDpcLevel(void);
static void dummy (void);
#define NDIS_MAXCPUS 64
@@ -370,10 +372,6 @@
{
uint8_t oldirql;
- /* I am so going to hell for this. */
- if (KeGetCurrentIrql() > DISPATCH_LEVEL)
- panic("IRQL_NOT_LESS_THAN_OR_EQUAL");
-
KeRaiseIrql(DISPATCH_LEVEL, &oldirql);
KeAcquireSpinLockAtDpcLevel(lock);
@@ -416,13 +414,16 @@
uint8_t oldirql;
oldirql = KeGetCurrentIrql();
- if (irql < oldirql)
+
+ /* I am so going to hell for this. */
+ if (oldirql > irql)
panic("IRQL_NOT_LESS_THAN");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list