Date: Wed, 10 Jan 2007 16:23:38 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 112708 for review Message-ID: <200701101623.l0AGNcGG090069@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=112708 Change 112708 by peter@peter_overcee on 2007/01/10 16:23:25 IFC @112657 Affected files ... .. //depot/projects/hammer/contrib/ipfilter/todo#3 branch .. //depot/projects/hammer/lib/libc/sys/open.2#9 integrate .. //depot/projects/hammer/lib/msun/Makefile#33 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#31 integrate .. //depot/projects/hammer/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#53 integrate .. //depot/projects/hammer/sys/bsm/audit.h#6 integrate .. //depot/projects/hammer/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#4 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#24 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-rem.c#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#4 delete Differences ... ==== //depot/projects/hammer/lib/libc/sys/open.2#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)open.2 8.2 (Berkeley) 11/16/93 -.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.33 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.34 2007/01/07 17:32:16 pjd Exp $ .\" .Dd January 10, 2006 .Dt OPEN 2 @@ -238,7 +238,7 @@ Too many symbolic links were encountered in translating the pathname. .It Bq Er EISDIR The named file is a directory, and the arguments specify -it is to be opened for writing. +it is to be modified. .It Bq Er EROFS The named file resides on a read-only file system, and the file is to be modified. ==== //depot/projects/hammer/lib/msun/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.75 2006/03/27 23:59:44 deischen Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.76 2007/01/07 07:54:20 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -69,7 +69,7 @@ .endif # C99 long double functions -COMMON_SRCS+= s_copysignl.c s_fabsl.c +COMMON_SRCS+= s_copysignl.c s_fabsl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. COMMON_SRCS+= s_fmal.c s_frexpl.c s_nextafterl.c s_nexttoward.c s_scalbnl.c ==== //depot/projects/hammer/lib/msun/Symbol.map#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/msun/Symbol.map,v 1.2 2007/01/06 21:18:17 das Exp $ +# $FreeBSD: src/lib/msun/Symbol.map,v 1.3 2007/01/07 07:54:21 das Exp $ FBSD_1.0 { __fe_dfl_env; tgamma; @@ -134,6 +134,7 @@ lroundf; lroundl; modff; + modfl; nearbyint; nearbyintf; nextafter; ==== //depot/projects/hammer/lib/msun/src/math.h#31 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.61 2005/04/16 21:12:47 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.62 2007/01/07 07:54:21 das Exp $ */ #ifndef _MATH_H_ @@ -439,8 +439,8 @@ long lrintl(long double); #endif long lroundl(long double); +long double modfl(long double, long double *); /* fundamentally !__pure2 */ #if 0 -long double modfl(long double, long double *); /* fundamentally !__pure2 */ long double nanl(const char *) __pure2; long double nearbyintl(long double); #endif ==== //depot/projects/hammer/lib/msun/src/s_copysignl.c#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/msun/src/s_copysignl.c,v 1.1 2004/05/07 18:56:31 stefanf Exp $ + * $FreeBSD: src/lib/msun/src/s_copysignl.c,v 1.2 2007/01/07 07:54:21 das Exp $ */ #include <math.h> ==== //depot/projects/hammer/lib/msun/src/s_fmal.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.3 2007/01/07 07:54:21 das Exp $"); #include <fenv.h> #include <float.h> ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#53 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.100 2006/12/29 21:59:17 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.101 2007/01/07 03:02:02 mlaier Exp $ */ #include <sys/param.h> @@ -2763,13 +2763,17 @@ * ',' indicating another address follows, '{' indicating a * set of addresses of unspecified size. */ - char *p = strpbrk(av, "/:,{"); + char *t = NULL, *p = strpbrk(av, "/:,{"); int masklen; - char md; + char md, nd; if (p) { md = *p; *p++ = '\0'; + if ((t = strpbrk(p, ",{")) != NULL) { + nd = *t; + *t = '\0'; + } } else md = '\0'; @@ -2803,6 +2807,8 @@ break; } d[0] &= d[1]; /* mask base address with mask */ + if (t) + *t = nd; /* find next separator */ if (p) p = strpbrk(p, ",{"); ==== //depot/projects/hammer/sys/bsm/audit.h#6 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_internal.h#3 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_kevents.h#7 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_record.h#4 (text) ==== ==== //depot/projects/hammer/sys/dev/mfi/mfi.c#5 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.25 2007/01/02 04:12:34 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.26 2007/01/07 06:43:25 scottl Exp $"); #include "opt_mfi.h" @@ -90,7 +90,7 @@ SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale, 0, "event message locale"); -static int mfi_event_class = 10; +static int mfi_event_class = MFI_EVT_CLASS_INFO; TUNABLE_INT("hw.mfi.event_class", &mfi_event_class); SYSCTL_INT(_hw_mfi, OID_AUTO, event_class, CTLFLAG_RW, &mfi_event_class, 0, "event message class"); ==== //depot/projects/hammer/sys/pc98/pc98/machdep.c#14 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.385 2006/12/06 18:27:17 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.386 2007/01/07 12:13:10 nyan Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -1960,6 +1960,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); /* * Initialize mutexes. ==== //depot/projects/hammer/sys/vm/vm_kern.c#24 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.125 2006/11/13 00:27:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.126 2007/01/07 07:32:04 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -487,7 +487,8 @@ /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ kernel_map = m; (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, - VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, 0); + VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, + MAP_NOFAULT); /* ... and ending with the completion of the above `insert' */ vm_map_unlock(m); } ==== //depot/projects/hammer/tools/regression/lib/msun/test-rem.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.1 2005/03/25 06:24:46 das Exp $"); +__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.2 2007/01/07 09:25:22 das Exp $"); #include <assert.h> #include <math.h> @@ -100,11 +100,15 @@ assert(isnan(remainder(x, y))); assert(isnan(remquo(x, y, &q))); +#ifdef STRICT assert(q == 0xdeadbeef); +#endif assert(isnan(remainderf(x, y))); assert(isnan(remquof(x, y, &q))); +#ifdef STRICT assert(q == 0xdeadbeef); +#endif } /* 0x012345 ==> 0x01ffff */ @@ -123,9 +127,11 @@ assert(remainder(x, y) == expected_rem); assert(remquo(x, y, &q) == expected_rem); assert((q & 0x7) == (expected_quo & 0x7)); - assert((q > 0) ^ !(expected_quo > 0)); - q = abs(q); - assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + if (q != 0) { + assert((q > 0) ^ !(expected_quo > 0)); + q = abs(q); + assert(q == (abs(expected_quo) & mask(q))); + } } static void @@ -137,7 +143,9 @@ assert(remainderf(x, y) == expected_rem); assert(remquof(x, y, &q) == expected_rem); assert((q & 0x7) == (expected_quo & 0x7)); - assert((q > 0) ^ !(expected_quo > 0)); - q = abs(q); - assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + if (q != 0) { + assert((q > 0) ^ !(expected_quo > 0)); + q = abs(q); + assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701101623.l0AGNcGG090069>