svn commit: r322922 - in projects/runtime-coverage: . bin/dd contrib/compiler-rt/lib/builtins lib/libc/gen lib/libc/tests/gen lib/msun/tests sys/boot/efi/loader sys/boot/efi/loader/arch/amd64 sys/b...
Ngie Cooper
ngie at FreeBSD.org
Sat Aug 26 07:05:33 UTC 2017
Author: ngie
Date: Sat Aug 26 07:05:29 2017
New Revision: 322922
URL: https://svnweb.freebsd.org/changeset/base/322922
Log:
MFhead at r322921
Added:
projects/runtime-coverage/lib/libc/tests/gen/getmntinfo_test.c
- copied unchanged from r322921, head/lib/libc/tests/gen/getmntinfo_test.c
Modified:
projects/runtime-coverage/UPDATING
projects/runtime-coverage/bin/dd/args.c
projects/runtime-coverage/bin/dd/conv.c
projects/runtime-coverage/bin/dd/dd.c
projects/runtime-coverage/bin/dd/dd.h
projects/runtime-coverage/bin/dd/position.c
projects/runtime-coverage/contrib/compiler-rt/lib/builtins/int_lib.h
projects/runtime-coverage/lib/libc/gen/getmntinfo.c
projects/runtime-coverage/lib/libc/tests/gen/Makefile
projects/runtime-coverage/lib/msun/tests/trig_test.c
projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc
projects/runtime-coverage/sys/boot/efi/loader/arch/i386/Makefile.inc
projects/runtime-coverage/sys/boot/efi/loader/conf.c
projects/runtime-coverage/sys/boot/i386/libi386/spinconsole.c
projects/runtime-coverage/sys/compat/cloudabi/cloudabi_fd.c
projects/runtime-coverage/sys/compat/cloudabi/cloudabi_sock.c
projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_proto.h
projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscall.h
projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscalls.c
projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_sysent.c
projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_systrace_args.c
projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_proto.h
projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_syscall.h
projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_syscalls.c
projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_sysent.c
projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_systrace_args.c
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_types_common.h
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_i686.S
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
projects/runtime-coverage/sys/contrib/cloudabi/syscalls32.master
projects/runtime-coverage/sys/contrib/cloudabi/syscalls64.master
projects/runtime-coverage/sys/dev/cxgbe/common/t4_hw.c
projects/runtime-coverage/sys/dev/e1000/if_em.c
projects/runtime-coverage/sys/dev/e1000/if_em.h
projects/runtime-coverage/sys/dev/nvme/nvme.c
projects/runtime-coverage/sys/dev/nvme/nvme.h
projects/runtime-coverage/sys/dev/nvme/nvme_ctrlr.c
projects/runtime-coverage/sys/dev/nvme/nvme_ctrlr_cmd.c
projects/runtime-coverage/sys/dev/nvme/nvme_ns.c
projects/runtime-coverage/sys/dev/nvme/nvme_private.h
projects/runtime-coverage/sys/dev/syscons/scvgarndr.c
projects/runtime-coverage/sys/dev/syscons/syscons.c
projects/runtime-coverage/sys/dev/syscons/syscons.h
projects/runtime-coverage/sys/kern/subr_blist.c
projects/runtime-coverage/sys/kern/sys_socket.c
projects/runtime-coverage/sys/mips/include/_limits.h
projects/runtime-coverage/sys/netinet/tcp_timer.c
projects/runtime-coverage/sys/netinet/tcp_var.h
projects/runtime-coverage/sys/sys/consio.h
projects/runtime-coverage/sys/sys/param.h
projects/runtime-coverage/sys/ufs/ffs/ffs_softdep.c
projects/runtime-coverage/sys/vm/swap_pager.c
projects/runtime-coverage/sys/vm/vm_object.c
projects/runtime-coverage/sys/vm/vm_object.h
projects/runtime-coverage/usr.bin/calendar/calendars/calendar.freebsd
projects/runtime-coverage/usr.bin/netstat/inet.c
projects/runtime-coverage/usr.bin/truss/syscalls.c
projects/runtime-coverage/usr.sbin/makefs/mtree.c
projects/runtime-coverage/usr.sbin/vidcontrol/vidcontrol.1
projects/runtime-coverage/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
projects/runtime-coverage/ (props changed)
projects/runtime-coverage/contrib/compiler-rt/ (props changed)
Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/UPDATING Sat Aug 26 07:05:29 2017 (r322922)
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20170825:
+ Move PMTUD blackhole counters to TCPSTATS and remove them from bare
+ sysctl values. Minor nit, but requires a rebuild of both world/kernel
+ to complete.
+
20170814:
"make check" behavior (made in ^/head at r295380) has been changed to
execute from a limited sandbox, as opposed to executing from
Modified: projects/runtime-coverage/bin/dd/args.c
==============================================================================
--- projects/runtime-coverage/bin/dd/args.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/bin/dd/args.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <inttypes.h>
@@ -184,7 +185,7 @@ f_bs(char *arg)
res = get_num(arg);
if (res < 1 || res > SSIZE_MAX)
- errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX);
+ errx(1, "bs must be between 1 and %zd", (ssize_t)SSIZE_MAX);
in.dbsz = out.dbsz = (size_t)res;
}
@@ -195,22 +196,22 @@ f_cbs(char *arg)
res = get_num(arg);
if (res < 1 || res > SSIZE_MAX)
- errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX);
+ errx(1, "cbs must be between 1 and %zd", (ssize_t)SSIZE_MAX);
cbsz = (size_t)res;
}
static void
f_count(char *arg)
{
- intmax_t res;
+ uintmax_t res;
- res = (intmax_t)get_num(arg);
- if (res < 0)
- errx(1, "count cannot be negative");
+ res = get_num(arg);
+ if (res == UINTMAX_MAX)
+ errc(1, ERANGE, "%s", oper);
if (res == 0)
- cpy_cnt = (uintmax_t)-1;
+ cpy_cnt = UINTMAX_MAX;
else
- cpy_cnt = (uintmax_t)res;
+ cpy_cnt = res;
}
static void
@@ -219,7 +220,7 @@ f_files(char *arg)
files_cnt = get_num(arg);
if (files_cnt < 1)
- errx(1, "files must be between 1 and %jd", (uintmax_t)-1);
+ errx(1, "files must be between 1 and %zu", SIZE_MAX);
}
static void
@@ -240,8 +241,8 @@ f_ibs(char *arg)
if (!(ddflags & C_BS)) {
res = get_num(arg);
if (res < 1 || res > SSIZE_MAX)
- errx(1, "ibs must be between 1 and %jd",
- (intmax_t)SSIZE_MAX);
+ errx(1, "ibs must be between 1 and %zd",
+ (ssize_t)SSIZE_MAX);
in.dbsz = (size_t)res;
}
}
@@ -261,8 +262,8 @@ f_obs(char *arg)
if (!(ddflags & C_BS)) {
res = get_num(arg);
if (res < 1 || res > SSIZE_MAX)
- errx(1, "obs must be between 1 and %jd",
- (intmax_t)SSIZE_MAX);
+ errx(1, "obs must be between 1 and %zd",
+ (ssize_t)SSIZE_MAX);
out.dbsz = (size_t)res;
}
}
Modified: projects/runtime-coverage/bin/dd/conv.c
==============================================================================
--- projects/runtime-coverage/bin/dd/conv.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/bin/dd/conv.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -133,7 +133,7 @@ block(void)
*/
ch = 0;
for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
- maxlen = MIN(cbsz, in.dbcnt);
+ maxlen = MIN(cbsz, (size_t)in.dbcnt);
if ((t = ctab) != NULL)
for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n';
++cnt)
@@ -146,7 +146,7 @@ block(void)
* Check for short record without a newline. Reassemble the
* input block.
*/
- if (ch != '\n' && in.dbcnt < cbsz) {
+ if (ch != '\n' && (size_t)in.dbcnt < cbsz) {
(void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
break;
}
@@ -228,7 +228,7 @@ unblock(void)
* translation has to already be done or we might not recognize the
* spaces.
*/
- for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) {
+ for (inp = in.db; (size_t)in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) {
for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t)
;
if (t >= inp) {
Modified: projects/runtime-coverage/bin/dd/dd.c
==============================================================================
--- projects/runtime-coverage/bin/dd/dd.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/bin/dd/dd.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -204,10 +204,10 @@ setup(void)
* record oriented I/O, only need a single buffer.
*/
if (!(ddflags & (C_BLOCK | C_UNBLOCK))) {
- if ((in.db = malloc(out.dbsz + in.dbsz - 1)) == NULL)
+ if ((in.db = malloc((size_t)out.dbsz + in.dbsz - 1)) == NULL)
err(1, "input buffer");
out.db = in.db;
- } else if ((in.db = malloc(MAX(in.dbsz, cbsz) + cbsz)) == NULL ||
+ } else if ((in.db = malloc(MAX((size_t)in.dbsz, cbsz) + cbsz)) == NULL ||
(out.db = malloc(out.dbsz + cbsz)) == NULL)
err(1, "output buffer");
@@ -405,7 +405,7 @@ dd_in(void)
++st.in_full;
/* Handle full input blocks. */
- } else if ((size_t)n == in.dbsz) {
+ } else if ((size_t)n == (size_t)in.dbsz) {
in.dbcnt += in.dbrcnt = n;
++st.in_full;
@@ -562,7 +562,7 @@ dd_out(int force)
outp += nw;
st.bytes += nw;
- if ((size_t)nw == n && n == out.dbsz)
+ if ((size_t)nw == n && n == (size_t)out.dbsz)
++st.out_full;
else
++st.out_part;
Modified: projects/runtime-coverage/bin/dd/dd.h
==============================================================================
--- projects/runtime-coverage/bin/dd/dd.h Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/bin/dd/dd.h Sat Aug 26 07:05:29 2017 (r322922)
@@ -38,10 +38,9 @@
typedef struct {
u_char *db; /* buffer address */
u_char *dbp; /* current buffer I/O address */
- /* XXX ssize_t? */
- size_t dbcnt; /* current buffer byte count */
- size_t dbrcnt; /* last read byte count */
- size_t dbsz; /* block size */
+ ssize_t dbcnt; /* current buffer byte count */
+ ssize_t dbrcnt; /* last read byte count */
+ ssize_t dbsz; /* block size */
#define ISCHR 0x01 /* character device (warn on short) */
#define ISPIPE 0x02 /* pipe-like (see position.c) */
Modified: projects/runtime-coverage/bin/dd/position.c
==============================================================================
--- projects/runtime-coverage/bin/dd/position.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/bin/dd/position.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -207,7 +207,7 @@ pos_out(void)
n = write(out.fd, out.db, out.dbsz);
if (n == -1)
err(1, "%s", out.name);
- if ((size_t)n != out.dbsz)
+ if (n != out.dbsz)
errx(1, "%s: write failure", out.name);
}
break;
Modified: projects/runtime-coverage/contrib/compiler-rt/lib/builtins/int_lib.h
==============================================================================
--- projects/runtime-coverage/contrib/compiler-rt/lib/builtins/int_lib.h Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/contrib/compiler-rt/lib/builtins/int_lib.h Sat Aug 26 07:05:29 2017 (r322922)
@@ -92,12 +92,13 @@
* does not have dedicated bit counting instructions.
*/
#if defined(__FreeBSD__) && (defined(__sparc64__) || \
- defined(__mips_n64) || defined(__mips_o64) || defined(__riscv))
+ defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64) || \
+ defined(__riscv))
si_int __clzsi2(si_int);
si_int __ctzsi2(si_int);
#define __builtin_clz __clzsi2
#define __builtin_ctz __ctzsi2
-#endif /* FreeBSD && (sparc64 || mips_n64 || mips_o64) */
+#endif /* FreeBSD && (sparc64 || mips_n32 || mips_n64 || mips_o64 || riscv) */
COMPILER_RT_ABI si_int __paritysi2(si_int a);
COMPILER_RT_ABI si_int __paritydi2(di_int a);
Modified: projects/runtime-coverage/lib/libc/gen/getmntinfo.c
==============================================================================
--- projects/runtime-coverage/lib/libc/gen/getmntinfo.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/lib/libc/gen/getmntinfo.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -38,6 +38,9 @@ __FBSDID("$FreeBSD$");
#include <sys/mount.h>
#include <stdlib.h>
+#define MAX_TRIES 3
+#define SCALING_FACTOR 2
+
/*
* Return information about mounted filesystems.
*/
@@ -47,20 +50,21 @@ getmntinfo(struct statfs **mntbufp, int mode)
static struct statfs *mntbuf;
static int mntsize;
static long bufsize;
+ unsigned tries = 0;
if (mntsize <= 0 && (mntsize = getfsstat(0, 0, MNT_NOWAIT)) < 0)
return (0);
if (bufsize > 0 && (mntsize = getfsstat(mntbuf, bufsize, mode)) < 0)
return (0);
- while (bufsize <= mntsize * sizeof(struct statfs)) {
- if (mntbuf)
- free(mntbuf);
- bufsize = (mntsize + 1) * sizeof(struct statfs);
- if ((mntbuf = malloc(bufsize)) == NULL)
+ while (tries++ < MAX_TRIES && bufsize <= mntsize * sizeof(*mntbuf)) {
+ bufsize = (mntsize * SCALING_FACTOR) * sizeof(*mntbuf);
+ if ((mntbuf = reallocf(mntbuf, bufsize)) == NULL)
return (0);
if ((mntsize = getfsstat(mntbuf, bufsize, mode)) < 0)
return (0);
}
*mntbufp = mntbuf;
+ if (mntsize > (bufsize / sizeof(*mntbuf)))
+ return (bufsize / sizeof(*mntbuf));
return (mntsize);
}
Modified: projects/runtime-coverage/lib/libc/tests/gen/Makefile
==============================================================================
--- projects/runtime-coverage/lib/libc/tests/gen/Makefile Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/lib/libc/tests/gen/Makefile Sat Aug 26 07:05:29 2017 (r322922)
@@ -8,6 +8,7 @@ ATF_TESTS_C+= fmtmsg_test
ATF_TESTS_C+= fnmatch2_test
ATF_TESTS_C+= fpclassify2_test
ATF_TESTS_C+= ftw_test
+ATF_TESTS_C+= getmntinfo_test
ATF_TESTS_C+= glob2_test
ATF_TESTS_C+= popen_test
ATF_TESTS_C+= posix_spawn_test
Copied: projects/runtime-coverage/lib/libc/tests/gen/getmntinfo_test.c (from r322921, head/lib/libc/tests/gen/getmntinfo_test.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/runtime-coverage/lib/libc/tests/gen/getmntinfo_test.c Sat Aug 26 07:05:29 2017 (r322922, copy of r322921, head/lib/libc/tests/gen/getmntinfo_test.c)
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 2017 Conrad Meyer <cem at FreeBSD.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 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.
+ */
+
+/*
+ * Limited test program for getmntinfo(3), a non-standard BSDism.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <sys/ucred.h>
+
+#include <errno.h>
+
+#include <atf-c.h>
+
+static void
+check_mntinfo(struct statfs *mntinfo, int n)
+{
+ int i;
+
+ for (i = 0; i < n; i++) {
+ ATF_REQUIRE_MSG(mntinfo[i].f_version == STATFS_VERSION, "%ju",
+ (uintmax_t)mntinfo[i].f_version);
+ ATF_REQUIRE(mntinfo[i].f_namemax <= sizeof(mntinfo[0].f_mntonname));
+ }
+}
+
+ATF_TC_WITHOUT_HEAD(getmntinfo_test);
+ATF_TC_BODY(getmntinfo_test, tc)
+{
+ int nmnts;
+ struct statfs *mntinfo;
+
+ /* Test bogus mode */
+ nmnts = getmntinfo(&mntinfo, 199);
+ ATF_REQUIRE_MSG(nmnts == 0 && errno == EINVAL,
+ "getmntinfo() succeeded; errno=%d", errno);
+
+ /* Valid modes */
+ nmnts = getmntinfo(&mntinfo, MNT_NOWAIT);
+ ATF_REQUIRE_MSG(nmnts != 0, "getmntinfo(MNT_NOWAIT) failed; errno=%d",
+ errno);
+
+ check_mntinfo(mntinfo, nmnts);
+ memset(mntinfo, 0xdf, sizeof(*mntinfo) * nmnts);
+
+ nmnts = getmntinfo(&mntinfo, MNT_WAIT);
+ ATF_REQUIRE_MSG(nmnts != 0, "getmntinfo(MNT_WAIT) failed; errno=%d",
+ errno);
+
+ check_mntinfo(mntinfo, nmnts);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, getmntinfo_test);
+
+ return (atf_no_error());
+}
Modified: projects/runtime-coverage/lib/msun/tests/trig_test.c
==============================================================================
--- projects/runtime-coverage/lib/msun/tests/trig_test.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/lib/msun/tests/trig_test.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -158,11 +158,6 @@ ATF_TC_BODY(reduction, tc)
};
#endif
-#if defined(__clang__) && \
- ((__clang_major__ >= 5))
- atf_tc_expect_fail("test fails with clang 5.0+ - bug 220989");
-#endif
-
unsigned i;
for (i = 0; i < nitems(f_pi_odd); i++) {
Modified: projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/boot/efi/loader/arch/amd64/Makefile.inc Sat Aug 26 07:05:29 2017 (r322922)
@@ -9,7 +9,8 @@ SRCS+= amd64_tramp.S \
.PATH: ${.CURDIR}/../../i386/libi386
SRCS+= nullconsole.c \
- comconsole.c
+ comconsole.c \
+ spinconsole.c
-CFLAGS+= -fPIC
+CFLAGS+= -fPIC -DTERM_EMU
LDFLAGS+= -Wl,-znocombreloc
Modified: projects/runtime-coverage/sys/boot/efi/loader/arch/i386/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/loader/arch/i386/Makefile.inc Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/boot/efi/loader/arch/i386/Makefile.inc Sat Aug 26 07:05:29 2017 (r322922)
@@ -7,7 +7,8 @@ SRCS+= start.S \
.PATH: ${.CURDIR}/../../i386/libi386
SRCS+= nullconsole.c \
- comconsole.c
+ comconsole.c \
+ spinconsole.c
-CFLAGS+= -fPIC
+CFLAGS+= -fPIC -DTERM_EMU
LDFLAGS+= -Wl,-znocombreloc
Modified: projects/runtime-coverage/sys/boot/efi/loader/conf.c
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/loader/conf.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/boot/efi/loader/conf.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -69,6 +69,7 @@ extern struct console efi_console;
#if defined(__amd64__) || defined(__i386__)
extern struct console comconsole;
extern struct console nullconsole;
+extern struct console spinconsole;
#endif
struct console *consoles[] = {
@@ -76,6 +77,7 @@ struct console *consoles[] = {
#if defined(__amd64__) || defined(__i386__)
&comconsole,
&nullconsole,
+ &spinconsole,
#endif
NULL
};
Modified: projects/runtime-coverage/sys/boot/i386/libi386/spinconsole.c
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/libi386/spinconsole.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/boot/i386/libi386/spinconsole.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -41,16 +41,14 @@ __FBSDID("$FreeBSD$");
#include <stand.h>
#include <bootstrap.h>
-extern void get_pos(int *x, int *y);
-extern void curs_move(int *_x, int *_y, int x, int y);
-extern void vidc_biosputchar(int c);
-
static void spinc_probe(struct console *cp);
static int spinc_init(int arg);
static void spinc_putchar(int c);
static int spinc_getchar(void);
static int spinc_ischar(void);
+extern struct console *consoles[];
+
struct console spinconsole = {
"spinconsole",
"spin port",
@@ -62,47 +60,53 @@ struct console spinconsole = {
spinc_ischar
};
+static struct console *parent = NULL;
+
static void
spinc_probe(struct console *cp)
{
- cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
+
+ if (parent == NULL)
+ parent = consoles[0];
+ parent->c_probe(cp);
}
static int
spinc_init(int arg)
{
- return(0);
+
+ return(parent->c_init(arg));
}
static void
spinc_putchar(int c)
{
- static int curx, cury;
static unsigned tw_chars = 0x5C2D2F7C; /* "\-/|" */
- static time_t lasttime;
+ static time_t lasttime = 0;
time_t now;
- now = time(NULL);
+ now = time(0);
if (now < (lasttime + 1))
return;
- lasttime = now;
#ifdef TERM_EMU
- get_pos(&curx, &cury);
- if (curx > 0)
- curs_move(&curx, &cury, curx - 1, cury);
+ if (lasttime > 0)
+ parent->c_out('\b');
#endif
- vidc_biosputchar((char)tw_chars);
+ lasttime = now;
+ parent->c_out((char)tw_chars);
tw_chars = (tw_chars >> 8) | ((tw_chars & (unsigned long)0xFF) << 24);
}
static int
spinc_getchar(void)
{
+
return(-1);
}
static int
spinc_ischar(void)
{
+
return(0);
}
Modified: projects/runtime-coverage/sys/compat/cloudabi/cloudabi_fd.c
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi/cloudabi_fd.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi/cloudabi_fd.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -79,11 +79,6 @@ __FBSDID("$FreeBSD$");
MAPPING(CLOUDABI_RIGHT_POLL_WAIT, CAP_KQUEUE_EVENT) \
MAPPING(CLOUDABI_RIGHT_PROC_EXEC, CAP_FEXECVE) \
MAPPING(CLOUDABI_RIGHT_SOCK_ACCEPT, CAP_ACCEPT) \
- MAPPING(CLOUDABI_RIGHT_SOCK_BIND_DIRECTORY, CAP_BINDAT) \
- MAPPING(CLOUDABI_RIGHT_SOCK_BIND_SOCKET, CAP_BIND) \
- MAPPING(CLOUDABI_RIGHT_SOCK_CONNECT_DIRECTORY, CAP_CONNECTAT) \
- MAPPING(CLOUDABI_RIGHT_SOCK_CONNECT_SOCKET, CAP_CONNECT) \
- MAPPING(CLOUDABI_RIGHT_SOCK_LISTEN, CAP_LISTEN) \
MAPPING(CLOUDABI_RIGHT_SOCK_SHUTDOWN, CAP_SHUTDOWN) \
MAPPING(CLOUDABI_RIGHT_SOCK_STAT_GET, CAP_GETPEERNAME, \
CAP_GETSOCKNAME, CAP_GETSOCKOPT)
@@ -109,10 +104,6 @@ cloudabi_sys_fd_create1(struct thread *td,
cap_rights_init(&fcaps.fc_rights, CAP_FSTAT, CAP_FTRUNCATE,
CAP_MMAP_RWX);
return (kern_shm_open(td, SHM_ANON, O_RDWR, 0, &fcaps));
- case CLOUDABI_FILETYPE_SOCKET_DGRAM:
- return (kern_socket(td, AF_UNIX, SOCK_DGRAM, 0));
- case CLOUDABI_FILETYPE_SOCKET_STREAM:
- return (kern_socket(td, AF_UNIX, SOCK_STREAM, 0));
default:
return (EINVAL);
}
@@ -312,9 +303,7 @@ cloudabi_remove_conflicting_rights(cloudabi_filetype_t
CLOUDABI_RIGHT_FILE_STAT_PUT_TIMES |
CLOUDABI_RIGHT_FILE_SYMLINK |
CLOUDABI_RIGHT_FILE_UNLINK |
- CLOUDABI_RIGHT_POLL_FD_READWRITE |
- CLOUDABI_RIGHT_SOCK_BIND_DIRECTORY |
- CLOUDABI_RIGHT_SOCK_CONNECT_DIRECTORY;
+ CLOUDABI_RIGHT_POLL_FD_READWRITE;
*inheriting &= CLOUDABI_RIGHT_FD_DATASYNC |
CLOUDABI_RIGHT_FD_READ |
CLOUDABI_RIGHT_FD_SEEK |
@@ -344,9 +333,7 @@ cloudabi_remove_conflicting_rights(cloudabi_filetype_t
CLOUDABI_RIGHT_MEM_MAP |
CLOUDABI_RIGHT_MEM_MAP_EXEC |
CLOUDABI_RIGHT_POLL_FD_READWRITE |
- CLOUDABI_RIGHT_PROC_EXEC |
- CLOUDABI_RIGHT_SOCK_BIND_DIRECTORY |
- CLOUDABI_RIGHT_SOCK_CONNECT_DIRECTORY;
+ CLOUDABI_RIGHT_PROC_EXEC;
break;
case CLOUDABI_FILETYPE_FIFO:
*base &= CLOUDABI_RIGHT_FD_READ |
@@ -400,9 +387,6 @@ cloudabi_remove_conflicting_rights(cloudabi_filetype_t
CLOUDABI_RIGHT_FILE_STAT_FGET |
CLOUDABI_RIGHT_POLL_FD_READWRITE |
CLOUDABI_RIGHT_SOCK_ACCEPT |
- CLOUDABI_RIGHT_SOCK_BIND_SOCKET |
- CLOUDABI_RIGHT_SOCK_CONNECT_SOCKET |
- CLOUDABI_RIGHT_SOCK_LISTEN |
CLOUDABI_RIGHT_SOCK_SHUTDOWN |
CLOUDABI_RIGHT_SOCK_STAT_GET;
break;
Modified: projects/runtime-coverage/sys/compat/cloudabi/cloudabi_sock.c
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi/cloudabi_sock.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi/cloudabi_sock.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/socketvar.h>
#include <sys/syscallsubr.h>
#include <sys/systm.h>
-#include <sys/un.h>
#include <net/vnet.h>
@@ -49,28 +48,6 @@ __FBSDID("$FreeBSD$");
#include <compat/cloudabi/cloudabi_proto.h>
#include <compat/cloudabi/cloudabi_util.h>
-/* Copies a pathname into a UNIX socket address structure. */
-static int
-copyin_sockaddr_un(const char *path, size_t pathlen, struct sockaddr_un *sun)
-{
- int error;
-
- /* Copy in pathname string if there's enough space. */
- if (pathlen >= sizeof(sun->sun_path))
- return (ENAMETOOLONG);
- error = copyin(path, &sun->sun_path, pathlen);
- if (error != 0)
- return (error);
- if (memchr(sun->sun_path, '\0', pathlen) != NULL)
- return (EINVAL);
-
- /* Initialize the rest of the socket address. */
- sun->sun_path[pathlen] = '\0';
- sun->sun_family = AF_UNIX;
- sun->sun_len = sizeof(*sun);
- return (0);
-}
-
int
cloudabi_sys_sock_accept(struct thread *td,
struct cloudabi_sys_sock_accept_args *uap)
@@ -80,41 +57,6 @@ cloudabi_sys_sock_accept(struct thread *td,
}
int
-cloudabi_sys_sock_bind(struct thread *td,
- struct cloudabi_sys_sock_bind_args *uap)
-{
- struct sockaddr_un sun;
- int error;
-
- error = copyin_sockaddr_un(uap->path, uap->path_len, &sun);
- if (error != 0)
- return (error);
- return (kern_bindat(td, uap->fd, uap->sock, (struct sockaddr *)&sun));
-}
-
-int
-cloudabi_sys_sock_connect(struct thread *td,
- struct cloudabi_sys_sock_connect_args *uap)
-{
- struct sockaddr_un sun;
- int error;
-
- error = copyin_sockaddr_un(uap->path, uap->path_len, &sun);
- if (error != 0)
- return (error);
- return (kern_connectat(td, uap->fd, uap->sock,
- (struct sockaddr *)&sun));
-}
-
-int
-cloudabi_sys_sock_listen(struct thread *td,
- struct cloudabi_sys_sock_listen_args *uap)
-{
-
- return (kern_listen(td, uap->sock, uap->backlog));
-}
-
-int
cloudabi_sys_sock_shutdown(struct thread *td,
struct cloudabi_sys_sock_shutdown_args *uap)
{
@@ -174,10 +116,7 @@ cloudabi_sock_recv(struct thread *td, cloudabi_fd_t fd
cloudabi_riflags_t flags, size_t *rdatalen, size_t *rfdslen,
cloudabi_roflags_t *rflags)
{
- struct sockaddr_storage ss;
struct msghdr hdr = {
- .msg_name = &ss,
- .msg_namelen = sizeof(ss),
.msg_iov = data,
.msg_iovlen = datalen,
};
Modified: projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_proto.h
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_proto.h Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_proto.h Sat Aug 26 07:05:29 2017 (r322922)
@@ -259,22 +259,6 @@ struct cloudabi_sys_sock_accept_args {
char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)];
char unused_l_[PADL_(void *)]; void * unused; char unused_r_[PADR_(void *)];
};
-struct cloudabi_sys_sock_bind_args {
- char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)];
- char fd_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t fd; char fd_r_[PADR_(cloudabi_fd_t)];
- char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char path_len_l_[PADL_(size_t)]; size_t path_len; char path_len_r_[PADR_(size_t)];
-};
-struct cloudabi_sys_sock_connect_args {
- char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)];
- char fd_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t fd; char fd_r_[PADR_(cloudabi_fd_t)];
- char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char path_len_l_[PADL_(size_t)]; size_t path_len; char path_len_r_[PADR_(size_t)];
-};
-struct cloudabi_sys_sock_listen_args {
- char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)];
- char backlog_l_[PADL_(cloudabi_backlog_t)]; cloudabi_backlog_t backlog; char backlog_r_[PADR_(cloudabi_backlog_t)];
-};
struct cloudabi32_sys_sock_recv_args {
char sock_l_[PADL_(cloudabi_fd_t)]; cloudabi_fd_t sock; char sock_r_[PADR_(cloudabi_fd_t)];
char in_l_[PADL_(const cloudabi32_recv_in_t *)]; const cloudabi32_recv_in_t * in; char in_r_[PADR_(const cloudabi32_recv_in_t *)];
@@ -349,9 +333,6 @@ int cloudabi_sys_proc_fork(struct thread *, struct clo
int cloudabi_sys_proc_raise(struct thread *, struct cloudabi_sys_proc_raise_args *);
int cloudabi_sys_random_get(struct thread *, struct cloudabi_sys_random_get_args *);
int cloudabi_sys_sock_accept(struct thread *, struct cloudabi_sys_sock_accept_args *);
-int cloudabi_sys_sock_bind(struct thread *, struct cloudabi_sys_sock_bind_args *);
-int cloudabi_sys_sock_connect(struct thread *, struct cloudabi_sys_sock_connect_args *);
-int cloudabi_sys_sock_listen(struct thread *, struct cloudabi_sys_sock_listen_args *);
int cloudabi32_sys_sock_recv(struct thread *, struct cloudabi32_sys_sock_recv_args *);
int cloudabi32_sys_sock_send(struct thread *, struct cloudabi32_sys_sock_send_args *);
int cloudabi_sys_sock_shutdown(struct thread *, struct cloudabi_sys_sock_shutdown_args *);
@@ -440,9 +421,6 @@ int cloudabi_sys_thread_yield(struct thread *, struct
#define CLOUDABI32_SYS_AUE_cloudabi_sys_proc_raise AUE_NULL
#define CLOUDABI32_SYS_AUE_cloudabi_sys_random_get AUE_NULL
#define CLOUDABI32_SYS_AUE_cloudabi_sys_sock_accept AUE_NULL
-#define CLOUDABI32_SYS_AUE_cloudabi_sys_sock_bind AUE_NULL
-#define CLOUDABI32_SYS_AUE_cloudabi_sys_sock_connect AUE_NULL
-#define CLOUDABI32_SYS_AUE_cloudabi_sys_sock_listen AUE_NULL
#define CLOUDABI32_SYS_AUE_cloudabi32_sys_sock_recv AUE_NULL
#define CLOUDABI32_SYS_AUE_cloudabi32_sys_sock_send AUE_NULL
#define CLOUDABI32_SYS_AUE_cloudabi_sys_sock_shutdown AUE_NULL
Modified: projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscall.h
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscall.h Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscall.h Sat Aug 26 07:05:29 2017 (r322922)
@@ -50,14 +50,11 @@
#define CLOUDABI32_SYS_cloudabi_sys_proc_raise 42
#define CLOUDABI32_SYS_cloudabi_sys_random_get 43
#define CLOUDABI32_SYS_cloudabi_sys_sock_accept 44
-#define CLOUDABI32_SYS_cloudabi_sys_sock_bind 45
-#define CLOUDABI32_SYS_cloudabi_sys_sock_connect 46
-#define CLOUDABI32_SYS_cloudabi_sys_sock_listen 47
-#define CLOUDABI32_SYS_cloudabi32_sys_sock_recv 48
-#define CLOUDABI32_SYS_cloudabi32_sys_sock_send 49
-#define CLOUDABI32_SYS_cloudabi_sys_sock_shutdown 50
-#define CLOUDABI32_SYS_cloudabi_sys_sock_stat_get 51
-#define CLOUDABI32_SYS_cloudabi32_sys_thread_create 52
-#define CLOUDABI32_SYS_cloudabi_sys_thread_exit 53
-#define CLOUDABI32_SYS_cloudabi_sys_thread_yield 54
-#define CLOUDABI32_SYS_MAXSYSCALL 55
+#define CLOUDABI32_SYS_cloudabi32_sys_sock_recv 45
+#define CLOUDABI32_SYS_cloudabi32_sys_sock_send 46
+#define CLOUDABI32_SYS_cloudabi_sys_sock_shutdown 47
+#define CLOUDABI32_SYS_cloudabi_sys_sock_stat_get 48
+#define CLOUDABI32_SYS_cloudabi32_sys_thread_create 49
+#define CLOUDABI32_SYS_cloudabi_sys_thread_exit 50
+#define CLOUDABI32_SYS_cloudabi_sys_thread_yield 51
+#define CLOUDABI32_SYS_MAXSYSCALL 52
Modified: projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscalls.c
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscalls.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscalls.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -51,14 +51,11 @@ const char *cloudabi32_syscallnames[] = {
"cloudabi_sys_proc_raise", /* 42 = cloudabi_sys_proc_raise */
"cloudabi_sys_random_get", /* 43 = cloudabi_sys_random_get */
"cloudabi_sys_sock_accept", /* 44 = cloudabi_sys_sock_accept */
- "cloudabi_sys_sock_bind", /* 45 = cloudabi_sys_sock_bind */
- "cloudabi_sys_sock_connect", /* 46 = cloudabi_sys_sock_connect */
- "cloudabi_sys_sock_listen", /* 47 = cloudabi_sys_sock_listen */
- "cloudabi32_sys_sock_recv", /* 48 = cloudabi32_sys_sock_recv */
- "cloudabi32_sys_sock_send", /* 49 = cloudabi32_sys_sock_send */
- "cloudabi_sys_sock_shutdown", /* 50 = cloudabi_sys_sock_shutdown */
- "cloudabi_sys_sock_stat_get", /* 51 = cloudabi_sys_sock_stat_get */
- "cloudabi32_sys_thread_create", /* 52 = cloudabi32_sys_thread_create */
- "cloudabi_sys_thread_exit", /* 53 = cloudabi_sys_thread_exit */
- "cloudabi_sys_thread_yield", /* 54 = cloudabi_sys_thread_yield */
+ "cloudabi32_sys_sock_recv", /* 45 = cloudabi32_sys_sock_recv */
+ "cloudabi32_sys_sock_send", /* 46 = cloudabi32_sys_sock_send */
+ "cloudabi_sys_sock_shutdown", /* 47 = cloudabi_sys_sock_shutdown */
+ "cloudabi_sys_sock_stat_get", /* 48 = cloudabi_sys_sock_stat_get */
+ "cloudabi32_sys_thread_create", /* 49 = cloudabi32_sys_thread_create */
+ "cloudabi_sys_thread_exit", /* 50 = cloudabi_sys_thread_exit */
+ "cloudabi_sys_thread_yield", /* 51 = cloudabi_sys_thread_yield */
};
Modified: projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_sysent.c
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_sysent.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_sysent.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -59,14 +59,11 @@ struct sysent cloudabi32_sysent[] = {
{ AS(cloudabi_sys_proc_raise_args), (sy_call_t *)cloudabi_sys_proc_raise, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 42 = cloudabi_sys_proc_raise */
{ AS(cloudabi_sys_random_get_args), (sy_call_t *)cloudabi_sys_random_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 43 = cloudabi_sys_random_get */
{ AS(cloudabi_sys_sock_accept_args), (sy_call_t *)cloudabi_sys_sock_accept, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 44 = cloudabi_sys_sock_accept */
- { AS(cloudabi_sys_sock_bind_args), (sy_call_t *)cloudabi_sys_sock_bind, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 45 = cloudabi_sys_sock_bind */
- { AS(cloudabi_sys_sock_connect_args), (sy_call_t *)cloudabi_sys_sock_connect, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 46 = cloudabi_sys_sock_connect */
- { AS(cloudabi_sys_sock_listen_args), (sy_call_t *)cloudabi_sys_sock_listen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 47 = cloudabi_sys_sock_listen */
- { AS(cloudabi32_sys_sock_recv_args), (sy_call_t *)cloudabi32_sys_sock_recv, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 48 = cloudabi32_sys_sock_recv */
- { AS(cloudabi32_sys_sock_send_args), (sy_call_t *)cloudabi32_sys_sock_send, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 49 = cloudabi32_sys_sock_send */
- { AS(cloudabi_sys_sock_shutdown_args), (sy_call_t *)cloudabi_sys_sock_shutdown, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 50 = cloudabi_sys_sock_shutdown */
- { AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 51 = cloudabi_sys_sock_stat_get */
- { AS(cloudabi32_sys_thread_create_args), (sy_call_t *)cloudabi32_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 52 = cloudabi32_sys_thread_create */
- { AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 53 = cloudabi_sys_thread_exit */
- { 0, (sy_call_t *)cloudabi_sys_thread_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 54 = cloudabi_sys_thread_yield */
+ { AS(cloudabi32_sys_sock_recv_args), (sy_call_t *)cloudabi32_sys_sock_recv, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 45 = cloudabi32_sys_sock_recv */
+ { AS(cloudabi32_sys_sock_send_args), (sy_call_t *)cloudabi32_sys_sock_send, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 46 = cloudabi32_sys_sock_send */
+ { AS(cloudabi_sys_sock_shutdown_args), (sy_call_t *)cloudabi_sys_sock_shutdown, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 47 = cloudabi_sys_sock_shutdown */
+ { AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 48 = cloudabi_sys_sock_stat_get */
+ { AS(cloudabi32_sys_thread_create_args), (sy_call_t *)cloudabi32_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 49 = cloudabi32_sys_thread_create */
+ { AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 50 = cloudabi_sys_thread_exit */
+ { 0, (sy_call_t *)cloudabi_sys_thread_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 51 = cloudabi_sys_thread_yield */
};
Modified: projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_systrace_args.c
==============================================================================
--- projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_systrace_args.c Sat Aug 26 06:44:50 2017 (r322921)
+++ projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_systrace_args.c Sat Aug 26 07:05:29 2017 (r322922)
@@ -415,36 +415,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 2;
break;
}
- /* cloudabi_sys_sock_bind */
- case 45: {
- struct cloudabi_sys_sock_bind_args *p = params;
- iarg[0] = p->sock; /* cloudabi_fd_t */
- iarg[1] = p->fd; /* cloudabi_fd_t */
- uarg[2] = (intptr_t) p->path; /* const char * */
- uarg[3] = p->path_len; /* size_t */
- *n_args = 4;
- break;
- }
- /* cloudabi_sys_sock_connect */
- case 46: {
- struct cloudabi_sys_sock_connect_args *p = params;
- iarg[0] = p->sock; /* cloudabi_fd_t */
- iarg[1] = p->fd; /* cloudabi_fd_t */
- uarg[2] = (intptr_t) p->path; /* const char * */
- uarg[3] = p->path_len; /* size_t */
- *n_args = 4;
- break;
- }
- /* cloudabi_sys_sock_listen */
- case 47: {
- struct cloudabi_sys_sock_listen_args *p = params;
- iarg[0] = p->sock; /* cloudabi_fd_t */
- iarg[1] = p->backlog; /* cloudabi_backlog_t */
- *n_args = 2;
- break;
- }
/* cloudabi32_sys_sock_recv */
- case 48: {
+ case 45: {
struct cloudabi32_sys_sock_recv_args *p = params;
iarg[0] = p->sock; /* cloudabi_fd_t */
uarg[1] = (intptr_t) p->in; /* const cloudabi32_recv_in_t * */
@@ -453,7 +425,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
break;
}
/* cloudabi32_sys_sock_send */
- case 49: {
+ case 46: {
struct cloudabi32_sys_sock_send_args *p = params;
iarg[0] = p->sock; /* cloudabi_fd_t */
uarg[1] = (intptr_t) p->in; /* const cloudabi32_send_in_t * */
@@ -462,7 +434,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
break;
}
/* cloudabi_sys_sock_shutdown */
- case 50: {
+ case 47: {
struct cloudabi_sys_sock_shutdown_args *p = params;
iarg[0] = p->sock; /* cloudabi_fd_t */
iarg[1] = p->how; /* cloudabi_sdflags_t */
@@ -470,7 +442,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
break;
}
/* cloudabi_sys_sock_stat_get */
- case 51: {
+ case 48: {
struct cloudabi_sys_sock_stat_get_args *p = params;
iarg[0] = p->sock; /* cloudabi_fd_t */
uarg[1] = (intptr_t) p->buf; /* cloudabi_sockstat_t * */
@@ -479,14 +451,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
break;
}
/* cloudabi32_sys_thread_create */
- case 52: {
+ case 49: {
struct cloudabi32_sys_thread_create_args *p = params;
uarg[0] = (intptr_t) p->attr; /* cloudabi32_threadattr_t * */
*n_args = 1;
break;
}
/* cloudabi_sys_thread_exit */
- case 53: {
+ case 50: {
struct cloudabi_sys_thread_exit_args *p = params;
uarg[0] = (intptr_t) p->lock; /* cloudabi_lock_t * */
iarg[1] = p->scope; /* cloudabi_scope_t */
@@ -494,7 +466,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
break;
}
/* cloudabi_sys_thread_yield */
- case 54: {
+ case 51: {
*n_args = 0;
break;
}
@@ -1224,64 +1196,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* cloudabi_sys_sock_bind */
+ /* cloudabi32_sys_sock_recv */
case 45:
switch(ndx) {
case 0:
p = "cloudabi_fd_t";
break;
case 1:
- p = "cloudabi_fd_t";
- break;
- case 2:
- p = "userland const char *";
- break;
- case 3:
- p = "size_t";
- break;
- default:
- break;
- };
- break;
- /* cloudabi_sys_sock_connect */
- case 46:
- switch(ndx) {
- case 0:
- p = "cloudabi_fd_t";
- break;
- case 1:
- p = "cloudabi_fd_t";
- break;
- case 2:
- p = "userland const char *";
- break;
- case 3:
- p = "size_t";
- break;
- default:
- break;
- };
- break;
- /* cloudabi_sys_sock_listen */
- case 47:
- switch(ndx) {
- case 0:
- p = "cloudabi_fd_t";
- break;
- case 1:
- p = "cloudabi_backlog_t";
- break;
- default:
- break;
- };
- break;
- /* cloudabi32_sys_sock_recv */
- case 48:
- switch(ndx) {
- case 0:
- p = "cloudabi_fd_t";
- break;
- case 1:
p = "userland const cloudabi32_recv_in_t *";
break;
case 2:
@@ -1292,7 +1213,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi32_sys_sock_send */
- case 49:
+ case 46:
switch(ndx) {
case 0:
p = "cloudabi_fd_t";
@@ -1308,7 +1229,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi_sys_sock_shutdown */
- case 50:
+ case 47:
switch(ndx) {
case 0:
p = "cloudabi_fd_t";
@@ -1321,7 +1242,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi_sys_sock_stat_get */
- case 51:
+ case 48:
switch(ndx) {
case 0:
p = "cloudabi_fd_t";
@@ -1337,7 +1258,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi32_sys_thread_create */
- case 52:
+ case 49:
switch(ndx) {
case 0:
p = "userland cloudabi32_threadattr_t *";
@@ -1347,7 +1268,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi_sys_thread_exit */
- case 53:
+ case 50:
switch(ndx) {
case 0:
p = "userland cloudabi_lock_t *";
@@ -1360,7 +1281,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
};
break;
/* cloudabi_sys_thread_yield */
- case 54:
+ case 51:
break;
default:
break;
@@ -1595,53 +1516,38 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
if (ndx == 0 || ndx == 1)
p = "cloudabi_fd_t";
break;
- /* cloudabi_sys_sock_bind */
+ /* cloudabi32_sys_sock_recv */
case 45:
if (ndx == 0 || ndx == 1)
p = "void";
break;
- /* cloudabi_sys_sock_connect */
+ /* cloudabi32_sys_sock_send */
case 46:
if (ndx == 0 || ndx == 1)
p = "void";
break;
- /* cloudabi_sys_sock_listen */
+ /* cloudabi_sys_sock_shutdown */
case 47:
if (ndx == 0 || ndx == 1)
p = "void";
break;
- /* cloudabi32_sys_sock_recv */
+ /* cloudabi_sys_sock_stat_get */
case 48:
if (ndx == 0 || ndx == 1)
p = "void";
break;
- /* cloudabi32_sys_sock_send */
+ /* cloudabi32_sys_thread_create */
case 49:
if (ndx == 0 || ndx == 1)
- p = "void";
- break;
- /* cloudabi_sys_sock_shutdown */
- case 50:
- if (ndx == 0 || ndx == 1)
- p = "void";
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list