CVS commit: src/sys/conf
Module Name:src
Committed By: nakayama
Date: Fri May 21 11:28:11 UTC 2021
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Fix previous to use the proper version file path.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.3 src/sys/conf/newvers_stand.mk:1.4
--- src/sys/conf/newvers_stand.mk:1.3 Mon May 17 20:10:27 2021
+++ src/sys/conf/newvers_stand.mk Fri May 21 11:28:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.3 2021/05/17 20:10:27 nakayama Exp $
+# $NetBSD: newvers_stand.mk,v 1.4 2021/05/21 11:28:11 nakayama Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -20,6 +20,6 @@ VERSIONFLAGS+=-d
vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
${HOST_SH} ${S}/conf/newvers_stand.sh \
- -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${VERSIONFILE} ${NEWVERSWHAT}
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC:[1]} ${NEWVERSWHAT}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: nakayama
Date: Mon May 17 20:10:27 UTC 2021
Modified Files:
src/sys/conf: newvers_stand.mk
Log Message:
Make vers.c depend on ${_NETBSD_VERSION_DEPENDS}.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/newvers_stand.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.mk
diff -u src/sys/conf/newvers_stand.mk:1.2 src/sys/conf/newvers_stand.mk:1.3
--- src/sys/conf/newvers_stand.mk:1.2 Sun Apr 9 14:52:14 2017
+++ src/sys/conf/newvers_stand.mk Mon May 17 20:10:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: newvers_stand.mk,v 1.2 2017/04/09 14:52:14 christos Exp $
+# $NetBSD: newvers_stand.mk,v 1.3 2021/05/17 20:10:27 nakayama Exp $
VERSIONFILE?=version
VERSIONMACHINE?=${MACHINE}
@@ -17,9 +17,9 @@ VERSIONFLAGS+=-d
. endif
.endif
-vers.c: ${VERSIONFILE}
+vers.c: ${VERSIONFILE} ${_NETBSD_VERSION_DEPENDS}
${_MKTARGET_CREATE}
${HOST_SH} ${S}/conf/newvers_stand.sh \
- -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${.ALLSRC} ${NEWVERSWHAT}
+ -m ${VERSIONMACHINE} ${VERSIONFLAGS} ${VERSIONFILE} ${NEWVERSWHAT}
.endif
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: nakayama
Date: Mon May 3 08:44:05 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod
Log Message:
Remove duplicate lines.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Mon May 3 08:44:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.4 2021/05/03 08:44:05 nakayama Exp $
.include # for NETBSDSRCDIR and mk.conf processing
@@ -27,6 +27,3 @@ CPPFLAGS+= -D__GLX_ALIGN64
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Mon May 3 08:44:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.4 2021/05/03 08:44:05 nakayama Exp $
.include # For /etc/mk.conf processing
@@ -25,7 +25,4 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
# IOPortBase is particularly annoying to fix
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Mon Apr 5 22:36:27 UTC 2021
Modified Files:
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: cpu.c
Log Message:
Fix build w/o options SUN4V.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/sparc64/sparc64/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/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.131 src/sys/arch/sparc64/include/cpu.h:1.132
--- src/sys/arch/sparc64/include/cpu.h:1.131 Sat Apr 3 17:01:24 2021
+++ src/sys/arch/sparc64/include/cpu.h Mon Apr 5 22:36:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.131 2021/04/03 17:01:24 palle Exp $ */
+/* $NetBSD: cpu.h,v 1.132 2021/04/05 22:36:27 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -198,7 +198,7 @@ struct cpu_info {
/* TSB description (sun4v). */
struct tsb_desc *ci_tsb_desc;
-
+
/* MMU Fault Status Area (sun4v).
* Will be initialized to the physical address of the bottom of
* the interrupt stack.
@@ -440,9 +440,6 @@ void switchtoctx_usiii(int);
void next_tick(long);
void next_stick(long);
void next_stick_init(void);
-#ifdef SUN4V
-voidcpu_idle_sun4v(void);
-#endif
/* trap.c */
void cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
int rwindow_save(struct lwp *);
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.139 src/sys/arch/sparc64/sparc64/cpu.c:1.140
--- src/sys/arch/sparc64/sparc64/cpu.c:1.139 Sat Apr 3 17:01:24 2021
+++ src/sys/arch/sparc64/sparc64/cpu.c Mon Apr 5 22:36:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $ */
+/* $NetBSD: cpu.c,v 1.140 2021/04/05 22:36:27 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140 2021/04/05 22:36:27 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -95,6 +95,7 @@ struct cpu_bootargs *cpu_args; /* alloca
struct pool_cache *fpstate_cache;
static struct cpu_info *alloc_cpuinfo(u_int);
+static void cpu_idle_sun4v(void);
/* The following are used externally (sysctl_hw). */
char machine[] = MACHINE; /* from */
@@ -700,16 +701,15 @@ cpu_attach(device_t parent, device_t dev
* cpu_idle setup (currently only necessary for sun4v)
*/
if (CPU_ISSUN4V) {
- ci->ci_idlespin = cpu_idle_sun4v;
+ ci->ci_idlespin = cpu_idle_sun4v;
}
}
-#ifdef SUN4V
-void cpu_idle_sun4v(void)
+static void
+cpu_idle_sun4v(void)
{
- hv_cpu_yield();
+ hv_cpu_yield();
}
-#endif
int
cpu_myid(void)
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: nakayama
Date: Thu Jan 7 07:40:39 UTC 2021
Modified Files:
src/sys/arch/sparc64/dev: psycho.c
Log Message:
The "available" property requires a variable length buffer, so
leave free(9) until prom_getprop is changed to use kmem_alloc(9)
instead of malloc(9).
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sparc64/dev/psycho.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/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.130 src/sys/arch/sparc64/dev/psycho.c:1.131
--- src/sys/arch/sparc64/dev/psycho.c:1.130 Wed Jan 6 20:04:30 2021
+++ src/sys/arch/sparc64/dev/psycho.c Thu Jan 7 07:40:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.130 2021/01/06 20:04:30 palle Exp $ */
+/* $NetBSD: psycho.c,v 1.131 2021/01/07 07:40:39 nakayama Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.130 2021/01/06 20:04:30 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.131 2021/01/07 07:40:39 nakayama Exp $");
#include "opt_ddb.h"
@@ -81,6 +81,7 @@ int psycho_debug = 0x0;
#include
#include
#include
+#include
#include
#include
#include
@@ -769,7 +770,7 @@ psycho_alloc_chipset(struct psycho_pbm *
static struct extent *
psycho_alloc_extent(struct psycho_pbm *pp, int node, int ss, const char *name)
{
- struct psycho_registers *pa = kmem_zalloc(sizeof *pa, KM_SLEEP);
+ struct psycho_registers *pa = NULL;
struct psycho_ranges *pr;
struct extent *ex;
bus_addr_t baddr, addr;
@@ -833,7 +834,7 @@ psycho_alloc_extent(struct psycho_pbm *p
ret:
/* return extent */
- kmem_free(pa, sizeof(*pa));
+ free(pa, M_DEVBUF);
return ex;
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: nakayama Date: Tue Aug 18 07:13:59 UTC 2020 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Quoted from the top of the file: # Note: don't delete entries from here - mark them as "obsolete" instead. To generate a diff of this commit: cvs rdiff -u -r1.893 -r1.894 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.893 src/distrib/sets/lists/tests/mi:1.894 --- src/distrib/sets/lists/tests/mi:1.893 Tue Aug 18 03:02:50 2020 +++ src/distrib/sets/lists/tests/mi Tue Aug 18 07:13:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.893 2020/08/18 03:02:50 perseant Exp $ +# $NetBSD: mi,v 1.894 2020/08/18 07:13:59 nakayama Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4758,6 +4758,8 @@ ./usr/tests/usr.bin/make/unit-tests/modmatch.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/modmisc.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/modmisc.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/modorder.exp tests-obsolete obsolete +./usr/tests/usr.bin/make/unit-tests/modorder.mk tests-obsolete obsolete ./usr/tests/usr.bin/make/unit-tests/modts.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/modts.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/modword.exp tests-usr.bin-tests compattestfile,atf
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Wed May 13 21:34:01 UTC 2020 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: smbfs has been removed. To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.214 src/etc/mtree/NetBSD.dist.base:1.215 --- src/etc/mtree/NetBSD.dist.base:1.214 Fri May 1 22:26:11 2020 +++ src/etc/mtree/NetBSD.dist.base Wed May 13 21:34:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.214 2020/05/01 22:26:11 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.215 2020/05/13 21:34:01 nakayama Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -157,7 +157,6 @@ ./usr/include/fs/nilfs ./usr/include/fs/ptyfs ./usr/include/fs/puffs -./usr/include/fs/smbfs ./usr/include/fs/sysvbfs ./usr/include/fs/tmpfs ./usr/include/fs/udf @@ -233,7 +232,6 @@ ./usr/include/netipsec ./usr/include/netmpls ./usr/include/netpgp -./usr/include/netsmb ./usr/include/nfs ./usr/include/ntfs ./usr/include/objc @@ -414,7 +412,6 @@ ./usr/share/examples/rpcapd ./usr/share/examples/rtadvd ./usr/share/examples/slip -./usr/share/examples/smbfs ./usr/share/examples/syslogd ./usr/share/examples/tmux ./usr/share/examples/wpa_supplicant
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: nakayama
Date: Tue Feb 25 10:27:01 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
Fix the fixup script to follow the URL change in /etc/motd (http->https).
PR install/54990, pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.14 src/usr.sbin/postinstall/postinstall.in:1.15
--- src/usr.sbin/postinstall/postinstall.in:1.14 Thu Jan 30 13:54:05 2020
+++ src/usr.sbin/postinstall/postinstall.in Tue Feb 25 10:27:01 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.14 2020/01/30 13:54:05 christos Exp $
+# $NetBSD: postinstall.in,v 1.15 2020/02/25 10:27:01 nakayama Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1271,7 +1271,7 @@ do_motd()
if ${GREP} -i 'http://www.NetBSD.org/Misc/send-pr.html' \
"${DEST_DIR}/etc/motd" >/dev/null 2>&1 \
- || ${GREP} -i 'http://www.NetBSD.org/support/send-pr.html' \
+ || ${GREP} -i 'https*://www.NetBSD.org/support/send-pr.html' \
"${DEST_DIR}/etc/motd" >/dev/null 2>&1
then
tmp1="$(mktemp /tmp/postinstall.motd.)"
CVS commit: src/lib
Module Name:src
Committed By: nakayama
Date: Fri May 10 09:42:46 UTC 2019
Modified Files:
src/lib: Makefile
Log Message:
Don't build compat LLVM PIC libraries since it is unused if MKCOMPATX11 == "no".
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.270 src/lib/Makefile:1.271
--- src/lib/Makefile:1.270 Wed Apr 3 15:22:05 2019
+++ src/lib/Makefile Fri May 10 09:42:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.270 2019/04/03 15:22:05 joerg Exp $
+# $NetBSD: Makefile,v 1.271 2019/05/10 09:42:46 nakayama Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -170,7 +170,7 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libsupc++
.endif
-.if (${MKLLVMRT} != "no")
+.if (${MKLLVMRT} != "no" && (!defined(MLIBDIR) || ${MKCOMPATX11} != "no"))
SUBDIR+= ../external/bsd/llvm/include
.endif
@@ -183,7 +183,7 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
.endif
.endfor
-.if (${MKLLVMRT} != "no")
+.if (${MKLLVMRT} != "no" && (!defined(MLIBDIR) || ${MKCOMPATX11} != "no"))
SUBDIR+= ../external/bsd/llvm/librt
.endif
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Sat Apr 6 21:40:15 UTC 2019
Modified Files:
src/sys/arch/sparc64/include: psl.h
Log Message:
The real cause for removing asm inline code on clang is that the
"r" constraint cannot handle 64-bit and is treated as 32-bit.
So code that refers to the upper 32-bit (manuf or impl) of the %ver
register is removed by optimization.
Use 32-bit kernel code as a workaround when referring to the %ver
register.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.59 src/sys/arch/sparc64/include/psl.h:1.60
--- src/sys/arch/sparc64/include/psl.h:1.59 Fri Apr 5 12:15:41 2019
+++ src/sys/arch/sparc64/include/psl.h Sat Apr 6 21:40:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.59 2019/04/05 12:15:41 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.60 2019/04/06 21:40:15 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -292,9 +292,8 @@
* Put "memory" to asm inline on sun4v to avoid issuing rdpr %ver
* before checking cputyp as a result of code moving by compiler
* optimization.
- * For clang, to prevent it from being removed by optimization.
*/
-#if defined(SUN4V) || defined(__clang__)
+#ifdef SUN4V
#define constasm_clobbers "memory"
#else
#define constasm_clobbers
@@ -323,11 +322,13 @@ static __inline void set##name(type _val
__asm volatile(#wr " %0,0,%" #reg : : "r" (_val) : "memory"); \
}
-#ifdef __arch64__
+/*
+ * XXX: clang's "r" constraint cannot handle 64-bit,
+ * so use 32-bit kernel code as a workaround.
+ */
+#if defined(__arch64__) && !defined(__clang__)
#define SPARC64_RDCONST64_DEF(rd, name, reg) \
SPARC64_RDCONST_DEF(rd, name, reg, uint64_t)
-#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
-#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
#else
#define SPARC64_RDCONST64_DEF(rd, name, reg)\
static __inline __constfunc uint64_t get##name(void) \
@@ -337,6 +338,12 @@ static __inline __constfunc uint64_t get
: "=r" (_hi), "=r" (_lo) : : constasm_clobbers); \
return ((uint64_t)_hi << 32) | _lo;\
}
+#endif
+
+#ifdef __arch64__
+#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
+#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
+#else
#define SPARC64_RD64_DEF(rd, name, reg) \
static __inline uint64_t get##name(void)\
{ \
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Fri Apr 5 23:09:18 UTC 2019
Modified Files:
src/sys/arch/sparc64/include: ctlreg.h
Log Message:
Redo previous.
In the case of store variant, put dummy constraint in output
instead of input.
Suggested by joerg@ in source-changes-d@
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sparc64/include/ctlreg.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/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.65 src/sys/arch/sparc64/include/ctlreg.h:1.66
--- src/sys/arch/sparc64/include/ctlreg.h:1.65 Fri Apr 5 12:16:13 2019
+++ src/sys/arch/sparc64/include/ctlreg.h Fri Apr 5 23:09:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.65 2019/04/05 12:16:13 nakayama Exp $ */
+/* $NetBSD: ctlreg.h,v 1.66 2019/04/05 23:09:18 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -681,10 +681,10 @@ SPARC64_LD_DEF64(ldxa, uint64_t)
/* 64-bit kernel, non-constant */
#define SPARC64_ST_NONCONST(st, type) \
__asm volatile( \
- "wr %2,%%g0,%%asi; "\
- #st " %0,[%1]%%asi "\
- : : "r" (value), "r" ((__uintptr_t)(loc)), \
- "r" (asi), "m" (*(type *)(__uintptr_t)(loc)))
+ "wr %3,%%g0,%%asi; "\
+ #st " %1,[%2]%%asi "\
+ : "=m" (*(type *)(__uintptr_t)(loc)) \
+ : "r" (value), "r" ((__uintptr_t)(loc)), "r" (asi))
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define SPARC64_ST_DEF(st, type) \
@@ -692,9 +692,10 @@ static __inline void st(paddr_t loc, int
{ \
if (__builtin_constant_p(asi)) \
__asm volatile( \
- #st " %0,[%1]%2 " \
- : : "r" (value), "r" ((__uintptr_t)(loc)), \
- "n" (asi), "m" (*(type *)(__uintptr_t)(loc))); \
+ #st " %1,[%2]%3 " \
+ : "=m" (*(type *)(__uintptr_t)(loc)) \
+ : "r" (value), "r" ((__uintptr_t)(loc)), \
+ "n" (asi)); \
else\
SPARC64_ST_NONCONST(st, type);\
}
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Fri Apr 5 12:16:13 UTC 2019
Modified Files:
src/sys/arch/sparc64/include: ctlreg.h
Log Message:
Add dummy constraints to avoid excessive optimization in clang.
GENERIC kernel compiled with clang now boot at least on my Fire V100.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sparc64/include/ctlreg.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/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.64 src/sys/arch/sparc64/include/ctlreg.h:1.65
--- src/sys/arch/sparc64/include/ctlreg.h:1.64 Wed Dec 28 19:16:25 2016
+++ src/sys/arch/sparc64/include/ctlreg.h Fri Apr 5 12:16:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.64 2016/12/28 19:16:25 martin Exp $ */
+/* $NetBSD: ctlreg.h,v 1.65 2019/04/05 12:16:13 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -485,12 +485,13 @@
#ifdef __arch64__
/* 64-bit kernel, non-constant */
-#define SPARC64_LD_NONCONST(ld) \
+#define SPARC64_LD_NONCONST(ld, type) \
__asm volatile( \
"wr %2,%%g0,%%asi; "\
#ld " [%1]%%asi,%0 "\
: "=r" (_v) \
- : "r" ((__uintptr_t)(loc)), "r" (asi))
+ : "r" ((__uintptr_t)(loc)), "r" (asi), \
+ "m" (*(type *)(__uintptr_t)(loc)))
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define SPARC64_LD_DEF(ld, type, vtype) \
@@ -501,9 +502,10 @@ static __inline type ld(paddr_t loc, int
__asm volatile( \
#ld " [%1]%2,%0 " \
: "=r" (_v) \
- : "r" ((__uintptr_t)(loc)), "n" (asi)); \
+ : "r" ((__uintptr_t)(loc)), "n" (asi), \
+ "m" (*(type *)(__uintptr_t)(loc))); \
else\
- SPARC64_LD_NONCONST(ld);\
+ SPARC64_LD_NONCONST(ld, type);\
return _v; \
}
#else
@@ -511,7 +513,7 @@ static __inline type ld(paddr_t loc, int
static __inline type ld(paddr_t loc, int asi)\
{ \
vtype _v; \
- SPARC64_LD_NONCONST(ld); \
+ SPARC64_LD_NONCONST(ld, type); \
return _v; \
}
#endif
@@ -677,12 +679,12 @@ SPARC64_LD_DEF64(ldxa, uint64_t)
#ifdef __arch64__
/* 64-bit kernel, non-constant */
-#define SPARC64_ST_NONCONST(st) \
+#define SPARC64_ST_NONCONST(st, type) \
__asm volatile( \
"wr %2,%%g0,%%asi; "\
#st " %0,[%1]%%asi "\
: : "r" (value), "r" ((__uintptr_t)(loc)), \
- "r" (asi))
+ "r" (asi), "m" (*(type *)(__uintptr_t)(loc)))
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define SPARC64_ST_DEF(st, type) \
@@ -692,15 +694,15 @@ static __inline void st(paddr_t loc, int
__asm volatile( \
#st " %0,[%1]%2 " \
: : "r" (value), "r" ((__uintptr_t)(loc)), \
- "n" (asi)); \
+ "n" (asi), "m" (*(type *)(__uintptr_t)(loc))); \
else\
- SPARC64_ST_NONCONST(st);\
+ SPARC64_ST_NONCONST(st, type);\
}
#else
#define SPARC64_ST_DEF(st, type) \
static __inline void st(paddr_t loc, int asi, type value) \
{ \
- SPARC64_ST_NONCONST(st); \
+ SPARC64_ST_NONCONST(st, type); \
}
#endif
#define SPARC64_ST_DEF64(st, type) SPARC64_ST_DEF(st, type)
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: nakayama Date: Fri Apr 5 12:15:41 UTC 2019 Modified Files: src/sys/arch/sparc64/include: psl.h Log Message: Put "memory" to asm inline reading privilege registers for clang to prevent it from being removed by excessive optimization. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h diff -u src/sys/arch/sparc64/include/psl.h:1.58 src/sys/arch/sparc64/include/psl.h:1.59 --- src/sys/arch/sparc64/include/psl.h:1.58 Fri Feb 8 20:09:24 2019 +++ src/sys/arch/sparc64/include/psl.h Fri Apr 5 12:15:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.58 2019/02/08 20:09:24 palle Exp $ */ +/* $NetBSD: psl.h,v 1.59 2019/04/05 12:15:41 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -292,8 +292,9 @@ * Put "memory" to asm inline on sun4v to avoid issuing rdpr %ver * before checking cputyp as a result of code moving by compiler * optimization. + * For clang, to prevent it from being removed by optimization. */ -#ifdef SUN4V +#if defined(SUN4V) || defined(__clang__) #define constasm_clobbers "memory" #else #define constasm_clobbers
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Wed Apr 3 19:52:38 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.sparc64 Log Message: Fix previous. sparc64 is automatically added, so leave the sparc line. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/etc/mtree/NetBSD.dist.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.sparc64 diff -u src/etc/mtree/NetBSD.dist.sparc64:1.13 src/etc/mtree/NetBSD.dist.sparc64:1.14 --- src/etc/mtree/NetBSD.dist.sparc64:1.13 Tue Mar 12 10:07:49 2019 +++ src/etc/mtree/NetBSD.dist.sparc64 Wed Apr 3 19:52:38 2019 @@ -1,3 +1,3 @@ -# $NetBSD: NetBSD.dist.sparc64,v 1.13 2019/03/12 10:07:49 mrg Exp $ +# $NetBSD: NetBSD.dist.sparc64,v 1.14 2019/04/03 19:52:38 nakayama Exp $ -./usr/include/sparc64 +./usr/include/sparc
CVS commit: src
Module Name:src Committed By: nakayama Date: Mon Mar 11 05:05:32 UTC 2019 Modified Files: src/distrib/sets/lists/xetc: mi src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile Log Message: Install new files also to etc/fonts/conf.avail. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xetc/mi cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/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/xetc/mi diff -u src/distrib/sets/lists/xetc/mi:1.33 src/distrib/sets/lists/xetc/mi:1.34 --- src/distrib/sets/lists/xetc/mi:1.33 Fri Mar 8 12:21:03 2019 +++ src/distrib/sets/lists/xetc/mi Mon Mar 11 05:05:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.33 2019/03/08 12:21:03 mrg Exp $ +# $NetBSD: mi,v 1.34 2019/03/11 05:05:31 nakayama Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -46,10 +46,12 @@ ./etc/fonts/conf.avail/30-metric-aliases.conf -unknown- xorg ./etc/fonts/conf.avail/30-urw-aliases.conf -unknown- obsolete ./etc/fonts/conf.avail/40-nonlatin.conf -unknown- xorg +./etc/fonts/conf.avail/45-generic.conf -unknown- xorg ./etc/fonts/conf.avail/45-latin.conf -unknown- xorg ./etc/fonts/conf.avail/49-sansserif.conf -unknown- xorg ./etc/fonts/conf.avail/50-user.conf -unknown- xorg ./etc/fonts/conf.avail/51-local.conf -unknown- xorg +./etc/fonts/conf.avail/60-generic.conf -unknown- xorg ./etc/fonts/conf.avail/60-latin.conf -unknown- xorg ./etc/fonts/conf.avail/65-fonts-persian.conf -unknown- xorg ./etc/fonts/conf.avail/65-khmer.conf -unknown- xorg Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.6 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.7 --- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.6 Sat Mar 9 02:56:44 2019 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Mar 11 05:05:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/03/09 02:56:44 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2019/03/11 05:05:32 nakayama Exp $ .include @@ -23,10 +23,12 @@ CONFIGFILES= \ 25-unhint-nonlatin.conf \ 30-metric-aliases.conf \ 40-nonlatin.conf \ + 45-generic.conf \ 45-latin.conf \ 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ + 60-generic.conf \ 60-latin.conf \ 65-fonts-persian.conf \ 65-khmer.conf \
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: nakayama
Date: Wed Mar 6 12:40:23 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
src/external/mit/xorg/bin/xdm/chooser: Makefile
src/external/mit/xorg/lib/libXdmGreet: Makefile
Log Message:
Centralize pam definitions and tabify.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXdmGreet/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/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.16 src/external/mit/xorg/bin/xdm/Makefile:1.17
--- src/external/mit/xorg/bin/xdm/Makefile:1.16 Wed Mar 6 03:38:30 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/06 03:38:30 christos Exp $
+# $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $
.include
@@ -13,7 +13,7 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
-CPPFLAGS+= -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
+CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c+= -DBSD44SOCKETS
CPPFLAGS.socket.c+= -DBSD44SOCKETS
CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.9 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.9 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.9 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.10 2019/03/06 12:40:23 nakayama Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -39,11 +39,12 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
LDFLAGS+= -Wl,--export-dynamic
.if (${USE_PAM} != "no")
-CPPFLAGS+= -DUSE_PAM
+CPPFLAGS+= -DUSE_PAM
+CPPFLAGS+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
.endif
.if (${USE_INET6} != "no")
-CPPFLAGS+= -DIPv6
+CPPFLAGS+= -DIPv6
.endif
.PATH: ${X11SRCDIR.xdm}
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4 Wed Mar 6 01:13:39 2019
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/06 01:13:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
NOMAN= 1
@@ -7,7 +7,6 @@ NOMAN= 1
PROG= chooser
CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
-CPPFLAGS.chooser.c+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
APPDEFS=Chooser
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u src/external/mit/xorg/lib/libXdmGreet/Makefile:1.6 src/external/mit/xorg/lib/libXdmGreet/Makefile:1.7
--- src/external/mit/xorg/lib/libXdmGreet/Makefile:1.6 Wed Mar 6 02:44:05 2019
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/03/06 02:44:05 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/06 12:40:23 nakayama Exp $
.include
@@ -11,7 +11,6 @@ SRCS= \
verify.c
CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
-CPPFLAGS+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
# XXX: Enabling this, which should allow --export-dynamic to
# be elided, causes xdm to fail to accept password input and
# then crash at login "failure".
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Fri Dec 14 09:21:32 UTC 2018 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove comment about removed lmc*. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/sys/arch/sparc64/conf/GENERIC 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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.211 src/sys/arch/sparc64/conf/GENERIC:1.212 --- src/sys/arch/sparc64/conf/GENERIC:1.211 Wed Dec 12 06:29:37 2018 +++ src/sys/arch/sparc64/conf/GENERIC Fri Dec 14 09:21:32 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.211 2018/12/12 06:29:37 maxv Exp $ +# $NetBSD: GENERIC,v 1.212 2018/12/14 09:21:32 nakayama Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.211 $" +#ident "GENERIC-$Revision: 1.212 $" maxusers 64 @@ -511,7 +511,6 @@ gsip* at pci? dev ? function ? # Nationa ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet -# XXX uses vtophys() mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet ne* at pci? dev ? function ? # NE2000-compatible Ethernet UT
CVS commit: src/lib/libnvmm
Module Name:src Committed By: nakayama Date: Mon Nov 12 17:46:53 UTC 2018 Modified Files: src/lib/libnvmm: Makefile Log Message: No need to install shared libraries to /lib. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libnvmm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libnvmm/Makefile diff -u src/lib/libnvmm/Makefile:1.1 src/lib/libnvmm/Makefile:1.2 --- src/lib/libnvmm/Makefile:1.1 Sat Nov 10 09:28:56 2018 +++ src/lib/libnvmm/Makefile Mon Nov 12 17:46:53 2018 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/11/10 09:28:56 maxv Exp $ - -USE_SHLIBDIR= yes +# $NetBSD: Makefile,v 1.2 2018/11/12 17:46:53 nakayama Exp $ .include
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nakayama
Date: Tue Sep 25 06:55:23 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
pad(4) mixer has only 1 channel, so return EINVAL in the case other than 1.
This fixes the following strange output of mixerctl(1):
outputs.master=255,0
inputs.dac=255,0
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pad/pad.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/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.57 src/sys/dev/pad/pad.c:1.58
--- src/sys/dev/pad/pad.c:1.57 Tue Sep 25 06:53:49 2018
+++ src/sys/dev/pad/pad.c Tue Sep 25 06:55:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.57 2018/09/25 06:53:49 nakayama Exp $ */
+/* $NetBSD: pad.c,v 1.58 2018/09/25 06:55:23 nakayama Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.57 2018/09/25 06:53:49 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.58 2018/09/25 06:55:23 nakayama Exp $");
#include
#include
@@ -781,6 +781,8 @@ pad_set_port(void *opaque, mixer_ctrl_t
switch (mc->dev) {
case PAD_OUTPUT_MASTER_VOLUME:
case PAD_INPUT_DAC_VOLUME:
+ if (mc->un.value.num_channels != 1)
+ return EINVAL;
sc->sc_swvol = mc->un.value.level[AUDIO_MIXER_LEVEL_MONO];
return 0;
}
@@ -800,6 +802,8 @@ pad_get_port(void *opaque, mixer_ctrl_t
switch (mc->dev) {
case PAD_OUTPUT_MASTER_VOLUME:
case PAD_INPUT_DAC_VOLUME:
+ if (mc->un.value.num_channels != 1)
+ return EINVAL;
mc->un.value.level[AUDIO_MIXER_LEVEL_MONO] = sc->sc_swvol;
return 0;
}
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nakayama
Date: Tue Sep 25 06:53:49 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Revert to rev.1.53.
I accidentally committed the netbsd-8 branch file in rev.1.54.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pad/pad.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/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.56 src/sys/dev/pad/pad.c:1.57
--- src/sys/dev/pad/pad.c:1.56 Sun Sep 23 23:34:45 2018
+++ src/sys/dev/pad/pad.c Tue Sep 25 06:53:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.56 2018/09/23 23:34:45 kre Exp $ */
+/* $NetBSD: pad.c,v 1.57 2018/09/25 06:53:49 nakayama Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,18 +27,23 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.56 2018/09/23 23:34:45 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.57 2018/09/25 06:53:49 nakayama Exp $");
#include
#include
#include
#include
+#include
+#include
+#include
+#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -52,9 +57,17 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.56
#include
+#define MAXDEVS 128
+#define PADCLONER 254
#define PADUNIT(x) minor(x)
+#define PADFREQ 44100
+#define PADCHAN 2
+#define PADPREC 16
+#define PADENC AUDIO_ENCODING_SLINEAR_LE
+
extern struct cfdriver pad_cd;
+kmutex_t padconfig;
typedef struct pad_block {
uint8_t *pb_ptr;
@@ -99,7 +112,18 @@ static stream_filter_t *pad_swvol_filter
const audio_params_t *, const audio_params_t *);
static void pad_swvol_dtor(stream_filter_t *);
-static bool pad_is_attached; /* Do we have an audio* child? */
+static int pad_close(struct pad_softc *);
+static int pad_read(struct pad_softc *, off_t *, struct uio *, kauth_cred_t, int);
+
+static int fops_pad_close(struct file *);
+static int fops_pad_read(struct file *, off_t *, struct uio *, kauth_cred_t, int);
+static int pad_write(struct file *, off_t *, struct uio *, kauth_cred_t, int);
+static int pad_ioctl(struct file *, u_long, void *);
+static int pad_kqfilter(struct file *, struct knote *);
+static int pad_poll(struct file *, int);
+static int pad_stat(struct file *, struct stat *);
+static int pad_mmap(struct file *, off_t *, size_t, int, int *, int *,
+ struct uvm_object **, int *);
static const struct audio_hw_if pad_hw_if = {
.open = pad_audio_open,
@@ -120,8 +144,8 @@ static const struct audio_hw_if pad_hw_i
#define PAD_NFORMATS 1
static const struct audio_format pad_formats[PAD_NFORMATS] = {
- { NULL, AUMODE_PLAY|AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
- 2, AUFMT_STEREO, 1, { 44100 } },
+ { NULL, AUMODE_PLAY|AUMODE_RECORD, PADENC, PADPREC, PADPREC,
+ PADCHAN, AUFMT_STEREO, 1, { PADFREQ } },
};
extern void padattach(int);
@@ -130,13 +154,13 @@ static int pad_add_block(pad_softc_t *,
static int pad_get_block(pad_softc_t *, pad_block_t *, int);
dev_type_open(pad_open);
-dev_type_close(pad_close);
-dev_type_read(pad_read);
+dev_type_close(cdev_pad_close);
+dev_type_read(cdev_pad_read);
const struct cdevsw pad_cdevsw = {
.d_open = pad_open,
- .d_close = pad_close,
- .d_read = pad_read,
+ .d_close = cdev_pad_close,
+ .d_read = cdev_pad_read,
.d_write = nowrite,
.d_ioctl = noioctl,
.d_stop = nostop,
@@ -148,34 +172,36 @@ const struct cdevsw pad_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE,
};
+const struct fileops pad_fileops = {
+ .fo_name = "pad",
+ .fo_read = fops_pad_read,
+ .fo_write = pad_write,
+ .fo_ioctl = pad_ioctl,
+ .fo_fcntl = fnullop_fcntl,
+ .fo_stat = pad_stat,
+ .fo_poll = pad_poll,
+ .fo_close = fops_pad_close,
+ .fo_mmap = pad_mmap,
+ .fo_kqfilter = pad_kqfilter,
+ .fo_restart = fnullop_restart
+};
+
CFATTACH_DECL2_NEW(pad, sizeof(pad_softc_t), pad_match, pad_attach, pad_detach,
NULL, NULL, pad_childdet);
void
padattach(int n)
{
- int i, err;
- cfdata_t cf;
+ int error;
- aprint_debug("pad: requested %d units\n", n);
-
- err = config_cfattach_attach(pad_cd.cd_name, _ca);
- if (err) {
+ error = config_cfattach_attach(pad_cd.cd_name, _ca);
+ if (error) {
aprint_error("%s: couldn't register cfattach: %d\n",
- pad_cd.cd_name, err);
+ pad_cd.cd_name, error);
config_cfdriver_detach(_cd);
return;
}
-
- for (i = 0; i < n; i++) {
- cf = kmem_alloc(sizeof(struct cfdata), KM_SLEEP);
- cf->cf_name = pad_cd.cd_name;
- cf->cf_atname = pad_cd.cd_name;
- cf->cf_unit = i;
- cf->cf_fstate = FSTATE_STAR;
-
- (void)config_attach_pseudo(cf);
- }
+ mutex_init(, MUTEX_DEFAULT, IPL_NONE);
return;
}
@@ -218,7 +244,7 @@ pad_get_block(pad_softc_t *sc, pad_block
KASSERT(mutex_owned(>sc_lock));
KASSERT(pb != NULL);
- if (sc->sc_buflen < blksize)
+ if (sc->sc_buflen < (uint)blksize)
return ERESTART;
pb->pb_ptr = (sc->sc_audiobuf + sc->sc_rpos);
@@ -253,51 +279,149 @@
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nakayama
Date: Sun Sep 23 21:18:30 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
pad(4) mixer has only 1 channel, so return EINVAL in the case other than 1.
This fixes the following strange output of mixerctl(1):
outputs.master=255,0
inputs.dac=255,0
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pad/pad.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/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.53 src/sys/dev/pad/pad.c:1.54
--- src/sys/dev/pad/pad.c:1.53 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pad/pad.c Sun Sep 23 21:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.53 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,23 +27,18 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.53 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $");
#include
#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -57,17 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.53
#include
-#define MAXDEVS 128
-#define PADCLONER 254
#define PADUNIT(x) minor(x)
-#define PADFREQ 44100
-#define PADCHAN 2
-#define PADPREC 16
-#define PADENC AUDIO_ENCODING_SLINEAR_LE
-
extern struct cfdriver pad_cd;
-kmutex_t padconfig;
typedef struct pad_block {
uint8_t *pb_ptr;
@@ -112,18 +99,7 @@ static stream_filter_t *pad_swvol_filter
const audio_params_t *, const audio_params_t *);
static void pad_swvol_dtor(stream_filter_t *);
-static int pad_close(struct pad_softc *);
-static int pad_read(struct pad_softc *, off_t *, struct uio *, kauth_cred_t, int);
-
-static int fops_pad_close(struct file *);
-static int fops_pad_read(struct file *, off_t *, struct uio *, kauth_cred_t, int);
-static int pad_write(struct file *, off_t *, struct uio *, kauth_cred_t, int);
-static int pad_ioctl(struct file *, u_long, void *);
-static int pad_kqfilter(struct file *, struct knote *);
-static int pad_poll(struct file *, int);
-static int pad_stat(struct file *, struct stat *);
-static int pad_mmap(struct file *, off_t *, size_t, int, int *, int *,
- struct uvm_object **, int *);
+static bool pad_is_attached; /* Do we have an audio* child? */
static const struct audio_hw_if pad_hw_if = {
.open = pad_audio_open,
@@ -144,8 +120,8 @@ static const struct audio_hw_if pad_hw_i
#define PAD_NFORMATS 1
static const struct audio_format pad_formats[PAD_NFORMATS] = {
- { NULL, AUMODE_PLAY|AUMODE_RECORD, PADENC, PADPREC, PADPREC,
- PADCHAN, AUFMT_STEREO, 1, { PADFREQ } },
+ { NULL, AUMODE_PLAY|AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
+ 2, AUFMT_STEREO, 1, { 44100 } },
};
extern void padattach(int);
@@ -154,13 +130,13 @@ static int pad_add_block(pad_softc_t *,
static int pad_get_block(pad_softc_t *, pad_block_t *, int);
dev_type_open(pad_open);
-dev_type_close(cdev_pad_close);
-dev_type_read(cdev_pad_read);
+dev_type_close(pad_close);
+dev_type_read(pad_read);
const struct cdevsw pad_cdevsw = {
.d_open = pad_open,
- .d_close = cdev_pad_close,
- .d_read = cdev_pad_read,
+ .d_close = pad_close,
+ .d_read = pad_read,
.d_write = nowrite,
.d_ioctl = noioctl,
.d_stop = nostop,
@@ -172,36 +148,34 @@ const struct cdevsw pad_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE,
};
-const struct fileops pad_fileops = {
- .fo_name = "pad",
- .fo_read = fops_pad_read,
- .fo_write = pad_write,
- .fo_ioctl = pad_ioctl,
- .fo_fcntl = fnullop_fcntl,
- .fo_stat = pad_stat,
- .fo_poll = pad_poll,
- .fo_close = fops_pad_close,
- .fo_mmap = pad_mmap,
- .fo_kqfilter = pad_kqfilter,
- .fo_restart = fnullop_restart
-};
-
CFATTACH_DECL2_NEW(pad, sizeof(pad_softc_t), pad_match, pad_attach, pad_detach,
NULL, NULL, pad_childdet);
void
padattach(int n)
{
- int error;
+ int i, err;
+ cfdata_t cf;
- error = config_cfattach_attach(pad_cd.cd_name, _ca);
- if (error) {
+ aprint_debug("pad: requested %d units\n", n);
+
+ err = config_cfattach_attach(pad_cd.cd_name, _ca);
+ if (err) {
aprint_error("%s: couldn't register cfattach: %d\n",
- pad_cd.cd_name, error);
+ pad_cd.cd_name, err);
config_cfdriver_detach(_cd);
return;
}
- mutex_init(, MUTEX_DEFAULT, IPL_NONE);
+
+ for (i = 0; i < n; i++) {
+ cf = kmem_alloc(sizeof(struct cfdata), KM_SLEEP);
+ cf->cf_name = pad_cd.cd_name;
+ cf->cf_atname = pad_cd.cd_name;
+ cf->cf_unit = i;
+ cf->cf_fstate = FSTATE_STAR;
+
+ (void)config_attach_pseudo(cf);
+ }
return;
}
@@ -244,7 +218,7 @@ pad_get_block(pad_softc_t *sc, pad_block
KASSERT(mutex_owned(>sc_lock));
KASSERT(pb != NULL);
- if (sc->sc_buflen < (uint)blksize)
+ if
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nakayama Date: Sat Sep 22 05:24:22 UTC 2018 Modified Files: src/sys/dev/pci: files.pci Log Message: ixg and ixv depend on mii and mii_phy. To generate a diff of this commit: cvs rdiff -u -r1.402 -r1.403 src/sys/dev/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.402 src/sys/dev/pci/files.pci:1.403 --- src/sys/dev/pci/files.pci:1.402 Fri Sep 21 18:38:25 2018 +++ src/sys/dev/pci/files.pci Sat Sep 22 05:24:22 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.402 2018/09/21 18:38:25 maxv Exp $ +# $NetBSD: files.pci,v 1.403 2018/09/22 05:24:22 nakayama Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -664,7 +664,7 @@ attach stge at pci file dev/pci/if_stge.c stge # Intel i82598 & i82599 10-Gigabit Ethernet -device ixg: ether, ifnet, arp +device ixg: ether, ifnet, arp, mii, mii_phy attach ixg at pci file dev/pci/ixgbe/ixgbe.c ixg | ixv file dev/pci/ixgbe/ix_txrx.c ixg | ixv @@ -683,7 +683,7 @@ file dev/pci/ixgbe/if_bypass.c ixg | ixv file dev/pci/ixgbe/if_fdir.c ixg | ixv # This appears to be the driver for virtual instances of i82599. -device ixv: ether, ifnet, arp +device ixv: ether, ifnet, arp, mii, mii_phy attach ixv at pci file dev/pci/ixgbe/ixv.c ixv
CVS commit: src/external/bsd/mdocml/include
Module Name:src Committed By: nakayama Date: Wed Aug 15 22:07:32 UTC 2018 Modified Files: src/external/bsd/mdocml/include: config.h Log Message: Add recallocarray prototype. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/include/config.h 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/mdocml/include/config.h diff -u src/external/bsd/mdocml/include/config.h:1.6 src/external/bsd/mdocml/include/config.h:1.7 --- src/external/bsd/mdocml/include/config.h:1.6 Tue Aug 14 08:53:06 2018 +++ src/external/bsd/mdocml/include/config.h Wed Aug 15 22:07:32 2018 @@ -29,6 +29,7 @@ #define HAVE_PLEDGE 0 #define HAVE_PROGNAME 1 #define HAVE_REALLOCARRAY 0 +#define HAVE_RECALLOCARRAY 0 #define HAVE_REWB_BSD 1 #define HAVE_REWB_SYSV 0 #define HAVE_SANDBOX_INIT 0 @@ -54,4 +55,5 @@ extern int getsubopt(char **, char * const *, char **); extern void *reallocarray(void *, size_t, size_t); +extern void *recallocarray(void *, size_t, size_t, size_t); extern long long strtonum(const char *, long long, long long, const char **);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nakayama
Date: Sat Jun 16 08:24:55 UTC 2018
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Change aprint_error_dev to aprint_normal_dev for normal completion case.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/usb/uaudio.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/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.155 src/sys/dev/usb/uaudio.c:1.156
--- src/sys/dev/usb/uaudio.c:1.155 Wed Jul 26 07:45:05 2017
+++ src/sys/dev/usb/uaudio.c Sat Jun 16 08:24:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.155 2017/07/26 07:45:05 maya Exp $ */
+/* $NetBSD: uaudio.c,v 1.156 2018/06/16 08:24:55 nakayama Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.155 2017/07/26 07:45:05 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.156 2018/06/16 08:24:55 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1585,7 +1585,7 @@ uaudio_process_as(struct uaudio_softc *s
return USBD_INVAL;
if (asf1d->bFormatType != FORMAT_TYPE_I) {
- aprint_error_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"ignored setting with type %d format\n", UGETW(asid->wFormatTag));
return USBD_NORMAL_COMPLETION;
}
@@ -1616,7 +1616,7 @@ uaudio_process_as(struct uaudio_softc *s
if (dir == UE_DIR_IN && type == UE_ISO_ADAPT) {
sync = TRUE;
#ifndef UAUDIO_MULTIPLE_ENDPOINTS
- aprint_error_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"ignored input endpoint of type adaptive\n");
return USBD_NORMAL_COMPLETION;
#endif
@@ -1624,7 +1624,7 @@ uaudio_process_as(struct uaudio_softc *s
if (dir != UE_DIR_IN && type == UE_ISO_ASYNC) {
sync = TRUE;
#ifndef UAUDIO_MULTIPLE_ENDPOINTS
- aprint_error_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"ignored output endpoint of type async\n");
return USBD_NORMAL_COMPLETION;
#endif
@@ -1693,7 +1693,7 @@ uaudio_process_as(struct uaudio_softc *s
chan = asf1d->bNrChannels;
prec = asf1d->bBitResolution;
if (prec != 8 && prec != 16 && prec != 24) {
- aprint_error_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"ignored setting with precision %d\n", prec);
return USBD_NORMAL_COMPLETION;
}
@@ -1726,7 +1726,7 @@ uaudio_process_as(struct uaudio_softc *s
break;
case UA_FMT_IEEE_FLOAT:
default:
- aprint_error_dev(sc->sc_dev,
+ aprint_normal_dev(sc->sc_dev,
"ignored setting with format %d\n", format);
return USBD_NORMAL_COMPLETION;
}
CVS commit: src/external/bsd/mdocml
Module Name:src
Committed By: nakayama
Date: Fri Apr 13 21:52:49 UTC 2018
Modified Files:
src/external/bsd/mdocml/dist: term_ascii.c
src/external/bsd/mdocml/include: config.h
Log Message:
Re-enable wchar_t support. mandoc(1) can now fall back to ascii
output if the locale is non-UTF-8 locale with the following change.
https://marc.info/?l=openbsd-cvs=152364416720474
| Modified files:
| usr.bin/mandoc : term_ascii.c
|
| Log message:
| Make sure that mandoc only goes into UTF-8 mode if the user really
| selected UTF-8, not some other multibyte locale. This obviously
| makes no difference on OpenBSD but improves portability.
| Issue reported by via wiz@.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/mdocml/dist/term_ascii.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/include/config.h
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/mdocml/dist/term_ascii.c
diff -u src/external/bsd/mdocml/dist/term_ascii.c:1.1.1.11 src/external/bsd/mdocml/dist/term_ascii.c:1.2
--- src/external/bsd/mdocml/dist/term_ascii.c:1.1.1.11 Sat Mar 18 15:06:54 2017
+++ src/external/bsd/mdocml/dist/term_ascii.c Fri Apr 13 21:52:49 2018
@@ -21,11 +21,13 @@
#include
#if HAVE_WCHAR
+#include
#include
#endif
#include
#include
#include
+#include
#include
#if HAVE_WCHAR
#include
@@ -99,7 +101,17 @@ ascii_init(enum termenc enc, const struc
v = TERMENC_LOCALE == enc ?
setlocale(LC_CTYPE, "") :
setlocale(LC_CTYPE, UTF8_LOCALE);
- if (NULL != v && MB_CUR_MAX > 1) {
+
+ /*
+ * We only support UTF-8,
+ * so revert to ASCII for anything else.
+ */
+
+ if (v != NULL &&
+ strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
+ v = setlocale(LC_CTYPE, "C");
+
+ if (v != NULL && MB_CUR_MAX > 1) {
p->enc = enc;
p->advance = locale_advance;
p->endline = locale_endline;
Index: src/external/bsd/mdocml/include/config.h
diff -u src/external/bsd/mdocml/include/config.h:1.4 src/external/bsd/mdocml/include/config.h:1.5
--- src/external/bsd/mdocml/include/config.h:1.4 Sat Mar 17 11:06:48 2018
+++ src/external/bsd/mdocml/include/config.h Fri Apr 13 21:52:48 2018
@@ -41,7 +41,7 @@
#define HAVE_STRTONUM 0
#define HAVE_SYS_ENDIAN 1
#define HAVE_VASPRINTF 1
-#define HAVE_WCHAR 0
+#define HAVE_WCHAR 1
#define HAVE_OHASH 0
#define BINM_APROPOS "apropos"
CVS commit: src/distrib/sets
Module Name:src
Committed By: nakayama
Date: Thu Apr 12 11:49:04 UTC 2018
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Handle compatdir first whether making obsolete lists or not, to
make obsolete lists including compat directory (eg. ./usr/lib/i386)
properly.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/sets.subr
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.183 src/distrib/sets/sets.subr:1.184
--- src/distrib/sets/sets.subr:1.183 Thu Feb 8 03:27:50 2018
+++ src/distrib/sets/sets.subr Thu Apr 12 11:49:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.183 2018/02/08 03:27:50 christos Exp $
+# $NetBSD: sets.subr,v 1.184 2018/04/12 11:49:04 nakayama Exp $
#
#
@@ -180,7 +180,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.183 2018/02/08 03:27:50 christos Exp $
+# # $NetBSD: sets.subr,v 1.184 2018/04/12 11:49:04 nakayama Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -369,6 +369,13 @@ list_set_files()
if (kw == "obsolete")
haveobs = 1
}
+ if (iscompatdir) {
+for (d in cpaths) {
+ if (cpaths[d] == $1 "/")
+ next
+}
+cpaths[ncpaths++] = $1 "/"
+ }
if (obsolete && ! haveobs)
next
if (!show)
@@ -392,11 +399,6 @@ list_set_files()
emitcompat[$1] = 1;
next
}
- for (d in cpaths) {
-if (cpaths[d] == $1 "/")
- next
- }
- cpaths[ncpaths++] = $1 "/"
for (d in compatarchdirs) {
tmp = $0
xfile = $1 "/" compatarchdirs[d]
CVS commit: src/sbin/raidctl
Module Name:src
Committed By: nakayama
Date: Sat Mar 24 19:41:35 UTC 2018
Modified Files:
src/sbin/raidctl: raidctl.c
Log Message:
Follow the ioctl arg changes of RAIDFRAME_GET_COMPONENT_LABEL and
RAIDFRAME_CHECK_*_STATUS_EXT.
This should fix strange raidctl -s outputs reported in
current-users ML.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sbin/raidctl/raidctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.66 src/sbin/raidctl/raidctl.c:1.67
--- src/sbin/raidctl/raidctl.c:1.66 Thu Jan 18 00:32:49 2018
+++ src/sbin/raidctl/raidctl.c Sat Mar 24 19:41:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.66 2018/01/18 00:32:49 mrg Exp $ */
+/* $NetBSD: raidctl.c,v 1.67 2018/03/24 19:41:35 nakayama Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: raidctl.c,v 1.66 2018/01/18 00:32:49 mrg Exp $");
+__RCSID("$NetBSD: raidctl.c,v 1.67 2018/03/24 19:41:35 nakayama Exp $");
#endif
@@ -653,7 +653,7 @@ rf_output_configuration(int fd, const ch
component_label.row = component_num / num_cols;
component_label.column = component_num % num_cols;
label_ptr = _label;
- do_ioctl(fd, RAIDFRAME_GET_COMPONENT_LABEL, _ptr,
+ do_ioctl(fd, RAIDFRAME_GET_COMPONENT_LABEL, label_ptr,
"RAIDFRAME_GET_COMPONENT_LABEL");
printf("START layout\n");
@@ -753,7 +753,7 @@ get_component_label(int fd, char *compon
component_label.column = component_num % num_cols;
label_ptr = _label;
- do_ioctl( fd, RAIDFRAME_GET_COMPONENT_LABEL, _ptr,
+ do_ioctl( fd, RAIDFRAME_GET_COMPONENT_LABEL, label_ptr,
"RAIDFRAME_GET_COMPONENT_LABEL");
printf("Component label for %s:\n",component);
@@ -1027,7 +1027,7 @@ do_meter(int fd, u_long option)
pInfoPtr=
percent_done = 0;
- do_ioctl(fd, option, , "");
+ do_ioctl(fd, option, pInfoPtr, "");
start_value = progressInfo.completed;
current_time = start_time;
simple_eta = 0;
@@ -1090,7 +1090,7 @@ do_meter(int fd, u_long option)
if (gettimeofday(_time,NULL) == -1)
err(1, "gettimeofday failed!?!?");
- do_ioctl( fd, option, , "");
+ do_ioctl( fd, option, pInfoPtr, "");
}
CVS commit: src/external/bsd/mdocml/include
Module Name:src Committed By: nakayama Date: Sat Mar 17 11:06:48 UTC 2018 Modified Files: src/external/bsd/mdocml/include: config.h Log Message: Disable wchar_t support since our C library does not treat wchar_t as UCS-4 in the case of non-UTF-8 locales. This feature was controlled by USE_WCHAR and disabled on NetBSD 7. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/include/config.h 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/mdocml/include/config.h diff -u src/external/bsd/mdocml/include/config.h:1.3 src/external/bsd/mdocml/include/config.h:1.4 --- src/external/bsd/mdocml/include/config.h:1.3 Sat Mar 18 15:24:17 2017 +++ src/external/bsd/mdocml/include/config.h Sat Mar 17 11:06:48 2018 @@ -41,7 +41,7 @@ #define HAVE_STRTONUM 0 #define HAVE_SYS_ENDIAN 1 #define HAVE_VASPRINTF 1 -#define HAVE_WCHAR 1 +#define HAVE_WCHAR 0 #define HAVE_OHASH 0 #define BINM_APROPOS "apropos"
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Fri Jan 19 12:47:42 UTC 2018
Modified Files:
src/sys/arch/sparc64/sparc64: cpu.c
Log Message:
sun4v doesn't have %ver register.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.133 src/sys/arch/sparc64/sparc64/cpu.c:1.134
--- src/sys/arch/sparc64/sparc64/cpu.c:1.133 Tue Jan 16 08:23:18 2018
+++ src/sys/arch/sparc64/sparc64/cpu.c Fri Jan 19 12:47:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.133 2018/01/16 08:23:18 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.134 2018/01/19 12:47:41 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.133 2018/01/16 08:23:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.134 2018/01/19 12:47:41 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -549,8 +549,8 @@ cpu_attach(device_t parent, device_t dev
aprint_normal(": %s, CPU id %d\n", buf, ci->ci_cpuid);
aprint_naive("\n");
- ci->ci_ver = getver();
if (CPU_ISSUN4U || CPU_ISSUN4US) {
+ ci->ci_ver = getver();
aprint_normal_dev(dev, "manuf %x, impl %x, mask %x\n",
(u_int)GETVER_CPU_MANUF(),
(u_int)GETVER_CPU_IMPL(),
CVS commit: src/sys/net
Module Name:src
Committed By: nakayama
Date: Fri Jan 19 12:31:28 UTC 2018
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Fix inverted logic.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/net/if_ethersubr.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/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.256 src/sys/net/if_ethersubr.c:1.257
--- src/sys/net/if_ethersubr.c:1.256 Mon Jan 15 14:00:34 2018
+++ src/sys/net/if_ethersubr.c Fri Jan 19 12:31:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.256 2018/01/15 14:00:34 maxv Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.257 2018/01/19 12:31:27 nakayama Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.256 2018/01/15 14:00:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.257 2018/01/19 12:31:27 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -756,7 +756,7 @@ ether_input(struct ifnet *ifp, struct mb
case ETHERTYPE_SLOWPROTOCOLS: {
uint8_t subtype;
- KASSERTMSG((m->m_pkthdr.len < sizeof(*eh) + sizeof(subtype)),
+ KASSERTMSG((m->m_pkthdr.len >= sizeof(*eh) + sizeof(subtype)),
"too short slow protocol packet");
m_copydata(m, sizeof(*eh), sizeof(subtype), );
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: nakayama
Date: Fri Dec 29 07:53:33 UTC 2017
Modified Files:
src/sys/arch/x86/x86: vmt.c
Log Message:
Add line break.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/vmt.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/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.19 src/sys/arch/x86/x86/vmt.c:1.20
--- src/sys/arch/x86/x86/vmt.c:1.19 Tue Oct 17 06:50:00 2017
+++ src/sys/arch/x86/x86/vmt.c Fri Dec 29 07:53:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.19 2017/10/17 06:50:00 maya Exp $ */
+/* $NetBSD: vmt.c,v 1.20 2017/12/29 07:53:33 nakayama Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -179,6 +179,7 @@ vmt_attach(device_t parent, device_t sel
struct vmt_softc *sc = device_private(self);
aprint_naive("\n");
+ aprint_normal("\n");
sc->sc_dev = self;
sc->sc_log = NULL;
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: nakayama Date: Wed Dec 27 01:17:01 UTC 2017 Modified Files: src/distrib/sets/lists/xserver: md.macppc Log Message: Add missing catman entry. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.macppc 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/xserver/md.macppc diff -u src/distrib/sets/lists/xserver/md.macppc:1.76 src/distrib/sets/lists/xserver/md.macppc:1.77 --- src/distrib/sets/lists/xserver/md.macppc:1.76 Thu Jan 5 02:22:19 2017 +++ src/distrib/sets/lists/xserver/md.macppc Wed Dec 27 01:17:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: md.macppc,v 1.76 2017/01/05 02:22:19 christos Exp $ +# $NetBSD: md.macppc,v 1.77 2017/12/27 01:17:01 nakayama Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -186,6 +186,7 @@ ./usr/X11R7/man/cat4/ati.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/chips.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/exa.0-unknown- .cat,xorg +./usr/X11R7/man/cat4/glint.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/imstt.0-unknown- obsolete ./usr/X11R7/man/cat4/kbd.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/mga.0-unknown- .cat,xorg
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: nakayama
Date: Sat Dec 23 10:15:52 UTC 2017
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
Remove duplicates.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/external/mit/xorg/server/drivers/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/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.94 src/external/mit/xorg/server/drivers/Makefile:1.95
--- src/external/mit/xorg/server/drivers/Makefile:1.94 Mon Aug 7 06:51:13 2017
+++ src/external/mit/xorg/server/drivers/Makefile Sat Dec 23 10:15:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2017/08/07 06:51:13 mrg Exp $
+# $NetBSD: Makefile,v 1.95 2017/12/23 10:15:52 nakayama Exp $
.include
@@ -307,19 +307,14 @@ SUBDIR+= \
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-ag10e \
- xf86-video-glint \
xf86-video-sunleo
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE} == "sparc"
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-pnozz
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-
SUBDIR+= \
xf86-video-suncg14 \
xf86-video-suntcx
+
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-pnozz
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: nakayama Date: Sat Dec 23 10:07:07 UTC 2017 Modified Files: src/distrib/sets/lists/xserver: md.sparc Log Message: glint is enabled both xorg-server 1.10 and 1.18. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xserver/md.sparc 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/xserver/md.sparc diff -u src/distrib/sets/lists/xserver/md.sparc:1.67 src/distrib/sets/lists/xserver/md.sparc:1.68 --- src/distrib/sets/lists/xserver/md.sparc:1.67 Thu Jan 5 02:22:19 2017 +++ src/distrib/sets/lists/xserver/md.sparc Sat Dec 23 10:07:07 2017 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.67 2017/01/05 02:22:19 christos Exp $ +# $NetBSD: md.sparc,v 1.68 2017/12/23 10:07:07 nakayama Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -29,10 +29,8 @@ ./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg -./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=110 -./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=118,obsolete -./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=110 -./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=118,obsolete +./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg @@ -190,8 +188,7 @@ ./usr/X11R7/man/cat4/ag10e.0-unknown- .cat,xorg,xorg_server_ver=110 ./usr/X11R7/man/cat4/ati.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/exa.0-unknown- .cat,xorg -./usr/X11R7/man/cat4/glint.0-unknown- .cat,xorg,xorg_server_ver=110 -./usr/X11R7/man/cat4/glint.0-unknown- .cat,xorg,xorg_server_ver=118,obsolete +./usr/X11R7/man/cat4/glint.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/kbd.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/mga.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/mousedrv.0-unknown- .cat,xorg @@ -217,8 +214,7 @@ ./usr/X11R7/man/html4/ag10e.html -unknown- html,xorg,xorg_server_ver=110 ./usr/X11R7/man/html4/ati.html-unknown- html,xorg ./usr/X11R7/man/html4/exa.html-unknown- html,xorg -./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110 -./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=118,obsolete +./usr/X11R7/man/html4/glint.html -unknown- html,xorg ./usr/X11R7/man/html4/kbd.html-unknown- html,xorg ./usr/X11R7/man/html4/mga.html-unknown- html,xorg ./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg @@ -244,8 +240,7 @@ ./usr/X11R7/man/man4/ag10e.4-unknown- .man,xorg,xorg_server_ver=110 ./usr/X11R7/man/man4/ati.4-unknown- .man,xorg ./usr/X11R7/man/man4/exa.4-unknown- .man,xorg -./usr/X11R7/man/man4/glint.4-unknown- .man,xorg,xorg_server_ver=110 -./usr/X11R7/man/man4/glint.4-unknown- .man,xorg,xorg_server_ver=118,obsolete +./usr/X11R7/man/man4/glint.4-unknown- .man,xorg ./usr/X11R7/man/man4/kbd.4-unknown- .man,xorg ./usr/X11R7/man/man4/mga.4-unknown- .man,xorg ./usr/X11R7/man/man4/mousedrv.4-unknown- .man,xorg
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: nakayama
Date: Tue Dec 19 14:34:08 UTC 2017
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
files.ofw is now mandatory, so use its dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/sparc64/conf/files.sparc64
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/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.153 src/sys/arch/sparc64/conf/files.sparc64:1.154
--- src/sys/arch/sparc64/conf/files.sparc64:1.153 Thu Jul 6 11:09:00 2017
+++ src/sys/arch/sparc64/conf/files.sparc64 Tue Dec 19 14:34:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.153 2017/07/06 11:09:00 martin Exp $
+# $NetBSD: files.sparc64,v 1.154 2017/12/19 14:34:08 nakayama Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -11,7 +11,7 @@ maxusers 2 8 1024
defflag opt_sparc_arch.h SUN4U SUN4V
define mainbus {}
-device mainbus: mainbus
+device mainbus: mainbus, ofw_subr
attach mainbus at root
define upa {}
@@ -314,9 +314,6 @@ file dev/md_root.c memory_disk_hooks
include "arch/sparc64/conf/majors.sparc64"
-# OpenFirmware convenience stuff
-file dev/ofw/ofw_subr.c
-
# Virtual rtc
device vrtc
attach vrtc at vbus
CVS commit: src/tests/kernel
Module Name:src
Committed By: nakayama
Date: Thu Dec 14 14:38:17 UTC 2017
Modified Files:
src/tests/kernel: Makefile
Log Message:
Use SCRIPTS instead of PROGS to avoid strip(1) if STRIPFLAG=-s.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/tests/kernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.51 src/tests/kernel/Makefile:1.52
--- src/tests/kernel/Makefile:1.51 Tue Dec 12 18:19:45 2017
+++ src/tests/kernel/Makefile Thu Dec 14 14:38:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/12/12 18:19:45 christos Exp $
+# $NetBSD: Makefile,v 1.52 2017/12/14 14:38:17 nakayama Exp $
NOMAN= # defined
@@ -29,8 +29,9 @@ PROGS= h_ps_strings1
PROGS+= h_ps_strings2
PROGS+= h_segv
PROGS+= h_getprocpath
-PROGS+= h_interpreter
-SRCS.h_interpreter += h_interpreter.sh
+
+SCRIPTSDIR= ${TESTSDIR}
+SCRIPTS= h_interpreter.sh
LDADD.t_mqueue+= -lrt
CVS commit: src/sys/arch
Module Name:src Committed By: nakayama Date: Mon Nov 13 11:45:54 UTC 2017 Modified Files: src/sys/arch/amd64/include: i82093reg.h src/sys/arch/i386/include: i82093reg.h src/sys/arch/x86/x86: ioapic.c Log Message: Don't write a 1 to the read only RIRR bit in the IOAPIC redirection register to fix "tlp0: filter setup and transmit timeout" observed on Hyper-V VMs with the Legacy Network Adapter. >From OpenBSD via PR kern/49323: https://marc.info/?l=openbsd-cvs=146718035432599=2 | Modified files: | sys/arch/amd64/amd64: ioapic.c | sys/arch/amd64/include: i82093reg.h | | Log message: | Don't write a 1 to the RIRR bit in the IOAPIC redirection register. This bit | is R/O, and although it should not matter what value is written there, | Hyper-V's emulated IOAPIC interprets a write of 1 in some unexpected way and | subsequently blocks interrupt delivery. This primarily manifests itself as | de(4) timeouts when using Hyper-V VMs with the "Legacy Network Adapter" | interface. Tested both amd64 and i386 on Client Hyper-V on Windows 10. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/include/i82093reg.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/include/i82093reg.h cvs rdiff -u -r1.53 -r1.54 src/sys/arch/x86/x86/ioapic.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/amd64/include/i82093reg.h diff -u src/sys/arch/amd64/include/i82093reg.h:1.8 src/sys/arch/amd64/include/i82093reg.h:1.9 --- src/sys/arch/amd64/include/i82093reg.h:1.8 Tue May 23 08:54:38 2017 +++ src/sys/arch/amd64/include/i82093reg.h Mon Nov 13 11:45:54 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: i82093reg.h,v 1.8 2017/05/23 08:54:38 nonaka Exp $ */ +/* $NetBSD: i82093reg.h,v 1.9 2017/11/13 11:45:54 nakayama Exp $ */ #include @@ -57,6 +57,7 @@ movq IOAPIC_SC_DATA(%rdi),%r15 ;\ movl (%r15),%esi ;\ orl $IOAPIC_REDLO_MASK,%esi;\ + andl $~IOAPIC_REDLO_RIRR,%esi ;\ movl %esi,(%r15) ;\ movq IS_PIC(%r14),%rdi;\ ioapic_asm_unlock(num) @@ -73,7 +74,7 @@ movq IOAPIC_SC_DATA(%rdi),%r13 ;\ movl %esi, (%r15) ;\ movl (%r13),%r12d ;\ - andl $~IOAPIC_REDLO_MASK,%r12d ;\ + andl $~(IOAPIC_REDLO_MASK|IOAPIC_REDLO_RIRR),%r12d ;\ movl %esi,(%r15) ;\ movl %r12d,(%r13) ;\ movq IS_PIC(%r14),%rdi;\ Index: src/sys/arch/i386/include/i82093reg.h diff -u src/sys/arch/i386/include/i82093reg.h:1.10 src/sys/arch/i386/include/i82093reg.h:1.11 --- src/sys/arch/i386/include/i82093reg.h:1.10 Tue May 23 08:54:39 2017 +++ src/sys/arch/i386/include/i82093reg.h Mon Nov 13 11:45:54 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: i82093reg.h,v 1.10 2017/05/23 08:54:39 nonaka Exp $ */ +/* $NetBSD: i82093reg.h,v 1.11 2017/11/13 11:45:54 nakayama Exp $ */ #include @@ -48,6 +48,7 @@ movl IOAPIC_SC_DATA(%edi),%ebx ;\ movl (%ebx),%esi ;\ orl $IOAPIC_REDLO_MASK,%esi;\ + andl $~IOAPIC_REDLO_RIRR,%esi ;\ movl %esi,(%ebx) ;\ movl IS_PIC(%ebp),%edi;\ ioapic_asm_unlock(num) @@ -71,7 +72,7 @@ movl IOAPIC_SC_DATA(%edi),%eax ;\ movl %esi, (%ebx) ;\ movl (%eax),%edx ;\ - andl $~IOAPIC_REDLO_MASK,%edx ;\ + andl $~(IOAPIC_REDLO_MASK|IOAPIC_REDLO_RIRR),%edx ;\ movl %esi, (%ebx) ;\ movl %edx,(%eax) ;\ movl IS_PIC(%ebp),%edi;\ Index: src/sys/arch/x86/x86/ioapic.c diff -u src/sys/arch/x86/x86/ioapic.c:1.53 src/sys/arch/x86/x86/ioapic.c:1.54 --- src/sys/arch/x86/x86/ioapic.c:1.53 Sat Nov 4 14:56:48 2017 +++ src/sys/arch/x86/x86/ioapic.c Mon Nov 13 11:45:54 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ioapic.c,v 1.53 2017/11/04 14:56:48 cherry Exp $ */ +/* $NetBSD: ioapic.c,v 1.54 2017/11/13 11:45:54 nakayama Exp $ */ /*- * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.53 2017/11/04 14:56:48 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.54 2017/11/13 11:45:54 nakayama Exp $"); #include "opt_ddb.h" @@ -508,6 +508,7 @@ ioapic_hwmask(struct pic *pic, int pin) flags = ioapic_lock(sc); redlo = ioapic_read_ul(sc, IOAPIC_REDLO(pin)); redlo |= IOAPIC_REDLO_MASK; + redlo &= ~IOAPIC_REDLO_RIRR; ioapic_write_ul(sc, IOAPIC_REDLO(pin), redlo); ioapic_unlock(sc, flags); } @@ -548,7 +549,7 @@ ioapic_hwunmask(struct pic *pic, int pin flags = ioapic_lock(sc); redlo = ioapic_read_ul(sc, IOAPIC_REDLO(pin)); - redlo &= ~IOAPIC_REDLO_MASK; + redlo &= ~(IOAPIC_REDLO_MASK | IOAPIC_REDLO_RIRR); ioapic_write_ul(sc, IOAPIC_REDLO(pin), redlo); ioapic_unlock(sc, flags); }
CVS commit: src/tests/usr.sbin/mtree
Module Name:src
Committed By: nakayama
Date: Thu Sep 7 04:05:21 UTC 2017
Modified Files:
src/tests/usr.sbin/mtree: t_mtree.sh
Log Message:
Add test mtree -O with same hash value in directory and leaf.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.sbin/mtree/t_mtree.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/mtree/t_mtree.sh
diff -u src/tests/usr.sbin/mtree/t_mtree.sh:1.7 src/tests/usr.sbin/mtree/t_mtree.sh:1.8
--- src/tests/usr.sbin/mtree/t_mtree.sh:1.7 Sat Jan 14 20:45:16 2017
+++ src/tests/usr.sbin/mtree/t_mtree.sh Thu Sep 7 04:05:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtree.sh,v 1.7 2017/01/14 20:45:16 christos Exp $
+# $NetBSD: t_mtree.sh,v 1.8 2017/09/07 04:05:21 nakayama Exp $
#
# Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -412,6 +412,42 @@ netbsd6_nonemptydir_body()
}
+atf_test_case mtree_onlyfile
+atf_test_case netbsd6_onlyfile
+onlyfile_head()
+{
+ atf_set "descr" "Test -O with same hash value in directory and leaf"
+}
+
+onlyfile_body()
+{
+ mkdir -p ab/no
+ echo ./ab/no >onlyfile
+ mtree -F ${FLAVOR} -c -n -O onlyfile >output
+ if [ ! -s output ]; then
+ atf_fail "mtree did not find path in onlyfile"
+ fi
+}
+
+mtree_onlyfile_head()
+{
+ FLAVOR=mtree onlyfile_head
+}
+netbsd6_onlyfile_head()
+{
+ FLAVOR=netbsd6 onlyfile_head
+}
+
+mtree_onlyfile_body()
+{
+ FLAVOR=mtree onlyfile_body
+}
+netbsd6_onlyfile_body()
+{
+ FLAVOR=netbsd6 onlyfile_body
+}
+
+
atf_init_test_cases()
{
atf_add_test_case mtree_create
@@ -423,6 +459,7 @@ atf_init_test_cases()
atf_add_test_case mtree_ignore
atf_add_test_case mtree_merge
atf_add_test_case mtree_nonemptydir
+ atf_add_test_case mtree_onlyfile
atf_add_test_case netbsd6_create
atf_add_test_case netbsd6_check
@@ -433,4 +470,5 @@ atf_init_test_cases()
atf_add_test_case netbsd6_ignore
atf_add_test_case netbsd6_merge
atf_add_test_case netbsd6_nonemptydir
+ atf_add_test_case netbsd6_onlyfile
}
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: nakayama
Date: Thu Sep 7 04:04:14 UTC 2017
Modified Files:
src/usr.sbin/mtree: only.c
Log Message:
Don't modify strings stored in hash, otherwise filling up of
directory hierarchy stops if the same hash value occurs in
directory and leaf.
Fix the issue that
"./usr/share/locale/pl/LC_MESSAGES/gettext-tools.mo" isn't included
in sets file in the case of MKUNPRIVED=no.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mtree/only.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/only.c
diff -u src/usr.sbin/mtree/only.c:1.2 src/usr.sbin/mtree/only.c:1.3
--- src/usr.sbin/mtree/only.c:1.2 Tue Feb 5 00:59:03 2013
+++ src/usr.sbin/mtree/only.c Thu Sep 7 04:04:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $ */
+/* $NetBSD: only.c,v 1.3 2017/09/07 04:04:13 nakayama Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $");
+__RCSID("$NetBSD: only.c,v 1.3 2017/09/07 04:04:13 nakayama Exp $");
#endif
#include
@@ -89,11 +89,14 @@ static void
hash_insert(char *str, uint32_t h)
{
struct hentry *e;
+ char *x;
if ((e = malloc(sizeof(*e))) == NULL)
mtree_err("memory allocation error");
+ if ((x = strdup(str)) == NULL)
+ mtree_err("memory allocation error");
- e->str = str;
+ e->str = x;
e->hash = h;
e->next = table[h];
table[h] = e;
@@ -110,10 +113,7 @@ fill(char *str)
*ptr = '\0';
if (!hash_find(str, )) {
- char *x = strdup(str);
- if (x == NULL)
- mtree_err("memory allocation error");
- hash_insert(x, h);
+ hash_insert(str, h);
fill(str);
}
*ptr = '/';
@@ -135,6 +135,7 @@ load_only(const char *fname)
err(1, "Duplicate entry %s", line);
hash_insert(line, h);
fill(line);
+ free(line);
}
fclose(fp);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nakayama
Date: Fri Jul 21 21:01:13 UTC 2017
Modified Files:
src/sys/dev/pci: aceride.c pciide_acer_reg.h
Log Message:
Apply workaround from FreeBSD to fix read data corruption observed
on Fire V100 and mSATA-SSD with mSATA to IDE adapter.
The patch is from port-sparc64@.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/aceride.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/pciide_acer_reg.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/dev/pci/aceride.c
diff -u src/sys/dev/pci/aceride.c:1.36 src/sys/dev/pci/aceride.c:1.37
--- src/sys/dev/pci/aceride.c:1.36 Mon Oct 7 19:51:55 2013
+++ src/sys/dev/pci/aceride.c Fri Jul 21 21:01:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aceride.c,v 1.36 2013/10/07 19:51:55 jakllsch Exp $ */
+/* $NetBSD: aceride.c,v 1.37 2017/07/21 21:01:13 nakayama Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.36 2013/10/07 19:51:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.37 2017/07/21 21:01:13 nakayama Exp $");
#include
#include
@@ -194,8 +194,13 @@ acer_chip_map(struct pciide_softc *sc, c
interface = PCI_INTERFACE(pci_conf_read(sc->sc_pc, sc->sc_tag,
PCI_CLASS_REG));
- /* From linux: enable "Cable Detection" */
if (rev >= 0xC2) {
+ /* From FreeBSD: use device interrupt as byte count end */
+ pciide_pci_write(sc->sc_pc, sc->sc_tag, ACER_0x4A,
+ pciide_pci_read(sc->sc_pc, sc->sc_tag, ACER_0x4A)
+ | ACER_0x4A_BCEINT);
+
+ /* From linux: enable "Cable Detection" */
pciide_pci_write(sc->sc_pc, sc->sc_tag, ACER_0x4B,
pciide_pci_read(sc->sc_pc, sc->sc_tag, ACER_0x4B)
| ACER_0x4B_CDETECT);
Index: src/sys/dev/pci/pciide_acer_reg.h
diff -u src/sys/dev/pci/pciide_acer_reg.h:1.12 src/sys/dev/pci/pciide_acer_reg.h:1.13
--- src/sys/dev/pci/pciide_acer_reg.h:1.12 Mon Oct 19 18:41:15 2009
+++ src/sys/dev/pci/pciide_acer_reg.h Fri Jul 21 21:01:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_acer_reg.h,v 1.12 2009/10/19 18:41:15 bouyer Exp $ */
+/* $NetBSD: pciide_acer_reg.h,v 1.13 2017/07/21 21:01:13 nakayama Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
@@ -37,6 +37,8 @@
* bit 1 is 0 -> secondary has 80 pin cable
*/
#define ACER_0x4A_80PIN(chan) (0x1 << (chan))
+/* From FreeBSD, use device interrupt as byte count end */
+#define ACER_0x4A_BCEINT 0x20
/* From FreeBSD, for UDMA mode > 2 */
#define ACER_0x4B 0x4b
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: nakayama
Date: Fri Jul 21 20:58:44 UTC 2017
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
sparc has db_machdep.c now.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.36 src/usr.sbin/crash/Makefile:1.37
--- src/usr.sbin/crash/Makefile:1.36 Mon Apr 10 12:05:52 2017
+++ src/usr.sbin/crash/Makefile Fri Jul 21 20:58:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/04/10 12:05:52 christos Exp $
+# $NetBSD: Makefile,v 1.37 2017/07/21 20:58:44 nakayama Exp $
PROG= crash
MAN= crash.8
@@ -21,9 +21,7 @@ DPADD+= ${LIBUTIL} ${LIBKVM} ${LIBEDIT}
|| (${MACHINE_CPU} == "arm" && ${MACHINE} != "acorn26") \
|| ${MACHINE_ARCH} == "m68k"
SRCS+= db_trace.c
-.if ${MACHINE_ARCH} == "sparc"
-SRCS+= db_interface.c
-.elif ${MACHINE_ARCH} != "m68k"
+.if ${MACHINE_ARCH} != "m68k"
SRCS+= db_machdep.c
.endif
REALCRASH=yes
CVS commit: src/sys/arch/sparc
Module Name:src
Committed By: nakayama
Date: Fri Jul 21 20:56:10 UTC 2017
Modified Files:
src/sys/arch/sparc/conf: files.sparc
src/sys/arch/sparc/sparc: db_interface.c
Added Files:
src/sys/arch/sparc/sparc: db_machdep.c
Log Message:
Move the ddb registers and empty command table used for crash(8) into
db_machdep.c like other archs.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/sparc/conf/files.sparc
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/sparc/db_machdep.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/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.156 src/sys/arch/sparc/conf/files.sparc:1.157
--- src/sys/arch/sparc/conf/files.sparc:1.156 Sat Apr 30 05:24:45 2016
+++ src/sys/arch/sparc/conf/files.sparc Fri Jul 21 20:56:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.156 2016/04/30 05:24:45 macallan Exp $
+# $NetBSD: files.sparc,v 1.157 2017/07/21 20:56:10 nakayama Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -317,6 +317,7 @@ file arch/sparc/sparc/trap.c
file arch/sparc/sparc/vm_machdep.c
file arch/sparc/sparc/db_interface.c ddb | kgdb
+file arch/sparc/sparc/db_machdep.c ddb
file arch/sparc/sparc/db_trace.c ddb
file arch/sparc/sparc/db_disasm.c ddb
Index: src/sys/arch/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.93 src/sys/arch/sparc/sparc/db_interface.c:1.94
--- src/sys/arch/sparc/sparc/db_interface.c:1.93 Wed Dec 14 18:50:56 2016
+++ src/sys/arch/sparc/sparc/db_interface.c Fri Jul 21 20:56:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.93 2016/12/14 18:50:56 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.94 2017/07/21 20:56:10 nakayama Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.93 2016/12/14 18:50:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.94 2017/07/21 20:56:10 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -113,8 +113,6 @@ db_write_bytes(vaddr_t addr, size_t size
}
#endif
-db_regs_t *ddb_regp;
-
#if defined(DDB)
/*
@@ -132,81 +130,6 @@ cpu_Debugger(void)
#if defined(DDB) || defined(_KMEMUSER)
-static long nil;
-
-/*
- * Machine register set.
- */
-#define dbreg(xx) (long *)offsetof(db_regs_t, db_tf.tf_ ## xx)
-#define dbregfr(xx) (long *)offsetof(db_regs_t, db_fr.fr_ ## xx)
-
-static int db_sparc_regop(const struct db_variable *, db_expr_t *, int);
-
-const struct db_variable db_regs[] = {
- { "psr", dbreg(psr), db_sparc_regop, NULL, },
- { "pc", dbreg(pc), db_sparc_regop, NULL, },
- { "npc", dbreg(npc), db_sparc_regop, NULL, },
- { "y", dbreg(y), db_sparc_regop, NULL, },
- { "wim", dbreg(global[0]), db_sparc_regop, NULL, }, /* see reg.h */
- { "g0", , FCN_NULL, NULL, },
- { "g1", dbreg(global[1]), db_sparc_regop, NULL, },
- { "g2", dbreg(global[2]), db_sparc_regop, NULL, },
- { "g3", dbreg(global[3]), db_sparc_regop, NULL, },
- { "g4", dbreg(global[4]), db_sparc_regop, NULL, },
- { "g5", dbreg(global[5]), db_sparc_regop, NULL, },
- { "g6", dbreg(global[6]), db_sparc_regop, NULL, },
- { "g7", dbreg(global[7]), db_sparc_regop, NULL, },
- { "o0", dbreg(out[0]), db_sparc_regop, NULL, },
- { "o1", dbreg(out[1]), db_sparc_regop, NULL, },
- { "o2", dbreg(out[2]), db_sparc_regop, NULL, },
- { "o3", dbreg(out[3]), db_sparc_regop, NULL, },
- { "o4", dbreg(out[4]), db_sparc_regop, NULL, },
- { "o5", dbreg(out[5]), db_sparc_regop, NULL, },
- { "o6", dbreg(out[6]), db_sparc_regop, NULL, },
- { "o7", dbreg(out[7]), db_sparc_regop, NULL, },
- { "l0", dbregfr(local[0]), db_sparc_regop, NULL, },
- { "l1", dbregfr(local[1]), db_sparc_regop, NULL, },
- { "l2", dbregfr(local[2]), db_sparc_regop, NULL, },
- { "l3", dbregfr(local[3]), db_sparc_regop, NULL, },
- { "l4", dbregfr(local[4]), db_sparc_regop, NULL, },
- { "l5", dbregfr(local[5]), db_sparc_regop, NULL, },
- { "l6", dbregfr(local[6]), db_sparc_regop, NULL, },
- { "l7", dbregfr(local[7]), db_sparc_regop, NULL, },
- { "i0", dbregfr(arg[0]), db_sparc_regop, NULL, },
- { "i1", dbregfr(arg[1]), db_sparc_regop, NULL, },
- { "i2", dbregfr(arg[2]), db_sparc_regop, NULL, },
- { "i3", dbregfr(arg[3]), db_sparc_regop, NULL, },
- { "i4", dbregfr(arg[4]), db_sparc_regop, NULL, },
- { "i5", dbregfr(arg[5]), db_sparc_regop, NULL, },
- { "i6", dbregfr(fp), db_sparc_regop, NULL, },
- { "i7", dbregfr(pc), db_sparc_regop, NULL, },
-};
-const struct db_variable * const db_eregs =
-db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
-
-static int
-db_sparc_regop (const struct db_variable *vp, db_expr_t *val, int opcode)
-{
- db_expr_t *regaddr =
- (db_expr_t *)(((uint8_t *)DDB_REGS) + ((size_t)vp->valuep));
-
- switch (opcode) {
- case
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: nakayama Date: Mon Mar 6 05:58:00 UTC 2017 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: Fix previous. - xevie.pc is for libXevie, not for libxcb-xevie. - obsolete lint file. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/distrib/sets/lists/xcomp/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.191 src/distrib/sets/lists/xcomp/mi:1.192 --- src/distrib/sets/lists/xcomp/mi:1.191 Sun Mar 5 09:27:52 2017 +++ src/distrib/sets/lists/xcomp/mi Mon Mar 6 05:58:00 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.191 2017/03/05 09:27:52 mrg Exp $ +# $NetBSD: mi,v 1.192 2017/03/06 05:58:00 nakayama Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1380,7 +1380,7 @@ ./usr/X11R7/lib/pkgconfig/xcursor.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xdamage.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xdmcp.pc -unknown- xorg -./usr/X11R7/lib/pkgconfig/xevie.pc -unknown- obsolete +./usr/X11R7/lib/pkgconfig/xevie.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xext.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xextproto.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xf86bigfontproto.pc -unknown- xorg @@ -4261,7 +4261,7 @@ ./usr/libdata/lint/llib-lxcb-shape.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lxcb-shm.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lxcb-sync.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lxcb-xevie.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lxcb-xevie.ln -unknown- obsolete ./usr/libdata/lint/llib-lxcb-xf86dri.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lxcb-xfixes.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lxcb-xinerama.ln -unknown- lint,xorg
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: nakayama Date: Sat Feb 11 18:47:36 UTC 2017 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Redo rev.1.718, remove trash in line end. To generate a diff of this commit: cvs rdiff -u -r1.719 -r1.720 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.719 src/distrib/sets/lists/tests/mi:1.720 --- src/distrib/sets/lists/tests/mi:1.719 Thu Feb 9 13:59:02 2017 +++ src/distrib/sets/lists/tests/mi Sat Feb 11 18:47:36 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.719 2017/02/09 13:59:02 christos Exp $ +# $NetBSD: mi,v 1.720 2017/02/11 18:47:36 nakayama Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2431,9 +2431,9 @@ ./usr/tests/lib/libc/gen/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/gen/Kyuafile tests-lib-tests compattestfile,atf,kyua ./usr/tests/lib/libc/gen/exect tests-obsolete obsolete -./usr/tests/lib/libc/gen/exect/Atffile tests-obsolete obsoleteernel-tests compattestfile,atf -./usr/tests/lib/libc/gen/exect/Kyuafile tests-obsolete obsoleteernel-tests compattestfile,atf,kyua -./usr/tests/lib/libc/gen/exect/t_exect tests-obsolete obsoleteernel-tests compattestfile,atf +./usr/tests/lib/libc/gen/exect/Atffile tests-obsolete obsolete +./usr/tests/lib/libc/gen/exect/Kyuafile tests-obsolete obsolete +./usr/tests/lib/libc/gen/exect/t_exect tests-obsolete obsolete ./usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Atffile tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Kyuafile tests-kernel-tests compattestfile,atf,kyua
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Tue Sep 20 08:56:34 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Fix RAS for 32-bit kernels. trapframe is always 64-bit. To generate a diff of this commit: cvs rdiff -u -r1.400 -r1.401 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.400 src/sys/arch/sparc64/sparc64/locore.s:1.401 --- src/sys/arch/sparc64/sparc64/locore.s:1.400 Tue Aug 23 19:57:01 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Tue Sep 20 08:56:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.400 2016/08/23 19:57:01 palle Exp $ */ +/* $NetBSD: locore.s,v 1.401 2016/09/20 08:56:34 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -6060,12 +6060,12 @@ ENTRY(cpu_switchto) brz,pt %o1, Lsw_noras ! no, skip RAS check LDPTR [%i1 + L_TF], %l3 ! pointer to trap frame call _C_LABEL(ras_lookup) - LDPTR [%l3 + TF_PC], %o1 + ldx [%l3 + TF_PC], %o1 cmp %o0, -1 - be,pt %xcc, Lsw_noras + be,pt CCCR, Lsw_noras add %o0, 4, %o1 - STPTR %o0, [%l3 + TF_PC] ! store rewound %pc - STPTR %o1, [%l3 + TF_NPC] ! and %npc + stx %o0, [%l3 + TF_PC] ! store rewound %pc + stx %o1, [%l3 + TF_NPC] ! and %npc Lsw_noras:
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: nakayama
Date: Sat Aug 20 18:21:18 UTC 2016
Modified Files:
src/sys/arch/sparc64/dev: ldc.c vdsk.c
Log Message:
Avoid "cast to pointer from integer of different size" warning on
32-bit kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/ldc.c \
src/sys/arch/sparc64/dev/vdsk.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/sparc64/dev/ldc.c
diff -u src/sys/arch/sparc64/dev/ldc.c:1.1 src/sys/arch/sparc64/dev/ldc.c:1.2
--- src/sys/arch/sparc64/dev/ldc.c:1.1 Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/ldc.c Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ldc.c,v 1.1 2016/08/19 19:02:07 palle Exp $ */
+/* $NetBSD: ldc.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $ */
/* $OpenBSD: ldc.c,v 1.12 2015/03/21 18:02:58 kettenis Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
@@ -256,7 +256,7 @@ ldc_send_vers(struct ldc_conn *lc)
return;
}
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_CTRL;
lp->stype = LDC_INFO;
@@ -291,7 +291,7 @@ ldc_send_ack(struct ldc_conn *lc)
return;
}
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_CTRL;
lp->stype = LDC_ACK;
@@ -326,7 +326,7 @@ ldc_send_rts(struct ldc_conn *lc)
return;
}
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_CTRL;
lp->stype = LDC_INFO;
@@ -361,7 +361,7 @@ ldc_send_rtr(struct ldc_conn *lc)
return;
}
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_CTRL;
lp->stype = LDC_INFO;
@@ -396,7 +396,7 @@ ldc_send_rdx(struct ldc_conn *lc)
return;
}
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_CTRL;
lp->stype = LDC_INFO;
@@ -442,7 +442,7 @@ ldc_send_unreliable(struct ldc_conn *lc,
}
while (len > 0) {
- lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
bzero(lp, sizeof(struct ldc_pkt));
lp->type = LDC_DATA;
lp->stype = LDC_INFO;
Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u src/sys/arch/sparc64/dev/vdsk.c:1.1 src/sys/arch/sparc64/dev/vdsk.c:1.2
--- src/sys/arch/sparc64/dev/vdsk.c:1.1 Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/vdsk.c Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vdsk.c,v 1.1 2016/08/19 19:02:07 palle Exp $ */
+/* $NetBSD: vdsk.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $ */
/* $OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $ */
/*
* Copyright (c) 2009, 2011 Mark Kettenis
@@ -542,7 +542,7 @@ vdsk_rx_intr(void *arg)
if (rx_head == rx_tail)
return (0);
- lp = (struct ldc_pkt *)(lc->lc_rxq->lq_va + rx_head);
+ lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_rxq->lq_va + rx_head);
switch (lp->type) {
case LDC_CTRL:
ldc_rx_ctrl(lc, lp);
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: nakayama Date: Thu Jul 28 19:24:08 UTC 2016 Modified Files: src/distrib/sets/lists/base: mi Log Message: Resurrect Asia/Tomsk, split off from Asia/Novosibirsk in tzdata2016d. To generate a diff of this commit: cvs rdiff -u -r1.1131 -r1.1132 src/distrib/sets/lists/base/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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1131 src/distrib/sets/lists/base/mi:1.1132 --- src/distrib/sets/lists/base/mi:1.1131 Fri Jul 1 22:52:06 2016 +++ src/distrib/sets/lists/base/mi Thu Jul 28 19:24:08 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1131 2016/07/01 22:52:06 christos Exp $ +# $NetBSD: mi,v 1.1132 2016/07/28 19:24:08 nakayama Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5520,7 +5520,7 @@ ./usr/share/zoneinfo/Asia/Thimbu base-sys-share share ./usr/share/zoneinfo/Asia/Thimphu base-sys-share share ./usr/share/zoneinfo/Asia/Tokyo base-sys-share share -./usr/share/zoneinfo/Asia/Tomsk base-obsolete obsolete +./usr/share/zoneinfo/Asia/Tomsk base-sys-share share ./usr/share/zoneinfo/Asia/Ujung_Pandang base-sys-share share ./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share ./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: nakayama Date: Mon May 30 09:05:32 UTC 2016 Modified Files: src/sys/arch/sparc/include: sljit_machdep.h Log Message: Adapt to new sljit. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc/include/sljit_machdep.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/sparc/include/sljit_machdep.h diff -u src/sys/arch/sparc/include/sljit_machdep.h:1.1 src/sys/arch/sparc/include/sljit_machdep.h:1.2 --- src/sys/arch/sparc/include/sljit_machdep.h:1.1 Wed Jul 23 18:19:45 2014 +++ src/sys/arch/sparc/include/sljit_machdep.h Mon May 30 09:05:32 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $ */ +/* $NetBSD: sljit_machdep.h,v 1.2 2016/05/30 09:05:32 nakayama Exp $ */ /*- * Copyright (c) 2012-2013 The NetBSD Foundation, Inc. @@ -35,5 +35,6 @@ #define SLJIT_CACHE_FLUSH(from, to) \ sparc_cache_flush((sljit_ins *)(from), (sljit_ins *)(to)) +#define SLJIT_CACHE_FLUSH_OWN_IMPL 1 #endif
CVS commit: src/common/lib/libc/arch/sparc/atomic
Module Name:src
Committed By: nakayama
Date: Sun May 29 05:10:34 UTC 2016
Modified Files:
src/common/lib/libc/arch/sparc/atomic: Makefile.inc
Log Message:
Use sparc64 code always on 32-bit sparc64 kernels since %psr read/write
instructions used in sparc's atomic_cas.S don't exist in SPARC-V9.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/common/lib/libc/arch/sparc/atomic/Makefile.inc
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/libc/arch/sparc/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.21 src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.22
--- src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.21 Sat Feb 27 19:19:33 2016
+++ src/common/lib/libc/arch/sparc/atomic/Makefile.inc Sun May 29 05:10:34 2016
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.21 2016/02/27 19:19:33 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.22 2016/05/29 05:10:34 nakayama Exp $
.include
# This is called with MACHINE=sparc64 && MACHINE_ARCH=sparc when building
# 32 bit kernels for ultrasparc hardware
-.if ${MACHINE} == "sparc64" && ${HAVE_LLVM:Uno} == "no"
+.if ${MACHINE} == "sparc64" && \
+ (${HAVE_LLVM:Uno} == "no" || (defined(LIB) && ${LIB} == "kern"))
SPARC64DIR= ${.PARSEDIR}/../../sparc64/atomic
.PATH.c: ${SPARC64DIR}
CVS commit: src/share/mk
Module Name:src
Committed By: nakayama
Date: Sun May 29 03:02:08 UTC 2016
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Add missing transform for xpresent.pc.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.118 src/share/mk/bsd.x11.mk:1.119
--- src/share/mk/bsd.x11.mk:1.118 Sun Mar 13 17:56:56 2016
+++ src/share/mk/bsd.x11.mk Sun May 29 03:02:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.118 2016/03/13 17:56:56 christos Exp $
+# $NetBSD: bsd.x11.mk,v 1.119 2016/05/29 03:02:07 nakayama Exp $
.include
@@ -269,6 +269,7 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@COMPOSITEEXT_VERSION@,$${_pkg_version%.*},; \
s,@DAMAGEEXT_VERSION@,$${_pkg_version%.*},; \
s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \
+ s,@PRESENTEXT_VERSION@,$${_pkg_version%.*},; \
s,@RANDR_VERSION@,$${_pkg_version%.*},; \
s,@RENDER_VERSION@,$${_pkg_version%.*}," \
-e "s,@LIBS@,,; \
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Thu May 26 10:38:07 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add more CardBus devices. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/conf/GENERIC 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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.188 src/sys/arch/sparc64/conf/GENERIC:1.189 --- src/sys/arch/sparc64/conf/GENERIC:1.188 Thu May 26 04:26:05 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 26 10:38:07 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.188 2016/05/26 04:26:05 nakayama Exp $ +# $NetBSD: GENERIC,v 1.189 2016/05/26 10:38:07 nakayama Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.188 $" +#ident "GENERIC-$Revision: 1.189 $" maxusers 64 @@ -773,7 +773,9 @@ pseudo-device stf # 6to4 IPv6 over IPv # CardBus network interfaces #ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +#athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) UT #atw* at cardbus? function ? # ADMtek ADM8211 (802.11) UT +#bwi* at cardbus? function ? # Broadcom BCM43xx wireless #ex* at cardbus? function ? # 3Com 3C575TX #fxp* at cardbus? function ? # Intel i8255x UT #ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g UT @@ -787,6 +789,9 @@ pseudo-device stf # 6to4 IPv6 over IPv #ohci* at cardbus? function ? # Open Host Controller #uhci* at cardbus? function ? # Universal Host Controller (Intel) UT +# CardBus IEEE1394 controllers +#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller UT + ## PCMCIA cards; UT marks untested. # PCMCIA serial interfaces
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Thu May 26 04:26:05 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/arch/sparc64/conf/GENERIC 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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.187 src/sys/arch/sparc64/conf/GENERIC:1.188 --- src/sys/arch/sparc64/conf/GENERIC:1.187 Wed May 25 20:00:50 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 26 04:26:05 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.187 2016/05/25 20:00:50 nakayama Exp $ +# $NetBSD: GENERIC,v 1.188 2016/05/26 04:26:05 nakayama Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.187 $" +#ident "GENERIC-$Revision: 1.188 $" maxusers 64 @@ -503,9 +503,9 @@ cas* at pci? dev ? function ? # Sun Cass en* at pci? dev ? function ? # ENI/Adaptec ATM UT # XXX causes ICE #ep* at pci? dev ? function ? # 3Com 3c59x -ex* at pci? dev ? function ? # 3Com 90x[B] epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card UT +ex* at pci? dev ? function ? # 3Com 90x[B] fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet @@ -525,9 +525,9 @@ ntwoc* at pci? dev ? function ? # Riscom ral* at pci? dev ? function ? # ralink wifi UT re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 +sip* at pci? dev ? function ? # SiS 900 Ethernet skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet sk* at skc?# SysKonnect SK9821 Gigabit Ethernet -sip* at pci? dev ? function ? # SiS 900 Ethernet ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet UT tl* at pci? dev ? function ? # ThunderLAN-based Ethernet tlp* at pci? dev ? function ? # DECchip 21x4x and clones @@ -546,10 +546,10 @@ exphy* at mii? phy ? # 3Com internal P gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x +igphy* at mii? phy ? # Intel IGP01E1000 ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs -igphy* at mii? phy ? # Intel IGP01E1000 lxtphy* at mii? phy ? # Level One LXT-970 PHYs makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs nsphy* at mii? phy ? # NS83840 PHYs
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Wed May 25 20:00:50 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC GENERIC.DEBUG GENERIC.UP GENERIC32 GENERIC32.UP INSTALL MODULAR NONPLUS NONPLUS64 Log Message: tabify, fix indent and remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/conf/GENERIC.DEBUG cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/GENERIC.UP \ src/sys/arch/sparc64/conf/GENERIC32.UP cvs rdiff -u -r1.140 -r1.141 src/sys/arch/sparc64/conf/GENERIC32 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/conf/INSTALL cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/conf/MODULAR cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/conf/NONPLUS cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/conf/NONPLUS64 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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.186 src/sys/arch/sparc64/conf/GENERIC:1.187 --- src/sys/arch/sparc64/conf/GENERIC:1.186 Tue May 24 13:57:26 2016 +++ src/sys/arch/sparc64/conf/GENERIC Wed May 25 20:00:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.186 2016/05/24 13:57:26 martin Exp $ +# $NetBSD: GENERIC,v 1.187 2016/05/25 20:00:50 nakayama Exp $ # # GENERIC machine description file # @@ -18,11 +18,11 @@ # of each device driver in this file see the section 4 man page for the # device. -include "arch/sparc64/conf/std.sparc64" +include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.186 $" +#ident "GENERIC-$Revision: 1.187 $" maxusers 64 @@ -56,14 +56,14 @@ options SYSVMSG # System V message que options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -options MODULAR # new style module(7) framework -options MODULAR_DEFAULT_AUTOLOAD +options MODULAR # new style module(7) framework +options MODULAR_DEFAULT_AUTOLOAD options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -# Enable experimental buffer queue strategy for better responsiveness under +# Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. #options BUFQ_READPRIO #options BUFQ_PRIOCSCAN @@ -156,14 +156,14 @@ options EXEC_AOUT # execve(2) support f options EXEC_ELF32 # Exec module for SunOS 5.x binaries. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. file-system FFS # Berkeley Fast Filesystem file-system NFS # Sun NFS-compatible filesystem client file-system KERNFS # kernel data-structure filesystem file-system NULLFS # NULL layered filesystem -file-system OVERLAY # overlay file system +file-system OVERLAY # overlay file system file-system MFS # memory-based filesystem file-system FDESC # user file descriptor filesystem file-system UMAPFS # uid/gid remapping filesystem @@ -201,7 +201,7 @@ options NTP # Network Time Protocol in #options PPS_SYNC # Add serial line synchronization for NTP options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device options IPFILTER_LOOKUP # ippool(8) support -options IPFILTER_COMPAT # Compat for IP-Filter +options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default options PPP_BSDCOMP # Add BSD compression to ppp device options PPP_DEFLATE # Add deflate (libz) compression to ppp device @@ -225,13 +225,13 @@ options PPP_FILTER # Add active filters Main bus and CPUs .. all systems. mainbus0 at root options MULTIPROCESSOR # include multiprocessor support -cpu* at mainbus0 # declare additional CPUs +cpu* at mainbus0 # declare additional CPUs Bus types found on SPARC systems. sbus* at mainbus0# SBus-based systems -psycho* at mainbus0# PCI-based systems -schizo* at mainbus? +psycho* at mainbus0# PCI-based systems +schizo* at mainbus? pyro* at mainbus? vpci* at mainbus0 central* at mainbus? @@ -289,7 +289,7 @@ ms0 at zstty? ## The SAB82532 controller has two serial ports sab* at ebus?# ttya/ttyb -sabtty* at sab? channel ? +sabtty* at sab? channel ? ## Part of a PC87332VLJ com* at ebus?# `com' driver for `su' @@ -297,12 +297,12 @@ kbd0 at com? # keyboard ms0 at com? # mouse ## Tadpole SPARCle PS/2 keyboard and mouse -pckbc* at ebus?# PC keyboard controller -pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse +pckbc*
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Wed May 18 15:14:08 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Decrement %tl in trap handler not to make it zero unconditionally for the nested trap, and remove useless mov. To generate a diff of this commit: cvs rdiff -u -r1.396 -r1.397 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.396 src/sys/arch/sparc64/sparc64/locore.s:1.397 --- src/sys/arch/sparc64/sparc64/locore.s:1.396 Tue May 17 19:43:28 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Wed May 18 15:14:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.396 2016/05/17 19:43:28 palle Exp $ */ +/* $NetBSD: locore.s,v 1.397 2016/05/18 15:14:08 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -7147,7 +7147,6 @@ ENTRY(sparc64_ipi_ccall) wrpr %g0, PSTATE_KERN, %pstate ! Get back to normal globals stx %g1, [%sp + CC64FSZ + STKB + TF_G + ( 1*8)] - mov %g1, %o1 ! code rdpr %tpc, %o2 ! (pc) stx %g2, [%sp + CC64FSZ + STKB + TF_G + ( 2*8)] rdpr %tstate, %g1 @@ -7157,7 +7156,6 @@ ENTRY(sparc64_ipi_ccall) rd %y, %o4 stx %g5, [%sp + CC64FSZ + STKB + TF_G + ( 5*8)] stx %g6, [%sp + CC64FSZ + STKB + TF_G + ( 6*8)] - wrpr %g0, 0, %tl ! return to tl=0 stx %g7, [%sp + CC64FSZ + STKB + TF_G + ( 7*8)] stx %g1, [%sp + CC64FSZ + STKB + TF_TSTATE] @@ -7169,6 +7167,10 @@ ENTRY(sparc64_ipi_ccall) stb %g5, [%sp + CC64FSZ + STKB + TF_PIL] stb %g5, [%sp + CC64FSZ + STKB + TF_OLDPIL] + rdpr %tl, %g7 + dec %g7 + movrlz %g7, %g0, %g7 + wrpr %g0, %g7, %tl !! In the EMBEDANY memory model %g4 points to the start of the data segment. !! In our case we need to clear it before calling any C-code clr %g4
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: nakayama Date: Wed May 18 08:16:04 UTC 2016 Modified Files: src/sys/arch/sparc/include: psl.h Log Message: Fix (unused) pstate mask bits in tstate and comment. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sparc/include/psl.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/sparc/include/psl.h diff -u src/sys/arch/sparc/include/psl.h:1.48 src/sys/arch/sparc/include/psl.h:1.49 --- src/sys/arch/sparc/include/psl.h:1.48 Sun Aug 28 22:30:09 2011 +++ src/sys/arch/sparc/include/psl.h Wed May 18 08:16:04 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.48 2011/08/28 22:30:09 mrg Exp $ */ +/* $NetBSD: psl.h,v 1.49 2016/05/18 08:16:04 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -146,14 +146,14 @@ /* * SPARC V9 TSTATE register * - * 39 32 31 24 23 18 17 8 7 5 4 0 + * 39 32 31 24 23 20 19 8 7 5 4 0 * +-+-+-++---+-+ * | CCR | ASI | - | PSTATE | - | CWP | * +-+-+-++---+-+ */ #define TSTATE_CWP 0x01f -#define TSTATE_PSTATE 0x6ff00 +#define TSTATE_PSTATE 0xfff00 #define TSTATE_PSTATE_SHIFT 8 #define TSTATE_ASI 0xff00LL #define TSTATE_ASI_SHIFT 24
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: nakayama Date: Wed May 18 07:59:30 UTC 2016 Modified Files: src/sys/arch/sparc64/include: psl.h Log Message: Fix (unused) pstate mask bits in tstate and comment. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h diff -u src/sys/arch/sparc64/include/psl.h:1.56 src/sys/arch/sparc64/include/psl.h:1.57 --- src/sys/arch/sparc64/include/psl.h:1.56 Thu Dec 25 14:02:03 2014 +++ src/sys/arch/sparc64/include/psl.h Wed May 18 07:59:30 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.56 2014/12/25 14:02:03 nakayama Exp $ */ +/* $NetBSD: psl.h,v 1.57 2016/05/18 07:59:30 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -165,14 +165,14 @@ /* * SPARC V9 TSTATE register * - * 39 32 31 24 23 18 17 8 7 5 4 0 + * 39 32 31 24 23 20 19 8 7 5 4 0 * +-+-+-++---+-+ * | CCR | ASI | - | PSTATE | - | CWP | * +-+-+-++---+-+ */ #define TSTATE_CWP 0x01f -#define TSTATE_PSTATE 0x6ff00 +#define TSTATE_PSTATE 0xfff00 #define TSTATE_PSTATE_SHIFT 8 #define TSTATE_ASI 0xff00LL #define TSTATE_ASI_SHIFT 24
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Sun May 15 23:54:58 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: %g1 is not preserved across function call, so load it before return_from_trap. To generate a diff of this commit: cvs rdiff -u -r1.393 -r1.394 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.393 src/sys/arch/sparc64/sparc64/locore.s:1.394 --- src/sys/arch/sparc64/sparc64/locore.s:1.393 Fri May 13 21:48:15 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Sun May 15 23:54:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.393 2016/05/13 21:48:15 palle Exp $ */ +/* $NetBSD: locore.s,v 1.394 2016/05/15 23:54:58 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -7078,8 +7078,8 @@ ENTRY(sparc64_ipi_ccall) call %o5 ! call function nop - ba,a return_from_trap ! and return from IPI - nop + b return_from_trap ! and return from IPI + ldx [%sp + CC64FSZ + STKB + TF_TSTATE], %g1 ! Load this for return_from_trap #endif
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Fri May 13 21:24:11 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64: intr.c
Log Message:
Interrupt handlers are now allocated by kmem_zalloc(9), so free
them by kmem_free(9).
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc64/sparc64/intr.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/sparc64/sparc64/intr.c
diff -u src/sys/arch/sparc64/sparc64/intr.c:1.68 src/sys/arch/sparc64/sparc64/intr.c:1.69
--- src/sys/arch/sparc64/sparc64/intr.c:1.68 Tue May 10 19:24:00 2016
+++ src/sys/arch/sparc64/sparc64/intr.c Fri May 13 21:24:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.68 2016/05/10 19:24:00 palle Exp $ */
+/* $NetBSD: intr.c,v 1.69 2016/05/13 21:24:11 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.68 2016/05/10 19:24:00 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.69 2016/05/13 21:24:11 nakayama Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.6
#include
#include
#include
-#include
#include
@@ -309,7 +308,7 @@ void
sparc_softintr_disestablish(void *cookie)
{
- free(cookie, M_DEVBUF);
+ kmem_free(cookie, sizeof(struct intrhand));
}
void
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Fri May 13 21:22:47 UTC 2016
Modified Files:
src/sys/arch/sparc64/dev: ebus_mainbus.c
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
Use newly introduced intrhand_alloc().
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.283 -r1.284 src/sys/arch/sparc64/sparc64/machdep.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/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.15 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.16
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.15 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Fri May 13 21:22:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.15 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.16 2016/05/13 21:22:47 nakayama Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.15 2014/11/04 18:11:42 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.16 2016/05/13 21:22:47 nakayama Exp $");
#ifdef DEBUG
#define EDB_PROM 0x01
@@ -350,9 +350,7 @@ XXX
intrclrptr = [ino];
ino |= INTVEC(ihandle);
- ih = malloc(sizeof *ih, M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
+ ih = intrhand_alloc();
/* Register the map and clear intr registers */
ih->ih_map = intrmapptr;
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.283 src/sys/arch/sparc64/sparc64/machdep.c:1.284
--- src/sys/arch/sparc64/sparc64/machdep.c:1.283 Sun Nov 22 09:32:34 2015
+++ src/sys/arch/sparc64/sparc64/machdep.c Fri May 13 21:22:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.283 2015/11/22 09:32:34 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.284 2016/05/13 21:22:47 nakayama Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.283 2015/11/22 09:32:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.284 2016/05/13 21:22:47 nakayama Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -2368,11 +2368,7 @@ sparc_mainbus_intr_establish(bus_space_t
{
struct intrhand *ih;
- ih = (struct intrhand *)
- malloc(sizeof(struct intrhand), M_DEVBUF, M_NOWAIT);
- if (ih == NULL)
- return (NULL);
-
+ ih = intrhand_alloc();
ih->ih_fun = handler;
ih->ih_arg = arg;
intr_establish(pil, level != IPL_VM, ih);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Fri May 13 21:23:30 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64: clock.c
Log Message:
Allocate interrupt handlers for clockintr and statintr dynamically.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/sparc64/clock.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/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.118 src/sys/arch/sparc64/sparc64/clock.c:1.119
--- src/sys/arch/sparc64/sparc64/clock.c:1.118 Sun Dec 13 18:41:09 2015
+++ src/sys/arch/sparc64/sparc64/clock.c Fri May 13 21:23:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.118 2015/12/13 18:41:09 christos Exp $ */
+/* $NetBSD: clock.c,v 1.119 2016/05/13 21:23:30 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.118 2015/12/13 18:41:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.119 2016/05/13 21:23:30 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include
#include
#include
-#include
#include
#include
#ifdef GPROF
@@ -129,11 +128,6 @@ int statmin; /* statclock interval - 1
int timerok;
#ifndef MULTIPROCESSOR
static int statscheddiv;
-#endif
-
-static struct intrhand level10 = { .ih_fun = clockintr, .ih_pil = PIL_CLOCK };
-#ifndef MULTIPROCESSOR
-static struct intrhand level14 = { .ih_fun = statintr, .ih_pil = PIL_STATCLOCK };
static struct intrhand *schedint;
#endif
@@ -293,18 +287,24 @@ timerattach(device_t parent, device_t se
(CPU_UPAID << INTMAP_TID_SHIFT));
/* Install the appropriate interrupt vector here */
- level10.ih_number = INTVEC(ma->ma_interrupts[0]);
- level10.ih_clr = _4u.t_clrintr[0];
- intr_establish(PIL_CLOCK, true, );
- printf(" irq vectors %lx", (u_long)level10.ih_number);
+ struct intrhand *level10 = intrhand_alloc();
+ level10->ih_fun = clockintr;
+ level10->ih_pil = PIL_CLOCK;
+ level10->ih_number = INTVEC(ma->ma_interrupts[0]);
+ level10->ih_clr = _4u.t_clrintr[0];
+ intr_establish(PIL_CLOCK, true, level10);
+ printf(" irq vectors %lx", (u_long)level10->ih_number);
#ifndef MULTIPROCESSOR
/*
* On SMP kernel, don't establish interrupt to use it as timecounter.
*/
- level14.ih_number = INTVEC(ma->ma_interrupts[1]);
- level14.ih_clr = _4u.t_clrintr[1];
- intr_establish(PIL_STATCLOCK, true, );
- printf(" and %lx", (u_long)level14.ih_number);
+ struct intrhand *level14 = intrhand_alloc();
+ level14->ih_fun = statintr;
+ level14->ih_pil = PIL_STATCLOCK;
+ level14->ih_number = INTVEC(ma->ma_interrupts[1]);
+ level14->ih_clr = _4u.t_clrintr[1];
+ intr_establish(PIL_STATCLOCK, true, level14);
+ printf(" and %lx", (u_long)level14->ih_number);
#endif
#if 0
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Fri May 13 21:21:25 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: - ci_paddr is always 64-bit. - intrlev is array of pointer. - ih_ack is pointer. To generate a diff of this commit: cvs rdiff -u -r1.391 -r1.392 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.391 src/sys/arch/sparc64/sparc64/locore.s:1.392 --- src/sys/arch/sparc64/sparc64/locore.s:1.391 Tue May 10 19:24:00 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Fri May 13 21:21:25 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.391 2016/05/10 19:24:00 palle Exp $ */ +/* $NetBSD: locore.s,v 1.392 2016/05/13 21:21:25 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3598,7 +3598,7 @@ sun4v_cpu_mondo: mov 0x3c0, %g1 ! CPU Mondo Queue Head ldxa [%g1] ASI_QUEUE, %g2 ! fetch index value for head set CPUINFO_VA, %g3 - LDPTR [%g3 + CI_PADDR], %g3 + ldx [%g3 + CI_PADDR], %g3 add %g3, CI_CPUMQ, %g3 ldxa [%g3] ASI_PHYS_CACHED, %g3 ! fetch head element ldxa [%g3 + %g2] ASI_PHYS_CACHED, %g4 ! fetch func @@ -3630,7 +3630,7 @@ sun4v_dev_mondo: retry ! unlikely, ingnore interrupt 2: set CPUINFO_VA, %g3 ! fetch cpuinfo pa - LDPTR [%g3 + CI_PADDR], %g3 ! fetch intstack pa + ldx [%g3 + CI_PADDR], %g3 ! fetch intstack pa set CPUINFO_VA-INTSTACK, %g4 ! offset to cpuinfo add %g4, %g3, %g3 ! %g3 is now cpuifo add %g3, CI_DEVMQ, %g3 ! calc offset to devmq @@ -3647,9 +3647,9 @@ sun4v_dev_mondo: nop ! no just continue sethi %hi(_C_LABEL(intrlev)), %g3 + sllx %g5, PTRSHFT, %g5 ! Calculate entry number or %g3, %lo(_C_LABEL(intrlev)), %g3 - sllx %g5, 3, %g5 ! Calculate entry number - ldx [%g3 + %g5], %g5 ! We have a pointer to the handler + LDPTR [%g3 + %g5], %g5 ! We have a pointer to the handler 1: brnz,pt %g5, setup_sparcintr ! branch if valid handle nop @@ -3951,7 +3951,7 @@ sparc_intr_retry: stx %g0, [%l1] ! Clear intr source membar #Sync ! Should not be needed 0: - ldx [%l2 + IH_ACK], %l1 ! ih->ih_ack + LDPTR [%l2 + IH_ACK], %l1 ! ih->ih_ack brz,pn %l1, 1f nop jmpl %l1, %o7 ! (*ih->ih_ack)(ih)
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: nakayama Date: Sun Apr 17 02:16:26 UTC 2016 Modified Files: src/external/mit/xorg/bin/fc-pattern: Makefile src/external/mit/xorg/bin/fc-query: Makefile Log Message: Fix NetBSD RCS keyword. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-pattern/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-query/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/mit/xorg/bin/fc-pattern/Makefile diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 --- src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 Mon Jun 3 06:56:49 2013 +++ src/external/mit/xorg/bin/fc-pattern/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.2 2016/04/17 02:16:26 nakayama Exp $ .include Index: src/external/mit/xorg/bin/fc-query/Makefile diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.2 src/external/mit/xorg/bin/fc-query/Makefile:1.3 --- src/external/mit/xorg/bin/fc-query/Makefile:1.2 Mon Jun 3 20:23:39 2013 +++ src/external/mit/xorg/bin/fc-query/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.3 2016/04/17 02:16:26 nakayama Exp $ .include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 20:52:07 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
src/external/mit/xorg/bin/xkill: Makefile
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
Log Message:
Use xorg-pkg-ver.mk to retrieve PACKAGE_STRING.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xstdcmap/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/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.5 src/external/mit/xorg/bin/smproxy/Makefile:1.6
--- src/external/mit/xorg/bin/smproxy/Makefile:1.5 Sat Apr 16 16:57:06 2016
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -6,12 +6,13 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.3 src/external/mit/xorg/bin/xkill/Makefile:1.4
--- src/external/mit/xorg/bin/xkill/Makefile:1.3 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xkill/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -7,9 +7,9 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING="\"xkill 1.0.4\""
-
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.7 src/external/mit/xorg/bin/xlsclients/Makefile:1.8
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.7 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
- -DPACKAGE_STRING="\"xlsclients 1.1.3\""
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
#BUILDSYMLINKS= xlscli.man xlsclients.man
@@ -14,5 +13,7 @@ DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.7 src/external/mit/xorg/bin/xrdb/Makefile:1.8
--- src/external/mit/xorg/bin/xrdb/Makefile:1.7 Wed Apr 13 22:01:55 2016
+++ src/external/mit/xorg/bin/xrdb/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\""
+CPPFLAGS+=-DHAVE_ASPRINTF
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +13,7 @@ DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.4 src/external/mit/xorg/bin/xset/Makefile:1.5
--- src/external/mit/xorg/bin/xset/Makefile:1.4 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xset/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xset
CVS commit: src/external/mit/xorg/bin/smproxy
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 16:57:06 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
Log Message:
Set PACKAGE_STRING properly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/smproxy/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/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.4 src/external/mit/xorg/bin/smproxy/Makefile:1.5
--- src/external/mit/xorg/bin/smproxy/Makefile:1.4 Sun Jul 19 19:49:17 2015
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 16:57:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 19:49:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
.include
@@ -6,9 +6,7 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-
-STRING!= ${PRINT_PACKAGE_STRING}
-CPPFLAGS+= -DPACKAGE_STRING=\"${STRING}\"
+CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: nakayama
Date: Fri Mar 25 14:58:53 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: kern32.ldscript
Log Message:
Fix probably a typo.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/conf/kern32.ldscript
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/sparc64/conf/kern32.ldscript
diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.16 src/sys/arch/sparc64/conf/kern32.ldscript:1.17
--- src/sys/arch/sparc64/conf/kern32.ldscript:1.16 Tue Aug 25 02:59:00 2015
+++ src/sys/arch/sparc64/conf/kern32.ldscript Fri Mar 25 14:58:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern32.ldscript,v 1.16 2015/08/25 02:59:00 uebayasi Exp $ */
+/* $NetBSD: kern32.ldscript,v 1.17 2016/03/25 14:58:53 nakayama Exp $ */
#undef sparc
@@ -42,7 +42,7 @@ SECTIONS
}
.data1 : { *(.data1) }
. = ALIGN(64); /* COHERENCY_UNIT */
- .data.cacheline_aligned : { *(.data_cacheline_aligned) }
+ .data.cacheline_aligned : { *(.data.cacheline_aligned) }
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly : { *(.data.read_mostly) }
. = ALIGN(64); /* COHERENCY_UNIT */
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: nakayama
Date: Thu Mar 17 15:28:00 UTC 2016
Modified Files:
src/external/bsd/flex/dist/src: initparse.c initscan.c
Log Message:
Regen without #line directives.
- nbyacc -l -d -o initparse.c parse.y
- nblex -L -t -p scan.l > initscan.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/dist/src/initparse.c \
src/external/bsd/flex/dist/src/initscan.c
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/flex/dist/src/initparse.c
diff -u src/external/bsd/flex/dist/src/initparse.c:1.1 src/external/bsd/flex/dist/src/initparse.c:1.2
--- src/external/bsd/flex/dist/src/initparse.c:1.1 Sat Jan 9 17:39:52 2016
+++ src/external/bsd/flex/dist/src/initparse.c Thu Mar 17 15:28:00 2016
@@ -19,7 +19,6 @@
#define YYPURE 0
-#line 37 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
/* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */
@@ -51,7 +50,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: initparse.c,v 1.1 2016/01/09 17:39:52 christos Exp $");
+__RCSID("$NetBSD: initparse.c,v 1.2 2016/03/17 15:28:00 nakayama Exp $");
#include "tables.h"
@@ -101,7 +100,6 @@ int previous_continued_action; /* whethe
*/
#define YYSTYPE int
-#line 105 "parse.c"
#if ! defined(YYSTYPE) && ! defined(YYSTYPE_IS_DECLARED)
/* Default: YYSTYPE is the semantic value type. */
@@ -606,7 +604,6 @@ typedef struct {
} YYSTACKDATA;
/* variables for the parser stack */
static YYSTACKDATA yystack;
-#line 951 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
/* build_eof_action - build the "<>" action for the active start
@@ -750,7 +747,6 @@ const char *msg;
{
(void)msg;
}
-#line 754 "parse.c"
#if YYDEBUG
#include /* needed for printf */
@@ -953,7 +949,6 @@ yyreduce:
switch (yyn)
{
case 1:
-#line 122 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ /* add default rule */
int def_rule;
@@ -982,7 +977,6 @@ case 1:
}
break;
case 2:
-#line 151 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ /* initialize for processing rules */
/* Create default DFA start condition. */
@@ -990,11 +984,9 @@ case 2:
}
break;
case 6:
-#line 162 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ synerr( _("unknown error processing section 1") ); }
break;
case 7:
-#line 166 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
check_options();
scon_stk = allocate_integer_array( lastsc + 1 );
@@ -1002,62 +994,48 @@ case 7:
}
break;
case 8:
-#line 174 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ xcluflg = false; }
break;
case 9:
-#line 177 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ xcluflg = true; }
break;
case 10:
-#line 181 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scinstal( nmstr, xcluflg ); }
break;
case 11:
-#line 184 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scinstal( nmstr, xcluflg ); }
break;
case 12:
-#line 187 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ synerr( _("bad start condition list") ); }
break;
case 16:
-#line 198 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
outfilename = copy_string( nmstr );
did_outfilename = 1;
}
break;
case 17:
-#line 203 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ extra_type = copy_string( nmstr ); }
break;
case 18:
-#line 205 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ prefix = copy_string( nmstr ); }
break;
case 19:
-#line 207 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ yyclass = copy_string( nmstr ); }
break;
case 20:
-#line 209 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ headerfilename = copy_string( nmstr ); }
break;
case 21:
-#line 211 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ tablesext = true; tablesfilename = copy_string( nmstr ); }
break;
case 22:
-#line 215 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scon_stk_ptr = yystack.l_mark[-3]; }
break;
case 23:
-#line 217 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scon_stk_ptr = yystack.l_mark[-3]; }
break;
case 25:
-#line 222 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
/* Initialize for a parse of one rule. */
trlcontxt = variable_trail_rule = varlength = false;
@@ -1070,7 +1048,6 @@ case 25:
}
break;
case 26:
-#line 235 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
pat = yystack.l_mark[0];
finish_rule( pat, variable_trail_rule,
@@ -1107,7 +1084,6 @@ case 26:
}
break;
case 27:
-#line 271 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
pat =
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: nakayama
Date: Thu Mar 17 15:23:21 UTC 2016
Modified Files:
src/external/bsd/flex/dist/src: scan.l
Log Message:
Apply our changes dropped in previous merge.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/scan.l
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/flex/dist/src/scan.l
diff -u src/external/bsd/flex/dist/src/scan.l:1.3 src/external/bsd/flex/dist/src/scan.l:1.4
--- src/external/bsd/flex/dist/src/scan.l:1.3 Sat Jan 9 18:28:41 2016
+++ src/external/bsd/flex/dist/src/scan.l Thu Mar 17 15:23:21 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: scan.l,v 1.4 2016/03/17 15:23:21 nakayama Exp $ */
+
/* scan.l - scanner for flex input -*-C-*- */
%{
@@ -31,8 +33,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: scan.l,v 1.4 2016/03/17 15:23:21 nakayama Exp $");
+
#include "parse.h"
extern bool tablesverify, tablesext;
extern int trlcontxt; /* Set in parse.y for each rule. */
@@ -68,7 +71,7 @@ extern const char *escaped_qstart, *esca
#define RETURNNAME \
if(yyleng < MAXLINE) \
{ \
- strcpy( nmstr, yytext ); \
+ strlcpy( nmstr, yytext, sizeof(nmstr) ); \
} \
else \
{ \
@@ -81,9 +84,9 @@ extern const char *escaped_qstart, *esca
for ( i = strlen( str ) - 1; i >= start; --i ) \
unput((str)[i])
-#define CHECK_REJECT(str) \
+#define CHECK_RE_JECT(str) \
if ( all_upper( str ) ) \
- reject = true;
+ reject = true
#define CHECK_YYMORE(str) \
if ( all_lower( str ) ) \
@@ -185,7 +188,7 @@ M4QEND "]]"
^{NAME} {
if(yyleng < MAXLINE)
{
- strcpy( nmstr, yytext );
+ strlcpy( nmstr, yytext, sizeof(nmstr) );
}
else
{
@@ -293,7 +296,7 @@ M4QEND "]]"
{NOT_WS}[^\r\n]* {
if(yyleng < MAXLINE)
{
- strcpy( (char *) nmdef, yytext );
+ strlcpy( (char *) nmdef, yytext, sizeof(nmdef) );
}
else
{
@@ -436,7 +439,7 @@ M4QEND "]]"
\"[^"\n]*\" {
if(yyleng-1 < MAXLINE)
{
- strcpy( nmstr, yytext + 1 );
+ strlcpy( nmstr, yytext + 1, sizeof(nmstr) );
}
else
{
@@ -611,7 +614,7 @@ M4QEND "]]"
if(yyleng < MAXLINE)
{
- strcpy( nmstr, yytext );
+ strlcpy( nmstr, yytext, sizeof(nmstr) );
}
else
{
@@ -669,7 +672,7 @@ M4QEND "]]"
if(yyleng-1 < MAXLINE)
{
- strcpy( nmstr, yytext + 1 );
+ strlcpy( nmstr, yytext + 1, sizeof(nmstr) );
}
else
{
@@ -875,7 +878,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /
{
"reject" {
ACTION_ECHO;
- CHECK_REJECT(yytext);
+ CHECK_RE_JECT(yytext);
}
"yymore" {
ACTION_ECHO;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Wed Mar 9 12:20:21 UTC 2016 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: 32-bit kernels use 32-bit stack. To generate a diff of this commit: cvs rdiff -u -r1.389 -r1.390 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.389 src/sys/arch/sparc64/sparc64/locore.s:1.390 --- src/sys/arch/sparc64/sparc64/locore.s:1.389 Thu Mar 3 20:45:45 2016 +++ src/sys/arch/sparc64/sparc64/locore.s Wed Mar 9 12:20:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.389 2016/03/03 20:45:45 palle Exp $ */ +/* $NetBSD: locore.s,v 1.390 2016/03/09 12:20:20 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -4123,7 +4123,11 @@ rft_kernel: rdpr %cwp, %g1 dec %g1 wrpr %g1, %cwp +#ifdef _LP64 FILL ldxa, %sp+BIAS, 8, %asi +#else + FILL lda, %sp, 4, %asi +#endif restored inc %g1 wrpr %g1, %cwp
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: nakayama
Date: Sun Mar 6 09:39:42 UTC 2016
Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd
Log Message:
Remove unnecessary local change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/binutils/dist/bfd/config.bfd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.19 src/external/gpl3/binutils/dist/bfd/config.bfd:1.20
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.19 Sun Mar 6 09:38:08 2016
+++ src/external/gpl3/binutils/dist/bfd/config.bfd Sun Mar 6 09:39:42 2016
@@ -1611,10 +1611,6 @@ case "${targ}" in
targ_selvecs="sparc_elf32_vec sparc_aout_linux_vec sparc_aout_sunos_be_vec"
want64=true
;;
- sparc64-*-netbsd*)
-targ_defvec=bfd_elf64_sparc_vec
-targ_selvecs="bfd_elf32_sparc_vec sparcnetbsd_vec sunos_big_vec"
-;;
sparc64-*-elf* | sparc64-*-rtems* )
targ_defvec=sparc_elf64_vec
targ_selvecs=sparc_elf32_vec
CVS commit: src/external/gpl3/binutils
Module Name:src
Committed By: nakayama
Date: Sun Mar 6 09:38:08 UTC 2016
Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd
src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h defs.mk
Log Message:
Reapply following changes to binutils 2.26 to fix PR toolchain/48630.
http://mail-index.netbsd.org/source-changes/2014/03/10/msg052578.html
http://mail-index.netbsd.org/source-changes/2014/03/10/msg052579.html
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/binutils/dist/bfd/config.bfd
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.18 src/external/gpl3/binutils/dist/bfd/config.bfd:1.19
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.18 Wed Feb 3 13:24:12 2016
+++ src/external/gpl3/binutils/dist/bfd/config.bfd Sun Mar 6 09:38:08 2016
@@ -1559,6 +1559,7 @@ case "${targ}" in
sparc-*-netbsdelf*)
targ_defvec=sparc_elf32_vec
targ_selvecs=sparc_aout_nbsd_vec
+want64=true
;;
sparc-*-netbsdaout* | sparc-*-netbsd*)
targ_defvec=sparc_aout_nbsd_vec
Index: src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.7 src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.8
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.7 Fri Jan 29 17:30:24 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h Sun Mar 6 09:38:08 2016
@@ -87,7 +87,7 @@ extern "C" {
/* The word size used by BFD on the host. This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have
been selected with --enable-targets, or if --enable-64-bit-bfd. */
-#define BFD_ARCH_SIZE 32
+#define BFD_ARCH_SIZE 64
/* The word size of the default bfd target. */
#define BFD_DEFAULT_TARGET_SIZE 32
Index: src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.4 src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.5
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.4 Fri Jan 29 17:30:24 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk Sun Mar 6 09:38:08 2016
@@ -2,7 +2,7 @@
# Generated from: NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp
# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp
#
-G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo dwarf2.lo sparcnetbsd.lo aout32.lo elf32-gen.lo plugin.lo cpu-sparc.lo cpu-plugin.lo netbsd-core.lo ofiles
+G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo dwarf2.lo sparcnetbsd.lo aout32.lo elf32-gen.lo plugin.lo cpu-sparc.lo cpu-plugin.lo netbsd-core.lo archive64.lo ofiles
G_libbfd_la_OBJECTS=archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
G_DEFS=-DHAVE_CONFIG_H
G_INCLUDES=-DNETBSD_CORE-I. -I${GNUHOSTDIST}/bfd -I${GNUHOSTDIST}/bfd/../include -DHAVE_sparc_elf32_vec -DHAVE_sparc_aout_nbsd_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -I./../intl
CVS commit: src/sys/compat/sunos
Module Name:src
Committed By: nakayama
Date: Sat Dec 12 17:48:18 UTC 2015
Modified Files:
src/sys/compat/sunos: sunos_ioctl.c
Log Message:
Redo previous. zero check before modulo.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/compat/sunos/sunos_ioctl.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/compat/sunos/sunos_ioctl.c
diff -u src/sys/compat/sunos/sunos_ioctl.c:1.66 src/sys/compat/sunos/sunos_ioctl.c:1.67
--- src/sys/compat/sunos/sunos_ioctl.c:1.66 Fri Dec 11 08:19:07 2015
+++ src/sys/compat/sunos/sunos_ioctl.c Sat Dec 12 17:48:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_ioctl.c,v 1.66 2015/12/11 08:19:07 mlelstv Exp $ */
+/* $NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $ */
/*
* Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.66 2015/12/11 08:19:07 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $");
#include
#include
@@ -880,6 +880,10 @@ sunos_sys_ioctl(struct lwp *l, const str
if (error)
break;
+ if (label.d_secpercyl == 0) {
+ error = ERANGE; /* XXX */
+ break;
+ }
if (pi.pi_offset % label.d_secpercyl != 0) {
error = ERANGE; /* XXX */
break;
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: nakayama Date: Sat Oct 31 02:36:17 UTC 2015 Modified Files: src/sys/arch/sparc64/include: db_machdep.h src/sys/arch/sparc64/sparc64: netbsd32_machdep.c Log Message: Remove #define SUN4U since machine/frame.h doesn't check SUN4U anymore. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sparc64/include/db_machdep.h cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc64/sparc64/netbsd32_machdep.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/sparc64/include/db_machdep.h diff -u src/sys/arch/sparc64/include/db_machdep.h:1.33 src/sys/arch/sparc64/include/db_machdep.h:1.34 --- src/sys/arch/sparc64/include/db_machdep.h:1.33 Tue Jul 12 07:51:34 2011 +++ src/sys/arch/sparc64/include/db_machdep.h Sat Oct 31 02:36:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: db_machdep.h,v 1.33 2011/07/12 07:51:34 mrg Exp $ */ +/* $NetBSD: db_machdep.h,v 1.34 2015/10/31 02:36:17 nakayama Exp $ */ /* * Mach Operating System @@ -37,9 +37,6 @@ #include -#ifndef SUN4U -#define SUN4U /* see .../sparc/include/frame.h for the reason */ -#endif #include #include #include Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.103 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.104 --- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.103 Fri Mar 7 22:51:27 2014 +++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Sat Oct 31 02:36:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep.c,v 1.103 2014/03/07 22:51:27 nakayama Exp $ */ +/* $NetBSD: netbsd32_machdep.c,v 1.104 2015/10/31 02:36:17 nakayama Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.103 2014/03/07 22:51:27 nakayama Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.104 2015/10/31 02:36:17 nakayama Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -76,9 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac #include #include -#ifndef SUN4U -#define SUN4U /* see .../sparc/include/frame.h for the reason */ -#endif #include #include #include
CVS commit: src/lib/libkvm
Module Name:src
Committed By: nakayama
Date: Sat Oct 31 02:40:44 UTC 2015
Modified Files:
src/lib/libkvm: kvm_sparc.c
Log Message:
Use PRIxPADDR instead of type casting.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libkvm/kvm_sparc.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/libkvm/kvm_sparc.c
diff -u src/lib/libkvm/kvm_sparc.c:1.34 src/lib/libkvm/kvm_sparc.c:1.35
--- src/lib/libkvm/kvm_sparc.c:1.34 Wed Oct 7 11:56:41 2015
+++ src/lib/libkvm/kvm_sparc.c Sat Oct 31 02:40:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $ */
+/* $NetBSD: kvm_sparc.c,v 1.35 2015/10/31 02:40:44 nakayama Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $");
+__RCSID("$NetBSD: kvm_sparc.c,v 1.35 2015/10/31 02:40:44 nakayama Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -363,7 +363,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa)
off += mp->size;
}
if (nmem < 0) {
- _kvm_err(kd, 0, "invalid address (%lx)", (unsigned long)pa);
+ _kvm_err(kd, 0, "invalid address (%#"PRIxPADDR")", pa);
return (-1);
}
CVS commit: src/common/lib/libc/arch
Module Name:src
Committed By: nakayama
Date: Sun Oct 18 02:28:07 UTC 2015
Modified Files:
src/common/lib/libc/arch/sparc/atomic: Makefile.inc
src/common/lib/libc/arch/sparc64/atomic: atomic_add.S atomic_and.S
atomic_cas.S atomic_dec.S atomic_inc.S atomic_op_asm.h atomic_or.S
atomic_swap.S
Log Message:
Fix 64-bit atomic operations on 32-bit kernel and userland, and add
support for missing __sync_*_8 builtins.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/common/lib/libc/arch/sparc/atomic/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/sparc64/atomic/atomic_add.S \
src/common/lib/libc/arch/sparc64/atomic/atomic_and.S \
src/common/lib/libc/arch/sparc64/atomic/atomic_cas.S \
src/common/lib/libc/arch/sparc64/atomic/atomic_inc.S \
src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h \
src/common/lib/libc/arch/sparc64/atomic/atomic_swap.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/sparc64/atomic/atomic_dec.S \
src/common/lib/libc/arch/sparc64/atomic/atomic_or.S
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/libc/arch/sparc/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.18 src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.19
--- src/common/lib/libc/arch/sparc/atomic/Makefile.inc:1.18 Mon Oct 13 08:59:41 2014
+++ src/common/lib/libc/arch/sparc/atomic/Makefile.inc Sun Oct 18 02:28:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2014/10/13 08:59:41 martin Exp $
+# $NetBSD: Makefile.inc,v 1.19 2015/10/18 02:28:07 nakayama Exp $
.include
@@ -12,6 +12,12 @@ SPARC64DIR= ${.PARSEDIR}/../../sparc64/a
.include "${SPARC64DIR}/Makefile.inc"
+.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \
+ || ${LIB} == "rump")
+SRCS+= atomic_nand_64_cas.c atomic_xor_64_cas.c atomic_sub_64_cas.c \
+ atomic_cas_64_cas.c
+.endif
+
.else
. if defined(LIB)
Index: src/common/lib/libc/arch/sparc64/atomic/atomic_add.S
diff -u src/common/lib/libc/arch/sparc64/atomic/atomic_add.S:1.6 src/common/lib/libc/arch/sparc64/atomic/atomic_add.S:1.7
--- src/common/lib/libc/arch/sparc64/atomic/atomic_add.S:1.6 Sun May 25 15:56:12 2008
+++ src/common/lib/libc/arch/sparc64/atomic/atomic_add.S Sun Oct 18 02:28:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_add.S,v 1.6 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_add.S,v 1.7 2015/10/18 02:28:07 nakayama Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -52,14 +52,22 @@ ATOMIC_OP_ALIAS(atomic_add_int_nv,_atomi
STRONG_ALIAS(_atomic_add_int_nv,_atomic_add_32)
ENTRY(_atomic_add_64)
+#ifndef __arch64__
+ COMBINE(%o1, %o2, %o1)
+#endif
ldx [%o0], %o2
1: add %o1, %o2, %o3
casx [%o0], %o2, %o3
cmp %o2, %o3
bne,a,pn %xcc, 1b
mov %o3, %o2
+#ifdef __arch64__
retl
add %o1, %o2, %o0
+#else
+ add %o1, %o2, %o0
+ SPLIT_RETL(%o0, %o0, %o1)
+#endif
ATOMIC_OP_ALIAS(atomic_add_64,_atomic_add_64)
ATOMIC_OP_ALIAS(atomic_add_64_nv,_atomic_add_64)
@@ -74,3 +82,19 @@ ATOMIC_OP_ALIAS_SIZE(atomic_add_long_nv,
STRONG_ALIAS_SIZE(_atomic_add_long_nv,_atomic_add)
ATOMIC_OP_ALIAS_SIZE(atomic_add_ptr_nv,_atomic_add)
STRONG_ALIAS_SIZE(_atomic_add_ptr_nv,_atomic_add)
+
+#if !defined(__arch64__) && defined(CRT_ALIAS)
+ENTRY(__sync_fetch_and_add_8)
+ COMBINE(%o1, %o2, %o1)
+ ldx [%o0], %o2
+1: add %o1, %o2, %o3
+ casx [%o0], %o2, %o3
+ cmp %o2, %o3
+ bne,a,pn %xcc, 1b
+ mov %o3, %o2
+ SPLIT_RETL(%o2, %o0, %o1)
+CRT_ALIAS(__sync_add_and_fetch_8,_atomic_add_64_nv)
+
+CRT_ALIAS(__atomic_fetch_add_8,__sync_fetch_and_add_8)
+CRT_ALIAS(__atomic_add_fetch_8,__sync_add_and_fetch_8)
+#endif
Index: src/common/lib/libc/arch/sparc64/atomic/atomic_and.S
diff -u src/common/lib/libc/arch/sparc64/atomic/atomic_and.S:1.6 src/common/lib/libc/arch/sparc64/atomic/atomic_and.S:1.7
--- src/common/lib/libc/arch/sparc64/atomic/atomic_and.S:1.6 Sun May 25 15:56:12 2008
+++ src/common/lib/libc/arch/sparc64/atomic/atomic_and.S Sun Oct 18 02:28:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_and.S,v 1.6 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_and.S,v 1.7 2015/10/18 02:28:07 nakayama Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -52,14 +52,22 @@ ATOMIC_OP_ALIAS(atomic_and_uint_nv,_atom
STRONG_ALIAS(_atomic_and_uint_nv,_atomic_and_32)
ENTRY(_atomic_and_64)
+#ifndef __arch64__
+ COMBINE(%o1, %o2, %o1)
+#endif
ldx [%o0], %o2
1: and %o1, %o2, %o3
casx [%o0], %o2, %o3
cmp %o2, %o3
bne,a,pn %xcc, 1b
mov %o3, %o2
+#ifdef __arch64__
retl
and %o1, %o2, %o0
+#else
+ and %o1, %o2, %o0
+ SPLIT_RETL(%o0, %o0, %o1)
+#endif
ATOMIC_OP_ALIAS(atomic_and_64,_atomic_and_64)
ATOMIC_OP_ALIAS(atomic_and_64_nv,_atomic_and_64)
@@ -70,3 +78,19 @@ STRONG_ALIAS_SIZE(_atomic_and_ulong,_ato
ATOMIC_OP_ALIAS_SIZE(atomic_and_ulong_nv,_atomic_and)
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Sat Oct 17 18:51:32 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: cpu_in_cksum.S Log Message: LDPTR is defined in machine/asm.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/sparc64/cpu_in_cksum.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/sparc64/sparc64/cpu_in_cksum.S diff -u src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.3 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.4 --- src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.3 Sat Dec 22 20:08:08 2012 +++ src/sys/arch/sparc64/sparc64/cpu_in_cksum.S Sat Oct 17 18:51:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.3 2012/12/22 20:08:08 nakayama Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.4 2015/10/17 18:51:32 nakayama Exp $ */ /* * Copyright (c) 2001 Eduardo Horvath @@ -27,12 +27,6 @@ #include "assym.h" #include -#ifdef __arch64__ -#define LDPTR ldx -#else -#define LDPTR lduw -#endif - /* * int cpu_in_cksum(struct mbuf *m, int len, int off, uint32_t initial_sum); *
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: nakayama Date: Sat Oct 17 19:29:48 UTC 2015 Modified Files: src/sys/arch/sparc64/include: asm.h locore.h src/sys/arch/sparc64/sparc64: copy.S Log Message: Move LP64 and ILP32 conversion macros COMBINE, SPLIT from locore.h to asm.h, and provide SPLIT_RETL for the case SPLIT and then retl immediately. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc64/include/asm.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/sparc64/copy.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/sparc64/include/asm.h diff -u src/sys/arch/sparc64/include/asm.h:1.21 src/sys/arch/sparc64/include/asm.h:1.22 --- src/sys/arch/sparc64/include/asm.h:1.21 Sun Apr 28 23:42:23 2013 +++ src/sys/arch/sparc64/include/asm.h Sat Oct 17 19:29:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.21 2013/04/28 23:42:23 nakayama Exp $*/ +/* $NetBSD: asm.h,v 1.22 2015/10/17 19:29:48 nakayama Exp $*/ #include @@ -66,3 +66,25 @@ /* use as needed to align things on longword boundaries */ #define _ALIGN .align 8 #define ICACHE_ALIGN .align 32 + +/* + * Combine 2 regs -- used to convert 64-bit ILP32 + * values to LP64. + */ +#define COMBINE(r1, r2, d) \ + clruw r2; \ + sllx r1, 32, d; \ + or d, r2, d + +/* + * Split 64-bit value in 1 reg into high and low halves. + * Used for ILP32 return values. + */ +#define SPLIT(s, r0, r1) \ + srl s, 0, r1; \ + srlx s, 32, r0 + +#define SPLIT_RETL(s, r0, r1) \ + srl s, 0, r1; \ + retl; \ + srlx s, 32, r0 Index: src/sys/arch/sparc64/include/locore.h diff -u src/sys/arch/sparc64/include/locore.h:1.8 src/sys/arch/sparc64/include/locore.h:1.9 --- src/sys/arch/sparc64/include/locore.h:1.8 Sun Aug 23 10:59:15 2015 +++ src/sys/arch/sparc64/include/locore.h Sat Oct 17 19:29:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.8 2015/08/23 10:59:15 joerg Exp $ */ +/* $NetBSD: locore.h,v 1.9 2015/10/17 19:29:48 nakayama Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -66,24 +66,6 @@ /* - * Combine 2 regs -- used to convert 64-bit ILP32 - * values to LP64. - */ -#define COMBINE(r1, r2, d) \ - clruw r2; \ - sllx r1, 32, d; \ - or d, r2, d - -/* - * Split 64-bit value in 1 reg into high and low halves. - * Used for ILP32 return values. - */ -#define SPLIT(r0, r1) \ - srl r0, 0, r1; \ - srlx r0, 32, r0 - - -/* * A handy macro for maintaining instrumentation counters. * Note that this clobbers %o0, %o1 and %o2. Normal usage is * something like: Index: src/sys/arch/sparc64/sparc64/copy.S diff -u src/sys/arch/sparc64/sparc64/copy.S:1.4 src/sys/arch/sparc64/sparc64/copy.S:1.5 --- src/sys/arch/sparc64/sparc64/copy.S:1.4 Sat Jul 10 10:12:07 2010 +++ src/sys/arch/sparc64/sparc64/copy.S Sat Oct 17 19:29:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.4 2010/07/10 10:12:07 nakayama Exp $ */ +/* $NetBSD: copy.S,v 1.5 2015/10/17 19:29:48 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -883,7 +883,7 @@ ENTRY(probeget) ldxa [%o0] %asi, %o0 ! value = *(long *)addr; 1: #ifndef _LP64 - SPLIT(%o0, %o1) + SPLIT(%o0, %o0, %o1) #endif membar #Sync #ifndef _LP64
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Tue Sep 8 13:18:06 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: pmap.c Log Message: Fix build w/o options SUN4V. mdesc_get_len() and mdesc_init() are used outside of #ifdef SUN4V, and eliminated by optimization if SUN4V isn't defined. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.298 src/sys/arch/sparc64/sparc64/pmap.c:1.299 --- src/sys/arch/sparc64/sparc64/pmap.c:1.298 Sun Sep 6 23:48:39 2015 +++ src/sys/arch/sparc64/sparc64/pmap.c Tue Sep 8 13:18:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $ */ +/* $NetBSD: pmap.c,v 1.299 2015/09/08 13:18:06 nakayama Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.299 2015/09/08 13:18:06 nakayama Exp $"); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2 #include #ifdef SUN4V #include -#include #endif +#include #include
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: nakayama Date: Sun Sep 6 23:47:09 UTC 2015 Modified Files: src/sys/arch/sparc64/dev: iommu.c Log Message: Fix build w/o options SUN4V. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sparc64/dev/iommu.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/sparc64/dev/iommu.c diff -u src/sys/arch/sparc64/dev/iommu.c:1.109 src/sys/arch/sparc64/dev/iommu.c:1.110 --- src/sys/arch/sparc64/dev/iommu.c:1.109 Thu Sep 3 19:43:35 2015 +++ src/sys/arch/sparc64/dev/iommu.c Sun Sep 6 23:47:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.109 2015/09/03 19:43:35 palle Exp $ */ +/* $NetBSD: iommu.c,v 1.110 2015/09/06 23:47:09 nakayama Exp $ */ /* * Copyright (c) 1999, 2000 Matthew R. Green @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.109 2015/09/03 19:43:35 palle Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.110 2015/09/06 23:47:09 nakayama Exp $"); #include "opt_ddb.h" @@ -78,6 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1. #include #include +#include #ifdef DEBUG #define IDB_BUSDMA 0x1
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: nakayama Date: Sun Sep 6 23:48:39 UTC 2015 Modified Files: src/sys/arch/sparc64/dev: vpci.c src/sys/arch/sparc64/include: cpu.h pmap.h src/sys/arch/sparc64/sparc64: cpu.c pmap.c Log Message: Use instead of for consistency. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/vpci.c cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/include/cpu.h cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/include/pmap.h cvs rdiff -u -r1.126 -r1.127 src/sys/arch/sparc64/sparc64/cpu.c cvs rdiff -u -r1.297 -r1.298 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/dev/vpci.c diff -u src/sys/arch/sparc64/dev/vpci.c:1.2 src/sys/arch/sparc64/dev/vpci.c:1.3 --- src/sys/arch/sparc64/dev/vpci.c:1.2 Thu Sep 3 19:43:35 2015 +++ src/sys/arch/sparc64/dev/vpci.c Sun Sep 6 23:48:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vpci.c,v 1.2 2015/09/03 19:43:35 palle Exp $ */ +/* $NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $ */ /* * Copyright (c) 2015 Palle Lyckegaard * All rights reserved. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.2 2015/09/03 19:43:35 palle Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $"); #include #include @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.2 #include #include -#include +#include #ifdef DEBUG #define VDB_PROM 0x01 Index: src/sys/arch/sparc64/include/cpu.h diff -u src/sys/arch/sparc64/include/cpu.h:1.116 src/sys/arch/sparc64/include/cpu.h:1.117 --- src/sys/arch/sparc64/include/cpu.h:1.116 Sun Sep 6 16:45:09 2015 +++ src/sys/arch/sparc64/include/cpu.h Sun Sep 6 23:48:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.116 2015/09/06 16:45:09 martin Exp $ */ +/* $NetBSD: cpu.h,v 1.117 2015/09/06 23:48:39 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -72,7 +72,7 @@ #include #endif #ifdef SUN4V -#include +#include #endif #include Index: src/sys/arch/sparc64/include/pmap.h diff -u src/sys/arch/sparc64/include/pmap.h:1.59 src/sys/arch/sparc64/include/pmap.h:1.60 --- src/sys/arch/sparc64/include/pmap.h:1.59 Thu Sep 4 18:48:29 2014 +++ src/sys/arch/sparc64/include/pmap.h Sun Sep 6 23:48:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.59 2014/09/04 18:48:29 palle Exp $ */ +/* $NetBSD: pmap.h,v 1.60 2015/09/06 23:48:39 nakayama Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -41,7 +41,7 @@ #ifdef _KERNEL #include #ifdef SUN4V -#include +#include #endif #endif #endif Index: src/sys/arch/sparc64/sparc64/cpu.c diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.126 src/sys/arch/sparc64/sparc64/cpu.c:1.127 --- src/sys/arch/sparc64/sparc64/cpu.c:1.126 Sun Sep 6 16:45:09 2015 +++ src/sys/arch/sparc64/sparc64/cpu.c Sun Sep 6 23:48:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.126 2015/09/06 16:45:09 martin Exp $ */ +/* $NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.126 2015/09/06 16:45:09 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $"); #include "opt_multiprocessor.h" @@ -72,10 +72,10 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 #include #include #include +#include +#include #include -#include -#include #define SUN4V_MONDO_QUEUE_SIZE 32 #define SUN4V_QUEUE_ENTRY_SIZE 64 Index: src/sys/arch/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.297 src/sys/arch/sparc64/sparc64/pmap.c:1.298 --- src/sys/arch/sparc64/sparc64/pmap.c:1.297 Sun Sep 6 16:45:09 2015 +++ src/sys/arch/sparc64/sparc64/pmap.c Sun Sep 6 23:48:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.297 2015/09/06 16:45:09 martin Exp $ */ +/* $NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.297 2015/09/06 16:45:09 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $"); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -58,13 +58,13 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2 #include #include #include - -#include #ifdef SUN4V -#include -#include +#include +#include #endif +#include + #ifdef DDB #include #include
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: nakayama
Date: Fri Aug 14 10:59:27 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: pckbc_ebus.c
Log Message:
pckbc@ebus: match kb_ps2 device to make keyboard and mouse work
on qemu-sparc64.
XXX OpenBIOS doesn't provide interrupts for pckbc currently, so use
the interrupt numbers described in QEMU's hw/sparc64/sun4u.c::isa_irq_handler.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/pckbc_ebus.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/sparc64/dev/pckbc_ebus.c
diff -u src/sys/arch/sparc64/dev/pckbc_ebus.c:1.1 src/sys/arch/sparc64/dev/pckbc_ebus.c:1.2
--- src/sys/arch/sparc64/dev/pckbc_ebus.c:1.1 Tue Oct 9 20:55:04 2012
+++ src/sys/arch/sparc64/dev/pckbc_ebus.c Fri Aug 14 10:59:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ebus.c,v 1.1 2012/10/09 20:55:04 jdc Exp $ */
+/* $NetBSD: pckbc_ebus.c,v 1.2 2015/08/14 10:59:27 nakayama Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pckbc_ebus.c,v 1.1 2012/10/09 20:55:04 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: pckbc_ebus.c,v 1.2 2015/08/14 10:59:27 nakayama Exp $);
#include sys/param.h
#include sys/systm.h
@@ -58,6 +58,7 @@ static void pckbc_ebus_attach(device_t,
static void pckbc_ebus_intr_establish(struct pckbc_softc *, pckbport_slot_t);
#define PCKBC_PROM_DEVICE_NAME 8042
+#define PCKBC_PROM_DEVICE_NAME2 kb_ps2
CFATTACH_DECL_NEW(pckbc_ebus, sizeof(struct pckbc_ebus_softc),
pckbc_ebus_match, pckbc_ebus_attach, NULL, NULL);
@@ -68,7 +69,10 @@ pckbc_ebus_match(device_t parent, cfdata
{
struct ebus_attach_args *ea = aux;
- return (strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME) == 0);
+ if (strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME) == 0 ||
+ strcmp(ea-ea_name, PCKBC_PROM_DEVICE_NAME2) == 0)
+ return 1;
+ return 0;
}
static void
@@ -98,8 +102,25 @@ pckbc_ebus_attach(device_t parent, devic
psc-intr_establish = pckbc_ebus_intr_establish;
- for (i = 0; i PCKBC_NSLOTS; i++)
- sc-psc_intr[i] = ea-ea_intr[i];
+ if (ea-ea_nintr PCKBC_NSLOTS) {
+ aprint_error(: no intr %d, ea-ea_nintr);
+
+ /*
+ * XXX OpenBIOS doesn't provide interrupts for pckbc
+ * currently, so use the interrupt numbers described in
+ * QEMU's hw/sparc64/sun4u.c::isa_irq_handler.
+ */
+ if (strcmp(machine_model, OpenBiosTeam,OpenBIOS) == 0) {
+ sc-psc_intr[PCKBC_KBD_SLOT] = 0x29;
+ sc-psc_intr[PCKBC_AUX_SLOT] = 0x2a;
+ } else {
+ aprint_error(\n);
+ return;
+ }
+ } else {
+ for (i = 0; i PCKBC_NSLOTS; i++)
+ sc-psc_intr[i] = ea-ea_intr[i];
+ }
if (isconsole) {
int status;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Fri Aug 14 02:28:18 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: autoconf.c Log Message: Detect a boot device more precisely on QEMU by checking the device name. To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/sys/arch/sparc64/sparc64/autoconf.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/sparc64/sparc64/autoconf.c diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.203 src/sys/arch/sparc64/sparc64/autoconf.c:1.204 --- src/sys/arch/sparc64/sparc64/autoconf.c:1.203 Sun Jun 14 19:05:27 2015 +++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Aug 14 02:28:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $ */ +/* $NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -843,7 +843,8 @@ dev_path_drive_match(device_t dev, int c snprintf(buf, sizeof(buf), %s@w%016 PRIx64 ,%d, name, wwn, lun); else if (ide_node) - snprintf(buf, sizeof(buf), %s@0, name); + snprintf(buf, sizeof(buf), %s@0, + device_is_a(dev, cd) ? cdrom : disk); else snprintf(buf, sizeof(buf), %s@%d,%d, name, target, lun);
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Wed Aug 12 21:55:05 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove obsolete directory ./usr/include/gcc-4.5 To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.146 src/etc/mtree/NetBSD.dist.base:1.147 --- src/etc/mtree/NetBSD.dist.base:1.146 Thu Jul 23 07:45:44 2015 +++ src/etc/mtree/NetBSD.dist.base Wed Aug 12 21:55:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.146 2015/07/23 07:45:44 mrg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.147 2015/08/12 21:55:05 nakayama Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -180,7 +180,6 @@ ./usr/include/g++/tr1 ./usr/include/g++/tr1_impl ./usr/include/g++/tr2 -./usr/include/gcc-4.5 ./usr/include/gcc-4.8 ./usr/include/gssapi ./usr/include/isofs
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: nakayama Date: Wed Aug 12 21:56:27 UTC 2015 Modified Files: src/distrib/sets/lists/comp: md.sparc md.sparc64 Log Message: Resurrect ./usr/include/gcc-4.8/tgmath.h on sparc*. They are not obsolete. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/comp/md.sparc64 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/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.87 src/distrib/sets/lists/comp/md.sparc:1.88 --- src/distrib/sets/lists/comp/md.sparc:1.87 Mon Aug 10 03:21:44 2015 +++ src/distrib/sets/lists/comp/md.sparc Wed Aug 12 21:56:27 2015 @@ -1,6 +1,6 @@ -# $NetBSD: md.sparc,v 1.87 2015/08/10 03:21:44 mrg Exp $ +# $NetBSD: md.sparc,v 1.88 2015/08/12 21:56:27 nakayama Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include obsolete -./usr/include/gcc-4.8/tgmath.h comp-c-include obsolete +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc ./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.194 src/distrib/sets/lists/comp/md.sparc64:1.195 --- src/distrib/sets/lists/comp/md.sparc64:1.194 Mon Aug 10 03:21:44 2015 +++ src/distrib/sets/lists/comp/md.sparc64 Wed Aug 12 21:56:27 2015 @@ -1,10 +1,10 @@ -# $NetBSD: md.sparc64,v 1.194 2015/08/10 03:21:44 mrg Exp $ +# $NetBSD: md.sparc64,v 1.195 2015/08/12 21:56:27 nakayama Exp $ ./usr/include/g++/bits/sparc comp-c-include compat ./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc,compat ./usr/include/g++/bits/sparc64 comp-c-include compat ./usr/include/g++/bits/sparc64/c++config.h comp-c-include gcc,compat ./usr/include/gcc-4.5/tgmath.h comp-c-include obsolete -./usr/include/gcc-4.8/tgmath.h comp-c-include obsolete +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc ./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: nakayama
Date: Mon Jul 6 12:05:40 UTC 2015
Modified Files:
src/usr.bin/gzip: zgrep
Log Message:
zgrep(1): suppress the prefixing of filename on output when only
one file is specified to match the grep(1)'s output.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/gzip/zgrep
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/gzip/zgrep
diff -u src/usr.bin/gzip/zgrep:1.8 src/usr.bin/gzip/zgrep:1.9
--- src/usr.bin/gzip/zgrep:1.8 Thu Jul 25 12:25:23 2013
+++ src/usr.bin/gzip/zgrep Mon Jul 6 12:05:40 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: zgrep,v 1.8 2013/07/25 12:25:23 pgoyette Exp $
+# $NetBSD: zgrep,v 1.9 2015/07/06 12:05:40 nakayama Exp $
#
# Copyright (c) 2003 Thomas Klausner.
#
@@ -113,7 +113,7 @@ then
${zcat} -fq - | ${grep} ${grep_args} -- ${pattern} -
else
# ... on all files given on the command line
-if [ ${silent} -lt 1 ]; then
+if [ ${silent} -lt 1 -a $# -gt 1 ]; then
grep_args=-H ${grep_args}
fi
while [ $# -gt 0 ]
CVS commit: src/sys/arch/sparc
Module Name:src Committed By: nakayama Date: Fri Mar 27 06:10:25 UTC 2015 Modified Files: src/sys/arch/sparc/include: openfirm.h src/sys/arch/sparc/sparc: openfirm.c Log Message: Sync sparc64 kernel's OF_seek with ofwboot's one, but sparc version is not changed. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/include/openfirm.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/sparc/openfirm.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/sparc/include/openfirm.h diff -u src/sys/arch/sparc/include/openfirm.h:1.7 src/sys/arch/sparc/include/openfirm.h:1.8 --- src/sys/arch/sparc/include/openfirm.h:1.7 Mon May 18 11:39:30 2009 +++ src/sys/arch/sparc/include/openfirm.h Fri Mar 27 06:10:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.h,v 1.7 2009/05/18 11:39:30 nakayama Exp $ */ +/* $NetBSD: openfirm.h,v 1.8 2015/03/27 06:10:25 nakayama Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -57,6 +57,8 @@ typedef uint64_t cell_t; typedef uint32_t cell_t; #define HDL2CELL(x) (cell_t)(x) #define ADR2CELL(x) (cell_t)(x) +#define HDQ2CELL_HI(x) (cell_t)((x) 32) +#define HDQ2CELL_LO(x) (cell_t)(x) #endif /* SUN4U */ int OF_test(const char *); Index: src/sys/arch/sparc/sparc/openfirm.c diff -u src/sys/arch/sparc/sparc/openfirm.c:1.19 src/sys/arch/sparc/sparc/openfirm.c:1.20 --- src/sys/arch/sparc/sparc/openfirm.c:1.19 Sun Nov 23 02:15:52 2014 +++ src/sys/arch/sparc/sparc/openfirm.c Fri Mar 27 06:10:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $ */ +/* $NetBSD: openfirm.c,v 1.20 2015/03/27 06:10:25 nakayama Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.20 2015/03/27 06:10:25 nakayama Exp $); #include sys/param.h #include sys/systm.h @@ -546,8 +546,8 @@ OF_seek(int handle, u_quad_t pos) args.nargs = 3; args.nreturns = 1; args.handle = HDL2CELL(handle); - args.poshi = HDL2CELL(pos 32); - args.poslo = HDL2CELL(pos); + args.poshi = HDQ2CELL_HI(pos); + args.poslo = HDQ2CELL_LO(pos); if (openfirmware(args) == -1) return -1; return args.status;
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: nakayama
Date: Fri Mar 27 06:07:33 UTC 2015
Modified Files:
src/sys/arch/sparc/stand/ofwboot: Locore.c
Log Message:
Fix kernel loading failures from partitions started from over first
4GB of disks on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/ofwboot/Locore.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/sparc/stand/ofwboot/Locore.c
diff -u src/sys/arch/sparc/stand/ofwboot/Locore.c:1.13 src/sys/arch/sparc/stand/ofwboot/Locore.c:1.14
--- src/sys/arch/sparc/stand/ofwboot/Locore.c:1.13 Wed Dec 18 10:09:56 2013
+++ src/sys/arch/sparc/stand/ofwboot/Locore.c Fri Mar 27 06:07:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.13 2013/12/18 10:09:56 martin Exp $ */
+/* $NetBSD: Locore.c,v 1.14 2015/03/27 06:07:33 nakayama Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -302,8 +302,8 @@ OF_seek(int handle, u_quad_t pos)
args.nargs = 3;
args.nreturns = 1;
args.handle = HDL2CELL(handle);
- args.poshi = HDL2CELL(pos 32);
- args.poslo = HDL2CELL(pos);
+ args.poshi = HDQ2CELL_HI(pos);
+ args.poslo = HDQ2CELL_LO(pos);
if (openfirmware(args) == -1) {
return -1;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nakayama Date: Thu Mar 26 20:13:28 UTC 2015 Modified Files: src/sys/dev/pci: pccbb.c Log Message: Add missing new lines. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/dev/pci/pccbb.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/dev/pci/pccbb.c diff -u src/sys/dev/pci/pccbb.c:1.207 src/sys/dev/pci/pccbb.c:1.208 --- src/sys/dev/pci/pccbb.c:1.207 Sun Nov 16 16:20:00 2014 +++ src/sys/dev/pci/pccbb.c Thu Mar 26 20:13:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.207 2014/11/16 16:20:00 ozaki-r Exp $ */ +/* $NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.207 2014/11/16 16:20:00 ozaki-r Exp $); +__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $); /* #define CBB_DEBUG @@ -556,9 +556,9 @@ pccbbdetach(device_t self, int flags) sc-sc_flags = ~(CBB_MEMHMAPPED|CBB_SPECMAPPED); if (!TAILQ_EMPTY(sc-sc_iowindow)) - aprint_error_dev(self, i/o windows not empty); + aprint_error_dev(self, i/o windows not empty\n); if (!TAILQ_EMPTY(sc-sc_memwindow)) - aprint_error_dev(self, memory windows not empty); + aprint_error_dev(self, memory windows not empty\n); callout_halt(sc-sc_insert_ch, NULL); callout_destroy(sc-sc_insert_ch);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Sun Mar 15 10:38:58 UTC 2015
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c machdep.c
Log Message:
Reuse results of bootpath and bootargs from openfirmware
instead of calling openfirmware in each sysctl CPU_BOOT*.
This change reduces openfirmware calls from userland since sysctl
CPU_BOOTED_KERNEL is used in system commands such as pstat and
netstat.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/sparc64/sparc64/machdep.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/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.201 src/sys/arch/sparc64/sparc64/autoconf.c:1.202
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.201 Sat Jan 10 22:19:26 2015
+++ src/sys/arch/sparc64/sparc64/autoconf.c Sun Mar 15 10:38:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $ */
+/* $NetBSD: autoconf.c,v 1.202 2015/03/15 10:38:58 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.202 2015/03/15 10:38:58 nakayama Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -146,6 +146,7 @@ int kgdb_break_at_attach;
char machine_banner[100];
char machine_model[100];
char ofbootpath[OFPATHLEN], *ofboottarget, *ofbootpartition;
+char ofbootargs[OFPATHLEN], *ofbootfile, *ofbootflags;
int ofbootpackage;
static int mbprint(void *, const char *);
@@ -418,8 +419,9 @@ get_bootpath_from_prom(void)
/* Setup pointer to boot flags */
if (OF_getprop(chosen, bootargs, sbuf, sizeof(sbuf)) == -1)
return;
+ strcpy(ofbootargs, sbuf);
- cp = sbuf;
+ cp = ofbootargs;
/* Find start of boot flags */
while (*cp) {
@@ -427,8 +429,12 @@ get_bootpath_from_prom(void)
if (*cp == '-' || *cp == '\0')
break;
while(*cp != ' ' *cp != '\t' *cp != '\0') cp++;
-
+ if (*cp != '\0')
+ *cp++ = '\0';
}
+ if (cp != ofbootargs)
+ ofbootfile = ofbootargs;
+ ofbootflags = cp;
if (*cp != '-')
return;
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.280 src/sys/arch/sparc64/sparc64/machdep.c:1.281
--- src/sys/arch/sparc64/sparc64/machdep.c:1.280 Tue Oct 28 13:04:51 2014
+++ src/sys/arch/sparc64/sparc64/machdep.c Sun Mar 15 10:38:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.280 2014/10/28 13:04:51 nakayama Exp $ */
+/* $NetBSD: machdep.c,v 1.281 2015/03/15 10:38:58 nakayama Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.280 2014/10/28 13:04:51 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.281 2015/03/15 10:38:58 nakayama Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -295,59 +295,6 @@ setregs(struct lwp *l, struct exec_packa
#endif
}
-static char *parse_bootfile(char *);
-static char *parse_bootargs(char *);
-
-static char *
-parse_bootfile(char *args)
-{
- char *cp;
-
- /*
- * bootargs is of the form: [kernelname] [args...]
- * It can be the empty string if we booted from the default
- * kernel name.
- */
- cp = args;
- for (cp = args; *cp != 0 *cp != ' ' *cp != '\t'; cp++) {
- if (*cp == '-') {
- int c;
- /*
- * If this `-' is most likely the start of boot
- * options, we're done.
- */
- if (cp == args)
-break;
- if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
- }
- }
- /* Now we've separated out the kernel name from the args */
- *cp = '\0';
- return (args);
-}
-
-static char *
-parse_bootargs(char *args)
-{
- char *cp;
-
- for (cp = args; *cp != '\0'; cp++) {
- if (*cp == '-') {
- int c;
- /*
- * Looks like options start here, but check this
- * `-' is not part of the kernel name.
- */
- if (cp == args)
-break;
- if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
- }
- }
- return (cp);
-}
-
/*
* machine dependent system variables.
*/
@@ -355,31 +302,28 @@ static int
sysctl_machdep_boot(SYSCTLFN_ARGS)
{
struct sysctlnode node = *rnode;
- u_int chosen;
- char bootargs[256];
- const char *cp;
-
- if ((chosen = OF_finddevice(/chosen)) == -1)
- return (ENOENT);
- if (node.sysctl_num == CPU_BOOTED_DEVICE)
- cp = bootpath;
- else
- cp = bootargs;
- if (OF_getprop(chosen, cp, bootargs, sizeof bootargs) 0)
- return (ENOENT);
+ char bootpath[256];
+ const char *cp = NULL;
+ extern char ofbootpath[], *ofbootpartition, *ofbootfile, *ofbootflags;
switch (node.sysctl_num) {
case CPU_BOOTED_KERNEL:
- cp = parse_bootfile(bootargs);
-if (cp != NULL cp[0] == '\0')
+ cp = ofbootfile;
+if (cp == NULL || cp[0] == '\0')
CVS commit: src/sys/dev
Module Name:src
Committed By: nakayama
Date: Thu Mar 5 14:02:55 UTC 2015
Modified Files:
src/sys/dev: cons.c
Log Message:
Fix strange kernel output sequence \n\r observed in serial
consoles. Output '\r' before '\n' in conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/cons.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/dev/cons.c
diff -u src/sys/dev/cons.c:1.73 src/sys/dev/cons.c:1.74
--- src/sys/dev/cons.c:1.73 Mon Feb 23 06:54:12 2015
+++ src/sys/dev/cons.c Thu Mar 5 14:02:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.73 2015/02/23 06:54:12 mlelstv Exp $ */
+/* $NetBSD: cons.c,v 1.74 2015/03/05 14:02:55 nakayama Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.73 2015/02/23 06:54:12 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.74 2015/03/05 14:02:55 nakayama Exp $);
#include sys/param.h
#include sys/proc.h
@@ -322,11 +322,11 @@ cnputc(int c)
return;
if (c) {
- (*cn_tab-cn_putc)(cn_tab-cn_dev, c);
if (c == '\n') {
- docritpollhooks();
(*cn_tab-cn_putc)(cn_tab-cn_dev, '\r');
+ docritpollhooks();
}
+ (*cn_tab-cn_putc)(cn_tab-cn_dev, c);
}
}
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Mon Mar 2 14:17:06 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: consinit.c
src/sys/arch/sparc64/sparc64: db_tlb_access.S locore.s ofw_machdep.c
Log Message:
prom_printf converts \n to \r\n internally, so omit \r.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/dev/consinit.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/db_tlb_access.S
cvs rdiff -u -r1.380 -r1.381 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/sparc64/ofw_machdep.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/sparc64/dev/consinit.c
diff -u src/sys/arch/sparc64/dev/consinit.c:1.27 src/sys/arch/sparc64/dev/consinit.c:1.28
--- src/sys/arch/sparc64/dev/consinit.c:1.27 Thu Sep 12 12:57:48 2013
+++ src/sys/arch/sparc64/dev/consinit.c Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.28 2015/03/02 14:17:06 nakayama Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.28 2015/03/02 14:17:06 nakayama Exp $);
#include opt_ddb.h
#include pcons.h
@@ -172,7 +172,7 @@ consinit(void)
char buffer[128];
const char *consname = unknown;
- DBPRINT((consinit()\r\n));
+ DBPRINT((consinit()\n));
if (cn_tab != consdev_prom)
return;
@@ -180,13 +180,13 @@ consinit(void)
if ((prom_stdin_node = prom_instance_to_package(prom_stdin())) == 0) {
printf(WARNING: no PROM stdin\n);
}
- DBPRINT((stdin node = %x\r\n, prom_stdin_node));
+ DBPRINT((stdin node = %x\n, prom_stdin_node));
if ((prom_stdout_node = prom_instance_to_package(prom_stdout())) == 0)
printf(WARNING: no PROM stdout\n);
- DBPRINT((stdout package = %x\r\n, prom_stdout_node));
+ DBPRINT((stdout package = %x\n, prom_stdout_node));
- DBPRINT((buffer @ %p\r\n, buffer));
+ DBPRINT((buffer @ %p\n, buffer));
if (prom_stdin_node != 0
(prom_getproplen(prom_stdin_node, keyboard) = 0)) {
Index: src/sys/arch/sparc64/sparc64/db_tlb_access.S
diff -u src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.2 src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.3
--- src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.2 Tue Feb 23 05:32:08 2010
+++ src/sys/arch/sparc64/sparc64/db_tlb_access.S Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: db_tlb_access.S,v 1.2 2010/02/23 05:32:08 mrg Exp $ */
+/* $NetBSD: db_tlb_access.S,v 1.3 2015/03/02 14:17:06 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -105,7 +105,7 @@ ENTRY_NOPROFILE(print_itlb)
2:
.asciz %2d:%016lx %016lx
3:
- .asciz %2d:%016lx %016lx\r\n
+ .asciz %2d:%016lx %016lx\n
.text
#else
ENTRY_NOPROFILE(print_dtlb)
@@ -196,6 +196,6 @@ ENTRY_NOPROFILE(print_itlb)
2:
.asciz %2d:%08x:%08x %08x:%08x
3:
- .asciz %2d:%08x:%08x %08x:%08x\r\n
+ .asciz %2d:%08x:%08x %08x:%08x\n
.text
#endif
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.380 src/sys/arch/sparc64/sparc64/locore.s:1.381
--- src/sys/arch/sparc64/sparc64/locore.s:1.380 Mon Mar 2 13:58:55 2015
+++ src/sys/arch/sparc64/sparc64/locore.s Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.380 2015/03/02 13:58:55 nakayama Exp $ */
+/* $NetBSD: locore.s,v 1.381 2015/03/02 14:17:06 nakayama Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -1627,7 +1627,7 @@ asmptechk:
.data
2:
- .asciz asmptechk: %x %x %x %x:%x\r\n
+ .asciz asmptechk: %x %x %x %x:%x\n
_ALIGN
.text
#endif
@@ -3513,7 +3513,7 @@ setup_sparcintr:
STACKFRAME(-CC64FSZ) ! Get a clean register window
LOAD_ASCIZ(%o0,\
- interrupt_vector: number %lx softint mask %lx pil %lu slot %p\r\n)
+ interrupt_vector: number %lx softint mask %lx pil %lu slot %p\n)
mov %g2, %o1
rdpr %pil, %o3
mov %g1, %o4
@@ -3545,7 +3545,7 @@ ret_from_intr_vector:
#if 1
set PANICSTACK-STKB, %g1 ! Use panic stack temporarily
save %g1, -CC64FSZ, %sp ! Get a clean register window
- LOAD_ASCIZ(%o0, interrupt_vector: spurious vector %lx at pil %d\r\n)
+ LOAD_ASCIZ(%o0, interrupt_vector: spurious vector %lx at pil %d\n)
mov %g7, %o1
GLOBTOLOC
clr %g4
@@ -3830,7 +3830,7 @@ sparc_intr_retry:
nop
STACKFRAME(-CC64FSZ) ! Get a clean register window
- LOAD_ASCIZ(%o0, sparc_interrupt: func %p arg %p\r\n)
+ LOAD_ASCIZ(%o0, sparc_interrupt: func %p arg %p\n)
mov %i0, %o2 ! arg
GLOBTOLOC
call prom_printf
@@ -3890,7 +3890,7 @@ intrcmplt:
nop
STACKFRAME(-CC64FSZ) ! Get a clean register window
- LOAD_ASCIZ(%o0, sparc_interrupt: done\r\n)
+ LOAD_ASCIZ(%o0, sparc_interrupt: done\n)
GLOBTOLOC
call prom_printf
nop
@@ -4542,7 +4542,7 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Mon Mar 2 13:48:00 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Use panic stack temporarily for calling prom_printf in a trap handler. It seems that openfirmware cannot handle over 4GB pointers, and stack pointers may point to over 4GB since VA layout was rearranged by rev 1.33 of vmparam.h. Therefore, use panic stack to avoid panicking in OF_write used by prom_printf. To generate a diff of this commit: cvs rdiff -u -r1.378 -r1.379 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.378 src/sys/arch/sparc64/sparc64/locore.s:1.379 --- src/sys/arch/sparc64/sparc64/locore.s:1.378 Mon Feb 23 12:36:58 2015 +++ src/sys/arch/sparc64/sparc64/locore.s Mon Mar 2 13:48:00 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.378 2015/02/23 12:36:58 palle Exp $ */ +/* $NetBSD: locore.s,v 1.379 2015/03/02 13:48:00 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3547,7 +3547,8 @@ ret_from_intr_vector: nop #endif #if 1 - STACKFRAME(-CC64FSZ) ! Get a clean register window + set PANICSTACK-STKB, %g1 ! Use panic stack temporarily + save %g1, -CC64FSZ, %sp ! Get a clean register window LOAD_ASCIZ(%o0, interrupt_vector: spurious vector %lx at pil %d\r\n) mov %g7, %o1 GLOBTOLOC
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Mon Mar 2 13:58:55 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: PANICSTACK is a pointer itself, not a pointer to pointer. To generate a diff of this commit: cvs rdiff -u -r1.379 -r1.380 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.379 src/sys/arch/sparc64/sparc64/locore.s:1.380 --- src/sys/arch/sparc64/sparc64/locore.s:1.379 Mon Mar 2 13:48:00 2015 +++ src/sys/arch/sparc64/sparc64/locore.s Mon Mar 2 13:58:55 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.379 2015/03/02 13:48:00 nakayama Exp $ */ +/* $NetBSD: locore.s,v 1.380 2015/03/02 13:58:55 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -2145,9 +2145,7 @@ winfixspill: wrpr %g0, 0, %otherwin or %lo(2f), %o0, %o0 wrpr %g0, WSTATE_KERN, %wstate - sethi %hi(PANICSTACK), %sp - LDPTR [%sp + %lo(PANICSTACK)], %sp - add %sp, -CC64FSZ-STKB, %sp + set PANICSTACK-CC64FSZ-STKB, %sp ta 1; nop ! This helps out traptrace. call _C_LABEL(panic)! This needs to be fixed properly but we should panic here mov %g1, %o1 @@ -2927,9 +2925,7 @@ slowtrap: cmp %g7, WSTATE_KERN bnz,pt %icc, 1f ! User stack -- we'll blow it away nop - sethi %hi(PANICSTACK), %sp - LDPTR [%sp + %lo(PANICSTACK)], %sp - add %sp, -CC64FSZ-STKB, %sp + set PANICSTACK-CC64FSZ-STKB, %sp 1: #endif rdpr %tt, %g4
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: nakayama
Date: Thu Feb 26 16:07:11 UTC 2015
Modified Files:
src/sys/dev/ic: tulip.c
Log Message:
Stop the interface before detaching to avoid the race between
tlp_detach() and tlp_intr().
While there, add missing callout_destroy()s.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/dev/ic/tulip.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/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.184 src/sys/dev/ic/tulip.c:1.185
--- src/sys/dev/ic/tulip.c:1.184 Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/tulip.c Thu Feb 26 16:07:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.184 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: tulip.c,v 1.185 2015/02/26 16:07:10 nakayama Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tulip.c,v 1.184 2014/08/10 16:44:35 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: tulip.c,v 1.185 2015/02/26 16:07:10 nakayama Exp $);
#include sys/param.h
@@ -592,7 +592,7 @@ tlp_detach(struct tulip_softc *sc)
struct tulip_rxsoft *rxs;
struct tulip_txsoft *txs;
device_t self = sc-sc_dev;
- int i;
+ int i, s;
/*
* Succeed now if there isn't any work to do.
@@ -600,9 +600,14 @@ tlp_detach(struct tulip_softc *sc)
if ((sc-sc_flags TULIPF_ATTACHED) == 0)
return (0);
- /* Unhook our tick handler. */
- if (sc-sc_tick)
- callout_stop(sc-sc_tick_callout);
+ s = splnet();
+ /* Stop the interface. Callouts are stopped in it. */
+ tlp_stop(ifp, 1);
+ splx(s);
+
+ /* Destroy our callouts. */
+ callout_destroy(sc-sc_nway_callout);
+ callout_destroy(sc-sc_tick_callout);
if (sc-sc_flags TULIPF_HAS_MII) {
/* Detach all PHYs */
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: nakayama
Date: Sat Feb 21 07:40:01 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: lom.c
Log Message:
Fix queue handling to make the watchdog timer actually works on
netbsd-7 if it is configured by wdogctl=YES in rc.conf, and also
avoid a hangup duaring shutdown.
- don't put an entry which is already in the queue.
- read a first entry properly to handle the queue.
- check the lom status if input buffer is empty before writing.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/dev/lom.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/sparc64/dev/lom.c
diff -u src/sys/arch/sparc64/dev/lom.c:1.13 src/sys/arch/sparc64/dev/lom.c:1.14
--- src/sys/arch/sparc64/dev/lom.c:1.13 Tue Feb 25 18:30:08 2014
+++ src/sys/arch/sparc64/dev/lom.c Sat Feb 21 07:40:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lom.c,v 1.13 2014/02/25 18:30:08 pooka Exp $ */
+/* $NetBSD: lom.c,v 1.14 2015/02/21 07:40:01 nakayama Exp $ */
/* $OpenBSD: lom.c,v 1.21 2010/02/28 20:44:39 kettenis Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lom.c,v 1.13 2014/02/25 18:30:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lom.c,v 1.14 2015/02/21 07:40:01 nakayama Exp $);
#include sys/param.h
#include sys/device.h
@@ -600,7 +600,15 @@ lom1_write_polled(struct lom_softc *sc,
static void
lom1_queue_cmd(struct lom_softc *sc, struct lom_cmd *lc)
{
+ struct lom_cmd *lcp;
+
mutex_enter(sc-sc_queue_mtx);
+ TAILQ_FOREACH(lcp, sc-sc_queue, lc_next) {
+ if (lcp == lc) {
+ mutex_exit(sc-sc_queue_mtx);
+ return;
+ }
+ }
TAILQ_INSERT_TAIL(sc-sc_queue, lc, lc_next);
if (sc-sc_state == LOM_STATE_IDLE) {
sc-sc_state = LOM_STATE_CMD;
@@ -818,13 +826,21 @@ lom2_write_polled(struct lom_softc *sc,
static void
lom2_queue_cmd(struct lom_softc *sc, struct lom_cmd *lc)
{
+ struct lom_cmd *lcp;
uint8_t str;
mutex_enter(sc-sc_queue_mtx);
+ TAILQ_FOREACH(lcp, sc-sc_queue, lc_next) {
+ if (lcp == lc) {
+ mutex_exit(sc-sc_queue_mtx);
+ return;
+ }
+ }
TAILQ_INSERT_TAIL(sc-sc_queue, lc, lc_next);
if (sc-sc_state == LOM_STATE_IDLE) {
str = bus_space_read_1(sc-sc_iot, sc-sc_ioh, LOM2_STATUS);
if ((str LOM2_STATUS_IBF) == 0) {
+ lc = TAILQ_FIRST(sc-sc_queue);
bus_space_write_1(sc-sc_iot, sc-sc_ioh,
LOM2_CMD, lc-lc_cmd);
sc-sc_state = LOM_STATE_DATA;
@@ -852,9 +868,11 @@ lom2_intr(void *arg)
}
if (lc-lc_cmd LOM_IDX_WRITE) {
- bus_space_write_1(sc-sc_iot, sc-sc_ioh,
- LOM2_DATA, lc-lc_data);
- lc-lc_cmd = ~LOM_IDX_WRITE;
+ if ((str LOM2_STATUS_IBF) == 0) {
+ bus_space_write_1(sc-sc_iot, sc-sc_ioh,
+ LOM2_DATA, lc-lc_data);
+ lc-lc_cmd = ~LOM_IDX_WRITE;
+ }
mutex_exit(sc-sc_queue_mtx);
return (1);
}
@@ -871,6 +889,7 @@ lom2_intr(void *arg)
if (!TAILQ_EMPTY(sc-sc_queue)) {
str = bus_space_read_1(sc-sc_iot, sc-sc_ioh, LOM2_STATUS);
if ((str LOM2_STATUS_IBF) == 0) {
+ lc = TAILQ_FIRST(sc-sc_queue);
bus_space_write_1(sc-sc_iot, sc-sc_ioh,
LOM2_CMD, lc-lc_cmd);
sc-sc_state = LOM_STATE_DATA;
CVS commit: src/etc
Module Name:src Committed By: nakayama Date: Sat Feb 14 19:46:55 UTC 2015 Modified Files: src/etc: security Log Message: Avoid nfs devices correctly. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/etc/security Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/security diff -u src/etc/security:1.118 src/etc/security:1.119 --- src/etc/security:1.118 Sat Dec 13 02:17:35 2014 +++ src/etc/security Sat Feb 14 19:46:55 2015 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: security,v 1.118 2014/12/13 02:17:35 uebayasi Exp $ +# $NetBSD: security,v 1.119 2015/02/14 19:46:55 nakayama Exp $ # from: @(#)security 8.1 (Berkeley) 6/9/93 # @@ -915,7 +915,7 @@ if checkyesno check_disklabels; then # nfs and device (the header of iostat) for i in $disks; do case $i in - [cfm]d[0-9]*|dk[0-9]*|st[0-9]*|nfs|device) + [cfm]d[0-9]*|dk[0-9]*|st[0-9]*|nfs[0-9]*|device) ;; *) if disklabel $i /dev/null 12; then
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Sun Feb 15 01:43:11 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Fix up sysmon_* dependencies. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sparc64/conf/files.sparc64 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/sparc64/conf/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.147 src/sys/arch/sparc64/conf/files.sparc64:1.148 --- src/sys/arch/sparc64/conf/files.sparc64:1.147 Thu Feb 12 10:09:10 2015 +++ src/sys/arch/sparc64/conf/files.sparc64 Sun Feb 15 01:43:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.147 2015/02/12 10:09:10 palle Exp $ +# $NetBSD: files.sparc64,v 1.148 2015/02/15 01:43:11 nakayama Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -32,11 +32,11 @@ file arch/sparc64/dev/sbus.c sbus device psycho: pcibus, sysmon_power, sysmon_taskq attach psycho at mainbus -device schizo: pcibus, sysmon_power, sysmon_taskq +device schizo: pcibus attach schizo at mainbus -device pyro: pcibus, sysmon_power, sysmon_taskq +device pyro: pcibus attach pyro at mainbus -device vpci: pcibus, sysmon_power, sysmon_taskq +device vpci: pcibus attach vpci at mainbus include dev/pci/files.pci file arch/sparc64/dev/psycho.c psycho needs-flag @@ -79,7 +79,7 @@ device rtc: mc146818 attach rtc at ebus with rtc_ebus file arch/sparc64/dev/rtc.c rtc -device psm: sysmon_envsys, sysmon_power +device psm: sysmon_power attach psm at ebus file arch/sparc64/dev/psm.c psm @@ -90,15 +90,15 @@ device power attach power at sbus, ebus file arch/sparc64/dev/power.c power -device tda +device tda: sysmon_envsys attach tda at iic file arch/sparc64/dev/tda.c tda -device pcfiic: sysmon_envsys, pcf8584, i2cbus +device pcfiic: pcf8584, i2cbus attach pcfiic at ebus file arch/sparc64/dev/pcfiic_ebus.c pcfiic -device ecadc +device ecadc: sysmon_envsys attach ecadc at iic file arch/sparc64/dev/pcf8591_envctrl.c ecadc
CVS commit: src/tests/lib/libexecinfo
Module Name:src
Committed By: nakayama
Date: Sat Jan 31 20:55:43 UTC 2015
Modified Files:
src/tests/lib/libexecinfo: Makefile
Log Message:
The test requires symbols, so put STRIPFLAG= explicitly to avoid
stripping them if STRIPFLAG?=-s is defined in /etc/mk.conf.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libexecinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libexecinfo/Makefile
diff -u src/tests/lib/libexecinfo/Makefile:1.5 src/tests/lib/libexecinfo/Makefile:1.6
--- src/tests/lib/libexecinfo/Makefile:1.5 Tue Mar 18 18:20:44 2014
+++ src/tests/lib/libexecinfo/Makefile Sat Jan 31 20:55:43 2015
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/03/18 18:20:44 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/31 20:55:43 nakayama Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libexecinfo
TESTS_C+= t_backtrace
+STRIPFLAG=
LDADD+= -lexecinfo -lelf
DPADD+= ${LIBEXECINFO} ${LIBELF}
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Thu Dec 25 14:02:03 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: psl.h
Log Message:
Put memory to asm inline for reading privilege registers on sun4v
to avoid issuing rdpr %ver before checking cputyp as a result of
code moving by compiler optimization.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.55 src/sys/arch/sparc64/include/psl.h:1.56
--- src/sys/arch/sparc64/include/psl.h:1.55 Fri Dec 5 11:34:00 2014
+++ src/sys/arch/sparc64/include/psl.h Thu Dec 25 14:02:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.55 2014/12/05 11:34:00 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.56 2014/12/25 14:02:03 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -284,6 +284,21 @@
#if defined(_KERNEL) !defined(_LOCORE)
+#if defined(_KERNEL_OPT)
+#include opt_sparc_arch.h
+#endif
+
+/*
+ * Put memory to asm inline on sun4v to avoid issuing rdpr %ver
+ * before checking cputyp as a result of code moving by compiler
+ * optimization.
+ */
+#ifdef SUN4V
+#define constasm_clobbers memory
+#else
+#define constasm_clobbers
+#endif
+
/*
* Inlines for manipulating privileged and ancillary state registers
*/
@@ -291,7 +306,7 @@
static __inline __constfunc type get##name(void) \
{ \
type _val; \
- __asm(#rd % #reg ,%0 : =r (_val)); \
+ __asm(#rd % #reg ,%0 : =r (_val) : : constasm_clobbers); \
return _val; \
}
#define SPARC64_RD_DEF(rd, name, reg, type)\
@@ -318,7 +333,7 @@ static __inline __constfunc uint64_t get
{ \
uint32_t _hi, _lo; \
__asm(#rd % #reg ,%0; srl %0,0,%1; srlx %0,32,%0 \
- : =r (_hi), =r (_lo));\
+ : =r (_hi), =r (_lo) : : constasm_clobbers); \
return ((uint64_t)_hi 32) | _lo;\
}
#define SPARC64_RD64_DEF(rd, name, reg) \
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Fri Dec 5 11:31:50 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: psl.h
Log Message:
Make getver() into a constant function since Version Register (%ver)
is read only and its value is constant.
This change reduces multipule %ver reads to one in the functions
which uses a number of CPU_IS_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.53 src/sys/arch/sparc64/include/psl.h:1.54
--- src/sys/arch/sparc64/include/psl.h:1.53 Sun Aug 18 09:31:38 2013
+++ src/sys/arch/sparc64/include/psl.h Fri Dec 5 11:31:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.53 2013/08/18 09:31:38 martin Exp $ */
+/* $NetBSD: psl.h,v 1.54 2014/12/05 11:31:50 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -287,6 +287,13 @@
/*
* Inlines for manipulating privileged and ancillary state registers
*/
+#define SPARC64_RDCONST_DEF(rd, name, reg, type) \
+static __inline __constfunc type get##name(void) \
+{ \
+ type _val; \
+ __asm(#rd % #reg ,%0 : =r (_val)); \
+ return _val; \
+}
#define SPARC64_RD_DEF(rd, name, reg, type)\
static __inline type get##name(void) \
{ \
@@ -301,9 +308,19 @@ static __inline void set##name(type _val
}
#ifdef __arch64__
+#define SPARC64_RDCONST64_DEF(rd, name, reg) \
+ SPARC64_RDCONST_DEF(rd, name, reg, uint64_t)
#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
#else
+#define SPARC64_RDCONST64_DEF(rd, name, reg)\
+static __inline __constfunc uint64_t get##name(void) \
+{ \
+ uint32_t _hi, _lo; \
+ __asm(#rd % #reg ,%0; srl %0,0,%1; srlx %0,32,%0 \
+ : =r (_hi), =r (_lo));\
+ return ((uint64_t)_hi 32) | _lo;\
+}
#define SPARC64_RD64_DEF(rd, name, reg) \
static __inline uint64_t get##name(void)\
{ \
@@ -345,7 +362,7 @@ SPARC64_RDPR_DEF(cwp, %cwp, int) /* get
SPARC64_WRPR_DEF(cwp, %cwp, int) /* setcwp() */
/* Version Register (PR 31) */
-SPARC64_RDPR64_DEF(ver, %ver) /* getver() */
+SPARC64_RDCONST64_DEF(rdpr, ver, %ver) /* getver() */
/* System Tick Register (ASR 24) */
SPARC64_RDASR64_DEF(stick, STICK) /* getstick() */
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Fri Dec 5 11:34:00 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: psl.h
src/sys/arch/sparc64/sparc64: cpu.c
Log Message:
Use GETVER_CPU_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sparc64/include/psl.h
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/sparc64/sparc64/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/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.54 src/sys/arch/sparc64/include/psl.h:1.55
--- src/sys/arch/sparc64/include/psl.h:1.54 Fri Dec 5 11:31:50 2014
+++ src/sys/arch/sparc64/include/psl.h Fri Dec 5 11:34:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.54 2014/12/05 11:31:50 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.55 2014/12/05 11:34:00 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -369,6 +369,7 @@ SPARC64_RDASR64_DEF(stick, STICK) /* ge
SPARC64_WRASR64_DEF(stick, STICK) /* setstick() */
/* Some simple macros to check the cpu type. */
+#define GETVER_CPU_MASK() ((getver() VER_MASK) VER_MASK_SHIFT)
#define GETVER_CPU_IMPL() ((getver() VER_IMPL) VER_IMPL_SHIFT)
#define GETVER_CPU_MANUF() ((getver() VER_MANUF) VER_MANUF_SHIFT)
#define CPU_IS_SPITFIRE() (GETVER_CPU_IMPL() == IMPL_SPITFIRE)
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.120 src/sys/arch/sparc64/sparc64/cpu.c:1.121
--- src/sys/arch/sparc64/sparc64/cpu.c:1.120 Wed Nov 5 13:30:11 2014
+++ src/sys/arch/sparc64/sparc64/cpu.c Fri Dec 5 11:34:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $ */
+/* $NetBSD: cpu.c,v 1.121 2014/12/05 11:34:00 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.121 2014/12/05 11:34:00 nakayama Exp $);
#include opt_multiprocessor.h
@@ -276,7 +276,6 @@ cpu_attach(device_t parent, device_t dev
struct cpu_info *ci;
const char *sep;
register int i, l;
- uint64_t ver;
int bigcache, cachesize;
char buf[100];
int totalsize = 0;
@@ -341,11 +340,10 @@ cpu_attach(device_t parent, device_t dev
aprint_normal(: %s, CPU id %d\n, buf, ci-ci_cpuid);
aprint_naive(\n);
if (CPU_ISSUN4U || CPU_ISSUN4US) {
- ver = getver();
aprint_normal_dev(dev, manuf %x, impl %x, mask %x\n,
- (u_int)((ver VER_MANUF) VER_MANUF_SHIFT),
- (u_int)((ver VER_IMPL) VER_IMPL_SHIFT),
- (u_int)((ver VER_MASK) VER_MASK_SHIFT));
+ (u_int)GETVER_CPU_MANUF(),
+ (u_int)GETVER_CPU_IMPL(),
+ (u_int)GETVER_CPU_MASK());
}
if (ci-ci_system_clockrate[0] != 0) {
@@ -485,7 +483,6 @@ int
cpu_myid(void)
{
char buf[32];
- int impl;
if (CPU_ISSUN4V) {
uint64_t myid;
@@ -495,8 +492,7 @@ cpu_myid(void)
if (OF_getprop(findroot(), name, buf, sizeof(buf)) 0
strcmp(buf, SUNW,Ultra-Enterprise-1) == 0)
return lduwa(0x1fff4d0UL, ASI_PHYS_NON_CACHED);
- impl = (getver() VER_IMPL) VER_IMPL_SHIFT;
- switch (impl) {
+ switch (GETVER_CPU_IMPL()) {
case IMPL_OLYMPUS_C:
case IMPL_JUPITER:
return CPU_JUPITERID;
