PERFORCE change 34903 for review
Marcel Moolenaar
marcel at FreeBSD.org
Wed Jul 23 16:04:02 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34903
Change 34903 by marcel at marcel_nfs on 2003/07/23 16:03:27
IFC @34901
Affected files ...
.. //depot/projects/uart/alpha/conf/GENERIC#2 integrate
.. //depot/projects/uart/alpha/conf/NOTES#2 integrate
.. //depot/projects/uart/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/uart/amd64/include/ieeefp.h#2 integrate
.. //depot/projects/uart/amd64/include/npx.h#2 integrate
.. //depot/projects/uart/conf/NOTES#4 integrate
.. //depot/projects/uart/conf/files#10 integrate
.. //depot/projects/uart/conf/files.alpha#3 integrate
.. //depot/projects/uart/conf/files.i386#3 integrate
.. //depot/projects/uart/conf/files.pc98#2 integrate
.. //depot/projects/uart/conf/kern.post.mk#2 integrate
.. //depot/projects/uart/conf/kern.pre.mk#3 integrate
.. //depot/projects/uart/conf/kmod.mk#2 integrate
.. //depot/projects/uart/conf/newvers.sh#2 integrate
.. //depot/projects/uart/conf/options#4 integrate
.. //depot/projects/uart/conf/options.i386#3 integrate
.. //depot/projects/uart/conf/options.pc98#3 integrate
.. //depot/projects/uart/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/uart/dev/harp/if_harp.c#1 branch
.. //depot/projects/uart/dev/ie/if_ie.c#2 integrate
.. //depot/projects/uart/dev/lnc/if_lnc.c#2 integrate
.. //depot/projects/uart/dev/patm/if_patm_tx.c#2 integrate
.. //depot/projects/uart/dev/rp/rp.c#2 integrate
.. //depot/projects/uart/dev/safe/safe.c#1 branch
.. //depot/projects/uart/dev/safe/safereg.h#1 branch
.. //depot/projects/uart/dev/safe/safevar.h#1 branch
.. //depot/projects/uart/dev/syscons/dragon/dragon_saver.c#2 integrate
.. //depot/projects/uart/dev/syscons/fire/fire_saver.c#2 integrate
.. //depot/projects/uart/dev/syscons/logo/logo_saver.c#2 integrate
.. //depot/projects/uart/dev/syscons/warp/warp_saver.c#2 integrate
.. //depot/projects/uart/dev/usb/usb_mem.c#3 integrate
.. //depot/projects/uart/dev/wi/if_wi.c#6 integrate
.. //depot/projects/uart/gnu/i386/fpemul/Changelog#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/README#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/control_w.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/div_small.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/errors.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/exception.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_arith.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_asm.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_aux.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_emu.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_entry.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_etc.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_proto.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_system.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/fpu_trig.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/get_address.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/load_store.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/math_emu.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_2xm1.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_atan.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_div.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_l2.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_mul64.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_sin.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/poly_tan.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/polynomial.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_add_sub.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_compare.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_constant.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_constant.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_div.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_ld_str.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_mul.c#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_norm.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_round.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_u_add.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_u_div.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_u_mul.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/reg_u_sub.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/status_w.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/version.h#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/wm_shrx.s#2 delete
.. //depot/projects/uart/gnu/i386/fpemul/wm_sqrt.s#2 delete
.. //depot/projects/uart/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/uart/i386/conf/NOTES#2 integrate
.. //depot/projects/uart/i386/i386/math_emu.h#2 delete
.. //depot/projects/uart/i386/i386/math_emulate.c#2 delete
.. //depot/projects/uart/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/uart/i386/i386/mpapic.c#2 integrate
.. //depot/projects/uart/i386/i386/pmap.c#6 integrate
.. //depot/projects/uart/i386/i386/trap.c#2 integrate
.. //depot/projects/uart/i386/include/apic.h#2 integrate
.. //depot/projects/uart/i386/include/asm.h#2 integrate
.. //depot/projects/uart/i386/include/cpufunc.h#2 integrate
.. //depot/projects/uart/i386/include/frame.h#2 integrate
.. //depot/projects/uart/i386/isa/npx.c#2 integrate
.. //depot/projects/uart/i4b/capi/iavc/iavc.h#2 integrate
.. //depot/projects/uart/i4b/capi/iavc/iavc_lli.c#2 integrate
.. //depot/projects/uart/ia64/include/_regset.h#2 integrate
.. //depot/projects/uart/kern/init_main.c#2 integrate
.. //depot/projects/uart/kern/kern_malloc.c#3 integrate
.. //depot/projects/uart/kern/kern_umtx.c#4 integrate
.. //depot/projects/uart/kern/md5c.c#2 integrate
.. //depot/projects/uart/kern/subr_autoconf.c#2 integrate
.. //depot/projects/uart/kern/subr_mbuf.c#2 integrate
.. //depot/projects/uart/kern/subr_prf.c#2 integrate
.. //depot/projects/uart/kern/tty_subr.c#2 integrate
.. //depot/projects/uart/kern/vfs_cluster.c#2 integrate
.. //depot/projects/uart/kern/vfs_subr.c#2 integrate
.. //depot/projects/uart/modules/Makefile#3 integrate
.. //depot/projects/uart/modules/fpu/Makefile#2 delete
.. //depot/projects/uart/modules/gnufpu/Makefile#2 delete
.. //depot/projects/uart/modules/harp/Makefile#1 branch
.. //depot/projects/uart/modules/safe/Makefile#1 branch
.. //depot/projects/uart/netatm/atm_cm.c#2 integrate
.. //depot/projects/uart/netatm/atm_device.c#2 integrate
.. //depot/projects/uart/netatm/atm_if.c#2 integrate
.. //depot/projects/uart/netatm/atm_if.h#2 integrate
.. //depot/projects/uart/netatm/atm_socket.c#2 integrate
.. //depot/projects/uart/netatm/atm_subr.c#3 integrate
.. //depot/projects/uart/netatm/ipatm/ipatm_if.c#2 integrate
.. //depot/projects/uart/netatm/ipatm/ipatm_load.c#2 integrate
.. //depot/projects/uart/netatm/ipatm/ipatm_vcm.c#2 integrate
.. //depot/projects/uart/netatm/sigpvc/sigpvc_if.c#2 integrate
.. //depot/projects/uart/netatm/spans/spans_arp.c#2 integrate
.. //depot/projects/uart/netatm/spans/spans_cls.c#2 integrate
.. //depot/projects/uart/netatm/spans/spans_if.c#2 integrate
.. //depot/projects/uart/netatm/uni/sscf_uni.c#2 integrate
.. //depot/projects/uart/netatm/uni/sscop.c#2 integrate
.. //depot/projects/uart/netatm/uni/uniarp.c#2 integrate
.. //depot/projects/uart/netatm/uni/uniarp_cache.c#2 integrate
.. //depot/projects/uart/netatm/uni/uniarp_vcm.c#2 integrate
.. //depot/projects/uart/netatm/uni/uniip.c#2 integrate
.. //depot/projects/uart/netatm/uni/unisig_decode.c#2 integrate
.. //depot/projects/uart/netatm/uni/unisig_if.c#2 integrate
.. //depot/projects/uart/netatm/uni/unisig_subr.c#2 integrate
.. //depot/projects/uart/netatm/uni/unisig_vc_state.c#2 integrate
.. //depot/projects/uart/netinet/ip_input.c#2 integrate
.. //depot/projects/uart/pc98/conf/GENERIC#2 integrate
.. //depot/projects/uart/pc98/conf/NOTES#2 integrate
.. //depot/projects/uart/pc98/pc98/pc98gdc.c#2 integrate
.. //depot/projects/uart/pci/if_sis.c#4 integrate
.. //depot/projects/uart/pci/if_sisreg.h#2 integrate
.. //depot/projects/uart/sys/cdefs.h#2 integrate
.. //depot/projects/uart/sys/systm.h#3 integrate
.. //depot/projects/uart/vm/swap_pager.c#3 integrate
.. //depot/projects/uart/vm/vm_object.c#2 integrate
Differences ...
==== //depot/projects/uart/alpha/conf/GENERIC#2 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.161 2003/06/08 02:03:01 jmallett Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.162 2003/07/21 19:15:25 ticso Exp $
machine alpha
cpu EV4
@@ -80,6 +80,7 @@
# Standard busses
device isa
+device eisa
device pci
# Floppy drives
==== //depot/projects/uart/alpha/conf/NOTES#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.151 2003/04/15 20:21:56 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.152 2003/07/21 19:15:25 ticso Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -45,6 +45,7 @@
# HARDWARE BUS CONFIGURATION
device isa
+device eisa
device pci
==== //depot/projects/uart/amd64/amd64/pmap.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.423 2003/07/09 22:59:45 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.424 2003/07/23 19:49:32 alc Exp $
*/
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -206,7 +206,8 @@
static PMAP_INLINE void free_pv_entry(pv_entry_t pv);
static pv_entry_t get_pv_entry(void);
static void amd64_protection_init(void);
-static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem);
+static void pmap_changebit(vm_page_t m, int bit, boolean_t setem)
+ __always_inline;
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
==== //depot/projects/uart/amd64/include/ieeefp.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.8 2003/01/19 06:01:33 marcel Exp $
+ * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.9 2003/07/22 06:44:54 peter Exp $
*/
/*
@@ -91,6 +91,15 @@
#define FP_STKY_FLD 0x3f /* sticky flags field */
/*
+ * SSE mxcsr register bit field masks
+ */
+#define SSE_STKY_FLD 0x3f /* exception flags */
+#define SSE_DAZ_FLD 0x40 /* Denormals are zero */
+#define SSE_MSKS_FLD 0x1f80 /* exception masks field */
+#define SSE_RND_FLD 0x6000 /* rounding control */
+#define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */
+
+/*
* FP register bit field offsets
*/
#define FP_MSKS_OFF 0 /* exception masks offset */
@@ -98,84 +107,185 @@
#define FP_RND_OFF 10 /* round control offset */
#define FP_STKY_OFF 0 /* sticky flags offset */
-#ifdef __GNUC__
+/*
+ * SSE mxcsr register bit field offsets
+ */
+#define SSE_STKY_OFF 0 /* exception flags offset */
+#define SSE_DAZ_OFF 6 /* DAZ exception mask offset */
+#define SSE_MSKS_OFF 7 /* other exception masks offset */
+#define SSE_RND_OFF 13 /* rounding control offset */
+#define SSE_FZ_OFF 15 /* flush to zero offset */
+
+#if defined(__GNUC__) && !defined(__cplusplus)
#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr)))
+#define __fldcw(addr) __asm __volatile("fldcw %0" : "=m" (*(addr)))
#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr)))
#define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr)))
+#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : "=m" (*(addr)))
+#define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr)))
+
+/*
+ * General notes about conflicting SSE vs FP status bits.
+ * This code assumes that software will not fiddle with the control
+ * bits of the SSE and x87 in such a way to get them out of sync and
+ * still expect this to work. Break this at your peril.
+ * Because I based this on the i386 port, the x87 state is used for
+ * the fpget*() functions, and is shadowed into the SSE state for
+ * the fpset*() functions. For dual source fpget*() functions, I
+ * merge the two together. I think.
+ */
+
+/* Set rounding control */
+static __inline__ fp_rnd_t
+__fpgetround(void)
+{
+ unsigned short _cw;
+
+ __fnstcw(&_cw);
+ return ((_cw & FP_RND_FLD) >> FP_RND_OFF);
+}
+
+static __inline__ fp_rnd_t
+__fpsetround(fp_rnd_t _m)
+{
+ unsigned short _cw;
+ unsigned int _mxcsr;
+ fp_rnd_t _p;
+
+ __fnstcw(&_cw);
+ _p = (_cw & FP_RND_FLD) >> FP_RND_OFF;
+ _cw &= ~FP_RND_FLD;
+ _cw |= (_m << FP_RND_OFF) & FP_RND_FLD;
+ __fldcw(&_cw);
+ __stmxcsr(&_mxcsr);
+ _mxcsr &= ~SSE_RND_FLD;
+ _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD;
+ __ldmxcsr(&_mxcsr);
+ return (_p);
+}
/*
- * return the contents of a FP register
+ * Set precision for fadd/fsub/fsqrt etc x87 instructions
+ * There is no equivalent SSE mode or control.
*/
-static __inline__ int
-__fpgetreg(int _reg)
+static __inline__ fp_prec_t
+__fpgetprec(void)
+{
+ unsigned short _cw;
+
+ __fnstcw(&_cw);
+ return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF);
+}
+
+static __inline__ fp_prec_t
+__fpsetprec(fp_rnd_t _m)
{
- unsigned short _mem;
+ unsigned short _cw;
+ fp_prec_t _p;
- /*-
- * This is more efficient than it looks. The switch gets optimized
- * away if _reg is constant.
- *
- * The default case only supports _reg == 0. We could handle more
- * registers (e.g., tags) using fnstenv, but the interface doesn't
- * support more.
- */
- switch(_reg) {
- default:
- __fnstcw(&_mem);
- break;
- case FP_STKY_REG:
- __fnstsw(&_mem);
- break;
- }
- return _mem;
+ __fnstcw(&_cw);
+ _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF;
+ _cw &= ~FP_PRC_FLD;
+ _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD;
+ __fldcw(&_cw);
+ return (_p);
}
/*
- * set a FP mode; return previous mode
+ * Look at the exception masks
+ * Note that x87 masks are inverse of the fp*() functions
+ * API. ie: mask = 1 means disable for x87 and SSE, but
+ * for the fp*() api, mask = 1 means enabled.
*/
-static __inline__ int
-__fpsetreg(int _m, int _reg, int _fld, int _off)
+static __inline__ fp_except_t
+__fpgetmask(void)
+{
+ unsigned short _cw;
+
+ __fnstcw(&_cw);
+ return ((~_cw) & FP_MSKS_FLD);
+}
+
+static __inline__ fp_except_t
+__fpsetmask(fp_except_t _m)
+{
+ unsigned short _cw;
+ unsigned int _mxcsr;
+ fp_except_t _p;
+
+ __fnstcw(&_cw);
+ _p = (~_cw) & FP_MSKS_FLD;
+ _cw &= ~FP_MSKS_FLD;
+ _cw |= (~_m) & FP_MSKS_FLD;
+ __fldcw(&_cw);
+ __stmxcsr(&_mxcsr);
+ /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */
+ _mxcsr &= ~SSE_MSKS_FLD;
+ _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD;
+ __ldmxcsr(&_mxcsr);
+ return (_p);
+}
+
+/* See which sticky exceptions are pending, and reset them */
+static __inline__ fp_except_t
+__fpgetsticky(void)
+{
+ unsigned short _sw;
+ unsigned int _mxcsr;
+ fp_except_t _ex;
+
+ __fnstsw(&_sw);
+ _ex = _sw & FP_STKY_FLD;
+ __stmxcsr(&_mxcsr);
+ _ex |= _mxcsr & SSE_STKY_FLD;
+ return (_ex);
+}
+
+/* Note that this should really be called fpresetsticky() */
+static __inline__ fp_except_t
+__fpsetsticky(fp_except_t _m)
{
unsigned _env[7];
- unsigned _p;
+ unsigned int _mxcsr;
+ fp_except_t _p;
- /*
- * _reg == 0 could be handled better using fnstcw/fldcw.
- */
__fnstenv(_env);
- _p = (_env[_reg] & _fld) >> _off;
- _env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld);
+ _p = _env[FP_STKY_REG] & _m;
+ __stmxcsr(&_mxcsr);
+ _p |= _mxcsr & SSE_STKY_FLD;
+ _env[FP_STKY_REG] &= ~_m;
__fldenv(_env);
- return _p;
+ _mxcsr &= ~_m;
+ __ldmxcsr(&_mxcsr);
+ return (_p);
}
-#endif /* __GNUC__ */
+#endif /* __GNUC__ && !__cplusplus */
+
+#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__)
-/*
- * SysV/386 FP control interface
- */
-#define fpgetround() ((fp_rnd_t) \
- ((__fpgetreg(FP_RND_REG) & FP_RND_FLD) >> FP_RND_OFF))
-#define fpsetround(m) ((fp_rnd_t) \
- __fpsetreg((m), FP_RND_REG, FP_RND_FLD, FP_RND_OFF))
-#define fpgetprec() ((fp_prec_t) \
- ((__fpgetreg(FP_PRC_REG) & FP_PRC_FLD) >> FP_PRC_OFF))
-#define fpsetprec(m) ((fp_prec_t) \
- __fpsetreg((m), FP_PRC_REG, FP_PRC_FLD, FP_PRC_OFF))
-#define fpgetmask() ((fp_except_t) \
- ((~__fpgetreg(FP_MSKS_REG) & FP_MSKS_FLD) >> FP_MSKS_OFF))
-#define fpsetmask(m) ((fp_except_t) \
- (~__fpsetreg(~(m), FP_MSKS_REG, FP_MSKS_FLD, FP_MSKS_OFF)) & \
- (FP_MSKS_FLD >> FP_MSKS_OFF))
-#define fpgetsticky() ((fp_except_t) \
- ((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF))
-#define fpresetsticky(m) ((fp_except_t) \
- __fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF))
-#define fpsetsticky(m) fpresetsticky(m)
+#define fpsetround() __fpsetround()
+#define fpgetround(_m) __fpgetround(_m)
+#define fpgetprec() __fpgetprec()
+#define fpsetprec(_m) __fpsetprec(_m)
+#define fpgetmask() __fpgetmask()
+#define fpsetmask(_m) __fpsetmask(_m)
+#define fpgetsticky() __fpgetsticky()
+#define fpsetsticky(_m) __fpsetsticky(_m)
/* Suppress prototypes in the MI header. */
#define _IEEEFP_INLINED_ 1
+#else /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUC__ */
+
+/* Augment the userland declarations */
+__BEGIN_DECLS
+extern fp_prec_t fpgetprec(void);
+extern fp_prec_t fpsetprec(fp_prec_t);
+__END_DECLS
+
+#endif /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUC__ */
+
#endif /* !_MACHINE_IEEEFP_H_ */
==== //depot/projects/uart/amd64/include/npx.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/npx.h,v 1.29 2003/07/22 06:50:34 peter Exp $
*/
/*
@@ -85,16 +85,17 @@
* 64-bit precision
* all exceptions masked.
*
- * We modify the affine mode bit and precision bits in this to give:
+ * FreeBSD/i386 uses 53 bit precision for things like fadd/fsub/fsqrt etc
+ * because of the difference between memory and fpu register stack arguments.
+ * If its using an intermediate fpu register, it has 80/64 bits to work
+ * with. If it uses memory, it has 64/53 bits to work with. However,
+ * gcc is aware of this and goes to a fair bit of trouble to make the
+ * best use of it.
*
- * affine mode for 287's (if they work at all) (1 in bitfield 1<<12)
- * 53-bit precision (2 in bitfield 3<<8)
- *
- * 64-bit precision often gives bad results with high level languages
- * because it makes the results of calculations depend on whether
- * intermediate values are stored in memory or in FPU registers.
+ * This is mostly academic for AMD64, because the ABI prefers the use
+ * SSE2 based math. For FreeBSD/amd64, we go with the default settings.
*/
-#define __INITIAL_NPXCW__ 0x127F
+#define __INITIAL_NPXCW__ 0x037F
#define __INITIAL_MXCSR__ 0x1F80
#define __INITIAL_MXCSR_MASK__ 0xFFBF
==== //depot/projects/uart/conf/NOTES#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1163 2003/07/15 11:57:23 harti Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1164 2003/07/21 13:56:21 harti Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -645,6 +645,8 @@
# The `hfa' driver provides support for the FORE Systems, Inc.
# PCA-200E ATM PCI Adapter.
#
+# The `harp' pseudo-driver makes all NATM interface drivers available to HARP.
+#
options ATM_CORE #core ATM protocol family
options ATM_IP #IP over ATM support
options ATM_SIGPVC #SIGPVC signalling manager
@@ -653,6 +655,7 @@
device hea #Efficient ENI-155p ATM PCI
device hfa #FORE PCA-200E ATM PCI
+device harp #Pseudo-interface for NATM
#####################################################################
==== //depot/projects/uart/conf/files#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.808 2003/07/18 10:02:43 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.811 2003/07/22 11:41:15 ticso Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -383,6 +383,7 @@
dev/ed/if_ed_pccard.c optional ed card
dev/ed/if_ed_pccard.c optional ed pccard
dev/ed/if_ed_pci.c optional ed pci
+dev/eisa/eisaconf.c optional eisa
dev/em/if_em.c optional em
dev/em/if_em_hw.c optional em
dev/en/midway.c optional en
@@ -415,6 +416,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gx/if_gx.c optional gx
+dev/harp/if_harp.c optional harp pci
dev/hatm/if_hatm.c optional hatm pci
dev/hatm/if_hatm_intr.c optional hatm pci
dev/hatm/if_hatm_ioctl.c optional hatm pci
@@ -666,6 +668,7 @@
dev/rp/rp_isa.c optional rp isa
dev/rp/rp_pci.c optional rp pci
dev/sab/sab.c optional sab ebus
+dev/safe/safe.c optional safe
dev/sbsh/if_sbsh.c optional sbsh
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
==== //depot/projects/uart/conf/files.alpha#3 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.alpha,v 1.101 2003/04/17 07:39:03 phk Exp $
+# $FreeBSD: src/sys/conf/files.alpha,v 1.103 2003/07/22 11:41:15 ticso Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/uart/conf/files.i386#3 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.446 2003/06/25 14:51:20 sam Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.448 2003/07/22 11:41:15 ticso Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -120,7 +120,6 @@
dev/cm/if_cm_isa.c optional cm isa
dev/dgb/dgb.c count dgb
dev/ed/if_ed_isa.c optional ed isa
-dev/eisa/eisaconf.c optional eisa
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/splash.c optional splash
@@ -157,38 +156,6 @@
geom/geom_bsd_enc.c standard
geom/geom_mbr.c standard
geom/geom_mbr_enc.c standard
-gnu/i386/fpemul/div_small.s optional gpl_math_emulate \
- warning "kernel contains GPL contaminated math emulator"
-gnu/i386/fpemul/errors.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate
-gnu/i386/fpemul/get_address.c optional gpl_math_emulate
-gnu/i386/fpemul/load_store.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_div.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate
-gnu/i386/fpemul/polynomial.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_round.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate
i386/acpica/OsdEnvironment.c optional acpi
i386/acpica/acpi_machdep.c optional acpi
i386/acpica/acpi_wakeup.c optional acpi
@@ -227,7 +194,6 @@
i386/i386/legacy.c standard
i386/i386/locore.s standard no-obj
i386/i386/machdep.c standard
-i386/i386/math_emulate.c optional math_emulate
i386/i386/mem.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
==== //depot/projects/uart/conf/files.pc98#2 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.272 2003/06/25 15:19:04 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.273 2003/07/22 08:11:12 peter Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -133,38 +133,6 @@
geom/geom_bsd_enc.c standard
geom/geom_pc98.c standard
geom/geom_pc98_enc.c standard
-gnu/i386/fpemul/div_small.s optional gpl_math_emulate \
- warning "kernel contains GPL contaminated math emulator"
-gnu/i386/fpemul/errors.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate
-gnu/i386/fpemul/get_address.c optional gpl_math_emulate
-gnu/i386/fpemul/load_store.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_div.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate
-gnu/i386/fpemul/polynomial.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_round.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate
i386/bios/apm.c optional apm
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
@@ -187,7 +155,6 @@
i386/i386/k6_mem.c standard
i386/i386/legacy.c standard
i386/i386/locore.s standard no-obj
-i386/i386/math_emulate.c optional math_emulate
i386/i386/mem.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
==== //depot/projects/uart/conf/kern.post.mk#2 (text+ko) ====
@@ -6,7 +6,7 @@
# should be defined in the kern.pre.mk so that port makefiles can
# override or augment them.
#
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.47 2003/06/22 17:57:56 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.48 2003/07/22 09:02:21 phk Exp $
#
# In case the config had a makeoptions DESTDIR...
@@ -115,7 +115,7 @@
# XXX used to force -elf after CFLAGS to work around breakage of cc -aout
# (genassym.sh makes some assumptions and cc stopped satisfying them).
genassym.o: $S/$M/$M/genassym.c
- ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c
+ ${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
==== //depot/projects/uart/conf/kern.pre.mk#3 (text+ko) ====
@@ -3,7 +3,7 @@
# Unified Makefile for building kernels. This includes all the definitions
# that need to be included before %BEFORE_DEPEND
#
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.27 2003/07/11 07:13:42 kan Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.30 2003/07/23 22:02:30 peter Exp $
#
# Can be overridden by makeoptions or /etc/make.conf
@@ -52,7 +52,10 @@
.endif
.endif
DEFINED_PROF= ${PROF}
-# WERROR?= -Werror
+#WERROR?= -Werror
+INLINE_LIMIT?= 2500
+CFLAGS+= --param max-inline-insns-single=${INLINE_LIMIT}
+
# Put configuration-specific C flags last (except for ${PROF}) so that they
# can override the others.
==== //depot/projects/uart/conf/kmod.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.137 2003/03/03 22:51:22 ru Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.138 2003/07/23 20:03:42 peter Exp $
#
# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
# drivers (KLD's).
@@ -99,6 +99,9 @@
CFLAGS+= -I@/../include -I${DESTDIR}/usr/include
.endif # @
+INLINE_LIMIT?= 2500
+CFLAGS+= --param max-inline-insns-single=${INLINE_LIMIT}
+
# Disallow common variables, and if we end up with commons from
# somewhere unexpected, allocate storage for them in the module itself.
CFLAGS+= -fno-common
==== //depot/projects/uart/conf/newvers.sh#2 (text+ko) ====
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.53 2003/06/09 18:19:32 jmallett Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.55 2003/07/23 20:07:49 peter Exp $
TYPE="FreeBSD"
REVISION="5.1"
==== //depot/projects/uart/conf/options#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.402 2003/07/15 08:59:37 harti Exp $
+# $FreeBSD: src/sys/conf/options,v 1.404 2003/07/22 11:42:45 ticso Exp $
#
# On the handling of kernel options
#
@@ -596,6 +596,8 @@
DEV_BPF opt_bpf.h
DEV_SPLASH opt_splash.h
+EISA_SLOTS opt_eisa.h
+
# ed driver
ED_NO_MIIBUS opt_ed.h
@@ -615,6 +617,11 @@
HIFN_RNDTEST opt_hifn.h
HIFN_NO_RNG opt_hifn.h
+# options for safenet driver
+SAFE_DEBUG opt_safe.h
+SAFE_NO_RNG opt_safe.h
+SAFE_RNDTEST opt_safe.h
+
# syscons options
MAXCONS opt_syscons.h
SC_ALT_MOUSE_IMAGE opt_syscons.h
==== //depot/projects/uart/conf/options.i386#3 (text+ko) ====
@@ -1,8 +1,6 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.194 2003/07/10 01:02:58 peter Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.196 2003/07/22 11:42:45 ticso Exp $
# Options specific to the i386 platform kernels
-MATH_EMULATE opt_math_emulate.h
-GPL_MATH_EMULATE opt_math_emulate.h
DISABLE_PSE opt_pmap.h
PMAP_SHPGPERPROC opt_pmap.h
DISABLE_PG_G opt_pmap.h
@@ -93,8 +91,6 @@
ATKBD_DFLT_KEYMAP opt_atkbd.h
-EISA_SLOTS opt_eisa.h
-
# pcvt(4) has a bunch of options
FAT_CURSOR opt_pcvt.h
XSERVER opt_pcvt.h
==== //depot/projects/uart/conf/options.pc98#3 (text+ko) ====
@@ -1,8 +1,6 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.166 2003/07/10 01:02:58 peter Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.167 2003/07/22 08:11:12 peter Exp $
# Options specific to the pc98 platform kernels
-MATH_EMULATE opt_math_emulate.h
-GPL_MATH_EMULATE opt_math_emulate.h
DISABLE_PSE opt_pmap.h
PMAP_SHPGPERPROC opt_pmap.h
DISABLE_PG_G opt_pmap.h
==== //depot/projects/uart/dev/fxp/if_fxp.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.187 2003/07/11 20:49:36 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.188 2003/07/22 15:50:54 mux Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,9 +230,9 @@
int low, int high);
static int sysctl_hw_fxp_bundle_max(SYSCTL_HANDLER_ARGS);
static int sysctl_hw_fxp_int_delay(SYSCTL_HANDLER_ARGS);
-static __inline void fxp_scb_wait(struct fxp_softc *sc);
-static __inline void fxp_scb_cmd(struct fxp_softc *sc, int cmd);
-static __inline void fxp_dma_wait(struct fxp_softc *sc,
+static void fxp_scb_wait(struct fxp_softc *sc);
+static void fxp_scb_cmd(struct fxp_softc *sc, int cmd);
+static void fxp_dma_wait(struct fxp_softc *sc,
volatile u_int16_t *status, bus_dma_tag_t dmat,
bus_dmamap_t map);
@@ -275,7 +275,7 @@
* Wait for the previous command to be accepted (but not necessarily
* completed).
*/
-static __inline void
+static void
fxp_scb_wait(struct fxp_softc *sc)
{
int i = 10000;
@@ -290,7 +290,7 @@
CSR_READ_2(sc, FXP_CSR_FLOWCONTROL));
}
-static __inline void
+static void
fxp_scb_cmd(struct fxp_softc *sc, int cmd)
{
@@ -301,7 +301,7 @@
CSR_WRITE_1(sc, FXP_CSR_SCB_COMMAND, cmd);
}
-static __inline void
+static void
fxp_dma_wait(struct fxp_softc *sc, volatile u_int16_t *status,
bus_dma_tag_t dmat, bus_dmamap_t map)
{
@@ -317,7 +317,7 @@
}
/*
- * Return identification string if this is device is ours.
+ * Return identification string if this device is ours.
*/
static int
fxp_probe(device_t dev)
@@ -2307,16 +2307,16 @@
m->m_data += sc->rfa_size;
rfa->size = htole16(MCLBYTES - sc->rfa_size - RFA_ALIGNMENT_FUDGE);
- /*
- * Initialize the rest of the RFA. Note that since the RFA
- * is misaligned, we cannot store values directly. Instead,
- * we use an optimized, inline copy.
- */
-
rfa->rfa_status = 0;
rfa->rfa_control = htole16(FXP_RFA_CONTROL_EL);
rfa->actual_size = 0;
+ /*
+ * Initialize the rest of the RFA. Note that since the RFA
+ * is misaligned, we cannot store values directly. We're thus
+ * using the le32enc() function which handles endianness and
+ * is also alignment-safe.
+ */
le32enc(&rfa->link_addr, 0xffffffff);
le32enc(&rfa->rbd_addr, 0xffffffff);
==== //depot/projects/uart/dev/ie/if_ie.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.94 2003/03/29 13:36:40 mdodd Exp $
+ * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.95 2003/07/22 09:35:45 phk Exp $
*
* MAINTAINER: Matthew N. Dodd <winter at jurai.net>
*/
@@ -326,6 +326,14 @@
return (0);
}
+static __inline void
+ie_ack(struct ie_softc *sc, u_int mask)
+{
+
+ sc->scb->ie_command = sc->scb->ie_status & mask;
+ (*sc->ie_chan_attn) (sc);
+}
+
/*
* What to do upon receipt of an interrupt.
*/
@@ -1220,14 +1228,6 @@
addr[i] = inb(PORT(sc) + i);
}
-static __inline void
-ie_ack(struct ie_softc *sc, u_int mask)
-{
-
- sc->scb->ie_command = sc->scb->ie_status & mask;
- (*sc->ie_chan_attn) (sc);
-}
-
static void
iereset(struct ie_softc *sc)
{
==== //depot/projects/uart/dev/lnc/if_lnc.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.95 2003/02/19 05:47:07 imp Exp $
+ * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.96 2003/07/22 09:22:00 phk Exp $
*/
/*
@@ -126,8 +126,8 @@
static __inline struct mbuf *mbuf_packet(struct lnc_softc *sc,
int start_of_packet,
int pkt_len);
-static __inline void lnc_rint(struct lnc_softc *sc);
-static __inline void lnc_tint(struct lnc_softc *sc);
+static void lnc_rint(struct lnc_softc *sc);
+static void lnc_tint(struct lnc_softc *sc);
static void lnc_init(void *);
static __inline int mbuf_to_buffer(struct mbuf *m, char *buffer);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list