CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Wed Nov 23 05:00:20 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Add io_read_write_handshake to t_ptrace_wait{,3,4,6,id,pid}
Verify PT_IO with PIOD_READ_D and PIOD_WRITE_D handshake
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.22 src/tests/kernel/t_ptrace_wait.c:1.23
--- src/tests/kernel/t_ptrace_wait.c:1.22 Wed Nov 23 03:02:56 2016
+++ src/tests/kernel/t_ptrace_wait.c Wed Nov 23 05:00:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.22 2016/11/23 03:02:56 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.23 2016/11/23 05:00:20 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.22 2016/11/23 03:02:56 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.23 2016/11/23 05:00:20 kamil Exp $");
#include
#include
@@ -3107,6 +3107,92 @@ ATF_TC_BODY(write4, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(io_read_write_handshake);
+ATF_TC_HEAD(io_read_write_handshake, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_IO with PIOD_READ_D and PIOD_WRITE_D handshake");
+}
+
+ATF_TC_BODY(io_read_write_handshake, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ uint8_t lookup_me_fromtracee = 0;
+ const uint8_t magic_fromtracee = (uint8_t)random();
+ uint8_t lookup_me_totracee = 0;
+ const uint8_t magic_totracee = (uint8_t)random();
+ struct ptrace_io_desc io_fromtracee = {
+ .piod_op = PIOD_READ_D,
+ .piod_offs = _me_fromtracee,
+ .piod_addr = _me_fromtracee,
+ .piod_len = sizeof(lookup_me_fromtracee)
+ };
+ struct ptrace_io_desc io_totracee = {
+ .piod_op = PIOD_WRITE_D,
+ .piod_offs = _me_totracee,
+ .piod_addr = _me_totracee,
+ .piod_len = sizeof(lookup_me_totracee)
+ };
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ lookup_me_fromtracee = magic_fromtracee;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ FORKEE_ASSERT_EQ(lookup_me_totracee, magic_totracee);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Read lookup_me_fromtracee PID=%d by tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, _fromtracee, 0) != -1);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me_fromtracee, magic_fromtracee,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me_fromtracee,
+ magic_fromtracee);
+
+ lookup_me_totracee = magic_totracee;
+
+ printf("Write lookup_me_totracee to PID=%d by tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, _totracee, 0) != -1);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me_totracee, magic_totracee,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me_totracee,
+ magic_totracee);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
#if defined(TWAIT_HAVE_PID)
#define ATF_TP_ADD_TC_HAVE_PID(a,b) ATF_TP_ADD_TC(a,b)
#else
@@ -3159,5 +3245,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, write3);
ATF_TP_ADD_TC(tp, write4);
+ ATF_TP_ADD_TC(tp, io_read_write_handshake);
+
return atf_no_error();
}
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: mrg
Date: Wed Nov 23 03:30:53 UTC 2016
Modified Files:
src/sys/uvm/pmap: pmap_segtab.c
Log Message:
fix the start index generation in pmap_segtab_release() to
ensure it fits in the actual array. fixes N64 binaries from
triggering later panic. move the panic check itself into a
common function that is called from a couple of new places too.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/uvm/pmap/pmap_segtab.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.3 src/sys/uvm/pmap/pmap_segtab.c:1.4
--- src/sys/uvm/pmap/pmap_segtab.c:1.3 Mon Jul 11 16:06:09 2016
+++ src/sys/uvm/pmap/pmap_segtab.c Wed Nov 23 03:30:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_segtab.c,v 1.3 2016/07/11 16:06:09 matt Exp $ */
+/* $NetBSD: pmap_segtab.c,v 1.4 2016/11/23 03:30:53 mrg Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.3 2016/07/11 16:06:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.4 2016/11/23 03:30:53 mrg Exp $");
/*
* Manages physical address maps.
@@ -130,6 +130,24 @@ struct pmap_segtab_info {
kmutex_t pmap_segtab_lock __cacheline_aligned;
+static void
+pmap_check_stp(pmap_segtab_t *stp, const char *caller, const char *why)
+{
+#ifdef DEBUG
+ for (size_t i = 0; i < PMAP_SEGTABSIZE; i++) {
+ if (stp->seg_tab[i] != 0) {
+#ifdef DEBUG_NOISY
+ for (size_t j = i; j < PMAP_SEGTABSIZE; j++)
+printf("%s: pm_segtab.seg_tab[%zu] = 0x%p\n",
+ caller, j, stp->seg_tab[j]);
+#endif
+ panic("%s: pm_segtab.seg_tab[%zu] != 0 (0x%p): %s",
+ caller, i, stp->seg_tab[i], why);
+ }
+ }
+#endif
+}
+
static inline struct vm_page *
pmap_pte_pagealloc(void)
{
@@ -190,7 +208,9 @@ pmap_segtab_release(pmap_t pmap, pmap_se
{
pmap_segtab_t *stp = *stp_p;
- for (size_t i = va / vinc; i < PMAP_SEGTABSIZE; i++, va += vinc) {
+ for (size_t i = (va / vinc) & (PMAP_SEGTABSIZE - 1);
+ i < PMAP_SEGTABSIZE;
+ i++, va += vinc) {
#ifdef _LP64
if (vinc > NBSEG) {
if (stp->seg_seg[i] != NULL) {
@@ -236,6 +256,8 @@ pmap_segtab_release(pmap_t pmap, pmap_se
}
if (free_stp) {
+ pmap_check_stp(stp, __func__,
+ vinc == NBSEG ? "release seg" : "release xseg");
pmap_segtab_free(stp);
*stp_p = NULL;
}
@@ -257,6 +279,7 @@ static pmap_segtab_t *
pmap_segtab_alloc(void)
{
pmap_segtab_t *stp;
+ bool found_on_freelist = false;
again:
mutex_spin_enter(_segtab_lock);
@@ -264,6 +287,7 @@ pmap_segtab_alloc(void)
pmap_segtab_info.free_segtab = stp->seg_seg[0];
stp->seg_seg[0] = NULL;
SEGTAB_ADD(nget, 1);
+ found_on_freelist = true;
}
mutex_spin_exit(_segtab_lock);
@@ -300,12 +324,9 @@ pmap_segtab_alloc(void)
}
}
-#ifdef DEBUG
- for (size_t i = 0; i < PMAP_SEGTABSIZE; i++) {
- if (stp->seg_tab[i] != 0)
- panic("%s: pm_segtab.seg_tab[%zu] != 0", __func__, i);
- }
-#endif
+ pmap_check_stp(stp, __func__,
+ found_on_freelist ? "from free list" : "allocated");
+
return stp;
}
@@ -420,6 +441,7 @@ pmap_pte_reserve(pmap_t pmap, vaddr_t va
#ifdef MULTIPROCESSOR
pmap_segtab_t *ostp = atomic_cas_ptr(stp_p, NULL, nstp);
if (__predict_false(ostp != NULL)) {
+pmap_check_stp(nstp, __func__, "reserve");
pmap_segtab_free(nstp);
nstp = ostp;
}
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Wed Nov 23 03:02:56 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Add new tests read[1234] in t_ptrace_wait{,3,4,6,id,pid}
read1:
Verify PT_READ_D called once
read2:
Verify PT_READ_D called twice
read3:
Verify PT_READ_D called three times
read4:
Verify PT_READ_D called four times
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.21 src/tests/kernel/t_ptrace_wait.c:1.22
--- src/tests/kernel/t_ptrace_wait.c:1.21 Wed Nov 23 01:49:05 2016
+++ src/tests/kernel/t_ptrace_wait.c Wed Nov 23 03:02:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.21 2016/11/23 01:49:05 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.22 2016/11/23 03:02:56 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.21 2016/11/23 01:49:05 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.22 2016/11/23 03:02:56 kamil Exp $");
#include
#include
@@ -2525,6 +2525,322 @@ ATF_TC_BODY(io_write_d4, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(read1);
+ATF_TC_HEAD(read1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_READ_D called once");
+}
+
+ATF_TC_BODY(read1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ int lookup_me = 0;
+ const int magic = (int)random();
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ lookup_me = magic;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Read new lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
+ child, getpid());
+ errno = 0;
+ lookup_me = ptrace(PT_READ_D, child, _me, 0);
+ ATF_REQUIRE_EQ(errno, 0);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me, magic,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me, magic);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
+ATF_TC(read2);
+ATF_TC_HEAD(read2, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_READ_D called twice");
+}
+
+ATF_TC_BODY(read2, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ int lookup_me1 = 0;
+ int lookup_me2 = 0;
+ const int magic1 = (int)random();
+ const int magic2 = (int)random();
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ lookup_me1 = magic1;
+ lookup_me2 = magic2;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Read new lookup_me1 from tracee (PID=%d) by tracer (PID=%d)\n",
+ child, getpid());
+ errno = 0;
+ lookup_me1 = ptrace(PT_READ_D, child, _me1, 0);
+ ATF_REQUIRE_EQ(errno, 0);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me1, magic1,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me1, magic1);
+
+ printf("Read new lookup_me2 from tracee (PID=%d) by tracer (PID=%d)\n",
+ child, getpid());
+ errno = 0;
+ lookup_me2 = ptrace(PT_READ_D, child, _me2, 0);
+ ATF_REQUIRE_EQ(errno, 0);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me2, magic2,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me2, magic2);
+
+ printf("Before resuming the child process where
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Wed Nov 23 01:49:05 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Add new tests io_write_d[1234] in t_ptrace_wait{,3,4,6,id,pid}
write1:
Verify PT_WRITE_D called once
write2:
Verify PT_WRITE_D called twice
write3:
Verify PT_WRITE_D called three times
write4:
Verify PT_WRITE_D called four times
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.20 src/tests/kernel/t_ptrace_wait.c:1.21
--- src/tests/kernel/t_ptrace_wait.c:1.20 Tue Nov 22 21:59:32 2016
+++ src/tests/kernel/t_ptrace_wait.c Wed Nov 23 01:49:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.20 2016/11/22 21:59:32 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.21 2016/11/23 01:49:05 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.20 2016/11/22 21:59:32 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.21 2016/11/23 01:49:05 kamil Exp $");
#include
#include
@@ -2525,6 +2525,272 @@ ATF_TC_BODY(io_write_d4, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(write1);
+ATF_TC_HEAD(write1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_WRITE_D called once");
+}
+
+ATF_TC_BODY(write1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ int lookup_me = 0;
+ const int magic = (int)random();
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ FORKEE_ASSERT_EQ(lookup_me, magic);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_WRITE_D, child, _me, magic) != -1);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
+ATF_TC(write2);
+ATF_TC_HEAD(write2, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_WRITE_D called twice");
+}
+
+ATF_TC_BODY(write2, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ int lookup_me1 = 0;
+ int lookup_me2 = 0;
+ const int magic1 = (int)random();
+ const int magic2 = (int)random();
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ FORKEE_ASSERT_EQ(lookup_me1, magic1);
+ FORKEE_ASSERT_EQ(lookup_me2, magic2);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Write new lookup_me1 to tracee (PID=%d) from tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_WRITE_D, child, _me1, magic1) != -1);
+
+ printf("Write new lookup_me2 to tracee (PID=%d) from tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_WRITE_D, child, _me2, magic2) != -1);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n",
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: scole
Date: Tue Nov 22 22:53:09 UTC 2016
Modified Files:
src/sys/arch/ia64/ia64: core_machdep.c
Log Message:
For ski, break into debugger instead of exiting
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/ia64/core_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/ia64/core_machdep.c
diff -u src/sys/arch/ia64/ia64/core_machdep.c:1.1 src/sys/arch/ia64/ia64/core_machdep.c:1.2
--- src/sys/arch/ia64/ia64/core_machdep.c:1.1 Fri Aug 5 16:50:07 2016
+++ src/sys/arch/ia64/ia64/core_machdep.c Tue Nov 22 22:53:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.1 2016/08/05 16:50:07 scole Exp $ */
+/* $NetBSD: core_machdep.c,v 1.2 2016/11/22 22:53:09 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2016/08/05 16:50:07 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2016/11/22 22:53:09 scole Exp $");
#include
#include
@@ -53,7 +53,7 @@ cpu_coredump(struct lwp *l, struct cored
struct core *chdr)
{
/* XXX implement, pause in ski */
- __asm __volatile("break.i 0");
+ __asm __volatile("break.i 1");
return -1;
}
CVS commit: src/lib/libc/arch/ia64/sys
Module Name:src Committed By: scole Date: Tue Nov 22 22:52:14 UTC 2016 Modified Files: src/lib/libc/arch/ia64/sys: ptrace.S Log Message: For ski, break into debugger instead of exiting To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/ia64/sys/ptrace.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/arch/ia64/sys/ptrace.S diff -u src/lib/libc/arch/ia64/sys/ptrace.S:1.2 src/lib/libc/arch/ia64/sys/ptrace.S:1.3 --- src/lib/libc/arch/ia64/sys/ptrace.S:1.2 Fri Aug 5 16:40:47 2016 +++ src/lib/libc/arch/ia64/sys/ptrace.S Tue Nov 22 22:52:14 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.S,v 1.2 2016/08/05 16:40:47 scole Exp $ */ +/* $NetBSD: ptrace.S,v 1.3 2016/11/22 22:52:14 scole Exp $ */ /*- * Copyright (c) 2006,2016 The NetBSD Foundation, Inc. @@ -31,6 +31,6 @@ ENTRY(ptrace,0) /* XXX implement, halt in ski */ - break.i 0 + break.i 1 END(ptrace)
CVS commit: src/lib/libc/arch/ia64/sys
Module Name:src Committed By: scole Date: Tue Nov 22 22:51:53 UTC 2016 Modified Files: src/lib/libc/arch/ia64/sys: __clone.S Log Message: For ski, break into debugger instead of exiting To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/ia64/sys/__clone.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/arch/ia64/sys/__clone.S diff -u src/lib/libc/arch/ia64/sys/__clone.S:1.2 src/lib/libc/arch/ia64/sys/__clone.S:1.3 --- src/lib/libc/arch/ia64/sys/__clone.S:1.2 Fri Aug 5 16:40:47 2016 +++ src/lib/libc/arch/ia64/sys/__clone.S Tue Nov 22 22:51:53 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: __clone.S,v 1.2 2016/08/05 16:40:47 scole Exp $ */ +/* $NetBSD: __clone.S,v 1.3 2016/11/22 22:51:53 scole Exp $ */ /*- * Copyright (c) 2006,2016 The NetBSD Foundation, Inc. @@ -37,6 +37,6 @@ WEAK_ALIAS(clone, __clone) ENTRY(__clone,4) /* XXX implement, break in ski*/ - break.i 0 + break.i 1 END(__clone)
CVS commit: src/lib/libc/arch/ia64/gen
Module Name:src
Committed By: scole
Date: Tue Nov 22 22:50:32 UTC 2016
Modified Files:
src/lib/libc/arch/ia64/gen: fpgetsticky.c fpsetsticky.c getcontext.S
makecontext.c swapcontext.S
Log Message:
For ski, break into debugger instead of exiting
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/ia64/gen/fpgetsticky.c \
src/lib/libc/arch/ia64/gen/fpsetsticky.c \
src/lib/libc/arch/ia64/gen/getcontext.S \
src/lib/libc/arch/ia64/gen/makecontext.c \
src/lib/libc/arch/ia64/gen/swapcontext.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/arch/ia64/gen/fpgetsticky.c
diff -u src/lib/libc/arch/ia64/gen/fpgetsticky.c:1.1 src/lib/libc/arch/ia64/gen/fpgetsticky.c:1.2
--- src/lib/libc/arch/ia64/gen/fpgetsticky.c:1.1 Fri Aug 5 16:40:47 2016
+++ src/lib/libc/arch/ia64/gen/fpgetsticky.c Tue Nov 22 22:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.1 2016/08/05 16:40:47 scole Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.2 2016/11/22 22:50:32 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@ fp_except_t
fpgetsticky(void)
{
/* XXX implement, pause in ski */
- __asm __volatile("break.i 0");
+ __asm __volatile("break.i 1");
return (fp_except_t)0;
}
Index: src/lib/libc/arch/ia64/gen/fpsetsticky.c
diff -u src/lib/libc/arch/ia64/gen/fpsetsticky.c:1.1 src/lib/libc/arch/ia64/gen/fpsetsticky.c:1.2
--- src/lib/libc/arch/ia64/gen/fpsetsticky.c:1.1 Fri Aug 5 16:40:47 2016
+++ src/lib/libc/arch/ia64/gen/fpsetsticky.c Tue Nov 22 22:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetsticky.c,v 1.1 2016/08/05 16:40:47 scole Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.2 2016/11/22 22:50:32 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@ fp_except_t
fpsetsticky(fp_except_t sticky)
{
/* XXX implement, pause in ski */
- __asm __volatile("break.i 0");
+ __asm __volatile("break.i 1");
return (fp_except_t)0;
}
Index: src/lib/libc/arch/ia64/gen/getcontext.S
diff -u src/lib/libc/arch/ia64/gen/getcontext.S:1.1 src/lib/libc/arch/ia64/gen/getcontext.S:1.2
--- src/lib/libc/arch/ia64/gen/getcontext.S:1.1 Fri Aug 5 16:40:47 2016
+++ src/lib/libc/arch/ia64/gen/getcontext.S Tue Nov 22 22:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.1 2016/08/05 16:40:47 scole Exp $ */
+/* $NetBSD: getcontext.S,v 1.2 2016/11/22 22:50:32 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -35,6 +35,6 @@ WEAK_ALIAS(getcontext, _getcontext)
ENTRY(_getcontext,0)
/* XXX implement, halt in ski */
- break.i 0
+ break.i 1
END(_getcontext)
Index: src/lib/libc/arch/ia64/gen/makecontext.c
diff -u src/lib/libc/arch/ia64/gen/makecontext.c:1.1 src/lib/libc/arch/ia64/gen/makecontext.c:1.2
--- src/lib/libc/arch/ia64/gen/makecontext.c:1.1 Fri Aug 5 16:40:47 2016
+++ src/lib/libc/arch/ia64/gen/makecontext.c Tue Nov 22 22:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: makecontext.c,v 1.1 2016/08/05 16:40:47 scole Exp $ */
+/* $NetBSD: makecontext.c,v 1.2 2016/11/22 22:50:32 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -41,5 +41,5 @@ void
makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
{
/* XXX implement, halt in ski */
- __asm __volatile("break.i 0");
+ __asm __volatile("break.i 1");
}
Index: src/lib/libc/arch/ia64/gen/swapcontext.S
diff -u src/lib/libc/arch/ia64/gen/swapcontext.S:1.1 src/lib/libc/arch/ia64/gen/swapcontext.S:1.2
--- src/lib/libc/arch/ia64/gen/swapcontext.S:1.1 Fri Aug 5 16:40:47 2016
+++ src/lib/libc/arch/ia64/gen/swapcontext.S Tue Nov 22 22:50:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.1 2016/08/05 16:40:47 scole Exp $ */
+/* $NetBSD: swapcontext.S,v 1.2 2016/11/22 22:50:32 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
ENTRY(swapcontext,0)
/* XXX implement, halt in ski */
- break.i 0
+ break.i 1
END(swapcontext)
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Tue Nov 22 21:59:32 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Add new tests io_write_d[1234] in t_ptrace_wait{,3,4,6,id,pid}
io_write_d1:
Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint8_t)
io_write_d2:
Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint16_t)
io_write_d3:
Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint32_t)
io_write_d4:
Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint64_t)
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.19 src/tests/kernel/t_ptrace_wait.c:1.20
--- src/tests/kernel/t_ptrace_wait.c:1.19 Tue Nov 22 19:46:26 2016
+++ src/tests/kernel/t_ptrace_wait.c Tue Nov 22 21:59:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.19 2016/11/22 19:46:26 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.20 2016/11/22 21:59:32 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.19 2016/11/22 19:46:26 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.20 2016/11/22 21:59:32 kamil Exp $");
#include
#include
@@ -2269,6 +2269,262 @@ ATF_TC_BODY(io_read_d4, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(io_write_d1);
+ATF_TC_HEAD(io_write_d1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint8_t)");
+}
+
+ATF_TC_BODY(io_write_d1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ uint8_t lookup_me = 0;
+ const uint8_t magic = 0xab;
+ struct ptrace_io_desc io = {
+ .piod_op = PIOD_WRITE_D,
+ .piod_offs = _me,
+ .piod_addr = _me,
+ .piod_len = sizeof(lookup_me)
+ };
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ FORKEE_ASSERT_EQ(lookup_me, magic);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ lookup_me = magic;
+
+ printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, , 0) != -1);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
+ATF_TC(io_write_d2);
+ATF_TC_HEAD(io_write_d2, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint16_t)");
+}
+
+ATF_TC_BODY(io_write_d2, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ uint16_t lookup_me = 0;
+ const uint16_t magic = 0xab12;
+ struct ptrace_io_desc io = {
+ .piod_op = PIOD_WRITE_D,
+ .piod_offs = _me,
+ .piod_addr = _me,
+ .piod_len = sizeof(lookup_me)
+ };
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ FORKEE_ASSERT_EQ(lookup_me, magic);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ lookup_me = magic;
+
+ printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, , 0) != -1);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) !=
CVS commit: src
Module Name:src Committed By: snj Date: Tue Nov 22 19:51:37 UTC 2016 Modified Files: src/distrib/sets/lists/xbase: mi src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/lib/xkeyboard-config: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Added Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.7 src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr: Makefile Log Message: update for xkeyboard-config 2.19 To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.19 -r1.20 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/xkeyboard-config/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7 cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.135 src/distrib/sets/lists/xbase/mi:1.136 --- src/distrib/sets/lists/xbase/mi:1.135 Tue Oct 4 23:52:02 2016 +++ src/distrib/sets/lists/xbase/mi Tue Nov 22 19:51:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.135 2016/10/04 23:52:02 mrg Exp $ +# $NetBSD: mi,v 1.136 2016/11/22 19:51:37 snj Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -675,6 +675,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg +./usr/X11R7/lib/X11/xkb/geometry/teck -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg @@ -695,6 +696,7 @@ ./usr/X11R7/lib/X11/xkb/keycodes/fujitsu -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/ibm -unknown- xorg +./usr/X11R7/lib/X11/xkb/keycodes/jolla -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/macintosh -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/olpc -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2 -unknown- obsolete @@ -839,12 +841,14 @@ ./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/au -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/be -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/bn -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete @@ -880,6 +884,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/vt -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/dk -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/dvorak -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/dz -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ee -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/el -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/empty -unknown- xorg @@ -924,6 +929,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/hu -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/hu_US -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/hu_qwerty -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/id -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ie -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/il -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/il_phonetic -unknown- obsolete @@ -935,6 +941,8 @@ ./usr/X11R7/lib/X11/xkb/symbols/iso9995-3 -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/it -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/iu -unknown- obsolete
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Tue Nov 22 19:46:26 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Add new tests io_read_d[1234] in t_ptrace_wait{,3,4,6,id,pid}
io_read_d1:
Verify PT_IO with PIOD_READ_D and len = sizeof(uint8_t)
io_read_d2:
Verify PT_IO with PIOD_READ_D and len = sizeof(uint16_t)
io_read_d3:
Verify PT_IO with PIOD_READ_D and len = sizeof(uint32_t)
io_read_d4:
Verify PT_IO with PIOD_READ_D and len = sizeof(uint64_t)
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.18 src/tests/kernel/t_ptrace_wait.c:1.19
--- src/tests/kernel/t_ptrace_wait.c:1.18 Tue Nov 15 21:50:38 2016
+++ src/tests/kernel/t_ptrace_wait.c Tue Nov 22 19:46:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.18 2016/11/15 21:50:38 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.19 2016/11/22 19:46:26 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.18 2016/11/15 21:50:38 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.19 2016/11/22 19:46:26 kamil Exp $");
#include
#include
@@ -2009,6 +2009,266 @@ ATF_TC_BODY(vfork2, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(io_read_d1);
+ATF_TC_HEAD(io_read_d1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_IO with PIOD_READ_D and len = sizeof(uint8_t)");
+}
+
+ATF_TC_BODY(io_read_d1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ uint8_t lookup_me = 0;
+ const uint8_t magic = 0xab;
+ struct ptrace_io_desc io = {
+ .piod_op = PIOD_READ_D,
+ .piod_offs = _me,
+ .piod_addr = _me,
+ .piod_len = sizeof(lookup_me)
+ };
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ lookup_me = magic;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Read lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, , 0) != -1);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me, magic,
+ "got value %" PRIx8 " != expected %" PRIx8, lookup_me, magic);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
+ATF_TC(io_read_d2);
+ATF_TC_HEAD(io_read_d2, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify PT_IO with PIOD_READ_D and len = sizeof(uint16_t)");
+}
+
+ATF_TC_BODY(io_read_d2, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+ uint16_t lookup_me = 0;
+ const uint16_t magic = 0x1234;
+ struct ptrace_io_desc io = {
+ .piod_op = PIOD_READ_D,
+ .piod_offs = _me,
+ .piod_addr = _me,
+ .piod_len = sizeof(lookup_me)
+ };
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ lookup_me = magic;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Read lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
+ child, getpid());
+ ATF_REQUIRE(ptrace(PT_IO, child, , 0) != -1);
+
+ ATF_REQUIRE_EQ_MSG(lookup_me, magic,
+ "got value %" PRIx16 " != expected %" PRIx16, lookup_me, magic);
+
+ printf("Before resuming the child process where it left
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: snj Date: Tue Nov 22 19:41:16 UTC 2016 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8491 Log Message: initial import of xkeyboard-config 2.19 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-19 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.in C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing C xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz N xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara C xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge N xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za N xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad N xsrc/external/mit/xkeyboard-config/dist/symbols/bn U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: roy
Date: Tue Nov 22 12:04:35 UTC 2016
Modified Files:
src/usr.sbin/sysinst: net.c
Log Message:
Fix PR kern/51531 by using ifconfig to wait for addresses to become
valid rather than sleeping a fixed ammount of time.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.21 src/usr.sbin/sysinst/net.c:1.22
--- src/usr.sbin/sysinst/net.c:1.21 Thu May 21 01:09:00 2015
+++ src/usr.sbin/sysinst/net.c Tue Nov 22 12:04:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.21 2015/05/21 01:09:00 ozaki-r Exp $ */
+/* $NetBSD: net.c,v 1.22 2016/11/22 12:04:35 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -833,11 +833,12 @@ done:
}
/*
- * wait a couple of seconds for the interface to go live.
+ * wait for addresses to become valid
*/
if (!nfs_root) {
msg_display_add(MSG_wait_network);
- sleep(5);
+ run_program(RUN_DISPLAY | RUN_PROGRESS,
+ "/sbin/ifconfig -w 15 -W 5");
}
/*
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: skrll Date: Tue Nov 22 11:01:51 UTC 2016 Modified Files: src/sys/arch/mips/include: vmparam.h Log Message: 1TB is enough UVA for anyone... plus not all cpus can support more. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mips/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/vmparam.h diff -u src/sys/arch/mips/include/vmparam.h:1.56 src/sys/arch/mips/include/vmparam.h:1.57 --- src/sys/arch/mips/include/vmparam.h:1.56 Fri Nov 4 08:24:36 2016 +++ src/sys/arch/mips/include/vmparam.h Tue Nov 22 11:01:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.56 2016/11/04 08:24:36 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.57 2016/11/22 11:01:50 skrll Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -158,7 +158,7 @@ */ #define VM_MIN_ADDRESS ((vaddr_t)0x) #ifdef _LP64 -#define MIPS_VM_MAXUSER_ADDRESS ((vaddr_t) 1L << (4*PGSHIFT-8)) +#define MIPS_VM_MAXUSER_ADDRESS ((vaddr_t) 1L << 40) #ifdef ENABLE_MIPS_16KB_PAGE #define VM_MAXUSER_ADDRESS mips_vm_maxuser_address #else
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: snj
Date: Tue Nov 22 10:34:57 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
Log Message:
follow upstream change from 2009: build xf86Init.c with the rest of the
common code.
remove not-reproducible-build-friendly goop that set a build date for
the the x server. the static date (which we've already been using) in
xf86Build.h does just fine, although all it really does is add one
useless line to the X log.
fix whitespace around OSVENDOR
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.35 -r1.36 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.12 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.19 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.20
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.19 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.19 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.20 2016/11/22 10:34:57 snj Exp $
.for _SL in \
mi \
@@ -40,7 +40,6 @@
hw/xfree86/dri2 \
hw/xfree86/dummy \
hw/xfree86/i2c \
- hw/xfree86/init \
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Nov 22 10:34:57 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2016/11/22 10:34:57 snj Exp $
-SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
+SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xf86config \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13 Fri Aug 19 03:59:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/22 10:34:57 snj Exp $
.include
@@ -31,7 +31,6 @@ LDFLAGS+= -rdynamic
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
-LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -121,7 +120,6 @@ DPADD+= \
${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
- ${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/common} \
${DPADD.hw/xfree86/loader} \
${DPADD.hw/xfree86/xf86config} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30 Mon Nov 21 08:43:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/11/21 08:43:49 snj Exp $
+# $NetBSD: Makefile,v 1.31 2016/11/22 10:34:57 snj Exp $
.include
@@ -15,7 +15,7 @@ SRCS.randr= xf86RandR.c
SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
- xf86Option.c \
+ xf86Option.c xf86Init.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
@@ -29,18 +29,6 @@ SRCS= xf86Configure.c xf86Bus.c xf86Conf
SRCS.bus+= xf86sbusBus.c
.endif
-# Rebuild xf86Build.h on every make
CVS commit: src/sys/arch/cobalt/conf
Module Name:src Committed By: skrll Date: Tue Nov 22 09:21:51 UTC 2016 Modified Files: src/sys/arch/cobalt/conf: GENERIC64 INSTALL64 RAMDISK64 Log Message: s/COMPAT_NETBSD64/COMPAT_NETBSD32/ so userland works To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/cobalt/conf/GENERIC64 \ src/sys/arch/cobalt/conf/INSTALL64 src/sys/arch/cobalt/conf/RAMDISK64 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/cobalt/conf/GENERIC64 diff -u src/sys/arch/cobalt/conf/GENERIC64:1.1 src/sys/arch/cobalt/conf/GENERIC64:1.2 --- src/sys/arch/cobalt/conf/GENERIC64:1.1 Thu Dec 17 15:29:47 2009 +++ src/sys/arch/cobalt/conf/GENERIC64 Tue Nov 22 09:21:51 2016 @@ -1,10 +1,10 @@ -# $NetBSD: GENERIC64,v 1.1 2009/12/17 15:29:47 matt Exp $ +# $NetBSD: GENERIC64,v 1.2 2016/11/22 09:21:51 skrll Exp $ include "arch/cobalt/conf/GENERIC" -#ident "GENERIC64-$Revision: 1.1 $" +#ident "GENERIC64-$Revision: 1.2 $" no makeoptions CPUFLAGS makeoptions LP64="yes" options EXEC_ELF64 -options COMPAT_NETBSD64 +options COMPAT_NETBSD32 Index: src/sys/arch/cobalt/conf/INSTALL64 diff -u src/sys/arch/cobalt/conf/INSTALL64:1.1 src/sys/arch/cobalt/conf/INSTALL64:1.2 --- src/sys/arch/cobalt/conf/INSTALL64:1.1 Thu Dec 17 15:29:47 2009 +++ src/sys/arch/cobalt/conf/INSTALL64 Tue Nov 22 09:21:51 2016 @@ -1,10 +1,10 @@ -# $NetBSD: INSTALL64,v 1.1 2009/12/17 15:29:47 matt Exp $ +# $NetBSD: INSTALL64,v 1.2 2016/11/22 09:21:51 skrll Exp $ include "arch/cobalt/conf/INSTALL" -#ident "INSTALL64-$Revision: 1.1 $" +#ident "INSTALL64-$Revision: 1.2 $" no makeoptions CPUFLAGS makeoptions LP64="yes" options EXEC_ELF64 -options COMPAT_NETBSD64 +options COMPAT_NETBSD32 Index: src/sys/arch/cobalt/conf/RAMDISK64 diff -u src/sys/arch/cobalt/conf/RAMDISK64:1.1 src/sys/arch/cobalt/conf/RAMDISK64:1.2 --- src/sys/arch/cobalt/conf/RAMDISK64:1.1 Thu Dec 17 15:29:47 2009 +++ src/sys/arch/cobalt/conf/RAMDISK64 Tue Nov 22 09:21:51 2016 @@ -1,10 +1,10 @@ -# $NetBSD: RAMDISK64,v 1.1 2009/12/17 15:29:47 matt Exp $ +# $NetBSD: RAMDISK64,v 1.2 2016/11/22 09:21:51 skrll Exp $ include "arch/cobalt/conf/RAMDISK" -#ident "RAMDISK64-$Revision: 1.1 $" +#ident "RAMDISK64-$Revision: 1.2 $" no makeoptions CPUFLAGS makeoptions LP64="yes" options EXEC_ELF64 -options COMPAT_NETBSD64 +options COMPAT_NETBSD32
