Re: CVS commit: src/sys/arch/powerpc/powerpc
In article 20140318143431.920a...@cvs.netbsd.org,
Michael Lorenz source-changes-d@NetBSD.org wrote:
-=-=-=-=-=-
+#ifdef PPC_OEA601
+static struct timecounter powerpc_601_timecounter = {
+ get_601_timecount, /* get_timecount */
+ 0, /* no poll_pps */
+ 0x7fff, /* counter_mask */
+ 0, /* frequency */
+ rtc, /* name */
+ 100,/* quality */
+ NULL, /* tc_priv */
+ NULL/* tc_next */
+};
+#endif
+
static struct timecounter powerpc_timecounter = {
get_powerpc_timecount, /* get_timecount */
0, /* no poll_pps */
0x7fff, /* counter_mask */
0, /* frequency */
-#if PPC_OEA601
- rtc, /* name */
-#else
mftb, /* name */
-#endif
100,/* quality */
NULL, /* tc_priv */
NULL/* tc_next */
Can we use c99 field initializers here instead of comments?!?
christos
Re: CVS commit: src/usr.sbin/rtsold
On Tue, Mar 18, 2014 at 03:30:09PM -0400, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Tue Mar 18 19:30:09 UTC 2014 Modified Files: src/usr.sbin/rtsold: rtsold.c Log Message: use time_t for time It isn't a time_t type time. The value is actually an interval in microseconds and bounded to less than a second. The code is doing: long x = arc4random() % (1 * 100); That really shouldn't generate a compiler warning. David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/usr.sbin/rtsold
In article 20140318201420.go20...@snowdrop.l8s.co.uk, David Laight da...@l8s.co.uk wrote: On Tue, Mar 18, 2014 at 03:30:09PM -0400, Christos Zoulas wrote: Module Name: src Committed By:christos Date:Tue Mar 18 19:30:09 UTC 2014 Modified Files: src/usr.sbin/rtsold: rtsold.c Log Message: use time_t for time It isn't a time_t type time. It is assigned to a time_t. long might not be wide enough; the value is unsigned and it is assigned to a signed type. christos
Re: CVS commit: src/usr.sbin/rtsold
On Tue, Mar 18, 2014 at 08:21:19PM +, Christos Zoulas wrote: In article 20140318201420.go20...@snowdrop.l8s.co.uk, David Laight da...@l8s.co.uk wrote: On Tue, Mar 18, 2014 at 03:30:09PM -0400, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Tue Mar 18 19:30:09 UTC 2014 Modified Files: src/usr.sbin/rtsold: rtsold.c Log Message: use time_t for time It isn't a time_t type time. It is assigned to a time_t. long might not be wide enough; the value is unsigned and it is assigned to a signed type. Only if 'long' is smaller than 100. i386 fails on the line: long interval = arc4random() /* uint32_t */ % 100; If you use 'unsigned long' then amd64 fails a line later doing: xxx.tv_usec = interval / 100; The compiler should be able to tell that neither of those lines is going to cause any problems. There is no reason to force 32bit systems to do unnecessary 64bit maths. David -- David Laight: da...@l8s.co.uk
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist/tests
Module Name:othersrc Committed By: dholland Date: Tue Mar 18 05:59:44 UTC 2014 Added Files: othersrc/external/bsd/bsd-pkg-config/dist/tests: Makefile README.test basetest.better basetest.good basetest.sh package-query-libtuff-4.better package-query-libtuff-4.good package-query-y11.better package-query-y11.good package-query-ykbproto.better package-query-ykbproto.good package-query-yproto.better package-query-yproto.good package-query.sh othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles: libtuff-4.pc y11.pc ykbproto.pc yproto.pc Log Message: Add a test suite. This needs a bit of work to support running the tests from bin/, but not much, and it runs ok (just less tidily) in place. At the moment none of it really works because the bsd-pkg-config script doesn't honor PKG_CONFIG_PATH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile \ othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.sh \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query.sh cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/libtuff-4.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/y11.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/ykbproto.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/yproto.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile diff -u /dev/null othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile:1.1 --- /dev/null Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile Tue Mar 18 05:59:44 2014 @@ -0,0 +1,47 @@ +PKGCONFIG=../bsd-pkg-config.sh +#PKGCONFIG=/usr/pkg/bin/pkg-config + +ALLTESTS=basetest +PCFILES=libtuff-4 y11 ykbproto yproto + +REFVER.libtuff-4=4.0.1 # less than extant version +REFVER.y11=1.6.1 # greater than extant version +REFVER.ykbproto=1.0.6 # same as extant version +REFVER.yproto=7.0.24 # same as extant version + + + +all: run-tests .WAIT show-diffs + +.for P in $(PCFILES) +ALLTESTS+=package-query-$(P) +package-query-$(P).out: package-query.sh $(PKGCONFIG) + ./package-query.sh $(PKGCONFIG) $(P) $(REFVER.$(P)) $@ 21 +.endfor + +.for T in $(ALLTESTS) +.if !target($(T).out) +$(T).out: $(T).sh $(PKGCONFIG) + ./$(T).sh $(PKGCONFIG) $@ 21 +.endif + +$(T).diff: $(T).good $(T).out + diff -u $(T).good $(T).out $(T).diff || true + +run-tests: $(T).diff +.endfor + +show-diffs: +.for T in $(ALLTESTS) + cat $(T).diff +.endfor + +good: +.for T in $(ALLTESTS) + cp $(T).out $(T).good +.endfor + +clean distclean: + rm -f *.out *.diff + +.PHONY: all run-tests show-diffs good clean distclean Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test diff -u /dev/null othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test:1.1 --- /dev/null Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test Tue Mar 18 05:59:44 2014 @@ -0,0 +1,26 @@ +This is some basic test material taken from the original pkg-config's +man page. + +I've included reference .pc files to work from, and given them +nonstandard names, so the test results will be invariant under +installed package changes. + +The .good files are the output that bsd-pkg-config currently emits; +the .better files are the output that the original pkg-config emits. + +Run make to run the tests. If there's any diff output, inspect it +for correctness relative to intended changes you've made (if any), and +either fix things or update the .good files as appropriate. + +Run make run-tests to run everything but not spew the diffs to the +screen. + +You can use make good to update the .good files from the current +.out files; don't do this without thinking. + +You can run make clean to explicitly delete the test output. + +make -j should work but is hardly
CVS commit: src/sys/arch/evbarm/armadaxp
Module Name:src Committed By: matt Date: Tue Mar 18 06:17:55 UTC 2014 Modified Files: src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c Log Message: Default comfreq to mvTclk if CONSFREQ is not defined. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadaxp/armadaxp_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/evbarm/armadaxp/armadaxp_machdep.c diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.6 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.7 --- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.6 Mon Dec 23 04:12:09 2013 +++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Tue Mar 18 06:17:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $ */ +/* $NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $ */ /*** Copyright (C) Marvell International Ltd. and its affiliates @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI ***/ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $); #include opt_machdep.h #include opt_mvsoc.h @@ -414,7 +414,7 @@ initarm(void *arg) #define CONMODE ((TTYDEF_CFLAG ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */ #endif #ifndef CONSFREQ -#define CONSFREQ 25000 +#define CONSFREQ 0 #endif static const int comcnspeed = CONSPEED; static const int comcnfreq = CONSFREQ; @@ -435,7 +435,7 @@ consinit(void) uint32_t, int); if (mvuart_cnattach(mvsoc_bs_tag, comcnaddr, comcnspeed, - comcnfreq, comcnmode)) + comcnfreq ? comcnfreq : mvTclk , comcnmode)) panic(Serial console can not be initialized.); #endif }
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Tue Mar 18 06:23:45 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.armadaxp mk.marvell
Log Message:
Don't replicate most of mk.marvell in mk.armadaxp
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.armadaxp
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.marvell
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/evbarm/conf/mk.armadaxp
diff -u src/sys/arch/evbarm/conf/mk.armadaxp:1.2 src/sys/arch/evbarm/conf/mk.armadaxp:1.3
--- src/sys/arch/evbarm/conf/mk.armadaxp:1.2 Wed May 29 23:50:35 2013
+++ src/sys/arch/evbarm/conf/mk.armadaxp Tue Mar 18 06:23:45 2014
@@ -1,26 +1,11 @@
#
-# $NetBSD: mk.armadaxp,v 1.2 2013/05/29 23:50:35 rkujawa Exp $
+# $NetBSD: mk.armadaxp,v 1.3 2014/03/18 06:23:45 matt Exp $
#
SYSTEM_FIRST_OBJ= armadaxp_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/armadaxp/armadaxp_start.S
-_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
-
KERNEL_BASE_PHYS=0x0020
KERNEL_BASE_VIRT=0xc020
-MKUBOOTIMAGEARGS= -A arm -T kernel
-MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS)
-MKUBOOTIMAGEARGS+= -n NetBSD/$(BOARDTYPE) ${_OSRELEASE}
-MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
-
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -S -O binary $@ $@.bin; \
- ${OBJCOPY} -S -O binary $@ $@.bin; \
- echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
- ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
- echo
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.include ${THISARM}/conf/mk.marvell
Index: src/sys/arch/evbarm/conf/mk.marvell
diff -u src/sys/arch/evbarm/conf/mk.marvell:1.4 src/sys/arch/evbarm/conf/mk.marvell:1.5
--- src/sys/arch/evbarm/conf/mk.marvell:1.4 Fri Aug 10 02:46:51 2012
+++ src/sys/arch/evbarm/conf/mk.marvell Tue Mar 18 06:23:45 2014
@@ -1,7 +1,7 @@
-# $NetBSD: mk.marvell,v 1.4 2012/08/10 02:46:51 matt Exp $
+# $NetBSD: mk.marvell,v 1.5 2014/03/18 06:23:45 matt Exp $
-SYSTEM_FIRST_OBJ= marvell_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/marvell/marvell_start.S
+SYSTEM_FIRST_OBJ?= marvell_start.o
+SYSTEM_FIRST_SFILE?= ${THISARM}/marvell/marvell_start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 06:46:14 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoc_intr.h Log Message: Only include opt_mvsoc.h if _INTR_PRIVATE is defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc_intr.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/arm/marvell/mvsoc_intr.h diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 src/sys/arch/arm/marvell/mvsoc_intr.h:1.4 --- src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 Wed Nov 20 12:16:47 2013 +++ src/sys/arch/arm/marvell/mvsoc_intr.h Tue Mar 18 06:46:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_intr.h,v 1.3 2013/11/20 12:16:47 kiyohara Exp $ */ +/* $NetBSD: mvsoc_intr.h,v 1.4 2014/03/18 06:46:14 matt Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -28,11 +28,13 @@ #ifndef _MVSOC_INTR_H_ #define _MVSOC_INTR_H_ +#ifdef _INTR_PRIVATE #include opt_mvsoc.h #if defined(ARMADAXP) #define __HAVE_PIC_SET_PRIORITY #endif +#endif #define ARM_IRQ_HANDLER _C_LABEL(mvsoc_irq_handler)
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Tue Mar 18 07:03:22 UTC 2014
Modified Files:
src/sys/arch/arm/include: vfpreg.h
src/sys/arch/arm/vfp: vfp_init.c
Log Message:
Enable VFP on MV88SV58XX
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/vfpreg.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/vfp/vfp_init.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/arm/include/vfpreg.h
diff -u src/sys/arch/arm/include/vfpreg.h:1.12 src/sys/arch/arm/include/vfpreg.h:1.13
--- src/sys/arch/arm/include/vfpreg.h:1.12 Mon Feb 24 16:57:57 2014
+++ src/sys/arch/arm/include/vfpreg.h Tue Mar 18 07:03:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfpreg.h,v 1.12 2014/02/24 16:57:57 christos Exp $ */
+/* $NetBSD: vfpreg.h,v 1.13 2014/03/18 07:03:22 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -64,6 +64,7 @@
#define FPU_VFP_CORTEXA8 0x410330c0
#define FPU_VFP_CORTEXA9 0x41033090
#define FPU_VFP_CORTEXA15 0x410330f0
+#define FPU_VFP_MV88SV58XX 0x56022090
#define VFP_FPEXC_EX 0x8000 /* EXception status bit */
#define VFP_FPEXC_EN 0x4000 /* VFP Enable bit */
Index: src/sys/arch/arm/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.35 src/sys/arch/arm/vfp/vfp_init.c:1.36
--- src/sys/arch/arm/vfp/vfp_init.c:1.35 Tue Mar 4 08:32:23 2014
+++ src/sys/arch/arm/vfp/vfp_init.c Tue Mar 18 07:03:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfp_init.c,v 1.35 2014/03/04 08:32:23 matt Exp $ */
+/* $NetBSD: vfp_init.c,v 1.36 2014/03/18 07:03:22 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -270,6 +270,7 @@ vfp_attach(void)
const char *model = NULL;
if (CPU_ID_ARM11_P(curcpu()-ci_arm_cpuid)
+ || CPU_ID_MV88SV58XX_P(curcpu()-ci_arm_cpuid)
|| CPU_ID_CORTEX_P(curcpu()-ci_arm_cpuid)) {
const uint32_t cpacr_vfp = CPACR_CPn(VFP_COPROC);
const uint32_t cpacr_vfp2 = CPACR_CPn(VFP_COPROC2);
@@ -328,6 +329,9 @@ vfp_attach(void)
case FPU_VFP11_ARM11:
model = VFP11;
break;
+ case FPU_VFP_MV88SV58XX:
+ model = VFP3;
+ break;
case FPU_VFP_CORTEXA5:
case FPU_VFP_CORTEXA7:
case FPU_VFP_CORTEXA8:
@@ -337,7 +341,7 @@ vfp_attach(void)
cpu_neon_present = 1;
break;
default:
- aprint_normal_dev(ci-ci_dev, unrecognized VFP version %x\n,
+ aprint_normal_dev(ci-ci_dev, unrecognized VFP version %#x\n,
fpsid);
install_coproc_handler(VFP_COPROC, vfp_fpscr_handler);
vfp_fpscr_changable = VFP_FPSCR_CSUM|VFP_FPSCR_ESUM
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:05:00 UTC 2014 Modified Files: src/sys/arch/arm/marvell: files.marvell Log Message: Add MEMSIZE to opt_mvsoc.h To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/marvell/files.marvell 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/marvell/files.marvell diff -u src/sys/arch/arm/marvell/files.marvell:1.11 src/sys/arch/arm/marvell/files.marvell:1.12 --- src/sys/arch/arm/marvell/files.marvell:1.11 Tue Mar 18 05:50:06 2014 +++ src/sys/arch/arm/marvell/files.marvell Tue Mar 18 07:05:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.11 2014/03/18 05:50:06 matt Exp $ +# $NetBSD: files.marvell,v 1.12 2014/03/18 07:05:00 matt Exp $ # # Configuration info for Marvell System on Chip support # @@ -16,7 +16,7 @@ file arch/arm/arm32/irq_dispatch.S # Some SoC(ARMADAXP) reports false DeviceID. defflag opt_mvsoc.hORION KIRKWOOD MV78XX0 ARMADAXP defparam opt_mvsoc.hMVSOC_INTERREGS_PBASE - MVSOC_FIXUP_DEVID + MVSOC_FIXUP_DEVID MEMSIZE file arch/arm/marvell/mvsoc_intr.c file arch/arm/marvell/orion.c orion file arch/arm/marvell/kirkwood.c kirkwood
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Tue Mar 18 07:05:47 UTC 2014 Modified Files: src/sys/arch/arm/conf: files.arm src/sys/arch/arm/include: locore.h Log Message: defflag VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/arch/arm/conf/files.arm cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/locore.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/arm/conf/files.arm diff -u src/sys/arch/arm/conf/files.arm:1.124 src/sys/arch/arm/conf/files.arm:1.125 --- src/sys/arch/arm/conf/files.arm:1.124 Thu Feb 20 17:39:59 2014 +++ src/sys/arch/arm/conf/files.arm Tue Mar 18 07:05:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm,v 1.124 2014/02/20 17:39:59 matt Exp $ +# $NetBSD: files.arm,v 1.125 2014/03/18 07:05:46 matt Exp $ # temporary define to allow easy moving to ../arch/arm/arm32 defflagARM32 @@ -64,6 +64,7 @@ defparam opt_arm_intr_impl.h ARM_INTR_IM # ARM-specific debug options defflag opt_arm_debug.h ARM_LOCK_CAS_DEBUG +defflag opt_arm_debug.h VERBOSE_INIT_ARM # Board-specific bus_space(9)/bus_dma(9) definitions defflag opt_arm_bus_space.h __BUS_SPACE_HAS_STREAM_METHODS Index: src/sys/arch/arm/include/locore.h diff -u src/sys/arch/arm/include/locore.h:1.14 src/sys/arch/arm/include/locore.h:1.15 --- src/sys/arch/arm/include/locore.h:1.14 Mon Mar 3 08:15:36 2014 +++ src/sys/arch/arm/include/locore.h Tue Mar 18 07:05:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.14 2014/03/03 08:15:36 matt Exp $ */ +/* $NetBSD: locore.h,v 1.15 2014/03/18 07:05:46 matt Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -51,6 +51,7 @@ #ifdef _KERNEL_OPT #include opt_cpuoptions.h #include opt_cputypes.h +#include opt_arm_debug.h #endif #include arm/cpuconf.h
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:06:43 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add xhci To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ARMADAXP 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/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.7 src/sys/arch/evbarm/conf/ARMADAXP:1.8 --- src/sys/arch/evbarm/conf/ARMADAXP:1.7 Mon Mar 17 01:56:14 2014 +++ src/sys/arch/evbarm/conf/ARMADAXP Tue Mar 18 07:06:43 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.7 2014/03/17 01:56:14 kiyohara Exp $ +# $NetBSD: ARMADAXP,v 1.8 2014/03/18 07:06:43 matt Exp $ # # ARMADA XP DEV BOARD # @@ -289,6 +289,10 @@ tqphy* at mii? phy ? # TSC Semiconduct ukphy* at mii? phy ? # Generic/unknown PHYs urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs +# PCI USB devices +xhci* at pci? dev ? function ? +usb* at xhci? + # Pseudo-Devices # disk/mass storage pseudo-devices #pseudo-device md # memory disk device (ramdisk)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:07:40 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Base on ARMADAXP, not SHEEVAPLUG. Simplify. Support FPU_VFP To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/MIRABOX 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/evbarm/conf/MIRABOX diff -u src/sys/arch/evbarm/conf/MIRABOX:1.1 src/sys/arch/evbarm/conf/MIRABOX:1.2 --- src/sys/arch/evbarm/conf/MIRABOX:1.1 Sat Mar 15 14:09:09 2014 +++ src/sys/arch/evbarm/conf/MIRABOX Tue Mar 18 07:07:40 2014 @@ -1,39 +1,21 @@ -# $NetBSD: MIRABOX,v 1.1 2014/03/15 14:09:09 kiyohara Exp $ +# $NetBSD: MIRABOX,v 1.2 2014/03/18 07:07:40 matt Exp $ # # This configuration supports for generically GlobalScale MiraBox # -include arch/evbarm/conf/SHEEVAPLUG +include arch/evbarm/conf/ARMADAXP # Board Type no makeoptions BOARDTYPE makeoptions BOARDTYPE=mirabox no options EVBARM_BOARDTYPE options EVBARM_BOARDTYPE=mirabox +options VERBOSE_INIT_ARM +no options MEMSIZE +options MEMSIZE=0x4000 # CPU options -no options CPU_SHEEVA -#no options MV_L2_CACHE_ENABLE -#no options MV_L2_CACHE_WRITE_THROUGH -no options MV_CACHE_RANGE_OPS -options CPU_PJ4B -options L2CACHE_ENABLE -#options AURORA_IO_CACHE_COHERENCY -options AURORA_L2_PT_WALK -options ARM_HAS_VBAR -#options FPU_VFP +options FPU_VFP no makeoptions CPUFLAGS -#makeoptions CPUFLAGS=-march=armv7-a -mfpu=neon -makeoptions CPUFLAGS=-march=armv7-a -msoft-float - -# Architecture options -no options KIRKWOOD -options ARMADAXP - -options PIC_MAXSOURCES=128 - -# Marvell MV6710 Armada 370 System-on-chip -mvsoc0 at mainbus? -options MVSOC_INTERREGS_PBASE=0xd000 - -options COM_16750 # : required +makeoptions CPUFLAGS=-march=armv7-a -msoft-float -mfpu=vfpv4 +no options CONSFREQ
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 07:18:22 UTC 2014
Modified Files:
src/sys/compat/netbsd32 [netbsd-6]: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
Pull up following revision(s) (requested by manu in ticket #1022):
sys/compat/netbsd32/netbsd32_ioctl.h: revision 1.44
sys/compat/netbsd32/netbsd32_ioctl.c: revision 1.68
Add ATAIOCCOMMAND ioctl form COMPAT_NETBSD32
This enables SMART monitoring by a netbsd32 binary.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/compat/netbsd32/netbsd32_ioctl.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/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.64 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.64.8.1
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.64 Thu Oct 6 03:19:32 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Tue Mar 18 07:18:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.64 2011/10/06 03:19:32 macallan Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.64.8.1 2014/03/18 07:18:22 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.64 2011/10/06 03:19:32 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.64.8.1 2014/03/18 07:18:22 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc
#include sys/audioio.h
#include sys/disklabel.h
#include sys/dkio.h
+#include sys/ataio.h
#include sys/sockio.h
#include sys/socket.h
#include sys/ttycom.h
@@ -243,6 +244,23 @@ netbsd32_to_sioc_sg_req(struct netbsd32_
}
static inline void
+netbsd32_to_atareq(struct netbsd32_atareq *s32p, struct atareq *p, u_long cmd)
+{
+ p-flags = (u_long)s32p-flags;
+ p-command = s32p-command;
+ p-features = s32p-features;
+ p-sec_count = s32p-sec_count;
+ p-sec_num = s32p-sec_num;
+ p-head = s32p-head;
+ p-cylinder = s32p-cylinder;
+ p-databuf = (char *)NETBSD32PTR64(s32p-databuf);
+ p-datalen = (u_long)s32p-datalen;
+ p-timeout = s32p-timeout;
+ p-retsts = s32p-retsts;
+ p-error = s32p-error;
+}
+
+static inline void
netbsd32_to_vnd_ioctl(struct netbsd32_vnd_ioctl *s32p, struct vnd_ioctl *p, u_long cmd)
{
@@ -482,6 +500,23 @@ netbsd32_from_sioc_sg_req(struct sioc_sg
}
static inline void
+netbsd32_from_atareq(struct atareq *p, struct netbsd32_atareq *s32p, u_long cmd)
+{
+ s32p-flags = (netbsd32_u_long)p-flags;
+ s32p-command = p-command;
+ s32p-features = p-features;
+ s32p-sec_count = p-sec_count;
+ s32p-sec_num = p-sec_num;
+ s32p-head = p-head;
+ s32p-cylinder = p-cylinder;
+ NETBSD32PTR32(s32p-databuf, p-databuf);
+ s32p-datalen = (netbsd32_u_long)p-datalen;
+ s32p-timeout = p-timeout;
+ s32p-retsts = p-retsts;
+ s32p-error = p-error;
+}
+
+static inline void
netbsd32_from_vnd_ioctl(struct vnd_ioctl *p, struct netbsd32_vnd_ioctl *s32p, u_long cmd)
{
@@ -783,6 +818,9 @@ netbsd32_ioctl(struct lwp *l, const stru
IOCTL_STRUCT_CONV_TO(DIOCWFORMAT, format_op);
#endif
+ case ATAIOCCOMMAND32:
+ IOCTL_STRUCT_CONV_TO(ATAIOCCOMMAND, atareq);
+
/*
* only a few ifreq syscalls need conversion and those are
* all driver specific... XXX
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.41 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.41.8.1
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.41 Wed Sep 28 01:46:39 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Tue Mar 18 07:18:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.41 2011/09/28 01:46:39 macallan Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.41.8.1 2014/03/18 07:18:22 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -90,6 +90,24 @@ struct netbsd32_format_op {
#define DIOCWFORMAT32 _IOWR('d', 106, struct netbsd32_format_op)
#endif
+/* from sys/ataio.h */
+struct netbsd32_atareq {
+ netbsd32_u_long flags;
+ u_char command;
+ u_char features;
+ u_char sec_count;
+ u_char sec_num;
+ u_char head;
+ u_short cylinder;
+ netbsd32_voidp databuf;
+ netbsd32_u_long datalen;
+ int timeout;
+ u_char retsts;
+ u_char error;
+};
+#define ATAIOCCOMMAND32 _IOWR('Q', 8, struct netbsd32_atareq)
+
+
/* from net/bpf.h */
struct netbsd32_bpf_program {
u_int bf_len;
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:25:57 UTC 2014 Modified Files: src/sys/arch/arm/marvell: files.marvell Log Message: defflag MVSOC_CONSOLE_EARLY To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/marvell/files.marvell 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/marvell/files.marvell diff -u src/sys/arch/arm/marvell/files.marvell:1.12 src/sys/arch/arm/marvell/files.marvell:1.13 --- src/sys/arch/arm/marvell/files.marvell:1.12 Tue Mar 18 07:05:00 2014 +++ src/sys/arch/arm/marvell/files.marvell Tue Mar 18 07:25:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.12 2014/03/18 07:05:00 matt Exp $ +# $NetBSD: files.marvell,v 1.13 2014/03/18 07:25:57 matt Exp $ # # Configuration info for Marvell System on Chip support # @@ -15,6 +15,7 @@ file arch/arm/arm32/irq_dispatch.S # Some SoC(ARMADAXP) reports false DeviceID. defflag opt_mvsoc.hORION KIRKWOOD MV78XX0 ARMADAXP + MVSOC_CONSOLE_EARLY defparam opt_mvsoc.hMVSOC_INTERREGS_PBASE MVSOC_FIXUP_DEVID MEMSIZE file arch/arm/marvell/mvsoc_intr.c
CVS commit: src/sys/arch/evbarm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:30:09 UTC 2014 Modified Files: src/sys/arch/evbarm/marvell: marvellvar.h Log Message: Add _LOCORE around marvell_interregs_pbase To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/marvell/marvellvar.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/evbarm/marvell/marvellvar.h diff -u src/sys/arch/evbarm/marvell/marvellvar.h:1.2 src/sys/arch/evbarm/marvell/marvellvar.h:1.3 --- src/sys/arch/evbarm/marvell/marvellvar.h:1.2 Mon Sep 30 12:57:53 2013 +++ src/sys/arch/evbarm/marvell/marvellvar.h Tue Mar 18 07:30:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: marvellvar.h,v 1.2 2013/09/30 12:57:53 kiyohara Exp $ */ +/* $NetBSD: marvellvar.h,v 1.3 2014/03/18 07:30:09 matt Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -37,6 +37,8 @@ #define MARVELL_INTERREGS_VBASE 0xf100 #define MARVELL_PEXIO_VBASE 0xf200 +#ifndef _LOCORE extern bus_addr_t marvell_interregs_pbase; +#endif #endif /* _EVBARM_MARVELLVAR_H_ */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:34:15 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add commented out MVSOC_EARLY_CONSOLE option To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ARMADAXP 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/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.8 src/sys/arch/evbarm/conf/ARMADAXP:1.9 --- src/sys/arch/evbarm/conf/ARMADAXP:1.8 Tue Mar 18 07:06:43 2014 +++ src/sys/arch/evbarm/conf/ARMADAXP Tue Mar 18 07:34:15 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.8 2014/03/18 07:06:43 matt Exp $ +# $NetBSD: ARMADAXP,v 1.9 2014/03/18 07:34:15 matt Exp $ # # ARMADA XP DEV BOARD # @@ -24,7 +24,8 @@ options L2CACHE_ENABLE #options AURORA_IO_CACHE_COHERENCY options AURORA_L2_PT_WALK -#options VERBOSE_INIT_ARM +#options VERBOSE_INIT_ARM +#options MVSOC_CONSOLE_EARLY # File systems file-system FFS # UFS
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:01:34 UTC 2014 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32_event.c Log Message: Pull up following revision(s) (requested by manu in ticket #1021): sys/compat/netbsd32/netbsd32_event.c: revision 1.10 Fix netbsd32 compatibility bug in kevent(). The keo_put_events() callback copies the events from kernel to userland. It is called for sets of up to 8 events (constant chosen in kevbuf definitition in kevent1()). The callback is called with pointer to userland buffer, count of events to copy, and an index parameter which tracks where we are in userland buffer when called multiple time. COMPAT_NETBSD32's flavor of keo_put_events() is netbsd32_kevent_put_events(). It did not honour the index parameter, which caused invalid event data to be returned when userland requested more that 8 events. This caused many reliability problems, and the obvious startup crash of dovecot log process when it accessed udata in the nineth event in its buffer, which was NULL. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/compat/netbsd32/netbsd32_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_event.c diff -u src/sys/compat/netbsd32/netbsd32_event.c:1.9 src/sys/compat/netbsd32/netbsd32_event.c:1.9.10.1 --- src/sys/compat/netbsd32/netbsd32_event.c:1.9 Mon May 23 21:34:47 2011 +++ src/sys/compat/netbsd32/netbsd32_event.c Tue Mar 18 08:01:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_event.c,v 1.9 2011/05/23 21:34:47 joerg Exp $ */ +/* $NetBSD: netbsd32_event.c,v 1.9.10.1 2014/03/18 08:01:34 msaitoh Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_event.c,v 1.9 2011/05/23 21:34:47 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_event.c,v 1.9.10.1 2014/03/18 08:01:34 msaitoh Exp $); #include sys/types.h #include sys/param.h @@ -86,7 +86,7 @@ netbsd32_kevent_put_events(void *private for (i = 0, kev32 = events32; i n; i++, kev32++, events++) netbsd32_from_kevent(events, kev32); - kev32 = (struct netbsd32_kevent *)eventlist; + kev32 = ((struct netbsd32_kevent *)eventlist) + index; return copyout(events32, kev32, n * sizeof(*events32)); }
CVS commit: src/sys/arch/dreamcast/dev
Module Name:src
Committed By: martin
Date: Tue Mar 18 08:08:55 UTC 2014
Modified Files:
src/sys/arch/dreamcast/dev: gdrom.c
Log Message:
Fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/dreamcast/dev/gdrom.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/dreamcast/dev/gdrom.c
diff -u src/sys/arch/dreamcast/dev/gdrom.c:1.37 src/sys/arch/dreamcast/dev/gdrom.c:1.38
--- src/sys/arch/dreamcast/dev/gdrom.c:1.37 Sun Mar 16 05:20:23 2014
+++ src/sys/arch/dreamcast/dev/gdrom.c Tue Mar 18 08:08:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gdrom.c,v 1.37 2014/03/16 05:20:23 dholland Exp $ */
+/* $NetBSD: gdrom.c,v 1.38 2014/03/18 08:08:55 martin Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: gdrom.c,v 1.37 2014/03/16 05:20:23 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdrom.c,v 1.38 2014/03/18 08:08:55 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -66,7 +66,7 @@ dev_type_strategy(gdromstrategy);
const struct bdevsw gdrom_bdevsw = {
.d_open = gdromopen,
.d_close = gdromclose,
- .d_strateegy = gdromstrategy,
+ .d_strategy = gdromstrategy,
.d_ioctl = gdromioctl,
.d_dump = nodump,
.d_psize = nosize,
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 08:09:46 UTC 2014
Modified Files:
src/sys/compat/netbsd32 [netbsd-6]: netbsd32.h netbsd32_netbsd.c
src/sys/uvm [netbsd-6]: uvm_swap.c uvm_swap.h
Log Message:
Pull up following revision(s) (requested by manu in ticket #1025):
sys/compat/netbsd32/netbsd32_netbsd.c: revision 1.184
sys/uvm/uvm_swap.c: revision 1.166
sys/uvm/uvm_swap.h: revision 1.20
sys/compat/netbsd32/netbsd32.h: revision 1.99
Properly translate struct swapent for COMPAT_NETBSD32
Properly translate struct swapent for COMPAT_NETBSD32 (missing commit)
To generate a diff of this commit:
cvs rdiff -u -r1.92.2.2 -r1.92.2.3 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.179 -r1.179.2.1 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.161 -r1.161.2.1 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/uvm/uvm_swap.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.92.2.2 src/sys/compat/netbsd32/netbsd32.h:1.92.2.3
--- src/sys/compat/netbsd32/netbsd32.h:1.92.2.2 Thu Dec 13 23:47:57 2012
+++ src/sys/compat/netbsd32/netbsd32.h Tue Mar 18 08:09:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.92.2.2 2012/12/13 23:47:57 riz Exp $ */
+/* $NetBSD: netbsd32.h,v 1.92.2.3 2014/03/18 08:09:46 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -383,6 +383,16 @@ struct netbsd32_loadavg {
netbsd32_long fscale;
};
+/* from sys/swap.h */
+struct netbsd32_swapent {
+ netbsd32_dev_t se_dev; /* device id */
+ int se_flags; /* flags */
+ int se_nblks; /* total blocks */
+ int se_inuse; /* blocks in use */
+ int se_priority; /* priority of this device */
+ char se_path[PATH_MAX+1]; /* path name */
+};
+
/* from sys/ipc.h */
typedef netbsd32_pointer_t netbsd32_ipc_permp_t;
struct netbsd32_ipc_perm {
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.179 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.179.2.1
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.179 Wed Feb 1 05:43:54 2012
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Mar 18 08:09:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.179.2.1 2014/03/18 08:09:46 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.179.2.1 2014/03/18 08:09:46 msaitoh Exp $);
#if defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_net
#include sys/socketvar.h
#include sys/mbuf.h
#include sys/stat.h
+#include sys/swap.h
#include sys/time.h
#include sys/signalvar.h
#include sys/ptrace.h
@@ -73,6 +74,7 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_net
#include sys/vfs_syscalls.h
#include uvm/uvm_extern.h
+#include uvm/uvm_swap.h
#include sys/sa.h
#include sys/savar.h
@@ -1728,6 +1730,51 @@ netbsd32___posix_rename(struct lwp *l, c
return (sys___posix_rename(l, ua, retval));
}
+static int
+netbsd32_swapctl_stats(struct lwp *l, struct sys_swapctl_args *uap, register_t *retval)
+{
+ struct swapent *ksep;
+ struct netbsd32_swapent *usep32;
+ struct netbsd32_swapent se32;
+ int count = SCARG(uap, misc);
+ int i, error = 0;
+ size_t ksep_len;
+
+ /* Make sure userland cannot exhaust kernel memory */
+ if ((size_t)count (size_t)uvmexp.nswapdev)
+ count = uvmexp.nswapdev;
+
+ ksep_len = sizeof(*ksep) * count;
+ ksep = kmem_alloc(ksep_len, KM_SLEEP);
+ usep32 = (struct netbsd32_swapent *)SCARG(uap, arg);
+
+ uvm_swap_stats(SWAP_STATS, ksep, count, retval);
+ count = *retval;
+
+ if (count 1)
+ goto out;
+
+ for (i = 0; i count; i++) {
+ se32.se_dev = ksep[i].se_dev;
+ se32.se_flags = ksep[i].se_flags;
+ se32.se_nblks = ksep[i].se_nblks;
+ se32.se_inuse = ksep[i].se_inuse;
+ se32.se_priority = ksep[i].se_priority;
+ memcpy(se32.se_path, ksep[i].se_path,
+ sizeof(se32.se_path));
+
+ error = copyout(se32, usep32 + i, sizeof(se32));
+ if (error)
+ break;
+ }
+
+
+out:
+ kmem_free(ksep, ksep_len);
+
+ return error;
+}
+
int
netbsd32_swapctl(struct lwp *l, const struct netbsd32_swapctl_args *uap, register_t *retval)
{
@@ -1741,6 +1788,11 @@ netbsd32_swapctl(struct lwp *l, const st
NETBSD32TO64_UAP(cmd);
NETBSD32TOP_UAP(arg, void);
NETBSD32TO64_UAP(misc);
+
+ /* SWAP_STATS50 and SWAP_STATS13 structures need no translation */
+ if (SCARG(ua, cmd) == SWAP_STATS)
+ return netbsd32_swapctl_stats(l, ua, retval);
+
return (sys_swapctl(l, ua, retval));
}
Index: src/sys/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.161 src/sys/uvm/uvm_swap.c:1.161.2.1
---
CVS commit: [netbsd-6] src
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 08:17:56 UTC 2014
Modified Files:
src/share/man/man4 [netbsd-6]: options.4
src/sys/kern [netbsd-6]: kern_exec.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1026):
share/man/man4/options.4: revision 1.433
sys/kern/kern_exec.c: revision 1.371- 1.372
Add EMUL_NATIVEROOT so that native binaries can be told to search an
emulation directory before the real root. This makes easier to test
an amd64 kernel on the top of an i386 root filesystem prior a full
migration.
To generate a diff of this commit:
cvs rdiff -u -r1.411.2.1 -r1.411.2.2 src/share/man/man4/options.4
cvs rdiff -u -r1.339.2.7 -r1.339.2.8 src/sys/kern/kern_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.411.2.1 src/share/man/man4/options.4:1.411.2.2
--- src/share/man/man4/options.4:1.411.2.1 Thu Feb 23 18:29:52 2012
+++ src/share/man/man4/options.4 Tue Mar 18 08:17:56 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: options.4,v 1.411.2.1 2012/02/23 18:29:52 riz Exp $
+.\ $NetBSD: options.4,v 1.411.2.2 2014/03/18 08:17:56 msaitoh Exp $
.\
.\ Copyright (c) 1996
.\ Perry E. Metzger. All rights reserved.
@@ -450,6 +450,21 @@ Currently only some system calls which u
are adjusted and some binaries which use
.Xr sysctl 3
to retrieve network details would not work properly.
+.It Cd options EMUL_NATIVEROOT=string
+Just like emulated binaries first try to lookup files in
+an emulation root (e.g.
+.Pa /emul/linux )
+before looking them up in real root, this option cause native
+binaries to first look up files in an emulation directory too.
+This can be useful to test an amd64 kernel on top of an i386 system
+prior full migration: by unpacking the amd64 distribution in e.g.
+.Pa /emul/netbsd64
+and specifying that location as
+.Cd EMUL_NATIVEROOT ,
+native amd64 binaries can be run while the root filesystem remains
+populated with i386 binaries. Beware of
+.Pa /dev
+incompatibilities between i386 and amd64 if you do this.
.It Cd options EXEC_ELF_NOTELESS
Run unidentified ELF binaries as
.Nx
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.339.2.7 src/sys/kern/kern_exec.c:1.339.2.8
--- src/sys/kern/kern_exec.c:1.339.2.7 Mon Feb 3 11:54:02 2014
+++ src/sys/kern/kern_exec.c Tue Mar 18 08:17:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.339.2.7 2014/02/03 11:54:02 sborrill Exp $ */
+/* $NetBSD: kern_exec.c,v 1.339.2.8 2014/03/18 08:17:56 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.339.2.7 2014/02/03 11:54:02 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.339.2.8 2014/03/18 08:17:56 msaitoh Exp $);
#include opt_exec.h
#include opt_ktrace.h
@@ -185,7 +185,11 @@ static struct sa_emul saemul_netbsd = {
/* NetBSD emul struct */
struct emul emul_netbsd = {
.e_name = netbsd,
+#ifdef EMUL_NATIVEROOT
+ .e_path = EMUL_NATIVEROOT,
+#else
.e_path = NULL,
+#endif
#ifndef __HAVE_MINIMAL_EMUL
.e_flags = EMUL_HAS_SYS___syscall,
.e_errno = NULL,
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 08:22:05 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Comment out VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/MIRABOX 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/evbarm/conf/MIRABOX diff -u src/sys/arch/evbarm/conf/MIRABOX:1.2 src/sys/arch/evbarm/conf/MIRABOX:1.3 --- src/sys/arch/evbarm/conf/MIRABOX:1.2 Tue Mar 18 07:07:40 2014 +++ src/sys/arch/evbarm/conf/MIRABOX Tue Mar 18 08:22:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: MIRABOX,v 1.2 2014/03/18 07:07:40 matt Exp $ +# $NetBSD: MIRABOX,v 1.3 2014/03/18 08:22:05 matt Exp $ # # This configuration supports for generically GlobalScale MiraBox # @@ -10,12 +10,12 @@ no makeoptions BOARDTYPE makeoptions BOARDTYPE=mirabox no options EVBARM_BOARDTYPE options EVBARM_BOARDTYPE=mirabox -options VERBOSE_INIT_ARM +#options VERBOSE_INIT_ARM no options MEMSIZE options MEMSIZE=0x4000 # CPU options options FPU_VFP no makeoptions CPUFLAGS -makeoptions CPUFLAGS=-march=armv7-a -msoft-float -mfpu=vfpv4 +makeoptions CPUFLAGS=-march=armv7-a -msoft-float -mfpu=vfpv3 no options CONSFREQ
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:22:45 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1021, #1022, #1025 and #1026. To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.95 src/doc/CHANGES-6.2:1.1.2.96 --- src/doc/CHANGES-6.2:1.1.2.95 Fri Feb 21 12:01:31 2014 +++ src/doc/CHANGES-6.2 Tue Mar 18 08:22:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.95 2014/02/21 12:01:31 sborrill Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.96 2014/03/18 08:22:45 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1344,3 +1344,31 @@ sys/arch/atari/dev/ite.c 1.72 terminal. Fixes PR/48599. [tsutsui, ticket #1033] +sys/compat/netbsd32/netbsd32_event.c 1.10 + + Fix netbsd32 compatibility bug in kevent(). + [manu, ticket #1021] + +sys/compat/netbsd32/netbsd32_ioctl.c 1.68 +sys/compat/netbsd32/netbsd32_ioctl.h 1.44 + + Add ATAIOCCOMMAND ioctl form COMPAT_NETBSD32. This enables SMART + monitoring by a netbsd32 binary. + [manu, ticket #1022] + +sys/compat/netbsd32/netbsd32.h 1.99 +sys/compat/netbsd32/netbsd32_netbsd.c 1.184 +sys/uvm/uvm_swap.c1.166 +sys/uvm/uvm_swap.h1.20 + + Properly translate struct swapent for COMPAT_NETBSD32. + [manu, ticket #1025] + +share/man/man4/options.4 1.433 +sys/kern/kern_exec.c1.371-1.372 + + Add EMUL_NATIVEROOT so that native binaries can be told to search an + emulation directory before the real root. This makes easier to test + an amd64 kernel on the top of an i386 root filesystem prior a full + migration. + [manu, ticket #1026]
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: skrll
Date: Tue Mar 18 08:40:05 UTC 2014
Modified Files:
src/external/gpl3/gdb/dist/gdb: armnbsd-nat.c
Log Message:
In fill_fpregset correct the address to grab the register from
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/armnbsd-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/armnbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.9
--- src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.8 Thu Oct 3 18:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c Tue Mar 18 08:40:05 2014
@@ -177,7 +177,7 @@ fill_fpregset (const struct regcache *re
}
else if (regno = ARM_D0_REGNUM regno = ARM_D0_REGNUM + 15)
regcache_raw_collect(regcache, regno,
- (char *) vfpregsetp-fpr_vfp.vfp_regs + 8*regno);
+ (char *) vfpregsetp-fpr_vfp.vfp_regs + 8 * (regno - ARM_D0_REGNUM));
if (ARM_FPSCR_REGNUM == regno || -1 == regno)
regcache_raw_collect (regcache, ARM_FPSCR_REGNUM,
@@ -308,7 +308,7 @@ fetch_fp_regs (struct regcache *regcache
if (ret 0)
{
- warning (_(unable to fetch general registers));
+ warning (_(unable to fetch floating-point registers));
return;
}
CVS commit: [netbsd-6] src/sys/ufs/ufs
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:43:33 UTC 2014 Modified Files: src/sys/ufs/ufs [netbsd-6]: ufs_quota2.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1027): sys/ufs/ufs/ufs_quota2.c: revision 1.37 Patch from Edgar Fuss on tech-kern: set grace time if lowering the limit cause the user/group to now be overquota. To generate a diff of this commit: cvs rdiff -u -r1.34.2.1 -r1.34.2.2 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/sys/ufs/ufs/ufs_quota2.c diff -u src/sys/ufs/ufs/ufs_quota2.c:1.34.2.1 src/sys/ufs/ufs/ufs_quota2.c:1.34.2.2 --- src/sys/ufs/ufs/ufs_quota2.c:1.34.2.1 Mon Oct 1 19:55:22 2012 +++ src/sys/ufs/ufs/ufs_quota2.c Tue Mar 18 08:43:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota2.c,v 1.34.2.1 2012/10/01 19:55:22 riz Exp $ */ +/* $NetBSD: ufs_quota2.c,v 1.34.2.2 2014/03/18 08:43:33 msaitoh Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.34.2.1 2012/10/01 19:55:22 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.34.2.2 2014/03/18 08:43:33 msaitoh Exp $); #include sys/buf.h #include sys/param.h @@ -42,6 +42,7 @@ __KERNEL_RCSID(0, $NetBSD: ufs_quota2.c #include sys/wapbl.h #include sys/quota.h #include sys/quotactl.h +#include sys/timevar.h #include ufs/ufs/quota2.h #include ufs/ufs/inode.h @@ -631,6 +632,15 @@ quota2_handle_cmd_put(struct ufsmount *u goto out_il; quota2_ufs_rwq2e(q2ep, q2e, needswap); + /* + * Reset time limit if previously had no soft limit or were + * under it, but now have a soft limit and are over it. + */ + if (val-qv_softlimit + q2e.q2e_val[key-qk_objtype].q2v_cur = val-qv_softlimit + (q2e.q2e_val[key-qk_objtype].q2v_softlimit == 0 || + q2e.q2e_val[key-qk_objtype].q2v_cur q2e.q2e_val[key-qk_objtype].q2v_softlimit)) + q2e.q2e_val[key-qk_objtype].q2v_time = time_second + val-qv_grace; quota2_dict_update_q2e_limits(key-qk_objtype, val, q2e); quota2_ufs_rwq2e(q2e, q2ep, needswap); quota2_bwrite(ump-um_mountp, bp);
CVS commit: [netbsd-6] src/distrib/sets/lists/comp
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:53:30 UTC 2014 Modified Files: src/distrib/sets/lists/comp [netbsd-6]: md.amd64 Log Message: Apply patch(requested by mlelstv in ticket #1030): distrib/sets/lists/comp/md.amd64: patch netbsd-6 amd64 does not build with MKDEBUG=yes because a file is missing from the set lists. Current got fhis fixed in rev. 1.186. To generate a diff of this commit: cvs rdiff -u -r1.155.2.9 -r1.155.2.10 src/distrib/sets/lists/comp/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.9 src/distrib/sets/lists/comp/md.amd64:1.155.2.10 --- src/distrib/sets/lists/comp/md.amd64:1.155.2.9 Fri Jun 14 04:17:36 2013 +++ src/distrib/sets/lists/comp/md.amd64 Tue Mar 18 08:53:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.155.2.9 2013/06/14 04:17:36 msaitoh Exp $ +# $NetBSD: md.amd64,v 1.155.2.10 2014/03/18 08:53:30 msaitoh Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -1064,6 +1064,7 @@ ./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug ./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/i386/libcrypto_rc5.so.7.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug comp-compat-shlib compat,pic,lvm,debug
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 08:56:42 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add some missing devices (crypto gige) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/ARMADAXP 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/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.9 src/sys/arch/evbarm/conf/ARMADAXP:1.10 --- src/sys/arch/evbarm/conf/ARMADAXP:1.9 Tue Mar 18 07:34:15 2014 +++ src/sys/arch/evbarm/conf/ARMADAXP Tue Mar 18 08:56:42 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.9 2014/03/18 07:34:15 matt Exp $ +# $NetBSD: ARMADAXP,v 1.10 2014/03/18 08:56:42 matt Exp $ # # ARMADA XP DEV BOARD # @@ -199,6 +199,9 @@ m25p0 at spi? slave 0 # TWSI SDRAM Serial Presence Detect spdmem0 at iic? addr 0x56 +# On-chip Cryptographic Engines and Security Accelerator +mvcesa* at mvsoc? offset ? irq ? + # On-chip USB 2.0 Interface ehci* at mvsoc? offset ? irq ? @@ -245,6 +248,10 @@ wd* at atabus? drive ? flags 0x sd* at atapibus? drive ? flags 0x # ATAPI disk drives uk* at atapibus? drive ? flags 0x # ATAPI unknown +# On-chip Gigabit Ethernet Controller Interface +mvgbec* at mvsoc? offset ? +mvgbe* at mvgbec? port ? irq ? + # On-chip RTC mvsocrtc* at mvsoc? offset ? irq ?
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:57:53 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1027 and #1030. To generate a diff of this commit: cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.96 src/doc/CHANGES-6.2:1.1.2.97 --- src/doc/CHANGES-6.2:1.1.2.96 Tue Mar 18 08:22:45 2014 +++ src/doc/CHANGES-6.2 Tue Mar 18 08:57:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.96 2014/03/18 08:22:45 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.97 2014/03/18 08:57:53 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1372,3 +1372,13 @@ sys/kern/kern_exec.c1.371-1.372 an amd64 kernel on the top of an i386 root filesystem prior a full migration. [manu, ticket #1026] + +sys/ufs/ufs/ufs_quota2.c 1.37 + + Set grace time if lowering the limit cause the user/group to now be + overquota. Patch was sent from Edgar Fuss on tech-kern. + [bouyer, ticket #1027] + +distrib/sets/lists/comp/md.amd64 patch + Build fix with MKDEBUG=yes on amd64. + [mlelstv, ticket #1030]
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 09:21:30 UTC 2014
Modified Files:
src/sys/kern [netbsd-6]: kern_verifiedexec.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1034):
sys/kern/kern_verifiedexec.c: revision 1.132
Reorder code to avoid use-after-free on error. From Maxime Villard
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.128.4.1 src/sys/kern/kern_verifiedexec.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_verifiedexec.c
diff -u src/sys/kern/kern_verifiedexec.c:1.128 src/sys/kern/kern_verifiedexec.c:1.128.4.1
--- src/sys/kern/kern_verifiedexec.c:1.128 Sun Nov 20 10:32:33 2011
+++ src/sys/kern/kern_verifiedexec.c Tue Mar 18 09:21:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $ */
+/* $NetBSD: kern_verifiedexec.c,v 1.128.4.1 2014/03/18 09:21:30 msaitoh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128.4.1 2014/03/18 09:21:30 msaitoh Exp $);
#include opt_veriexec.h
@@ -1281,18 +1281,6 @@ veriexec_file_add(struct lwp *l, prop_di
vfe-npages = 0;
vfe-last_page_size = 0;
- vte = veriexec_table_lookup(vp-v_mount);
- if (vte == NULL)
- vte = veriexec_table_add(l, vp-v_mount);
-
- /* XXX if we bail below this, we might want to gc newly created vtes. */
-
- error = fileassoc_add(vp, veriexec_hook, vfe);
- if (error)
- goto unlock_out;
-
- vte-vte_count++;
-
if (prop_bool_true(prop_dictionary_get(dict, eval-on-load)) ||
(vfe-type VERIEXEC_UNTRUSTED)) {
u_char *digest;
@@ -1314,6 +1302,18 @@ veriexec_file_add(struct lwp *l, prop_di
kmem_free(digest, vfe-ops-hash_len);
}
+ vte = veriexec_table_lookup(vp-v_mount);
+ if (vte == NULL)
+ vte = veriexec_table_add(l, vp-v_mount);
+
+ /* XXX if we bail below this, we might want to gc newly created vtes. */
+
+ error = fileassoc_add(vp, veriexec_hook, vfe);
+ if (error)
+ goto unlock_out;
+
+ vte-vte_count++;
+
veriexec_file_report(NULL, New entry., file, NULL, REPORT_DEBUG);
veriexec_bypass = 0;
CVS commit: [netbsd-6-1] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 09:21:51 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-1]: kern_verifiedexec.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1034):
sys/kern/kern_verifiedexec.c: revision 1.132
Reorder code to avoid use-after-free on error. From Maxime Villard
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.128.10.1 src/sys/kern/kern_verifiedexec.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_verifiedexec.c
diff -u src/sys/kern/kern_verifiedexec.c:1.128 src/sys/kern/kern_verifiedexec.c:1.128.10.1
--- src/sys/kern/kern_verifiedexec.c:1.128 Sun Nov 20 10:32:33 2011
+++ src/sys/kern/kern_verifiedexec.c Tue Mar 18 09:21:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $ */
+/* $NetBSD: kern_verifiedexec.c,v 1.128.10.1 2014/03/18 09:21:51 msaitoh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128.10.1 2014/03/18 09:21:51 msaitoh Exp $);
#include opt_veriexec.h
@@ -1281,18 +1281,6 @@ veriexec_file_add(struct lwp *l, prop_di
vfe-npages = 0;
vfe-last_page_size = 0;
- vte = veriexec_table_lookup(vp-v_mount);
- if (vte == NULL)
- vte = veriexec_table_add(l, vp-v_mount);
-
- /* XXX if we bail below this, we might want to gc newly created vtes. */
-
- error = fileassoc_add(vp, veriexec_hook, vfe);
- if (error)
- goto unlock_out;
-
- vte-vte_count++;
-
if (prop_bool_true(prop_dictionary_get(dict, eval-on-load)) ||
(vfe-type VERIEXEC_UNTRUSTED)) {
u_char *digest;
@@ -1314,6 +1302,18 @@ veriexec_file_add(struct lwp *l, prop_di
kmem_free(digest, vfe-ops-hash_len);
}
+ vte = veriexec_table_lookup(vp-v_mount);
+ if (vte == NULL)
+ vte = veriexec_table_add(l, vp-v_mount);
+
+ /* XXX if we bail below this, we might want to gc newly created vtes. */
+
+ error = fileassoc_add(vp, veriexec_hook, vfe);
+ if (error)
+ goto unlock_out;
+
+ vte-vte_count++;
+
veriexec_file_report(NULL, New entry., file, NULL, REPORT_DEBUG);
veriexec_bypass = 0;
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Tue Mar 18 09:36:58 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-0]: kern_verifiedexec.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1034):
sys/kern/kern_verifiedexec.c: revision 1.132
Reorder code to avoid use-after-free on error. From Maxime Villard
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.128.8.1 src/sys/kern/kern_verifiedexec.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_verifiedexec.c
diff -u src/sys/kern/kern_verifiedexec.c:1.128 src/sys/kern/kern_verifiedexec.c:1.128.8.1
--- src/sys/kern/kern_verifiedexec.c:1.128 Sun Nov 20 10:32:33 2011
+++ src/sys/kern/kern_verifiedexec.c Tue Mar 18 09:36:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $ */
+/* $NetBSD: kern_verifiedexec.c,v 1.128.8.1 2014/03/18 09:36:58 msaitoh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_verifiedexec.c,v 1.128.8.1 2014/03/18 09:36:58 msaitoh Exp $);
#include opt_veriexec.h
@@ -1281,18 +1281,6 @@ veriexec_file_add(struct lwp *l, prop_di
vfe-npages = 0;
vfe-last_page_size = 0;
- vte = veriexec_table_lookup(vp-v_mount);
- if (vte == NULL)
- vte = veriexec_table_add(l, vp-v_mount);
-
- /* XXX if we bail below this, we might want to gc newly created vtes. */
-
- error = fileassoc_add(vp, veriexec_hook, vfe);
- if (error)
- goto unlock_out;
-
- vte-vte_count++;
-
if (prop_bool_true(prop_dictionary_get(dict, eval-on-load)) ||
(vfe-type VERIEXEC_UNTRUSTED)) {
u_char *digest;
@@ -1314,6 +1302,18 @@ veriexec_file_add(struct lwp *l, prop_di
kmem_free(digest, vfe-ops-hash_len);
}
+ vte = veriexec_table_lookup(vp-v_mount);
+ if (vte == NULL)
+ vte = veriexec_table_add(l, vp-v_mount);
+
+ /* XXX if we bail below this, we might want to gc newly created vtes. */
+
+ error = fileassoc_add(vp, veriexec_hook, vfe);
+ if (error)
+ goto unlock_out;
+
+ vte-vte_count++;
+
veriexec_file_report(NULL, New entry., file, NULL, REPORT_DEBUG);
veriexec_bypass = 0;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:02 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.97 src/doc/CHANGES-6.2:1.1.2.98 --- src/doc/CHANGES-6.2:1.1.2.97 Tue Mar 18 08:57:53 2014 +++ src/doc/CHANGES-6.2 Tue Mar 18 09:44:02 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.97 2014/03/18 08:57:53 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.98 2014/03/18 09:44:02 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1382,3 +1382,8 @@ sys/ufs/ufs/ufs_quota2.c 1.37 distrib/sets/lists/comp/md.amd64 patch Build fix with MKDEBUG=yes on amd64. [mlelstv, ticket #1030] + +sys/kern/kern_verifiedexec.c 1.132 + + Reorder code to avoid use-after-free on error. + [maxv, ticket #1034]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:51 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.5 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-6.0.5 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-6.0.5 diff -u src/doc/CHANGES-6.0.5:1.1.2.4 src/doc/CHANGES-6.0.5:1.1.2.5 --- src/doc/CHANGES-6.0.5:1.1.2.4 Fri Feb 21 12:28:04 2014 +++ src/doc/CHANGES-6.0.5 Tue Mar 18 09:44:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.5,v 1.1.2.4 2014/02/21 12:28:04 sborrill Exp $ +# $NetBSD: CHANGES-6.0.5,v 1.1.2.5 2014/03/18 09:44:51 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.4 release to the NetBSD 6.0.5 release: @@ -35,3 +35,7 @@ sys/arch/atari/dev/ite.c 1.72 terminal. Fixes PR/48599. [tsutsui, ticket #1033] +sys/kern/kern_verifiedexec.c 1.132 + + Reorder code to avoid use-after-free on error. + [maxv, ticket #1034]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:25 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.4 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-6.1.4 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-6.1.4 diff -u src/doc/CHANGES-6.1.4:1.1.2.4 src/doc/CHANGES-6.1.4:1.1.2.5 --- src/doc/CHANGES-6.1.4:1.1.2.4 Fri Feb 21 13:28:00 2014 +++ src/doc/CHANGES-6.1.4 Tue Mar 18 09:44:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.4,v 1.1.2.4 2014/02/21 13:28:00 sborrill Exp $ +# $NetBSD: CHANGES-6.1.4,v 1.1.2.5 2014/03/18 09:44:25 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.3 release to the NetBSD 6.1.4 release: @@ -35,3 +35,7 @@ sys/arch/atari/dev/ite.c 1.72 terminal. Fixes PR/48599. [tsutsui, ticket #1033] +sys/kern/kern_verifiedexec.c 1.132 + + Reorder code to avoid use-after-free on error. + [maxv, ticket #1034]
CVS commit: src
Module Name:src Committed By: hannken Date: Tue Mar 18 10:21:48 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile vfssubr.9 src/sys/kern: vfs_mount.c src/sys/sys: param.h vnode.h src/sys/ufs/lfs: lfs_segment.c Log Message: Operations vmark(), vunmark() and vismarker() have been replaced by vfs_vnode_iterator_*(), remove them. Document vfs_vnode_iterator_*(). Make VI_MARKER private to vfs_vnode.c, vfs_mount.c and unfortunately to ufs/lfs/lfs_segment.c. Welcome to 6.99.37 To generate a diff of this commit: cvs rdiff -u -r1.1881 -r1.1882 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.374 -r1.375 src/share/man/man9/Makefile cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/vfssubr.9 cvs rdiff -u -r1.27 -r1.28 src/sys/kern/vfs_mount.c cvs rdiff -u -r1.445 -r1.446 src/sys/sys/param.h cvs rdiff -u -r1.244 -r1.245 src/sys/sys/vnode.h cvs rdiff -u -r1.234 -r1.235 src/sys/ufs/lfs/lfs_segment.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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1881 src/distrib/sets/lists/comp/mi:1.1882 --- src/distrib/sets/lists/comp/mi:1.1881 Fri Mar 14 01:05:57 2014 +++ src/distrib/sets/lists/comp/mi Tue Mar 18 10:21:47 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1881 2014/03/14 01:05:57 pooka Exp $ +# $NetBSD: mi,v 1.1882 2014/03/18 10:21:47 hannken Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -11002,6 +11002,9 @@ ./usr/share/man/cat9/vfs_sysctl.0 comp-obsolete obsolete ./usr/share/man/cat9/vfs_unbusy.0 comp-sys-catman .cat ./usr/share/man/cat9/vfs_unmountall.0 comp-sys-catman .cat +./usr/share/man/cat9/vfs_vnode_iterator_destroy.0 comp-sys-catman .cat +./usr/share/man/cat9/vfs_vnode_iterator_init.0 comp-sys-catman .cat +./usr/share/man/cat9/vfs_vnode_iterator_next.0 comp-sys-catman .cat ./usr/share/man/cat9/vfs_write_resume.0 comp-obsolete obsolete ./usr/share/man/cat9/vfs_write_suspend.0 comp-obsolete obsolete ./usr/share/man/cat9/vfsops.0 comp-sys-catman .cat @@ -17650,6 +17653,9 @@ ./usr/share/man/html9/vfs_suspend.html comp-sys-htmlman html ./usr/share/man/html9/vfs_unbusy.html comp-sys-htmlman html ./usr/share/man/html9/vfs_unmountall.html comp-sys-htmlman html +./usr/share/man/html9/vfs_vnode_iterator_destroy.html comp-sys-htmlman html +./usr/share/man/html9/vfs_vnode_iterator_init.html comp-sys-htmlman html +./usr/share/man/html9/vfs_vnode_iterator_next.html comp-sys-htmlman html ./usr/share/man/html9/vfsops.html comp-sys-htmlman html ./usr/share/man/html9/vfssubr.html comp-sys-htmlman html ./usr/share/man/html9/vget.html comp-sys-htmlman html @@ -24539,6 +24545,9 @@ ./usr/share/man/man9/vfs_sysctl.9 comp-obsolete obsolete ./usr/share/man/man9/vfs_unbusy.9 comp-sys-man .man ./usr/share/man/man9/vfs_unmountall.9 comp-sys-man .man +./usr/share/man/man9/vfs_vnode_iterator_destroy.9 comp-sys-man .man +./usr/share/man/man9/vfs_vnode_iterator_init.9 comp-sys-man .man +./usr/share/man/man9/vfs_vnode_iterator_next.9 comp-sys-man .man ./usr/share/man/man9/vfs_write_resume.9 comp-obsolete obsolete ./usr/share/man/man9/vfs_write_suspend.9 comp-obsolete obsolete ./usr/share/man/man9/vfsops.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.374 src/share/man/man9/Makefile:1.375 --- src/share/man/man9/Makefile:1.374 Thu Sep 19 17:29:06 2013 +++ src/share/man/man9/Makefile Tue Mar 18 10:21:47 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.374 2013/09/19 17:29:06 rmind Exp $ +# $NetBSD: Makefile,v 1.375 2014/03/18 10:21:47 hannken Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -876,7 +876,10 @@ MLINKS+=vfssubr.9 vfs_getnewfsid.9 \ vfssubr.9 vfs_reinit.9 \ vfssubr.9 vfs_getopsbyname.9 \ vfssubr.9 vfs_resume.9 \ - vfssubr.9 vfs_suspend.9 + vfssubr.9 vfs_suspend.9 \ + vfssubr.9 vfs_vnode_iterator_init.9 \ + vfssubr.9 vfs_vnode_iterator_destroy.9 \ + vfssubr.9 vfs_vnode_iterator_next.9 MLINKS+=vmem.9 vmem_alloc.9 \ vmem.9 vmem_create.9 \ vmem.9 vmem_destroy.9 \ Index: src/share/man/man9/vfssubr.9 diff -u src/share/man/man9/vfssubr.9:1.22 src/share/man/man9/vfssubr.9:1.23 --- src/share/man/man9/vfssubr.9:1.22 Sat Feb 22 11:08:05 2014 +++ src/share/man/man9/vfssubr.9 Tue Mar 18 10:21:47 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: vfssubr.9,v 1.22 2014/02/22 11:08:05 wiz Exp $ +.\ $NetBSD: vfssubr.9,v 1.23 2014/03/18 10:21:47 hannken Exp $ .\ .\ Copyright (c) 2003, 2005, 2006 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 February 22, 2014 +.Dd March 18, 2014 .Dt VFSSUBR 9 .Os .Sh NAME @@ -51,7 +51,10 @@ .Nm vfs_reinit , .Nm vfs_getopsbyname , .Nm
CVS commit: src/libexec/rpc.rquotad
Module Name:src
Committed By: gson
Date: Tue Mar 18 11:00:20 UTC 2014
Modified Files:
src/libexec/rpc.rquotad: rquotad.c
Log Message:
Delay daemonization until RPC services have been registered.
Fixes one of the race conditions of PR misc/48282.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/rpc.rquotad/rquotad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/rpc.rquotad/rquotad.c
diff -u src/libexec/rpc.rquotad/rquotad.c:1.32 src/libexec/rpc.rquotad/rquotad.c:1.33
--- src/libexec/rpc.rquotad/rquotad.c:1.32 Mon Jan 9 15:37:34 2012
+++ src/libexec/rpc.rquotad/rquotad.c Tue Mar 18 11:00:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rquotad.c,v 1.32 2012/01/09 15:37:34 dholland Exp $ */
+/* $NetBSD: rquotad.c,v 1.33 2014/03/18 11:00:20 gson Exp $ */
/*
* by Manuel Bouyer (bou...@ensta.fr). Public domain.
@@ -6,7 +6,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rquotad.c,v 1.32 2012/01/09 15:37:34 dholland Exp $);
+__RCSID($NetBSD: rquotad.c,v 1.33 2014/03/18 11:00:20 gson Exp $);
#endif
#include sys/param.h
@@ -62,13 +62,8 @@ main(int argc, char *argv[])
from_inetd = 0;
if (!from_inetd) {
- daemon(0, 0);
-
(void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
(void) rpcb_unset(RQUOTAPROG, EXT_RQUOTAVERS, NULL);
- (void) signal(SIGINT, cleanup);
- (void) signal(SIGTERM, cleanup);
- (void) signal(SIGHUP, cleanup);
}
openlog(rpc.rquotad, LOG_PID, LOG_DAEMON);
@@ -106,6 +101,12 @@ main(int argc, char *argv[])
}
}
+ if (!from_inetd) {
+ daemon(0, 0);
+ (void) signal(SIGINT, cleanup);
+ (void) signal(SIGTERM, cleanup);
+ (void) signal(SIGHUP, cleanup);
+ }
svc_run();
syslog(LOG_ERR, svc_run returned);
exit(1);
CVS commit: src/sys/arch/arm/gemini
Module Name:src
Committed By: martin
Date: Tue Mar 18 12:54:29 UTC 2014
Modified Files:
src/sys/arch/arm/gemini: gemini_timer.c
Log Message:
Bracket timer_init() with disable_interrupts()/restore_interrupts()
properly. Pointed out by Chris Gilbert.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_timer.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/arm/gemini/gemini_timer.c
diff -u src/sys/arch/arm/gemini/gemini_timer.c:1.6 src/sys/arch/arm/gemini/gemini_timer.c:1.7
--- src/sys/arch/arm/gemini/gemini_timer.c:1.6 Sun Mar 9 10:33:23 2014
+++ src/sys/arch/arm/gemini/gemini_timer.c Tue Mar 18 12:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 martin Exp $ */
+/* $NetBSD: gemini_timer.c,v 1.7 2014/03/18 12:54:29 martin Exp $ */
/* adapted from:
* NetBSD: omap2_geminitmr.c,v 1.1 2008/08/27 11:03:10 matt Exp
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: gemini_timer.c,v 1.7 2014/03/18 12:54:29 martin Exp $);
#include opt_gemini.h
#include opt_cpuoptions.h
@@ -257,7 +257,9 @@ statintr(void *frame)
static void
timer_init(geminitmr_softc_t *sc, int schz, boolean_t autoload, boolean_t intr)
{
- disable_interrupts(I32_bit);
+ int psw;
+
+ psw = disable_interrupts(I32_bit);
timer_factors(sc, schz, autoload);
_timer_stop(sc);
_timer_intr_dis(sc);
@@ -265,7 +267,7 @@ timer_init(geminitmr_softc_t *sc, int sc
if (intr)
_timer_intr_enb(sc);
_timer_start(sc);
- enable_interrupts(I32_bit);
+ restore_interrupts(psw);
}
void
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Tue Mar 18 13:08:15 UTC 2014
Modified Files:
src/sys/lib/libunwind: Registers.hpp libunwind.cxx unwind_registers.S
Log Message:
Add basic unwind support for VAX. PSW handling and stack pointer after
resume is still incomplete.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/Registers.hpp
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libunwind/libunwind.cxx \
src/sys/lib/libunwind/unwind_registers.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/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.4 src/sys/lib/libunwind/Registers.hpp:1.5
--- src/sys/lib/libunwind/Registers.hpp:1.4 Wed Mar 12 00:01:12 2014
+++ src/sys/lib/libunwind/Registers.hpp Tue Mar 18 13:08:15 2014
@@ -308,6 +308,70 @@ private:
uint64_t fpreg[32];
};
+enum {
+ DWARF_VAX_R0 = 0,
+ DWARF_VAX_R15 = 15,
+ DWARF_VAX_PSW = 16,
+
+ REGNO_VAX_R0 = 0,
+ REGNO_VAX_R14 = 14,
+ REGNO_VAX_R15 = 15,
+ REGNO_VAX_PSW = 16,
+};
+
+class Registers_vax {
+public:
+ enum {
+LAST_REGISTER = REGNO_VAX_PSW,
+LAST_RESTORE_REG = REGNO_VAX_PSW,
+RETURN_REG = REGNO_VAX_R15,
+ };
+
+ __dso_hidden Registers_vax();
+
+ static int dwarf2regno(int num) {
+if (num = DWARF_VAX_R0 num = DWARF_VAX_R15)
+ return REGNO_VAX_R0 + (num - DWARF_VAX_R0);
+if (num == DWARF_VAX_PSW)
+ return REGNO_VAX_PSW;
+return LAST_REGISTER + 1;
+ }
+
+ bool validRegister(int num) const {
+return num = 0 num = LAST_RESTORE_REG;
+ }
+
+ uint64_t getRegister(int num) const {
+assert(validRegister(num));
+return reg[num];
+ }
+
+ void setRegister(int num, uint64_t value) {
+assert(validRegister(num));
+reg[num] = value;
+ }
+
+ uint64_t getIP() const { return reg[REGNO_VAX_R15]; }
+
+ void setIP(uint64_t value) { reg[REGNO_VAX_R15] = value; }
+
+ uint64_t getSP() const { return reg[REGNO_VAX_R14]; }
+
+ void setSP(uint64_t value) { reg[REGNO_VAX_R14] = value; }
+
+ bool validFloatVectorRegister(int num) const {
+return false;
+ }
+
+ void copyFloatVectorRegister(int num, uint64_t addr_) {
+ }
+
+ __dso_hidden void jumpto() const __dead;
+
+private:
+ uint32_t reg[REGNO_VAX_PSW + 1];
+};
+
} // namespace _Unwind
#endif // __REGISTERS_HPP__
Index: src/sys/lib/libunwind/libunwind.cxx
diff -u src/sys/lib/libunwind/libunwind.cxx:1.3 src/sys/lib/libunwind/libunwind.cxx:1.4
--- src/sys/lib/libunwind/libunwind.cxx:1.3 Thu Mar 13 00:28:20 2014
+++ src/sys/lib/libunwind/libunwind.cxx Tue Mar 18 13:08:15 2014
@@ -25,6 +25,8 @@ typedef Registers_x86_64 ThisUnwindRegis
typedef Registers_ppc32 ThisUnwindRegisters;
#elif __arm__ !defined(__ARM_EABI__)
typedef Registers_arm32 ThisUnwindRegisters;
+#elif __vax__
+typedef Registers_vax ThisUnwindRegisters;
#else
#error Unsupported architecture
#endif
Index: src/sys/lib/libunwind/unwind_registers.S
diff -u src/sys/lib/libunwind/unwind_registers.S:1.3 src/sys/lib/libunwind/unwind_registers.S:1.4
--- src/sys/lib/libunwind/unwind_registers.S:1.3 Wed Mar 12 00:01:12 2014
+++ src/sys/lib/libunwind/unwind_registers.S Tue Mar 18 13:08:15 2014
@@ -288,3 +288,58 @@ ENTRY(_ZNK7_Unwind15Registers_arm326jump
ldmia r0, {r0-r15}
END(_ZNK7_Unwind15Registers_arm326jumptoEv)
#endif
+
+#if defined(__vax__)
+ .hidden _ZN7_Unwind13Registers_vaxC1Ev
+ENTRY(_ZN7_Unwind13Registers_vaxC1Ev, R0)
+ subl2 $4, %sp
+ movl 4(%ap), %r0
+ movl %r1, 4(%r0)
+ movl %r2, 8(%r0)
+ movl %r3, 12(%r0)
+ movl %r4, 16(%r0)
+ movl %r5, 20(%r0)
+ movl %r6, 24(%r0)
+ movl %r7, 28(%r0)
+ movl %r8, 32(%r0)
+ movl %r9, 36(%r0)
+ movl %r10, 40(%r0)
+ movl %r11, 44(%r0)
+ movl 8(%fp), 48(%r0)
+ movl 12(%fp), 52(%r0)
+ /* XXX correct argument handling */
+ addl3 $36, %r14, 56(%r0)
+ /* Return PC */
+ movl 16(%fp), 60(%r0)
+ /* Load saved value of r0 as r1 */
+ movl 20(%fp), 0(%r0)
+ /* Saved PSW */
+ movl 4(%fp), 64(%r0)
+ ret
+END(_ZN7_Unwind13Registers_vaxC1Ev)
+
+ .hidden _ZNK7_Unwind13Registers_vax6jumptoEv
+ENTRY(_ZNK7_Unwind13Registers_vax6jumptoEv, 0)
+ subl2 $4, %sp
+ movl 4(%ap), %r0
+ movl 4(%r0), %r1
+ movl 8(%r0), %r2
+ movl 12(%r0), %r3
+ movl 16(%r0), %r4
+ movl 20(%r0), %r5
+ movl 24(%r0), %r6
+ movl 28(%r0), %r7
+ movl 32(%r0), %r8
+ movl 36(%r0), %r9
+ movl 40(%r0), %r10
+ movl 44(%r0), %r11
+ movl 48(%r0), %r12
+ movl 52(%r0), %r13
+ movl 56(%r0), %r14
+ movl 60(%r0), -(%sp)
+ movl 0(%r0), %r0
+ /* XXX restore PSW */
+ rsb
+
+END(_ZNK7_Unwind13Registers_vax6jumptoEv)
+#endif
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Tue Mar 18 13:10:27 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
libunwind supports vax now.
To generate a diff of this commit:
cvs rdiff -u -r1.789 -r1.790 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.789 src/share/mk/bsd.own.mk:1.790
--- src/share/mk/bsd.own.mk:1.789 Mon Mar 17 07:11:40 2014
+++ src/share/mk/bsd.own.mk Tue Mar 18 13:10:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.789 2014/03/17 07:11:40 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.790 2014/03/18 13:10:27 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -100,6 +100,7 @@ HAVE_LIBGCC?= yes
_LIBC_UNWIND_SUPPORT.i386= yes
_LIBC_UNWIND_SUPPORT.powerpc= yes
+_LIBC_UNWIND_SUPPORT.vax= yes
_LIBC_UNWIND_SUPPORT.x86_64= yes
.if ${MKLLVM:Uno} == yes ${_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}:Uno} == yes
HAVE_LIBGCC_EH?= no
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist/tests
Module Name:othersrc Committed By: dholland Date: Tue Mar 18 13:22:01 UTC 2014 Modified Files: othersrc/external/bsd/bsd-pkg-config/dist/tests: basetest.good package-query-libtuff-4.good package-query-y11.good package-query-ykbproto.good package-query-yproto.good Log Message: update for agc's simultaneous changes To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.good Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good diff -u othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good:1.1 othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good:1.2 --- othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good:1.1 Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good Tue Mar 18 13:22:01 2014 @@ -3,11 +3,10 @@ *** number of lines of help *** 1 *** modversion of many libs *** -Package y11 not installed Exit 1 *** cflags and libs together *** -Package --ldflags not installed -Exit 1 + + *** get prefix A *** Package y11 not installed Exit 1 @@ -19,16 +18,15 @@ Exit 1 *** list-all *** *** cflags with PKG_CONFIG_SYSROOT_DIR *** -Package y11 not installed -Exit 1 + + *** libs with PKG_CONFIG_SYSROOT_DIR *** -Package y11 not installed -Exit 1 + + *** getting own version with modversion *** -Package pkg-config not installed Exit 1 *** getting search path *** *** explicit .pc file *** -Package ./pcfiles/y11.pc not installed -Exit 1 + + Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good diff -u othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good:1.1 othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good:1.2 --- othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good:1.1 Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good Tue Mar 18 13:22:01 2014 @@ -3,7 +3,6 @@ *** exists *** Exit 1 *** modversion *** -Package libtuff-4 not installed Exit 1 *** atleast-version=4.0.1 *** @@ -12,21 +11,18 @@ Exit 1 *** max-version=4.0.1 *** *** cflags *** -Package libtuff-4 not installed -Exit 1 + + *** cflags-only-I *** *** libs *** -Package libtuff-4 not installed -Exit 1 + + *** libs-only-L *** -Package libtuff-4 not installed *** libs-only-l *** -Package libtuff-4 not installed *** libs-only-other *** -Package libtuff-4 not installed *** print-variables *** @@ -143,72 +139,49 @@ Exit 1 *** max-version with no op with --silence-errors *** *** uninstalled with --static *** -Package --uninstalled not installed Exit 1 *** exists with --static *** -Package libtuff-4 not installed Exit 1 *** modversion with --static *** -Package libtuff-4 not installed Exit 1 *** atleast-version=4.0.1 with --static *** -Package --atleast-version=4.0.1 not installed Exit 1 *** exact-version=4.0.1 with --static *** -Package --exact-version=4.0.1 not installed Exit 1 *** max-version=4.0.1 with --static *** -Package --max-version=4.0.1 not installed Exit 1 *** cflags with --static *** -Package libtuff-4 not installed Exit 1 *** cflags-only-I with --static *** -Package --cflags-only-I not installed Exit 1 *** libs with --static *** -Package libtuff-4 not installed Exit 1 *** libs-only-L with --static *** -Package libtuff-4 not installed Exit 1 *** libs-only-l with --static *** -Package libtuff-4 not installed Exit 1 *** libs-only-other with --static *** -Package libtuff-4 not installed Exit 1 *** print-variables with --static *** -Package --print-variables not installed Exit 1 *** print-provides with --static *** -Package --print-provides not installed Exit 1 *** print-requires with --static *** -Package --print-requires not installed Exit 1 *** print-requires-private with --static *** -Package --print-requires-private not installed Exit 1 *** atleast-version using exists with --static *** -Package libtuff-4 not installed Exit 1 *** exact-version using exists with --static *** -Package libtuff-4 not installed Exit 1 *** max-version using exists with --static *** -Package libtuff-4 not installed Exit 1 *** no explicit op with --static *** -Package libtuff-4 not installed Exit 1 *** atleast-version with no op with --static *** -Package libtuff-4 not installed Exit 1 *** exact-version with no op with --static *** -Package libtuff-4 not installed Exit 1 *** max-version with no op
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: macallan
Date: Tue Mar 18 14:34:31 UTC 2014
Modified Files:
src/sys/arch/powerpc/powerpc: clock.c
Log Message:
split 601 and generic PowerPC timecounter code a bit more
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/powerpc/clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/clock.c
diff -u src/sys/arch/powerpc/powerpc/clock.c:1.14 src/sys/arch/powerpc/powerpc/clock.c:1.15
--- src/sys/arch/powerpc/powerpc/clock.c:1.14 Mon Mar 3 15:36:36 2014
+++ src/sys/arch/powerpc/powerpc/clock.c Tue Mar 18 14:34:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.14 2014/03/03 15:36:36 macallan Exp $ */
+/* $NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.14 2014/03/03 15:36:36 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -58,21 +58,33 @@ __KERNEL_RCSID(0, $NetBSD: clock.c,v 1.
void decr_intr(struct clockframe *);
void init_powerpc_tc(void);
static u_int get_powerpc_timecount(struct timecounter *);
+#ifdef PPC_OEA601
+static u_int get_601_timecount(struct timecounter *);
+#endif
uint32_t ticks_per_sec;
uint32_t ns_per_tick;
uint32_t ticks_per_intr = 0;
+#ifdef PPC_OEA601
+static struct timecounter powerpc_601_timecounter = {
+ get_601_timecount, /* get_timecount */
+ 0, /* no poll_pps */
+ 0x7fff, /* counter_mask */
+ 0, /* frequency */
+ rtc, /* name */
+ 100, /* quality */
+ NULL, /* tc_priv */
+ NULL /* tc_next */
+};
+#endif
+
static struct timecounter powerpc_timecounter = {
get_powerpc_timecount, /* get_timecount */
0, /* no poll_pps */
0x7fff, /* counter_mask */
0, /* frequency */
-#if PPC_OEA601
- rtc, /* name */
-#else
mftb, /* name */
-#endif
100, /* quality */
NULL, /* tc_priv */
NULL /* tc_next */
@@ -122,7 +134,7 @@ void
decr_intr(struct clockframe *cfp)
{
struct cpu_info * const ci = curcpu();
- int msr;
+ const register_t msr = mfmsr();
int pri;
u_long tb;
long ticks;
@@ -163,13 +175,8 @@ decr_intr(struct clockframe *cfp)
__asm volatile (mftb %0 : =r(tb));
ci-ci_lasttb = tb + ticks - ticks_per_intr;
-
- /*
- * Reenable interrupts
- */
- __asm volatile (mfmsr %0; ori %0, %0, %1; mtmsr %0
- : =r(msr) : K(PSL_EE));
-
+ ci-ci_idepth++;
+ mtmsr(msr | PSL_EE);
/*
* Do standard timer interrupt stuff.
* Do softclock stuff only on the last iteration.
@@ -177,8 +184,12 @@ decr_intr(struct clockframe *cfp)
while (--nticks 0)
hardclock(cfp);
hardclock(cfp);
+ mtmsr(msr);
+ ci-ci_idepth--;
}
+ mtmsr(msr | PSL_EE);
splx(pri);
+ mtmsr(msr);
}
/*
@@ -241,21 +252,42 @@ get_powerpc_timecount(struct timecounter
__asm volatile (mfmsr %0; andi. %1,%0,%2; mtmsr %1
: =r(msr), =r(scratch) : K((u_short)~PSL_EE));
+
+ tb = (u_int)(mftb() 0x7fff);
+ mtmsr(msr);
+
+ return tb;
+}
+
#ifdef PPC_OEA601
- if ((mfpvr() 16) == MPC601)
- tb = rtc_nanosecs();
- else
-#endif
- __asm volatile (mftb %0 : =r(tb));
+static u_int
+get_601_timecount(struct timecounter *tc)
+{
+ u_long tb;
+ int msr, scratch;
+
+ __asm volatile (mfmsr %0; andi. %1,%0,%2; mtmsr %1
+ : =r(msr), =r(scratch) : K((u_short)~PSL_EE));
+
+ tb = rtc_nanosecs();
mtmsr(msr);
return tb;
}
+#endif
void
init_powerpc_tc(void)
{
- /* from machdep initialization */
- powerpc_timecounter.tc_frequency = ticks_per_sec;
- tc_init(powerpc_timecounter);
+ struct timecounter *tc;
+
+#ifdef PPC_OEA601
+ if ((mfpvr() 16) == MPC601) {
+ tc = powerpc_601_timecounter;
+ } else
+#endif
+ tc = powerpc_timecounter;
+
+ tc-tc_frequency = ticks_per_sec;
+ tc_init(tc);
}
CVS commit: src/sys/sys
Module Name:src
Committed By: riastradh
Date: Tue Mar 18 14:28:37 UTC 2014
Modified Files:
src/sys/sys: endian.h
Log Message:
Avoid undefined behaviour in shifts in endian decoding routines.
If int is 32-bit and p is a uint8_t *, then p[0] is promoted to int
and p[0] 24 can shift a one into the sign bit of an int, which is
nasal demon territory.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/sys/endian.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/sys/endian.h
diff -u src/sys/sys/endian.h:1.28 src/sys/sys/endian.h:1.29
--- src/sys/sys/endian.h:1.28 Sat Aug 8 21:23:15 2009
+++ src/sys/sys/endian.h Tue Mar 18 14:28:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: endian.h,v 1.28 2009/08/08 21:23:15 christos Exp $ */
+/* $NetBSD: endian.h,v 1.29 2014/03/18 14:28:37 riastradh Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -250,7 +250,7 @@ be16dec(const void *buf)
{
const uint8_t *p = __CAST(const uint8_t *, buf);
- return __CAST(uint16_t, ((p[0] 8) | p[1]));
+ return ((__CAST(uint16_t, p[0]) 8) | p[1]);
}
static __inline uint16_t __unused
@@ -258,7 +258,7 @@ le16dec(const void *buf)
{
const uint8_t *p = __CAST(const uint8_t *, buf);
- return __CAST(uint16_t, ((p[1] 8) | p[0]));
+ return (p[0] | (__CAST(uint16_t, p[1]) 8));
}
static __inline void __unused
@@ -288,7 +288,7 @@ be32dec(const void *buf)
{
const uint8_t *p = __CAST(const uint8_t *, buf);
- return ((p[0] 24) | (p[1] 16) | (p[2] 8) | p[3]);
+ return ((__CAST(uint32_t, be16dec(p)) 16) | be16dec(p + 2));
}
static __inline uint32_t __unused
@@ -296,7 +296,7 @@ le32dec(const void *buf)
{
const uint8_t *p = __CAST(const uint8_t *, buf);
- return ((p[3] 24) | (p[2] 16) | (p[1] 8) | p[0]);
+ return (le16dec(p) | (__CAST(uint32_t, le16dec(p + 2)) 16));
}
static __inline void __unused
CVS commit: src/sys/dev
Module Name:src
Committed By: skrll
Date: Tue Mar 18 15:44:37 UTC 2014
Modified Files:
src/sys/dev: cgd.c cgdvar.h
Log Message:
Remove a simplelock and replace with a kmutex
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/cgd.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cgdvar.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/cgd.c
diff -u src/sys/dev/cgd.c:1.84 src/sys/dev/cgd.c:1.85
--- src/sys/dev/cgd.c:1.84 Sun Mar 16 05:20:26 2014
+++ src/sys/dev/cgd.c Tue Mar 18 15:44:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.84 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: cgd.c,v 1.85 2014/03/18 15:44:37 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.84 2014/03/16 05:20:26 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.85 2014/03/18 15:44:37 skrll Exp $);
#include sys/types.h
#include sys/param.h
@@ -200,7 +200,7 @@ cgd_attach(device_t parent, device_t sel
{
struct cgd_softc *sc = device_private(self);
- simple_lock_init(sc-sc_slock);
+ mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_BIO);
dk_sc_init(sc-sc_dksc, device_xname(self));
sc-sc_dksc.sc_dev = self;
disk_init(sc-sc_dksc.sc_dkdev, sc-sc_dksc.sc_xname, cgddkdriver);
@@ -354,12 +354,12 @@ cgd_getdata(struct dk_softc *dksc, unsig
struct cgd_softc *cs = (struct cgd_softc *)dksc;
void * data = NULL;
- simple_lock(cs-sc_slock);
+ mutex_enter(cs-sc_lock);
if (cs-sc_data_used == 0) {
cs-sc_data_used = 1;
data = cs-sc_data;
}
- simple_unlock(cs-sc_slock);
+ mutex_exit(cs-sc_lock);
if (data)
return data;
@@ -373,9 +373,9 @@ cgd_putdata(struct dk_softc *dksc, void
struct cgd_softc *cs = (struct cgd_softc *)dksc;
if (data == cs-sc_data) {
- simple_lock(cs-sc_slock);
+ mutex_enter(cs-sc_lock);
cs-sc_data_used = 0;
- simple_unlock(cs-sc_slock);
+ mutex_exit(cs-sc_lock);
} else {
free(data, M_DEVBUF);
}
Index: src/sys/dev/cgdvar.h
diff -u src/sys/dev/cgdvar.h:1.16 src/sys/dev/cgdvar.h:1.17
--- src/sys/dev/cgdvar.h:1.16 Wed Dec 5 02:23:20 2012
+++ src/sys/dev/cgdvar.h Tue Mar 18 15:44:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.16 2012/12/05 02:23:20 christos Exp $ */
+/* $NetBSD: cgdvar.h,v 1.17 2014/03/18 15:44:37 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,8 +32,6 @@
#ifndef _DEV_CGDVAR_H_
#define _DEV_CGDVAR_H_
-#include sys/simplelock.h
-
/* ioctl(2) code: used by CGDIOCSET and CGDIOCCLR */
struct cgd_ioctl {
const char *ci_disk;
@@ -90,7 +88,7 @@ struct cgd_softc {
size_t sc_tpathlen; /* length of prior string */
struct cryptdata sc_cdata; /* crypto data */
const struct cryptfuncs *sc_cfuncs; /* encryption functions */
- struct simplelock sc_slock; /* our lock */
+ kmutex_t sc_lock; /* our lock */
};
#endif
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Tue Mar 18 16:05:34 UTC 2014
Modified Files:
src/libexec/ld.elf_so: rtld.c
Log Message:
Ignore LD_BIND_NOW for setuid binaries, but keep it in the environment
otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.172 src/libexec/ld.elf_so/rtld.c:1.173
--- src/libexec/ld.elf_so/rtld.c:1.172 Fri Jan 31 22:46:40 2014
+++ src/libexec/ld.elf_so/rtld.c Tue Mar 18 16:05:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.172 2014/01/31 22:46:40 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.173 2014/03/18 16:05:34 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.172 2014/01/31 22:46:40 joerg Exp $);
+__RCSID($NetBSD: rtld.c,v 1.173 2014/03/18 16:05:34 joerg Exp $);
#endif /* not lint */
#include sys/param.h
@@ -558,7 +558,10 @@ _rtld(Elf_Addr *sp, Elf_Addr relocbase)
*oenvp++ = *env;
}
} else if (strncmp(*env, bind_var, LEN(bind_var)) == 0) {
- ld_bind_now = *env + LEN(bind_var);
+ if (_rtld_trust) {
+ld_bind_now = *env + LEN(bind_var);
+*oenvp++ = *env;
+ }
} else if (strncmp(*env, path_var, LEN(path_var)) == 0) {
if (_rtld_trust) {
ld_library_path = *env + LEN(path_var);
CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Tue Mar 18 17:11:19 UTC 2014 Modified Files: src/sys/arch/alpha/include: cdefs.h src/sys/arch/arm/include: cdefs.h src/sys/arch/hppa/include: cdefs.h src/sys/arch/ia64/include: cdefs.h src/sys/arch/mips/include: cdefs.h src/sys/arch/sparc/include: cdefs.h Log Message: Make all __ALIGNBYTES macros return the same type (size_t) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/cdefs.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/cdefs.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/alpha/include/cdefs.h diff -u src/sys/arch/alpha/include/cdefs.h:1.12 src/sys/arch/alpha/include/cdefs.h:1.13 --- src/sys/arch/alpha/include/cdefs.h:1.12 Fri Jan 20 09:08:05 2012 +++ src/sys/arch/alpha/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,8 +1,8 @@ -/* $NetBSD: cdefs.h,v 1.12 2012/01/20 14:08:05 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_MACHINE_CDEFS_H_ */ Index: src/sys/arch/arm/include/cdefs.h diff -u src/sys/arch/arm/include/cdefs.h:1.12 src/sys/arch/arm/include/cdefs.h:1.13 --- src/sys/arch/arm/include/cdefs.h:1.12 Tue Jan 28 20:20:03 2014 +++ src/sys/arch/arm/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.12 2014/01/29 01:20:03 matt Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _ARM_CDEFS_H_ #define _ARM_CDEFS_H_ @@ -50,7 +50,7 @@ #endif #if defined(__ARM_EABI__) || defined(__ARM_PCS_AAPCS64) -#define __ALIGNBYTES (8 - 1) +#define __ALIGNBYTES ((size_t)(8 - 1)) #else #define __ALIGNBYTES (sizeof(int) - 1) #endif Index: src/sys/arch/hppa/include/cdefs.h diff -u src/sys/arch/hppa/include/cdefs.h:1.2 src/sys/arch/hppa/include/cdefs.h:1.3 --- src/sys/arch/hppa/include/cdefs.h:1.2 Fri Jan 20 09:08:05 2012 +++ src/sys/arch/hppa/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.2 2012/01/20 14:08:05 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.3 2014/03/18 17:11:19 christos Exp $ */ #ifndef _HPPA_CDEFS_H_ #define _HPPA_CDEFS_H_ @@ -10,6 +10,6 @@ */ #define __ASM_DELIMITER \n\t -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_HPPA_CDEFS_H_ */ Index: src/sys/arch/ia64/include/cdefs.h diff -u src/sys/arch/ia64/include/cdefs.h:1.2 src/sys/arch/ia64/include/cdefs.h:1.3 --- src/sys/arch/ia64/include/cdefs.h:1.2 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/ia64/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.2 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.3 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ @@ -8,6 +8,6 @@ #define __ELF__ #endif -#define __ALIGNBYTES 15 +#define __ALIGNBYTES ((size_t)15) #endif /* !_MACHINE_CDEFS_H_ */ Index: src/sys/arch/mips/include/cdefs.h diff -u src/sys/arch/mips/include/cdefs.h:1.14 src/sys/arch/mips/include/cdefs.h:1.15 --- src/sys/arch/mips/include/cdefs.h:1.14 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/mips/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.14 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.15 2014/03/18 17:11:19 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -71,6 +71,6 @@ #define _MIPS_ISA_MIPS32 5 #define _MIPS_ISA_MIPS64 6 -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_MIPS_CDEFS_H_ */ Index: src/sys/arch/sparc/include/cdefs.h diff -u src/sys/arch/sparc/include/cdefs.h:1.12 src/sys/arch/sparc/include/cdefs.h:1.13 --- src/sys/arch/sparc/include/cdefs.h:1.12 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/sparc/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,13 +1,13 @@ -/* $NetBSD: cdefs.h,v 1.12 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ /* No arch-specific cdefs. */ #ifdef __arch64__ -#define __ALIGNBYTES 0xf +#define __ALIGNBYTES ((size_t)0xf) #else -#define __ALIGNBYTES 0x7 +#define __ALIGNBYTES ((size_t)0x7) #endif #endif /* !_MACHINE_CDEFS_H_ */
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Tue Mar 18 18:10:09 UTC 2014
Modified Files:
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
Trim alignment out of packet length before passing it up.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/net/lib/libvirtif/if_virt.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/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.44 src/sys/rump/net/lib/libvirtif/if_virt.c:1.45
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.44 Thu Mar 13 21:11:12 2014
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Tue Mar 18 18:10:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.44 2014/03/13 21:11:12 pooka Exp $ */
+/* $NetBSD: if_virt.c,v 1.45 2014/03/18 18:10:08 pooka Exp $ */
/*
* Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.44 2014/03/13 21:11:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.45 2014/03/18 18:10:08 pooka Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -353,8 +353,10 @@ VIF_DELIVERPKT(struct virtif_sc *sc, str
return;
}
}
-
m-m_data += align;
+ m-m_pkthdr.len -= align;
+ m-m_len -= align;
+
eth = mtod(m, struct ether_header *);
if (memcmp(eth-ether_dhost, CLLADDR(ifp-if_sadl),
ETHER_ADDR_LEN) == 0) {
CVS commit: src/usr.sbin/rtsold
Module Name:src
Committed By: christos
Date: Tue Mar 18 19:30:09 UTC 2014
Modified Files:
src/usr.sbin/rtsold: rtsold.c
Log Message:
use time_t for time
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.c
diff -u src/usr.sbin/rtsold/rtsold.c:1.38 src/usr.sbin/rtsold/rtsold.c:1.39
--- src/usr.sbin/rtsold/rtsold.c:1.38 Mon Mar 17 20:16:49 2014
+++ src/usr.sbin/rtsold/rtsold.c Tue Mar 18 15:30:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsold.c,v 1.38 2014/03/18 00:16:49 christos Exp $ */
+/* $NetBSD: rtsold.c,v 1.39 2014/03/18 19:30:09 christos Exp $ */
/* $KAME: rtsold.c,v 1.77 2004/01/03 01:35:13 itojun Exp $ */
/*
@@ -565,7 +565,7 @@ rtsol_timer_update(struct ifinfo *ifinfo
{
#define MILLION 100
#define DADRETRY 10 /* XXX: adhoc */
- long interval;
+ time_t interval;
struct timeval now;
bzero(ifinfo-timer, sizeof(ifinfo-timer));
@@ -587,7 +587,7 @@ rtsol_timer_update(struct ifinfo *ifinfo
ifinfo-timer = tm_max; /* stop timer(valid?) */
break;
case IFS_DELAY:
- interval = arc4random() % (MAX_RTR_SOLICITATION_DELAY * MILLION);
+ interval = (time_t) (arc4random() % (MAX_RTR_SOLICITATION_DELAY * MILLION));
ifinfo-timer.tv_sec = interval / MILLION;
ifinfo-timer.tv_usec = (suseconds_t)(interval % MILLION);
break;
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: macallan
Date: Tue Mar 18 20:11:08 UTC 2014
Modified Files:
src/sys/arch/powerpc/powerpc: clock.c
Log Message:
Can we use c99 field initializers here instead of comments?!?
Yes, yes we can.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/powerpc/clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/clock.c
diff -u src/sys/arch/powerpc/powerpc/clock.c:1.15 src/sys/arch/powerpc/powerpc/clock.c:1.16
--- src/sys/arch/powerpc/powerpc/clock.c:1.15 Tue Mar 18 14:34:31 2014
+++ src/sys/arch/powerpc/powerpc/clock.c Tue Mar 18 20:11:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan Exp $ */
+/* $NetBSD: clock.c,v 1.16 2014/03/18 20:11:08 macallan Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.16 2014/03/18 20:11:08 macallan Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -68,26 +68,26 @@ uint32_t ticks_per_intr = 0;
#ifdef PPC_OEA601
static struct timecounter powerpc_601_timecounter = {
- get_601_timecount, /* get_timecount */
- 0, /* no poll_pps */
- 0x7fff, /* counter_mask */
- 0, /* frequency */
- rtc, /* name */
- 100, /* quality */
- NULL, /* tc_priv */
- NULL /* tc_next */
+ .tc_get_timecount = get_601_timecount,
+ .tc_poll_pps = 0,
+ .tc_counter_mask = 0x7fff,
+ .tc_frequency = 0,
+ .tc_name = rtc,
+ .tc_quality = 100,
+ .tc_priv = NULL,
+ .tc_next = NULL
};
#endif
static struct timecounter powerpc_timecounter = {
- get_powerpc_timecount, /* get_timecount */
- 0, /* no poll_pps */
- 0x7fff, /* counter_mask */
- 0, /* frequency */
- mftb, /* name */
- 100, /* quality */
- NULL, /* tc_priv */
- NULL /* tc_next */
+ .tc_get_timecount = get_powerpc_timecount,
+ .tc_poll_pps = 0,
+ .tc_counter_mask = 0x7fff,
+ .tc_frequency = 0,
+ .tc_name = mftb,
+ .tc_quality = 100,
+ .tc_priv = NULL,
+ .tc_next = NULL
};
/*
CVS commit: src/usr.sbin/rtsold
Module Name:src
Committed By: dsl
Date: Tue Mar 18 20:39:55 UTC 2014
Modified Files:
src/usr.sbin/rtsold: rtsold.c
Log Message:
Change previous to use uint32_t for 'interval'.
The value is a random interval in usec obtained by reducing a uint32_t
value modulo 100 (multiplied by a delay in seconds of 1).
The value is then being split into secs+usec and assigned to a timeval
(and an interval).
With -Wsign-conversion the type has to be either an unsigned 32bit
type, or a signed 64bit one. This is just plain stupid.
Warning about conversions between signed and unsigned types really
only makes sense if the compiler is dynamically tracking the domain
of the value.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.c
diff -u src/usr.sbin/rtsold/rtsold.c:1.39 src/usr.sbin/rtsold/rtsold.c:1.40
--- src/usr.sbin/rtsold/rtsold.c:1.39 Tue Mar 18 19:30:09 2014
+++ src/usr.sbin/rtsold/rtsold.c Tue Mar 18 20:39:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsold.c,v 1.39 2014/03/18 19:30:09 christos Exp $ */
+/* $NetBSD: rtsold.c,v 1.40 2014/03/18 20:39:55 dsl Exp $ */
/* $KAME: rtsold.c,v 1.77 2004/01/03 01:35:13 itojun Exp $ */
/*
@@ -565,7 +565,7 @@ rtsol_timer_update(struct ifinfo *ifinfo
{
#define MILLION 100
#define DADRETRY 10 /* XXX: adhoc */
- time_t interval;
+ uint32_t interval;
struct timeval now;
bzero(ifinfo-timer, sizeof(ifinfo-timer));
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Tue Mar 18 21:36:52 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c drm_global.c
drm_modes.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c i915_irq.c
intel_display.c intel_dp.c intel_hdmi.c
Log Message:
Fix unused variable warnings in drm2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_global.c \
src/sys/external/bsd/drm2/dist/drm/drm_modes.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Tue Mar 18 21:36:52 2014
@@ -1216,7 +1216,6 @@ static int drm_pick_crtcs(struct drm_fb_
struct drm_connector *connector;
struct drm_connector_helper_funcs *connector_funcs;
struct drm_encoder *encoder;
- struct drm_fb_helper_crtc *best_crtc;
int my_score, best_score, score;
struct drm_fb_helper_crtc **crtcs, *crtc;
struct drm_fb_helper_connector *fb_helper_conn;
@@ -1228,7 +1227,6 @@ static int drm_pick_crtcs(struct drm_fb_
connector = fb_helper_conn-connector;
best_crtcs[n] = NULL;
- best_crtc = NULL;
best_score = drm_pick_crtcs(fb_helper, best_crtcs, modes, n+1, width, height);
if (modes[n] == NULL)
return best_score;
@@ -1277,7 +1275,6 @@ static int drm_pick_crtcs(struct drm_fb_
score = my_score + drm_pick_crtcs(fb_helper, crtcs, modes, n + 1,
width, height);
if (score best_score) {
- best_crtc = crtc;
best_score = score;
memcpy(best_crtcs, crtcs,
dev-mode_config.num_connector *
@@ -1419,7 +1416,6 @@ EXPORT_SYMBOL(drm_fb_helper_initial_conf
int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
{
struct drm_device *dev = fb_helper-dev;
- int count = 0;
u32 max_width, max_height, bpp_sel;
int bound = 0, crtcs_bound = 0;
struct drm_crtc *crtc;
@@ -1446,8 +1442,7 @@ int drm_fb_helper_hotplug_event(struct d
max_height = fb_helper-fb-height;
bpp_sel = fb_helper-fb-bits_per_pixel;
- count = drm_fb_helper_probe_connector_modes(fb_helper, max_width,
- max_height);
+ drm_fb_helper_probe_connector_modes(fb_helper, max_width, max_height);
drm_setup_crtcs(fb_helper);
mutex_unlock(dev-mode_config.mutex);
Index: src/sys/external/bsd/drm2/dist/drm/drm_global.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_global.c Tue Mar 18 21:36:52 2014
@@ -75,7 +75,6 @@ int drm_global_item_ref(struct drm_globa
{
int ret;
struct drm_global_item *item = glob[ref-global_type];
- void *object;
mutex_lock(item-mutex);
if (item-refcount == 0) {
@@ -93,7 +92,6 @@ int drm_global_item_ref(struct drm_globa
}
++item-refcount;
ref-object = item-object;
- object = item-object;
mutex_unlock(item-mutex);
return 0;
out_err:
Index: src/sys/external/bsd/drm2/dist/drm/drm_modes.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_modes.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_modes.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_modes.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_modes.c Tue Mar 18 21:36:52 2014
@@ -173,7 +173,7 @@ struct drm_display_mode *drm_cvt_mode(st
/* 3) Nominal HSync width (% of line period) - default 8 */
#define CVT_HSYNC_PERCENTAGE 8
unsigned int hblank_percentage;
- int vsyncandback_porch, vback_porch, hblank;
+ int vsyncandback_porch, vback_porch __unused, hblank;
/* estimated the horizontal period */
tmp1 = HV_FACTOR * 100 -
@@ -321,9 +321,9 @@ drm_gtf_mode_complex(struct drm_device *
int top_margin, bottom_margin;
int interlace;
unsigned int hfreq_est;
- int vsync_plus_bp, vback_porch;
- unsigned int vtotal_lines, vfieldrate_est, hperiod;
- unsigned int vfield_rate, vframe_rate;
+ int vsync_plus_bp, vback_porch __unused;
+ unsigned int vtotal_lines, vfieldrate_est __unused, hperiod __unused;
+ unsigned int vfield_rate, vframe_rate __unused;
int left_margin, right_margin;
unsigned int total_active_pixels, ideal_duty_cycle;
unsigned int hblank, total_pixels, pixel_freq;
Index:
CVS commit: src/lib/libm/src
Module Name:src
Committed By: dsl
Date: Tue Mar 18 21:52:19 UTC 2014
Modified Files:
src/lib/libm/src: s_exp2.c
Log Message:
Change 'i0' to be signed so that the sign bit is preserved on 'k'
and the code at the bottom splits the multiply.
Fixes denormal results.
This might have been introduced when I deferred shifting 'k' left.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_exp2.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/libm/src/s_exp2.c
diff -u src/lib/libm/src/s_exp2.c:1.4 src/lib/libm/src/s_exp2.c:1.5
--- src/lib/libm/src/s_exp2.c:1.4 Sun Mar 16 22:44:48 2014
+++ src/lib/libm/src/s_exp2.c Tue Mar 18 21:52:19 2014
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: s_exp2.c,v 1.4 2014/03/16 22:44:48 dsl Exp $);
+__RCSID($NetBSD: s_exp2.c,v 1.5 2014/03/18 21:52:19 dsl Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $);
#endif
@@ -353,7 +353,8 @@ exp2(double x)
{
volatile ieee_double_shape_type x_p_redux;
double r, t, twopk, z;
- uint32_t hx, ix, lx, i0;
+ uint32_t hx, ix, lx;
+ int32_t i0;
int k;
/* Filter out exceptional cases. */
CVS commit: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: wiz Date: Tue Mar 18 22:26:50 UTC 2014 Modified Files: xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Reduce unnecessary diffs to upstream. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.2 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.3 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.2 Sun Mar 6 01:05:51 2011 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Tue Mar 18 22:26:50 2014 @@ -84,7 +84,6 @@ fi XCOMM This is the fallback case if nothing else is executed above #endif /* !defined(__SCO__) !defined(__UNIXWARE__) */ -XCOMM do not use slash-star in the glob; slash-questionmark-star is equivalent if [ -d XINITDIR/xinitrc.d ] ; then for f in XINITDIR/xinitrc.d/?*.sh ; do [ -x $f ] . $f
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: joerg Date: Tue Mar 18 22:28:49 UTC 2014 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv841 Log Message: Import compiler-rt r204194. Fixes shift use in divide routines and const correctness in gcc_personality_v0.c. Status: Vendor Tag: LLVM Release Tags: compiler-rt-204194 U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/lib/profile/GCDAProfiling.c U src/sys/external/bsd/compiler_rt/dist/lib/profile/PGOProfiling.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_lib.h U src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulosi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/enable_execute_stack.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatuntixf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clear_cache.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/powidf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatsidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/negvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/subvdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/umodsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/trampoline_setup.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/powitf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/powixf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatuntisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/subvti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/paritydi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_math.h U src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulxc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdixf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/negsf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/subdf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/parityti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattixf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunssfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/popcountdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/lshrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatdisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendsfdf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/int_types.h U src/sys/external/bsd/compiler_rt/dist/lib/builtins/popcountti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivmodsi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/lshrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floattisf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/muldi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/floatundidf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsxfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/udivdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/multi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/mulodi4.c U
CVS commit: src/external/gpl3/binutils/dist/binutils
Module Name:src Committed By: matt Date: Tue Mar 18 23:41:02 UTC 2014 Modified Files: src/external/gpl3/binutils/dist/binutils: readelf.c Log Message: Make readelf know what the vax pcrel32 reloc number is. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/binutils/readelf.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/binutils/dist/binutils/readelf.c diff -u src/external/gpl3/binutils/dist/binutils/readelf.c:1.9 src/external/gpl3/binutils/dist/binutils/readelf.c:1.10 --- src/external/gpl3/binutils/dist/binutils/readelf.c:1.9 Thu Nov 14 12:44:25 2013 +++ src/external/gpl3/binutils/dist/binutils/readelf.c Tue Mar 18 23:41:02 2014 @@ -10020,6 +10020,8 @@ is_32bit_pcrel_reloc (unsigned int reloc case EM_L1OM: case EM_K1OM: return reloc_type == 2; /* R_X86_64_PC32. */ +case EM_VAX: + return reloc_type == 4; /* R_VAX_PCREL32. */ case EM_XTENSA_OLD: case EM_XTENSA: return reloc_type == 14; /* R_XTENSA_32_PCREL. */
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: matt
Date: Tue Mar 18 23:41:36 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-vax.c tc-vax.h
Log Message:
Add support for the .cfi pseudo-ops for VAX.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/gas/config/tc-vax.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/config/tc-vax.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-vax.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.6 src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.7
--- src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.6 Tue Jul 17 20:29:44 2012
+++ src/external/gpl3/binutils/dist/gas/config/tc-vax.c Tue Mar 18 23:41:36 2014
@@ -24,6 +24,7 @@
#include vax-inst.h
#include obstack.h /* For FRAG_APPEND_1_CHAR macro in frags.h */
+#include dw2gencfi.h
#include subsegs.h
#include safe-ctype.h
@@ -3570,3 +3571,37 @@ md_atof (int type, char * litP, int * si
{
return vax_md_atof (type, litP, sizeP);
}
+
+void
+vax_cfi_frame_initial_instructions (void)
+{
+ cfi_add_CFA_def_cfa (14, 0);
+}
+
+int
+tc_vax_regname_to_dw2regnum (char *regname)
+{
+ unsigned int i;
+ static const struct { char *name; int dw2regnum; } regnames[] =
+{
+ { r0, 0 }, { r1, 1 }, { r2, 2 }, { r3, 3 },
+ { r4, 4 }, { r5, 5 }, { r6, 6 }, { r7, 7 },
+ { r8, 8 }, { r9, 9 }, { r10, 10 }, { r11, 11 },
+ { ap, 12 }, { fp, 13 }, { sp, 14 }, { pc, 15 },
+ { psw, 16 },
+};
+
+ for (i = 0; i ARRAY_SIZE (regnames); ++i)
+if (strcmp (regnames[i].name, regname) == 0)
+ return regnames[i].dw2regnum;
+
+ return -1;
+}
+
+void
+vax_cfi_emit_pcrel_expr (expressionS *exp, unsigned int nbytes)
+{
+ vax_cons_special_reloc = pcrel;
+ emit_expr (exp, nbytes);
+ vax_cons_special_reloc = NULL;
+}
Index: src/external/gpl3/binutils/dist/gas/config/tc-vax.h
diff -u src/external/gpl3/binutils/dist/gas/config/tc-vax.h:1.3 src/external/gpl3/binutils/dist/gas/config/tc-vax.h:1.4
--- src/external/gpl3/binutils/dist/gas/config/tc-vax.h:1.3 Thu Apr 14 07:49:48 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-vax.h Tue Mar 18 23:41:36 2014
@@ -71,9 +71,17 @@ extern const struct relax_type md_relax_
== S_GET_SEGMENT ((FIX)-fx_addsy))) \
|| S_IS_LOCAL ((FIX)-fx_addsy)))
-/*
- * Local Variables:
- * comment-column: 0
- * fill-column: 131
- * End:
- */
+#define TARGET_USE_CFIPOP 1
+
+#define tc_cfi_frame_initial_instructions vax_cfi_frame_initial_instructions
+extern void vax_cfi_frame_initial_instructions (void);
+
+#define tc_regname_to_dw2regnum tc_vax_regname_to_dw2regnum
+extern int tc_vax_regname_to_dw2regnum (char *);
+
+#define tc_cfi_emit_pcrel_expr vax_cfi_emit_pcrel_expr
+extern void vax_cfi_emit_pcrel_expr (expressionS *, unsigned int);
+
+#define DWARF2_LINE_MIN_INSN_LENGTH 1
+#define DWARF2_DEFAULT_RETURN_COLUMN15
+#define DWARF2_CIE_DATA_ALIGNMENT -4
CVS commit: src/gnu/dist/gcc4/gcc/config/vax
Module Name:src
Committed By: joerg
Date: Tue Mar 18 23:43:41 UTC 2014
Modified Files:
src/gnu/dist/gcc4/gcc/config/vax: vax.c vax.h vax.md
Log Message:
Add a register definition for the Processor Status Word on VAX.
Change the unwind definition to specify the CFA base via %fp before
using it in the various register locations.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/gnu/dist/gcc4/gcc/config/vax/vax.c
cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/gcc4/gcc/config/vax/vax.h
cvs rdiff -u -r1.17 -r1.18 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.19 src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.20
--- src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.19 Mon Apr 8 12:10:53 2013
+++ src/gnu/dist/gcc4/gcc/config/vax/vax.c Tue Mar 18 23:43:40 2014
@@ -124,16 +124,22 @@ vax_output_function_prologue (FILE * fil
if (dwarf2out_do_frame ())
{
const char *label = dwarf2out_cfi_label ();
- int offset = 0;
+ int offset;
- for (regno = FIRST_PSEUDO_REGISTER-1; regno = 0; --regno)
- if (regs_ever_live[regno] !call_used_regs[regno])
- dwarf2out_reg_save (label, regno, offset -= 4);
-
- dwarf2out_reg_save (label, PC_REGNUM, offset -= 4);
- dwarf2out_reg_save (label, FRAME_POINTER_REGNUM, offset -= 4);
- dwarf2out_reg_save (label, ARG_POINTER_REGNUM, offset -= 4);
- dwarf2out_def_cfa (label, FRAME_POINTER_REGNUM, -(offset - 4));
+ offset = -20;
+ for (regno = 0; regno FIRST_PSEUDO_REGISTER; ++regno)
+if (regs_ever_live[regno] !call_used_regs[regno])
+ offset -= 4;
+
+ dwarf2out_def_cfa (label, FRAME_POINTER_REGNUM, -offset);
+ dwarf2out_reg_save (label, PSW_REGNUM, offset += 4);
+ dwarf2out_reg_save (label, ARG_POINTER_REGNUM, offset += 4);
+ dwarf2out_reg_save (label, FRAME_POINTER_REGNUM, offset += 4);
+ dwarf2out_reg_save (label, PC_REGNUM, offset += 4);
+
+ for (regno = 0; regno FIRST_PSEUDO_REGISTER; ++regno)
+if (regs_ever_live[regno] !call_used_regs[regno])
+ dwarf2out_reg_save (label, regno, offset += 4);
}
size -= STARTING_FRAME_OFFSET;
Index: src/gnu/dist/gcc4/gcc/config/vax/vax.h
diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.5 src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.6
--- src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.5 Mon Apr 2 16:44:17 2007
+++ src/gnu/dist/gcc4/gcc/config/vax/vax.h Tue Mar 18 23:43:40 2014
@@ -166,6 +166,9 @@ Boston, MA 02110-1301, USA. */
/* Specify the registers used for certain standard purposes.
The values of these macros are register numbers. */
+/* VAX PSW for DWARF-2 */
+#define PSW_REGNUM VAX_PSW_REGNUM
+
/* VAX pc is overloaded on a register. */
#define PC_REGNUM VAX_PC_REGNUM
Index: src/gnu/dist/gcc4/gcc/config/vax/vax.md
diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.17 src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.18
--- src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.17 Mon Apr 8 12:10:53 2013
+++ src/gnu/dist/gcc4/gcc/config/vax/vax.md Tue Mar 18 23:43:40 2014
@@ -40,6 +40,7 @@
(VAX_FP_REGNUM 13) ; Register 13 contains the frame pointer
(VAX_SP_REGNUM 14) ; Register 14 contains the stack pointer
(VAX_PC_REGNUM 15) ; Register 15 contains the program counter
+ (VAX_PSW_REGNUM 16) ; Program Status Word
]
)
CVS commit: src/libexec/ld.elf_so/arch/vax
Module Name:src Committed By: matt Date: Tue Mar 18 23:43:38 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/vax: rtld_start.S Log Message: Add .cfi ops so that one can unwind through this. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/libexec/ld.elf_so/arch/vax/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.16 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.17 --- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.16 Sun Mar 2 22:03:40 2003 +++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Tue Mar 18 23:43:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.16 2003/03/02 22:03:40 mycroft Exp $ */ +/* $NetBSD: rtld_start.S,v 1.17 2014/03/18 23:43:38 matt Exp $ */ /* * Copyright 1996 Matt Thomas m...@3am-software.com @@ -53,26 +53,42 @@ ENTRY(_rtld_start, 0) movq (%sp)+,%r7 /* grab cleanup and obj_main into %r7/%r8 */ jmp 2(%r0) /* jump to entry point + 2 */ +END(_rtld_start) /* - * Lazy binding entry point, called via PLT. + * Lazy binding entry point, called via PLT via JMP into pltgot[1]. + * SP+0: obj entry points + * SP+4: address to relocation index * * Note: Some functions rely on there not being an additional call frame; * hence the `optimization' to avoid the callg opportunistically. */ ALTENTRY(_rtld_bind_start) + .cfi_startproc + .cfi_def_cfa 13, 60 + .cfi_offset 16, -56 + .cfi_offset 12, -52 + .cfi_offset 13, -48 + .cfi_offset 15, -44 + .cfi_offset 2, -40 + .cfi_offset 3, -36 + .cfi_offset 4, -32 + .cfi_offset 5, -28 + .cfi_offset 6, -24 + .cfi_offset 7, -20 + .cfi_offset 8, -16 + .cfi_offset 9, -12 + .cfi_offset 10, -8 + .cfi_offset 11, -4 pushr $0x3f /* save R0-R5 */ movq 24(%sp),%r0 /* get addresses of plt.got reloc index */ pushl (%r1) /* push relocation index */ pushl %r0 /* push address of obj entry */ calls $2,_rtld_bind movl %r0,28(%sp) /* save return address onto stack */ - bicw3 6(%fp),(%r0),%r0/* does the entry mask save any additional regs */ popr $0x3f /* restore R0-R5 (cond flags not modified) */ - bneq 4f /* yes? do it the hard way */ - addl2 $4,%sp /* no? skip past plt.got on stack */ - addl2 $2,(%sp) /*skip past the mask */ - rsb /*and jump to it */ -4: addl2 $4,%sp + addl2 $4,%sp callg (%ap),*(%sp)+ /* return value from _rtld_bind() == actual */ ret + .cfi_endproc +END(_rtld_bind_start)
CVS commit: src/usr.bin/getaddrinfo
Module Name:src Committed By: ginsbach Date: Wed Mar 19 01:24:32 UTC 2014 Modified Files: src/usr.bin/getaddrinfo: getaddrinfo.c Log Message: Add missing include files. Don't rely on them bein pulled in as a side effect of other includes. Fixes build errors when getaddrinfo(1) is added to the usr.bin tree. - need sys/socket.h for address family (AF_*) and socket type (SOCK_*) - need stdio.h for printf() and friends To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/getaddrinfo/getaddrinfo.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/getaddrinfo/getaddrinfo.c diff -u src/usr.bin/getaddrinfo/getaddrinfo.c:1.2 src/usr.bin/getaddrinfo/getaddrinfo.c:1.3 --- src/usr.bin/getaddrinfo/getaddrinfo.c:1.2 Fri Mar 14 13:17:18 2014 +++ src/usr.bin/getaddrinfo/getaddrinfo.c Wed Mar 19 01:24:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: getaddrinfo.c,v 1.2 2014/03/14 13:17:18 ginsbach Exp $ */ +/* $NetBSD: getaddrinfo.c,v 1.3 2014/03/19 01:24:32 ginsbach Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,10 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: getaddrinfo.c,v 1.2 2014/03/14 13:17:18 ginsbach Exp $); +__RCSID($NetBSD: getaddrinfo.c,v 1.3 2014/03/19 01:24:32 ginsbach Exp $); + +#include sys/types.h +#include sys/socket.h #include assert.h #include err.h @@ -40,6 +43,7 @@ __RCSID($NetBSD: getaddrinfo.c,v 1.2 20 #include stdbool.h #include stdint.h #include stdlib.h +#include stdio.h #include string.h #include unistd.h #include util.h
CVS commit: src/libexec/ld.elf_so/arch/vax
Module Name:src Committed By: matt Date: Wed Mar 19 02:39:22 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/vax: rtld_start.S Log Message: Once we know the bound routine, rebuilt a new callframe that can be unwound properly. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/arch/vax/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.17 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.18 --- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.17 Tue Mar 18 23:43:38 2014 +++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Wed Mar 19 02:39:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.17 2014/03/18 23:43:38 matt Exp $ */ +/* $NetBSD: rtld_start.S,v 1.18 2014/03/19 02:39:22 matt Exp $ */ /* * Copyright 1996 Matt Thomas m...@3am-software.com @@ -64,31 +64,95 @@ END(_rtld_start) * hence the `optimization' to avoid the callg opportunistically. */ ALTENTRY(_rtld_bind_start) - .cfi_startproc - .cfi_def_cfa 13, 60 - .cfi_offset 16, -56 - .cfi_offset 12, -52 - .cfi_offset 13, -48 - .cfi_offset 15, -44 - .cfi_offset 2, -40 - .cfi_offset 3, -36 - .cfi_offset 4, -32 - .cfi_offset 5, -28 - .cfi_offset 6, -24 - .cfi_offset 7, -20 - .cfi_offset 8, -16 - .cfi_offset 9, -12 - .cfi_offset 10, -8 - .cfi_offset 11, -4 + movab -64(%sp),%sp /* reserve some space */ pushr $0x3f /* save R0-R5 */ - movq 24(%sp),%r0 /* get addresses of plt.got reloc index */ + movq -8(%fp),%r0 /* get addresses of plt.got reloc index */ pushl (%r1) /* push relocation index */ pushl %r0 /* push address of obj entry */ calls $2,_rtld_bind - movl %r0,28(%sp) /* save return address onto stack */ + + movl %r0,%r3 /* save routine address */ + extzv $0,$12,(%r0),%r1 /* get entry mask */ + extzv $0,$12,6(%fp),%r2 /* get saved mask */ + cmpw %r1,%r2 /* compare them */ + bneq 12f /* if they are different, rebuild */ + movl %r0,-4(%fp) /* save routine address */ + popr $0x3f /* pop registers */ + movab 68(%sp),%sp /* restore sp */ + rsb /* and jump to it */ + + /* + * We need to rebuild the callframe. Save the current one in case + * we might overwrite it. + */ +12: movq 4(%fp),-(%sp) /* save PSW and AP */ + movq 12(%fp),-(%sp) /* save FP and return address */ + /* + * Find out where this this call frame ends. + */ + movl %ap,%r0 /* get past callframe and registers */ + bbs $29,4(%fp),22f /* calls is easy, it's where AP is */ + /* + * Callg not so much + */ + movab 20(%fp),%r0 /* past fixed callframe */ + tstw %r2 /* no saved registers? */ + beql 22f /*none, so we are done. */ + movl $11,%r4 /* start with register 11 */ +20: bbc %r4,%r2,21f /* save this register? */ + addl2 $4,%r0 /* yes, adjust for saved register */ +21: sobgeq %r4,20b /* try next register */ + +22: + /* + * First push the caller saved registers (if there any that + * need to saved.) + */ + tstw %r1 /* if there are no registers to save */ + beql 1f /* just push the callframe */ + cmpw %r1,$63 /* if there are no caller-saved registers */ + blequ 5f /* skip them */ + bbc $11,%r1,10f /* does it need to be saved? */ + movl %r11,-(%r0) +10: bbc $10,%r1,9f /* does it need to be saved? */ + movl %r10,-(%r0) +9: bbc $9,%r1,8f /* does it need to be saved? */ + movl %r9,-(%r0) +8: bbc $8,%r1,7f /* does it need to be saved? */ + movl %r8,-(%r0) +7: bbc $7,%r1,6f /* does it need to be saved? */ + movl %r7,-(%r0) +6: bbc $6,%r1,5f /* does it need to be saved? */ + movl %r6,-(%r0) +5: + /* + * r0-r5 are not normally preserved so we should be done. + */ + cmpw %r1,$63 + bgtru 1f + /* + * For some reason, we have to preserve these. + */ + movab 16(%sp),%r2 + bbc $5,%r1,4f /* does it need to be saved? */ + movl 20(%r2),-(%r0) +4: bbc $4,%r1,3f /* does it need to be saved? */ + movl 16(%r2),-(%r0) +3: bbc $3,%r1,2f /* does it need to be saved? */ + movl 12(%r2),-(%r0) +2: bbc $2,%r1,1f /* does it need to be saved? */ + movl 8(%r2),-(%r0) + + /* + * Now we save the fixed part of the callframe. + */ +1: clrl %r4 /* clear condition handler slot */ + movq (%sp)+,-(%r0) /* move FP and PC into place */ + movq (%sp)+,-(%r0) /* move PSW/save-mask/etc + AP into place */ + movq %r3,-(%r0) /* move routine address + cond handle slot */ + addl3 $4,%r0,%fp /* get start of new callframe */ + insv $0,$12,%r1,6(%fp) /* insert new saved mask */ popr $0x3f /* restore R0-R5 (cond flags not modified) */ - addl2 $4,%sp - callg (%ap),*(%sp)+ /* return value from _rtld_bind() == actual */ - ret - .cfi_endproc + subl3 $4,%fp,%sp /* sp needs to be equal to fp */ + rsb /* and jmp to the routine */ END(_rtld_bind_start)
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist
Module Name:othersrc
Committed By: agc
Date: Wed Mar 19 04:08:04 UTC 2014
Modified Files:
othersrc/external/bsd/bsd-pkg-config/dist: bsd-pkg-config.sh
Log Message:
Update bsd-pkg-config to version 20140318
Changes from previous version:
+ be a bit smarter in the awk command in the rmdups functionality
+ add --list-all command
+ support for PKG_CONFIG_PATH
+ optimise queries just a tad
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
diff -u othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.3 othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.4
--- othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.3 Tue Mar 18 00:42:45 2014
+++ othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh Wed Mar 19 04:08:04 2014
@@ -1,8 +1,8 @@
#! /bin/sh
-# $NetBSD: bsd-pkg-config.sh,v 1.3 2014/03/18 00:42:45 agc Exp $
+# $NetBSD: bsd-pkg-config.sh,v 1.4 2014/03/19 04:08:04 agc Exp $
-# Copyright (c) 2012 Alistair Crooks a...@netbsd.org
+# Copyright (c) 2012,2013,2014 Alistair Crooks a...@netbsd.org
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -26,11 +26,11 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-version=20140317
+version=20140318
# find the base of the .pc file
findbase() {
- for b in ${pkgbase} ${srcbase} ${xbase}; do
+ for b in ${pathdirs}; do
if [ -f ${b}/$1.pc ]; then
echo ${b}
return 0
@@ -39,18 +39,17 @@ findbase() {
exit 1
}
-# invoked as showvalues type package
+# invoked as showvalues type base package
showvalues() {
- b=$(findbase $2)
- if [ -f ${b}/$2.pc ]; then
+ if [ -f $2/$3.pc ]; then
mf=$(awk -v s=$1 '
/[A-Za-z_0-9]+=.*/ { print }
$1 == s { split($0, a, :); print t=\ a[2] \ }
- END { print all:\n\t@echo -n ${t} }' ${b}/$2.pc)
+ END { print all:\n\t@echo -n ${t} }' $2/$3.pc)
echo ${mf} | make -f -
return 0
else
-# echo Package \${pkg}\ not installed 2
+# echo Package \$3\ not installed 2
exit 1
fi
}
@@ -77,13 +76,13 @@ expandpkgname() {
local inname=$1
case ${inname} in
*\*|*\*)
- constraint=$(echo ${inname} | sed -e 's| ||g')
- name=${inname%% *}
- have=${name}-$(showvalues Version: ${inname})
+ constraint=${inname}
+ name=${inname%%*}; name=${name%%*}
+ have=${name}-$(showvalues Version: $(findbase ${name}) ${name})
have=$(echo ${have} | sed -e 's| ||g')
got=$(pkg_admin pmatch ${constraint} ${have})
if [ $? -ne 0 ]; then
- echo Constraint ${constraint} not matched by ${have} 2
+ echo Constraint ${constraint} not matched by ${have} for ${inname} 2
exit 1
fi
echo ${name}
@@ -94,62 +93,99 @@ expandpkgname() {
# get the requires lines (recursively)
showreqs() {
- out=$(showvalues Requires: $1)
+ out=$(showvalues Requires: $(findbase $1) $1 | sed -e 's| ||g' -e 's| ||g' -e 's|= |=|g')
for word in ${out}; do
out=${out} $(showreqs ${word})
done
- echo ${out}
+ case ${out} in
+ ) ;;
+ *) echo ${out}
+ esac
}
-# show the values for $1 (recursively) for pkg $2
-recursevalues() {
- out=$(showvalues $1 $2)
- requires=$(showreqs $2)
+# get the requires recursively
+recursereqs() {
+ out=
+ requires=$(showreqs $1)
for req in ${requires}; do
- out=${out} $(recursevalues $1 ${req})
+ case ${req} in
+ *\*|*\*) r=$(expandpkgname ${req}) ;;
+ *) r=${req} ;;
+ esac
+ test -z ${r} continue
+ out=${out} ${r}
+ done
+ case ${out} in
+ ) ;;
+ *) echo ${out} ;;
+ esac
+}
+
+# get the libraries, $1 == pc, $2 == search
+findvalues() {
+ for lib in $1; do
+ out=${out} $(showvalues $2 $(findbase ${lib}) ${lib})
done
echo ${out}
}
# remove duplicates in the list (but without reordering)
rmdups() {
- echo $(echo $1 | tr ' ' '\n' | awk '!cnt[$0]++ { m[c++] = $0 } END { for (i = 0 ; i c ; i++) printf(%s , m[i]) }')
+ echo $1 | awk -v RS=$2 '!cnt[$0]++ { s = s $0 } END { printf(%s, s) }'
+}
+
+# list one pkgconfig file's details
+listpc() {
+ a=${1##*/}
+ awk -v pc=${a%%.pc} '
+BEGIN { s = pc \t\t\t }
+$1 == Name: { sub($1, ); s = s $0 - }
+$1 == Description: { sub($1, ); s = s $0 }
+END { print s }' $1
+}
+
+getpkgconfig() {
+ reqs=$(recursereqs $1)
+ reqs=$(rmdups ${reqs} )
+ vals=$(findvalues $1 ${reqs} $2)
+ echo $(rmdups ${vals} )
}
prefix=/usr/pkg
actions=
while [ $# -gt 0 ]; do
case $1 in
- --cflags|--exists|--libs*|--modversion|--static|--variable=*|--version)
+ --cflags|--exists|--libs*|--list-all|--modversion|--static|--variable=*|--version)
actions=${actions} $1 ;;
--prefix=*)
prefix=${1#--prefix=} ;;
--prefix)
prefix=$2; shift ;;
+-v) set -x ;; # XXX
*) break ;;
esac
shift
done
-pkgbase=${prefix}/lib/pkgconfig
-srcbase=/usr/lib/pkgconfig
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist/tests
Module Name:othersrc Committed By: dholland Date: Tue Mar 18 05:59:44 UTC 2014 Added Files: othersrc/external/bsd/bsd-pkg-config/dist/tests: Makefile README.test basetest.better basetest.good basetest.sh package-query-libtuff-4.better package-query-libtuff-4.good package-query-y11.better package-query-y11.good package-query-ykbproto.better package-query-ykbproto.good package-query-yproto.better package-query-yproto.good package-query.sh othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles: libtuff-4.pc y11.pc ykbproto.pc yproto.pc Log Message: Add a test suite. This needs a bit of work to support running the tests from bin/, but not much, and it runs ok (just less tidily) in place. At the moment none of it really works because the bsd-pkg-config script doesn't honor PKG_CONFIG_PATH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile \ othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.sh \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query.sh cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/libtuff-4.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/y11.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/ykbproto.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/yproto.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/armadaxp
Module Name:src Committed By: matt Date: Tue Mar 18 06:17:55 UTC 2014 Modified Files: src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c Log Message: Default comfreq to mvTclk if CONSFREQ is not defined. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.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/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 06:23:45 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: mk.armadaxp mk.marvell Log Message: Don't replicate most of mk.marvell in mk.armadaxp To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.armadaxp cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.marvell 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/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 06:46:14 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoc_intr.h Log Message: Only include opt_mvsoc.h if _INTR_PRIVATE is defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc_intr.h 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/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:05:00 UTC 2014 Modified Files: src/sys/arch/arm/marvell: files.marvell Log Message: Add MEMSIZE to opt_mvsoc.h To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/marvell/files.marvell 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
Module Name:src Committed By: matt Date: Tue Mar 18 07:05:47 UTC 2014 Modified Files: src/sys/arch/arm/conf: files.arm src/sys/arch/arm/include: locore.h Log Message: defflag VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/arch/arm/conf/files.arm cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:06:43 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add xhci To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:07:40 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Base on ARMADAXP, not SHEEVAPLUG. Simplify. Support FPU_VFP To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src Committed By: msaitoh Date: Tue Mar 18 07:18:22 UTC 2014 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: Pull up following revision(s) (requested by manu in ticket #1022): sys/compat/netbsd32/netbsd32_ioctl.h: revision 1.44 sys/compat/netbsd32/netbsd32_ioctl.c: revision 1.68 Add ATAIOCCOMMAND ioctl form COMPAT_NETBSD32 This enables SMART monitoring by a netbsd32 binary. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/compat/netbsd32/netbsd32_ioctl.h 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/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:25:57 UTC 2014 Modified Files: src/sys/arch/arm/marvell: files.marvell Log Message: defflag MVSOC_CONSOLE_EARLY To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/marvell/files.marvell Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 07:30:09 UTC 2014 Modified Files: src/sys/arch/evbarm/marvell: marvellvar.h Log Message: Add _LOCORE around marvell_interregs_pbase To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/marvell/marvellvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 07:34:15 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add commented out MVSOC_EARLY_CONSOLE option To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:01:34 UTC 2014 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32_event.c Log Message: Pull up following revision(s) (requested by manu in ticket #1021): sys/compat/netbsd32/netbsd32_event.c: revision 1.10 Fix netbsd32 compatibility bug in kevent(). The keo_put_events() callback copies the events from kernel to userland. It is called for sets of up to 8 events (constant chosen in kevbuf definitition in kevent1()). The callback is called with pointer to userland buffer, count of events to copy, and an index parameter which tracks where we are in userland buffer when called multiple time. COMPAT_NETBSD32's flavor of keo_put_events() is netbsd32_kevent_put_events(). It did not honour the index parameter, which caused invalid event data to be returned when userland requested more that 8 events. This caused many reliability problems, and the obvious startup crash of dovecot log process when it accessed udata in the nineth event in its buffer, which was NULL. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/compat/netbsd32/netbsd32_event.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/dreamcast/dev
Module Name:src Committed By: martin Date: Tue Mar 18 08:08:55 UTC 2014 Modified Files: src/sys/arch/dreamcast/dev: gdrom.c Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/dreamcast/dev/gdrom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:09:46 UTC 2014 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32.h netbsd32_netbsd.c src/sys/uvm [netbsd-6]: uvm_swap.c uvm_swap.h Log Message: Pull up following revision(s) (requested by manu in ticket #1025): sys/compat/netbsd32/netbsd32_netbsd.c: revision 1.184 sys/uvm/uvm_swap.c: revision 1.166 sys/uvm/uvm_swap.h: revision 1.20 sys/compat/netbsd32/netbsd32.h: revision 1.99 Properly translate struct swapent for COMPAT_NETBSD32 Properly translate struct swapent for COMPAT_NETBSD32 (missing commit) To generate a diff of this commit: cvs rdiff -u -r1.92.2.2 -r1.92.2.3 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.179 -r1.179.2.1 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.161 -r1.161.2.1 src/sys/uvm/uvm_swap.c cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/uvm/uvm_swap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:17:56 UTC 2014 Modified Files: src/share/man/man4 [netbsd-6]: options.4 src/sys/kern [netbsd-6]: kern_exec.c Log Message: Pull up following revision(s) (requested by manu in ticket #1026): share/man/man4/options.4: revision 1.433 sys/kern/kern_exec.c: revision 1.371- 1.372 Add EMUL_NATIVEROOT so that native binaries can be told to search an emulation directory before the real root. This makes easier to test an amd64 kernel on the top of an i386 root filesystem prior a full migration. To generate a diff of this commit: cvs rdiff -u -r1.411.2.1 -r1.411.2.2 src/share/man/man4/options.4 cvs rdiff -u -r1.339.2.7 -r1.339.2.8 src/sys/kern/kern_exec.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/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 08:22:05 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Comment out VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:22:45 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1021, #1022, #1025 and #1026. To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: skrll Date: Tue Mar 18 08:40:05 UTC 2014 Modified Files: src/external/gpl3/gdb/dist/gdb: armnbsd-nat.c Log Message: In fill_fpregset correct the address to grab the register from To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/ufs/ufs
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:43:33 UTC 2014 Modified Files: src/sys/ufs/ufs [netbsd-6]: ufs_quota2.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1027): sys/ufs/ufs/ufs_quota2.c: revision 1.37 Patch from Edgar Fuss on tech-kern: set grace time if lowering the limit cause the user/group to now be overquota. To generate a diff of this commit: cvs rdiff -u -r1.34.2.1 -r1.34.2.2 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.
CVS commit: [netbsd-6] src/distrib/sets/lists/comp
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:53:30 UTC 2014 Modified Files: src/distrib/sets/lists/comp [netbsd-6]: md.amd64 Log Message: Apply patch(requested by mlelstv in ticket #1030): distrib/sets/lists/comp/md.amd64: patch netbsd-6 amd64 does not build with MKDEBUG=yes because a file is missing from the set lists. Current got fhis fixed in rev. 1.186. To generate a diff of this commit: cvs rdiff -u -r1.155.2.9 -r1.155.2.10 src/distrib/sets/lists/comp/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Tue Mar 18 08:56:42 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Add some missing devices (crypto gige) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 08:57:53 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1027 and #1030. To generate a diff of this commit: cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:21:30 UTC 2014 Modified Files: src/sys/kern [netbsd-6]: kern_verifiedexec.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1034): sys/kern/kern_verifiedexec.c: revision 1.132 Reorder code to avoid use-after-free on error. From Maxime Villard To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.128.4.1 src/sys/kern/kern_verifiedexec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/sys/kern
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:21:51 UTC 2014 Modified Files: src/sys/kern [netbsd-6-1]: kern_verifiedexec.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1034): sys/kern/kern_verifiedexec.c: revision 1.132 Reorder code to avoid use-after-free on error. From Maxime Villard To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.128.10.1 src/sys/kern/kern_verifiedexec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:36:58 UTC 2014 Modified Files: src/sys/kern [netbsd-6-0]: kern_verifiedexec.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1034): sys/kern/kern_verifiedexec.c: revision 1.132 Reorder code to avoid use-after-free on error. From Maxime Villard To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.128.8.1 src/sys/kern/kern_verifiedexec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:02 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:51 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.5 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-6.0.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Tue Mar 18 09:44:25 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.4 Log Message: Ticket #1034. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-6.1.4 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: hannken Date: Tue Mar 18 10:21:48 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile vfssubr.9 src/sys/kern: vfs_mount.c src/sys/sys: param.h vnode.h src/sys/ufs/lfs: lfs_segment.c Log Message: Operations vmark(), vunmark() and vismarker() have been replaced by vfs_vnode_iterator_*(), remove them. Document vfs_vnode_iterator_*(). Make VI_MARKER private to vfs_vnode.c, vfs_mount.c and unfortunately to ufs/lfs/lfs_segment.c. Welcome to 6.99.37 To generate a diff of this commit: cvs rdiff -u -r1.1881 -r1.1882 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.374 -r1.375 src/share/man/man9/Makefile cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/vfssubr.9 cvs rdiff -u -r1.27 -r1.28 src/sys/kern/vfs_mount.c cvs rdiff -u -r1.445 -r1.446 src/sys/sys/param.h cvs rdiff -u -r1.244 -r1.245 src/sys/sys/vnode.h cvs rdiff -u -r1.234 -r1.235 src/sys/ufs/lfs/lfs_segment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/rpc.rquotad
Module Name:src Committed By: gson Date: Tue Mar 18 11:00:20 UTC 2014 Modified Files: src/libexec/rpc.rquotad: rquotad.c Log Message: Delay daemonization until RPC services have been registered. Fixes one of the race conditions of PR misc/48282. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/libexec/rpc.rquotad/rquotad.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/arm/gemini
Module Name:src Committed By: martin Date: Tue Mar 18 12:54:29 UTC 2014 Modified Files: src/sys/arch/arm/gemini: gemini_timer.c Log Message: Bracket timer_init() with disable_interrupts()/restore_interrupts() properly. Pointed out by Chris Gilbert. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_timer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: joerg Date: Tue Mar 18 13:08:15 UTC 2014 Modified Files: src/sys/lib/libunwind: Registers.hpp libunwind.cxx unwind_registers.S Log Message: Add basic unwind support for VAX. PSW handling and stack pointer after resume is still incomplete. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/Registers.hpp cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libunwind/libunwind.cxx \ src/sys/lib/libunwind/unwind_registers.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Tue Mar 18 13:10:27 UTC 2014 Modified Files: src/share/mk: bsd.own.mk Log Message: libunwind supports vax now. To generate a diff of this commit: cvs rdiff -u -r1.789 -r1.790 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist/tests
Module Name:othersrc Committed By: dholland Date: Tue Mar 18 13:22:01 UTC 2014 Modified Files: othersrc/external/bsd/bsd-pkg-config/dist/tests: basetest.good package-query-libtuff-4.good package-query-y11.good package-query-ykbproto.good package-query-yproto.good Log Message: update for agc's simultaneous changes To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.good Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Tue Mar 18 14:28:37 UTC 2014 Modified Files: src/sys/sys: endian.h Log Message: Avoid undefined behaviour in shifts in endian decoding routines. If int is 32-bit and p is a uint8_t *, then p[0] is promoted to int and p[0] 24 can shift a one into the sign bit of an int, which is nasal demon territory. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/sys/endian.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: macallan Date: Tue Mar 18 14:34:31 UTC 2014 Modified Files: src/sys/arch/powerpc/powerpc: clock.c Log Message: split 601 and generic PowerPC timecounter code a bit more To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/powerpc/clock.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
Module Name:src Committed By: skrll Date: Tue Mar 18 15:44:37 UTC 2014 Modified Files: src/sys/dev: cgd.c cgdvar.h Log Message: Remove a simplelock and replace with a kmutex To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/dev/cgd.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cgdvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Tue Mar 18 16:05:34 UTC 2014 Modified Files: src/libexec/ld.elf_so: rtld.c Log Message: Ignore LD_BIND_NOW for setuid binaries, but keep it in the environment otherwise. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/libexec/ld.elf_so/rtld.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
Module Name:src Committed By: christos Date: Tue Mar 18 17:11:19 UTC 2014 Modified Files: src/sys/arch/alpha/include: cdefs.h src/sys/arch/arm/include: cdefs.h src/sys/arch/hppa/include: cdefs.h src/sys/arch/ia64/include: cdefs.h src/sys/arch/mips/include: cdefs.h src/sys/arch/sparc/include: cdefs.h Log Message: Make all __ALIGNBYTES macros return the same type (size_t) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/cdefs.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
