CVS commit: src/lib/libm/arch/i387
Module Name:src Committed By: dsl Date: Mon Mar 3 08:00:50 UTC 2014 Modified Files: src/lib/libm/arch/i387: e_acos.S Log Message: Drop in a fabs() after the fsqrt(). While it may seem pointless, it the rouding mode is set to round towards minus infinity then acos(-1) calculates atan2(sqrt(1.0 - 1.0), -1) the subtract generates -0.0 which sqrt() preserves. atan2(-0, -1) is -pi, but acos(-1) is expected to be +pi. This might 'fix' the test failures seen in some environments, but they are not failing due to an obvously incorrent x87 rounding mode. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/i387/e_acos.S 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/arch/i387/e_acos.S diff -u src/lib/libm/arch/i387/e_acos.S:1.8 src/lib/libm/arch/i387/e_acos.S:1.9 --- src/lib/libm/arch/i387/e_acos.S:1.8 Sat Jul 26 19:24:57 2003 +++ src/lib/libm/arch/i387/e_acos.S Mon Mar 3 08:00:50 2014 @@ -7,7 +7,7 @@ #include abi.h -RCSID($NetBSD: e_acos.S,v 1.8 2003/07/26 19:24:57 salo Exp $) +RCSID($NetBSD: e_acos.S,v 1.9 2014/03/03 08:00:50 dsl Exp $) /* acos = atan (sqrt(1 - x^2) / x) */ ENTRY(__ieee754_acos) @@ -18,6 +18,7 @@ ENTRY(__ieee754_acos) fld1 fsubp/* 1 - x^2 */ fsqrt/* sqrt (1 - x^2) */ + fabs/* Change -0.0 to +0.0 */ fxch %st(1) fpatan XMM_DOUBLE_EPILOGUE
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Mon Mar 3 08:15:36 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c cpu.c
src/sys/arch/arm/include: locore.h
Log Message:
Add most of the cpu_* variables to arm/locore.h
Add and initialize cpu_synchprim_present
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/arm/arm32/arm32_machdep.c \
src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.13 -r1.14 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/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.100 src/sys/arch/arm/arm32/arm32_machdep.c:1.101
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.100 Tue Feb 25 18:30:08 2014
+++ src/sys/arch/arm/arm32/arm32_machdep.c Mon Mar 3 08:15:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.100 2014/02/25 18:30:08 pooka Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.101 2014/03/03 08:15:36 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.100 2014/02/25 18:30:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.101 2014/03/03 08:15:36 matt Exp $);
#include opt_modular.h
#include opt_md.h
@@ -106,6 +106,7 @@ int cpu_neon_present;
int cpu_simd_present;
int cpu_simdex_present;
int cpu_umull_present;
+int cpu_synchprim_present;
const char *cpu_arch = ;
int cpu_instruction_set_attributes[6];
@@ -491,6 +492,11 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc
NULL, 0, cpu_simdex_present, 0,
CTL_MACHDEP, CTL_CREATE, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READONLY,
+ CTLTYPE_INT, synchprim_present, NULL,
+ NULL, 0, cpu_synchprim_present, 0,
+ CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_INT, printfataltraps, NULL,
NULL, 0, cpu_printfataltraps, 0,
@@ -679,6 +685,9 @@ cpu_boot_secondary_processors(void)
{
uint32_t mbox;
kcpuset_export_u32(kcpuset_attached, mbox, sizeof(mbox));
+#ifdef VERBOSE_ARM_INIT
+ printf(%s: writing mbox with %#x\n, __func__, mbox);
+#endif
atomic_swap_32(arm_cpu_mbox, mbox);
membar_producer();
#ifdef _ARM_ARCH_7
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.100 src/sys/arch/arm/arm32/cpu.c:1.101
--- src/sys/arch/arm/arm32/cpu.c:1.100 Thu Feb 20 23:24:55 2014
+++ src/sys/arch/arm/arm32/cpu.c Mon Mar 3 08:15:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.100 2014/02/20 23:24:55 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.101 2014/03/03 08:15:36 matt Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.100 2014/02/20 23:24:55 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.101 2014/03/03 08:15:36 matt Exp $);
#include sys/systm.h
#include sys/conf.h
@@ -67,7 +67,7 @@ extern const char *cpu_arch;
volatile u_int arm_cpu_hatched = 0;
u_int arm_cpu_max = 0;
uint32_t arm_cpu_mbox __cacheline_aligned = 0;
-uint32_t arm_cpu_marker __cacheline_aligned = 1;
+uint32_t arm_cpu_marker[2] __cacheline_aligned = { 0, 0 };
#endif
/* Prototypes */
@@ -784,6 +784,9 @@ identify_features(device_t dv)
((cpu_instruction_set_attributes[3] 4) 0x0f) = 3;
cpu_simdex_present = cpu_simd_present
((cpu_instruction_set_attributes[1] 12) 0x0f) = 2;
+ cpu_synchprim_present =
+ ((cpu_instruction_set_attributes[3] 8) 0xf0)
+ | ((cpu_instruction_set_attributes[4] 20) 0x0f);
cpu_memory_model_features[0] = armreg_mmfr0_read();
cpu_memory_model_features[1] = armreg_mmfr1_read();
Index: src/sys/arch/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.13 src/sys/arch/arm/include/locore.h:1.14
--- src/sys/arch/arm/include/locore.h:1.13 Wed Feb 26 01:54:35 2014
+++ src/sys/arch/arm/include/locore.h Mon Mar 3 08:15:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.13 2014/02/26 01:54:35 matt Exp $ */
+/* $NetBSD: locore.h,v 1.14 2014/03/03 08:15:36 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -148,10 +148,20 @@ void cpu_attach(device_t, cpuid_t);
#endif
/* 1 == use cpu_sleep(), 0 == don't */
-extern int cpu_printfataltraps;
extern int cpu_do_powersave;
+extern int cpu_printfataltraps;
extern int cpu_fpu_present;
extern int cpu_hwdiv_present;
+extern int cpu_neon_present;
+extern int cpu_simd_present;
+extern int cpu_simdex_present;
+extern int cpu_umull_present;
+extern int cpu_synchprim_present;
+
+extern int cpu_instruction_set_attributes[6];
+extern int cpu_memory_model_features[4];
+extern int cpu_processor_features[2];
+extern int cpu_media_and_vfp_features[2];
extern u_int arm_cpu_max;
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Mon Mar 3 08:45:18 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: sys_machdep.c
src/sys/arch/arm/vfp: vfp_init.c
Log Message:
Query the media and vfp feature registers to determine what our default
mode should be and what bits in the fpscr can be changed.
Print what features are supported:
vfp0 at cpu0: NEON MPE (VFP 3.0+), rounding, NaN propogation, denormals
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/arm32/sys_machdep.c
cvs rdiff -u -r1.33 -r1.34 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/arm32/sys_machdep.c
diff -u src/sys/arch/arm/arm32/sys_machdep.c:1.19 src/sys/arch/arm/arm32/sys_machdep.c:1.20
--- src/sys/arch/arm/arm32/sys_machdep.c:1.19 Fri Aug 23 14:39:50 2013
+++ src/sys/arch/arm/arm32/sys_machdep.c Mon Mar 3 08:45:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.19 2013/08/23 14:39:50 matt Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.20 2014/03/03 08:45:18 matt Exp $ */
/*
* Copyright (c) 1995-1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_machdep.c,v 1.19 2013/08/23 14:39:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_machdep.c,v 1.20 2014/03/03 08:45:18 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -106,11 +106,12 @@ arm32_vfp_fpscr(struct lwp *l, const voi
retval[0] = pcb-pcb_vfp.vfp_fpscr;
if (uap) {
+ extern uint32_t vfp_fpscr_changable;
struct arm_vfp_fpscr_args ua;
int error;
if ((error = copyin(uap, ua, sizeof(ua))) != 0)
return (error);
- if (((ua.fpscr_clear|ua.fpscr_set) ~VFP_FPSCR_RMODE) != 0)
+ if ((ua.fpscr_clear|ua.fpscr_set) ~vfp_fpscr_changable)
return EINVAL;
pcb-pcb_vfp.vfp_fpscr = ~ua.fpscr_clear;
pcb-pcb_vfp.vfp_fpscr |= ua.fpscr_set;
Index: src/sys/arch/arm/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.33 src/sys/arch/arm/vfp/vfp_init.c:1.34
--- src/sys/arch/arm/vfp/vfp_init.c:1.33 Sat Jan 25 17:30:56 2014
+++ src/sys/arch/arm/vfp/vfp_init.c Mon Mar 3 08:45:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfp_init.c,v 1.33 2014/01/25 17:30:56 skrll Exp $ */
+/* $NetBSD: vfp_init.c,v 1.34 2014/03/03 08:45:18 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -148,6 +148,11 @@ struct evcnt vfpevent_use;
struct evcnt vfpevent_reuse;
struct evcnt vfpevent_fpe;
+/* determine what bits can be changed */
+uint32_t vfp_fpscr_changable = VFP_FPSCR_CSUM;
+/* default to run fast */
+uint32_t vfp_fpscr_default = (VFP_FPSCR_DN | VFP_FPSCR_FZ | VFP_FPSCR_RN);
+
/*
* Used to test for a VFP. The following function is installed as a coproc10
* handler on the undefined instruction vector and then we issue a VFP
@@ -208,10 +213,8 @@ vfp_fpscr_handler(u_int address, u_int i
if (insn 0x0010) {
*regp = pcb-pcb_vfp.vfp_fpscr;
} else {
- register_t tmp = *regp;
- if (!(cpu_media_and_vfp_features[0] ARM_MVFR0_EXCEPT_MASK))
- tmp = ~VFP_FPSCR_ESUM;
- pcb-pcb_vfp.vfp_fpscr = tmp;
+ pcb-pcb_vfp.vfp_fpscr = ~vfp_fpscr_changable;
+ pcb-pcb_vfp.vfp_fpscr |= *regp vfp_fpscr_changable;
}
vfp_fpscr_ev.ev_count++;
@@ -345,14 +348,34 @@ vfp_attach(void)
cpu_media_and_vfp_features[0] = armreg_mvfr0_read();
cpu_media_and_vfp_features[1] = armreg_mvfr1_read();
if (fpsid != 0) {
- aprint_normal(vfp%d at %s: %s\n,
+ uint32_t f0 = armreg_mvfr0_read();
+ uint32_t f1 = armreg_mvfr0_read();
+ aprint_normal(vfp%d at %s: %s%s%s%s%s\n,
device_unit(curcpu()-ci_dev),
device_xname(curcpu()-ci_dev),
- model);
+ model,
+ ((f0 ARM_MVFR0_ROUNDING_MASK) ? , rounding : ),
+ ((f0 ARM_MVFR0_EXCEPT_MASK) ? , exceptions : ),
+ ((f1 ARM_MVFR1_D_NAN_MASK) ? , NaN propogation : ),
+ ((f1 ARM_MVFR1_FTZ_MASK) ? , denormals : ));
aprint_verbose(vfp%d: mvfr: [0]=%#x [1]=%#x\n,
- device_unit(curcpu()-ci_dev),
- cpu_media_and_vfp_features[0],
- cpu_media_and_vfp_features[1]);
+ device_unit(curcpu()-ci_dev), f0, f1);
+ if (cpu_media_and_vfp_features[0] ARM_MVFR0_ROUNDING_MASK) {
+ vfp_fpscr_changable |= VFP_FPSCR_RMODE;
+ }
+ if (cpu_media_and_vfp_features[0] ARM_MVFR0_EXCEPT_MASK) {
+ vfp_fpscr_changable |= VFP_FPSCR_ESUM;
+ }
+ // If hardware supports propogation of NaNs, select it.
+ if (cpu_media_and_vfp_features[1] ARM_MVFR1_D_NAN_MASK) {
+ vfp_fpscr_default = ~VFP_FPSCR_DN;
+ vfp_fpscr_changable |= VFP_FPSCR_DN;
+ }
+ // If hardware supports denormalized numbers, use it.
+ if (cpu_media_and_vfp_features[1] ARM_MVFR1_FTZ_MASK) {
+ vfp_fpscr_default = ~VFP_FPSCR_FZ;
+ vfp_fpscr_changable |= VFP_FPSCR_FZ;
+ }
}
evcnt_attach_dynamic(vfpevent_use, EVCNT_TYPE_MISC, NULL,
VFP, coproc use);
@@ -505,8 +528,7 @@ vfp_state_load(lwp_t *l, u_int flags)
if (__predict_false((flags PCU_LOADED) == 0)) {
KASSERT(flags
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: matt
Date: Mon Mar 3 08:50:48 UTC 2014
Modified Files:
src/sys/arch/arm/pic: pic.c picvar.h
Log Message:
Add a mpsafe flag to the intrsource
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/pic/pic.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/pic/picvar.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/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.19 src/sys/arch/arm/pic/pic.c:1.20
--- src/sys/arch/arm/pic/pic.c:1.19 Tue Jan 28 13:20:30 2014
+++ src/sys/arch/arm/pic/pic.c Mon Mar 3 08:50:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.19 2014/01/28 13:20:30 martin Exp $ */
+/* $NetBSD: pic.c,v 1.20 2014/03/03 08:50:48 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.19 2014/01/28 13:20:30 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.20 2014/03/03 08:50:48 matt Exp $);
#define _INTR_PRIVATE
#include sys/param.h
@@ -255,18 +255,27 @@ pic_find_pending_irqs_by_ipl(struct pic_
void
pic_dispatch(struct intrsource *is, void *frame)
{
- int rv __unused;
+ int (*func)(void *) = is-is_func;
+ void *arg = is-is_arg;
- if (__predict_false(is-is_arg == NULL)
- __predict_true(frame != NULL)) {
- rv = (*is-is_func)(frame);
- } else if (__predict_true(is-is_arg != NULL)) {
- rv = (*is-is_func)(is-is_arg);
- } else {
- pic_deferral_ev.ev_count++;
- return;
+ if (__predict_false(arg == NULL)) {
+ if (__predict_false(frame == NULL)) {
+ pic_deferral_ev.ev_count++;
+ return;
+ }
+ arg = frame;
}
+#ifdef MULTIPROCESSOR
+ if (!is-is_mpsafe) {
+ KERNEL_LOCK(1, NULL);
+ (void)(*func)(arg);
+ KERNEL_UNLOCK_ONE(NULL);
+ } else
+#endif
+ (void)(*func)(arg);
+
+
struct pic_percpu * const pcpu = percpu_getref(is-is_pic-pic_percpu);
KASSERT(pcpu-pcpu_magic == PICPERCPU_MAGIC);
pcpu-pcpu_evs[is-is_irq].ev_count++;
@@ -607,6 +616,9 @@ pic_establish_intr(struct pic_softc *pic
is-is_type = type;
is-is_func = func;
is-is_arg = arg;
+#ifdef MULTIPROCESSOR
+ is-is_mpsafe = false;
+#endif
if (pic-pic_ops-pic_source_name)
(*pic-pic_ops-pic_source_name)(pic, irq, is-is_source,
Index: src/sys/arch/arm/pic/picvar.h
diff -u src/sys/arch/arm/pic/picvar.h:1.7 src/sys/arch/arm/pic/picvar.h:1.8
--- src/sys/arch/arm/pic/picvar.h:1.7 Sat Sep 1 00:00:42 2012
+++ src/sys/arch/arm/pic/picvar.h Mon Mar 3 08:50:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: picvar.h,v 1.7 2012/09/01 00:00:42 matt Exp $ */
+/* $NetBSD: picvar.h,v 1.8 2014/03/03 08:50:48 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -99,6 +99,7 @@ struct intrsource {
uint8_t is_ipl;/* IPL_xxx */
uint8_t is_irq;/* local to pic */
uint8_t is_iplidx;
+ bool is_mpsafe;
char is_source[16];
};
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Mon Mar 3 08:51:39 UTC 2014
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
Add more instructions including ldrex/strex variants
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm/disassem.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/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.23 src/sys/arch/arm/arm/disassem.c:1.24
--- src/sys/arch/arm/arm/disassem.c:1.23 Fri Jan 10 23:52:53 2014
+++ src/sys/arch/arm/arm/disassem.c Mon Mar 3 08:51:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.23 2014/01/10 23:52:53 matt Exp $ */
+/* $NetBSD: disassem.c,v 1.24 2014/03/03 08:51:39 matt Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.23 2014/01/10 23:52:53 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.24 2014/03/03 08:51:39 matt Exp $);
#include sys/systm.h
@@ -122,6 +122,9 @@ struct arm32_insn {
static const struct arm32_insn arm32_i[] = {
{ 0x0fff, 0x0ff0, imb, c }, /* Before swi */
{ 0x0fff, 0x0ff1, imbrange, c }, /* Before swi */
+{ 0x0fff, 0x0320f003, yield, }, /* Before swi */
+{ 0x0fff, 0x0320f002, wfe, }, /* Before swi */
+{ 0x0fff, 0x0320f003, wfi, }, /* Before swi */
{ 0x0f00, 0x0f00, swi, c },
{ 0xfe00, 0xfa00, blx, t }, /* Before b and bl */
{ 0x0f00, 0x0a00, b, b },
@@ -140,10 +143,20 @@ static const struct arm32_insn arm32_i[]
{ 0x0c50, 0x0410, ldr, daW },
{ 0x0c50, 0x0440, strb, daW },
{ 0x0c50, 0x0450, ldrb, daW },
+{ 0x0fff, 0x092d, push, l }, /* separate out r13 base */
+{ 0x0fff, 0x08bd, pop, l }, /* separate out r13 base */
{ 0x0e1f, 0x080d, stm, YnWl },/* separate out r13 base */
{ 0x0e1f, 0x081d, ldm, YnWl },/* separate out r13 base */
{ 0x0e10, 0x0800, stm, XnWl },
{ 0x0e10, 0x0810, ldm, XnWl },
+{ 0x0ff00fff, 0x01900f9f, ldrex, da },
+{ 0x0ff00fff, 0x01b00f9f, ldrexd, da },
+{ 0x0ff00fff, 0x01d00f9f, ldrexb, da },
+{ 0x0ff00fff, 0x01f00f9f, ldrexh, da },
+{ 0x0ff00ff0, 0x01800f90, strex, dma },
+{ 0x0ff00ff0, 0x01a00f90, strexd, dma },
+{ 0x0ff00ff0, 0x01c00f90, strexb, dma },
+{ 0x0ff00ff0, 0x01e00f90, strexh, dma },
{ 0x0e1000f0, 0x00100090, ldrb, de },
{ 0x0e1000f0, 0x0090, strb, de },
{ 0x0e1000f0, 0x001000d0, ldrsb, de },
@@ -667,7 +680,8 @@ disasm_insn_ldrstr(const disasm_interfac
di-di_printaddr(loc + 8);
} else {
di-di_printf([r%d, (insn 16) 0x0f);
- if ((insn 0x03000fff) != 0x0100) {
+ if ((insn 0x03000fff) != 0x0100
+ (insn 0x0f800ff0) != 0x01800f90) {
di-di_printf(%s, , (insn (1 24)) ? : ]);
if (!(insn 0x0080))
di-di_printf(-);
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Mon Mar 3 08:52:30 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c
Log Message:
Further cpu_info inits in cpu_hatch
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm32/arm32_boot.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/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.5 src/sys/arch/arm/arm32/arm32_boot.c:1.6
--- src/sys/arch/arm/arm32/arm32_boot.c:1.5 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm32/arm32_boot.c Mon Mar 3 08:52:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.5 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.6 2014/03/03 08:52:30 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -123,7 +123,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.5 2013/08/18 06:28:18 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.6 2014/03/03 08:52:30 matt Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -342,14 +342,18 @@ cpu_hatch(struct cpu_info *ci, cpuid_t c
set_stackptr(PSR_UND32_MODE,
undstack.pv_va + cpu_index(ci) * UND_STACK_SIZE * PAGE_SIZE);
-#if 0
+ ci-ci_lastlwp = NULL;
+ ci-ci_pmap_lastuser = NULL;
+#ifdef ARM_MMU_EXTENDED
+ printf( tlb);
/*
- * Now that we are going to apart of the kernel,
- * take out the kernel lock.
+ * Attach to the tlb.
*/
- printf( kernel_lock);
- KERNEL_LOCK(1, NULL);
+ ci-ci_pmap_cur = pmap_kernel();
+ ci-ci_pmap_asid_cur = KERNEL_PID;
+ pmap_tlb_info_attach(pmap_tlb0_info, ci);
#endif
+
#ifdef CPU_CORTEX
if (CPU_ID_CORTEX_P(ci-ci_arm_cpuid)) {
/*
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 3 09:10:00 UTC 2014 Modified Files: src/share/man/man4: mii.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/mii.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/mii.4 diff -u src/share/man/man4/mii.4:1.26 src/share/man/man4/mii.4:1.27 --- src/share/man/man4/mii.4:1.26 Mon Mar 3 01:36:21 2014 +++ src/share/man/man4/mii.4 Mon Mar 3 09:10:00 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mii.4,v 1.26 2014/03/03 01:36:21 ozaki-r Exp $ +.\ $NetBSD: mii.4,v 1.27 2014/03/03 09:10:00 wiz Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -68,7 +68,8 @@ .Sh DESCRIPTION Media Independent Interface is an IEEE standard serial bus for connecting MACs (network controllers) to PHYs (physical media -interfaces). The +interfaces). +The .Nm layer allows network device drivers to share support code for various PHY models, and allows unused support for PHYs which @@ -78,7 +79,8 @@ Network device drivers which use the .Nm layer carry the .Dq mii -autoconfiguration attribute. This allows kernel configuration +autoconfiguration attribute. +This allows kernel configuration files to simply specify PHYs as described above in the synopsis. .Pp The following is an example of the messages displayed when a network @@ -92,8 +94,8 @@ qsphy0: 10baseT, 10baseT-FDX, 100baseTX, .Ed .Pp All PHY drivers display the media types supported by the PHY when it -is detected by the kernel. These media types are valid media keywords -for use with the +is detected by the kernel. +These media types are valid media keywords for use with the .Xr ifconfig 8 program. .Sh SEE ALSO
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 3 09:10:46 UTC 2014 Modified Files: src/share/man/man4: micphy.4 Log Message: Prefix link to cpsw with 'evbarm'. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/micphy.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/micphy.4 diff -u src/share/man/man4/micphy.4:1.1 src/share/man/man4/micphy.4:1.2 --- src/share/man/man4/micphy.4:1.1 Mon Mar 3 01:35:08 2014 +++ src/share/man/man4/micphy.4 Mon Mar 3 09:10:46 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: micphy.4,v 1.1 2014/03/03 01:35:08 ozaki-r Exp $ +.\ $NetBSD: micphy.4,v 1.2 2014/03/03 09:10:46 wiz Exp $ .\ .\ Copyright (c) 2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,10 +28,10 @@ The .Nm driver currently supports only Micrel KSZ9021RN PHY. The driver has a fixup for -.Xr cpsw 4 +.Xr evbarm/cpsw 4 which requires Gig-E PHYs to adjust RGMII signal timing. .Sh SEE ALSO -.Xr cpsw 4 , +.Xr evbarm/cpsw 4 , .Xr ifmedia 4 , .Xr intro 4 , .Xr mii 4 ,
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Mon Mar 3 10:38:36 UTC 2014
Modified Files:
src/tests/lib/libm: t_acos.c
Log Message:
Fix build for platforms w/o fenv.h.
Remove some bogus #ifdef __vax__ (and add a few, hopefully non-bogus,
new ones).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_acos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_acos.c
diff -u src/tests/lib/libm/t_acos.c:1.6 src/tests/lib/libm/t_acos.c:1.7
--- src/tests/lib/libm/t_acos.c:1.6 Sun Mar 2 22:40:45 2014
+++ src/tests/lib/libm/t_acos.c Mon Mar 3 10:38:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_acos.c,v 1.6 2014/03/02 22:40:45 dsl Exp $ */
+/* $NetBSD: t_acos.c,v 1.7 2014/03/03 10:38:36 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,12 +31,16 @@
#include atf-c.h
#include math.h
+
+#ifdef HAVE_FENV_H
#include fenv.h
+#endif
/*
* Check result of fn(arg) is correct within the bounds.
* Should be ok to do the checks using 'double' for 'float' functions.
*/
+#ifdef HAVE_FENV_H
#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
double r = fn(arg); \
double e = fabs(r - expect); \
@@ -45,6 +49,16 @@
subtest %zu: #fn (%g) is %g not %g (error %g %g), roundmode %x, \
subtest, arg, r, expect, e, epsilon, fegetround()); \
} while (0)
+#else
+#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
+ double r = fn(arg); \
+ double e = fabs(r - expect); \
+ if (e epsilon) \
+ atf_tc_fail_nonfatal( \
+ subtest %zu: #fn (%g) is %g not %g (error %g %g), \
+ subtest, arg, r, expect, e, epsilon); \
+} while (0)
+#endif
/* Check that the result of fn(arg) is NaN */
#ifndef __vax__
@@ -74,9 +88,11 @@ AFT_LIBM_TEST(acos_nan, Test acos/acosf
-1.1, 1.1,
-1.001, 1.001,
-1.1, 1.1,
+#ifndef __vax__
0.0L / 0.0L, /* NAN */
-1.0L / 0.0L, /* -Inf */
+1.0L / 0.0L, /* +Inf */
+#endif
};
size_t i;
@@ -120,22 +136,18 @@ AFT_LIBM_TEST(acos_inrange, Test acos/a
AFT_LIBM_TEST(acos_one_pos, Test acos(1.0) == +0.0)
{
-#ifndef __vax__
const double y = acos(1.0);
if (fabs(y) 0.0 || signbit(y) != 0)
atf_tc_fail_nonfatal(acos(1.0) != +0.0);
-#endif
}
AFT_LIBM_TEST(acosf_one_pos, Test acosf(1.0) == +0.0)
{
-#ifndef __vax__
const float y = acosf(1.0);
if (fabsf(y) 0.0 || signbit(y) != 0)
atf_tc_fail_nonfatal(acosf(1.0) != +0.0);
-#endif
}
ATF_TP_ADD_TCS(tp)
CVS commit: src/sbin/fsdb
Module Name:src Committed By: blymn Date: Mon Mar 3 12:12:19 UTC 2014 Modified Files: src/sbin/fsdb: fsdb.8 Log Message: Correct usage of clri. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sbin/fsdb/fsdb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsdb/fsdb.8 diff -u src/sbin/fsdb/fsdb.8:1.22 src/sbin/fsdb/fsdb.8:1.23 --- src/sbin/fsdb/fsdb.8:1.22 Wed Apr 30 13:10:53 2008 +++ src/sbin/fsdb/fsdb.8 Mon Mar 3 12:12:18 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsdb.8,v 1.22 2008/04/30 13:10:53 martin Exp $ +.\ $NetBSD: fsdb.8,v 1.23 2014/03/03 12:12:18 blymn Exp $ .\ .\ Copyright (c) 1996 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -93,8 +93,9 @@ as the new current inode. .It Cm back Revert to the previously current inode. .Pp -.It Cm clri -Clear the current inode. +.It Cm clri Ar i-number +Clear the inode +.Ar i-number . .Pp .It Cm lookup Ar name .It Cm cd Ar name
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Mon Mar 3 12:15:27 UTC 2014
Modified Files:
src/tests/lib/libm: Makefile
Log Message:
Define HAVE_FENV_H on architectures that support it.
What a mess, we need a central place for this!
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.20 src/tests/lib/libm/Makefile:1.21
--- src/tests/lib/libm/Makefile:1.20 Tue Nov 12 16:48:39 2013
+++ src/tests/lib/libm/Makefile Mon Mar 3 12:15:27 2014
@@ -1,9 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2013/11/12 16:48:39 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/03 12:15:27 martin Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libm
+.if ${MACHINE} == sparc || ${MACHINE} == i386 \
+ || ${MACHINE} == amd64 || ${MACHINE_CPU} == arm \
+ || ${MACHINE} == sparc64
+CPPFLAGS+= -DHAVE_FENV_H
+.endif
+
TESTS_C+= t_acos
TESTS_C+= t_asin
TESTS_C+= t_atan
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: skrll Date: Mon Mar 3 13:54:43 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi Log Message: Restore the hp700 file entries and mark them obsolete. Don't mark any hppa files obsolete - delete them. To generate a diff of this commit: cvs rdiff -u -r1.1461 -r1.1462 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1461 src/distrib/sets/lists/man/mi:1.1462 --- src/distrib/sets/lists/man/mi:1.1461 Mon Mar 3 02:10:24 2014 +++ src/distrib/sets/lists/man/mi Mon Mar 3 13:54:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1461 2014/03/03 02:10:24 ozaki-r Exp $ +# $NetBSD: mi,v 1.1462 2014/03/03 13:54:43 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1139,6 +1139,25 @@ ./usr/share/man/cat4/hp300/rtc.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/tc.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/topcat.0 man-sys-catman .cat +./usr/share/man/cat4/hp700/asp.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/astro.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/cpu.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/dino.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/elroy.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/gsc.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/gsckbc.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/harmony.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/intro.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/io.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/lasi.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/lcd.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/mem.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/mongoose.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/pdc.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/phantomas.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/ssio.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/uturn.0 man-obsolete obsolete +./usr/share/man/cat4/hp700/wax.0 man-obsolete obsolete ./usr/share/man/cat4/hpacel.0 man-sys-catman .cat ./usr/share/man/cat4/hpcarm/intro.0 man-sys-catman .cat ./usr/share/man/cat4/hpcarm/j720kbd.0 man-sys-catman .cat @@ -2443,6 +2462,10 @@ ./usr/share/man/cat8/hp300/crash.0 man-sys-catman .cat ./usr/share/man/cat8/hp300/format.0 man-sys-catman .cat ./usr/share/man/cat8/hp300/makedev.0 man-obsolete obsolete +./usr/share/man/cat8/hp700/MAKEDEV.0 man-obsolete obsolete +./usr/share/man/cat8/hp700/boot.0 man-obsolete obsolete +./usr/share/man/cat8/hp700/makedev.0 man-obsolete obsolete +./usr/share/man/cat8/hp700/mkboot.0 man-obsolete obsolete ./usr/share/man/cat8/hpcarm/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/hpcarm/boot.0 man-sys-catman .cat ./usr/share/man/cat8/hpcarm/makedev.0 man-obsolete obsolete @@ -2454,9 +2477,7 @@ ./usr/share/man/cat8/hpcsh/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/hpcsh/boot.0 man-sys-catman .cat ./usr/share/man/cat8/hpcsh/makedev.0 man-obsolete obsolete -./usr/share/man/cat8/hppa/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/hppa/boot.0 man-sys-catman .cat -./usr/share/man/cat8/hppa/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/hppa/mkboot.0 man-sys-catman .cat ./usr/share/man/cat8/hprop.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat8/hpropd.0 man-krb5-catman kerberos,.cat @@ -4139,6 +4160,25 @@ ./usr/share/man/html4/hp300/rmp.html man-sys-htmlman html ./usr/share/man/html4/hp300/rtc.html man-sys-htmlman html ./usr/share/man/html4/hp300/topcat.html man-sys-htmlman html +./usr/share/man/html4/hp700/asp.html man-obsolete obsolete +./usr/share/man/html4/hp700/astro.html man-obsolete obsolete +./usr/share/man/html4/hp700/cpu.html man-obsolete obsolete +./usr/share/man/html4/hp700/dino.html man-obsolete obsolete +./usr/share/man/html4/hp700/elroy.html man-obsolete obsolete +./usr/share/man/html4/hp700/gsc.html man-obsolete obsolete +./usr/share/man/html4/hp700/gsckbc.html man-obsolete obsolete +./usr/share/man/html4/hp700/harmony.html man-obsolete obsolete +./usr/share/man/html4/hp700/intro.html man-obsolete obsolete +./usr/share/man/html4/hp700/io.html man-obsolete obsolete +./usr/share/man/html4/hp700/lasi.html man-obsolete obsolete +./usr/share/man/html4/hp700/lcd.html man-obsolete obsolete +./usr/share/man/html4/hp700/mem.html man-obsolete obsolete +./usr/share/man/html4/hp700/mongoose.html man-obsolete obsolete +./usr/share/man/html4/hp700/pdc.html man-obsolete obsolete +./usr/share/man/html4/hp700/phantomas.html man-obsolete obsolete +./usr/share/man/html4/hp700/ssio.html man-obsolete obsolete +./usr/share/man/html4/hp700/uturn.html man-obsolete obsolete
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Mon Mar 3 13:56:41 UTC 2014
Modified Files:
src/sys/rump/net/lib/libvirtif: if_virt.c if_virt.h rumpcomp_user.c
rumpcomp_user.h
Log Message:
Pull in the changes from the dpdk, netmap and snabb switch repos.
There are two major changes:
1) All thread context policy is pushed down to the hypercalls.
This is meant to help performance-mongering implementations be
able to control packet scheduling better (e.g. pin down packet
reception to certain physical cores).
2) Generalize linkstr, meaning that the interface can now take an
arbitrary string which is passed to the create() hypercall. This can
be used to map backend device characteristics to the rump kernel
interface instance.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/net/lib/libvirtif/if_virt.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libvirtif/if_virt.h
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libvirtif/rumpcomp_user.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/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.38 src/sys/rump/net/lib/libvirtif/if_virt.c:1.39
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.38 Fri Feb 21 08:33:51 2014
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Mon Mar 3 13:56:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.38 2014/02/21 08:33:51 skrll Exp $ */
+/* $NetBSD: if_virt.c,v 1.39 2014/03/03 13:56:40 pooka Exp $ */
/*
* Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved.
@@ -26,24 +26,17 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.38 2014/02/21 08:33:51 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.39 2014/03/03 13:56:40 pooka Exp $);
#include sys/param.h
-#include sys/condvar.h
-#include sys/fcntl.h
#include sys/kernel.h
#include sys/kmem.h
-#include sys/kthread.h
-#include sys/mutex.h
-#include sys/poll.h
-#include sys/sockio.h
-#include sys/socketvar.h
#include sys/cprng.h
#include net/bpf.h
#include net/if.h
+#include net/if_dl.h
#include net/if_ether.h
-#include net/if_tap.h
#include netinet/in.h
#include netinet/in_var.h
@@ -70,14 +63,11 @@ static void virtif_stop(struct ifnet *,
struct virtif_sc {
struct ethercom sc_ec;
struct virtif_user *sc_viu;
- bool sc_dying;
- struct lwp *sc_l_snd, *sc_l_rcv;
- kmutex_t sc_mtx;
- kcondvar_t sc_cv;
+
+ int sc_num;
+ char *sc_linkstr;
};
-static void virtif_receiver(void *);
-static void virtif_sender(void *);
static int virtif_clone(struct if_clone *, int);
static int virtif_unclone(struct ifnet *);
@@ -85,60 +75,74 @@ struct if_clone VIF_CLONER =
IF_CLONE_INITIALIZER(VIF_NAME, virtif_clone, virtif_unclone);
static int
-virtif_clone(struct if_clone *ifc, int num)
+virtif_create(struct ifnet *ifp)
{
- struct virtif_sc *sc;
- struct virtif_user *viu;
- struct ifnet *ifp;
uint8_t enaddr[ETHER_ADDR_LEN] = { 0xb2, 0x0a, 0x00, 0x0b, 0x0e, 0x01 };
- int error = 0;
+ char enaddrstr[3*ETHER_ADDR_LEN];
+ struct virtif_sc *sc = ifp-if_softc;
+ int error;
- if (num = 0x100)
- return E2BIG;
+ if (sc-sc_viu)
+ panic(%s: already created, ifp-if_xname);
- if ((error = VIFHYPER_CREATE(num, viu)) != 0)
+ enaddr[2] = cprng_fast32() 0xff;
+ enaddr[5] = sc-sc_num 0xff;
+
+ if ((error = VIFHYPER_CREATE(sc-sc_linkstr,
+ sc, enaddr, sc-sc_viu)) != 0) {
+ printf(VIFHYPER_CREATE failed: %d\n, error);
return error;
+ }
- enaddr[2] = cprng_fast32() 0xff;
- enaddr[5] = num;
+ ether_ifattach(ifp, enaddr);
+ ether_snprintf(enaddrstr, sizeof(enaddrstr), enaddr);
+ aprint_normal_ifnet(ifp, Ethernet address %s\n, enaddrstr);
- sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
- sc-sc_dying = false;
- sc-sc_viu = viu;
+ IFQ_SET_READY(ifp-if_snd);
- mutex_init(sc-sc_mtx, MUTEX_DEFAULT, IPL_NONE);
- cv_init(sc-sc_cv, VIF_NAME snd);
+ return 0;
+}
+
+static int
+virtif_clone(struct if_clone *ifc, int num)
+{
+ struct virtif_sc *sc;
+ struct ifnet *ifp;
+ int error = 0;
+
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ sc-sc_num = num;
ifp = sc-sc_ec.ec_if;
sprintf(ifp-if_xname, %s%d, VIF_NAME, num);
ifp-if_softc = sc;
- if (rump_threads) {
- if ((error = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL,
- virtif_receiver, ifp, sc-sc_l_rcv, VIF_NAME ifr)) != 0)
- goto out;
-
- if ((error = kthread_create(PRI_NONE,
- KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
- virtif_sender, ifp, sc-sc_l_snd, VIF_NAME ifs)) != 0)
- goto out;
- } else {
- printf(WARNING: threads not enabled, receive NOT working\n);
- }
-
ifp-if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp-if_init = virtif_init;
ifp-if_ioctl = virtif_ioctl;
ifp-if_start = virtif_start;
ifp-if_stop = virtif_stop;
- IFQ_SET_READY(ifp-if_snd);
+ ifp-if_mtu = ETHERMTU;
+
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src
Committed By: pooka
Date: Mon Mar 3 14:01:30 UTC 2014
Modified Files:
src/sys/rump/net/lib/libnpf: Makefile
Log Message:
For now, make it possible to not specify -D_NPF_TESTING by compiling
with RUMP_NPF_TESTING_=no. This in turn makes it possible to use npf
in a rump kernel for real packet filtering instead of just testing.
no change to default
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libnpf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.9 src/sys/rump/net/lib/libnpf/Makefile:1.10
--- src/sys/rump/net/lib/libnpf/Makefile:1.9 Fri Nov 8 00:38:27 2013
+++ src/sys/rump/net/lib/libnpf/Makefile Mon Mar 3 14:01:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/11/08 00:38:27 rmind Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/03 14:01:30 pooka Exp $
#
# Public Domain.
#
@@ -19,7 +19,9 @@ SRCS+= npf_ext_log.c npf_ext_normalize.c
SRCS+= component.c
+.if ${RUMP_NPF_TESTING:Uyes} == yes
CPPFLAGS+= -D_NPF_TESTING
+.endif
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
.include bsd.lib.mk
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Mon Mar 3 14:03:14 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
Log Message:
If we are going to map all of physical memory, we don't need to allocate
l2 page tables for the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.22 src/sys/arch/arm/arm32/arm32_kvminit.c:1.23
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.22 Thu Aug 29 15:46:17 2013
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Mon Mar 3 14:03:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.22 2013/08/29 15:46:17 riz Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.23 2014/03/03 14:03:14 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.22 2013/08/29 15:46:17 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.23 2014/03/03 14:03:14 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -302,6 +302,8 @@ valloc_pages(struct bootmem_info *bmi, p
size_t free_idx = 0;
static bool l1pt_found;
+ KASSERT(npages 0);
+
/*
* If we haven't allocated the kernel L1 page table and we are aligned
* at a L1 table boundary, alloc the memory for it.
@@ -392,21 +394,31 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
*/
size_t kernel_size = bmi-bmi_kernelend;
kernel_size -= (bmi-bmi_kernelstart -L2_S_SEGSIZE);
- kernel_size += L1_TABLE_SIZE;
- kernel_size += L2_TABLE_SIZE * (2 + 1 + KERNEL_L2PT_VMDATA_NUM + 1);
+ kernel_size += L1_TABLE_SIZE_REAL;
+ kernel_size += PAGE_SIZE * KERNEL_L2PT_VMDATA_NUM;
+ if (map_vectors_p) {
+ kernel_size += PAGE_SIZE; /* L2PT for VECTORS */
+ }
+ if (iovbase) {
+ kernel_size += PAGE_SIZE; /* L2PT for IO */
+ }
kernel_size +=
cpu_num * (ABT_STACK_SIZE + FIQ_STACK_SIZE + IRQ_STACK_SIZE
+ UND_STACK_SIZE + UPAGES) * PAGE_SIZE;
kernel_size += round_page(MSGBUFSIZE);
kernel_size += 0x1; /* slop */
- kernel_size += PAGE_SIZE * (kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE;
+ if (!mapallmem_p) {
+ kernel_size += PAGE_SIZE
+ * ((kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE);
+ }
kernel_size = round_page(kernel_size);
/*
- * Now we know how many L2 pages it will take.
+ * Now we know how many L2 pages it will take. If we've mapped
+ * all of memory, then it won't take any.
*/
- const size_t KERNEL_L2PT_KERNEL_NUM =
- (kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE;
+ const size_t KERNEL_L2PT_KERNEL_NUM = mapallmem_p
+ ? 0 : round_page(kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE;
#ifdef VERBOSE_INIT_ARM
printf(%s: %zu L2 pages are needed to map %#zx kernel bytes\n,
@@ -463,9 +475,8 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
#ifdef VERBOSE_INIT_ARM
printf( vector);
#endif
- valloc_pages(bmi, bmi-bmi_vector_l2pt,
- L2_TABLE_SIZE / PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE,
- PTE_PAGETABLE, true);
+ valloc_pages(bmi, bmi-bmi_vector_l2pt, 1,
+ VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true);
add_pages(bmi, bmi-bmi_vector_l2pt);
}
@@ -475,8 +486,10 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
#ifdef VERBOSE_INIT_ARM
printf( kernel);
#endif
+ KASSERT(mapallmem_p || KERNEL_L2PT_KERNEL_NUM 0);
+ KASSERT(!mapallmem_p || KERNEL_L2PT_KERNEL_NUM == 0);
for (size_t idx = 0; idx KERNEL_L2PT_KERNEL_NUM; ++idx) {
- valloc_pages(bmi, kernel_l2pt[idx], L2_TABLE_SIZE / PAGE_SIZE,
+ valloc_pages(bmi, kernel_l2pt[idx], 1,
VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true);
add_pages(bmi, kernel_l2pt[idx]);
}
@@ -488,7 +501,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
printf( vm);
#endif
for (size_t idx = 0; idx KERNEL_L2PT_VMDATA_NUM; ++idx) {
- valloc_pages(bmi, vmdata_l2pt[idx], L2_TABLE_SIZE / PAGE_SIZE,
+ valloc_pages(bmi, vmdata_l2pt[idx], 1,
VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true);
add_pages(bmi, vmdata_l2pt[idx]);
}
@@ -496,11 +509,11 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
/*
* If someone wanted a L2 page for I/O, allocate it now.
*/
- if (iovbase != 0) {
+ if (iovbase) {
#ifdef VERBOSE_INIT_ARM
printf( io);
#endif
- valloc_pages(bmi, bmi-bmi_io_l2pt, L2_TABLE_SIZE / PAGE_SIZE,
+ valloc_pages(bmi, bmi-bmi_io_l2pt, 1,
VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true);
add_pages(bmi, bmi-bmi_io_l2pt);
}
@@ -600,8 +613,8 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
kernel_l2pt[idx]);
#ifdef VERBOSE_INIT_ARM
printf(%s: adding L2 pt (VA %#lx, PA %#lx) for VA %#lx (kernel)\n,
- __func__, kernel_l2pt[idx].pv_va, kernel_l2pt[idx].pv_pa,
- kernel_base + idx * L2_S_SEGSIZE);
+ __func__, kernel_l2pt[idx].pv_va,
+
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Mon Mar 3 14:26:32 UTC 2014 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: More control bits. SYNCHPRIM defines. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/arm/include/armreg.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/include/armreg.h diff -u src/sys/arch/arm/include/armreg.h:1.89 src/sys/arch/arm/include/armreg.h:1.90 --- src/sys/arch/arm/include/armreg.h:1.89 Sat Mar 1 05:41:59 2014 +++ src/sys/arch/arm/include/armreg.h Mon Mar 3 14:26:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.89 2014/03/01 05:41:59 matt Exp $ */ +/* $NetBSD: armreg.h,v 1.90 2014/03/03 14:26:32 matt Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -269,6 +269,11 @@ #define CPU_ID_ARM_88SV584X_V6 0x410fb020 /* Marvell Sheeva 88SV584x v6 Core */ /* CPUID registers */ +#define ARM_ISA3_SYNCHPRIM_MASK 0xf000 +#define ARM_ISA4_SYNCHPRIM_MASK 0x00f0 +#define ARM_ISA3_SYNCHPRIM_LDREX 0x10 // LDREX +#define ARM_ISA3_SYNCHPRIM_LDREXPLUS 0x13 // +CLREX/LDREXB/LDREXH +#define ARM_ISA3_SYNCHPRIM_LDREXD 0x20 // +LDREXD #define ARM_PFR0_THUMBEE_MASK 0xf000 #define ARM_PFR1_GTIMER_MASK 0x000f #define ARM_PFR1_VIRT_MASK 0xf000 @@ -358,6 +363,9 @@ #define CPU_CONTROL_VECRELOC 0x2000 /* V: Vector relocation */ #define CPU_CONTROL_ROUNDROBIN 0x4000 /* RR: Predictable replacement */ #define CPU_CONTROL_V4COMPAT 0x8000 /* L4: ARMv4 compat LDR R15 etc */ +#define CPU_CONTROL_HA_ENABLE 0x0002 /* HA: Hardware Access flag enable */ +#define CPU_CONTROL_WXN_ENABLE 0x0008 /* WXN: Write Execute Never */ +#define CPU_CONTROL_UWXN_ENABLE 0x0010 /* UWXN: User Write eXecute Never */ #define CPU_CONTROL_FI_ENABLE 0x0020 /* FI: Low interrupt latency */ #define CPU_CONTROL_UNAL_ENABLE 0x0040 /* U: unaligned data access */ #define CPU_CONTROL_XP_ENABLE 0x0080 /* XP: extended page table */
CVS commit: src/common/lib/libc/arch/powerpc/string
Module Name:src Committed By: macallan Date: Mon Mar 3 15:30:31 UTC 2014 Modified Files: src/common/lib/libc/arch/powerpc/string: memcpy.S Log Message: on ppc601 do byte-wise copies when in _KERNEL from scole_mail, ok matt@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/powerpc/string/memcpy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/powerpc/string/memcpy.S diff -u src/common/lib/libc/arch/powerpc/string/memcpy.S:1.3 src/common/lib/libc/arch/powerpc/string/memcpy.S:1.4 --- src/common/lib/libc/arch/powerpc/string/memcpy.S:1.3 Sat Jan 15 07:31:12 2011 +++ src/common/lib/libc/arch/powerpc/string/memcpy.S Mon Mar 3 15:30:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: memcpy.S,v 1.3 2011/01/15 07:31:12 matt Exp $ */ +/* $NetBSD: memcpy.S,v 1.4 2014/03/03 15:30:31 macallan Exp $ */ /* stropt/memcpy_440.S, pl_string_common, pl_linux 10/11/04 11:45:36 * == @@ -52,6 +52,9 @@ */ #include machine/asm.h +#ifdef _KERNEL +#include opt_ppcarch.h +#endif .text .align 4 @@ -63,6 +66,32 @@ ENTRY(memcpy) cmpwi %r5,0 beqlr- +#if defined(_KERNEL) defined(PPC_OEA601) + /* + * 601 will generate alignment exceptions if operand crosses + * 4k page boundary, so do byte copy when exception handler + * not available. Maybe want to have a different memcpy for 601 + * that checks for page boundaries/word alignment... + */ + mfspr %r6, 287 /* mfpvbr %r6 PVR = 287 */ + srwi%r6, %r6, 0x10 /* get version field from PVR */ + cmpwi %r6, 0x1 /* 601 CPU = 0x0001 */ + bne bnorm /* skip byte-only unless 601 */ + +bcpy: + mtctr %r5 /* byte copy everything */ + li %r6, 0 +bloop: + lbzx%r7, %r4, %r6 + stbx%r7, %r3, %r6 + addi%r6, %r6, 1 + bdnzbloop + blr + +bnorm: + +#endif + mr %r8, %r3 /* Copy dst (return value) */ addi %r4, %r4, -4 /* Prepare for main loop's auto */
CVS commit: src/sys/arch/powerpc
Module Name:src
Committed By: macallan
Date: Mon Mar 3 15:36:36 UTC 2014
Modified Files:
src/sys/arch/powerpc/include: cpu.h trap.h
src/sys/arch/powerpc/oea: oea_machdep.c ofwoea_machdep.c pmap.c
src/sys/arch/powerpc/powerpc: clock.c fixup.c trap.c
Log Message:
support ppc601
from scole_mail, ok matt@
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/trap.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/oea/ofwoea_machdep.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/powerpc/clock.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/fixup.c
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/powerpc/powerpc/trap.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/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.98 src/sys/arch/powerpc/include/cpu.h:1.99
--- src/sys/arch/powerpc/include/cpu.h:1.98 Fri Nov 8 03:59:35 2013
+++ src/sys/arch/powerpc/include/cpu.h Mon Mar 3 15:36:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.98 2013/11/08 03:59:35 nisimura Exp $ */
+/* $NetBSD: cpu.h,v 1.99 2014/03/03 15:36:36 macallan Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -316,6 +316,26 @@ mfrtc(uint32_t *rtcp)
: [rtcu] =r(rtcp[0]), [rtcl] =r(rtcp[1]), [tmp] =r(tmp)
:: cr0);
}
+
+static __inline uint64_t
+rtc_nanosecs(void)
+{
+/*
+ * 601 RTC/DEC registers share clock of 7.8125 MHz, 128 ns per tick.
+ * DEC has max of 25 bits, FF = 2.14748352 seconds.
+ * RTCU is seconds, 32 bits.
+ * RTCL is nano-seconds, 23 bit counter from 0 - 999,999,872 (999,999,999 - 128 ns)
+ */
+uint64_t cycles;
+uint32_t tmp[2];
+
+mfrtc(tmp);
+
+cycles = tmp[0] * 10;
+cycles += (tmp[1] 7);
+
+return cycles;
+}
#endif /* !_MODULE */
static __inline uint32_t
Index: src/sys/arch/powerpc/include/trap.h
diff -u src/sys/arch/powerpc/include/trap.h:1.12 src/sys/arch/powerpc/include/trap.h:1.13
--- src/sys/arch/powerpc/include/trap.h:1.12 Wed Jul 18 16:44:52 2012
+++ src/sys/arch/powerpc/include/trap.h Mon Mar 3 15:36:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.12 2012/07/18 16:44:52 matt Exp $ */
+/* $NetBSD: trap.h,v 1.13 2014/03/03 15:36:36 macallan Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -47,7 +47,8 @@
#define EXC_TRC 0x0d00 /* Trace */
#define EXC_FPA 0x0e00 /* Floating-point Assist */
-/* The following is only available on the 601: */
+/* The following are only available on the 601: */
+#define EXC_IOC 0x0a00 /* I/O Controller Interface Exception */
#define EXC_RUNMODETRC 0x2000 /* Run Mode/Trace Exception */
/* The following are only available on 7400(G4): */
@@ -112,12 +113,78 @@
*/
#define EXC_ALI_OPCODE_INDICATOR(dsisr) ((dsisr 10) 0x7f)
+
+#define EXC_ALI_LWARX_LWZ 0x00
+#define EXC_ALI_LDARX 0x01
+#define EXC_ALI_STW0x02
+#define EXC_ALI_LHZ0x04
+#define EXC_ALI_LHA0x05
+#define EXC_ALI_STH0x06
+#define EXC_ALI_LMW0x07
+#define EXC_ALI_LFS0x08
#define EXC_ALI_LFD 0x09
+#define EXC_ALI_STFS 0x0a
#define EXC_ALI_STFD 0x0b
+#define EXC_ALI_LD_LDU_LWA 0x0d
+#define EXC_ALI_STD_STDU 0x0f
+#define EXC_ALI_LWZU 0x10
+#define EXC_ALI_STWU 0x12
+#define EXC_ALI_LHZU 0x14
+#define EXC_ALI_LHAU 0x15
+#define EXC_ALI_STHU 0x16
+#define EXC_ALI_STMW 0x17
+#define EXC_ALI_LFSU 0x18
+#define EXC_ALI_LFDU 0x19
+#define EXC_ALI_STFSU 0x1a
+#define EXC_ALI_STFDU 0x1b
+#define EXC_ALI_LDX0x20
+#define EXC_ALI_STDX 0x22
+#define EXC_ALI_LWAX 0x25
+#define EXC_ALI_LSWX 0x28
+#define EXC_ALI_LSWI 0x29
+#define EXC_ALI_STSWX 0x2a
+#define EXC_ALI_STSWI 0x2b
+#define EXC_ALI_LDUX 0x30
+#define EXC_ALI_STDUX 0x32
+#define EXC_ALI_LWAUX 0x35
+#define EXC_ALI_STWCX 0x42 /* stwcx. */
+#define EXC_ALI_STDCX 0x43 /* stdcx. */
+#define EXC_ALI_LWBRX 0x48
+#define EXC_ALI_STWBRX 0x4a
+#define EXC_ALI_LHBRX 0x4c
+#define EXC_ALI_STHBRX 0x4e
+#define EXC_ALI_ECIWX 0x54
+#define EXC_ALI_ECOWX 0x56
#define EXC_ALI_DCBZ 0x5f
+#define EXC_ALI_LWZX 0x60
+#define EXC_ALI_STWX 0x62
+#define EXC_ALI_LHZX 0x64
+#define EXC_ALI_LHAX 0x65
+#define EXC_ALI_STHX 0x66
+#define EXC_ALI_LSFX 0x68
+#define EXC_ALI_LDFX 0x69
+#define EXC_ALI_STFSX 0x6a
+#define EXC_ALI_STFDX 0x6b
+#define EXC_ALI_STFIWX 0x6f
+#define EXC_ALI_LWZUX 0x70
+#define EXC_ALI_STWUX 0x72
+#define EXC_ALI_LHZUX 0x74
+#define EXC_ALI_LHAUX 0x75
+#define EXC_ALI_STHUX 0x76
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Mon Mar 3 16:09:43 UTC 2014 Added Files: src/sys/arch/macppc/conf: GENERIC_601 std.macppc.601 Log Message: config goop for ppc601 support GENERIC_601 more or less resembles a Power Macintosh 7200 with a few drivers thrown in for convenience while keeping the kernel itself smaller than 4MB To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/macppc/conf/GENERIC_601 \ src/sys/arch/macppc/conf/std.macppc.601 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/macppc/conf/GENERIC_601 diff -u /dev/null src/sys/arch/macppc/conf/GENERIC_601:1.1 --- /dev/null Mon Mar 3 16:09:43 2014 +++ src/sys/arch/macppc/conf/GENERIC_601 Mon Mar 3 16:09:43 2014 @@ -0,0 +1,380 @@ +# $NetBSD: GENERIC_601,v 1.1 2014/03/03 16:09:43 macallan Exp $ +# +# GENERIC machine description file +# +# This machine description file is used to generate the default NetBSD +# kernel. The generic kernel does not include all options, subsystems +# and device drivers, but should be useful for most applications. +# +# The machine description file can be customised for your specific +# machine to reduce the kernel size and improve its performance. +# +# For further information on compiling NetBSD kernels, see the config(8) +# man page. +# +# For further information on hardware support for this architecture, see +# the intro(4) man page. For further information about kernel options +# for this architecture, see the options(4) man page. For an explanation +# of each device driver in this file see the section 4 man page for the +# device. +# +# For PPC 601, need CPUFLAGS+= -mcpu=601 +# +# Openfirmware 1.0.5 require a kernel 4M for netbooting +# +# this config more or less matches a Power Macintosh 7200 with a USB card + +include arch/macppc/conf/std.macppc.601 + +options INCLUDE_CONFIG_FILE # embed config file in kernel binary + +ident GENERIC-$Revision: 1.1 $ + +maxusers 32 + +# Standard system options +options INSECURE # disable kernel security levels + +options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT +options NTP # NTP phase/frequency locked loop +options KTRACE # system call tracing via ktrace(1) + +options SYSVMSG # System V message queues +options SYSVSEM # System V semaphores +options SYSVSHM # System V shared memory + +options MODULAR # new style module(7) framework + +#options USERCONF # userconf(4) support +#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel + +# Enable experimental buffer queue strategy for better responsiveness under +# high disk I/O load. Use it with caution - it's not proven to be stable yet. +#options BUFQ_READPRIO +#options BUFQ_PRIOCSCAN + +# Diagnostic/debugging support options +#options DIAGNOSTIC # cheap kernel consistency checks +#options DEBUG # expensive debugging checks/support +options ZS_CONSOLE_ABORT# allow break to get into DDB on serial +options DDB # in-kernel debugger +#options DDB_ONPANIC=0 # don't go into ddb on panic. +options DDB_HISTORY_SIZE=512 # enable history editing in DDB +#options TRAP_PANICWAIT +options DDB_COMMANDONENTER=bt + +#makeoptions DEBUG=-g # compile full symbol table + +# Compatibility options +options COMPAT_50 # NetBSD 5.0 compatibility. +options COMPAT_60 # NetBSD 6.0 compatibility. +#options COMPAT_386BSD_MBRPART # recognize old partition ID +#options COMPAT_LINUX # Linux binary compatibility +#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. +options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. + +# Wedge support +options DKWEDGE_AUTODISCOVER# Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#optionsDKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#optionsDKWEDGE_METHOD_MBR # Support MBR partitions as wedges + +# File systems +file-system FFS # UFS +#file-system EXT2FS # second extended file system (linux) +#file-system LFS # log-structured file system +#file-system MFS # memory file system +file-system NFS # Network File System client +file-system CD9660 # ISO 9660 + Rock Ridge file system +#file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system OVERLAY # overlay file system +#file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) +file-system PROCFS # /proc +#file-system UMAPFS # NULLFS + uid and gid remapping +#file-system UNION # union file system +#file-system SMBFS # CIFS; also needs nsmb (below) +file-system PTYFS # /dev/pts/N support +file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental -
CVS commit: src/doc
Module Name:src Committed By: macallan Date: Mon Mar 3 16:22:57 UTC 2014 Modified Files: src/doc: CHANGES Log Message: mention ppc601 support To generate a diff of this commit: cvs rdiff -u -r1.1896 -r1.1897 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1896 src/doc/CHANGES:1.1897 --- src/doc/CHANGES:1.1896 Sat Mar 1 20:58:04 2014 +++ src/doc/CHANGES Mon Mar 3 16:22:57 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1896 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1897 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -363,3 +363,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: dhcpcd(8): Import dhcpcd-6.3.1 [roy 20140301] x68k: Switch to X11FLAVOUR=Xorg, including X68k monolithic server. [tsutsui 20140301] + macppc: add support for ppc601-based machines + from scole_mail via PR48600 [macallan 20140303]
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Mar 3 16:50:28 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
Log Message:
Fix the memory limiter to work for non-pagedaemon threads again
reported by njoly
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/rump/librump/rumpkern/vm.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/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.149 src/sys/rump/librump/rumpkern/vm.c:1.150
--- src/sys/rump/librump/rumpkern/vm.c:1.149 Tue Feb 18 06:18:13 2014
+++ src/sys/rump/librump/rumpkern/vm.c Mon Mar 3 16:50:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.149 2014/02/18 06:18:13 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.149 2014/02/18 06:18:13 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -1158,6 +1158,8 @@ uvm_kick_pdaemon()
void *
rump_hypermalloc(size_t howmuch, int alignment, bool waitok, const char *wmsg)
{
+ const unsigned long thelimit =
+ curlwp == uvm.pagedaemon_lwp ? pdlimit : rump_physmemlimit;
unsigned long newmem;
void *rv;
int error;
@@ -1166,10 +1168,9 @@ rump_hypermalloc(size_t howmuch, int ali
/* first we must be within the limit */
limitagain:
- if (rump_physmemlimit != RUMPMEM_UNLIMITED) {
+ if (thelimit != RUMPMEM_UNLIMITED) {
newmem = atomic_add_long_nv(curphysmem, howmuch);
- if ((newmem rump_physmemlimit)
- !(curlwp == uvm.pagedaemon_lwp || newmem pdlimit)) {
+ if (newmem thelimit) {
newmem = atomic_add_long_nv(curphysmem, -howmuch);
if (!waitok) {
return NULL;
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: dsl
Date: Mon Mar 3 18:21:33 UTC 2014
Modified Files:
src/tests/lib/libm: t_acos.c
Log Message:
Remove the print of the rounding mode.
It was added in case it was non-zero - which it isn't.
It still isn't clear why acos(-1) gives the wrong result on some amd64
systems.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libm/t_acos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_acos.c
diff -u src/tests/lib/libm/t_acos.c:1.7 src/tests/lib/libm/t_acos.c:1.8
--- src/tests/lib/libm/t_acos.c:1.7 Mon Mar 3 10:38:36 2014
+++ src/tests/lib/libm/t_acos.c Mon Mar 3 18:21:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_acos.c,v 1.7 2014/03/03 10:38:36 martin Exp $ */
+/* $NetBSD: t_acos.c,v 1.8 2014/03/03 18:21:33 dsl Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,24 +32,10 @@
#include atf-c.h
#include math.h
-#ifdef HAVE_FENV_H
-#include fenv.h
-#endif
-
/*
* Check result of fn(arg) is correct within the bounds.
* Should be ok to do the checks using 'double' for 'float' functions.
*/
-#ifdef HAVE_FENV_H
-#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
- double r = fn(arg); \
- double e = fabs(r - expect); \
- if (e epsilon) \
- atf_tc_fail_nonfatal( \
- subtest %zu: #fn (%g) is %g not %g (error %g %g), roundmode %x, \
- subtest, arg, r, expect, e, epsilon, fegetround()); \
-} while (0)
-#else
#define T_LIBM_CHECK(subtest, fn, arg, expect, epsilon) do { \
double r = fn(arg); \
double e = fabs(r - expect); \
@@ -58,7 +44,6 @@
subtest %zu: #fn (%g) is %g not %g (error %g %g), \
subtest, arg, r, expect, e, epsilon); \
} while (0)
-#endif
/* Check that the result of fn(arg) is NaN */
#ifndef __vax__
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: joerg
Date: Mon Mar 3 18:25:14 UTC 2014
Modified Files:
src/sys/arch/evbppc/compile: walnut-mkimg.sh
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Use nbstat when cross-compiling, unbreaks build on Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/compile/walnut-mkimg.sh
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc
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/evbppc/compile/walnut-mkimg.sh
diff -u src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.5
--- src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 Sat Nov 6 16:23:35 2010
+++ src/sys/arch/evbppc/compile/walnut-mkimg.sh Mon Mar 3 18:25:14 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: walnut-mkimg.sh,v 1.4 2010/11/06 16:23:35 uebayasi Exp $
+# $NetBSD: walnut-mkimg.sh,v 1.5 2014/03/03 18:25:14 joerg Exp $
# Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
@@ -18,6 +18,7 @@ output=$1; shift
: ${OBJDUMP=objdump}
: ${OBJCOPY=objcopy}
+: ${STAT=stat}
file=$( file $input )
case $file in
@@ -36,7 +37,7 @@ case $file in
;;
esac
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
size=$(( ( $size + 511 ) / 512 ))
enc()
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.6 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 Mon Jan 27 21:37:17 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.9 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == obs266
@@ -30,8 +30,8 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == obs600
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 Wed Feb 1 21:46:02 2012
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.6 2012/02/01 21:46:02 matt Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.7 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
CVS commit: src
Module Name:src
Committed By: pooka
Date: Mon Mar 3 18:27:20 UTC 2014
Modified Files:
src/distrib/sets/lists/man: mi
src/lib/librumpvfs: Makefile
Added Files:
src/lib/librumpvfs: rumpfs.4
Log Message:
add man page for rumpfs
To generate a diff of this commit:
cvs rdiff -u -r1.1462 -r1.1463 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpvfs/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/librumpvfs/rumpfs.4
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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1462 src/distrib/sets/lists/man/mi:1.1463
--- src/distrib/sets/lists/man/mi:1.1462 Mon Mar 3 13:54:43 2014
+++ src/distrib/sets/lists/man/mi Mon Mar 3 18:27:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1462 2014/03/03 13:54:43 skrll Exp $
+# $NetBSD: mi,v 1.1463 2014/03/03 18:27:20 pooka Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1566,6 +1566,7 @@
./usr/share/man/cat4/rtpphy.0 man-obsolete obsolete
./usr/share/man/cat4/rtw.0 man-sys-catman .cat
./usr/share/man/cat4/rum.0 man-sys-catman .cat
+./usr/share/man/cat4/rumpfs.0 man-sys-catman .cat,rump
./usr/share/man/cat4/run.0 man-sys-catman .cat
./usr/share/man/cat4/s390rtc.0 man-sys-catman .cat
./usr/share/man/cat4/sandpoint/nhpow.0 man-sys-catman .cat
@@ -4530,6 +4531,7 @@
./usr/share/man/html4/rtk.html man-sys-htmlman html
./usr/share/man/html4/rtw.html man-sys-htmlman html
./usr/share/man/html4/rum.html man-sys-htmlman html
+./usr/share/man/html4/rumpfs.html man-sys-htmlman html,rump
./usr/share/man/html4/run.html man-sys-htmlman html
./usr/share/man/html4/s390rtc.html man-sys-htmlman html
./usr/share/man/html4/sandpoint/nhpow.html man-sys-htmlman html
@@ -7398,6 +7400,7 @@
./usr/share/man/man4/rtpphy.4 man-obsolete obsolete
./usr/share/man/man4/rtw.4 man-sys-man .man
./usr/share/man/man4/rum.4 man-sys-man .man
+./usr/share/man/man4/rumpfs.4 man-sys-man .man,rump
./usr/share/man/man4/run.4 man-sys-man .man
./usr/share/man/man4/s390rtc.4 man-sys-man .man
./usr/share/man/man4/sandpoint/nhpow.4 man-sys-man .man
Index: src/lib/librumpvfs/Makefile
diff -u src/lib/librumpvfs/Makefile:1.3 src/lib/librumpvfs/Makefile:1.4
--- src/lib/librumpvfs/Makefile:1.3 Tue Nov 30 17:32:29 2010
+++ src/lib/librumpvfs/Makefile Mon Mar 3 18:27:20 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/11/30 17:32:29 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/03 18:27:20 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../sys/rump
LIBDPLIBS+= rump ${.CURDIR}/../librump
-MAN= rump_etfs.3
+MAN= rump_etfs.3 rumpfs.4
WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare
Added files:
Index: src/lib/librumpvfs/rumpfs.4
diff -u /dev/null src/lib/librumpvfs/rumpfs.4:1.1
--- /dev/null Mon Mar 3 18:27:20 2014
+++ src/lib/librumpvfs/rumpfs.4 Mon Mar 3 18:27:20 2014
@@ -0,0 +1,67 @@
+.\ $NetBSD: rumpfs.4,v 1.1 2014/03/03 18:27:20 pooka Exp $
+.\
+.\ Copyright (c) 2014 Antti Kantee. All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\ SUCH DAMAGE.
+.\
+.Dd March 3, 2014
+.Dt RUMPFS 4
+.Os
+.Sh NAME
+.Nm rumpfs
+.Nd rump kernel root file system
+.Sh LIBRARY
+rump kernel (librumpvfs, \-lrumpvfs)
+.Sh DESCRIPTION
+.Nm
+is a simple in-memory file system for rump kernels.
+It is automatically mounted as the root file system of a rump kernel
+at boot time, provided that the VFS faction is configured into the rump
+kernel instance.
+.Pp
+The three main features of
+.Nm
+are:
+.Bl -enum -offset indent
+.It
+providing a hook for accessing host files via the
CVS commit: src/common/lib/libc/arch/powerpc/string
Module Name:src Committed By: matt Date: Mon Mar 3 18:55:02 UTC 2014 Modified Files: src/common/lib/libc/arch/powerpc/string: memcpy.S Log Message: Use _KERNEL_OPT around #include opt_ppcarch.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/powerpc/string/memcpy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/powerpc/string/memcpy.S diff -u src/common/lib/libc/arch/powerpc/string/memcpy.S:1.4 src/common/lib/libc/arch/powerpc/string/memcpy.S:1.5 --- src/common/lib/libc/arch/powerpc/string/memcpy.S:1.4 Mon Mar 3 15:30:31 2014 +++ src/common/lib/libc/arch/powerpc/string/memcpy.S Mon Mar 3 18:55:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: memcpy.S,v 1.4 2014/03/03 15:30:31 macallan Exp $ */ +/* $NetBSD: memcpy.S,v 1.5 2014/03/03 18:55:02 matt Exp $ */ /* stropt/memcpy_440.S, pl_string_common, pl_linux 10/11/04 11:45:36 * == @@ -52,7 +52,7 @@ */ #include machine/asm.h -#ifdef _KERNEL +#ifdef _KERNEL_OPT #include opt_ppcarch.h #endif
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: joerg
Date: Mon Mar 3 19:08:46 UTC 2014
Modified Files:
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Spell it TOOL_STAT.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.walnut.inc
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/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.6 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.7 2014/03/03 19:08:46 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.11
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.11 2014/03/03 19:08:46 joerg Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,7 +15,7 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
@@ -30,7 +30,7 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.7 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.8 2014/03/03 19:08:46 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src
Committed By: pooka
Date: Mon Mar 3 19:09:52 UTC 2014
Modified Files:
src/sys/rump/net/lib/libnpf: Makefile
Log Message:
also include bsd.own.mk, so value for RUMP_NPF_TESTING can come from mk.conf
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/lib/libnpf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.10 src/sys/rump/net/lib/libnpf/Makefile:1.11
--- src/sys/rump/net/lib/libnpf/Makefile:1.10 Mon Mar 3 14:01:30 2014
+++ src/sys/rump/net/lib/libnpf/Makefile Mon Mar 3 19:09:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/03/03 14:01:30 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2014/03/03 19:09:52 pooka Exp $
#
# Public Domain.
#
@@ -19,6 +19,8 @@ SRCS+= npf_ext_log.c npf_ext_normalize.c
SRCS+= component.c
+.include bsd.own.mk
+
.if ${RUMP_NPF_TESTING:Uyes} == yes
CPPFLAGS+= -D_NPF_TESTING
.endif
CVS commit: src/distrib/evbppc/md-kernel
Module Name:src
Committed By: joerg
Date: Mon Mar 3 19:14:00 UTC 2014
Modified Files:
src/distrib/evbppc/md-kernel: Makefile
Log Message:
Pass down TOOL_STAT here as well.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbppc/md-kernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/md-kernel/Makefile
diff -u src/distrib/evbppc/md-kernel/Makefile:1.3 src/distrib/evbppc/md-kernel/Makefile:1.4
--- src/distrib/evbppc/md-kernel/Makefile:1.3 Wed Aug 3 14:55:37 2005
+++ src/distrib/evbppc/md-kernel/Makefile Mon Mar 3 19:14:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/03 14:55:37 shige Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/03 19:14:00 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -14,8 +14,8 @@ MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.-= img create-img
create-img= \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} ${.TARGET:R} ${.TARGET}
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} ${.TARGET:R} ${.TARGET}
.include ${DISTRIBDIR}/common/Makefile.mdset
CVS commit: src/external/bsd/atf/tests/atf/atf-sh
Module Name:src
Committed By: jmmv
Date: Mon Mar 3 19:56:32 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/atf-sh: Makefile
Added Files:
src/external/bsd/atf/tests/atf/atf-sh: Atffile Kyuafile
Log Message:
Avoid running a helper program for atf-sh as a test.
Should fix failures observed in PR bin/48624.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-sh/Atffile \
src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Mon Mar 3 19:56:32 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 19:56:32 jmmv Exp $
.include bsd.init.mk
TESTSDIR= ${TESTSBASE}/atf/atf-sh
+ATFFILE= yes
+KYUAFILE= yes
.PATH: ${SRCDIR}/atf-sh
Added files:
Index: src/external/bsd/atf/tests/atf/atf-sh/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Atffile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Atffile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+Content-Type: application/X-atf-atffile; version=1
+
+prop: test-suite = NetBSD
+
+tp: atf-check_test
+tp: atf_check_test
+tp: config_test
+tp: integration_test
+tp: normalize_test
+tp: tc_test
+tp: tp_test
Index: src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Kyuafile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Kyuafile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+syntax(2)
+
+test_suite(NetBSD)
+
+atf_test_program{name=atf-check_test}
+atf_test_program{name=atf_check_test}
+atf_test_program{name=config_test}
+atf_test_program{name=integration_test}
+atf_test_program{name=normalize_test}
+atf_test_program{name=tc_test}
+atf_test_program{name=tp_test}
CVS commit: src/external/gpl3/gcc/dist/gcc/config/mips
Module Name:src Committed By: mrg Date: Mon Mar 3 21:01:40 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/mips: t-mips Log Message: apply netbsd not rebuilding to mips-tables.opt; fixes r/o src builds. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/mips/t-mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/mips/t-mips diff -u src/external/gpl3/gcc/dist/gcc/config/mips/t-mips:1.1.1.2 src/external/gpl3/gcc/dist/gcc/config/mips/t-mips:1.2 --- src/external/gpl3/gcc/dist/gcc/config/mips/t-mips:1.1.1.2 Sat Mar 1 08:43:33 2014 +++ src/external/gpl3/gcc/dist/gcc/config/mips/t-mips Mon Mar 3 21:01:40 2014 @@ -18,5 +18,7 @@ $(srcdir)/config/mips/mips-tables.opt: $(srcdir)/config/mips/genopt.sh \ $(srcdir)/config/mips/mips-cpus.def + @echo NOT REBUILDING $@ +NetBSD_DISABLED_config_mips_mips-tables.opt: $(SHELL) $(srcdir)/config/mips/genopt.sh $(srcdir)/config/mips \ $(srcdir)/config/mips/mips-tables.opt
CVS commit: src/sys/arch/xen/x86
Module Name:src
Committed By: dsl
Date: Mon Mar 3 22:09:32 UTC 2014
Modified Files:
src/sys/arch/xen/x86: mainbus.c
Log Message:
Use the global pci_mode to avoid 'set but not used' warnings from gcc 4.8.3.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/x86/mainbus.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/xen/x86/mainbus.c
diff -u src/sys/arch/xen/x86/mainbus.c:1.17 src/sys/arch/xen/x86/mainbus.c:1.18
--- src/sys/arch/xen/x86/mainbus.c:1.17 Fri Jan 31 10:37:01 2014
+++ src/sys/arch/xen/x86/mainbus.c Mon Mar 3 22:09:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2014/01/31 10:37:01 bouyer Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2014/03/03 22:09:32 dsl Exp $ */
/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.17 2014/01/31 10:37:01 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.18 2014/03/03 22:09:32 dsl Exp $);
#include sys/param.h
#include sys/systm.h
@@ -133,9 +133,6 @@ mainbus_match(device_t parent, cfdata_t
void
mainbus_attach(device_t parent, device_t self, void *aux)
{
-#if defined(DOM0OPS) NPCI 0
- int mode;
-#endif
union mainbus_attach_args mba;
#if defined(DOM0OPS)
int numcpus = 0;
@@ -157,9 +154,9 @@ mainbus_attach(device_t parent, device_t
#endif
#if NPCI 0
/* ACPI needs to be able to access PCI configuration space. */
- mode = pci_mode_detect();
+ pci_mode_detect();
#ifdef PCI_BUS_FIXUP
- if (mode != 0) {
+ if (pci_mode != 0) {
pci_maxbus = pci_bus_fixup(NULL, 0);
aprint_debug_dev(self, PCI bus max, after
pci_bus_fixup: %i\n, pci_maxbus);
CVS commit: src/sys/modules/iic
Module Name:src Committed By: ozaki-r Date: Tue Mar 4 00:54:55 UTC 2014 Modified Files: src/sys/modules/iic: iic.ioconf Log Message: Remove unnecessary files.i2c inclusion files.i2c is already included in conf/files. So we don't need to include it in this file. This fix shuts up many warnings on building sys/modules/iic. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/iic/iic.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/iic/iic.ioconf diff -u src/sys/modules/iic/iic.ioconf:1.1 src/sys/modules/iic/iic.ioconf:1.2 --- src/sys/modules/iic/iic.ioconf:1.1 Sun Oct 2 21:14:22 2011 +++ src/sys/modules/iic/iic.ioconf Tue Mar 4 00:54:55 2014 @@ -1,9 +1,8 @@ -# $NetBSD: iic.ioconf,v 1.1 2011/10/02 21:14:22 jmcneill Exp $ +# $NetBSD: iic.ioconf,v 1.2 2014/03/04 00:54:55 ozaki-r Exp $ ioconf iic include conf/files -include dev/i2c/files.i2c pseudo-root i2cbus* iic* at i2cbus?
CVS commit: othersrc/external/bsd/multigest/dist
Module Name:othersrc
Committed By: agc
Date: Tue Mar 4 02:12:58 UTC 2014
Modified Files:
othersrc/external/bsd/multigest/dist: blake2.c libmultigest.3
multigest.c multigest.h
Added Files:
othersrc/external/bsd/multigest/dist: Makefile.in configure
Log Message:
Minor changes to multigest
Introduce a new multigest_format_raw() function to the multigest
library, which can be used to format a raw multigest value into a
formatted hexadecimal number.
Add a new multigest_algs_rawsize() function, which will return the
space needed (in bytes) to hold a raw multigest for the algorithms
specified. The multigest_get_rawsize() function continues to work
on a multigest_t structure which has already been initialised.
Make blake2 compile without a c99 compiler.
Add faux-autoconf infrastructure for packaging purposes.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/multigest/dist/Makefile.in \
othersrc/external/bsd/multigest/dist/configure
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/multigest/dist/blake2.c
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/multigest/dist/libmultigest.3
cvs rdiff -u -r1.7 -r1.8 othersrc/external/bsd/multigest/dist/multigest.c
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/multigest/dist/multigest.h
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/multigest/dist/blake2.c
diff -u othersrc/external/bsd/multigest/dist/blake2.c:1.2 othersrc/external/bsd/multigest/dist/blake2.c:1.3
--- othersrc/external/bsd/multigest/dist/blake2.c:1.2 Sat Aug 17 18:29:35 2013
+++ othersrc/external/bsd/multigest/dist/blake2.c Tue Mar 4 02:12:58 2014
@@ -254,8 +254,10 @@ blake2b_param_set_personal(blake2b_param
static inline int
blake2b_init0(BLAKE2_CTX *S)
{
+ int i;
+
memset(S, 0, sizeof(*S));
- for (int i = 0; i 8; ++i) {
+ for (i = 0; i 8; ++i) {
S-h[i] = blake2b_IV[i];
}
return 0;
@@ -266,11 +268,12 @@ static int
blake2b_init_param(BLAKE2_CTX *S, const blake2b_param *P)
{
const uint8_t *p;
+ size_t i;
blake2b_init0(S);
p = (const uint8_t *)(const void *)(P);
/* IV XOR ParamBlock */
- for (size_t i = 0; i 8; ++i) {
+ for (i = 0; i 8; ++i) {
S-h[i] ^= load64(p + sizeof(S-h[i]) * i);
}
return 0;
@@ -395,6 +398,7 @@ int
blake2b_final(BLAKE2_CTX *S, uint8_t *out, uint8_t outlen)
{
uint8_t buffer[BLAKE2B_OUTBYTES];
+ int i;
if (S-buflen BLAKE2B_BLOCKBYTES) {
blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
@@ -406,7 +410,7 @@ blake2b_final(BLAKE2_CTX *S, uint8_t *ou
blake2b_set_lastblock(S);
memset(S-buf + S-buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S-buflen); /* Padding */
blake2b_compress(S, S-buf);
- for (int i = 0; i 8; ++i) {
+ for (i = 0; i 8; ++i) {
/* Output full hash to temp buffer */
store64(buffer + sizeof(S-h[i]) * i, S-h[i]);
}
Index: othersrc/external/bsd/multigest/dist/libmultigest.3
diff -u othersrc/external/bsd/multigest/dist/libmultigest.3:1.5 othersrc/external/bsd/multigest/dist/libmultigest.3:1.6
--- othersrc/external/bsd/multigest/dist/libmultigest.3:1.5 Sun Aug 18 06:03:14 2013
+++ othersrc/external/bsd/multigest/dist/libmultigest.3 Tue Mar 4 02:12:58 2014
@@ -1,6 +1,6 @@
-.\ $NetBSD: libmultigest.3,v 1.5 2013/08/18 06:03:14 agc Exp $
+.\ $NetBSD: libmultigest.3,v 1.6 2014/03/04 02:12:58 agc Exp $
.\
-.\ Copyright (c) 2013 Alistair Crooks a...@netbsd.org
+.\ Copyright (c) 2013,2014 Alistair Crooks a...@netbsd.org
.\ All rights reserved.
.\
.\ Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd August 17, 2013
+.Dd March 3, 2014
.Dt LIBMULTIGEST 3
.Os
.Sh NAME
@@ -69,6 +69,10 @@
.Fo multigest_get_rawsize
.Fa multigest_t *mg
.Fc
+.Ft uint32_t
+.Fo multigest_algs_rawsize
+.Fa const char *algnames
+.Fc
.Ft int
.Fo multigest_format_hex
.Fa unsigned char *rawinput const char *algorithms
@@ -80,6 +84,11 @@
.Fa const char *outname const char *filename const char *substregex
.Fa const char *output_separator const char *output_format
.Fc
+.Ft char *
+.Fo multigest_format_raw
+.Fa const uint8_t *rawinput size_t insize
+.Fa char *fmtoutput size_t outsize
+.Fc
.Sh DESCRIPTION
.Nm
is a library interface to calculate multiple digests
@@ -167,6 +176,18 @@ using
.Fn multigest_format_hex
or printed, possible to an output file, by
.Fn multigest_print_hex .
+To format output without printing to a stream,
+the
+.Fn multigest_format_raw
+function can be used.
+To find out the rawsize needed (in bytes) for a multigest,
+the
+.Fn multigest_algs_rawsize
+function can be used, passing the digest algorithm names as
+arguments to the function, or the
+.Fn multigest_get_rawsize
+function can be used if the multigest structure has already
+been initialised.
CVS commit: othersrc/external/bsd/transit
Module Name:othersrc
Committed By: agc
Date: Tue Mar 4 02:14:15 UTC 2014
Modified Files:
othersrc/external/bsd/transit: Makefile
othersrc/external/bsd/transit/dist: transit.h
Added Files:
othersrc/external/bsd/transit/dist: Makefile.in configure
Log Message:
Add almost-pass-through configure and Makefile.in scripts for the
package distribution. No functional change
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/transit/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/transit/dist/Makefile.in \
othersrc/external/bsd/transit/dist/configure
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/transit/dist/transit.h
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/transit/Makefile
diff -u othersrc/external/bsd/transit/Makefile:1.1.1.1 othersrc/external/bsd/transit/Makefile:1.2
--- othersrc/external/bsd/transit/Makefile:1.1.1.1 Mon Feb 24 05:59:13 2014
+++ othersrc/external/bsd/transit/Makefile Tue Mar 4 02:14:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/02/24 05:59:13 agc Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/04 02:14:15 agc Exp $
SUBDIR= lib .WAIT
SUBDIR+= bin
@@ -7,5 +7,3 @@ SUBDIR+= bin
t:
cd bin ${MAKE} t
-# comment
-# comment
Index: othersrc/external/bsd/transit/dist/transit.h
diff -u othersrc/external/bsd/transit/dist/transit.h:1.2 othersrc/external/bsd/transit/dist/transit.h:1.3
--- othersrc/external/bsd/transit/dist/transit.h:1.2 Mon Feb 24 21:05:18 2014
+++ othersrc/external/bsd/transit/dist/transit.h Tue Mar 4 02:14:15 2014
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef TRANSIT_H_
-#define TRANSIT_H_ 20140223
+#define TRANSIT_H_ 20140303
#include sys/types.h
Added files:
Index: othersrc/external/bsd/transit/dist/Makefile.in
diff -u /dev/null othersrc/external/bsd/transit/dist/Makefile.in:1.1
--- /dev/null Tue Mar 4 02:14:15 2014
+++ othersrc/external/bsd/transit/dist/Makefile.in Tue Mar 4 02:14:15 2014
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.in,v 1.1 2014/03/04 02:14:15 agc Exp $
+
+PROG=transit
+
+OBJS+= transit.o
+OBJS+= main.o
+
+PREFIX=@PREFIX@
+MANDIR=@MANDIR@
+
+all: ${PROG}
+
+${PROG}: ${OBJS}
+ ${CC} ${OBJS} -o ${PROG}
+
+install:
+ install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin
+ install -c transit.1 ${DESTDIR}${MANDIR}/man1
+
+clean:
+ rm -rf *.core ${OBJS} ${PROG}
+cleandist:
+ rm -rf *.core ${OBJS} ${PROG} Makefile
Index: othersrc/external/bsd/transit/dist/configure
diff -u /dev/null othersrc/external/bsd/transit/dist/configure:1.1
--- /dev/null Tue Mar 4 02:14:15 2014
+++ othersrc/external/bsd/transit/dist/configure Tue Mar 4 02:14:15 2014
@@ -0,0 +1,65 @@
+#! /bin/sh
+
+# $NetBSD: configure,v 1.1 2014/03/04 02:14:15 agc Exp $
+
+# Copyright (c) 2014 Alistair Crooks a...@netbsd.org
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# set up defs and paths, etc
+prefix=/usr/local
+mandir=${prefix}/man
+while [ $# -gt 0 ]; do
+ case $1 in
+ # have all /bin/sh's got ${1#--prefix=} yet?
+ --prefix=*) prefix=$(echo $1 | sed -e 's|--prefix=||') ;;
+ --mandir=*) mandir=$(echo $1 | sed -e 's|--mandir=||') ;;
+ --build=*|--host=*|--infodir=*) ;;
+ *) break ;;
+ esac
+ shift
+done
+
+rm -f config.h
+echo #ifndef CONFIG_H_ config.h
+echo #define CONFIG_H_ $(date '+%Y%m%d') config.h
+echo config.h
+
+# portability macros
+echo #ifndef __UNCONST config.h
+echo #define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) config.h
+echo #endif /* __UNCONST */ config.h
+echo config.h
+echo #ifndef USE_ARG config.h
+echo #define USE_ARG(x) /*LINTED*/(void)(x) config.h
+echo #endif
CVS commit: src/external/cddl/osnet/dev/dtrace
Module Name:src
Committed By: ozaki-r
Date: Tue Mar 4 03:20:49 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/dtrace: dtrace_debug.c
Log Message:
Fix wrong conditional statement in dtrace_debug_output
Reported in PR kern/48547 by ozaki-r.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dev/dtrace/dtrace_debug.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/cddl/osnet/dev/dtrace/dtrace_debug.c
diff -u src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.6 src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.7
--- src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.6 Sun Apr 14 16:39:59 2013
+++ src/external/cddl/osnet/dev/dtrace/dtrace_debug.c Tue Mar 4 03:20:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_debug.c,v 1.6 2013/04/14 16:39:59 christos Exp $ */
+/* $NetBSD: dtrace_debug.c,v 1.7 2014/03/04 03:20:49 ozaki-r Exp $ */
/*-
* Copyright (C) 2008 John Birrell j...@freebsd.org.
@@ -167,7 +167,7 @@ dtrace_debug_output(void)
for (p = d-first; p d-next; p++)
*p1++ = *p;
- } else if (d-next d-first) {
+ } else if (d-first d-next) {
char *p1 = dtrace_debug_bufr;
count = (uintptr_t) d-last - (uintptr_t) d-first;
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Tue Mar 4 03:24:03 UTC 2014
Modified Files:
src/sys/sys: syscallvar.h
Log Message:
Reformat a little. Add m68k quirk
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/syscallvar.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/syscallvar.h
diff -u src/sys/sys/syscallvar.h:1.8 src/sys/sys/syscallvar.h:1.9
--- src/sys/sys/syscallvar.h:1.8 Sat Jun 29 16:50:51 2013
+++ src/sys/sys/syscallvar.h Tue Mar 4 03:24:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: syscallvar.h,v 1.8 2013/06/29 16:50:51 rmind Exp $ */
+/* $NetBSD: syscallvar.h,v 1.9 2014/03/04 03:24:03 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -72,10 +72,10 @@ sy_invoke(const struct sysent *sy, struc
(sy-sy_flags SYCALL_INDIRECT) == 0;
int error;
- if (__predict_true(!do_trace) || (error = trace_enter(code, uap,
- sy-sy_narg)) == 0) {
+ if (__predict_true(!do_trace)
+ || (error = trace_enter(code, uap, sy-sy_narg)) == 0) {
rval[0] = 0;
-#if !defined(__mips__)
+#if !defined(__mips__) !defined(__m68k__)
/*
* Due to the mips userland code for SYS_break needing v1 to be
* preserved, we can't clear this on mips.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Tue Mar 4 03:34:22 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S
Log Message:
Fetch value from correct stack location. Push an even number of registers
so ldrd won't fail.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.5 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.6
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.5 Sat Nov 30 21:09:11 2013
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Tue Mar 4 03:34:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_64.S,v 1.5 2013/11/30 21:09:11 joerg Exp $ */
+/* $NetBSD: atomic_cas_64.S,v 1.6 2014/03/04 03:34:22 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,10 +36,10 @@
* and kernel.
*/
ENTRY_NP(_atomic_cas_64)
- push {r4, r5, r6} /* save temporaries */
+ push {r4-r7} /* save temporaries */
mov ip, r0 /* we need r0 for return value */
#ifdef __ARM_EABI__
- ldrd r4, r5, [sp] /* fetch new value */
+ ldrd r4, r5, [sp, #16] /* fetch new value */
#else
ldr r4, [sp, #0] /* fetch new value */
ldr r5, [sp, #4] /* fetch new value */
@@ -65,7 +65,7 @@ ENTRY_NP(_atomic_cas_64)
mcr p15, 0, ip, c7, c10, 4 /* data synchronization barrier */
#endif
2:
- pop {r4, r5, r6} /* restore temporaries */
+ pop {r4-r7} /* restore temporaries */
RET/* return. */
END(_atomic_cas_64)
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Tue Mar 4 03:36:24 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_cas_up.S
Log Message:
Load new value from correct stack location in _atomic_cas_64_up
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.6 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.7
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.6 Thu Feb 27 09:39:00 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S Tue Mar 4 03:36:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_up.S,v 1.6 2014/02/27 09:39:00 matt Exp $ */
+/* $NetBSD: atomic_cas_up.S,v 1.7 2014/03/04 03:36:24 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@ END(_atomic_cas_up)
ARM_ENTRY(_atomic_cas_64_up)
push {r4-r5}
mov ip, r0
- ldrd r4, r5, [sp]
+ ldrd r4, r5, [sp, #8]
.align 0
RAS_START_ASM_HIDDEN(_atomic_cas_64)
ldrd r0, r1, [ip]
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Tue Mar 4 03:49:07 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Log Message:
Add atomic_sub_64.S
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/common/lib/libc/arch/arm/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.19 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.20
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.19 Thu Feb 27 09:39:00 2014
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Tue Mar 4 03:49:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2014/02/27 09:39:00 matt Exp $
+# $NetBSD: Makefile.inc,v 1.20 2014/03/04 03:49:07 matt Exp $
.ifnmake obj
.include ${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk
@@ -34,6 +34,7 @@ SRCS.atomic+= atomic_${op}_${sz}.S
.endfor
SRCS.atomic+= atomic_dec_32.S atomic_dec_64.S
SRCS.atomic+= atomic_inc_32.S atomic_inc_64.S
+SRCS.atomic+= atomic_sub_32.S
SRCS.atomic+= atomic_swap.S atomic_swap_16.S atomic_swap_64.S
SRCS.atomic+= membar_ops.S
.for op in add and nand or sub xor
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 03:50:37 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S Log Message: Fix non-EABI loading of argument. Deal with endian issues. Fixes PR/48635 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.6 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.7 --- src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.6 Tue Mar 4 03:34:22 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Tue Mar 4 03:50:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_64.S,v 1.6 2014/03/04 03:34:22 matt Exp $ */ +/* $NetBSD: atomic_cas_64.S,v 1.7 2014/03/04 03:50:37 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -40,9 +40,13 @@ ENTRY_NP(_atomic_cas_64) mov ip, r0 /* we need r0 for return value */ #ifdef __ARM_EABI__ ldrd r4, r5, [sp, #16] /* fetch new value */ +#elif __ARMEB__ + ldr r5, [sp, #16] /* fetch new value */ + ldr r4, [sp, #20] /* fetch new value */ #else - ldr r4, [sp, #0] /* fetch new value */ - ldr r5, [sp, #4] /* fetch new value */ + ldr r4, [sp, #16] /* fetch new value */ + ldr r5, [sp, #20] /* fetch new value */ +#endif mov r3, r2 /* r2 will be overwritten by r1 which ... */ mov r2, r1 /* r1 will be overwritten by ldrexd */ #endif
CVS commit: src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 04:03:49 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/gen: modsi3.S Log Message: Make this coldfire compatible To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/m68k/gen/modsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/gen/modsi3.S diff -u src/common/lib/libc/arch/m68k/gen/modsi3.S:1.6 src/common/lib/libc/arch/m68k/gen/modsi3.S:1.7 --- src/common/lib/libc/arch/m68k/gen/modsi3.S:1.6 Sat Sep 7 19:06:29 2013 +++ src/common/lib/libc/arch/m68k/gen/modsi3.S Tue Mar 4 04:03:49 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: modsi3.S,v 1.6 2013/09/07 19:06:29 chs Exp $ */ +/* $NetBSD: modsi3.S,v 1.7 2014/03/04 04:03:49 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ #if 0 RCSID(from: @(#)modsi3.s 5.1 (Berkeley) 6/7/90) #else - RCSID($NetBSD: modsi3.S,v 1.6 2013/09/07 19:06:29 chs Exp $) + RCSID($NetBSD: modsi3.S,v 1.7 2014/03/04 04:03:49 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -47,7 +47,12 @@ #ifndef __mc68010__ ENTRY(__modsi3) movel 4(%sp),%d1 +#ifdef __mcoldfire__ + remsl 8(%sp),%d0:%d1 + divsl 8(%sp),%d1 +#else divsll 8(%sp),%d0:%d1 +#endif rts END(__modsi3) #else
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: matt Date: Tue Mar 4 06:14:53 UTC 2014 Modified Files: src/sys/uvm/pmap: vmpagemd.h Log Message: use _KERNEL_OPT around #include To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/pmap/vmpagemd.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/uvm/pmap/vmpagemd.h diff -u src/sys/uvm/pmap/vmpagemd.h:1.1 src/sys/uvm/pmap/vmpagemd.h:1.2 --- src/sys/uvm/pmap/vmpagemd.h:1.1 Wed Oct 3 00:51:47 2012 +++ src/sys/uvm/pmap/vmpagemd.h Tue Mar 4 06:14:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmpagemd.h,v 1.1 2012/10/03 00:51:47 christos Exp $ */ +/* $NetBSD: vmpagemd.h,v 1.2 2014/03/04 06:14:53 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -46,8 +46,10 @@ #error this file should not be included by loadable kernel modules #endif +#ifdef _KERNEL_OPT #include opt_modular.h #include opt_multiprocessor.h +#endif #include sys/mutex.h
CVS commit: src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 06:15:33 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/gen: umodsi3.S Log Message: Make this work with coldfire. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/m68k/gen/umodsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/gen/umodsi3.S diff -u src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.4 src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.5 --- src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.4 Tue Jul 16 23:24:18 2013 +++ src/common/lib/libc/arch/m68k/gen/umodsi3.S Tue Mar 4 06:15:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: umodsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */ +/* $NetBSD: umodsi3.S,v 1.5 2014/03/04 06:15:33 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ #if 0 RCSID(from: @(#)umodsi3.s 5.1 (Berkeley) 6/7/90)( #else - RCSID($NetBSD: umodsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $) + RCSID($NetBSD: umodsi3.S,v 1.5 2014/03/04 06:15:33 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -47,7 +47,12 @@ #ifndef __mc68010__ ENTRY(__umodsi3) movel 4(%sp),%d1 +#ifdef __mcoldfire__ + remul 8(%sp),%d0:%d1 + divul 8(%sp),%d1 +#else divull 8(%sp),%d0:%d1 +#endif rts END(__umodsi3) #else
CVS commit: src/lib/libc/compat/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 06:27:00 UTC 2014 Modified Files: src/lib/libc/compat/arch/m68k/gen: compat_setjmp.S Log Message: Avoid a warning and just do the trap #1 instead of calling sigreturn inline. If it fails, it'll fall into the botch case so don't bother calling CERROR on failure. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S diff -u src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.3 --- src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2 Wed Jul 17 21:29:01 2013 +++ src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S Tue Mar 4 06:27:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $ */ +/* $NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ #if 0 RCSID(from: @(#)setjmp.s 5.1 (Berkeley) 5/12/90) #else - RCSID($NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $) + RCSID($NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -88,8 +88,8 @@ ENTRY(longjmp) moveq #1,%d0 /* else make non-zero */ ok: moveml 28(%a0),#0x3CFC /* restore non-scratch regs */ - movl %a0,-(%sp) /* let sigreturn */ - jbsr PIC_PLT(_C_LABEL(sigreturn)) /* finish for us */ + movl %a0,-(%sp) /* let sigreturn */ + trap #1 /* finish via compat_13_sigreturn13() */ botch: jbsr PIC_PLT(_C_LABEL(longjmperror))
CVS commit: src/lib/libc/arch/m68k
Module Name:src
Committed By: matt
Date: Tue Mar 4 06:30:40 UTC 2014
Modified Files:
src/lib/libc/arch/m68k: Makefile.inc
Log Message:
The fixuns* come from compiler_rt so softfloat doesn't need to provide them.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/m68k/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/m68k/Makefile.inc
diff -u src/lib/libc/arch/m68k/Makefile.inc:1.16 src/lib/libc/arch/m68k/Makefile.inc:1.17
--- src/lib/libc/arch/m68k/Makefile.inc:1.16 Thu Jul 18 21:31:22 2013
+++ src/lib/libc/arch/m68k/Makefile.inc Tue Mar 4 06:30:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2013/07/18 21:31:22 matt Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/03/04 06:30:40 matt Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S __m68k_read_tp.S __mmap.S
@@ -7,7 +7,8 @@ ASM+= _lwp_getprivate.S mremap.S
CPPFLAGS+= -I. # for assym.h
.if ${MKSOFTFLOAT} != no
-CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS -DSOFTFLOAT -DSOFTFLOATM68K_FOR_GCC
+#CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
+CPPFLAGS+= -DSOFTFLOAT -DSOFTFLOATM68K_FOR_GCC
. include softfloat/Makefile.inc
.elif ${MACHINE_ARCH} != m68000
.PATH : ${ARCHDIR}/hardfloat
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Tue Mar 4 06:36:41 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/common/lib/libc/arch/arm/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.20 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.21
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.20 Tue Mar 4 03:49:07 2014
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Tue Mar 4 06:36:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2014/03/04 03:49:07 matt Exp $
+# $NetBSD: Makefile.inc,v 1.21 2014/03/04 06:36:41 matt Exp $
.ifnmake obj
.include ${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk
@@ -34,7 +34,7 @@ SRCS.atomic+= atomic_${op}_${sz}.S
.endfor
SRCS.atomic+= atomic_dec_32.S atomic_dec_64.S
SRCS.atomic+= atomic_inc_32.S atomic_inc_64.S
-SRCS.atomic+= atomic_sub_32.S
+SRCS.atomic+= atomic_sub_64.S
SRCS.atomic+= atomic_swap.S atomic_swap_16.S atomic_swap_64.S
SRCS.atomic+= membar_ops.S
.for op in add and nand or sub xor
CVS commit: src/lib/libkvm
Module Name:src Committed By: matt Date: Tue Mar 4 06:38:08 UTC 2014 Modified Files: src/lib/libkvm: kvm_m68k_cmn.c Log Message: #include m68k/m68k.h To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libkvm/kvm_m68k_cmn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libkvm/kvm_m68k_cmn.c diff -u src/lib/libkvm/kvm_m68k_cmn.c:1.17 src/lib/libkvm/kvm_m68k_cmn.c:1.18 --- src/lib/libkvm/kvm_m68k_cmn.c:1.17 Tue Sep 13 19:11:09 2011 +++ src/lib/libkvm/kvm_m68k_cmn.c Tue Mar 4 06:38:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_m68k_cmn.c,v 1.17 2011/09/13 19:11:09 christos Exp $ */ +/* $NetBSD: kvm_m68k_cmn.c,v 1.18 2014/03/04 06:38:08 matt Exp $ */ /*- * Copyright (c) 1989, 1992, 1993 @@ -74,7 +74,7 @@ #if 0 static char sccsid[] = @(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: kvm_m68k_cmn.c,v 1.17 2011/09/13 19:11:09 christos Exp $); +__RCSID($NetBSD: kvm_m68k_cmn.c,v 1.18 2014/03/04 06:38:08 matt Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -97,6 +97,7 @@ __RCSID($NetBSD: kvm_m68k_cmn.c,v 1.17 #include m68k/cpu.h #include m68k/kcore.h +#include m68k/m68k.h #include kvm_private.h #include kvm_m68k.h
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 07:01:26 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S Log Message: Fix #if/#endif nesting To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.7 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.8 --- src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.7 Tue Mar 4 03:50:37 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Tue Mar 4 07:01:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_64.S,v 1.7 2014/03/04 03:50:37 matt Exp $ */ +/* $NetBSD: atomic_cas_64.S,v 1.8 2014/03/04 07:01:26 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -40,7 +40,8 @@ ENTRY_NP(_atomic_cas_64) mov ip, r0 /* we need r0 for return value */ #ifdef __ARM_EABI__ ldrd r4, r5, [sp, #16] /* fetch new value */ -#elif __ARMEB__ +#else +#if __ARMEB__ ldr r5, [sp, #16] /* fetch new value */ ldr r4, [sp, #20] /* fetch new value */ #else
CVS commit: src/lib/libm/arch/i387
Module Name:src Committed By: dsl Date: Mon Mar 3 08:00:50 UTC 2014 Modified Files: src/lib/libm/arch/i387: e_acos.S Log Message: Drop in a fabs() after the fsqrt(). While it may seem pointless, it the rouding mode is set to round towards minus infinity then acos(-1) calculates atan2(sqrt(1.0 - 1.0), -1) the subtract generates -0.0 which sqrt() preserves. atan2(-0, -1) is -pi, but acos(-1) is expected to be +pi. This might 'fix' the test failures seen in some environments, but they are not failing due to an obvously incorrent x87 rounding mode. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/i387/e_acos.S 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: Mon Mar 3 08:15:36 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_machdep.c cpu.c src/sys/arch/arm/include: locore.h Log Message: Add most of the cpu_* variables to arm/locore.h Add and initialize cpu_synchprim_present To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/arch/arm/arm32/arm32_machdep.c \ src/sys/arch/arm/arm32/cpu.c cvs rdiff -u -r1.13 -r1.14 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/arm
Module Name:src Committed By: matt Date: Mon Mar 3 08:45:18 UTC 2014 Modified Files: src/sys/arch/arm/arm32: sys_machdep.c src/sys/arch/arm/vfp: vfp_init.c Log Message: Query the media and vfp feature registers to determine what our default mode should be and what bits in the fpscr can be changed. Print what features are supported: vfp0 at cpu0: NEON MPE (VFP 3.0+), rounding, NaN propogation, denormals To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/arm32/sys_machdep.c cvs rdiff -u -r1.33 -r1.34 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.
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: matt Date: Mon Mar 3 08:50:48 UTC 2014 Modified Files: src/sys/arch/arm/pic: pic.c picvar.h Log Message: Add a mpsafe flag to the intrsource To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/pic/pic.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/pic/picvar.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/arm
Module Name:src Committed By: matt Date: Mon Mar 3 08:51:39 UTC 2014 Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: Add more instructions including ldrex/strex variants To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm/disassem.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/arm32
Module Name:src Committed By: matt Date: Mon Mar 3 08:52:30 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_boot.c Log Message: Further cpu_info inits in cpu_hatch To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm32/arm32_boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 3 09:10:00 UTC 2014 Modified Files: src/share/man/man4: mii.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/mii.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 3 09:10:46 UTC 2014 Modified Files: src/share/man/man4: micphy.4 Log Message: Prefix link to cpsw with 'evbarm'. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/micphy.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: martin Date: Mon Mar 3 10:38:36 UTC 2014 Modified Files: src/tests/lib/libm: t_acos.c Log Message: Fix build for platforms w/o fenv.h. Remove some bogus #ifdef __vax__ (and add a few, hopefully non-bogus, new ones). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_acos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: martin Date: Mon Mar 3 10:39:08 UTC 2014 Modified Files: src/tests/lib/libm: t_asin.c t_atan.c t_cbrt.c t_ceil.c t_cos.c t_cosh.c t_erf.c t_exp.c t_ldexp.c t_log.c t_pow.c t_scalbn.c t_sin.c t_sinh.c t_sqrt.c t_tan.c t_tanh.c Log Message: Remove all cargo-cult #ifndef __vax__ from the tests, that just paper over bugs in the vax libm. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libm/t_asin.c \ src/tests/lib/libm/t_cbrt.c src/tests/lib/libm/t_pow.c cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libm/t_atan.c \ src/tests/lib/libm/t_log.c src/tests/lib/libm/t_scalbn.c cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libm/t_ceil.c cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libm/t_cos.c \ src/tests/lib/libm/t_sin.c cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_cosh.c \ src/tests/lib/libm/t_sinh.c src/tests/lib/libm/t_sqrt.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libm/t_erf.c cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_exp.c \ src/tests/lib/libm/t_tan.c cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libm/t_ldexp.c cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_tanh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsdb
Module Name:src Committed By: blymn Date: Mon Mar 3 12:12:19 UTC 2014 Modified Files: src/sbin/fsdb: fsdb.8 Log Message: Correct usage of clri. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sbin/fsdb/fsdb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: martin Date: Mon Mar 3 12:15:27 UTC 2014 Modified Files: src/tests/lib/libm: Makefile Log Message: Define HAVE_FENV_H on architectures that support it. What a mess, we need a central place for this! To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tests/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: skrll Date: Mon Mar 3 13:54:43 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi Log Message: Restore the hp700 file entries and mark them obsolete. Don't mark any hppa files obsolete - delete them. To generate a diff of this commit: cvs rdiff -u -r1.1461 -r1.1462 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: pooka Date: Mon Mar 3 13:56:41 UTC 2014 Modified Files: src/sys/rump/net/lib/libvirtif: if_virt.c if_virt.h rumpcomp_user.c rumpcomp_user.h Log Message: Pull in the changes from the dpdk, netmap and snabb switch repos. There are two major changes: 1) All thread context policy is pushed down to the hypercalls. This is meant to help performance-mongering implementations be able to control packet scheduling better (e.g. pin down packet reception to certain physical cores). 2) Generalize linkstr, meaning that the interface can now take an arbitrary string which is passed to the create() hypercall. This can be used to map backend device characteristics to the rump kernel interface instance. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/rump/net/lib/libvirtif/if_virt.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libvirtif/if_virt.h cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libvirtif/rumpcomp_user.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src Committed By: pooka Date: Mon Mar 3 14:01:30 UTC 2014 Modified Files: src/sys/rump/net/lib/libnpf: Makefile Log Message: For now, make it possible to not specify -D_NPF_TESTING by compiling with RUMP_NPF_TESTING_=no. This in turn makes it possible to use npf in a rump kernel for real packet filtering instead of just testing. no change to default To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libnpf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Mon Mar 3 14:03:14 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: If we are going to map all of physical memory, we don't need to allocate l2 page tables for the kernel. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm32/arm32_kvminit.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/include
Module Name:src Committed By: matt Date: Mon Mar 3 14:26:32 UTC 2014 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: More control bits. SYNCHPRIM defines. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/arm/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/powerpc/string
Module Name:src Committed By: macallan Date: Mon Mar 3 15:30:31 UTC 2014 Modified Files: src/common/lib/libc/arch/powerpc/string: memcpy.S Log Message: on ppc601 do byte-wise copies when in _KERNEL from scole_mail, ok matt@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/powerpc/string/memcpy.S 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
Module Name:src Committed By: macallan Date: Mon Mar 3 15:36:36 UTC 2014 Modified Files: src/sys/arch/powerpc/include: cpu.h trap.h src/sys/arch/powerpc/oea: oea_machdep.c ofwoea_machdep.c pmap.c src/sys/arch/powerpc/powerpc: clock.c fixup.c trap.c Log Message: support ppc601 from scole_mail, ok matt@ To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/powerpc/include/cpu.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/trap.h cvs rdiff -u -r1.69 -r1.70 src/sys/arch/powerpc/oea/oea_machdep.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/oea/ofwoea_machdep.c cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/oea/pmap.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/powerpc/clock.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/fixup.c cvs rdiff -u -r1.148 -r1.149 src/sys/arch/powerpc/powerpc/trap.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/macppc/conf
Module Name:src Committed By: macallan Date: Mon Mar 3 16:09:43 UTC 2014 Added Files: src/sys/arch/macppc/conf: GENERIC_601 std.macppc.601 Log Message: config goop for ppc601 support GENERIC_601 more or less resembles a Power Macintosh 7200 with a few drivers thrown in for convenience while keeping the kernel itself smaller than 4MB To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/macppc/conf/GENERIC_601 \ src/sys/arch/macppc/conf/std.macppc.601 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: macallan Date: Mon Mar 3 16:22:57 UTC 2014 Modified Files: src/doc: CHANGES Log Message: mention ppc601 support To generate a diff of this commit: cvs rdiff -u -r1.1896 -r1.1897 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Mar 3 16:50:28 UTC 2014 Modified Files: src/sys/rump/librump/rumpkern: vm.c Log Message: Fix the memory limiter to work for non-pagedaemon threads again reported by njoly To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/rump/librump/rumpkern/vm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: dsl Date: Mon Mar 3 18:21:33 UTC 2014 Modified Files: src/tests/lib/libm: t_acos.c Log Message: Remove the print of the rounding mode. It was added in case it was non-zero - which it isn't. It still isn't clear why acos(-1) gives the wrong result on some amd64 systems. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libm/t_acos.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/evbppc
Module Name:src Committed By: joerg Date: Mon Mar 3 18:25:14 UTC 2014 Modified Files: src/sys/arch/evbppc/compile: walnut-mkimg.sh src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc Makefile.walnut.inc Log Message: Use nbstat when cross-compiling, unbreaks build on Linux. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/compile/walnut-mkimg.sh cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc 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: pooka Date: Mon Mar 3 18:27:20 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi src/lib/librumpvfs: Makefile Added Files: src/lib/librumpvfs: rumpfs.4 Log Message: add man page for rumpfs To generate a diff of this commit: cvs rdiff -u -r1.1462 -r1.1463 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.3 -r1.4 src/lib/librumpvfs/Makefile cvs rdiff -u -r0 -r1.1 src/lib/librumpvfs/rumpfs.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/powerpc/string
Module Name:src Committed By: matt Date: Mon Mar 3 18:55:02 UTC 2014 Modified Files: src/common/lib/libc/arch/powerpc/string: memcpy.S Log Message: Use _KERNEL_OPT around #include opt_ppcarch.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/powerpc/string/memcpy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: joerg Date: Mon Mar 3 19:08:46 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc Makefile.walnut.inc Log Message: Spell it TOOL_STAT. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.ev64260.inc cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/Makefile.obs405.inc cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.walnut.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src Committed By: pooka Date: Mon Mar 3 19:09:52 UTC 2014 Modified Files: src/sys/rump/net/lib/libnpf: Makefile Log Message: also include bsd.own.mk, so value for RUMP_NPF_TESTING can come from mk.conf To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/lib/libnpf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbppc/md-kernel
Module Name:src Committed By: joerg Date: Mon Mar 3 19:14:00 UTC 2014 Modified Files: src/distrib/evbppc/md-kernel: Makefile Log Message: Pass down TOOL_STAT here as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/evbppc/md-kernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf/tests/atf/atf-sh
Module Name:src Committed By: jmmv Date: Mon Mar 3 19:56:32 UTC 2014 Modified Files: src/external/bsd/atf/tests/atf/atf-sh: Makefile Added Files: src/external/bsd/atf/tests/atf/atf-sh: Atffile Kyuafile Log Message: Avoid running a helper program for atf-sh as a test. Should fix failures observed in PR bin/48624. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-sh/Atffile \ src/external/bsd/atf/tests/atf/atf-sh/Kyuafile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-sh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/mips
Module Name:src Committed By: mrg Date: Mon Mar 3 21:01:40 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/mips: t-mips Log Message: apply netbsd not rebuilding to mips-tables.opt; fixes r/o src builds. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/mips/t-mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: dsl Date: Mon Mar 3 22:09:32 UTC 2014 Modified Files: src/sys/arch/xen/x86: mainbus.c Log Message: Use the global pci_mode to avoid 'set but not used' warnings from gcc 4.8.3. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/x86/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/iic
Module Name:src Committed By: ozaki-r Date: Tue Mar 4 00:54:55 UTC 2014 Modified Files: src/sys/modules/iic: iic.ioconf Log Message: Remove unnecessary files.i2c inclusion files.i2c is already included in conf/files. So we don't need to include it in this file. This fix shuts up many warnings on building sys/modules/iic. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/iic/iic.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/multigest/dist
Module Name:othersrc Committed By: agc Date: Tue Mar 4 02:12:58 UTC 2014 Modified Files: othersrc/external/bsd/multigest/dist: blake2.c libmultigest.3 multigest.c multigest.h Added Files: othersrc/external/bsd/multigest/dist: Makefile.in configure Log Message: Minor changes to multigest Introduce a new multigest_format_raw() function to the multigest library, which can be used to format a raw multigest value into a formatted hexadecimal number. Add a new multigest_algs_rawsize() function, which will return the space needed (in bytes) to hold a raw multigest for the algorithms specified. The multigest_get_rawsize() function continues to work on a multigest_t structure which has already been initialised. Make blake2 compile without a c99 compiler. Add faux-autoconf infrastructure for packaging purposes. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/multigest/dist/Makefile.in \ othersrc/external/bsd/multigest/dist/configure cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/multigest/dist/blake2.c cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/multigest/dist/libmultigest.3 cvs rdiff -u -r1.7 -r1.8 othersrc/external/bsd/multigest/dist/multigest.c cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/multigest/dist/multigest.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/transit
Module Name:othersrc Committed By: agc Date: Tue Mar 4 02:14:15 UTC 2014 Modified Files: othersrc/external/bsd/transit: Makefile othersrc/external/bsd/transit/dist: transit.h Added Files: othersrc/external/bsd/transit/dist: Makefile.in configure Log Message: Add almost-pass-through configure and Makefile.in scripts for the package distribution. No functional change To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/transit/Makefile cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/transit/dist/Makefile.in \ othersrc/external/bsd/transit/dist/configure cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/transit/dist/transit.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dev/dtrace
Module Name:src Committed By: ozaki-r Date: Tue Mar 4 03:20:49 UTC 2014 Modified Files: src/external/cddl/osnet/dev/dtrace: dtrace_debug.c Log Message: Fix wrong conditional statement in dtrace_debug_output Reported in PR kern/48547 by ozaki-r. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dev/dtrace/dtrace_debug.c 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: matt Date: Tue Mar 4 03:24:03 UTC 2014 Modified Files: src/sys/sys: syscallvar.h Log Message: Reformat a little. Add m68k quirk To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/sys/syscallvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 03:34:22 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S Log Message: Fetch value from correct stack location. Push an even number of registers so ldrd won't fail. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 03:36:24 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_up.S Log Message: Load new value from correct stack location in _atomic_cas_64_up To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 03:49:07 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: Makefile.inc Log Message: Add atomic_sub_64.S To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/common/lib/libc/arch/arm/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 03:50:37 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S Log Message: Fix non-EABI loading of argument. Deal with endian issues. Fixes PR/48635 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 04:03:49 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/gen: modsi3.S Log Message: Make this coldfire compatible To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/m68k/gen/modsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: matt Date: Tue Mar 4 06:14:53 UTC 2014 Modified Files: src/sys/uvm/pmap: vmpagemd.h Log Message: use _KERNEL_OPT around #include To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/pmap/vmpagemd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 06:15:33 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/gen: umodsi3.S Log Message: Make this work with coldfire. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/m68k/gen/umodsi3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compat/arch/m68k/gen
Module Name:src Committed By: matt Date: Tue Mar 4 06:27:00 UTC 2014 Modified Files: src/lib/libc/compat/arch/m68k/gen: compat_setjmp.S Log Message: Avoid a warning and just do the trap #1 instead of calling sigreturn inline. If it fails, it'll fall into the botch case so don't bother calling CERROR on failure. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/m68k
Module Name:src Committed By: matt Date: Tue Mar 4 06:30:40 UTC 2014 Modified Files: src/lib/libc/arch/m68k: Makefile.inc Log Message: The fixuns* come from compiler_rt so softfloat doesn't need to provide them. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/m68k/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 06:36:41 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: Makefile.inc Log Message: fix typo. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/common/lib/libc/arch/arm/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libkvm
Module Name:src Committed By: matt Date: Tue Mar 4 06:38:08 UTC 2014 Modified Files: src/lib/libkvm: kvm_m68k_cmn.c Log Message: #include m68k/m68k.h To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libkvm/kvm_m68k_cmn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Tue Mar 4 07:01:26 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S Log Message: Fix #if/#endif nesting To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
