CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Feb 26 09:27:21 UTC 2011

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/libX11/libX11-xcb: Makefile

Log Message:
add missing x11-xcb.pc.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.123 src/distrib/sets/lists/xcomp/mi:1.124
--- src/distrib/sets/lists/xcomp/mi:1.123	Wed Feb 23 07:53:29 2011
+++ src/distrib/sets/lists/xcomp/mi	Sat Feb 26 09:27:20 2011
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.123 2011/02/23 07:53:29 mrg Exp $
+#	 $NetBSD: mi,v 1.124 2011/02/26 09:27:20 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -6438,6 +6438,7 @@
 ./usr/X11R7/lib/pkgconfig/trapproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/videoproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/x11.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/x11-xcb.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xau.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xaw6.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xaw7.pc			-unknown-	xorg

Index: src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile
diff -u src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile:1.1 src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile:1.2
--- src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile:1.1	Wed Feb 23 07:53:30 2011
+++ src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile	Sat Feb 26 09:27:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/23 07:53:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/02/26 09:27:20 mrg Exp $
 
 NOLINT=		1
 
@@ -6,6 +6,7 @@
 
 LIB=	X11-xcb
 
+.PATH:	${X11SRCDIR.X11}/src
 SRCS+=	x11_xcb.c
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
@@ -13,7 +14,8 @@
 LIBDPLIBS+= \
 	X11 ${.CURDIR}/../../libX11/dynamic
 
-.PATH:	${X11SRCDIR.X11}/src
+PKGDIST=	X11
+PKGCONFIG=  	x11-xcb
 
 .include bsd.x11.mk
 .include bsd.lib.mk

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 09:47:24 UTC 2011

Modified Files:
src/sys/arch/mips/mips: locore.S

Log Message:
Fix comment about mips_emul_fp() call.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/mips/mips/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.181 src/sys/arch/mips/mips/locore.S:1.182
--- src/sys/arch/mips/mips/locore.S:1.181	Thu Feb 24 16:21:50 2011
+++ src/sys/arch/mips/mips/locore.S	Sat Feb 26 09:47:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.181 2011/02/24 16:21:50 tsutsui Exp $	*/
+/*	$NetBSD: locore.S,v 1.182 2011/02/26 09:47:24 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -687,7 +687,7 @@
 
 /*
  * Finally, we can call
- * mips_emul(uint32_t insn, struct trapframe *tf, vaddr_t pc).
+ * mips_emul_fp(uint32_t instr, struct trapframe *tf, uint32_t cause).
  */
 4:
 	jal		_C_LABEL(mips_emul_fp)

CVS commit: src

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Feb 26 09:52:16 UTC 2011

Modified Files:
src/etc/etc.sandpoint: MAKEDEV.conf
src/sys/arch/sandpoint/conf: files.sandpoint

Log Message:
Changed satmgr(4) device major number from 100 to 144, which is reserved
for local/vendor use according to src/sys/conf/majors. This prevents
problems when the shared PowerPC device majors list gets another entry.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/etc.sandpoint/MAKEDEV.conf
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sandpoint/conf/files.sandpoint

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.sandpoint/MAKEDEV.conf
diff -u src/etc/etc.sandpoint/MAKEDEV.conf:1.9 src/etc/etc.sandpoint/MAKEDEV.conf:1.10
--- src/etc/etc.sandpoint/MAKEDEV.conf:1.9	Sun May 30 10:17:33 2010
+++ src/etc/etc.sandpoint/MAKEDEV.conf	Sat Feb 26 09:52:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.9 2010/05/30 10:17:33 phx Exp $
+# $NetBSD: MAKEDEV.conf,v 1.10 2011/02/26 09:52:16 phx Exp $
 
 init)
 	makedev std tty00 tty01 opty ptm pty0
@@ -25,7 +25,7 @@
 	;;
 
 satmgr)
-	mkdev satmgr	c 100 0 620
+	mkdev satmgr	c 144 0 620
 	;;
 
 power)

Index: src/sys/arch/sandpoint/conf/files.sandpoint
diff -u src/sys/arch/sandpoint/conf/files.sandpoint:1.27 src/sys/arch/sandpoint/conf/files.sandpoint:1.28
--- src/sys/arch/sandpoint/conf/files.sandpoint:1.27	Wed Jan 12 18:09:03 2011
+++ src/sys/arch/sandpoint/conf/files.sandpoint	Sat Feb 26 09:52:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sandpoint,v 1.27 2011/01/12 18:09:03 phx Exp $
+#	$NetBSD: files.sandpoint,v 1.28 2011/02/26 09:52:16 phx Exp $
 #
 # Motorola's SandPoint evaluation board and multiplied descendents.
 #
@@ -110,4 +110,4 @@
 
 include arch/powerpc/conf/majors.powerpc
 
-device-major	satmgr		char 100	satmgr
+device-major	satmgr		char 144	satmgr

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 10:56:56 UTC 2011

Modified Files:
src/sys/arch/mips/mips: mips_fputrap.c

Log Message:
- #if DEBUG - #ifdef FPEMUL_DEBUG
- use __func__ to print function name
- add debug printf()s in mips_fpuexcept() and mips_fpuillinst() too


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/mips_fputrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/mips_fputrap.c
diff -u src/sys/arch/mips/mips/mips_fputrap.c:1.7 src/sys/arch/mips/mips/mips_fputrap.c:1.8
--- src/sys/arch/mips/mips/mips_fputrap.c:1.7	Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/mips_fputrap.c	Sat Feb 26 10:56:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fputrap.c,v 1.7 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: mips_fputrap.c,v 1.8 2011/02/26 10:56:56 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -46,6 +46,11 @@
 {
 	ksiginfo_t ksi;
 
+#ifdef FPEMUL_DEBUG
+	printf(%s(%x,%#PRIxREGISTER)\n,
+	   __func__, fpustat, l-l_md.md_utf-tf_regs[_R_PC]);
+#endif
+
 	KSI_INIT_TRAP(ksi);
 	ksi.ksi_signo = SIGFPE;
 	ksi.ksi_code = fpustat2sicode(fpustat);
@@ -58,6 +63,11 @@
 {
 	ksiginfo_t ksi;
 
+#ifdef FPEMUL_DEBUG
+	printf(%s(%x,%#PRIxREGISTER)\n,
+	   __func__, opcode, l-l_md.md_utf-tf_regs[_R_PC]);
+#endif
+
 	KSI_INIT_TRAP(ksi);
 	ksi.ksi_signo = SIGILL;
 	ksi.ksi_code = ILL_ILLOPC;
@@ -97,9 +107,9 @@
 {
 	ksiginfo_t ksi;
 
-#if DEBUG
-	printf(fpemul_trapsignal(%x,%x,%#PRIxREGISTER)\n,
-	   sig, code, l-l_md.md_utf-tf_regs[_R_PC]);
+#ifdef FPEMUL_DEBUG
+	printf(%s(%x,%x,%#PRIxREGISTER)\n,
+	   __func__, sig, code, l-l_md.md_utf-tf_regs[_R_PC]);
 #endif
 
 	KSI_INIT_TRAP(ksi);

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 11:05:54 UTC 2011

Modified Files:
src/sys/arch/mips/mips: mips_fputrap.c

Log Message:
mips_fpu_trap() no longer passes pc to mips_fpuillinst().
Use _R_PC value in trapframe instead for ksi_addr of siginfo.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/mips/mips_fputrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/mips_fputrap.c
diff -u src/sys/arch/mips/mips/mips_fputrap.c:1.8 src/sys/arch/mips/mips/mips_fputrap.c:1.9
--- src/sys/arch/mips/mips/mips_fputrap.c:1.8	Sat Feb 26 10:56:56 2011
+++ src/sys/arch/mips/mips/mips_fputrap.c	Sat Feb 26 11:05:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fputrap.c,v 1.8 2011/02/26 10:56:56 tsutsui Exp $ */
+/* $NetBSD: mips_fputrap.c,v 1.9 2011/02/26 11:05:54 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -38,7 +38,7 @@
 
 #if defined(FPEMUL) || !defined(NOFPU)
 void mips_fpuexcept(struct lwp *, uint32_t);
-void mips_fpuillinst(struct lwp *, uint32_t, vaddr_t);
+void mips_fpuillinst(struct lwp *, uint32_t);
 static int fpustat2sicode(uint32_t);
 
 void
@@ -59,7 +59,7 @@
 }
 
 void
-mips_fpuillinst(struct lwp *l, uint32_t opcode, vaddr_t vaddr)
+mips_fpuillinst(struct lwp *l, uint32_t opcode)
 {
 	ksiginfo_t ksi;
 
@@ -72,7 +72,7 @@
 	ksi.ksi_signo = SIGILL;
 	ksi.ksi_code = ILL_ILLOPC;
 	ksi.ksi_trap = opcode;
-	ksi.ksi_addr = (void *)vaddr;
+	ksi.ksi_addr = (void *)(uintptr_t)l-l_md.md_utf-tf_regs[_R_PC];
 	(*l-l_proc-p_emul-e_trapsignal)(l, ksi);
 }
 

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 11:16:12 UTC 2011

Modified Files:
src/sys/arch/mips/mips: bds_emul.S

Log Message:
Use fpemul_fpuillinst() instead of fpemul_trapsignal() to deliver SIGILL.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/bds_emul.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/bds_emul.S
diff -u src/sys/arch/mips/mips/bds_emul.S:1.2 src/sys/arch/mips/mips/bds_emul.S:1.3
--- src/sys/arch/mips/mips/bds_emul.S:1.2	Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/mips/bds_emul.S	Sat Feb 26 11:16:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bds_emul.S,v 1.2 2011/02/20 07:45:47 matt Exp $	*/
+/*	$NetBSD: bds_emul.S,v 1.3 2011/02/26 11:16:12 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -621,9 +621,8 @@
 	REG_EPILOGUE
 
 	move	ra, t3# restore ra
-	move	a2, a0# code = instruction
+	move	a1, a0# code = instruction
 	move	a0, MIPS_CURLWP			# get current process
-	li	a1, SIGILL
-	j	_C_LABEL(fpemul_trapsignal)
+	j	_C_LABEL(fpemul_fpuillinst)
 
 END(mips_emul_branchdelayslot)

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 11:28:00 UTC 2011

Modified Files:
src/sys/arch/mips/mips: bds_emul.S

Log Message:
Um, it's mips_fpuillinst(), not fpemul_fpuillinst().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/bds_emul.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/bds_emul.S
diff -u src/sys/arch/mips/mips/bds_emul.S:1.3 src/sys/arch/mips/mips/bds_emul.S:1.4
--- src/sys/arch/mips/mips/bds_emul.S:1.3	Sat Feb 26 11:16:12 2011
+++ src/sys/arch/mips/mips/bds_emul.S	Sat Feb 26 11:27:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bds_emul.S,v 1.3 2011/02/26 11:16:12 tsutsui Exp $	*/
+/*	$NetBSD: bds_emul.S,v 1.4 2011/02/26 11:27:59 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -623,6 +623,6 @@
 	move	ra, t3# restore ra
 	move	a1, a0# code = instruction
 	move	a0, MIPS_CURLWP			# get current process
-	j	_C_LABEL(fpemul_fpuillinst)
+	j	_C_LABEL(mips_fpuillinst)
 
 END(mips_emul_branchdelayslot)

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:02:02 UTC 2011

Modified Files:
src/sys/arch/mips/mips: fp.S

Log Message:
Use mips_fpuillinst() instead of fpemul_trapsignal() to deliver SIGILL.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mips/mips/fp.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.40 src/sys/arch/mips/mips/fp.S:1.41
--- src/sys/arch/mips/mips/fp.S:1.40	Fri Feb 25 11:44:56 2011
+++ src/sys/arch/mips/mips/fp.S	Sat Feb 26 12:02:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fp.S,v 1.40 2011/02/25 11:44:56 tsutsui Exp $	*/
+/*	$NetBSD: fp.S,v 1.41 2011/02/26 12:02:01 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -4559,10 +4559,9 @@
 	REG_S	a2, TF_REG_CAUSE(a1)
 	REG_EPILOGUE
 
-	move	a2, a0# code = instruction
+	move	a1, a0# code = instruction
 	move	a0, MIPS_CURLWP			# get current lwp
-	li	a1, SIGILL
-	j	_C_LABEL(fpemul_trapsignal)
+	j	_C_LABEL(mips_fpuillinst)
 END(fpemul_sigill)
 
 STATIC_LEAF(fpemul_sigfpe)

CVS commit: src/sys/arch/hpcmips/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:04:25 UTC 2011

Modified Files:
src/sys/arch/hpcmips/include: bus_types.h

Log Message:
No need to include mips/locore.h here.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcmips/include/bus_types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcmips/include/bus_types.h
diff -u src/sys/arch/hpcmips/include/bus_types.h:1.1 src/sys/arch/hpcmips/include/bus_types.h:1.2
--- src/sys/arch/hpcmips/include/bus_types.h:1.1	Sun Nov 18 08:19:40 2001
+++ src/sys/arch/hpcmips/include/bus_types.h	Sat Feb 26 12:04:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_types.h,v 1.1 2001/11/18 08:19:40 takemura Exp $	*/
+/*	$NetBSD: bus_types.h,v 1.2 2011/02/26 12:04:25 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2001 TAKEMRUA Shin. All rights reserved.
@@ -32,8 +32,6 @@
 #ifndef _HPCMIPS_BUS_TYPES_H_
 #define _HPCMIPS_BUS_TYPES_H_
 
-#include mips/locore.h
-
 #define __BUS_SPACE_HAS_STREAM_METHODS
 
 typedef u_long bus_addr_t;

CVS commit: src/sys/arch/hpcmips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:07:46 UTC 2011

Modified Files:
src/sys/arch/hpcmips/hpcmips: bus_dma.c bus_space.c
src/sys/arch/hpcmips/tx: tx39.c
src/sys/arch/hpcmips/vr: vr.c

Log Message:
Explicitly include mips/locore.h for wbflush().


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hpcmips/hpcmips/bus_dma.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/hpcmips/bus_space.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hpcmips/tx/tx39.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hpcmips/vr/vr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c
diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.37
--- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36	Sun Feb 20 07:58:13 2011
+++ src/sys/arch/hpcmips/hpcmips/bus_dma.c	Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -40,6 +40,7 @@
 
 #include uvm/uvm_extern.h
 #include mips/cache.h
+#include mips/locore.h
 
 #include machine/bus.h
 #include machine/bus_dma_hpcmips.h

Index: src/sys/arch/hpcmips/hpcmips/bus_space.c
diff -u src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29 src/sys/arch/hpcmips/hpcmips/bus_space.c:1.30
--- src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29	Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/hpcmips/bus_space.c	Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -41,6 +41,7 @@
 #include uvm/uvm_extern.h
 
 #include mips/cache.h
+#include mips/locore.h
 #include mips/pte.h
 #include machine/bus.h
 #include machine/bus_space_hpcmips.h

Index: src/sys/arch/hpcmips/tx/tx39.c
diff -u src/sys/arch/hpcmips/tx/tx39.c:1.42 src/sys/arch/hpcmips/tx/tx39.c:1.43
--- src/sys/arch/hpcmips/tx/tx39.c:1.42	Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/tx/tx39.c	Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $ */
+/*	$NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $);
 
 #include opt_vr41xx.h
 #include opt_tx39xx.h
@@ -44,6 +44,7 @@
 #include uvm/uvm_extern.h
 
 #include mips/cache.h
+#include mips/locore.h
 
 #include machine/bootinfo.h /* bootinfo */
 #include machine/sysconf.h  /* platform */

Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.59 src/sys/arch/hpcmips/vr/vr.c:1.60
--- src/sys/arch/hpcmips/vr/vr.c:1.59	Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/vr/vr.c	Sat Feb 26 12:07:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $	*/
+/*	$NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $);
 
 #include opt_vr41xx.h
 #include opt_tx39xx.h
@@ -52,6 +52,9 @@
 
 #include uvm/uvm_extern.h
 
+#include mips/cache.h
+#include mips/locore.h
+
 #include machine/sysconf.h
 #include machine/bootinfo.h
 #include machine/bus_space_hpcmips.h
@@ -66,8 +69,6 @@
 #include hpcmips/vr/vripreg.h
 #include hpcmips/vr/rtcreg.h
 
-#include mips/cache.h
-
 #include vrip_common.h
 #if NVRIP_COMMON  0
 #include hpcmips/vr/vripvar.h

CVS commit: src/sys/arch/hpcmips/hpcmips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:08:30 UTC 2011

Modified Files:
src/sys/arch/hpcmips/hpcmips: cpu.c

Log Message:
Explicitly include mips/locore.h for mips_locoresw.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/hpcmips/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcmips/hpcmips/cpu.c
diff -u src/sys/arch/hpcmips/hpcmips/cpu.c:1.17 src/sys/arch/hpcmips/hpcmips/cpu.c:1.18
--- src/sys/arch/hpcmips/hpcmips/cpu.c:1.17	Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/hpcmips/cpu.c	Sat Feb 26 12:08:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.17 2011/02/20 07:58:14 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
  * Copyright (c) 1999-2001 SATO Kazumi, All rights reserved.
@@ -56,7 +56,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.17 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -64,6 +64,8 @@
 #include sys/cpu.h
 #include sys/bus.h
 
+#include mips/locore.h
+
 #include machine/sysconf.h
 #include machine/autoconf.h
 

CVS commit: src/sys/arch/hpcmips/tx

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:09:34 UTC 2011

Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c

Log Message:
Explicitly include mips/locore.h for softint_process().


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/tx/tx39icu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.28 src/sys/arch/hpcmips/tx/tx39icu.c:1.29
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.28	Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/tx/tx39icu.c	Sat Feb 26 12:09:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39icu.c,v 1.28 2011/02/20 07:58:14 matt Exp $ */
+/*	$NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.28 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $);
 
 #include opt_vr41xx.h
 #include opt_tx39xx.h
@@ -49,6 +49,7 @@
 #include uvm/uvm_extern.h
 
 #include mips/cpuregs.h
+#include mips/locore.h
 #include machine/bus.h
 
 #include hpcmips/tx/tx39var.h

CVS commit: src/sys/arch/hpcmips/tx

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 12:54:41 UTC 2011

Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c

Log Message:
Mechanically adapt to new interrupt/spl framework. Untested.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/tx/tx39icu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.29 src/sys/arch/hpcmips/tx/tx39icu.c:1.30
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.29	Sat Feb 26 12:09:34 2011
+++ src/sys/arch/hpcmips/tx/tx39icu.c	Sat Feb 26 12:54:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $ */
+/*	$NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $);
 
 #include opt_vr41xx.h
 #include opt_tx39xx.h
@@ -39,6 +39,8 @@
 #include opt_tx39icu_debug.h
 #include opt_tx39_watchdogtimer.h
 
+#define	__INTR_PRIVATE
+
 #include sys/param.h
 #include sys/systm.h
 #include sys/device.h
@@ -49,8 +51,8 @@
 #include uvm/uvm_extern.h
 
 #include mips/cpuregs.h
-#include mips/locore.h
 #include machine/bus.h
+#include machine/intr.h
 
 #include hpcmips/tx/tx39var.h
 #include hpcmips/tx/tx39icureg.h
@@ -66,7 +68,7 @@
 #else
 #define	TX_INTR	cpu_intr	/* locore_mips3 directly call this */
 #endif
-void TX_INTR(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void TX_INTR(int, vaddr_t, uint32_t);
 
 #ifdef	TX39ICU_DEBUG
 #define DPRINTF_ENABLE
@@ -74,29 +76,26 @@
 #endif
 #include machine/debug.h
 
-u_int32_t tx39intrvec;
+uint32_t tx39intrvec;
 
 /*
  * This is a mask of bits to clear in the SR when we go to a
  * given interrupt priority level.
  */
-const u_int32_t __ipl_sr_bits_tx[_IPL_N] = {
-	0,	/* IPL_NONE */
-
-	MIPS_SOFT_INT_MASK_0,			/* IPL_SOFTCLOCK */
-
-	MIPS_SOFT_INT_MASK_0|
-		MIPS_SOFT_INT_MASK_1,		/* IPL_SOFTNET */
-
-	MIPS_SOFT_INT_MASK_0|
-		MIPS_SOFT_INT_MASK_1|
-		MIPS_INT_MASK_2|
-		MIPS_INT_MASK_4,		/* IPL_VM */
-
-	MIPS_SOFT_INT_MASK_0|
-		MIPS_SOFT_INT_MASK_1|
-		MIPS_INT_MASK_2|
-		MIPS_INT_MASK_4,		/* IPL_SCHED */
+const struct ipl_sr_map __ipl_sr_map_tx = {
+.sr_bits = {
+	[IPL_NONE] =		0,
+	[IPL_SOFTCLOCK] =	MIPS_SOFT_INT_MASK_0,
+	[IPL_SOFTNET] =		MIPS_SOFT_INT_MASK,
+	[IPL_VM] =		MIPS_SOFT_INT_MASK
+| MIPS_INT_MASK_2
+| MIPS_INT_MASK_4,
+	[IPL_SCHED] =		MIPS_SOFT_INT_MASK
+| MIPS_INT_MASK_2
+| MIPS_INT_MASK_4,
+	[IPL_DDB] =		MIPS_INT_MASK,
+	[IPL_HIGH] =		MIPS_INT_MASK,
+	},
 };
 
 /* IRQHIGH lines list */
@@ -201,14 +200,13 @@
 
 int	tx39icu_match(struct device *, struct cfdata *, void *);
 void	tx39icu_attach(struct device *, struct device *, void *);
-int	tx39icu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
 
 void	tx39_intr_dump(struct tx39icu_softc *);
 void	tx39_intr_decode(int, int *, int *);
 void	tx39_irqhigh_disestablish(tx_chipset_tag_t, int, int, int);
 void	tx39_irqhigh_establish(tx_chipset_tag_t, int, int, int, 
 	int (*)(void *), void *);
-void	tx39_irqhigh_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void	tx39_irqhigh_intr(uint32_t, uint32_t, uint32_t);
 int	tx39_irqhigh(int, int);
 
 CFATTACH_DECL(tx39icu, sizeof(struct tx39icu_softc),
@@ -306,23 +304,15 @@
 }
 
 void
-TX_INTR(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+TX_INTR(int ppl, vaddr_t pc, uint32_t status)
 {
+	uint32_t ipending;
+	int ipl;
 	struct tx39icu_softc *sc;
 	tx_chipset_tag_t tc;
-	struct cpu_info *ci;
 	txreg_t reg, pend, *regs;
 	int i, j;
 
-	ci = curcpu();
-	ci-ci_idepth++;
-	ci-ci_data.cpu_nintr++;
-
-#ifdef __HAVE_FAST_SOFTINTS
-	if ((ipending  MIPS_HARD_INT_MASK) == 0)
-		goto softintr;
-#endif
-
 	tc = tx_conf_get_tag();
 	sc = tc-tc_intrt;
 	/*
@@ -340,89 +330,92 @@
 	regs[8] = tx_conf_read(tc, TX39_INTRSTATUS8_REG);
 #endif
 
+	while (ppl  (ipl = splintr(ipending))) {
 #ifdef TX39ICU_DEBUG
-	if (!(ipending  MIPS_INT_MASK_4)  !(ipending  MIPS_INT_MASK_2)) {
-		dbg_bit_print(ipending);
-		panic(bogus HwInt);
-	}
-	if (tx39icu_debug  1) {
-		tx39_intr_dump(sc);
-	}
+		if (!(ipending  MIPS_INT_MASK_4) 
+		!(ipending  MIPS_INT_MASK_2)) {
+			dbg_bit_print(ipending);
+			panic(bogus HwInt);
+		}
+		if (tx39icu_debug  1) {
+			tx39_intr_dump(sc);
+		}
 #endif /* TX39ICU_DEBUG */
 
-	/* IRQHIGH */
-	if (ipending  MIPS_INT_MASK_4) {
-		tx39_irqhigh_intr(ipending, pc, status, cause);
-
-#ifdef __HAVE_FAST_SOFTINTS
-		goto softintr;
-#endif
-	}
+		/* IRQHIGH */
+		if (ipending  MIPS_INT_MASK_4) {
+			tx39_irqhigh_intr(ipending, pc, status);
+		}
 
-	/* IRQLOW */
-	if (ipending  MIPS_INT_MASK_2) {
-		for (i = 1; i = TX39_INTRSET_MAX; i++) {
-			int ofs;
+		/* IRQLOW */
+		if (ipending  

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Feb 26 12:56:36 UTC 2011

Modified Files:
src/common/lib/libprop: prop_string.3
src/lib/librt: mq.3

Log Message:
Remove duplicate the. From Henning Petersen in PR 44640.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libprop/prop_string.3
cvs rdiff -u -r1.4 -r1.5 src/lib/librt/mq.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libprop/prop_string.3
diff -u src/common/lib/libprop/prop_string.3:1.7 src/common/lib/libprop/prop_string.3:1.8
--- src/common/lib/libprop/prop_string.3:1.7	Mon Dec 14 06:06:22 2009
+++ src/common/lib/libprop/prop_string.3	Sat Feb 26 12:56:36 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: prop_string.3,v 1.7 2009/12/14 06:06:22 dholland Exp $
+.\	$NetBSD: prop_string.3,v 1.8 2011/02/26 12:56:36 wiz Exp $
 .\
 .\ Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -106,7 +106,7 @@
 on failure.
 .It Fn prop_string_copy prop_string_t string
 Copy a string.
-If the the string being copied is an immutable external C string reference,
+If the string being copied is an immutable external C string reference,
 then the copy is also immutable and references the same external C string.
 Returns
 .Dv NULL

Index: src/lib/librt/mq.3
diff -u src/lib/librt/mq.3:1.4 src/lib/librt/mq.3:1.5
--- src/lib/librt/mq.3:1.4	Wed Jul 28 20:49:12 2010
+++ src/lib/librt/mq.3	Sat Feb 26 12:56:35 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: mq.3,v 1.4 2010/07/28 20:49:12 jruoho Exp $
+.\ $NetBSD: mq.3,v 1.5 2011/02/26 12:56:35 wiz Exp $
 .\
 .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
 .\
@@ -192,7 +192,7 @@
 };
 .Ed
 .Pp
-The members in the the structure are:
+The members in the structure are:
 flags set for the message queue
 .Pq Va mq_flags ,
 the maximum number of messages in the queue

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 13:58:35 UTC 2011

Modified Files:
src/sys/arch/mips/mips: locore.S

Log Message:
- clear MIPS_FPU_EXCEPTION_BITS in MIPS_FPU_CSR in SIGILL case
  as noted in commit log of rev 1.158
- update comment to reflect changes in rev 1.109


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/mips/mips/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.182 src/sys/arch/mips/mips/locore.S:1.183
--- src/sys/arch/mips/mips/locore.S:1.182	Sat Feb 26 09:47:24 2011
+++ src/sys/arch/mips/mips/locore.S	Sat Feb 26 13:58:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.182 2011/02/26 09:47:24 tsutsui Exp $	*/
+/*	$NetBSD: locore.S,v 1.183 2011/02/26 13:58:34 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -645,12 +645,12 @@
  * Check to see if the instruction to be emulated is a floating-point
  * instruction.
  */
-	srl		t0, a0, MIPS_OPCODE_SHIFT
-	beq		t0, MIPS_OPCODE_C1, 4f
+	srl		t2, a0, MIPS_OPCODE_SHIFT
+	beq		t2, MIPS_OPCODE_C1, 4f
 	 nop
 
 /*
- * Send a floating point exception signal to the current LWP.
+ * Send an ILL signal to the current LWP if the instruction can't be emulated.
  */
 	srl		a2, 8
 	sll		a2, 8
@@ -659,6 +659,9 @@
 	REG_S		a2, TF_REG_CAUSE(a1)
 	REG_EPILOGUE
 
+	and		t2, t0, ~MIPS_FPU_EXCEPTION_BITS
+	ctc1		t2, MIPS_FPU_CSR
+
 	move		a1, a0# code = instruction
 	jal		_C_LABEL(mips_fpuillinst)
 	 move		a0, MIPS_CURLWP			# get current LWP

CVS commit: src/sys/arch

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sat Feb 26 14:43:18 UTC 2011

Modified Files:
src/sys/arch/x86/x86: cpu.c
src/sys/arch/xen/x86: cpu.c

Log Message:
Use config_defer(9) for cpu_rescan() in cpu_attach().
Also mark few local functions as static.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/x86/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.86 src/sys/arch/x86/x86/cpu.c:1.87
--- src/sys/arch/x86/x86/cpu.c:1.86	Thu Feb 24 15:42:17 2011
+++ src/sys/arch/x86/x86/cpu.c	Sat Feb 26 14:43:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.86 2011/02/24 15:42:17 jruoho Exp $	*/
+/*	$NetBSD: cpu.c,v 1.87 2011/02/26 14:43:18 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.86 2011/02/24 15:42:17 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.87 2011/02/26 14:43:18 jruoho Exp $);
 
 #include opt_ddb.h
 #include opt_mpbios.h		/* for MPDEBUG */
@@ -117,12 +117,11 @@
 #error cpu_info contains 32bit bitmasks
 #endif
 
-int cpu_match(device_t, cfdata_t, void *);
-voidcpu_attach(device_t, device_t, void *);
-int	cpu_rescan(device_t, const char *, const int *);
-void	cpu_childdetached(device_t, device_t);
-
-
+static int	cpu_match(device_t, cfdata_t, void *);
+static void	cpu_attach(device_t, device_t, void *);
+static void	cpu_defer(device_t);
+static int	cpu_rescan(device_t, const char *, const int *);
+static void	cpu_childdetached(device_t, device_t);
 static bool	cpu_suspend(device_t, const pmf_qual_t *);
 static bool	cpu_resume(device_t, const pmf_qual_t *);
 static bool	cpu_shutdown(device_t, int);
@@ -214,7 +213,7 @@
 	pmap_update(pmap_kernel());
 }
 
-int
+static int
 cpu_match(device_t parent, cfdata_t match, void *aux)
 {
 
@@ -274,7 +273,7 @@
 }
 
 
-void
+static void
 cpu_attach(device_t parent, device_t self, void *aux)
 {
 	struct cpu_softc *sc = device_private(self);
@@ -449,10 +448,16 @@
 		);
 	}
 
+	(void)config_defer(self, cpu_defer);
+}
+
+static void
+cpu_defer(device_t self)
+{
 	cpu_rescan(self, NULL, NULL);
 }
 
-int
+static int
 cpu_rescan(device_t self, const char *ifattr, const int *locators)
 {
 	struct cpu_softc *sc = device_private(self);
@@ -486,7 +491,7 @@
 	return 0;
 }
 
-void
+static void
 cpu_childdetached(device_t self, device_t child)
 {
 	struct cpu_softc *sc = device_private(self);

Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.55 src/sys/arch/xen/x86/cpu.c:1.56
--- src/sys/arch/xen/x86/cpu.c:1.55	Thu Feb 24 19:00:58 2011
+++ src/sys/arch/xen/x86/cpu.c	Sat Feb 26 14:43:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.55 2011/02/24 19:00:58 jruoho Exp $	*/
+/*	$NetBSD: cpu.c,v 1.56 2011/02/26 14:43:18 jruoho Exp $	*/
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.55 2011/02/24 19:00:58 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.56 2011/02/26 14:43:18 jruoho Exp $);
 
 #include opt_ddb.h
 #include opt_multiprocessor.h
@@ -115,14 +115,15 @@
 #error cpu_info contains 32bit bitmasks
 #endif
 
-int	cpu_match(device_t, cfdata_t, void *);
-void	cpu_attach(device_t, device_t, void *);
-int	cpu_rescan(device_t, const char *, const int *);
-void	cpu_childdetached(device_t, device_t);
-int	vcpu_match(device_t, cfdata_t, void *);
-void	vcpu_attach(device_t, device_t, void *);
-void	cpu_attach_common(device_t, device_t, void *);
-void	cpu_offline_md(void);
+static int	cpu_match(device_t, cfdata_t, void *);
+static void	cpu_attach(device_t, device_t, void *);
+static void	cpu_defer(device_t);
+static int	cpu_rescan(device_t, const char *, const int *);
+static void	cpu_childdetached(device_t, device_t);
+static int	vcpu_match(device_t, cfdata_t, void *);
+static void	vcpu_attach(device_t, device_t, void *);
+static void	cpu_attach_common(device_t, device_t, void *);
+void		cpu_offline_md(void);
 
 struct cpu_softc {
 	device_t sc_dev;		/* device tree glue */
@@ -209,14 +210,14 @@
 }
 #endif	/* MULTIPROCESSOR */
 
-int
+static int
 cpu_match(device_t parent, cfdata_t match, void *aux)
 {
 
 	return 1;
 }
 
-void
+static void
 cpu_attach(device_t parent, device_t self, void *aux)
 {
 	struct cpu_softc *sc = device_private(self);
@@ -270,10 +271,16 @@
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, couldn't establish power handler\n);
 
-	return;
+	(void)config_defer(self, cpu_defer);
 }
 
-int
+static void
+cpu_defer(device_t self)
+{
+	cpu_rescan(self, NULL, NULL);
+}
+
+static int
 cpu_rescan(device_t self, const char *ifattr, const int *locators)
 {
 	struct cpu_softc *sc = device_private(self);
@@ -295,7 +302,7 @@
 	

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 15:01:32 UTC 2011

Modified Files:
src/sys/arch/mips/mips: fp.S

Log Message:
Use proper CALLFRAME_FRAME and CALLFRAME_CAUSE macro.

XXX: is it safe to use (CALLFRAME_SIZ + 3*SZREG(sp)) to save FSR?


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/mips/fp.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.41 src/sys/arch/mips/mips/fp.S:1.42
--- src/sys/arch/mips/mips/fp.S:1.41	Sat Feb 26 12:02:01 2011
+++ src/sys/arch/mips/mips/fp.S	Sat Feb 26 15:01:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fp.S,v 1.41 2011/02/26 12:02:01 tsutsui Exp $	*/
+/*	$NetBSD: fp.S,v 1.42 2011/02/26 15:01:31 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -2833,8 +2833,8 @@
 	#nop
 	INT_S	a2, PCB_FPREGS+FRAME_FSR(v0)
 #endif
-	REG_L	a1, CALLFRAME_SIZ + 1*SZREG(sp)	# frame
-	REG_L	a2, CALLFRAME_SIZ + 2*SZREG(sp)	# cause
+	REG_L	a1, CALLFRAME_FRAME(sp)		# frame
+	REG_L	a2, CALLFRAME_CAUSE(sp)		# cause
 	REG_L	ra, CALLFRAME_RA(sp)
 	PTR_ADDU sp, CALLFRAME_SIZ
 	j	_C_LABEL(fpemul_sigfpe)

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 26 15:41:32 UTC 2011

Modified Files:
src/sys/arch/mips/mips: fp.S mips_fputrap.c

Log Message:
Use mips_fpexcept() instead of fpemul_trapsignal() to deliver SIGFPE,
and remove now unused fpemul_trapsignal() introduced for PR port-mips/26410.

Fixes PR port-mips/35326 and now t_except unmasked tests in
/usr/tests/lib/libc/ieeefp pass.

Note t_subnormal double test still fails as mentioned in PR port-mips/44639.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mips/mips/fp.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/mips_fputrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.42 src/sys/arch/mips/mips/fp.S:1.43
--- src/sys/arch/mips/mips/fp.S:1.42	Sat Feb 26 15:01:31 2011
+++ src/sys/arch/mips/mips/fp.S	Sat Feb 26 15:41:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fp.S,v 1.42 2011/02/26 15:01:31 tsutsui Exp $	*/
+/*	$NetBSD: fp.S,v 1.43 2011/02/26 15:41:32 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -2833,6 +2833,7 @@
 	#nop
 	INT_S	a2, PCB_FPREGS+FRAME_FSR(v0)
 #endif
+	move	a3, a2# fpustat
 	REG_L	a1, CALLFRAME_FRAME(sp)		# frame
 	REG_L	a2, CALLFRAME_CAUSE(sp)		# cause
 	REG_L	ra, CALLFRAME_RA(sp)
@@ -4572,10 +4573,9 @@
 	REG_S	a2, TF_REG_CAUSE(a1)
 	REG_EPILOGUE
 
-	move	a2, a0# code = instruction
+	move	a1, a3# fpustat
 	move	a0, MIPS_CURLWP			# get current lwp
-	li	a1, SIGFPE
-	j	_C_LABEL(fpemul_trapsignal)
+	j	_C_LABEL(mips_fpuexcept)
 END(fpemul_sigfpe)
 
 #ifdef FPEMUL
@@ -4587,9 +4587,8 @@
 	REG_S	a2, TF_REG_CAUSE(a1)
 	REG_EPILOGUE
 
-	move	a2, a0# code = instruction
+	move	a1, a3# fpustat
 	move	a0, MIPS_CURLWP			# get current lwp
-	li	a1, SIGFPE
-	j	_C_LABEL(fpemul_trapsignal)
+	j	_C_LABEL(mips_fpuexcept)
 END(mips_emul_sigfpe)
 #endif

Index: src/sys/arch/mips/mips/mips_fputrap.c
diff -u src/sys/arch/mips/mips/mips_fputrap.c:1.9 src/sys/arch/mips/mips/mips_fputrap.c:1.10
--- src/sys/arch/mips/mips/mips_fputrap.c:1.9	Sat Feb 26 11:05:54 2011
+++ src/sys/arch/mips/mips/mips_fputrap.c	Sat Feb 26 15:41:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fputrap.c,v 1.9 2011/02/26 11:05:54 tsutsui Exp $ */
+/* $NetBSD: mips_fputrap.c,v 1.10 2011/02/26 15:41:32 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -99,22 +99,3 @@
 	return FPE_FLTINV;
 }
 #endif /* FPEMUL || !NOFPU */
-
-void fpemul_trapsignal(struct lwp *, unsigned int, unsigned int);
-
-void
-fpemul_trapsignal(struct lwp *l, unsigned int sig, unsigned int code)
-{
-	ksiginfo_t ksi;
-
-#ifdef FPEMUL_DEBUG
-	printf(%s(%x,%x,%#PRIxREGISTER)\n,
-	   __func__, sig, code, l-l_md.md_utf-tf_regs[_R_PC]);
-#endif
-
-	KSI_INIT_TRAP(ksi);
-	ksi.ksi_signo = sig;
-	ksi.ksi_code = 1; /* XXX */
-	ksi.ksi_trap = code;
-	(*l-l_proc-p_emul-e_trapsignal)(l, ksi);
-}

CVS commit: src/sys/arch/sgimips/stand

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Feb 26 16:26:58 UTC 2011

Modified Files:
src/sys/arch/sgimips/stand: Makefile.booters
src/sys/arch/sgimips/stand/boot: Makefile

Log Message:
Make sure that sgimips64 can build the O32 bootloaders


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/stand/Makefile.booters
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sgimips/stand/boot/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sgimips/stand/Makefile.booters
diff -u src/sys/arch/sgimips/stand/Makefile.booters:1.20 src/sys/arch/sgimips/stand/Makefile.booters:1.21
--- src/sys/arch/sgimips/stand/Makefile.booters:1.20	Sun Feb 20 07:59:51 2011
+++ src/sys/arch/sgimips/stand/Makefile.booters	Sat Feb 26 16:26:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.20 2011/02/20 07:59:51 matt Exp $
+# $NetBSD: Makefile.booters,v 1.21 2011/02/26 16:26:58 matt Exp $
 
 # PROG set by parent.
 NOMAN=		# defined
@@ -26,9 +26,8 @@
 # compiler flags for smallest code size
 CFLAGS=		-ffreestanding -Os -Wall -Werror -mno-abicalls -msoft-float -G 1024
 .if ${MACHINE_ARCH} == mips64eb
-CPUFLAGS+=	-mips3 -mabi=32
-LDFLAGS+=	-mips3 -mabi=32
-MACHINE_ARCH=	mipseb
+AFLAGS+=	-mips3 -mabi=32
+CFLAGS+=	-mips3 -mabi=32
 .endif
 CWARNFLAGS+=	-Wall -Werror
 CWARNFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith

Index: src/sys/arch/sgimips/stand/boot/Makefile
diff -u src/sys/arch/sgimips/stand/boot/Makefile:1.18 src/sys/arch/sgimips/stand/boot/Makefile:1.19
--- src/sys/arch/sgimips/stand/boot/Makefile:1.18	Sun Feb 20 07:59:51 2011
+++ src/sys/arch/sgimips/stand/boot/Makefile	Sat Feb 26 16:26:58 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/02/20 07:59:51 matt Exp $
+#	$NetBSD: Makefile,v 1.19 2011/02/26 16:26:58 matt Exp $
 
 
 # Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@@ -31,14 +31,14 @@
 ip3xboot: ${OBJS} ${LIBS}
 	${_MKTARGET_LINK}
 	${LD} -Map ${.TARGET}.map -N -x -Ttext ${LOAD_ADDRESS_IP32} ${LDBUG} \
-	-e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
+	-m elf32btsmip -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
 	@${STRIP} -s ${.TARGET}.elf -o ${.TARGET}
 	@${SIZE} ${.TARGET}
 
 ip2xboot: ${OBJS} ${LIBS}
 	${_MKTARGET_LINK}
 	${LD} -Map ${.TARGET}.map -N -x -Ttext ${LOAD_ADDRESS} ${LDBUG} \
-	-e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
+	-m elf32btsmip -e start -o ${.TARGET}.elf ${OBJS} ${LIBS}
 	@${STRIP} -s ${.TARGET}.elf -o ${.TARGET}
 	@${SIZE} ${.TARGET}
 

CVS commit: src/sys/lib/libkern

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Feb 26 16:28:10 UTC 2011

Modified Files:
src/sys/lib/libkern: Makefile.libkern

Log Message:
Add quad srcs if using MIPS O32 ABI


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libkern/Makefile.libkern

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.10 src/sys/lib/libkern/Makefile.libkern:1.11
--- src/sys/lib/libkern/Makefile.libkern:1.10	Tue May 11 21:50:35 2010
+++ src/sys/lib/libkern/Makefile.libkern	Sat Feb 26 16:28:10 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libkern,v 1.10 2010/05/11 21:50:35 pooka Exp $
+#	$NetBSD: Makefile.libkern,v 1.11 2011/02/26 16:28:10 matt Exp $
 
 # 
 # Variable definitions for libkern.  
@@ -43,8 +43,8 @@
 .endif
 
 .if (${MACHINE_ARCH} != alpha)  \
-(${MACHINE_ARCH} != mips64eb)  \
-(${MACHINE_ARCH} != mips64el)  \
+(${MACHINE_ARCH} != mips64eb || !empty(CFLAGS:M-mabi=32))  \
+(${MACHINE_ARCH} != mips64el || !empty(CFLAGS:M-mabi=32))  \
 (${MACHINE_ARCH} != powerpc64)  \
 (${MACHINE_ARCH} != sparc64)  \
 (${MACHINE_ARCH} != x86_64)

CVS commit: src/lib/csu/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Feb 26 17:11:23 UTC 2011

Modified Files:
src/lib/csu/powerpc: crt0.c

Log Message:
When loading r13 and r2 with _SDA_BASE_ and _SDA2_BASE, do so in a PIC
manner.  With this change, simple programs can now run with MKPIE=yes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/lib/csu/powerpc/crt0.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/csu/powerpc/crt0.c
diff -u src/lib/csu/powerpc/crt0.c:1.27 src/lib/csu/powerpc/crt0.c:1.28
--- src/lib/csu/powerpc/crt0.c:1.27	Tue Feb 22 05:45:07 2011
+++ src/lib/csu/powerpc/crt0.c	Sat Feb 26 17:11:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.c,v 1.27 2011/02/22 05:45:07 joerg Exp $ */
+/* $NetBSD: crt0.c,v 1.28 2011/02/26 17:11:23 matt Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -63,11 +63,17 @@
 	 * Initialize the Small Data Area registers.
 	 * _SDA_BASE is defined in the SVR4 ABI for PPC.
 	 * _SDA2_BASE is defined in the E[mbedded] ABI for PPC.
+	 *
+	 * Do the initialization in a PIC manner.
 	 */
-	__asm(  lis %r13,rtld_SDA_BASE_@ha;
-		addi %r13,%r13,rtld_SDA_BASE_@l;
-		lis %r2,rtld_SDA2_BASE_@ha;
-		addi %r2,%r2,rtld_SDA2_BASE_@l );
+	__asm(
+		bcl 20,31,1f;
+		1: mflr 11;
+		addis 13,11,rtld_SDA_BASE_-1b@ha;
+		addi 13,13,rtld_SDA_BASE_-1b@l;
+		addis 2,11,rtld_SDA2_BASE_-1b@ha;
+		addi 2,2,rtld_SDA2_BASE_-1b@l
+	::: lr );
 
 	if ((namep = argv[0]) != NULL) {	/* NULL ptr if argc = 0 */
 		if ((__progname = _strrchr(namep, '/')) == NULL)
@@ -101,7 +107,7 @@
  * NOTE: Leave the RCS ID _after_ __start(), in case it gets placed in .text.
  */
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: crt0.c,v 1.27 2011/02/22 05:45:07 joerg Exp $);
+__RCSID($NetBSD: crt0.c,v 1.28 2011/02/26 17:11:23 matt Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include common.c

CVS commit: src/sys/lib/libkern

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sat Feb 26 18:17:55 UTC 2011

Modified Files:
src/sys/lib/libkern: Makefile.libkern

Log Message:
Add quad srcs if building x86_64 32-bit libkern.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/lib/libkern/Makefile.libkern

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.11 src/sys/lib/libkern/Makefile.libkern:1.12
--- src/sys/lib/libkern/Makefile.libkern:1.11	Sat Feb 26 16:28:10 2011
+++ src/sys/lib/libkern/Makefile.libkern	Sat Feb 26 18:17:55 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libkern,v 1.11 2011/02/26 16:28:10 matt Exp $
+#	$NetBSD: Makefile.libkern,v 1.12 2011/02/26 18:17:55 jakllsch Exp $
 
 # 
 # Variable definitions for libkern.  
@@ -47,7 +47,7 @@
 (${MACHINE_ARCH} != mips64el || !empty(CFLAGS:M-mabi=32))  \
 (${MACHINE_ARCH} != powerpc64)  \
 (${MACHINE_ARCH} != sparc64)  \
-(${MACHINE_ARCH} != x86_64)
+(${MACHINE_ARCH} != x86_64 || !empty(CFLAGS:M-m32))
 # Quad support
 SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \

CVS commit: src/sys/arch/i386/stand/boot

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sat Feb 26 18:22:59 UTC 2011

Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot

Log Message:
Enable LIBSA_PRINTF_LONGLONG_SUPPORT.
Useful in any of the cases where we already print a (64-bit) daddr_t.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/stand/boot/Makefile.boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.49 src/sys/arch/i386/stand/boot/Makefile.boot:1.50
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.49	Sat Jan 22 19:19:18 2011
+++ src/sys/arch/i386/stand/boot/Makefile.boot	Sat Feb 26 18:22:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.49 2011/01/22 19:19:18 joerg Exp $
+# $NetBSD: Makefile.boot,v 1.50 2011/02/26 18:22:58 jakllsch Exp $
 
 S=	${.CURDIR}/../../../../..
 
@@ -81,6 +81,7 @@
 # loaded at physical address 0x1.
 # XXX The heap values should be determined from _end.
 SAMISCCPPFLAGS+= -DHEAP_START=0x4 -DHEAP_LIMIT=0x7
+SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
 SAMISCMAKEFLAGS+= SA_USE_CREAD=yes	# Read compressed kernels
 SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no	# Netboot via TFTP, NFS
 

CVS commit: src/external/bsd/ntp/bin

[Iain Hibbert]

Module Name:src
Committed By:   plunky
Date:   Sat Feb 26 19:17:38 UTC 2011

Modified Files:
src/external/bsd/ntp/bin/ntp-keygen: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/bin/ntpdc: Makefile
src/external/bsd/ntp/bin/ntpq: Makefile

Log Message:
clean up man files copied during build

also.. while we are putting the pages into different sections,
lets change the manpage contents to reflect that


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/bin/ntp-keygen/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/bin/ntpdc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/bin/ntpq/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ntp/bin/ntp-keygen/Makefile
diff -u src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.2 src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.3
--- src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.2	Sat Aug 28 15:42:46 2010
+++ src/external/bsd/ntp/bin/ntp-keygen/Makefile	Sat Feb 26 19:17:37 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/08/28 15:42:46 kardel Exp $
+#	$NetBSD: Makefile,v 1.3 2011/02/26 19:17:37 plunky Exp $
 
 NOGCCERROR=yes
 
@@ -24,6 +24,9 @@
 .PATH: ${DIST}
 
 ntp-keygen.8:	ntp-keygen.1
-	@cp $? $@
+	${_MKTARGET_BUILD}
+	${TOOL_SED} -e s,NTP-KEYGEN 1,NTP-KEYGEN 8, $?  $@
+
+CLEANFILES+=ntp-keygen.8
 
 .include bsd.prog.mk

Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.7 src/external/bsd/ntp/bin/ntpd/Makefile:1.8
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.7	Sat Dec  4 23:08:33 2010
+++ src/external/bsd/ntp/bin/ntpd/Makefile	Sat Feb 26 19:17:37 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2010/12/04 23:08:33 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2011/02/26 19:17:37 plunky Exp $
 
 #NOGCCERROR=yes
 
@@ -86,7 +86,10 @@
 .PATH: ${DIST}
 
 ntpd.8: ntpd.1
-	@cp $? $@
+	${_MKTARGET_BUILD}
+	${TOOL_SED} -e s,NTPD 1,NTPD 8, $?  $@
+
+CLEANFILES+=ntpd.8
 
 .include bsd.prog.mk
 

Index: src/external/bsd/ntp/bin/ntpdc/Makefile
diff -u src/external/bsd/ntp/bin/ntpdc/Makefile:1.3 src/external/bsd/ntp/bin/ntpdc/Makefile:1.4
--- src/external/bsd/ntp/bin/ntpdc/Makefile:1.3	Wed Sep  1 16:26:11 2010
+++ src/external/bsd/ntp/bin/ntpdc/Makefile	Sat Feb 26 19:17:38 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/09/01 16:26:11 he Exp $
+#	$NetBSD: Makefile,v 1.4 2011/02/26 19:17:38 plunky Exp $
 
 .include bsd.own.mk
 
@@ -23,6 +23,9 @@
 .PATH: ${DIST}
 
 ntpdc.8:	ntpdc.1
-	@cp $? $@
+	${_MKTARGET_BUILD}
+	${TOOL_SED} -e s,NTPDC 1,NTPDC 8, $?  $@
+
+CLEANFILES+=ntpdc.8
 
 .include bsd.prog.mk

Index: src/external/bsd/ntp/bin/ntpq/Makefile
diff -u src/external/bsd/ntp/bin/ntpq/Makefile:1.3 src/external/bsd/ntp/bin/ntpq/Makefile:1.4
--- src/external/bsd/ntp/bin/ntpq/Makefile:1.3	Wed Sep  1 16:43:39 2010
+++ src/external/bsd/ntp/bin/ntpq/Makefile	Sat Feb 26 19:17:38 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/09/01 16:43:39 he Exp $
+#	$NetBSD: Makefile,v 1.4 2011/02/26 19:17:38 plunky Exp $
 
 # NOGCCERROR=yes
 
@@ -25,5 +25,9 @@
 
 ntpq.8:	ntpq.1
 	@cp $? $@
+	${_MKTARGET_BUILD}
+	${TOOL_SED} -e s,NTPQ 1,NTPQ 8, $?  $@
+
+CLEANFILES+=ntpq.8
 
 .include bsd.prog.mk

CVS commit: src/usr.bin/mkubootimage

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Feb 26 20:03:09 UTC 2011

Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c uboot.h

Log Message:
Add the -O option to set the OS type, which defaults to NetBSD when missing.
This is needed, because some vendors have stripped U-Boot so much that it
only accepts Linux kernel modules.
Also allow 'standalone' as module type.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/mkubootimage/uboot.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.5 src/usr.bin/mkubootimage/mkubootimage.c:1.6
--- src/usr.bin/mkubootimage/mkubootimage.c:1.5	Mon Jan 31 03:37:28 2011
+++ src/usr.bin/mkubootimage/mkubootimage.c	Sat Feb 26 20:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.6 2011/02/26 20:03:09 phx Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $);
+__RCSID($NetBSD: mkubootimage.c,v 1.6 2011/02/26 20:03:09 phx Exp $);
 
 #include sys/mman.h
 #include sys/stat.h
@@ -53,6 +53,7 @@
 
 extern uint32_t crc32(const void *, size_t);
 
+static enum uboot_image_os image_os = IH_OS_NETBSD;
 static enum uboot_image_arch image_arch = IH_ARCH_UNKNOWN;
 static enum uboot_image_type image_type = IH_TYPE_UNKNOWN;
 static enum uboot_image_comp image_comp = IH_COMP_NONE;
@@ -60,6 +61,29 @@
 static uint32_t image_entrypoint = 0;
 static char *image_name;
 
+struct uboot_os {
+	enum uboot_image_os os;
+	const char *name;
+} uboot_os[] = {
+	{ IH_OS_OPENBSD,	openbsd },
+	{ IH_OS_NETBSD,		netbsd },
+	{ IH_OS_FREEBSD,	freebsd },
+	{ IH_OS_LINUX,		linux },
+};
+
+static enum uboot_image_os
+get_os(const char *name)
+{
+	unsigned int i;
+
+	for (i = 0; i  __arraycount(uboot_os); i++) {
+		if (strcmp(uboot_os[i].name, name) == 0)
+			return uboot_os[i].os;
+	}
+
+	return IH_OS_UNKNOWN;
+}
+
 struct uboot_arch {
 	enum uboot_image_arch arch;
 	const char *name;
@@ -87,6 +111,7 @@
 	enum uboot_image_type type;
 	const char *name;
 } uboot_type[] = {
+	{ IH_TYPE_STANDALONE,	standalone },
 	{ IH_TYPE_KERNEL,	kernel },
 	{ IH_TYPE_RAMDISK,	ramdisk },
 	{ IH_TYPE_FILESYSTEM,	fs },
@@ -131,8 +156,9 @@
 usage(void)
 {
 	fprintf(stderr, usage: mkubootimage -A arm|mips|mips64|powerpc);
-	fprintf(stderr,  -T kernel|ramdisk|fs);
 	fprintf(stderr,  -C none|gz|bz2);
+	fprintf(stderr,  -O openbsd|netbsd|freebsd|linux);
+	fprintf(stderr,  -T standalone|kernel|ramdisk|fs);
 	fprintf(stderr,  -a addr [-e ep] -n name);
 	fprintf(stderr,  srcfile dstfile\n);
 
@@ -192,7 +218,7 @@
 	hdr-ih_load = htonl(image_loadaddr);
 	hdr-ih_ep = htonl(image_entrypoint);
 	hdr-ih_dcrc = htonl(crc);
-	hdr-ih_os = IH_OS_NETBSD;
+	hdr-ih_os = image_os;
 	hdr-ih_arch = image_arch;
 	hdr-ih_type = image_type;
 	hdr-ih_comp = image_comp;
@@ -238,7 +264,7 @@
 	int ch;
 	unsigned long num;
 
-	while ((ch = getopt(argc, argv, A:C:T:a:e:hn:)) != -1) {
+	while ((ch = getopt(argc, argv, A:C:O:T:a:e:hn:)) != -1) {
 		switch (ch) {
 		case 'A':	/* arch */
 			image_arch = get_arch(optarg);
@@ -246,6 +272,9 @@
 		case 'C':	/* comp */
 			image_comp = get_comp(optarg);
 			break;
+		case 'O':	/* os */
+			image_os = get_os(optarg);
+			break;
 		case 'T':	/* type */
 			image_type = get_type(optarg);
 			break;

Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.2 src/usr.bin/mkubootimage/uboot.h:1.3
--- src/usr.bin/mkubootimage/uboot.h:1.2	Mon Jan 31 03:37:28 2011
+++ src/usr.bin/mkubootimage/uboot.h	Sat Feb 26 20:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.2 2011/01/31 03:37:28 matt Exp $ */
+/* $NetBSD: uboot.h,v 1.3 2011/02/26 20:03:09 phx Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -28,7 +28,13 @@
 #ifndef _HAVE_UBOOT_H
 #define _HAVE_UBOOT_H
 
-#define	IH_OS_NETBSD	2
+enum uboot_image_os {
+	IH_OS_UNKNOWN = 0,
+	IH_OS_OPENBSD = 1,
+	IH_OS_NETBSD = 2,
+	IH_OS_FREEBSD = 3,
+	IH_OS_LINUX = 5
+};
 
 enum uboot_image_arch {
 	IH_ARCH_UNKNOWN = 0,
@@ -40,6 +46,7 @@
 
 enum uboot_image_type {
 	IH_TYPE_UNKNOWN = 0,
+	IH_TYPE_STANDALONE = 1,
 	IH_TYPE_KERNEL = 2,
 	IH_TYPE_RAMDISK = 3,
 	IH_TYPE_FILESYSTEM = 7,

CVS commit: src/sys/arch/sandpoint/stand/altboot

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Feb 26 20:11:24 UTC 2011

Modified Files:
src/sys/arch/sandpoint/stand/altboot: Makefile entry.S main.c version

Log Message:
Build altboot.img, which fakes a Linux kernel module, loadable with bootm,
for extremely stripped U-Boot firmware. Arguments are passed through the
bootargs environment variable, which is detected automatically when
using bootm.
The startup code also fixes a bug in bootm, which doesn't flush the cache
before running the image.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sandpoint/stand/altboot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sandpoint/stand/altboot/entry.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/stand/altboot/version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sandpoint/stand/altboot/Makefile
diff -u src/sys/arch/sandpoint/stand/altboot/Makefile:1.7 src/sys/arch/sandpoint/stand/altboot/Makefile:1.8
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.7	Fri Jan 28 22:15:36 2011
+++ src/sys/arch/sandpoint/stand/altboot/Makefile	Sat Feb 26 20:11:24 2011
@@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.7 2011/01/28 22:15:36 phx Exp $
+#	$NetBSD: Makefile,v 1.8 2011/02/26 20:11:24 phx Exp $
 
 S=		${.CURDIR}/../../../..
 
 PROG=		altboot
-FILES+=		${PROG}.bin
+FILES+=		${PROG}.bin ${PROG}.img
 NOMAN=		# defined
 SRCS=		entry.S main.c brdsetup.c pci.c devopen.c dev_net.c nif.c
 SRCS+=		fxp.c tlp.c rge.c skg.c dsk.c pciide.c siisata.c printf.c
 SRCS+=		vers.c
-CLEANFILES+=	vers.c ${PROG} ${PROG}.bin
+CLEANFILES+=	vers.c ${PROG} ${PROG}.bin ${PROG}.img
 CFLAGS+=	-Wall -Wno-main -ffreestanding -msoft-float -mmultiple
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CPPFLAGS+=	-D_STANDALONE -DSUPPORT_DHCP
@@ -63,6 +63,8 @@
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-	${OBJCOPY} -S -O binary ${.TARGET} ${.TARGET}.bin
+	${OBJCOPY} -S -O binary ${PROG} ${PROG}.bin
+	${TOOL_MKUBOOTIMAGE} -A powerpc -T kernel -C none -O linux \
+	-a 0x${RELOC} -n ${PROG} ${PROG}.bin ${PROG}.img
 
 .include bsd.prog.mk

Index: src/sys/arch/sandpoint/stand/altboot/entry.S
diff -u src/sys/arch/sandpoint/stand/altboot/entry.S:1.1 src/sys/arch/sandpoint/stand/altboot/entry.S:1.2
--- src/sys/arch/sandpoint/stand/altboot/entry.S:1.1	Sun Jan 23 01:05:30 2011
+++ src/sys/arch/sandpoint/stand/altboot/entry.S	Sat Feb 26 20:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: entry.S,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: entry.S,v 1.2 2011/02/26 20:11:24 phx Exp $ */
 
 #include powerpc/psl.h
 #include powerpc/spr.h
@@ -9,8 +9,41 @@
 	.text
 	.globl _start
 _start:
+	/*
+	 * Save possible argc and argv values from the firmware, usually
+	 * passed in r3 and r4.
+	 * When started with bootm, as a Linux kernel module, r6 and r7
+	 * point to the start and end address of the bootargs.
+	 */
 	mr	30,3
 	mr	31,4
+	mr	28,6
+	mr	29,7
+
+	/*
+	 * U-Boot/PPCBoot forgets to flush the cache when using the bootm
+	 * command, so we have to do that now.
+	 */
+	lis	3,_start@ha
+	addi	3,3,_start@l
+	andi.	3,3,~31@l
+	lis	4,(_edata+31)@ha
+	addi	4,4,(_edata+31)@l
+	mr	5,3
+10:
+	dcbst	0,5
+	addi	5,5,32
+	cmplw	5,4
+	ble	10b
+	sync
+11:
+	icbi	0,3
+	addi	3,3,32
+	cmplw	3,4
+	ble	11b
+	sync
+	isync
+
 	mfspr	11,SPR_HID0
 	andi.	0,11,HID0_DCE
 	ori	11,11,HID0_ICE
@@ -93,6 +126,8 @@
 	bl	brdsetup
 	mr	3,30
 	mr	4,31
+	mr	5,28
+	mr	6,29
 	bl	main
 
 hang:	b	hang

Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.6 src/sys/arch/sandpoint/stand/altboot/main.c:1.7
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.6	Thu Feb 10 13:38:08 2011
+++ src/sys/arch/sandpoint/stand/altboot/main.c	Sat Feb 26 20:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2011/02/10 13:38:08 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.7 2011/02/26 20:11:24 phx Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
 void module_load(char *);
 int module_open(struct boot_module *);
 
-void main(int, char **);
+void main(int, char **, char *, char *);
 extern char bootprog_name[], bootprog_rev[];
 
 struct pcidev lata[2];
@@ -100,13 +100,18 @@
 uint32_t busclock, cpuclock;
 
 static int check_bootname(char *);
+static int parse_cmdline(char **, int, char *, char *);
+static int is_space(char);
+
 #define	BNAME_DEFAULT nfs:
+#define MAX_ARGS 10
 
 void
-main(int argc, char *argv[])
+main(int argc, char *argv[], char *bootargs_start, char *bootargs_end)
 {
 	struct brdprop *brdprop;
 	unsigned long marks[MARK_MAX];
+	char *new_argv[MAX_ARGS];
 	int n, i, fd, howto;
 	char *bname;
 
@@ -166,6 +171,18 @@
 	if (netif_init(lnif[0]) == 0)
 		printf(no NET device driver was 

CVS commit: src/distrib

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Feb 26 20:38:50 UTC 2011

Modified Files:
src/distrib/notes/common: contents
src/distrib/notes/sandpoint: install
src/distrib/sandpoint: Makefile
src/distrib/sets/lists/base: md.sandpoint

Log Message:
altboot.img: altboot as U-Boot image to fake a Linux kernel module


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/distrib/notes/common/contents
cvs rdiff -u -r1.8 -r1.9 src/distrib/notes/sandpoint/install
cvs rdiff -u -r1.6 -r1.7 src/distrib/sandpoint/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.sandpoint

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.166 src/distrib/notes/common/contents:1.167
--- src/distrib/notes/common/contents:1.166	Thu Feb 10 00:56:34 2011
+++ src/distrib/notes/common/contents	Sat Feb 26 20:38:49 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.166 2011/02/10 00:56:34 jym Exp $
+.\	$NetBSD: contents,v 1.167 2011/02/26 20:38:49 phx Exp $
 .\
 .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -371,6 +371,8 @@
 \*M bootloader in ELF format; see below
 .		It Pa altboot.bin
 \*M bootloader in binary format; see below
+.		It Pa altboot.img
+\*M bootloader as an U-Boot/PPCBoot image, suitable for bootm; see below
 .\}
 .
 .if \n[sgimips] \{\

Index: src/distrib/notes/sandpoint/install
diff -u src/distrib/notes/sandpoint/install:1.8 src/distrib/notes/sandpoint/install:1.9
--- src/distrib/notes/sandpoint/install:1.8	Thu Feb  3 21:04:52 2011
+++ src/distrib/notes/sandpoint/install	Sat Feb 26 20:38:49 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: install,v 1.8 2011/02/03 21:04:52 phx Exp $
+.\	$NetBSD: install,v 1.9 2011/02/26 20:38:49 phx Exp $
 .
 .Ss2 Prepare the NFS or TFTP server
 .
@@ -26,6 +26,12 @@
 .It
 Flash ROM
 .bullet)
+.Pp
+When your firmware is restricted to
+.Pa bootm
+as the only command to run a program you should use
+.Pa altboot.img
+, which fakes a Linux kernel module.
 .
 .Ss2 Booting the installer
 Depending on whether the serial console is attached to the first or the
@@ -59,6 +65,20 @@
 .Pp
 when the kernel resides on NFS.
 .Pp
+Note, that when using
+.Pa altboot.img
+with
+.Pa bootm
+instead of
+.Pa altboot.bin
+you have to pass arguments like
+.Pa tftp:
+or
+.Pa nfs:
+in the
+.Pa bootargs
+enviroment variable.
+.Pp
 The installation kernel will run
 .Pa sysinst
 from an internal memory disk image.

Index: src/distrib/sandpoint/Makefile
diff -u src/distrib/sandpoint/Makefile:1.6 src/distrib/sandpoint/Makefile:1.7
--- src/distrib/sandpoint/Makefile:1.6	Fri Jan 28 22:15:35 2011
+++ src/distrib/sandpoint/Makefile	Sat Feb 26 20:38:50 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/01/28 22:15:35 phx Exp $
+#	$NetBSD: Makefile,v 1.7 2011/02/26 20:38:50 phx Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -9,7 +9,7 @@
 TARGETS+=	release
 
 BOOTOBJ!=	cd ${KERNSRCDIR}/arch/sandpoint/stand/altboot  ${PRINTOBJDIR}
-ALTBOOTERS=	${BOOTOBJ}/altboot ${BOOTOBJ}/altboot.bin
+ALTBOOTERS=	${BOOTOBJ}/altboot ${BOOTOBJ}/altboot.bin ${BOOTOBJ}/altboot.img
 
 release: check_RELEASEDIR .WAIT ${ALTBOOTERS}
 	${RELEASE_INSTALL} ${ALTBOOTERS} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation

Index: src/distrib/sets/lists/base/md.sandpoint
diff -u src/distrib/sets/lists/base/md.sandpoint:1.7 src/distrib/sets/lists/base/md.sandpoint:1.8
--- src/distrib/sets/lists/base/md.sandpoint:1.7	Fri Jan 28 22:15:35 2011
+++ src/distrib/sets/lists/base/md.sandpoint	Sat Feb 26 20:38:50 2011
@@ -1,4 +1,5 @@
-# $NetBSD: md.sandpoint,v 1.7 2011/01/28 22:15:35 phx Exp $
+# $NetBSD: md.sandpoint,v 1.8 2011/02/26 20:38:50 phx Exp $
 ./dev/pms0	base-obsolete		obsolete
 ./usr/mdec/altbootbase-sysutil-bin
 ./usr/mdec/altboot.binbase-sysutil-bin
+./usr/mdec/altboot.imgbase-sysutil-bin

CVS commit: src/distrib/sets/lists/comp

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Sat Feb 26 23:24:10 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
+flashctl.debug


To generate a diff of this commit:
cvs rdiff -u -r1.1590 -r1.1591 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1590 src/distrib/sets/lists/comp/mi:1.1591
--- src/distrib/sets/lists/comp/mi:1.1590	Sat Feb 26 18:07:14 2011
+++ src/distrib/sets/lists/comp/mi	Sat Feb 26 23:24:09 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1590 2011/02/26 18:07:14 ahoka Exp $
+#	$NetBSD: mi,v 1.1591 2011/02/26 23:24:09 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -3660,6 +3660,7 @@
 ./usr/libdata/debug/usr/sbin/extattrctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/faithd.debug	comp-router-debug	inet6,debug
 ./usr/libdata/debug/usr/sbin/fixmount.debug	comp-nfsclient-debug	debug
+./usr/libdata/debug/usr/sbin/flashctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/fsinfo.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/fssconfig.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/ftp-proxy.debug	comp-pf-debug		pf,debug

CVS commit: src/lib/libc/stdlib

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Sat Feb 26 23:27:49 UTC 2011

Modified Files:
src/lib/libc/stdlib: jemalloc.c

Log Message:
Switch from floating point to fixed point integer for run sizes maths.
From FreeBSD (part of revision 1.154).


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdlib/jemalloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.21 src/lib/libc/stdlib/jemalloc.c:1.22
--- src/lib/libc/stdlib/jemalloc.c:1.21	Thu Mar  4 22:48:31 2010
+++ src/lib/libc/stdlib/jemalloc.c	Sat Feb 26 23:27:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: jemalloc.c,v 1.21 2010/03/04 22:48:31 enami Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.22 2011/02/26 23:27:49 njoly Exp $	*/
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans jas...@freebsd.org.
@@ -118,7 +118,7 @@
 
 #include sys/cdefs.h
 /* __FBSDID($FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $); */ 
-__RCSID($NetBSD: jemalloc.c,v 1.21 2010/03/04 22:48:31 enami Exp $);
+__RCSID($NetBSD: jemalloc.c,v 1.22 2011/02/26 23:27:49 njoly Exp $);
 
 #ifdef __FreeBSD__
 #include libc_private.h
@@ -319,20 +319,25 @@
 #define	SMALL_MAX_DEFAULT	(1  SMALL_MAX_2POW_DEFAULT)
 
 /*
- * Maximum desired run header overhead.  Runs are sized as small as possible
- * such that this setting is still honored, without violating other constraints.
- * The goal is to make runs as small as possible without exceeding a per run
- * external fragmentation threshold.
+ * RUN_MAX_OVRHD indicates maximum desired run header overhead.  Runs are sized
+ * as small as possible such that this setting is still honored, without
+ * violating other constraints.  The goal is to make runs as small as possible
+ * without exceeding a per run external fragmentation threshold.
  *
- * Note that it is possible to set this low enough that it cannot be honored
- * for some/all object sizes, since there is one bit of header overhead per
- * object (plus a constant).  In such cases, this constraint is relaxed.
+ * We use binary fixed point math for overhead computations, where the binary
+ * point is implicitly RUN_BFP bits to the left.
  *
- * RUN_MAX_OVRHD_RELAX specifies the maximum number of bits per region of
- * overhead for which RUN_MAX_OVRHD is relaxed.
+ * Note that it is possible to set RUN_MAX_OVRHD low enough that it cannot be
+ * honored for some/all object sizes, since there is one bit of header overhead
+ * per object (plus a constant).  This constraint is relaxed (ignored) for runs
+ * that are so small that the per-region overhead is greater than:
+ *
+ *   (RUN_MAX_OVRHD / (reg_size  (3+RUN_BFP))
  */
-#define RUN_MAX_OVRHD		0.015
-#define RUN_MAX_OVRHD_RELAX	1.5
+#define RUN_BFP			12
+/*  \/   Implicit binary fixed point. */
+#define RUN_MAX_OVRHD		0x003dU
+#define RUN_MAX_OVRHD_RELAX	0x1800U
 
 /* Put a cap on small object run size.  This overrides RUN_MAX_OVRHD. */
 #define RUN_MAX_SMALL_2POW	15
@@ -2143,7 +2148,6 @@
 	size_t try_run_size, good_run_size;
 	unsigned good_nregs, good_mask_nelms, good_reg0_offset;
 	unsigned try_nregs, try_mask_nelms, try_reg0_offset;
-	float max_ovrhd = RUN_MAX_OVRHD;
 
 	assert(min_run_size = pagesize);
 	assert(min_run_size = arena_maxclass);
@@ -2161,7 +2165,7 @@
 	 */
 	try_run_size = min_run_size;
 	try_nregs = (unsigned)(((try_run_size - sizeof(arena_run_t)) /
-	bin-reg_size) + 1); /* Counter-act the first line of the loop. */
+	bin-reg_size) + 1); /* Counter-act try_nregs-- in loop. */
 	do {
 		try_nregs--;
 		try_mask_nelms = (try_nregs  (SIZEOF_INT_2POW + 3)) +
@@ -2195,9 +2199,8 @@
 		} while (sizeof(arena_run_t) + (sizeof(unsigned) *
 		(try_mask_nelms - 1))  try_reg0_offset);
 	} while (try_run_size = arena_maxclass  try_run_size = RUN_MAX_SMALL
-	 max_ovrhd  RUN_MAX_OVRHD_RELAX / ((float)(bin-reg_size  3))
-	 ((float)(try_reg0_offset)) / ((float)(try_run_size)) 
-	max_ovrhd);
+	 RUN_MAX_OVRHD * (bin-reg_size  3)  RUN_MAX_OVRHD_RELAX
+	 (try_reg0_offset  RUN_BFP)  RUN_MAX_OVRHD * try_run_size);
 
 	assert(sizeof(arena_run_t) + (sizeof(unsigned) * (good_mask_nelms - 1))
 	= good_reg0_offset);

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Feb 27 01:02:40 UTC 2011

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_drv.c

Log Message:
use pa_intrpin instead of pa_intrline for irq#, since drivers treat irq=0
as no irq and this matches pa_intrpin encoding


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.19 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.20
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.19	Sat Nov  6 22:06:10 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c	Sun Feb 27 01:02:39 2011
@@ -401,7 +401,7 @@
 
 	memcpy(dev-pa, pa, sizeof(dev-pa));
 
-	dev-irq = pa-pa_intrline;
+	dev-irq = pa-pa_intrpin;
 	dev-pci_domain = parent_unit;
 	dev-pci_bus = pa-pa_bus;
 	dev-pci_slot = pa-pa_device;

CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Feb 27 01:51:37 UTC 2011

Modified Files:
src/lib/libedit: editline.3

Log Message:
Fix argument for EL_EDITOR from Jess Thrysoee


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/lib/libedit/editline.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.74 src/lib/libedit/editline.3:1.75
--- src/lib/libedit/editline.3:1.74	Thu Dec 16 12:42:28 2010
+++ src/lib/libedit/editline.3	Sat Feb 26 20:51:37 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: editline.3,v 1.74 2010/12/16 17:42:28 wiz Exp $
+.\	$NetBSD: editline.3,v 1.75 2011/02/27 01:51:37 christos Exp $
 .\
 .\ Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -26,7 +26,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 3, 2010
+.Dd February 26, 2011
 .Dt EDITLINE 3
 .Os
 .Sh NAME
@@ -501,7 +501,7 @@
 is not
 .Dv NULL ,
 return the start/stop literal prompt character in it.
-.It Dv EL_EDITOR , Fa const char *
+.It Dv EL_EDITOR , Fa const char **
 Return the name of the editor, which will be one of
 .Dq emacs
 or

CVS commit: src/lib/libc/gen

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Feb 27 01:53:22 UTC 2011

Modified Files:
src/lib/libc/gen: unvis.c

Log Message:
Add stdint.h for uint8_t from Jess Thrysoee


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/gen/unvis.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.32 src/lib/libc/gen/unvis.c:1.33
--- src/lib/libc/gen/unvis.c:1.32	Sat Nov 27 16:22:11 2010
+++ src/lib/libc/gen/unvis.c	Sat Feb 26 20:53:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.32 2010/11/27 21:22:11 christos Exp $	*/
+/*	$NetBSD: unvis.c,v 1.33 2011/02/27 01:53:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)unvis.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: unvis.c,v 1.32 2010/11/27 21:22:11 christos Exp $);
+__RCSID($NetBSD: unvis.c,v 1.33 2011/02/27 01:53:22 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -43,6 +43,7 @@
 
 #include assert.h
 #include ctype.h
+#include stdint.h
 #include stdio.h
 #include vis.h
 

CVS commit: src/bin/ln

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Feb 27 06:02:08 UTC 2011

Modified Files:
src/bin/ln: ln.1

Log Message:
Typographical improvement by David H. Gutteridge in PR 44645.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/bin/ln/ln.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/ln/ln.1
diff -u src/bin/ln/ln.1:1.22 src/bin/ln/ln.1:1.23
--- src/bin/ln/ln.1:1.22	Mon Oct 29 11:22:59 2007
+++ src/bin/ln/ln.1	Sun Feb 27 06:02:07 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: ln.1,v 1.22 2007/10/29 11:22:59 jnemeth Exp $
+.\	$NetBSD: ln.1,v 1.23 2011/02/27 06:02:07 wiz Exp $
 .\
 .\ Copyright (c) 1980, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -57,7 +57,7 @@
 instead, a link
 .Dq points
 to the original copy.
-There are two types of links; hard links and symbolic links.
+There are two types of links: hard links and symbolic links.
 How a link
 .Dq points
 to a file is one of the differences between a hard or symbolic link.

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Feb 27 06:24:27 UTC 2011

Modified Files:
src/share/man/man4: flash.4

Log Message:
Sort macros, add comma in enumeration.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/flash.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/flash.4
diff -u src/share/man/man4/flash.4:1.2 src/share/man/man4/flash.4:1.3
--- src/share/man/man4/flash.4:1.2	Sat Feb 26 18:07:17 2011
+++ src/share/man/man4/flash.4	Sun Feb 27 06:24:27 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: flash.4,v 1.2 2011/02/26 18:07:17 ahoka Exp $
+.\	$NetBSD: flash.4,v 1.3 2011/02/27 06:24:27 wiz Exp $
 .\
 .\ Copyright (c) 2010 Department of Software Engineering,
 .\		  University of Szeged, Hungary
@@ -47,23 +47,23 @@
 operations are supported on
 .Pa /dev/flash :
 .Bl -tag -width indent
-.It Dv FLASH_ERASE_BLOCK (struct flash_erase_params)
-This command erases one or more blocks.
-.It Dv FLASH_DUMP (struct flash_dump_params)
-This command dumps a block.
-.It Dv FLASH_GET_INFO (struct flash_info_params)
-This command aquires information aboout the flash device.
 .It Dv FLASH_BLOCK_ISBAD (struct flash_badblock_params)
 This command checks if a block is marked as bad.
 .It Dv FLASH_BLOCK_MARKBAD (struct flash_badblock_params)
 This command marks a block as bad.
+.It Dv FLASH_DUMP (struct flash_dump_params)
+This command dumps a block.
+.It Dv FLASH_ERASE_BLOCK (struct flash_erase_params)
+This command erases one or more blocks.
+.It Dv FLASH_GET_INFO (struct flash_info_params)
+This command aquires information aboout the flash device.
 .El
 .Sh FILES
 .Bl -tag -width /dev/flash -compact
 .It Pa /dev/flash
 .El
 .Sh SEE ALSO
-.Xr flash 9
+.Xr flash 9 ,
 .Xr nand 9
 .Sh AUTHORS
 .An Adam Hoka Aq ah...@netbsd.org

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Feb 27 06:25:07 UTC 2011

Modified Files:
src/share/man/man9: flash.9

Log Message:
 Add comma in enumeration.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/flash.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/flash.9
diff -u src/share/man/man9/flash.9:1.1 src/share/man/man9/flash.9:1.2
--- src/share/man/man9/flash.9:1.1	Sat Feb 26 18:07:17 2011
+++ src/share/man/man9/flash.9	Sun Feb 27 06:25:07 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: flash.9,v 1.1 2011/02/26 18:07:17 ahoka Exp $
+.\	$NetBSD: flash.9,v 1.2 2011/02/27 06:25:07 wiz Exp $
 .\
 .\ Copyright (c) 2010 Department of Software Engineering,
 .\		  University of Szeged, Hungary
@@ -78,7 +78,7 @@
 };
 .Ed
 .Sh SEE ALSO
-.Xr flash 4
+.Xr flash 4 ,
 .Xr nand 9
 .Sh AUTHORS
 .An Adam Hoka Aq ah...@netbsd.org