CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Feb 5 08:23:12 UTC 2012
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
-Wextra -Wno-unused-parameter
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.105 src/sys/arch/hp700/hp700/machdep.c:1.106
--- src/sys/arch/hp700/hp700/machdep.c:1.105 Fri Jan 27 18:52:56 2012
+++ src/sys/arch/hp700/hp700/machdep.c Sun Feb 5 08:23:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.105 2012/01/27 18:52:56 para Exp $ */
+/* $NetBSD: machdep.c,v 1.106 2012/02/05 08:23:11 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.105 2012/01/27 18:52:56 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.106 2012/02/05 08:23:11 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -259,11 +259,11 @@ struct fpreg lwp0_fpregs;
/* Our exported CPU info */
struct cpu_info cpus[HPPA_MAXCPUS] = {
- {
#ifdef MULTIPROCESSOR
+ {
.ci_curlwp = lwp0,
-#endif
},
+#endif
};
struct vm_map *phys_map = NULL;
@@ -324,21 +324,21 @@ const struct hppa_cpu_info cpu_types[] =
hpcx, 0,
0, 1.0,
desidhash_x, itlb_x, dtlb_x, itlbna_x, dtlbna_x, tlbd_x,
- ibtlb_g, NULL, pbtlb_g }, /* XXXNH check */
+ ibtlb_g, NULL, pbtlb_g, NULL }, /* XXXNH check */
#endif
#ifdef HP7000_CPU
{ PA7000, NULL, PCXS,
hpcxs, 0,
0, 1.1a,
desidhash_s, itlb_s, dtlb_s, itlbna_s, dtlbna_s, tlbd_s,
- ibtlb_g, NULL, pbtlb_g },
+ ibtlb_g, NULL, pbtlb_g, NULL },
#endif
#ifdef HP7100_CPU
{ PA7100, T-Bird, PCXT,
hpcxt, 0,
HPPA_FTRS_BTLBU, 1.1b,
desidhash_t, itlb_t, dtlb_t, itlbna_t, dtlbna_t, tlbd_t,
- ibtlb_g, NULL, pbtlb_g },
+ ibtlb_g, NULL, pbtlb_g, NULL },
#endif
#ifdef HP7100LC_CPU
{ PA7100LC, Hummingbird, PCXL,
@@ -352,7 +352,7 @@ const struct hppa_cpu_info cpu_types[] =
hpcxtp, HPPA_CPU_PCXT2,
HPPA_FTRS_BTLBU, 1.1d,
desidhash_t, itlb_t, dtlb_t, itlbna_t, dtlbna_t, tlbd_t,
- ibtlb_g, NULL, pbtlb_g },
+ ibtlb_g, NULL, pbtlb_g, NULL },
#endif
#ifdef HP7300LC_CPU
{ PA7300LC, Velociraptor, PCXL2,
@@ -366,49 +366,49 @@ const struct hppa_cpu_info cpu_types[] =
hpcxu, HPPA_CPU_PCXU,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8200_CPU
{ PA8200, Vulcan, PCXU+,
hpcxup, HPPA_CPU_PCXUP,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8500_CPU
{ PA8500, Barra'Cuda, PCXW,
hpcxw, HPPA_CPU_PCXW,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8600_CPU
{ PA8600, Landshark, PCXW+,
hpcxwp, HPPA_CPU_PCXW2 /*XXX NH */,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8700_CPU
{ PA8700, Piranha, PCXW2,
hpcxw2, HPPA_CPU_PCXW2,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8800_CPU
{ PA8800, Mako, Make,
mako, HPPA_CPU_PCXW2,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
#ifdef HP8900_CPU
{ PA8900, Shortfin, Shortfin,
mako, HPPA_CPU_PCXW2,
HPPA_FTRS_W32B, 2.0,
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
- ibtlb_u, NULL, pbtlb_u },
+ ibtlb_u, NULL, pbtlb_u, NULL },
#endif
{ }
};
@@ -2031,7 +2031,9 @@ struct blink_lcd_softc {
SLIST_HEAD(, blink_lcd) bls_head;
int bls_on;
struct callout bls_to;
-} blink_sc = { SLIST_HEAD_INITIALIZER(bls_head), 0 };
+} blink_sc = {
+ .bls_head = SLIST_HEAD_INITIALIZER(bls_head)
+};
void
blink_lcd_register(struct blink_lcd *l)
CVS commit: [yamt-pagecache] src/sys/miscfs/genfs
Module Name:src
Committed By: yamt
Date: Sun Feb 5 08:23:41 UTC 2012
Modified Files:
src/sys/miscfs/genfs [yamt-pagecache]: genfs_io.c
Log Message:
genfs_gop_write_rwmap: comment
To generate a diff of this commit:
cvs rdiff -u -r1.53.2.11 -r1.53.2.12 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.53.2.11 src/sys/miscfs/genfs/genfs_io.c:1.53.2.12
--- src/sys/miscfs/genfs/genfs_io.c:1.53.2.11 Sun Feb 5 05:01:26 2012
+++ src/sys/miscfs/genfs/genfs_io.c Sun Feb 5 08:23:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.53.2.11 2012/02/05 05:01:26 yamt Exp $ */
+/* $NetBSD: genfs_io.c,v 1.53.2.12 2012/02/05 08:23:41 yamt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.11 2012/02/05 05:01:26 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.12 2012/02/05 08:23:41 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1333,8 +1333,17 @@ genfs_gop_write(struct vnode *vp, struct
return error;
}
+/*
+ * genfs_gop_write_rwmap:
+ *
+ * a variant of genfs_gop_write. it's used by UDF for its directory buffers.
+ * this maps pages with PROT_WRITE so that VOP_STRATEGY can modifies
+ * the contents before writing it out to the underlying storage.
+ */
+
int
-genfs_gop_write_rwmap(struct vnode *vp, struct vm_page **pgs, int npages, int flags)
+genfs_gop_write_rwmap(struct vnode *vp, struct vm_page **pgs, int npages,
+int flags)
{
off_t off;
vaddr_t kva;
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Feb 5 08:24:43 UTC 2012
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
Use __arrarycount(cpu_types) to bound the table search and not NULL
check. The NULL check was wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.106 src/sys/arch/hp700/hp700/machdep.c:1.107
--- src/sys/arch/hp700/hp700/machdep.c:1.106 Sun Feb 5 08:23:11 2012
+++ src/sys/arch/hp700/hp700/machdep.c Sun Feb 5 08:24:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.106 2012/02/05 08:23:11 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.107 2012/02/05 08:24:43 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.106 2012/02/05 08:23:11 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.107 2012/02/05 08:24:43 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -410,7 +410,6 @@ const struct hppa_cpu_info cpu_types[] =
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
ibtlb_u, NULL, pbtlb_u, NULL },
#endif
- { }
};
void
@@ -649,7 +648,7 @@ cpuid(void)
const struct hppa_cpu_info *p = NULL;
const char *model;
u_int cpu_version, cpu_features;
- int error;
+ int error, i;
/* may the scientific guessing begin */
cpu_type = hpc_unknown;
@@ -786,21 +785,25 @@ cpuid(void)
pmap_hptsize = 0;
}
- if (cpu_version)
- for (p = cpu_types; p-hci_chip_name; p++) {
+ if (cpu_version) {
+ for (i = 0, p = cpu_types; i __arraycount(cpu_types);
+ i++, p++) {
if (p-hci_cpuversion == cpu_version)
break;
}
- else if (cpu_type != hpc_unknown)
- for (p = cpu_types; p-hci_chip_name; p++) {
+ } else if (cpu_type != hpc_unknown) {
+ for (i = 0, p = cpu_types; i __arraycount(cpu_types);
+ i++, p++) {
if (p-hci_cputype == cpu_type)
break;
}
- else
- for (p = cpu_types; p-hci_chip_name; p++) {
+ } else {
+ for (i = 0, p = cpu_types; i __arraycount(cpu_types);
+ i++, p++) {
if (p-hci_features == cpu_features)
break;
}
+ }
hppa_cpu_info = p;
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Feb 5 08:27:37 UTC 2012
Modified Files:
src/sys/arch/hp700/hp700: conf.c
Log Message:
-Wextra -Wno-unused-parameter
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/hp700/conf.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/hp700/hp700/conf.c
diff -u src/sys/arch/hp700/hp700/conf.c:1.9 src/sys/arch/hp700/hp700/conf.c:1.10
--- src/sys/arch/hp700/hp700/conf.c:1.9 Sun Dec 11 12:17:24 2005
+++ src/sys/arch/hp700/hp700/conf.c Sun Feb 5 08:27:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.9 2005/12/11 12:17:24 christos Exp $ */
+/* $NetBSD: conf.c,v 1.10 2012/02/05 08:27:37 skrll Exp $ */
/* $OpenBSD: conf.c,v 1.15 2001/09/28 02:53:13 mickey Exp $ */
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: conf.c,v 1.9 2005/12/11 12:17:24 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: conf.c,v 1.10 2012/02/05 08:27:37 skrll Exp $);
#include sys/param.h
#include sys/conf.h
@@ -54,6 +54,6 @@ struct consdev constab[] = {
#if NCOM 0
cons_init(com),
#endif
- { 0 }
+ { .cn_probe = NULL }
};
CVS commit: src/sys/arch/hp700
Module Name:src
Committed By: skrll
Date: Sun Feb 5 08:31:53 UTC 2012
Modified Files:
src/sys/arch/hp700/dev: cpudevs_data.h devlist2h.awk
src/sys/arch/hp700/hp700: autoconf.c
Log Message:
Use __arraycount on hppa_knownmods rather than end-of-table record.
OK riz@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/dev/cpudevs_data.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/dev/devlist2h.awk
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hp700/hp700/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/hp700/dev/cpudevs_data.h
diff -u src/sys/arch/hp700/dev/cpudevs_data.h:1.6 src/sys/arch/hp700/dev/cpudevs_data.h:1.7
--- src/sys/arch/hp700/dev/cpudevs_data.h:1.6 Sat Feb 4 17:05:38 2012
+++ src/sys/arch/hp700/dev/cpudevs_data.h Sun Feb 5 08:31:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpudevs_data.h,v 1.6 2012/02/04 17:05:38 skrll Exp $ */
+/* $NetBSD: cpudevs_data.h,v 1.7 2012/02/05 08:31:53 skrll Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -354,4 +354,3 @@
{HPPA_TYPE_FABRIC, HPPA_FABRIC_DNACA, Halfdome DNA Central Agent },
{HPPA_TYPE_FABRIC, HPPA_FABRIC_TOGO, Halfdome TOGO Fabric Crossbar },
{HPPA_TYPE_FABRIC, HPPA_FABRIC_SAKURA, Halfdome Sakura Fabric Router },
-{ -1 }
Index: src/sys/arch/hp700/dev/devlist2h.awk
diff -u src/sys/arch/hp700/dev/devlist2h.awk:1.5 src/sys/arch/hp700/dev/devlist2h.awk:1.6
--- src/sys/arch/hp700/dev/devlist2h.awk:1.5 Thu Apr 30 07:01:26 2009
+++ src/sys/arch/hp700/dev/devlist2h.awk Sun Feb 5 08:31:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: devlist2h.awk,v 1.5 2009/04/30 07:01:26 skrll Exp $
+# $NetBSD: devlist2h.awk,v 1.6 2012/02/05 08:31:53 skrll Exp $
# $OpenBSD: devlist2h.awk,v 1.6 2004/04/07 18:24:19 mickey Exp $
@@ -122,7 +122,6 @@ END {
print(unterminated comment at the EOF\n);
exit(1);
}
- printf({ -1 }\n) cpud;
close(cpud)
close(cpuh)
}
Index: src/sys/arch/hp700/hp700/autoconf.c
diff -u src/sys/arch/hp700/hp700/autoconf.c:1.43 src/sys/arch/hp700/hp700/autoconf.c:1.44
--- src/sys/arch/hp700/hp700/autoconf.c:1.43 Fri Jan 13 07:05:57 2012
+++ src/sys/arch/hp700/hp700/autoconf.c Sun Feb 5 08:31:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.43 2012/01/13 07:05:57 skrll Exp $ */
+/* $NetBSD: autoconf.c,v 1.44 2012/02/05 08:31:53 skrll Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@@ -86,7 +86,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.43 2012/01/13 07:05:57 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.44 2012/02/05 08:31:53 skrll Exp $);
#include opt_kgdb.h
#include opt_useleds.h
@@ -649,15 +649,21 @@ hppa_mod_info(int type, int sv)
{
const struct hppa_mod_info *mi;
static char fakeid[32];
+ int i;
- for (mi = hppa_knownmods; mi-mi_type = 0
- (mi-mi_type != type || mi-mi_sv != sv); mi++);
+ for (i = 0, mi = hppa_knownmods; i __arraycount(hppa_knownmods);
+ i++, mi++) {
+ if (mi-mi_type == type mi-mi_sv == sv) {
+ break;
+ }
+ }
- if (mi-mi_type 0) {
+ if (i == __arraycount(hppa_knownmods)) {
sprintf(fakeid, type %x, sv %x, type, sv);
return fakeid;
- } else
- return mi-mi_name;
+ }
+
+ return mi-mi_name;
}
/*
CVS commit: src/sys/uvm
Module Name:src
Committed By: rmind
Date: Sun Feb 5 11:08:07 UTC 2012
Modified Files:
src/sys/uvm: uvm_kmguard.c
Log Message:
uvm_kmguard_alloc: use vmem_addr_t, instead of vaddr_t.
Fixes the build on ports where vaddr_t is of different size.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/uvm/uvm_kmguard.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/uvm/uvm_kmguard.c
diff -u src/sys/uvm/uvm_kmguard.c:1.8 src/sys/uvm/uvm_kmguard.c:1.9
--- src/sys/uvm/uvm_kmguard.c:1.8 Sun Feb 5 03:40:07 2012
+++ src/sys/uvm/uvm_kmguard.c Sun Feb 5 11:08:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_kmguard.c,v 1.8 2012/02/05 03:40:07 rmind Exp $ */
+/* $NetBSD: uvm_kmguard.c,v 1.9 2012/02/05 11:08:06 rmind Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_kmguard.c,v 1.8 2012/02/05 03:40:07 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_kmguard.c,v 1.9 2012/02/05 11:08:06 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -97,8 +97,8 @@ uvm_kmguard_alloc(struct uvm_kmguard *kg
{
struct vm_page *pg;
vm_flag_t flags;
+ vmem_addr_t va;
void **p;
- vaddr_t va;
/*
* can't handle PAGE_SIZE allocations. let the caller handle it
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sun Feb 5 12:28:08 UTC 2012
Modified Files:
src/sys/kern [netbsd-5]: kern_fork.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1628):
sys/kern/kern_fork.c: revision 1.184 via patch
fork1: fix stop-on-fork case, lend a correct lock to LWP for LSSTOP state.
Fixes PR/44935.
To generate a diff of this commit:
cvs rdiff -u -r1.171.4.1 -r1.171.4.2 src/sys/kern/kern_fork.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/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.171.4.1 src/sys/kern/kern_fork.c:1.171.4.2
--- src/sys/kern/kern_fork.c:1.171.4.1 Sat Jun 18 16:35:51 2011
+++ src/sys/kern/kern_fork.c Sun Feb 5 12:28:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.171.4.1 2011/06/18 16:35:51 bouyer Exp $ */
+/* $NetBSD: kern_fork.c,v 1.171.4.2 2012/02/05 12:28:08 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.4.1 2011/06/18 16:35:51 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.4.2 2012/02/05 12:28:08 bouyer Exp $);
#include opt_ktrace.h
@@ -509,13 +509,15 @@ fork1(struct lwp *l1, int flags, int exi
p2-p_acflag = AFORK;
lwp_lock(l2);
if (p2-p_sflag PS_STOPFORK) {
+ struct schedstate_percpu *spc = l2-l_cpu-ci_schedstate;
p2-p_nrlwps = 0;
p2-p_stat = SSTOP;
p2-p_waited = 0;
p1-p_nstopchild++;
l2-l_stat = LSSTOP;
l2-l_flag |= tmp;
- lwp_unlock(l2);
+ KASSERT(l2-l_wchan == NULL);
+ lwp_unlock_to(l2, spc-spc_lwplock);
} else {
p2-p_nrlwps = 1;
p2-p_stat = SACTIVE;
@@ -524,7 +526,6 @@ fork1(struct lwp *l1, int flags, int exi
sched_enqueue(l2, false);
lwp_unlock(l2);
}
-
mutex_exit(p2-p_lock);
/*
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sun Feb 5 12:28:15 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-0]: kern_fork.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1628):
sys/kern/kern_fork.c: revision 1.184 via patch
fork1: fix stop-on-fork case, lend a correct lock to LWP for LSSTOP state.
Fixes PR/44935.
To generate a diff of this commit:
cvs rdiff -u -r1.171.8.1 -r1.171.8.2 src/sys/kern/kern_fork.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/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.171.8.1 src/sys/kern/kern_fork.c:1.171.8.2
--- src/sys/kern/kern_fork.c:1.171.8.1 Sat Jun 18 16:36:09 2011
+++ src/sys/kern/kern_fork.c Sun Feb 5 12:28:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.171.8.1 2011/06/18 16:36:09 bouyer Exp $ */
+/* $NetBSD: kern_fork.c,v 1.171.8.2 2012/02/05 12:28:14 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.8.1 2011/06/18 16:36:09 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.8.2 2012/02/05 12:28:14 bouyer Exp $);
#include opt_ktrace.h
@@ -509,13 +509,15 @@ fork1(struct lwp *l1, int flags, int exi
p2-p_acflag = AFORK;
lwp_lock(l2);
if (p2-p_sflag PS_STOPFORK) {
+ struct schedstate_percpu *spc = l2-l_cpu-ci_schedstate;
p2-p_nrlwps = 0;
p2-p_stat = SSTOP;
p2-p_waited = 0;
p1-p_nstopchild++;
l2-l_stat = LSSTOP;
l2-l_flag |= tmp;
- lwp_unlock(l2);
+ KASSERT(l2-l_wchan == NULL);
+ lwp_unlock_to(l2, spc-spc_lwplock);
} else {
p2-p_nrlwps = 1;
p2-p_stat = SACTIVE;
@@ -524,7 +526,6 @@ fork1(struct lwp *l1, int flags, int exi
sched_enqueue(l2, false);
lwp_unlock(l2);
}
-
mutex_exit(p2-p_lock);
/*
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sun Feb 5 12:28:20 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-1]: kern_fork.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1628):
sys/kern/kern_fork.c: revision 1.184 via patch
fork1: fix stop-on-fork case, lend a correct lock to LWP for LSSTOP state.
Fixes PR/44935.
To generate a diff of this commit:
cvs rdiff -u -r1.171.12.1 -r1.171.12.2 src/sys/kern/kern_fork.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/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.171.12.1 src/sys/kern/kern_fork.c:1.171.12.2
--- src/sys/kern/kern_fork.c:1.171.12.1 Sat Jun 18 16:35:56 2011
+++ src/sys/kern/kern_fork.c Sun Feb 5 12:28:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.171.12.1 2011/06/18 16:35:56 bouyer Exp $ */
+/* $NetBSD: kern_fork.c,v 1.171.12.2 2012/02/05 12:28:20 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.12.1 2011/06/18 16:35:56 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_fork.c,v 1.171.12.2 2012/02/05 12:28:20 bouyer Exp $);
#include opt_ktrace.h
@@ -509,13 +509,15 @@ fork1(struct lwp *l1, int flags, int exi
p2-p_acflag = AFORK;
lwp_lock(l2);
if (p2-p_sflag PS_STOPFORK) {
+ struct schedstate_percpu *spc = l2-l_cpu-ci_schedstate;
p2-p_nrlwps = 0;
p2-p_stat = SSTOP;
p2-p_waited = 0;
p1-p_nstopchild++;
l2-l_stat = LSSTOP;
l2-l_flag |= tmp;
- lwp_unlock(l2);
+ KASSERT(l2-l_wchan == NULL);
+ lwp_unlock_to(l2, spc-spc_lwplock);
} else {
p2-p_nrlwps = 1;
p2-p_stat = SACTIVE;
@@ -524,7 +526,6 @@ fork1(struct lwp *l1, int flags, int exi
sched_enqueue(l2, false);
lwp_unlock(l2);
}
-
mutex_exit(p2-p_lock);
/*
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:30:13 UTC 2012 Modified Files: src/sys/kern [netbsd-5]: vfs_bio.c Log Message: Pull up following revision(s) (requested by rmind in ticket #1718): sys/kern/vfs_bio.c: revision 1.233 sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.210.4.1 src/sys/kern/vfs_bio.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/kern/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.210 src/sys/kern/vfs_bio.c:1.210.4.1 --- src/sys/kern/vfs_bio.c:1.210 Thu Sep 11 09:14:46 2008 +++ src/sys/kern/vfs_bio.c Sun Feb 5 12:30:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.210.4.1 2012/02/05 12:30:13 bouyer Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -109,7 +109,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210.4.1 2012/02/05 12:30:13 bouyer Exp $); #include fs_ffs.h #include opt_bufcache.h @@ -1788,6 +1788,7 @@ sysctl_dobuf(SYSCTLFN_ARGS) break; } mutex_exit(bufcache_lock); + sysctl_relock(); goto retry; } dp += elem_size;
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:30:33 UTC 2012 Modified Files: src/sys/kern [netbsd-5-0]: vfs_bio.c Log Message: Pull up following revision(s) (requested by rmind in ticket #1718): sys/kern/vfs_bio.c: revision 1.233 sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.210.6.1 src/sys/kern/vfs_bio.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/kern/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.210 src/sys/kern/vfs_bio.c:1.210.6.1 --- src/sys/kern/vfs_bio.c:1.210 Thu Sep 11 09:14:46 2008 +++ src/sys/kern/vfs_bio.c Sun Feb 5 12:30:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.210.6.1 2012/02/05 12:30:33 bouyer Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -109,7 +109,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210.6.1 2012/02/05 12:30:33 bouyer Exp $); #include fs_ffs.h #include opt_bufcache.h @@ -1788,6 +1788,7 @@ sysctl_dobuf(SYSCTLFN_ARGS) break; } mutex_exit(bufcache_lock); + sysctl_relock(); goto retry; } dp += elem_size;
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:30:38 UTC 2012 Modified Files: src/sys/kern [netbsd-5-1]: vfs_bio.c Log Message: Pull up following revision(s) (requested by rmind in ticket #1718): sys/kern/vfs_bio.c: revision 1.233 sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.210.10.1 src/sys/kern/vfs_bio.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/kern/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.210 src/sys/kern/vfs_bio.c:1.210.10.1 --- src/sys/kern/vfs_bio.c:1.210 Thu Sep 11 09:14:46 2008 +++ src/sys/kern/vfs_bio.c Sun Feb 5 12:30:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.210.10.1 2012/02/05 12:30:38 bouyer Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -109,7 +109,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.210.10.1 2012/02/05 12:30:38 bouyer Exp $); #include fs_ffs.h #include opt_bufcache.h @@ -1788,6 +1788,7 @@ sysctl_dobuf(SYSCTLFN_ARGS) break; } mutex_exit(bufcache_lock); + sysctl_relock(); goto retry; } dp += elem_size;
CVS commit: [netbsd-5] src/sys/net
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:34:56 UTC 2012 Modified Files: src/sys/net [netbsd-5]: route.c Log Message: Pull up following revision(s) (requested by christos in ticket #1721): sys/net/route.c: revision 1.126 Count length from the beginning of the structure not the sa_data portion. =46rom skrll@ To generate a diff of this commit: cvs rdiff -u -r1.113.4.1 -r1.113.4.2 src/sys/net/route.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/route.c diff -u src/sys/net/route.c:1.113.4.1 src/sys/net/route.c:1.113.4.2 --- src/sys/net/route.c:1.113.4.1 Fri Apr 3 17:59:03 2009 +++ src/sys/net/route.c Sun Feb 5 12:34:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $ */ +/* $NetBSD: route.c,v 1.113.4.2 2012/02/05 12:34:55 bouyer Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ #include opt_route.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.2 2012/02/05 12:34:55 bouyer Exp $); #include sys/param.h #include sys/sysctl.h @@ -847,8 +847,8 @@ rt_maskedcopy(const struct sockaddr *src const char *netmaskp = netmask-sa_data[0], *srcp = src-sa_data[0]; char *dstp = dst-sa_data[0]; - const char *maskend = dstp + MIN(netmask-sa_len, src-sa_len); - const char *srcend = dstp + src-sa_len; + const char *maskend = (char *)dst + MIN(netmask-sa_len, src-sa_len); + const char *srcend = (char *)dst + src-sa_len; dst-sa_len = src-sa_len; dst-sa_family = src-sa_family;
CVS commit: [netbsd-5-0] src/sys/net
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:35:10 UTC 2012 Modified Files: src/sys/net [netbsd-5-0]: route.c Log Message: Pull up following revision(s) (requested by christos in ticket #1721): sys/net/route.c: revision 1.126 Count length from the beginning of the structure not the sa_data portion. =46rom skrll@ To generate a diff of this commit: cvs rdiff -u -r1.113.4.1 -r1.113.4.1.2.1 src/sys/net/route.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/route.c diff -u src/sys/net/route.c:1.113.4.1 src/sys/net/route.c:1.113.4.1.2.1 --- src/sys/net/route.c:1.113.4.1 Fri Apr 3 17:59:03 2009 +++ src/sys/net/route.c Sun Feb 5 12:35:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $ */ +/* $NetBSD: route.c,v 1.113.4.1.2.1 2012/02/05 12:35:10 bouyer Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ #include opt_route.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1.2.1 2012/02/05 12:35:10 bouyer Exp $); #include sys/param.h #include sys/sysctl.h @@ -847,8 +847,8 @@ rt_maskedcopy(const struct sockaddr *src const char *netmaskp = netmask-sa_data[0], *srcp = src-sa_data[0]; char *dstp = dst-sa_data[0]; - const char *maskend = dstp + MIN(netmask-sa_len, src-sa_len); - const char *srcend = dstp + src-sa_len; + const char *maskend = (char *)dst + MIN(netmask-sa_len, src-sa_len); + const char *srcend = (char *)dst + src-sa_len; dst-sa_len = src-sa_len; dst-sa_family = src-sa_family;
CVS commit: [netbsd-5-1] src/sys/net
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:35:15 UTC 2012 Modified Files: src/sys/net [netbsd-5-1]: route.c Log Message: Pull up following revision(s) (requested by christos in ticket #1721): sys/net/route.c: revision 1.126 Count length from the beginning of the structure not the sa_data portion. =46rom skrll@ To generate a diff of this commit: cvs rdiff -u -r1.113.4.1 -r1.113.4.1.6.1 src/sys/net/route.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/route.c diff -u src/sys/net/route.c:1.113.4.1 src/sys/net/route.c:1.113.4.1.6.1 --- src/sys/net/route.c:1.113.4.1 Fri Apr 3 17:59:03 2009 +++ src/sys/net/route.c Sun Feb 5 12:35:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $ */ +/* $NetBSD: route.c,v 1.113.4.1.6.1 2012/02/05 12:35:15 bouyer Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ #include opt_route.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1 2009/04/03 17:59:03 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: route.c,v 1.113.4.1.6.1 2012/02/05 12:35:15 bouyer Exp $); #include sys/param.h #include sys/sysctl.h @@ -847,8 +847,8 @@ rt_maskedcopy(const struct sockaddr *src const char *netmaskp = netmask-sa_data[0], *srcp = src-sa_data[0]; char *dstp = dst-sa_data[0]; - const char *maskend = dstp + MIN(netmask-sa_len, src-sa_len); - const char *srcend = dstp + src-sa_len; + const char *maskend = (char *)dst + MIN(netmask-sa_len, src-sa_len); + const char *srcend = (char *)dst + src-sa_len; dst-sa_len = src-sa_len; dst-sa_family = src-sa_family;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:45:40 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: tickets 1628, 1718, 1721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.135 src/doc/CHANGES-5.2:1.1.2.136 --- src/doc/CHANGES-5.2:1.1.2.135 Sat Feb 4 17:10:02 2012 +++ src/doc/CHANGES-5.2 Sun Feb 5 12:45:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.135 2012/02/04 17:10:02 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.136 2012/02/05 12:45:40 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6010,3 +6010,21 @@ sys/dev/ic/mpt_netbsd.c1.17 drives do not have write cache enabled. [mhitch, ticket #1720] +sys/kern/kern_fork.c1.184 via patch + + fork1: fix stop-on-fork case, lend a correct lock to LWP for + LSSTOP state. + Fixes PR/44935. + [rmind, ticket #1628] + +sys/kern/vfs_bio.c1.233 + + sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. + [rmind, ticket #1718] + +sys/net/route.c 1.126 + + Count length from the beginning of the structure not the sa_data + portion. + [christos, ticket #1721] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:45:54 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1628, 1718, 1721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.60 src/doc/CHANGES-5.0.3:1.1.2.61 --- src/doc/CHANGES-5.0.3:1.1.2.60 Fri Jan 27 19:32:31 2012 +++ src/doc/CHANGES-5.0.3 Sun Feb 5 12:45:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.60 2012/01/27 19:32:31 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.61 2012/02/05 12:45:54 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2923,3 +2923,21 @@ crypto/dist/ssh/auth-options.c patch Prevent minor information disclosure in ssh. [drochner, ticket #1717] +sys/kern/kern_fork.c1.184 via patch + + fork1: fix stop-on-fork case, lend a correct lock to LWP for + LSSTOP state. + Fixes PR/44935. + [rmind, ticket #1628] + +sys/kern/vfs_bio.c1.233 + + sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. + [rmind, ticket #1718] + +sys/net/route.c 1.126 + + Count length from the beginning of the structure not the sa_data + portion. + [christos, ticket #1721] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Sun Feb 5 12:46:16 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: tickets 1628, 1718, 1721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.1 src/doc/CHANGES-5.1.3:1.1.2.2 --- src/doc/CHANGES-5.1.3:1.1.2.1 Sat Feb 4 20:16:58 2012 +++ src/doc/CHANGES-5.1.3 Sun Feb 5 12:46:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.1 2012/02/04 20:16:58 snj Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.2 2012/02/05 12:46:16 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -9,3 +9,21 @@ sys/sys/param.h patched by hand Welcome to 5.1.2_PATCH. [snj] +sys/kern/kern_fork.c1.184 via patch + + fork1: fix stop-on-fork case, lend a correct lock to LWP for + LSSTOP state. + Fixes PR/44935. + [rmind, ticket #1628] + +sys/kern/vfs_bio.c1.233 + + sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827. + [rmind, ticket #1718] + +sys/net/route.c 1.126 + + Count length from the beginning of the structure not the sa_data + portion. + [christos, ticket #1721] +
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: skrll Date: Sun Feb 5 13:26:01 UTC 2012 Modified Files: src/external/gpl3/gdb/dist/gdb: mipsnbsd-nat.c Log Message: Fix build of gdb7 for mips. It's not used at present. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.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/gpl3/gdb/dist/gdb/mipsnbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.2 src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.3 --- src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.2 Sun Jan 22 20:27:28 2012 +++ src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c Sun Feb 5 13:26:01 2012 @@ -86,7 +86,7 @@ mipsnbsd_store_inferior_registers (struc mipsnbsd_fill_reg (regcache, (char *) regs, regno); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, TIDGET (inferior_ptid).) == -1) + (PTRACE_TYPE_ARG3) regs, TIDGET (inferior_ptid)) == -1) perror_with_name (_(Couldn't write registers)); if (regno != -1)
CVS commit: src
Module Name:src Committed By: dholland Date: Sun Feb 5 14:14:44 UTC 2012 Modified Files: src/usr.bin/quota: quota.c src/usr.sbin/repquota: repquota.c Log Message: Remove unneeded #include. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/quota/quota.c cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/repquota/repquota.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.bin/quota/quota.c diff -u src/usr.bin/quota/quota.c:1.47 src/usr.bin/quota/quota.c:1.48 --- src/usr.bin/quota/quota.c:1.47 Wed Feb 1 17:48:10 2012 +++ src/usr.bin/quota/quota.c Sun Feb 5 14:14:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: quota.c,v 1.47 2012/02/01 17:48:10 dholland Exp $ */ +/* $NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: quota.c,v 1.47 2012/02/01 17:48:10 dholland Exp $); +__RCSID($NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $); #endif #endif /* not lint */ @@ -71,7 +71,6 @@ __RCSID($NetBSD: quota.c,v 1.47 2012/02 #include unistd.h #include quota.h -#include quota/quota.h #include printquota.h Index: src/usr.sbin/repquota/repquota.c diff -u src/usr.sbin/repquota/repquota.c:1.41 src/usr.sbin/repquota/repquota.c:1.42 --- src/usr.sbin/repquota/repquota.c:1.41 Wed Feb 1 17:48:10 2012 +++ src/usr.sbin/repquota/repquota.c Sun Feb 5 14:14:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: repquota.c,v 1.41 2012/02/01 17:48:10 dholland Exp $ */ +/* $NetBSD: repquota.c,v 1.42 2012/02/05 14:14:44 dholland Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)repquota.c 8.2 (Berkeley) 11/22/94; #else -__RCSID($NetBSD: repquota.c,v 1.41 2012/02/01 17:48:10 dholland Exp $); +__RCSID($NetBSD: repquota.c,v 1.42 2012/02/05 14:14:44 dholland Exp $); #endif #endif /* not lint */ @@ -64,7 +64,6 @@ __RCSID($NetBSD: repquota.c,v 1.41 2012 #include string.h #include unistd.h -#include quota/quota.h #include quota.h #include printquota.h
CVS commit: src
Module Name:src
Committed By: dholland
Date: Sun Feb 5 14:19:06 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/include: Makefile
src/sys/lib/libkern: Makefile.libkern
src/sys/ufs/ufs: quota2.h quota2_subr.c ufs_quota2.c
Removed Files:
src/common/include/quota: Makefile quota.h quotaprop.h
src/common/lib/libquota: Makefile.inc quotaprop.c quotasubr.c
Log Message:
Migrate one last leftover bit (used only by the kernel now) to
sys/ufs/ufs and remove the old quota headers and no-longer-used shared
code. Ok by releng.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/common/include/quota/Makefile
cvs rdiff -u -r1.5 -r0 src/common/include/quota/quota.h
cvs rdiff -u -r1.4 -r0 src/common/include/quota/quotaprop.h
cvs rdiff -u -r1.1 -r0 src/common/lib/libquota/Makefile.inc
cvs rdiff -u -r1.2 -r0 src/common/lib/libquota/quotaprop.c \
src/common/lib/libquota/quotasubr.c
cvs rdiff -u -r1.979 -r1.980 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1729 -r1.1730 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.137 -r1.138 src/include/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/ufs/quota2.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ufs/quota2_subr.c
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/ufs/ufs_quota2.c
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.979 src/distrib/sets/lists/base/mi:1.980
--- src/distrib/sets/lists/base/mi:1.979 Fri Feb 3 22:18:04 2012
+++ src/distrib/sets/lists/base/mi Sun Feb 5 14:19:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.979 2012/02/03 22:18:04 joerg Exp $
+# $NetBSD: mi,v 1.980 2012/02/05 14:19:04 dholland Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -889,7 +889,7 @@
./usr/include/ppathbase-c-usr
./usr/include/propbase-c-usr
./usr/include/protocolsbase-c-usr
-./usr/include/quotabase-c-usr
+./usr/include/quotabase-obsolete obsolete
./usr/include/readlinebase-c-usr
./usr/include/rpcbase-c-usr
./usr/include/rpcsvcbase-c-usr
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1729 src/distrib/sets/lists/comp/mi:1.1730
--- src/distrib/sets/lists/comp/mi:1.1729 Wed Feb 1 05:34:38 2012
+++ src/distrib/sets/lists/comp/mi Sun Feb 5 14:19:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1729 2012/02/01 05:34:38 dholland Exp $
+# $NetBSD: mi,v 1.1730 2012/02/05 14:19:05 dholland Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2215,8 +2215,8 @@
./usr/include/puffsdump.h comp-puffs-include
./usr/include/pwd.hcomp-c-include
./usr/include/quota.hcomp-c-include
-./usr/include/quota/quota.h comp-c-include
-./usr/include/quota/quotaprop.h comp-c-include
+./usr/include/quota/quota.h comp-obsolete obsolete
+./usr/include/quota/quotaprop.h comp-obsolete obsolete
./usr/include/radlib.hcomp-c-include
./usr/include/radlib_vs.h comp-c-include
./usr/include/randomid.h comp-c-include
Index: src/include/Makefile
diff -u src/include/Makefile:1.137 src/include/Makefile:1.138
--- src/include/Makefile:1.137 Mon Jan 9 15:19:45 2012
+++ src/include/Makefile Sun Feb 5 14:19:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2012/01/09 15:19:45 dholland Exp $
+# $NetBSD: Makefile,v 1.138 2012/02/05 14:19:02 dholland Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -45,7 +45,6 @@ INCSDIR= /usr/include
SUBDIR= rpc
SUBDIR+= ../common/include/prop
SUBDIR+= ../common/include/ppath
-SUBDIR+= ../common/include/quota
.include bsd.prog.mk
.include bsd.subdir.mk
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.16 src/sys/lib/libkern/Makefile.libkern:1.17
--- src/sys/lib/libkern/Makefile.libkern:1.16 Fri Jan 20 00:25:29 2012
+++ src/sys/lib/libkern/Makefile.libkern Sun Feb 5 14:19:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.16 2012/01/20 00:25:29 joerg Exp $
+# $NetBSD: Makefile.libkern,v 1.17 2012/02/05 14:19:03 dholland Exp $
#
# Variable definitions for libkern.
@@ -33,7 +33,6 @@ CPPFLAGS+= -I$M ${KERNCPPFLAGS} ${KERNMI
.include ${.PARSEDIR}/../../../common/lib/libutil/Makefile.inc
.include ${.PARSEDIR}/../../../common/lib/libprop/Makefile.inc
.include ${.PARSEDIR}/../../../common/lib/libppath/Makefile.inc
-.include ${.PARSEDIR}/../../../common/lib/libquota/Makefile.inc
CPPFLAGS+= -I${KERNDIR}/../../../common/include
Index: src/sys/ufs/ufs/quota2.h
diff -u src/sys/ufs/ufs/quota2.h:1.8 src/sys/ufs/ufs/quota2.h:1.9
--- src/sys/ufs/ufs/quota2.h:1.8 Sun Jan 29 07:20:27 2012
+++ src/sys/ufs/ufs/quota2.h Sun Feb 5 14:19:04 2012
@@ -1,4 +1,4 @@
-/*
CVS commit: src/sys/arch/usermode/include
Module Name:src Committed By: reinoud Date: Sun Feb 5 14:27:09 UTC 2012 Modified Files: src/sys/arch/usermode/include: asm.h bswap.h byte_swap.h cdefs.h disklabel.h elf_machdep.h endian.h endian_machdep.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h limits.h netbsd32_machdep.h param.h ptrace.h wchar_limits.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/include/asm.h \ src/sys/arch/usermode/include/bswap.h \ src/sys/arch/usermode/include/byte_swap.h \ src/sys/arch/usermode/include/elf_machdep.h \ src/sys/arch/usermode/include/endian.h \ src/sys/arch/usermode/include/endian_machdep.h \ src/sys/arch/usermode/include/int_const.h \ src/sys/arch/usermode/include/int_fmtio.h \ src/sys/arch/usermode/include/int_limits.h \ src/sys/arch/usermode/include/int_mwgwtypes.h \ src/sys/arch/usermode/include/int_types.h \ src/sys/arch/usermode/include/limits.h \ src/sys/arch/usermode/include/netbsd32_machdep.h \ src/sys/arch/usermode/include/wchar_limits.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/cdefs.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/include/disklabel.h \ src/sys/arch/usermode/include/ptrace.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/include/param.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/usermode/include/asm.h diff -u src/sys/arch/usermode/include/asm.h:1.8 src/sys/arch/usermode/include/asm.h:1.9 --- src/sys/arch/usermode/include/asm.h:1.8 Thu Feb 2 11:12:40 2012 +++ src/sys/arch/usermode/include/asm.h Sun Feb 5 14:27:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: asm.h,v 1.8 2012/02/02 11:12:40 reinoud Exp $ */ +/* $NetBSD: asm.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Fri Jan 27 08:34:26 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ASM_H Index: src/sys/arch/usermode/include/bswap.h diff -u src/sys/arch/usermode/include/bswap.h:1.8 src/sys/arch/usermode/include/bswap.h:1.9 --- src/sys/arch/usermode/include/bswap.h:1.8 Thu Feb 2 11:12:40 2012 +++ src/sys/arch/usermode/include/bswap.h Sun Feb 5 14:27:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: bswap.h,v 1.8 2012/02/02 11:12:40 reinoud Exp $ */ +/* $NetBSD: bswap.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Fri Jan 27 08:34:26 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_BSWAP_H Index: src/sys/arch/usermode/include/byte_swap.h diff -u src/sys/arch/usermode/include/byte_swap.h:1.8 src/sys/arch/usermode/include/byte_swap.h:1.9 --- src/sys/arch/usermode/include/byte_swap.h:1.8 Thu Feb 2 11:12:40 2012 +++ src/sys/arch/usermode/include/byte_swap.h Sun Feb 5 14:27:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: byte_swap.h,v 1.8 2012/02/02 11:12:40 reinoud Exp $ */ +/* $NetBSD: byte_swap.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Fri Jan 27 08:34:26 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_BYTE_SWAP_H Index: src/sys/arch/usermode/include/elf_machdep.h diff -u src/sys/arch/usermode/include/elf_machdep.h:1.8 src/sys/arch/usermode/include/elf_machdep.h:1.9 --- src/sys/arch/usermode/include/elf_machdep.h:1.8 Thu Feb 2 11:12:40 2012 +++ src/sys/arch/usermode/include/elf_machdep.h Sun Feb 5 14:27:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: elf_machdep.h,v 1.8 2012/02/02 11:12:40 reinoud Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Fri Jan 27 08:34:26 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ELF_MACHDEP_H Index: src/sys/arch/usermode/include/endian.h diff -u src/sys/arch/usermode/include/endian.h:1.8 src/sys/arch/usermode/include/endian.h:1.9 --- src/sys/arch/usermode/include/endian.h:1.8 Thu Feb 2 11:12:40 2012 +++ src/sys/arch/usermode/include/endian.h Sun Feb 5 14:27:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: endian.h,v 1.8 2012/02/02 11:12:40 reinoud Exp $ */ +/* $NetBSD: endian.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Fri Jan 27 08:34:26 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 15:25:57 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ENDIAN_H Index: src/sys/arch/usermode/include/endian_machdep.h diff -u src/sys/arch/usermode/include/endian_machdep.h:1.8 src/sys/arch/usermode/include/endian_machdep.h:1.9 ---
CVS commit: src/sys/uvm
Module Name:src
Committed By: rmind
Date: Sun Feb 5 16:08:28 UTC 2012
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
- sys_swapctl: validate the number of swap devices argument for SWAP_STATS.
- uvm_swap_stats: fix a buffer overrun, add some asserts.
Reviewed by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.160 src/sys/uvm/uvm_swap.c:1.161
--- src/sys/uvm/uvm_swap.c:1.160 Sat Jan 28 00:00:06 2012
+++ src/sys/uvm/uvm_swap.c Sun Feb 5 16:08:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.160 2012/01/28 00:00:06 rmind Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.161 2012/02/05 16:08:28 rmind Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_swap.c,v 1.160 2012/01/28 00:00:06 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_swap.c,v 1.161 2012/02/05 16:08:28 rmind Exp $);
#include opt_uvmhist.h
#include opt_compat_netbsd.h
@@ -398,8 +398,7 @@ swaplist_trim(void)
{
struct swappri *spp, *nextspp;
- for (spp = LIST_FIRST(swap_priority); spp != NULL; spp = nextspp) {
- nextspp = LIST_NEXT(spp, spi_swappri);
+ LIST_FOREACH_SAFE(spp, swap_priority, spi_swappri, nextspp) {
if (CIRCLEQ_FIRST(spp-spi_swapdev) !=
(void *)spp-spi_swapdev)
continue;
@@ -454,20 +453,11 @@ sys_swapctl(struct lwp *l, const struct
struct swapent *sep;
#define SWAP_PATH_MAX (PATH_MAX + 1)
char *userpath;
- size_t len;
+ size_t len = 0;
int error, misc;
int priority;
UVMHIST_FUNC(sys_swapctl); UVMHIST_CALLED(pdhist);
- misc = SCARG(uap, misc);
-
- userpath = kmem_alloc(SWAP_PATH_MAX, KM_SLEEP);
-
- /*
- * ensure serialized syscall access by grabbing the swap_syscall_lock
- */
- rw_enter(swap_syscall_lock, RW_WRITER);
-
/*
* we handle the non-priv NSWAP and STATS request first.
*
@@ -475,13 +465,20 @@ sys_swapctl(struct lwp *l, const struct
* [can also be obtained with uvmexp sysctl]
*/
if (SCARG(uap, cmd) == SWAP_NSWAP) {
- UVMHIST_LOG(pdhist, - done SWAP_NSWAP=%d, uvmexp.nswapdev,
- 0, 0, 0);
- *retval = uvmexp.nswapdev;
- error = 0;
- goto out;
+ const int nswapdev = uvmexp.nswapdev;
+ UVMHIST_LOG(pdhist, - done SWAP_NSWAP=%d, nswapdev, 0, 0, 0);
+ *retval = nswapdev;
+ return 0;
}
+ misc = SCARG(uap, misc);
+ userpath = kmem_alloc(SWAP_PATH_MAX, KM_SLEEP);
+
+ /*
+ * ensure serialized syscall access by grabbing the swap_syscall_lock
+ */
+ rw_enter(swap_syscall_lock, RW_WRITER);
+
/*
* SWAP_STATS: get stats on current # of configured swap devs
*
@@ -500,6 +497,12 @@ sys_swapctl(struct lwp *l, const struct
) {
if ((size_t)misc (size_t)uvmexp.nswapdev)
misc = uvmexp.nswapdev;
+
+ if (misc == 0) {
+ error = EINVAL;
+ goto out;
+ }
+ KASSERT(misc 0);
#if defined(COMPAT_13)
if (SCARG(uap, cmd) == SWAP_STATS13)
len = sizeof(struct swapent13) * misc;
@@ -561,6 +564,7 @@ sys_swapctl(struct lwp *l, const struct
if (SCARG(uap, cmd) == SWAP_ON
copystr(miniroot, userpath, SWAP_PATH_MAX, len))
panic(swapctl: miniroot copy failed);
+ KASSERT(len 0);
} else {
struct pathbuf *pb;
@@ -656,9 +660,10 @@ sys_swapctl(struct lwp *l, const struct
swaplist_insert(sdp, spp, priority);
mutex_exit(uvm_swap_data_lock);
+ KASSERT(len 0);
sdp-swd_pathlen = len;
- sdp-swd_path = kmem_alloc(sdp-swd_pathlen, KM_SLEEP);
- if (copystr(userpath, sdp-swd_path, sdp-swd_pathlen, 0) != 0)
+ sdp-swd_path = kmem_alloc(len, KM_SLEEP);
+ if (copystr(userpath, sdp-swd_path, len, 0) != 0)
panic(swapctl: copystr);
/*
@@ -737,12 +742,13 @@ uvm_swap_stats(int cmd, struct swapent *
int count = 0;
LIST_FOREACH(spp, swap_priority, spi_swappri) {
- for (sdp = CIRCLEQ_FIRST(spp-spi_swapdev);
- sdp != (void *)spp-spi_swapdev sec-- 0;
- sdp = CIRCLEQ_NEXT(sdp, swd_next)) {
+ CIRCLEQ_FOREACH(sdp, spp-spi_swapdev, swd_next) {
int inuse;
- /*
+ if (sec-- = 0)
+break;
+
+ /*
* backwards compatibility for system call.
* For NetBSD 1.3 and 5.0, we have to use
* the 32 bit dev_t. For 5.0 and -current
@@ -759,8 +765,9 @@ uvm_swap_stats(int cmd, struct swapent *
sep-se_nblks = sdp-swd_nblks;
sep-se_inuse = inuse;
sep-se_priority = sdp-swd_priority;
-memcpy(sep-se_path, sdp-swd_path,
- sizeof sep-se_path);
+KASSERT(sdp-swd_pathlen
+sizeof(sep-se_path));
+strcpy(sep-se_path, sdp-swd_path);
sep++;
#if defined(COMPAT_13)
} else if (cmd == SWAP_STATS13) {
@@ -784,8 +791,9 @@ uvm_swap_stats(int cmd, struct swapent *
sep50-se50_nblks = sdp-swd_nblks;
sep50-se50_inuse = inuse;
sep50-se50_priority = sdp-swd_priority;
-memcpy(sep50-se50_path, sdp-swd_path,
-
CVS commit: src/gnu/dist/gcc4/gcc/config/vax
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:34:34 UTC 2012
Modified Files:
src/gnu/dist/gcc4/gcc/config/vax: vax.c vax.md
Log Message:
Use REG_P, CONST_INT_P, and gcc_unreachable.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/gnu/dist/gcc4/gcc/config/vax/vax.c
cvs rdiff -u -r1.14 -r1.15 src/gnu/dist/gcc4/gcc/config/vax/vax.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config/vax/vax.c
diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.17 src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.18
--- src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.17 Thu Feb 2 18:33:03 2012
+++ src/gnu/dist/gcc4/gcc/config/vax/vax.c Sun Feb 5 17:34:34 2012
@@ -1097,14 +1097,14 @@ vax_output_int_move (rtx insn ATTRIBUTE_
|| GET_CODE (XEXP (operands[0], 0)) == PRE_DEC
|| GET_CODE (XEXP (operands[0], 0)) == POST_INC
|| !illegal_addsub_di_memory_operand (operands[0], DImode))
- ((GET_CODE (operands[1]) == CONST_INT
+ ((CONST_INT_P (operands[1])
(unsigned HOST_WIDE_INT) INTVAL (operands[1]) = 64)
|| GET_CODE (operands[1]) == CONST_DOUBLE))
{
hi[0] = operands[0];
hi[1] = operands[1];
- split_quadword_operands(insn, SET, hi, lo, 2);
+ split_quadword_operands (insn, SET, hi, lo, 2);
pattern_lo = vax_output_int_move (NULL, lo, SImode);
pattern_hi = vax_output_int_move (NULL, hi, SImode);
@@ -1549,12 +1549,12 @@ mkrtx(enum rtx_code code, enum machine_m
rtx b = XEXP (base, 1);
if (GET_CODE (b) == CONST)
b = XEXP (b, 0);
- if (GET_CODE (b) == CONST_INT)
+ if (CONST_INT_P (b))
{
off += INTVAL (b);
base = a;
}
- else if (GET_CODE (a) == REG GET_CODE (b) == SYMBOL_REF)
+ else if (REG_P (a) GET_CODE (b) == SYMBOL_REF)
{
if (off != 0)
{
@@ -1562,7 +1562,7 @@ mkrtx(enum rtx_code code, enum machine_m
off = 0;
}
}
- else if (GET_CODE (a) == REG GET_CODE (b) == PLUS)
+ else if (REG_P (a) GET_CODE (b) == PLUS)
{
off += INTVAL (XEXP (b, 1));
base = gen_rtx_PLUS (Pmode, a, plus_constant(XEXP (b, 0), off));
@@ -1570,8 +1570,8 @@ mkrtx(enum rtx_code code, enum machine_m
}
else
{
- print_rtl(stderr, base); fprintf(stderr, \n);
- gcc_assert(0);
+ debug_rtx(base);
+ gcc_unreachable ();
}
}
if (code == POST_INC)
Index: src/gnu/dist/gcc4/gcc/config/vax/vax.md
diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.14 src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.15
--- src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.14 Tue Jul 27 16:30:38 2010
+++ src/gnu/dist/gcc4/gcc/config/vax/vax.md Sun Feb 5 17:34:34 2012
@@ -191,7 +191,7 @@
*
{
- if (GET_CODE (operands[1]) == CONST_INT)
+ if (CONST_INT_P (operands[1]))
{
int i = INTVAL (operands[1]);
if (i == 0)
@@ -212,7 +212,7 @@
*
{
- if (GET_CODE (operands[1]) == CONST_INT)
+ if (CONST_INT_P (operands[1]))
{
int i = INTVAL (operands[1]);
if (i == 0)
@@ -565,14 +565,14 @@
rtx op1 = operands[1];
/* If there is a constant argument, complement that one. */
- if (GET_CODE (operands[2]) == CONST_INT GET_CODE (op1) != CONST_INT)
+ if (CONST_INT_P (operands[2]) ! CONST_INT_P (op1))
{
operands[1] = operands[2];
operands[2] = op1;
op1 = operands[1];
}
- if (GET_CODE (op1) == CONST_INT)
+ if (CONST_INT_P (op1))
operands[1] = GEN_INT (~INTVAL (op1));
else
operands[1] = expand_unop (MODEmode, one_cmpl_optab, op1, 0, 1);
@@ -658,7 +658,7 @@
{
- if (GET_CODE (operands[2]) != CONST_INT)
+ if (! CONST_INT_P (operands[2]))
operands[2] = gen_rtx_NEG (QImode, negate_rtx (QImode, operands[2]));
})
@@ -685,8 +685,7 @@
{
if (operands[2] == const1_rtx rtx_equal_p (operands[0], operands[1]))
return \addl2 %0,%0\;
- if (GET_CODE (operands[1]) == REG
- GET_CODE (operands[2]) == CONST_INT)
+ if (REG_P (operands[1]) CONST_INT_P (operands[2]))
{
int i = INTVAL (operands[2]);
if (i == 1)
@@ -760,7 +759,7 @@
{
- if (GET_CODE (operands[2]) != CONST_INT)
+ if (! CONST_INT_P (operands[2]))
operands[2] = gen_rtx_NEG (QImode, negate_rtx (QImode, operands[2]));
})
@@ -806,7 +805,7 @@
(match_operand:SI 3 general_operand g))]
(INTVAL (operands[1]) == 8 || INTVAL (operands[1]) == 16)
INTVAL (operands[2]) % INTVAL (operands[1]) == 0
-(GET_CODE (operands[0]) == REG
+(REG_P (operands[0])
|| ! mode_dependent_address_p (XEXP (operands[0], 0)))
*
{
@@ -834,7 +833,7 @@
(match_operand:SI 3 const_int_operand n)))]
(INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16)
INTVAL (operands[3]) % INTVAL (operands[2]) == 0
-(GET_CODE (operands[1]) == REG
+(REG_P (operands[1])
|| ! mode_dependent_address_p (XEXP (operands[1], 0)))
*
{
@@ -861,7
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src Committed By: matt Date: Sun Feb 5 17:37:19 UTC 2012 Modified Files: src/external/gpl3/gcc/dist/gcc/config/vax: constraints.md Log Message: Constraint 'T' needs to be a CONSTANT_P so add a match_test for that. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md 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/gcc/dist/gcc/config/vax/constraints.md diff -u src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md:1.2 --- src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md:1.1.1.1 Tue Jun 21 01:22:25 2011 +++ src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md Sun Feb 5 17:37:19 2012 @@ -113,5 +113,6 @@ (define_constraint T @internal satisfies CONSTANT_P and, if pic is enabled, is not a SYMBOL_REF, LABEL_REF, or CONST. - (ior (not (match_code const,symbol_ref,label_ref)) - (match_test !flag_pic))) + (and (match_test CONSTANT_P (op)) + (ior (not (match_code const,symbol_ref,label_ref)) + (match_test !flag_pic
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:38:21 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax: vax.c vax.md
Log Message:
Use REG_P, CONST_INT_P, and gcc_unreachable().
Bring forward movememsi from gcc4.1
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md
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/gcc/dist/gcc/config/vax/vax.c
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.2
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.1.1.1 Tue Jun 21 01:22:25 2011
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.c Sun Feb 5 17:38:21 2012
@@ -300,7 +300,10 @@ print_operand_address (FILE * file, rtx
addr = XEXP (addr, 1);
}
else
- gcc_unreachable ();
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
+ }
if (REG_P (addr))
{
@@ -311,9 +314,8 @@ print_operand_address (FILE * file, rtx
}
else if (GET_CODE (addr) == MULT)
ireg = addr;
- else
+ else if (GET_CODE (addr) == PLUS)
{
- gcc_assert (GET_CODE (addr) == PLUS);
if (CONSTANT_ADDRESS_P (XEXP (addr, 0))
|| MEM_P (XEXP (addr, 0)))
{
@@ -321,11 +323,15 @@ print_operand_address (FILE * file, rtx
{
if (CONST_INT_P (offset))
offset = plus_constant (XEXP (addr, 0), INTVAL (offset));
- else
+ else if (CONST_INT_P (XEXP (addr, 0)))
{
- gcc_assert (CONST_INT_P (XEXP (addr, 0)));
offset = plus_constant (offset, INTVAL (XEXP (addr, 0)));
}
+ else
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
+ }
}
offset = XEXP (addr, 0);
}
@@ -336,12 +342,15 @@ print_operand_address (FILE * file, rtx
else
reg1 = XEXP (addr, 0);
}
- else
+ else if (GET_CODE (XEXP (addr, 0)) == MULT !ireg)
{
- gcc_assert (GET_CODE (XEXP (addr, 0)) == MULT);
- gcc_assert (!ireg);
ireg = XEXP (addr, 0);
}
+ else
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
+ }
if (CONSTANT_ADDRESS_P (XEXP (addr, 1))
|| MEM_P (XEXP (addr, 1)))
@@ -365,12 +374,20 @@ print_operand_address (FILE * file, rtx
else
reg1 = XEXP (addr, 1);
}
- else
+ else if (GET_CODE (XEXP (addr, 1)) == MULT !ireg)
{
- gcc_assert (GET_CODE (XEXP (addr, 1)) == MULT);
- gcc_assert (!ireg);
ireg = XEXP (addr, 1);
}
+ else
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
+ }
+ }
+ else
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
}
/* If REG1 is nonzero, figure out if it is a base or index register. */
@@ -382,7 +399,11 @@ print_operand_address (FILE * file, rtx
(MEM_P (offset)
|| (flag_pic symbolic_operand (offset, SImode)
{
- gcc_assert (!ireg);
+ if (ireg)
+ {
+ debug_rtx (orig);
+ gcc_unreachable ();
+ }
ireg = reg1;
}
else
@@ -428,12 +449,17 @@ print_operand_address (FILE * file, rtx
{
if (GET_CODE (ireg) == MULT)
ireg = XEXP (ireg, 0);
- gcc_assert (REG_P (ireg));
+ if (! REG_P (ireg))
+ {
+ debug_rtx (orig);
+ output_operand_lossage (non-register index expression);
+ }
fprintf (file, [%s], reg_names[REGNO (ireg)]);
}
break;
default:
+ gcc_assert (! REG_P(addr));
output_addr_const (file, addr);
}
}
@@ -1566,6 +1592,111 @@ vax_output_int_subtract (rtx insn, rtx *
}
}
+static rtx
+mkrtx(enum rtx_code code, enum machine_mode mode, rtx base, HOST_WIDE_INT off)
+{
+ rtx tmp;
+
+ if (GET_CODE (base) == CONST)
+base = XEXP (base, 0);
+
+ if (GET_CODE (base) == PLUS)
+{
+ rtx a = XEXP (base, 0);
+ rtx b = XEXP (base, 1);
+ if (GET_CODE (b) == CONST)
+ b = XEXP (b, 0);
+ if (CONST_INT_P (b))
+ {
+ off += INTVAL (b);
+ base = a;
+ }
+ else if (REG_P (a) GET_CODE (b) == SYMBOL_REF)
+ {
+ if (off != 0)
+ {
+ base = gen_rtx_PLUS (Pmode, a, plus_constant(b, off));
+ off = 0;
+ }
+ }
+ else if (REG_P (a) GET_CODE (b) == PLUS)
+ {
+ off += INTVAL (XEXP (b, 1));
+ base = gen_rtx_PLUS (Pmode, a, plus_constant(XEXP (b, 0), off));
+ off = 0;
+ }
+ else
+{
+ debug_rtx(base);
+ gcc_unreachable ();
+ }
+}
+ if (code == POST_INC)
+tmp = gen_rtx_POST_INC (SImode, base);
+ else if (off == 0 || (REG_P (base) code == REG))
+tmp = base;
+ else
+tmp = plus_constant (base, off);
+ return gen_rtx_MEM (mode, tmp);
+}
+
+const char *
+vax_output_movmemsi (rtx insn, rtx *operands)
+{
+ HOST_WIDE_INT n = INTVAL (operands[2]);
+ HOST_WIDE_INT off;
+ rtx src, dest;
+ const char *pat = NULL;
CVS commit: src/sys/arch/usermode/include
Module Name:src
Committed By: reinoud
Date: Sun Feb 5 17:39:18 UTC 2012
Modified Files:
src/sys/arch/usermode/include: genheaders.sh
Log Message:
With the recent kmem changes, remove the `unlimited' maximum setting of
NKMEMPAGES from amd64 since it gets us into trouble.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/include/genheaders.sh
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/usermode/include/genheaders.sh
diff -u src/sys/arch/usermode/include/genheaders.sh:1.7 src/sys/arch/usermode/include/genheaders.sh:1.8
--- src/sys/arch/usermode/include/genheaders.sh:1.7 Sat Feb 4 23:04:15 2012
+++ src/sys/arch/usermode/include/genheaders.sh Sun Feb 5 17:39:18 2012
@@ -60,6 +60,9 @@ EOF
echo #define UPAGES 12 ${hdr}
echo #undef USPACE ${hdr}
echo #define USPACE (PAGE_SIZE*UPAGES) ${hdr}
+ echo ${hdr}
+ echo #undef NKMEMPAGES_MAX_UNLIMITED ${hdr}
+ echo #include \opt_kmempages.h\ ${hdr}
fi
echo ${hdr}
CVS commit: src/sys/arch/usermode/include
Module Name:src Committed By: reinoud Date: Sun Feb 5 17:40:08 UTC 2012 Modified Files: src/sys/arch/usermode/include: asm.h bswap.h byte_swap.h cdefs.h disklabel.h elf_machdep.h endian.h endian_machdep.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h limits.h netbsd32_machdep.h param.h ptrace.h wchar_limits.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/include/asm.h \ src/sys/arch/usermode/include/bswap.h \ src/sys/arch/usermode/include/byte_swap.h \ src/sys/arch/usermode/include/elf_machdep.h \ src/sys/arch/usermode/include/endian.h \ src/sys/arch/usermode/include/endian_machdep.h \ src/sys/arch/usermode/include/int_const.h \ src/sys/arch/usermode/include/int_fmtio.h \ src/sys/arch/usermode/include/int_limits.h \ src/sys/arch/usermode/include/int_mwgwtypes.h \ src/sys/arch/usermode/include/int_types.h \ src/sys/arch/usermode/include/limits.h \ src/sys/arch/usermode/include/netbsd32_machdep.h \ src/sys/arch/usermode/include/wchar_limits.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/include/cdefs.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/include/disklabel.h \ src/sys/arch/usermode/include/ptrace.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/include/param.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/usermode/include/asm.h diff -u src/sys/arch/usermode/include/asm.h:1.9 src/sys/arch/usermode/include/asm.h:1.10 --- src/sys/arch/usermode/include/asm.h:1.9 Sun Feb 5 14:27:08 2012 +++ src/sys/arch/usermode/include/asm.h Sun Feb 5 17:40:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: asm.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ +/* $NetBSD: asm.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 18:39:33 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ASM_H Index: src/sys/arch/usermode/include/bswap.h diff -u src/sys/arch/usermode/include/bswap.h:1.9 src/sys/arch/usermode/include/bswap.h:1.10 --- src/sys/arch/usermode/include/bswap.h:1.9 Sun Feb 5 14:27:08 2012 +++ src/sys/arch/usermode/include/bswap.h Sun Feb 5 17:40:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: bswap.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ +/* $NetBSD: bswap.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_BSWAP_H Index: src/sys/arch/usermode/include/byte_swap.h diff -u src/sys/arch/usermode/include/byte_swap.h:1.9 src/sys/arch/usermode/include/byte_swap.h:1.10 --- src/sys/arch/usermode/include/byte_swap.h:1.9 Sun Feb 5 14:27:08 2012 +++ src/sys/arch/usermode/include/byte_swap.h Sun Feb 5 17:40:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: byte_swap.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ +/* $NetBSD: byte_swap.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_BYTE_SWAP_H Index: src/sys/arch/usermode/include/elf_machdep.h diff -u src/sys/arch/usermode/include/elf_machdep.h:1.9 src/sys/arch/usermode/include/elf_machdep.h:1.10 --- src/sys/arch/usermode/include/elf_machdep.h:1.9 Sun Feb 5 14:27:08 2012 +++ src/sys/arch/usermode/include/elf_machdep.h Sun Feb 5 17:40:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: elf_machdep.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Sun Feb 5 15:25:56 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ELF_MACHDEP_H Index: src/sys/arch/usermode/include/endian.h diff -u src/sys/arch/usermode/include/endian.h:1.9 src/sys/arch/usermode/include/endian.h:1.10 --- src/sys/arch/usermode/include/endian.h:1.9 Sun Feb 5 14:27:08 2012 +++ src/sys/arch/usermode/include/endian.h Sun Feb 5 17:40:08 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: endian.h,v 1.9 2012/02/05 14:27:08 reinoud Exp $ */ +/* $NetBSD: endian.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */ /* - * Automatically generated by genheaders.sh on Sun Feb 5 15:25:57 CET 2012 + * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012 * Do not modify directly! */ #ifndef _USERMODE_ENDIAN_H Index: src/sys/arch/usermode/include/endian_machdep.h diff -u src/sys/arch/usermode/include/endian_machdep.h:1.9 src/sys/arch/usermode/include/endian_machdep.h:1.10 ---
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:40:48 UTC 2012
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-thread.c vaxbsd-nat.c
Log Message:
Deal with vax defining [an empty] struct fpreg;
Add supply_gregset and fill_gregset for nbsd-thread.c to vaxbsd-nat.c
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.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/gpl3/gdb/dist/gdb/nbsd-thread.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.8 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.9
--- src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.8 Wed Jan 25 16:48:44 2012
+++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Sun Feb 5 17:40:48 2012
@@ -42,10 +42,11 @@
#include observer.h
#include machine/reg.h
-#ifndef __sh3__
-#define HAVE_FPREGS
-#else
+#ifdef __sh3__
struct fpreg { };
+#elif defined(__vax__)
+#else
+#define HAVE_FPREGS
#endif
#ifndef HAVE_GREGSET_T
Index: src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.3 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.4
--- src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c:1.3 Sun Jan 22 20:27:28 2012
+++ src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c Sun Feb 5 17:40:48 2012
@@ -31,6 +31,10 @@
#include vax-tdep.h
#include inf-ptrace.h
+#ifndef HAVE_GREGSET_T
+typedef struct reg gregset_t;
+#endif
+
/* Supply the general-purpose registers stored in GREGS to REGCACHE. */
static void
@@ -60,6 +64,24 @@ vaxbsd_collect_gregset (const struct reg
}
}
+void
+supply_gregset (struct regcache *regcache, const gregset_t *gregs)
+{
+ if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+ (PTRACE_TYPE_ARG3) gregs, TIDGET (inferior_ptid)) == -1)
+perror_with_name (_(Couldn't write registers));
+}
+
+void
+fill_gregset (const struct regcache *regcache, gregset_t *gregs, int regnum)
+{
+ if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+ (PTRACE_TYPE_ARG3) gregs, TIDGET (inferior_ptid)) == -1)
+perror_with_name (_(Couldn't get registers));
+}
+
+
+/* Support for debugging kernel virtual memory images. */
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */
@@ -68,13 +90,11 @@ static void
vaxbsd_fetch_inferior_registers (struct target_ops *ops,
struct regcache *regcache, int regnum)
{
- struct reg regs;
+ gregset_t gregs;
- if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) regs, TIDGET (inferior_ptid)) == -1)
-perror_with_name (_(Couldn't get registers));
+ fill_gregset (regcache, gregs, regnum);
- vaxbsd_supply_gregset (regcache, regs);
+ vaxbsd_supply_gregset (regcache, gregs);
}
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
@@ -84,22 +104,16 @@ static void
vaxbsd_store_inferior_registers (struct target_ops *ops,
struct regcache *regcache, int regnum)
{
- struct reg regs;
+ gregset_t gregs;
- if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) regs, TIDGET (inferior_ptid)) == -1)
-perror_with_name (_(Couldn't get registers));
+ fill_gregset (regcache, gregs, regnum);
- vaxbsd_collect_gregset (regcache, regs, regnum);
+ vaxbsd_collect_gregset (regcache, gregs, regnum);
- if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) regs, TIDGET (inferior_ptid)) == -1)
-perror_with_name (_(Couldn't write registers));
+ supply_gregset (regcache, gregs);
}
-/* Support for debugging kernel virtual memory images. */
-
#include sys/types.h
#include machine/pcb.h
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:43:47 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/gcc: c-lex.c
Log Message:
Gcc emit overflows warnings on VAX when you try to use HUGE_VAL. Make these
warning supressable if -Wno-overflow is given.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/c-lex.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/gpl3/gcc/dist/gcc/c-lex.c
diff -u src/external/gpl3/gcc/dist/gcc/c-lex.c:1.1.1.1 src/external/gpl3/gcc/dist/gcc/c-lex.c:1.2
--- src/external/gpl3/gcc/dist/gcc/c-lex.c:1.1.1.1 Tue Jun 21 01:20:08 2011
+++ src/external/gpl3/gcc/dist/gcc/c-lex.c Sun Feb 5 17:43:47 2012
@@ -718,22 +718,25 @@ interpret_float (const cpp_token *token,
outside the range of representable values of its type. Since we
have __builtin_inf* to produce an infinity, this is now a
mandatory pedwarn if the target does not support infinities. */
- if (REAL_VALUE_ISINF (real)
- || (const_type != type REAL_VALUE_ISINF (real_trunc)))
+ if (warn_overflow)
{
- if (!MODE_HAS_INFINITIES (TYPE_MODE (type)))
- pedwarn (input_location, 0, floating constant exceeds range of %qT, type);
- else
- warning (OPT_Woverflow, floating constant exceeds range of %qT, type);
-}
- /* We also give a warning if the value underflows. */
- else if (REAL_VALUES_EQUAL (real, dconst0)
- || (const_type != type REAL_VALUES_EQUAL (real_trunc, dconst0)))
-{
- REAL_VALUE_TYPE realvoidmode;
- int overflow = real_from_string (realvoidmode, copy);
- if (overflow 0 || !REAL_VALUES_EQUAL (realvoidmode, dconst0))
- warning (OPT_Woverflow, floating constant truncated to zero);
+ if (REAL_VALUE_ISINF (real)
+ || (const_type != type REAL_VALUE_ISINF (real_trunc)))
+{
+ if (!MODE_HAS_INFINITIES (TYPE_MODE (type)))
+ pedwarn (input_location, 0, floating constant exceeds range of %qT, type);
+ else
+ warning (OPT_Woverflow, floating constant exceeds range of %qT, type);
+ }
+ /* We also give a warning if the value underflows. */
+ else if (REAL_VALUES_EQUAL (real, dconst0)
+ || (const_type != type REAL_VALUES_EQUAL (real_trunc, dconst0)))
+ {
+ REAL_VALUE_TYPE realvoidmode;
+ int overflow = real_from_string (realvoidmode, copy);
+ if (overflow 0 || !REAL_VALUES_EQUAL (realvoidmode, dconst0))
+ warning (OPT_Woverflow, floating constant truncated to zero);
+ }
}
/* Create a node with determined type and value. */
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Sun Feb 5 17:45:38 UTC 2012 Modified Files: src/sys/arch/vax/include: math.h Log Message: Define __INFINITY as huge_val since VAX FP doesn't have infinities. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/math.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/vax/include/math.h diff -u src/sys/arch/vax/include/math.h:1.5 src/sys/arch/vax/include/math.h:1.6 --- src/sys/arch/vax/include/math.h:1.5 Sun Dec 11 12:19:34 2005 +++ src/sys/arch/vax/include/math.h Sun Feb 5 17:45:38 2012 @@ -1,6 +1,15 @@ -/* $NetBSD: math.h,v 1.5 2005/12/11 12:19:34 christos Exp $ */ +/* $NetBSD: math.h,v 1.6 2012/02/05 17:45:38 matt Exp $ */ +#ifndef _VAX_MATH_H_ +#define _VAX_MATH_H_ + +#include sys/cdefs.h + +#if __GNUC_PREREQ__(3, 3) +#define __INFINITY __builtin_huge_valf() +#else #define __INFINITY 1.0E+39F +#endif #define __isinf(__x) (0) #define __isnan(__x) (0) @@ -15,3 +24,5 @@ #define FP_DIRTYZERO 0x80 #define FP_ROP 0x81 #endif + +#endif /* _VAX_MATH_H_ */
CVS commit: src/external/gpl3/gdb
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:47:30 UTC 2012
Modified Files:
src/external/gpl3/gdb: Makefile.inc
Log Message:
For VAX GCC, turn on -Wno-overflow to supress a GCC error.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/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/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.3 src/external/gpl3/gdb/Makefile.inc:1.4
--- src/external/gpl3/gdb/Makefile.inc:1.3 Tue Oct 11 15:18:09 2011
+++ src/external/gpl3/gdb/Makefile.inc Sun Feb 5 17:47:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2011/10/11 15:18:09 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2012/02/05 17:47:30 matt Exp $
USE_LIBEDIT=no
USE_TUI=yes
@@ -10,4 +10,8 @@ CWARNFLAGS.clang+= -Wno-unused-value -Wn
-Wno-format-security \
-Wno-tautological-compare -Wno-format-extra-args
+.if ${MACHINE} == vax
+CWARNFLAGS.gcc+= -Wno-overflow
+.endif
+
DIST= ${NETBSDSRCDIR}/external/gpl3/gdb/dist
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:52:55 UTC 2012
Modified Files:
src/tests/lib/libm: t_log.c
Log Message:
Change eps to fit within the VAX FP range.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_log.c
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/libm/t_log.c
diff -u src/tests/lib/libm/t_log.c:1.5 src/tests/lib/libm/t_log.c:1.6
--- src/tests/lib/libm/t_log.c:1.5 Sun Sep 18 04:49:11 2011
+++ src/tests/lib/libm/t_log.c Sun Feb 5 17:52:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_log.c,v 1.5 2011/09/18 04:49:11 jruoho Exp $ */
+/* $NetBSD: t_log.c,v 1.6 2012/02/05 17:52:55 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_log.c,v 1.5 2011/09/18 04:49:11 jruoho Exp $);
+__RCSID($NetBSD: t_log.c,v 1.6 2012/02/05 17:52:55 matt Exp $);
#include atf-c.h
#include stdio.h
@@ -684,7 +684,7 @@ ATF_TC_HEAD(log_base, tc)
ATF_TC_BODY(log_base, tc)
{
- const double eps = 1.0e-40;
+ const double eps = 1.0e-38;
if (fabs(log(M_E) - 1.0) eps)
atf_tc_fail_nonfatal(log(e) != 1);
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:55:13 UTC 2012
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Make this compilable by VAX GCC 4.5
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.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/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.4 src/external/public-domain/sqlite/dist/sqlite3.c:1.5
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.4 Sat Jan 28 23:55:36 2012
+++ src/external/public-domain/sqlite/dist/sqlite3.c Sun Feb 5 17:55:12 2012
@@ -7792,7 +7792,11 @@ SQLITE_PRIVATE void sqlite3HashClear(Has
# endif
#endif
#ifndef SQLITE_BIG_DBL
-# define SQLITE_BIG_DBL (1e99)
+# ifdef __vax__
+# define SQLITE_BIG_DBL (1e38)
+# else
+# define SQLITE_BIG_DBL (1e99)
+# endif
#endif
#ifndef SQLITE_HUGE_DBL
# define SQLITE_HUGE_DBL (1.0e+308)
@@ -21353,6 +21357,7 @@ do_atof_calc:
** and store in result. */
if( e ){
double scale = 1.0;
+#ifndef __vax__
/* attempt to handle extremely small/large numbers better */
if( e307 e342 ){
while( e%308 ) { scale *= 1.0e+1; e -= 1; }
@@ -21369,7 +21374,9 @@ do_atof_calc:
}else{
result = 1e308*1e308*s; /* Infinity */
}
- }else{
+ }else
+#endif
+ {
/* 1.0e+22 is the largest power of 10 than can be
** represented exactly. */
while( e%22 ) { scale *= 1.0e+1; e -= 1; }
@@ -132869,7 +132876,7 @@ SQLITE_API int sqlite3_extension_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.4 2012/01/28 23:55:36 joerg Exp $
+** $Id: sqlite3.c,v 1.5 2012/02/05 17:55:12 matt Exp $
**
** This file implements an integration between the ICU library
** (International Components for Unicode, an open-source library
CVS commit: src/include
Module Name:src Committed By: matt Date: Sun Feb 5 17:57:18 UTC 2012 Modified Files: src/include: math.h Log Message: Use __INFINITY in preference to __builtin_inff(). Currently only VAX defines __INFINITY and allows to use __builtin_huge_valf() instead since gcc4.5 will error out unconditionally if __builtin_inf() is used. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/include/math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/math.h diff -u src/include/math.h:1.56 src/include/math.h:1.57 --- src/include/math.h:1.56 Thu Jul 28 22:32:28 2011 +++ src/include/math.h Sun Feb 5 17:57:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: math.h,v 1.56 2011/07/28 22:32:28 joerg Exp $ */ +/* $NetBSD: math.h,v 1.57 2012/02/05 17:57:17 matt Exp $ */ /* * @@ -88,10 +88,10 @@ extern const union __long_double_u __inf #endif /* 7.12#4 INFINITY */ -#if __GNUC_PREREQ__(3, 3) -#define INFINITY __builtin_inff() -#elif defined(__INFINITY) +#if defined(__INFINITY) #define INFINITY __INFINITY /* float constant which overflows */ +#elif __GNUC_PREREQ__(3, 3) +#define INFINITY __builtin_inff() #else #define INFINITY HUGE_VALF /* positive infinity */ #endif /* __INFINITY */
CVS commit: src/sys/modules
Module Name:src
Committed By: christos
Date: Sun Feb 5 18:46:05 UTC 2012
Modified Files:
src/sys/modules/dm/dm_target_error: Makefile
src/sys/modules/dm/dm_target_mirror: Makefile
src/sys/modules/dm/dm_target_snapshot: Makefile
src/sys/modules/dm/dm_target_zero: Makefile
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
-D flags belong in CPPFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_error/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_mirror/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_snapshot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_zero/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/dm/dm_target_error/Makefile
diff -u src/sys/modules/dm/dm_target_error/Makefile:1.1 src/sys/modules/dm/dm_target_error/Makefile:1.2
--- src/sys/modules/dm/dm_target_error/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_error/Makefile Sun Feb 5 13:46:04 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:04 christos Exp $
.include ../../Makefile.inc
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_error
SRCS= dm_target_error.c
Index: src/sys/modules/dm/dm_target_mirror/Makefile
diff -u src/sys/modules/dm/dm_target_mirror/Makefile:1.1 src/sys/modules/dm/dm_target_mirror/Makefile:1.2
--- src/sys/modules/dm/dm_target_mirror/Makefile:1.1 Fri Jan 2 06:03:24 2009
+++ src/sys/modules/dm/dm_target_mirror/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 11:03:24 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include ../../Makefile.inc
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_mirror
SRCS= dm_target_mirror.c
Index: src/sys/modules/dm/dm_target_snapshot/Makefile
diff -u src/sys/modules/dm/dm_target_snapshot/Makefile:1.1 src/sys/modules/dm/dm_target_snapshot/Makefile:1.2
--- src/sys/modules/dm/dm_target_snapshot/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_snapshot/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include ../../Makefile.inc
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_snapshot
SRCS= dm_target_snapshot.c
Index: src/sys/modules/dm/dm_target_zero/Makefile
diff -u src/sys/modules/dm/dm_target_zero/Makefile:1.1 src/sys/modules/dm/dm_target_zero/Makefile:1.2
--- src/sys/modules/dm/dm_target_zero/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_zero/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include ../../Makefile.inc
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_zero
SRCS= dm_target_zero.c
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.2 src/sys/modules/zfs/Makefile.zfsmod:1.3
--- src/sys/modules/zfs/Makefile.zfsmod:1.2 Sat Feb 4 13:28:53 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Sun Feb 5 13:46:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.2 2012/02/04 18:28:53 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.3 2012/02/05 18:46:05 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -126,5 +126,5 @@ CPPFLAGS+= -std=c99
CPPFLAGS+= -D_NFS_NFS_H_
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CFLAGS+= -DDIAGNOSTIC
+CPPFLAGS+= -DDIAGNOSTIC
# -DZFS_DEBUG
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: matt Date: Sun Feb 5 19:30:43 UTC 2012 Modified Files: src/sys/arch/algor/conf: P5064-64 Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/conf/P5064-64 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/algor/conf/P5064-64 diff -u src/sys/arch/algor/conf/P5064-64:1.3 src/sys/arch/algor/conf/P5064-64:1.4 --- src/sys/arch/algor/conf/P5064-64:1.3 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/conf/P5064-64 Sun Feb 5 19:30:42 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P5064-64,v 1.3 2011/02/20 07:51:21 matt Exp $ +# $NetBSD: P5064-64,v 1.4 2012/02/05 19:30:42 matt Exp $ # # Algorithmics P-5064 kernel (64-bit). # @@ -8,5 +8,5 @@ include arch/algor/conf/P5064 include arch/algor/conf/std.algor64 no options SYMTAB_SPACE -options SYMTAB_SPACE=60 -#ident P5064-64-$Revision: 1.3 $ +options SYMTAB_SPACE=62 +#ident P5064-64-$Revision: 1.4 $
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Sun Feb 5 21:46:37 UTC 2012
Modified Files:
src/sys/arch/hp700/dev: pdc.c
Log Message:
Delay some things to attach time - pdc_init is too early.
Minor tidyup while I'm here.
OK riz@
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hp700/dev/pdc.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/hp700/dev/pdc.c
diff -u src/sys/arch/hp700/dev/pdc.c:1.40 src/sys/arch/hp700/dev/pdc.c:1.41
--- src/sys/arch/hp700/dev/pdc.c:1.40 Sat Oct 1 15:51:17 2011
+++ src/sys/arch/hp700/dev/pdc.c Sun Feb 5 21:46:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.40 2011/10/01 15:51:17 chs Exp $ */
+/* $NetBSD: pdc.c,v 1.41 2012/02/05 21:46:37 skrll Exp $ */
/* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.40 2011/10/01 15:51:17 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.41 2012/02/05 21:46:37 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -63,8 +63,8 @@ enum pdc_type pdc_type;
static struct pdc_result pdcret1 PDC_ALIGNMENT;
static struct pdc_result pdcret2 PDC_ALIGNMENT;
+static char pdc_consbuf[IODC_MINIOSIZ] PDC_ALIGNMENT;
-char pdc_consbuf[IODC_MINIOSIZ] PDC_ALIGNMENT;
iodcio_t pdc_cniodc, pdc_kbdiodc;
pz_device_t *pz_kbd, *pz_cons;
@@ -105,10 +105,6 @@ static int pdcsettod(todr_chip_handle_t,
void
pdc_init(void)
{
- static struct todr_chip_handle todr = {
- .todr_settime = pdcsettod,
- .todr_gettime = pdcgettod,
- };
static int kbd_iodc[IODC_MAXSIZE/sizeof(int)];
static int cn_iodc[IODC_MAXSIZE/sizeof(int)];
int err;
@@ -116,12 +112,11 @@ pdc_init(void)
pagezero_cookie = hp700_pagezero_map();
- /*
- * locore has updated pdc with (pdcio_t)PAGE0-mem_pdc
- */
pz_kbd = PAGE0-mem_kbd;
pz_cons = PAGE0-mem_cons;
+ pdc = (pdcio_t)PAGE0-mem_pdc;
+
/* XXX should we reset the console/kbd here?
well, /boot did that for us anyway */
if ((err = pdc_call((iodcio_t)pdc, 0, PDC_IODC, PDC_IODC_READ,
@@ -133,19 +128,13 @@ pdc_init(void)
#endif
}
+ hp700_pagezero_unmap(pagezero_cookie);
+
pdc_cniodc = (iodcio_t)cn_iodc;
pdc_kbdiodc = (iodcio_t)kbd_iodc;
/* XXX make pdc current console */
cn_tab = constab[0];
-
- cn_init_magic(pdc_cnm_state);
- cn_set_magic(+);
-
- hp700_pagezero_unmap(pagezero_cookie);
-
- /* attach the TOD clock */
- todr_attach(todr);
}
void
@@ -235,13 +224,22 @@ pdcmatch(device_t parent, cfdata_t cf, v
void
pdcattach(device_t parent, device_t self, void *aux)
{
+ static struct todr_chip_handle todr = {
+ .todr_settime = pdcsettod,
+ .todr_gettime = pdcgettod,
+ };
struct pdc_softc *sc = device_private(self);
sc-sc_dv = self;
pdc_attached = 1;
- if (!pdc)
- pdc_init();
+ KASSERT(pdc != NULL);
+
+ cn_init_magic(pdc_cnm_state);
+ cn_set_magic(+);
+
+ /* attach the TOD clock */
+ todr_attach(todr);
aprint_normal(\n);
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Mon Feb 6 00:37:52 UTC 2012
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5 npf_build.c
Log Message:
- Handle NPF rule procedures in the parser and thus re-enable them.
- Few small updates to the man page.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfctl/npf_build.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/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.7 src/usr.sbin/npf/npfctl/npf.conf.5:1.8
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.7 Sun Jan 8 22:14:55 2012
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Mon Feb 6 00:37:52 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.7 2012/01/08 22:14:55 christos Exp $
+.\$NetBSD: npf.conf.5,v 1.8 2012/02/06 00:37:52 rmind Exp $
.\
.\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd January 6, 2012
+.Dd February 5, 2012
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -80,20 +80,26 @@ which are applied for all packets of a c
.Pp
Definitions (prefixed with $) and tables (specified by an ID within
\*[Lt]\*[Gt] marks) can be used in the filter options of rules.
-.Ss Rule procedures and normalization
+.Ss Rule procedures and normalisation
Rule procedures are provided to perform packet transformations and various
additional procedures on the packets.
It should be noted that rule procedures are applied for the connections,
that is, both for packets which match the rule and for further packets
of the connection, which are passed without ruleset inspection.
Currently, two facilities are supported:
-traffic normalization and packet logging.
-Packet normalization has the following functionality:
-IP ID randomization, IP_DF flag cleansing, TCP minimum TTL enforcement,
+traffic normalisation and packet logging.
+Packet normalisation has the following functionality:
+IP ID randomisation, IP_DF flag cleansing, TCP minimum TTL enforcement,
and maximum MSS enforcement (MSS clamping).
-If a matching rule is going to drop the packet, normalization functions
+If a matching rule is going to drop the packet, normalisation functions
are not performed.
Packet logging is performed both in packet passing and blocking cases.
+Note that the logging interface has to be created manually, using
+.Xr ifconfig 8
+routine, for example:
+.Pp
+ifconfig npflog0 create
+.Pp
.Ss Network address translation
Rules for address translation can be added.
Translation is performed on the specified interface, assigning the specified
@@ -150,10 +156,10 @@ group-opts = interface iface , [ in
ruleset = { rule1 \*[Lt]newline\*[Gt], rule2 \*[Lt]newline\*[Gt], ... }
rule = ( block block-opts | pass ) [ in | out ] [ quick ]
- [ on iface ] [ inet | inet6 ] [ proto \*[Lt]protocol\*[Gt] ]
- ( all | filt-opts [ flags \*[Lt]tcp_flags \*[Gt] )
- [ keep state ] [ apply rproc }
+ [ on iface ] [ family fam-opt ] [ proto \*[Lt]protocol\*[Gt] ]
+ ( all | filt-opts ) [ keep state ] [ apply rproc ] }
+fam-opt = [ inet | inet6 ]
block-opts = [ return-rst | return-icmp | return ]
filt-addr = iface | def | \*[Lt]addr/mask\*[Gt] | \*[Lt]tid\*[Gt]
port-opts = [ port ( \*[Lt]port-num\*[Gt] | \*[Lt]port-from\*[Gt] - \*[Lt]port-to\*[Gt] | def ) ]
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.3 src/usr.sbin/npf/npfctl/npf_build.c:1.4
--- src/usr.sbin/npf/npfctl/npf_build.c:1.3 Sun Feb 5 00:37:13 2012
+++ src/usr.sbin/npf/npfctl/npf_build.c Mon Feb 6 00:37:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_build.c,v 1.3 2012/02/05 00:37:13 rmind Exp $ */
+/* $NetBSD: npf_build.c,v 1.4 2012/02/06 00:37:52 rmind Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_build.c,v 1.3 2012/02/05 00:37:13 rmind Exp $);
+__RCSID($NetBSD: npf_build.c,v 1.4 2012/02/06 00:37:52 rmind Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -299,19 +299,85 @@ npfctl_build_ncode(nl_rule_t *rl, sa_fam
return true;
}
+static void
+npfctl_build_rpcall(nl_rproc_t *rp, const char *name, npfvar_t *args)
+{
+ /*
+ * XXX/TODO: Hardcoded for the first release. However,
+ * rule procedures will become fully dynamic modules.
+ */
+
+ bool log = false, norm = false;
+ bool rnd = false, no_df = false;
+ int minttl = 0, maxmss = 0;
+
+ if (strcmp(name, log) == 0) {
+ log = true;
+ } else if (strcmp(name, normalise) == 0) {
+ norm = true;
+ } else {
+ yyerror(unknown rule procedure '%s', name);
+ }
+
+ for (size_t i = 0; i npfvar_get_count(args); i++) {
+ module_arg_t *arg;
+ const char *aval;
+
+ arg = npfvar_get_data(args, NPFVAR_MODULE_ARG, i);
+
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Mon Feb 6 00:41:36 UTC 2012
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
Fix the family option in the grammar and example.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/npf/npfctl/npf.conf.5
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/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.8 src/usr.sbin/npf/npfctl/npf.conf.5:1.9
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.8 Mon Feb 6 00:37:52 2012
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Mon Feb 6 00:41:36 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.8 2012/02/06 00:37:52 rmind Exp $
+.\$NetBSD: npf.conf.5,v 1.9 2012/02/06 00:41:36 rmind Exp $
.\
.\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -156,7 +156,7 @@ group-opts = interface iface , [ in
ruleset = { rule1 \*[Lt]newline\*[Gt], rule2 \*[Lt]newline\*[Gt], ... }
rule = ( block block-opts | pass ) [ in | out ] [ quick ]
- [ on iface ] [ family fam-opt ] [ proto \*[Lt]protocol\*[Gt] ]
+ [ on iface ] [ family fam-opt ] [ proto \*[Lt]protocol\*[Gt] ]
( all | filt-opts ) [ keep state ] [ apply rproc ] }
fam-opt = [ inet | inet6 ]
@@ -200,7 +200,7 @@ group (name external, interface $ext_i
block in quick from \*[Lt]1\*[Gt]
pass out quick from $ext_if keep state apply rid
- pass in quick inet proto tcp to $ext_if port ssh apply log
+ pass in quick family inet proto tcp to $ext_if port ssh apply log
pass in quick proto tcp to $ext_if port $services_tcp
pass in quick proto udp to $ext_if port $services_udp
pass in quick proto tcp to $ext_if port 49151-65535 # Passive FTP
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Mon Feb 6 02:03:32 UTC 2012 Modified Files: src/sys/dev/ic: tpm.c Log Message: PR/45932: Pierre Pronchery: Fix the return values of the suspend and resume functions. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/tpm.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/tpm.c diff -u src/sys/dev/ic/tpm.c:1.6 src/sys/dev/ic/tpm.c:1.7 --- src/sys/dev/ic/tpm.c:1.6 Fri Feb 3 10:42:46 2012 +++ src/sys/dev/ic/tpm.c Sun Feb 5 21:03:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tpm.c,v 1.6 2012/02/03 15:42:46 christos Exp $ */ +/* $NetBSD: tpm.c,v 1.7 2012/02/06 02:03:32 christos Exp $ */ /* * Copyright (c) 2008, 2009 Michael Shalayeff * Copyright (c) 2009, 2010 Hans-Jörg Höxer @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tpm.c,v 1.6 2012/02/03 15:42:46 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: tpm.c,v 1.7 2012/02/06 02:03:32 christos Exp $); #if 0 #define TPM_DEBUG @@ -333,7 +333,7 @@ tpm_suspend(device_t dev, const pmf_qual #ifdef TPM_DEBUG aprint_debug_dev(sc-sc_dev, %s: power down\n, __func__); #endif - return 0; + return true; } /* @@ -347,7 +347,7 @@ tpm_resume(device_t dev, const pmf_qual_ struct tpm_softc *sc = device_private(dev); aprint_debug_dev(sc-sc_dev, %s: resume\n, __func__); #endif - return 0; + return true; } /* Wait for given status bits using polling. */
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: christos
Date: Mon Feb 6 04:29:47 UTC 2012
Modified Files:
src/sys/dev/isa: tpm_isa.c
Log Message:
PR/45932: Add missing braces... This will probably fix interrupts too!
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/tpm_isa.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/isa/tpm_isa.c
diff -u src/sys/dev/isa/tpm_isa.c:1.1 src/sys/dev/isa/tpm_isa.c:1.2
--- src/sys/dev/isa/tpm_isa.c:1.1 Sun Jan 22 01:44:28 2012
+++ src/sys/dev/isa/tpm_isa.c Sun Feb 5 23:29:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_isa.c,v 1.1 2012/01/22 06:44:28 christos Exp $ */
+/* $NetBSD: tpm_isa.c,v 1.2 2012/02/06 04:29:47 christos Exp $ */
/*
* Copyright (c) 2008, 2009 Michael Shalayeff
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tpm_isa.c,v 1.1 2012/01/22 06:44:28 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tpm_isa.c,v 1.2 2012/02/06 04:29:47 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -118,9 +118,10 @@ tpm_isa_attach(device_t parent, device_t
}
if ((rv = (*sc-sc_init)(sc, ia-ia_irq[0].ir_irq,
- device_xname(sc-sc_dev))) != 0)
+ device_xname(sc-sc_dev))) != 0) {
bus_space_unmap(sc-sc_bt, sc-sc_bh, size);
return;
+ }
/*
* Only setup interrupt handler when we have a vector and the
