From owner-svn-src-head@freebsd.org Fri Oct 2 11:17:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61C19A0E63E; Fri, 2 Oct 2015 11:17:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5322C1599; Fri, 2 Oct 2015 11:17:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t92BHHVH049255; Fri, 2 Oct 2015 11:17:17 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t92BHGAT049252; Fri, 2 Oct 2015 11:17:16 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201510021117.t92BHGAT049252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Fri, 2 Oct 2015 11:17:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288487 - head/usr.bin/truss X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2015 11:17:17 -0000 Author: ed Date: Fri Oct 2 11:17:15 2015 New Revision: 288487 URL: https://svnweb.freebsd.org/changeset/base/288487 Log: Make truss print CloudABI system call names. This change adds the bits that are necessary to fetch system call arguments and return values from trapframes for CloudABI. This allows us to properly print system calls with the right name. We need to make sure that we properly convert error numbers when system calls fail. We still need to improve truss to pretty-print some of the system calls that have flags. Added: head/usr.bin/truss/amd64-cloudabi64.c (contents, props changed) head/usr.bin/truss/amd64cloudabi64.conf (contents, props changed) Modified: head/usr.bin/truss/Makefile Modified: head/usr.bin/truss/Makefile ============================================================================== --- head/usr.bin/truss/Makefile Fri Oct 2 11:16:46 2015 (r288486) +++ head/usr.bin/truss/Makefile Fri Oct 2 11:17:15 2015 (r288487) @@ -58,6 +58,16 @@ fbsd32-syscalls.master: ${.CURDIR}/../.. freebsd32_syscalls.h: fbsd32-syscalls.master /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \ ${.CURDIR}/fbsd32.conf + +SRCS+= amd64-cloudabi64.c cloudabi64_syscalls.h +CLEANFILES+=amd64cloudabi64-syscalls.master cloudabi64_syscalls.h + +amd64cloudabi64-syscalls.master: ${.CURDIR}/../../sys/compat/cloudabi64/syscalls.master + cat ${.ALLSRC} > ${.TARGET} + +cloudabi64_syscalls.h: amd64cloudabi64-syscalls.master + /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \ + ${.CURDIR}/amd64cloudabi64.conf .endif .if ${MACHINE_ARCH} == "powerpc64" Added: head/usr.bin/truss/amd64-cloudabi64.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/truss/amd64-cloudabi64.c Fri Oct 2 11:17:15 2015 (r288487) @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2015 Nuxi, https://nuxi.nl/ + * + * 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. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#include + +#include +#include + +#include "cloudabi64_syscalls.h" +#include "truss.h" + +static int +amd64_cloudabi64_fetch_args(struct trussinfo *trussinfo, unsigned int narg) +{ + struct current_syscall *cs; + struct reg regs; + lwpid_t tid; + + tid = trussinfo->curthread->tid; + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) == -1) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return (-1); + } + + cs = &trussinfo->curthread->cs; + if (narg >= 1) + cs->args[0] = regs.r_rdi; + if (narg >= 2) + cs->args[1] = regs.r_rsi; + if (narg >= 3) + cs->args[2] = regs.r_rdx; + if (narg >= 4) + cs->args[3] = regs.r_rcx; + if (narg >= 5) + cs->args[4] = regs.r_r8; + if (narg >= 6) + cs->args[5] = regs.r_r9; + return (0); +} + +static const int cloudabi_errno_table[] = { + 0, E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, EAFNOSUPPORT, + EAGAIN, EALREADY, EBADF, EBADMSG, EBUSY, ECANCELED, ECHILD, + ECONNABORTED, ECONNREFUSED, ECONNRESET, EDEADLK, EDESTADDRREQ, + EDOM, EDQUOT, EEXIST, EFAULT, EFBIG, EHOSTUNREACH, EIDRM, + EILSEQ, EINPROGRESS, EINTR, EINVAL, EIO, EISCONN, EISDIR, ELOOP, + EMFILE, EMLINK, EMSGSIZE, EMULTIHOP, ENAMETOOLONG, ENETDOWN, + ENETRESET, ENETUNREACH, ENFILE, ENOBUFS, ENODEV, ENOENT, + ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG, ENOPROTOOPT, ENOSPC, + ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE, ENOTSOCK, + ENOTSUP, ENOTTY, ENXIO, EOVERFLOW, EOWNERDEAD, EPERM, EPIPE, + EPROTO, EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, + ESRCH, ESTALE, ETIMEDOUT, ETXTBSY, EXDEV, ENOTCAPABLE, +}; + +static int +amd64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval, + int *errorp) +{ + struct reg regs; + lwpid_t tid; + + tid = trussinfo->curthread->tid; + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) == -1) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return (-1); + } + + retval[0] = regs.r_rax; + retval[1] = regs.r_rdx; + *errorp = (regs.r_rflags & PSL_C) != 0; + if (*errorp && *retval >= 0 && *retval < nitems(cloudabi_errno_table)) + *retval = cloudabi_errno_table[*retval]; + return (0); +} + +static struct procabi amd64_cloudabi64 = { + "CloudABI ELF64", + cloudabi64_syscallnames, + nitems(cloudabi64_syscallnames), + amd64_cloudabi64_fetch_args, + amd64_cloudabi64_fetch_retval +}; + +PROCABI(amd64_cloudabi64); Added: head/usr.bin/truss/amd64cloudabi64.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/truss/amd64cloudabi64.conf Fri Oct 2 11:17:15 2015 (r288487) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +sysnames="cloudabi64_syscalls.h" +sysproto="/dev/null" +sysproto_h="/dev/null" +syshdr="/dev/null" +sysmk="/dev/null" +syssw="/dev/null" +syshide="/dev/null" +syscallprefix="SYS_" +switchname="sysent" +namesname="cloudabi64_syscallnames" +systrace="/dev/null"