Re: CVS commit: src
Matt Thomas m...@3am-software.com wrote: Only those ports which reserve a register in mcontext for the TCB pointer should define _UC_TLSBASE. Otherwise _UC_TLSBASE has no meaning and thus should not be defined. Well, we have the choice between: - define it and keeep it unused - not define it add add #ifdef in libpthread and tests I chose the second alternative, an unused #ifdef for a simplier code -- Emmanuel Dreyfus http://hcpnet.free.fr/pubz m...@netbsd.org
Re: CVS commit: src
On Sep 11, 2012, at 11:19 PM, Emmanuel Dreyfus wrote: Matt Thomas m...@3am-software.com wrote: Only those ports which reserve a register in mcontext for the TCB pointer should define _UC_TLSBASE. Otherwise _UC_TLSBASE has no meaning and thus should not be defined. Well, we have the choice between: - define it and keeep it unused - not define it add add #ifdef in libpthread and tests I chose the second alternative, an unused #ifdef for a simplier code In this case, I would prefer an #ifdef _UC_TLSBASE is an MD thing. Defining it unconditionally bloats things. For instance, if _UC_TLSBASE isn't defined, pthread_setcontext doesn't need to do anything except call setcontext. That's a win.
Re: CVS commit: src
On Tue, Sep 11, 2012 at 11:20:47PM -0700, Matt Thomas wrote: _UC_TLSBASE is an MD thing. iMO it is a MI interface with a MD implementation. It just says whether TLS is part of struct mcontext or not. The MD code can handle that in the kernel or in userland if that is possible. Defining it unconditionally bloats things. For instance, if _UC_TLSBASE isn't defined, pthread_setcontext doesn't need to do anything except call setcontext. That's a win. But do we have any port that are in this situation? I understand they all change the TLS pointer with setcontext. -- Emmanuel Dreyfus m...@netbsd.org
Re: CVS commit: src
In article 20120912072608.gr10...@homeworld.netbsd.org, Emmanuel Dreyfus m...@netbsd.org wrote: On Tue, Sep 11, 2012 at 11:20:47PM -0700, Matt Thomas wrote: _UC_TLSBASE is an MD thing. iMO it is a MI interface with a MD implementation. It just says whether TLS is part of struct mcontext or not. The MD code can handle that in the kernel or in userland if that is possible. Defining it unconditionally bloats things. For instance, if _UC_TLSBASE isn't defined, pthread_setcontext doesn't need to do anything except call setcontext. That's a win. But do we have any port that are in this situation? I understand they all change the TLS pointer with setcontext. This is orthogonal. I believe that in the discussion we had in core we decided to not define _UC_TLSBASE unconditionally, and that ports should define it as needed. If in the end all ports define _UC_TLSBASE, then the #ifdef code in libpthread can be removed, but even in that case I don't see the benefit. christos
Re: CVS commit: src
On Wed, Sep 12, 2012 at 01:00:52PM +, Christos Zoulas wrote: This is orthogonal. I believe that in the discussion we had in core we decided to not define _UC_TLSBASE unconditionally, and that ports should define it as needed. What does as needed mean here? Can you show an example of an arch not needing it? Martin
Re: CVS commit: src
On Sep 12, 4:04pm, mar...@duskware.de (Martin Husemann) wrote: -- Subject: Re: CVS commit: src | On Wed, Sep 12, 2012 at 01:00:52PM +, Christos Zoulas wrote: | This is orthogonal. I believe that in the discussion we had in core | we decided to not define _UC_TLSBASE unconditionally, and that ports | should define it as needed. | | What does as needed mean here? Can you show an example of an arch not | needing it? I don't have one. christos
Re: CVS commit: src (_UC_TLSBASE)
On Sep 12, 2012, at 12:26 AM, Emmanuel Dreyfus wrote: On Tue, Sep 11, 2012 at 11:20:47PM -0700, Matt Thomas wrote: _UC_TLSBASE is an MD thing. iMO it is a MI interface with a MD implementation. It just says whether TLS is part of struct mcontext or not. The MD code can handle that in the kernel or in userland if that is possible. Defining it unconditionally bloats things. For instance, if _UC_TLSBASE isn't defined, pthread_setcontext doesn't need to do anything except call setcontext. That's a win. But do we have any port that are in this situation? I understand they all change the TLS pointer with setcontext. Actually, several don't. arm doesn't, mips doesn't, vax doesn't, m68k doesn't. They may be others.
Re: CVS commit: src
On Sep 12, 2012, at 7:04 AM, Martin Husemann wrote: On Wed, Sep 12, 2012 at 01:00:52PM +, Christos Zoulas wrote: This is orthogonal. I believe that in the discussion we had in core we decided to not define _UC_TLSBASE unconditionally, and that ports should define it as needed. What does as needed mean here? Can you show an example of an arch not needing it? arm and mips for instance. They both have instructions that fetch the TCB pointer thus it's not kept in a specific register and not in the mcontext structure. So they don't need _UC_TLSBASE since it will never be present in the ucontext_t.
Re: CVS commit: src (_UC_TLSBASE)
On Wed, Sep 12, 2012 at 07:48:52AM -0700, Matt Thomas wrote:
Actually, several don't. arm doesn't, mips doesn't, vax doesn't,
m68k doesn't. They may be others.
Are we talking about the same things? All these ports arlready did
it conditionally on _UC_TLSBASE:
src/sys/arch/arm/arm/sig_machdep.c:
if ((flags _UC_TLSBASE) != 0)
lwp_setprivate(l, (void *)(uintptr_t)mcp-_mc_tlsbase);
src/sys/arch/mips/mips/cpu_subr.c:
/* Restore the private thread context */
if (flags _UC_TLSBASE) {
lwp_setprivate(l, (void *)(intptr_t)mcp-_mc_tlsbase);
}
src/sys/arch/vax/vax/machdep.c:
if (flags _UC_TLSBASE) {
void *tlsbase;
error = copyin((void *)tf-tf_sp, tlsbase, sizeof(tlsbase));
if (error) {
return error;
}
lwp_setprivate(l, tlsbase);
tf-tf_sp += sizeof(tlsbase);
}
src/sys/arch/m68k/m68k/sig_machdep.c:
if ((flags _UC_TLSBASE) != 0)
lwp_setprivate(l, (void *)(uintptr_t)mcp-_mc_tlsbase);
--
Emmanuel Dreyfus
m...@netbsd.org
Re: CVS commit: src/lib/libpthread
On Wed, Sep 12, 2012 at 02:55:48PM +, Matt Thomas wrote: Module Name: src Committed By: matt Date: Wed Sep 12 14:55:48 UTC 2012 Modified Files: src/lib/libpthread: pthread_specific.c Log Message: Only copy the ucontext_t in pthread_setcontext if _UC_TLSBASE is set. Conditionalize the test on _UC_TLSBASE being defined. Why not just define it to be zero if it isn't needed ? David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/lib/libpthread
On Sep 12, 2012, at 9:45 AM, David Laight wrote: On Wed, Sep 12, 2012 at 02:55:48PM +, Matt Thomas wrote: Module Name: src Committed By:matt Date:Wed Sep 12 14:55:48 UTC 2012 Modified Files: src/lib/libpthread: pthread_specific.c Log Message: Only copy the ucontext_t in pthread_setcontext if _UC_TLSBASE is set. Conditionalize the test on _UC_TLSBASE being defined. Why not just define it to be zero if it isn't needed ? lint will complain. :(
Re: CVS commit: [tls-maxphys] src
Hello, On Wed, Sep 12, 2012 at 06:15:37AM +, Thor Lancelot Simon wrote: Added Files: src [tls-maxphys]: MAXPHYS-NOTES Log Message: Initial snapshot of work to eliminate 64K MAXPHYS. Basically works for physio (I/O to raw devices); needs more doing to get it going with the filesystems, but it shouldn't damage data. All work's been done on amd64 so far. Not hard to add support to other ports. If others want to pitch in, one very helpful thing would be to sort out when and how IDE disks can do 128K or larger transfers, and adjust the various PCI IDE (or at least ahcisata) drivers and wd.c accordingly -- it would make testing much easier. Another very helpful thing would be to implement a smart minphys() for RAIDframe along the lines detailed in the MAXPHYS-NOTES file. glad to see you're working on this ! It's been something I've had in my TODO list for a while. I'll have a look at the IDE driver ASAP, getting it going shouldn't be too hard. -- Manuel Bouyer bou...@antioche.eu.org NetBSD: 26 ans d'experience feront toujours la difference --
CVS commit: [tls-maxphys] src
Module Name:src Committed By: tls Date: Wed Sep 12 06:15:36 UTC 2012 Modified Files: src/sys/arch/amd64/include [tls-maxphys]: param.h src/sys/arch/i386/pnpbios [tls-maxphys]: fdc_pnpbios.c lpt_pnpbios.c pciide_pnpbios.c pnpbios.c src/sys/dev/acpi [tls-maxphys]: acpi.c src/sys/dev/ic [tls-maxphys]: mpt_netbsd.c mpt_netbsd.h src/sys/dev/isa [tls-maxphys]: isa.c src/sys/dev/pci [tls-maxphys]: amr.c mlyvar.h mpt_pci.c pci.c pciide.c src/sys/dev/scsipi [tls-maxphys]: cd.c sd.c ss.c src/sys/kern [tls-maxphys]: kern_physio.c subr_autoconf.c subr_disk.c sys_descrip.c vfs_vnops.c vfs_wapbl.c src/sys/miscfs/genfs [tls-maxphys]: genfs_io.c src/sys/sys [tls-maxphys]: device.h disk.h mount.h src/sys/ufs/ffs [tls-maxphys]: ffs_vfsops.c src/sys/uvm [tls-maxphys]: uvm_io.c uvm_map.c uvm_readahead.c uvm_readahead.h Added Files: src [tls-maxphys]: MAXPHYS-NOTES Log Message: Initial snapshot of work to eliminate 64K MAXPHYS. Basically works for physio (I/O to raw devices); needs more doing to get it going with the filesystems, but it shouldn't damage data. All work's been done on amd64 so far. Not hard to add support to other ports. If others want to pitch in, one very helpful thing would be to sort out when and how IDE disks can do 128K or larger transfers, and adjust the various PCI IDE (or at least ahcisata) drivers and wd.c accordingly -- it would make testing much easier. Another very helpful thing would be to implement a smart minphys() for RAIDframe along the lines detailed in the MAXPHYS-NOTES file. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/MAXPHYS-NOTES cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/amd64/include/param.h cvs rdiff -u -r1.17 -r1.17.6.1 src/sys/arch/i386/pnpbios/fdc_pnpbios.c cvs rdiff -u -r1.12 -r1.12.12.1 src/sys/arch/i386/pnpbios/lpt_pnpbios.c cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.71 -r1.71.12.1 src/sys/arch/i386/pnpbios/pnpbios.c cvs rdiff -u -r1.254 -r1.254.2.1 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/ic/mpt_netbsd.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/ic/mpt_netbsd.h cvs rdiff -u -r1.138 -r1.138.18.1 src/sys/dev/isa/isa.c cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/dev/pci/amr.c cvs rdiff -u -r1.5 -r1.5.44.1 src/sys/dev/pci/mlyvar.h cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/pci/mpt_pci.c cvs rdiff -u -r1.142 -r1.142.12.1 src/sys/dev/pci/pci.c cvs rdiff -u -r1.219 -r1.219.18.1 src/sys/dev/pci/pciide.c cvs rdiff -u -r1.309 -r1.309.2.1 src/sys/dev/scsipi/cd.c cvs rdiff -u -r1.298 -r1.298.2.1 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.84 -r1.84.2.1 src/sys/dev/scsipi/ss.c cvs rdiff -u -r1.92 -r1.92.14.1 src/sys/kern/kern_physio.c cvs rdiff -u -r1.223 -r1.223.2.1 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.100 -r1.100.18.1 src/sys/kern/subr_disk.c cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/kern/sys_descrip.c cvs rdiff -u -r1.185 -r1.185.2.1 src/sys/kern/vfs_vnops.c cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/miscfs/genfs/genfs_io.c cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/sys/device.h cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/sys/disk.h cvs rdiff -u -r1.207 -r1.207.6.1 src/sys/sys/mount.h cvs rdiff -u -r1.278 -r1.278.2.1 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.27 -r1.27.6.1 src/sys/uvm/uvm_io.c cvs rdiff -u -r1.322 -r1.322.2.1 src/sys/uvm/uvm_map.c cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/uvm/uvm_readahead.c cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/uvm/uvm_readahead.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/amd64/include/param.h diff -u src/sys/arch/amd64/include/param.h:1.18 src/sys/arch/amd64/include/param.h:1.18.2.1 --- src/sys/arch/amd64/include/param.h:1.18 Fri Apr 20 22:23:24 2012 +++ src/sys/arch/amd64/include/param.h Wed Sep 12 06:15:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.18 2012/04/20 22:23:24 rmind Exp $ */ +/* $NetBSD: param.h,v 1.18.2.1 2012/09/12 06:15:31 tls Exp $ */ #ifdef __x86_64__ @@ -45,9 +45,11 @@ #define DEV_BSIZE (1 DEV_BSHIFT) #define BLKDEV_IOSIZE 2048 #ifndef MAXPHYS -#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ +#define MAXPHYS (64 * 1024) /* default I/O transfer size max */ #endif +#define MACHINE_MAXPHYS (1024 * 1024) /* absolute I/O transfer size max */ + #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ #ifdef DIAGNOSTIC Index: src/sys/arch/i386/pnpbios/fdc_pnpbios.c diff -u src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.17.6.1 --- src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.17 Thu Feb 2 19:42:59 2012 +++ src/sys/arch/i386/pnpbios/fdc_pnpbios.c Wed Sep 12 06:15:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbios.c,v 1.17 2012/02/02
CVS commit: src/usr.sbin/npf/npftest
Module Name:src
Committed By: martin
Date: Wed Sep 12 08:47:14 UTC 2012
Modified Files:
src/usr.sbin/npf/npftest: npftest.c
Log Message:
Add two new command line options to help integration into ATF:
-L lists the available test cases, -T executes a single named test.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npftest/npftest.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/npftest/npftest.c
diff -u src/usr.sbin/npf/npftest/npftest.c:1.6 src/usr.sbin/npf/npftest/npftest.c:1.7
--- src/usr.sbin/npf/npftest/npftest.c:1.6 Tue Aug 21 20:52:11 2012
+++ src/usr.sbin/npf/npftest/npftest.c Wed Sep 12 08:47:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npftest.c,v 1.6 2012/08/21 20:52:11 rmind Exp $ */
+/* $NetBSD: npftest.c,v 1.7 2012/09/12 08:47:14 martin Exp $ */
/*
* NPF testing framework.
@@ -29,19 +29,37 @@ static bool verbose, quiet;
static void
usage(void)
{
- printf(usage: %s: [ -q | -v ] [ -c config ]
- [ -i interface ] -b | -t | -s file \n
+ printf(usage:\n
+ %s [ -q | -v ] [ -c config ]
+ [ -i interface ] -b | -t | -s file \n
+ %s -T testname -c config\n
+ %s -L\n
+ where:\n
\t-b: benchmark\n
\t-t: regression test\n
+ \t-T testname: specific test\n
\t-s file: pcap stream\n
\t-c config: NPF configuration file\n
\t-i interface: primary interface\n
+ \t-L: list testnames and description for -T\n
\t-q: quiet mode\n
\t-v: verbose mode\n,
- getprogname());
+ getprogname(), getprogname(), getprogname());
exit(EXIT_FAILURE);
}
+static void
+describe_tests(void)
+{
+ printf( nbuf\tbasic npf mbuf handling\n
+ processor\tncode processing\n
+ table\ttable handling\n
+ state\tstate handling and processing\n
+ rule\trule processing\n
+ nat\tNAT rule processing\n);
+ exit(EXIT_SUCCESS);
+}
+
static bool
result(const char *testcase, bool ok)
{
@@ -119,13 +137,15 @@ arc4random(void)
int
main(int argc, char **argv)
{
- bool benchmark, test, ok, fail;
- char *config, *interface, *stream;
+ bool benchmark, test, ok, fail, tname_matched;
+ char *config, *interface, *stream, *testname;
int idx = -1, ch;
benchmark = false;
test = false;
+ tname_matched = false;
+ testname = NULL;
config = NULL;
interface = NULL;
stream = NULL;
@@ -133,7 +153,7 @@ main(int argc, char **argv)
verbose = false;
quiet = false;
- while ((ch = getopt(argc, argv, bqvc:i:s:t)) != -1) {
+ while ((ch = getopt(argc, argv, bqvc:i:s:tT:L)) != -1) {
switch (ch) {
case 'b':
benchmark = true;
@@ -156,6 +176,12 @@ main(int argc, char **argv)
case 't':
test = true;
break;
+ case 'T':
+ test = true;
+ testname = optarg;
+ break;
+ case 'L':
+ describe_tests();
default:
usage();
}
@@ -189,25 +215,43 @@ main(int argc, char **argv)
fail = false;
if (test) {
- ok = rumpns_npf_nbuf_test(verbose);
- fail |= result(nbuf, ok);
+ if (!testname || strcmp(nbuf, testname) == 0) {
+ ok = rumpns_npf_nbuf_test(verbose);
+ fail |= result(nbuf, ok);
+ tname_matched = true;
+ }
- ok = rumpns_npf_processor_test(verbose);
- fail |= result(processor, ok);
+ if (!testname || strcmp(processor, testname) == 0) {
+ ok = rumpns_npf_processor_test(verbose);
+ fail |= result(processor, ok);
+ tname_matched = true;
+ }
- ok = rumpns_npf_table_test(verbose);
- fail |= result(table, ok);
+ if (!testname || strcmp(table, testname) == 0) {
+ ok = rumpns_npf_table_test(verbose);
+ fail |= result(table, ok);
+ tname_matched = true;
+ }
- ok = rumpns_npf_state_test(verbose);
- fail |= result(state, ok);
+ if (!testname || strcmp(state, testname) == 0) {
+ ok = rumpns_npf_state_test(verbose);
+ fail |= result(state, ok);
+ tname_matched = true;
+ }
}
if (test config) {
- ok = rumpns_npf_rule_test(verbose);
- fail |= result(rule, ok);
+ if (!testname || strcmp(rule, testname) == 0) {
+ ok = rumpns_npf_rule_test(verbose);
+ fail |= result(rule, ok);
+ tname_matched = true;
+ }
- ok = rumpns_npf_nat_test(verbose);
- fail |= result(nat, ok);
+ if (!testname || strcmp(nat, testname) == 0) {
+ ok = rumpns_npf_nat_test(verbose);
+ fail |= result(nat, ok);
+ tname_matched = true;
+ }
}
if (stream) {
@@ -216,5 +260,8 @@ main(int argc, char **argv)
rump_unschedule();
+ if (testname !tname_matched)
+ errx(EXIT_FAILURE, test \%s\ unknown, testname);
+
return fail ? EXIT_FAILURE : EXIT_SUCCESS;
}
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: martin
Date: Wed Sep 12 10:35:10 UTC 2012
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
When emulating poll/select better tell the events of the host kernel
apart from those received from the rump kernel. Also handle timeout.
Patch from pooka.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.98 src/lib/librumphijack/hijack.c:1.99
--- src/lib/librumphijack/hijack.c:1.98 Mon Sep 3 12:07:42 2012
+++ src/lib/librumphijack/hijack.c Wed Sep 12 10:35:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.98 2012/09/03 12:07:42 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.99 2012/09/12 10:35:10 martin Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include rumpuser_port.h
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.98 2012/09/03 12:07:42 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.99 2012/09/12 10:35:10 martin Exp $);
#include sys/param.h
#include sys/types.h
@@ -1502,7 +1502,7 @@ msg_convert(struct msghdr *msg, int (*fu
int *fdp = (void *)CMSG_DATA(cmsg);
const size_t size =
cmsg-cmsg_len - __CMSG_ALIGN(sizeof(*cmsg));
- const int nfds = size / sizeof(int);
+ const int nfds = (int)(size / sizeof(int));
const int * const efdp = fdp + nfds;
while (fdp efdp) {
@@ -1957,7 +1957,7 @@ REALPOLLTS(struct pollfd *fds, nfds_t nf
int rpipe[2] = {-1,-1}, hpipe[2] = {-1,-1};
struct pollarg parg;
void *trv_val;
- int sverrno = 0, lrv, trv;
+ int sverrno = 0, rv_rump, rv_host, errno_rump, errno_host;
/*
* ok, this is where it gets tricky. We must support
@@ -2047,30 +2047,63 @@ REALPOLLTS(struct pollfd *fds, nfds_t nf
pthread_create(pt, NULL, hostpoll, parg);
op_pollts = GETSYSCALL(rump, POLLTS);
- lrv = op_pollts(pfd_rump, nfds+1, ts, NULL);
- sverrno = errno;
+ rv_rump = op_pollts(pfd_rump, nfds+1, ts, NULL);
+ errno_rump = errno;
write(hpipe[1], rv, sizeof(rv));
pthread_join(pt, trv_val);
- trv = (int)(intptr_t)trv_val;
+ rv_host = (int)(intptr_t)trv_val;
+ errno_host = parg.errnum;
- /* check who won and merge results */
- if (lrv != 0 pfd_host[nfds].revents POLLIN) {
- rv = trv;
-
- for (i = 0; i nfds; i++) {
-if (pfd_rump[i].fd != -1)
- fds[i].revents = pfd_rump[i].revents;
+ /* strip cross-thread notification from real results */
+ if (pfd_host[nfds].revents POLLIN) {
+ assert((pfd_rump[nfds].revents POLLIN) == 0);
+ assert(rv_host 0);
+ rv_host--;
+ }
+ if (pfd_rump[nfds].revents POLLIN) {
+ assert((pfd_host[nfds].revents POLLIN) == 0);
+ assert(rv_rump 0);
+ rv_rump--;
+ }
+
+ /* then merge the results into what's reported to the caller */
+ if (rv_rump 0 || rv_host 0) {
+ /* SUCCESS */
+
+ rv = 0;
+ if (rv_rump 0) {
+for (i = 0; i nfds; i++) {
+ if (pfd_rump[i].fd != -1)
+ fds[i].revents
+ = pfd_rump[i].revents;
+}
+rv += rv_rump;
}
- sverrno = parg.errnum;
- } else if (trv != 0 pfd_rump[nfds].revents POLLIN) {
- rv = trv;
-
- for (i = 0; i nfds; i++) {
-if (pfd_host[i].fd != -1)
- fds[i].revents = pfd_host[i].revents;
+ if (rv_host 0) {
+for (i = 0; i nfds; i++) {
+ if (pfd_host[i].fd != -1)
+ fds[i].revents
+ = pfd_host[i].revents;
+}
+rv += rv_host;
+ }
+ assert(rv 0);
+ sverrno = 0;
+ } else if (rv_rump == -1 || rv_host == -1) {
+ /* ERROR */
+
+ /* just pick one kernel at random */
+ rv = -1;
+ if (rv_host == -1) {
+sverrno = errno_host;
+ } else if (rv_rump == -1) {
+sverrno = errno_rump;
}
} else {
+ /* TIMEOUT */
+
rv = 0;
+ assert(rv_rump == 0 rv_host == 0);
}
out:
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Sep 12 12:07:04 UTC 2012
Modified Files:
src/sys/dev/pci: pm2fb.c pm2reg.h
Log Message:
support anti-aliased fonts in 8 bit
while there, fix pm2fb_bitblt() packed mode, for real this time
TODO:
- use packed mode when uploading glyphs
- let the hardware do the alpha blending if possible
- mode setting
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/pm2reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.16 src/sys/dev/pci/pm2fb.c:1.17
--- src/sys/dev/pci/pm2fb.c:1.16 Wed Sep 5 23:19:13 2012
+++ src/sys/dev/pci/pm2fb.c Wed Sep 12 12:07:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.16 2012/09/05 23:19:13 macallan Exp $ */
+/* $NetBSD: pm2fb.c,v 1.17 2012/09/12 12:07:04 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.16 2012/09/05 23:19:13 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.17 2012/09/12 12:07:04 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.
#include dev/wsfont/wsfont.h
#include dev/rasops/rasops.h
#include dev/wscons/wsdisplay_vconsvar.h
+#include dev/wscons/wsdisplay_glyphcachevar.h
#include dev/pci/wsdisplay_pci.h
#include dev/i2c/i2cvar.h
@@ -104,6 +105,7 @@ struct pm2fb_softc {
uint8_t sc_edid_data[128];
struct edid_info sc_ei;
struct videomode *sc_videomode;
+ glyphcache sc_gc;
};
static int pm2fb_match(device_t, cfdata_t, void *);
@@ -129,11 +131,11 @@ static void pm2fb_init(struct pm2fb_soft
static void pm2fb_flush_engine(struct pm2fb_softc *);
static void pm2fb_rectfill(struct pm2fb_softc *, int, int, int, int,
uint32_t);
-static void pm2fb_bitblt(struct pm2fb_softc *, int, int, int, int, int,
- int, int);
+static void pm2fb_bitblt(void *, int, int, int, int, int, int, int);
static void pm2fb_cursor(void *, int, int, int);
static void pm2fb_putchar(void *, int, int, u_int, long);
+static void pm2fb_putchar_aa(void *, int, int, u_int, long);
static void pm2fb_copycols(void *, int, int, int, int);
static void pm2fb_erasecols(void *, int, int, int, long);
static void pm2fb_copyrows(void *, int, int, int);
@@ -222,7 +224,10 @@ pm2fb_match(device_t parent, cfdata_t ma
if (PCI_VENDOR(pa-pa_id) != PCI_VENDOR_3DLABS)
return 0;
- /* only cards tested on so far - likely need a list */
+ /*
+ * only card tested on so far is a TechSource Raptor GFX 8P
+ * Sun PGX32, which happens to be a Permedia 2v
+ */
if ((PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2) ||
(PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2V))
return 100;
@@ -323,6 +328,18 @@ pm2fb_attach(device_t parent, device_t s
ri = sc-sc_console_screen.scr_ri;
+ sc-sc_gc.gc_bitblt = pm2fb_bitblt;
+ sc-sc_gc.gc_blitcookie = sc;
+ sc-sc_gc.gc_rop = 3;
+
+#ifdef PM2FB_DEBUG
+ /*
+ * leave some room at the bottom of the screen for various blitter
+ * tests and in order to make the glyph cache visible
+ */
+ sc-sc_height -= 200;
+#endif
+
if (is_console) {
vcons_init_screen(sc-vd, sc-sc_console_screen, 1,
defattr);
@@ -334,12 +351,25 @@ pm2fb_attach(device_t parent, device_t s
sc-sc_defaultscreen_descr.capabilities = ri-ri_caps;
sc-sc_defaultscreen_descr.nrows = ri-ri_rows;
sc-sc_defaultscreen_descr.ncols = ri-ri_cols;
+ /* XXX use actual memory size instead of assuming 8MB */
+ glyphcache_init(sc-sc_gc, sc-sc_height + 5,
+(0x80 / sc-sc_stride) - sc-sc_height - 5,
+sc-sc_width,
+ri-ri_font-fontwidth,
+ri-ri_font-fontheight,
+defattr);
wsdisplay_cnattach(sc-sc_defaultscreen_descr, ri, 0, 0,
defattr);
vcons_replay_msgbuf(sc-sc_console_screen);
} else {
if (sc-sc_console_screen.scr_ri.ri_rows == 0) {
/* do some minimal setup to avoid weirdnesses later */
+ glyphcache_init(sc-sc_gc, sc-sc_height + 5,
+(0x80 / sc-sc_stride) - sc-sc_height - 5,
+sc-sc_width,
+ri-ri_font-fontwidth,
+ri-ri_font-fontheight,
+defattr);
vcons_init_screen(sc-vd, sc-sc_console_screen, 1,
defattr);
}
@@ -360,7 +390,25 @@ pm2fb_attach(device_t parent, device_t s
aa.accessops = pm2fb_accessops;
aa.accesscookie = sc-vd;
- config_found(sc-sc_dev, aa, wsemuldisplaydevprint);
+ config_found(sc-sc_dev, aa, wsemuldisplaydevprint);
+
+#ifdef PM2FB_DEBUG
+ /*
+ * draw a pattern to check if pm2fb_bitblt() gets the alignment stuff
+ * right
+ */
+ pm2fb_rectfill(sc, 0, sc-sc_height, sc-sc_width, 200, 0x);
+ pm2fb_rectfill(sc, 0, sc-sc_height, 300, 10, 0);
+ pm2fb_rectfill(sc, 10, sc-sc_height, 200, 10, 0xe0e0e0e0);
+ for (i = 1; i 20; i++) {
+ pm2fb_bitblt(sc, 0, sc-sc_height,
+ i, sc-sc_height
CVS commit: src/lib/librumpclient
Module Name:src
Committed By: pooka
Date: Wed Sep 12 12:38:17 UTC 2012
Modified Files:
src/lib/librumpclient: rumpclient.c
Log Message:
attempt to inform user of what the error means
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/lib/librumpclient/rumpclient.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.51 src/lib/librumpclient/rumpclient.c:1.52
--- src/lib/librumpclient/rumpclient.c:1.51 Wed Aug 29 10:38:53 2012
+++ src/lib/librumpclient/rumpclient.c Wed Sep 12 12:38:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.51 2012/08/29 10:38:53 msaitoh Exp $ */
+/* $NetBSD: rumpclient.c,v 1.52 2012/09/12 12:38:16 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -49,7 +49,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: rumpclient.c,v 1.51 2012/08/29 10:38:53 msaitoh Exp $);
+__RCSID($NetBSD: rumpclient.c,v 1.52 2012/09/12 12:38:16 pooka Exp $);
#include sys/param.h
#include sys/mman.h
@@ -877,6 +877,7 @@ rumpclient_init(void)
if ((p = getenv(RUMP__PARSEDSERVER)) == NULL) {
if ((p = getenv(RUMP_SERVER)) == NULL) {
+ fprintf(stderr, error: RUMP_SERVER not set\n);
errno = ENOENT;
goto out;
}
CVS commit: src/usr.sbin/npf
Module Name:src Committed By: martin Date: Wed Sep 12 14:06:02 UTC 2012 Modified Files: src/usr.sbin/npf: Makefile Log Message: Install the npftest binary To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/npf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/Makefile diff -u src/usr.sbin/npf/Makefile:1.1 src/usr.sbin/npf/Makefile:1.2 --- src/usr.sbin/npf/Makefile:1.1 Sun Aug 22 18:56:23 2010 +++ src/usr.sbin/npf/Makefile Wed Sep 12 14:06:02 2012 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1 2010/08/22 18:56:23 rmind Exp $ +# $NetBSD: Makefile,v 1.2 2012/09/12 14:06:02 martin Exp $ -SUBDIR= npfctl +SUBDIR= npfctl npftest .include bsd.subdir.mk
CVS commit: src/tests/net
Module Name:src
Committed By: martin
Date: Wed Sep 12 14:06:31 UTC 2012
Modified Files:
src/tests/net: Makefile
Added Files:
src/tests/net/npf: Makefile t_npf.sh
Log Message:
ATF wrapping of the npf tests
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/npf/Makefile src/tests/net/npf/t_npf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.12 src/tests/net/Makefile:1.13
--- src/tests/net/Makefile:1.12 Tue Aug 14 19:13:54 2012
+++ src/tests/net/Makefile Wed Sep 12 14:06:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/08/14 19:13:54 alnsn Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/12 14:06:31 martin Exp $
.include bsd.own.mk
@@ -6,7 +6,7 @@ TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass route sys
.if (${MKRUMP} != no)
-TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_loop net
+TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_loop net npf
.endif
.include bsd.test.mk
Added files:
Index: src/tests/net/npf/Makefile
diff -u /dev/null src/tests/net/npf/Makefile:1.1
--- /dev/null Wed Sep 12 14:06:31 2012
+++ src/tests/net/npf/Makefile Wed Sep 12 14:06:31 2012
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2012/09/12 14:06:31 martin Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/net/npf
+FILESDIR= ${TESTSDIR}
+
+TESTS_SH= t_npf
+FILES= ../../../usr.sbin/npf/npftest/npftest.conf
+
+.include bsd.test.mk
Index: src/tests/net/npf/t_npf.sh
diff -u /dev/null src/tests/net/npf/t_npf.sh:1.1
--- /dev/null Wed Sep 12 14:06:31 2012
+++ src/tests/net/npf/t_npf.sh Wed Sep 12 14:06:31 2012
@@ -0,0 +1,62 @@
+# $NetBSD: t_npf.sh,v 1.1 2012/09/12 14:06:31 martin Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+run_test()
+{
+ local name=${1}
+
+ atf_check -o ignore -e ignore npfctl debug $(atf_get_srcdir)/npftest.conf ./npf.plist
+ atf_check -o ignore npftest -c npf.plist -T ${name}
+}
+
+add_test()
+{
+ local name=${1}; shift
+ local desc=${*};
+
+ atf_test_case npf_${name}
+ eval npf_${name}_head() { \
+ atf_set \descr\ \${desc}\; \
+ }; \
+ npf_${name}_body() { \
+ run_test \${name}\; \
+ }
+ atf_add_test_case npf_${name}
+}
+
+atf_init_test_cases()
+{
+ LIST=/tmp/t_npf.$$
+ trap rm -f $LIST EXIT
+
+ npftest -L $LIST
+
+ while read tag desc
+ do
+ add_test ${tag} ${desc}
+ done $LIST
+}
CVS commit: src/etc/mtree
Module Name:src Committed By: martin Date: Wed Sep 12 14:07:10 UTC 2012 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: New test directory for npf To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.83 src/etc/mtree/NetBSD.dist.tests:1.84 --- src/etc/mtree/NetBSD.dist.tests:1.83 Sun Aug 26 23:03:22 2012 +++ src/etc/mtree/NetBSD.dist.tests Wed Sep 12 14:07:10 2012 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.83 2012/08/26 23:03:22 jmmv Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.84 2012/09/12 14:07:10 martin Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -252,6 +252,7 @@ ./usr/tests/net/if ./usr/tests/net/if_loop ./usr/tests/net/net +./usr/tests/net/npf ./usr/tests/net/route ./usr/tests/net/sys ./usr/tests/rump
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Wed Sep 12 14:07:52 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi Log Message: Set list changes for npftest binary and npf tests To generate a diff of this commit: cvs rdiff -u -r1.1003 -r1.1004 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1777 -r1.1778 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.491 -r1.492 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1003 src/distrib/sets/lists/base/mi:1.1004 --- src/distrib/sets/lists/base/mi:1.1003 Wed Aug 22 06:45:15 2012 +++ src/distrib/sets/lists/base/mi Wed Sep 12 14:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1003 2012/08/22 06:45:15 spz Exp $ +# $NetBSD: mi,v 1.1004 2012/09/12 14:07:51 martin Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1352,6 +1352,7 @@ ./usr/sbin/nfsd base-nfsserver-bin ./usr/sbin/nfsiodbase-obsolete obsolete ./usr/sbin/npfctlbase-npf-bin npf +./usr/sbin/npftestbase-npf-bin npf ./usr/sbin/nsec3hashbase-bind-bin ./usr/sbin/nslookupbase-obsolete obsolete ./usr/sbin/nsquerybase-obsolete obsolete Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1777 src/distrib/sets/lists/comp/mi:1.1778 --- src/distrib/sets/lists/comp/mi:1.1777 Wed Aug 15 21:03:09 2012 +++ src/distrib/sets/lists/comp/mi Wed Sep 12 14:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1777 2012/08/15 21:03:09 pgoyette Exp $ +# $NetBSD: mi,v 1.1778 2012/09/12 14:07:51 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4218,6 +4218,7 @@ ./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug comp-nis-debug debug ./usr/libdata/debug/usr/sbin/nfsd.debug comp-nfsserver-debug debug ./usr/libdata/debug/usr/sbin/npfctl.debug comp-npf-debug npf,debug +./usr/libdata/debug/usr/sbin/npftest.debug comp-npf-debug npf,rump,debug ./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug crypto,debug ./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.491 src/distrib/sets/lists/tests/mi:1.492 --- src/distrib/sets/lists/tests/mi:1.491 Wed Sep 12 02:00:51 2012 +++ src/distrib/sets/lists/tests/mi Wed Sep 12 14:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.491 2012/09/12 02:00:51 manu Exp $ +# $NetBSD: mi,v 1.492 2012/09/12 14:07:52 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2861,6 +2861,10 @@ ./usr/tests/net/net/Atffile tests-net-tests atf,rump ./usr/tests/net/net/t_raw tests-net-tests atf,rump ./usr/tests/net/net/t_unix tests-net-tests atf,rump +./usr/tests/net/npf tests-net-tests atf,rump +./usr/tests/net/npf/Atffile tests-net-tests atf,rump +./usr/tests/net/npf/npftest.conf tests-net-tests atf,rump +./usr/tests/net/npf/t_npf tests-net-tests atf,rump ./usr/tests/net/routetests-net-tests ./usr/tests/net/route/Atffile tests-net-tests atf ./usr/tests/net/route/t_change tests-net-tests atf
CVS commit: src/lib/libc/arch/alpha/gen
Module Name:src Committed By: manu Date: Wed Sep 12 14:13:44 UTC 2012 Modified Files: src/lib/libc/arch/alpha/gen: _lwp.c Log Message: Fix the build, _UC_UNIQUE has been renamed _UC_TLSBASE To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/alpha/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/alpha/gen/_lwp.c diff -u src/lib/libc/arch/alpha/gen/_lwp.c:1.6 src/lib/libc/arch/alpha/gen/_lwp.c:1.7 --- src/lib/libc/arch/alpha/gen/_lwp.c:1.6 Thu Feb 24 04:28:41 2011 +++ src/lib/libc/arch/alpha/gen/_lwp.c Wed Sep 12 14:13:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:41 joerg Exp $ */ +/* $NetBSD: _lwp.c,v 1.7 2012/09/12 14:13:43 manu Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:41 joerg Exp $); +__RCSID($NetBSD: _lwp.c,v 1.7 2012/09/12 14:13:43 manu Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -62,5 +62,5 @@ _lwp_makecontext(ucontext_t *u, void (*s gr[_REG_S6] = 0; gr[_REG_UNIQUE] = (unsigned long)private; - u-uc_flags |= _UC_UNIQUE; + u-uc_flags |= _UC_TLSBASE; }
CVS commit: src/lib/libpthread
Module Name:src
Committed By: matt
Date: Wed Sep 12 14:55:48 UTC 2012
Modified Files:
src/lib/libpthread: pthread_specific.c
Log Message:
Only copy the ucontext_t in pthread_setcontext if _UC_TLSBASE is set.
Conditionalize the test on _UC_TLSBASE being defined.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libpthread/pthread_specific.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_specific.c
diff -u src/lib/libpthread/pthread_specific.c:1.22 src/lib/libpthread/pthread_specific.c:1.23
--- src/lib/libpthread/pthread_specific.c:1.22 Wed Sep 12 02:00:53 2012
+++ src/lib/libpthread/pthread_specific.c Wed Sep 12 14:55:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_specific.c,v 1.22 2012/09/12 02:00:53 manu Exp $ */
+/* $NetBSD: pthread_specific.c,v 1.23 2012/09/12 14:55:48 matt Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_specific.c,v 1.22 2012/09/12 02:00:53 manu Exp $);
+__RCSID($NetBSD: pthread_specific.c,v 1.23 2012/09/12 14:55:48 matt Exp $);
/* Functions and structures dealing with thread-specific data */
@@ -89,9 +89,16 @@ pthread_curcpu_np(void)
int
pthread_setcontext(const ucontext_t *ucp)
{
+#ifdef _UC_TLSBASE
ucontext_t uc;
-
- (void)memcpy(uc, ucp, sizeof(uc));
- uc.uc_flags = ~_UC_TLSBASE;
- return _sys_setcontext(uc);
+ /*
+ * Only copy and clear _UC_TLSBASE if it is set.
+ */
+ if (ucp-uc_flags _UC_TLSBASE) {
+ uc = *ucp;
+ uc.uc_flags = ~_UC_TLSBASE;
+ ucp = uc;
+ }
+#endif /* _UC_TLSBASE */
+ return _sys_setcontext(ucp);
}
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Wed Sep 12 15:09:49 UTC 2012 Modified Files: src/sys/arch/mips/include: mcontext.h Log Message: N32 uses dadd instructions to manipulate stack (actually, all ABIs except O32 use dadd). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/include/mcontext.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/mips/include/mcontext.h diff -u src/sys/arch/mips/include/mcontext.h:1.19 src/sys/arch/mips/include/mcontext.h:1.20 --- src/sys/arch/mips/include/mcontext.h:1.19 Tue Jul 5 19:30:50 2011 +++ src/sys/arch/mips/include/mcontext.h Wed Sep 12 15:09:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mcontext.h,v 1.19 2011/07/05 19:30:50 joerg Exp $ */ +/* $NetBSD: mcontext.h,v 1.20 2012/09/12 15:09:49 matt Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -205,10 +205,10 @@ __lwp_gettcb_fast(void) */ __asm __volatile(.set push; .set mips32r2; rdhwr $3,$29; .set pop; -#ifdef _LP64 - daddiu %[__tcb],$3,%1 -#else +#ifdef __mips_o32 addiu %[__tcb],$3,%1 +#else + daddiu %[__tcb],$3,%1 #endif : [__tcb]=r(__tcb) : [__offset]n(-(TLS_TP_OFFSET + sizeof(*__tcb)))
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: martin Date: Wed Sep 12 16:26:02 UTC 2012 Modified Files: src/usr.sbin/npf/npftest: npfstream.c Log Message: Fix printf format To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npftest/npfstream.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/npftest/npfstream.c diff -u src/usr.sbin/npf/npftest/npfstream.c:1.3 src/usr.sbin/npf/npftest/npfstream.c:1.4 --- src/usr.sbin/npf/npftest/npfstream.c:1.3 Sun Aug 12 03:35:14 2012 +++ src/usr.sbin/npf/npftest/npfstream.c Wed Sep 12 16:26:02 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: npfstream.c,v 1.3 2012/08/12 03:35:14 rmind Exp $ */ +/* $NetBSD: npfstream.c,v 1.4 2012/09/12 16:26:02 martin Exp $ */ /* * NPF stream processor. @@ -73,7 +73,7 @@ process_tcpip(const void *data, size_t l len = ntohs(ip-ip_len); error = rumpns_npf_test_handlepkt(ip, len, idx, forw, result); - fprintf(fp, %s%2x %5d %3d %11u %11u %11u %11u %12lx, + fprintf(fp, %s%2x %5d %3d %11u %11u %11u %11u %12 PRIxPTR, forw ? : , (th-th_flags (TH_SYN | TH_ACK | TH_FIN)), packetno, error, (u_int)seq, (u_int)ntohl(th-th_ack), tcpdlen, ntohs(th-th_win), (uintptr_t)result[0]);
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Wed Sep 12 18:23:33 UTC 2012
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_add_64.S
Log Message:
Fix bas code, use ldr
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_add_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.1 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.2
--- src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.1 Tue Sep 11 20:51:25 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_add_64.S Wed Sep 12 18:23:33 2012
@@ -1,7 +1,7 @@
-/* $NetBSD: atomic_add_64.S,v 1.1 2012/09/11 20:51:25 matt Exp $ */
+/* $NetBSD: atomic_add_64.S,v 1.2 2012/09/12 18:23:33 matt Exp $ */
/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -51,7 +51,7 @@ ENTRY_NP(_atomic_add_64)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
- ldmfd sp!, {r4, r5}
+ ldr r4, [sp], #4 /* restore temporary */
RET/* return old value */
END(_atomic_add_64)
ATOMIC_OP_ALIAS(atomic_add_64,_atomic_add_64)
@@ -74,7 +74,7 @@ ENTRY_NP(_atomic_add_64_nv)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
- ldmfd sp!, {r4, r5}
+ ldr r4, [sp], #4 /* restore temporary */
RET/* return new value */
END(_atomic_add_64_nv)
ATOMIC_OP_ALIAS(atomic_add_64_nv,_atomic_add_64_nv)
CVS commit: src
Module Name:src
Committed By: rjs
Date: Wed Sep 12 19:20:38 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/tests: mi
src/usr.sbin/npf: Makefile
Log Message:
Allow build with MKRUMP=no.
To generate a diff of this commit:
cvs rdiff -u -r1.1004 -r1.1005 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.492 -r1.493 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1004 src/distrib/sets/lists/base/mi:1.1005
--- src/distrib/sets/lists/base/mi:1.1004 Wed Sep 12 14:07:51 2012
+++ src/distrib/sets/lists/base/mi Wed Sep 12 19:20:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1004 2012/09/12 14:07:51 martin Exp $
+# $NetBSD: mi,v 1.1005 2012/09/12 19:20:37 rjs Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -1352,7 +1352,7 @@
./usr/sbin/nfsd base-nfsserver-bin
./usr/sbin/nfsiodbase-obsolete obsolete
./usr/sbin/npfctlbase-npf-bin npf
-./usr/sbin/npftestbase-npf-bin npf
+./usr/sbin/npftestbase-npf-bin npf,rump
./usr/sbin/nsec3hashbase-bind-bin
./usr/sbin/nslookupbase-obsolete obsolete
./usr/sbin/nsquerybase-obsolete obsolete
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.492 src/distrib/sets/lists/tests/mi:1.493
--- src/distrib/sets/lists/tests/mi:1.492 Wed Sep 12 14:07:52 2012
+++ src/distrib/sets/lists/tests/mi Wed Sep 12 19:20:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.492 2012/09/12 14:07:52 martin Exp $
+# $NetBSD: mi,v 1.493 2012/09/12 19:20:38 rjs Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2861,7 +2861,7 @@
./usr/tests/net/net/Atffile tests-net-tests atf,rump
./usr/tests/net/net/t_raw tests-net-tests atf,rump
./usr/tests/net/net/t_unix tests-net-tests atf,rump
-./usr/tests/net/npf tests-net-tests atf,rump
+./usr/tests/net/npf tests-net-tests
./usr/tests/net/npf/Atffile tests-net-tests atf,rump
./usr/tests/net/npf/npftest.conf tests-net-tests atf,rump
./usr/tests/net/npf/t_npf tests-net-tests atf,rump
Index: src/usr.sbin/npf/Makefile
diff -u src/usr.sbin/npf/Makefile:1.2 src/usr.sbin/npf/Makefile:1.3
--- src/usr.sbin/npf/Makefile:1.2 Wed Sep 12 14:06:02 2012
+++ src/usr.sbin/npf/Makefile Wed Sep 12 19:20:37 2012
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/09/12 14:06:02 martin Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/12 19:20:37 rjs Exp $
-SUBDIR= npfctl npftest
+.include bsd.own.mk
+
+SUBDIR= npfctl
+
+.if (${MKRUMP} != no)
+SUBDIR+= npftest
+.endif
.include bsd.subdir.mk
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Sep 12 23:06:16 UTC 2012 Modified Files: src/sys/arch/arm/arm32: exception.S Log Message: Make sure the handler addresses are 32-bit aligned. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm32/exception.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/exception.S diff -u src/sys/arch/arm/arm32/exception.S:1.17 src/sys/arch/arm/arm32/exception.S:1.18 --- src/sys/arch/arm/arm32/exception.S:1.17 Wed Aug 29 23:10:31 2012 +++ src/sys/arch/arm/arm32/exception.S Wed Sep 12 23:06:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: exception.S,v 1.17 2012/08/29 23:10:31 matt Exp $ */ +/* $NetBSD: exception.S,v 1.18 2012/09/12 23:06:15 matt Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -50,7 +50,7 @@ #include machine/cpu.h #include machine/frame.h - RCSID($NetBSD: exception.S,v 1.17 2012/08/29 23:10:31 matt Exp $) + RCSID($NetBSD: exception.S,v 1.18 2012/09/12 23:06:15 matt Exp $) .text .align 0 @@ -111,8 +111,8 @@ Lprefetch_abort_handler_address: .word _C_LABEL(prefetch_abort_handler_address) .data + .p2align 2 .global _C_LABEL(prefetch_abort_handler_address) - _C_LABEL(prefetch_abort_handler_address): .word abortprefetch @@ -150,6 +150,7 @@ Ldata_abort_handler_address: .word _C_LABEL(data_abort_handler_address) .data + .p2align 2 .global _C_LABEL(data_abort_handler_address) _C_LABEL(data_abort_handler_address): .word abortdata
CVS commit: [tls-maxphys] src
Module Name:src Committed By: tls Date: Wed Sep 12 06:15:36 UTC 2012 Modified Files: src/sys/arch/amd64/include [tls-maxphys]: param.h src/sys/arch/i386/pnpbios [tls-maxphys]: fdc_pnpbios.c lpt_pnpbios.c pciide_pnpbios.c pnpbios.c src/sys/dev/acpi [tls-maxphys]: acpi.c src/sys/dev/ic [tls-maxphys]: mpt_netbsd.c mpt_netbsd.h src/sys/dev/isa [tls-maxphys]: isa.c src/sys/dev/pci [tls-maxphys]: amr.c mlyvar.h mpt_pci.c pci.c pciide.c src/sys/dev/scsipi [tls-maxphys]: cd.c sd.c ss.c src/sys/kern [tls-maxphys]: kern_physio.c subr_autoconf.c subr_disk.c sys_descrip.c vfs_vnops.c vfs_wapbl.c src/sys/miscfs/genfs [tls-maxphys]: genfs_io.c src/sys/sys [tls-maxphys]: device.h disk.h mount.h src/sys/ufs/ffs [tls-maxphys]: ffs_vfsops.c src/sys/uvm [tls-maxphys]: uvm_io.c uvm_map.c uvm_readahead.c uvm_readahead.h Added Files: src [tls-maxphys]: MAXPHYS-NOTES Log Message: Initial snapshot of work to eliminate 64K MAXPHYS. Basically works for physio (I/O to raw devices); needs more doing to get it going with the filesystems, but it shouldn't damage data. All work's been done on amd64 so far. Not hard to add support to other ports. If others want to pitch in, one very helpful thing would be to sort out when and how IDE disks can do 128K or larger transfers, and adjust the various PCI IDE (or at least ahcisata) drivers and wd.c accordingly -- it would make testing much easier. Another very helpful thing would be to implement a smart minphys() for RAIDframe along the lines detailed in the MAXPHYS-NOTES file. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/MAXPHYS-NOTES cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/amd64/include/param.h cvs rdiff -u -r1.17 -r1.17.6.1 src/sys/arch/i386/pnpbios/fdc_pnpbios.c cvs rdiff -u -r1.12 -r1.12.12.1 src/sys/arch/i386/pnpbios/lpt_pnpbios.c cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.71 -r1.71.12.1 src/sys/arch/i386/pnpbios/pnpbios.c cvs rdiff -u -r1.254 -r1.254.2.1 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/ic/mpt_netbsd.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/ic/mpt_netbsd.h cvs rdiff -u -r1.138 -r1.138.18.1 src/sys/dev/isa/isa.c cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/dev/pci/amr.c cvs rdiff -u -r1.5 -r1.5.44.1 src/sys/dev/pci/mlyvar.h cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/pci/mpt_pci.c cvs rdiff -u -r1.142 -r1.142.12.1 src/sys/dev/pci/pci.c cvs rdiff -u -r1.219 -r1.219.18.1 src/sys/dev/pci/pciide.c cvs rdiff -u -r1.309 -r1.309.2.1 src/sys/dev/scsipi/cd.c cvs rdiff -u -r1.298 -r1.298.2.1 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.84 -r1.84.2.1 src/sys/dev/scsipi/ss.c cvs rdiff -u -r1.92 -r1.92.14.1 src/sys/kern/kern_physio.c cvs rdiff -u -r1.223 -r1.223.2.1 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.100 -r1.100.18.1 src/sys/kern/subr_disk.c cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/kern/sys_descrip.c cvs rdiff -u -r1.185 -r1.185.2.1 src/sys/kern/vfs_vnops.c cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/miscfs/genfs/genfs_io.c cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/sys/device.h cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/sys/disk.h cvs rdiff -u -r1.207 -r1.207.6.1 src/sys/sys/mount.h cvs rdiff -u -r1.278 -r1.278.2.1 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.27 -r1.27.6.1 src/sys/uvm/uvm_io.c cvs rdiff -u -r1.322 -r1.322.2.1 src/sys/uvm/uvm_map.c cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/uvm/uvm_readahead.c cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/uvm/uvm_readahead.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: martin Date: Wed Sep 12 08:47:14 UTC 2012 Modified Files: src/usr.sbin/npf/npftest: npftest.c Log Message: Add two new command line options to help integration into ATF: -L lists the available test cases, -T executes a single named test. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npftest/npftest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: martin Date: Wed Sep 12 10:35:10 UTC 2012 Modified Files: src/lib/librumphijack: hijack.c Log Message: When emulating poll/select better tell the events of the host kernel apart from those received from the rump kernel. Also handle timeout. Patch from pooka. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Sep 12 12:07:04 UTC 2012 Modified Files: src/sys/dev/pci: pm2fb.c pm2reg.h Log Message: support anti-aliased fonts in 8 bit while there, fix pm2fb_bitblt() packed mode, for real this time TODO: - use packed mode when uploading glyphs - let the hardware do the alpha blending if possible - mode setting To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/pm2fb.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/pm2reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpclient
Module Name:src Committed By: pooka Date: Wed Sep 12 12:38:17 UTC 2012 Modified Files: src/lib/librumpclient: rumpclient.c Log Message: attempt to inform user of what the error means To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/lib/librumpclient/rumpclient.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf
Module Name:src Committed By: martin Date: Wed Sep 12 14:06:02 UTC 2012 Modified Files: src/usr.sbin/npf: Makefile Log Message: Install the npftest binary To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/npf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net
Module Name:src Committed By: martin Date: Wed Sep 12 14:06:31 UTC 2012 Modified Files: src/tests/net: Makefile Added Files: src/tests/net/npf: Makefile t_npf.sh Log Message: ATF wrapping of the npf tests To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/npf/Makefile src/tests/net/npf/t_npf.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: martin Date: Wed Sep 12 14:07:10 UTC 2012 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: New test directory for npf To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Wed Sep 12 14:07:52 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi Log Message: Set list changes for npftest binary and npf tests To generate a diff of this commit: cvs rdiff -u -r1.1003 -r1.1004 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1777 -r1.1778 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.491 -r1.492 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/alpha/gen
Module Name:src Committed By: manu Date: Wed Sep 12 14:13:44 UTC 2012 Modified Files: src/lib/libc/arch/alpha/gen: _lwp.c Log Message: Fix the build, _UC_UNIQUE has been renamed _UC_TLSBASE To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/alpha/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Wed Sep 12 15:09:49 UTC 2012 Modified Files: src/sys/arch/mips/include: mcontext.h Log Message: N32 uses dadd instructions to manipulate stack (actually, all ABIs except O32 use dadd). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/include/mcontext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: martin Date: Wed Sep 12 16:26:02 UTC 2012 Modified Files: src/usr.sbin/npf/npftest: npfstream.c Log Message: Fix printf format To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npftest/npfstream.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Wed Sep 12 18:23:33 UTC 2012 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_64.S Log Message: Fix bas code, use ldr To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rjs Date: Wed Sep 12 19:20:38 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/tests: mi src/usr.sbin/npf: Makefile Log Message: Allow build with MKRUMP=no. To generate a diff of this commit: cvs rdiff -u -r1.1004 -r1.1005 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.492 -r1.493 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Sep 12 23:06:16 UTC 2012 Modified Files: src/sys/arch/arm/arm32: exception.S Log Message: Make sure the handler addresses are 32-bit aligned. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm32/exception.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Thu Sep 13 00:36:12 UTC 2012 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_64.S atomic_and_64.S atomic_dec_64.S atomic_inc_64.S atomic_or_64.S atomic_swap_64.S Log Message: Correct copyright/fix comments. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_dec_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Thu Sep 13 02:09:00 UTC 2012 Modified Files: src/sys/dev/pci: pm2fb.c Log Message: add mode setting support While there, don't pretend to support the Permedia2 non-V - I don't have the hardware and it has never been tested in the first place. The only hardware this has been tested on is a TechSource Raptor GFX 8P / Sun PGX32 which happens to be a Permedia2V with Sun firmware. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/pm2fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: spz Date: Thu Sep 13 05:32:08 UTC 2012 Modified Files: src/external/bsd/bind/dist: CHANGES version src/external/bsd/bind/dist/lib/dns: master.c rdata.c rdataslab.c src/external/bsd/bind/dist/lib/dns/include/dns: rdata.h src/external/bsd/bind/dist/lib/dns/tests: Makefile.in master_test.c Added Files: src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c src/external/bsd/bind/dist/lib/dns/tests/testdata/master: master15.data master16.data Log Message: apply fix for CVE-2012-4244 from upstream upstream changelog: --- 9.9.1-P3 released --- 3364. [security] Named could die on specially crafted record. [RT #30416] To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/version cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/master.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/rdata.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/dns/rdataslab.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/lib/dns/include/dns/rdata.h cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/lib/dns/tests/Makefile.in \ src/external/bsd/bind/dist/lib/dns/tests/master_test.c cvs rdiff -u -r0 -r1.1 src/external/bsd/bind/dist/lib/dns/tests/rdata_test.c cvs rdiff -u -r0 -r1.1 \ src/external/bsd/bind/dist/lib/dns/tests/testdata/master/master15.data \ src/external/bsd/bind/dist/lib/dns/tests/testdata/master/master16.data Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
