Index: head/usr.bin/truss/riscv64-freebsd.c
===================================================================
--- head/usr.bin/truss/riscv64-freebsd.c	(revision 341655)
+++ head/usr.bin/truss/riscv64-freebsd.c	(nonexistent)
@@ -1,106 +0,0 @@
-/*-
- * Copyright 2017 Li-Wen Hsu <lwhsu@FreeBSD.org>
- *
- * 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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/* FreeBSD/riscv64-specific system call handling. */
-
-#include <sys/ptrace.h>
-#include <sys/syscall.h>
-
-#include <machine/frame.h>
-#include <machine/reg.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <sysdecode.h>
-
-#include "truss.h"
-
-static int
-riscv64_fetch_args(struct trussinfo *trussinfo, u_int narg)
-{
-	struct reg regs;
-	struct current_syscall *cs;
-	lwpid_t tid;
-	u_int i, reg, syscall_num;
-
-	tid = trussinfo->curthread->tid;
-	cs = &trussinfo->curthread->cs;
-	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
-		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
-		return (-1);
-	}
-
-	/*
-	 * FreeBSD has two special kinds of system call redirections --
-	 * SYS_syscall, and SYS___syscall.  The former is the old syscall()
-	 * routine, basically; the latter is for quad-aligned arguments.
-	 *
-	 * The system call argument count and code from ptrace() already
-	 * account for these, but we need to skip over the first argument.
-	 */
-	syscall_num = regs.t[0];
-	if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) {
-		reg = 1;
-		syscall_num = regs.a[0];
-	} else {
-		reg = 0;
-	}
-
-	for (i = 0; i < narg && reg < NARGREG; i++, reg++)
-		cs->args[i] = regs.a[reg];
-	return (0);
-}
-
-static int
-riscv64_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)&regs, 0) < 0) {
-		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
-		return (-1);
-	}
-
-	retval[0] = regs.a[0];
-	retval[1] = regs.a[1];
-	*errorp = !!(regs.t[0]);
-	return (0);
-}
-
-static struct procabi riscv64_freebsd = {
-	"FreeBSD ELF64",
-	SYSDECODE_ABI_FREEBSD,
-	riscv64_fetch_args,
-	riscv64_fetch_retval,
-	STAILQ_HEAD_INITIALIZER(riscv64_freebsd.extra_syscalls),
-	{ NULL }
-};
-
-PROCABI(riscv64_freebsd);

Property changes on: head/usr.bin/truss/riscv64-freebsd.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/usr.bin/truss/riscv-freebsd.c
===================================================================
--- head/usr.bin/truss/riscv-freebsd.c	(nonexistent)
+++ head/usr.bin/truss/riscv-freebsd.c	(revision 341656)
@@ -0,0 +1,106 @@
+/*-
+ * Copyright 2017 Li-Wen Hsu <lwhsu@FreeBSD.org>
+ *
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/* FreeBSD/riscv-specific system call handling. */
+
+#include <sys/ptrace.h>
+#include <sys/syscall.h>
+
+#include <machine/frame.h>
+#include <machine/reg.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <sysdecode.h>
+
+#include "truss.h"
+
+static int
+riscv_fetch_args(struct trussinfo *trussinfo, u_int narg)
+{
+	struct reg regs;
+	struct current_syscall *cs;
+	lwpid_t tid;
+	u_int i, reg, syscall_num;
+
+	tid = trussinfo->curthread->tid;
+	cs = &trussinfo->curthread->cs;
+	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
+		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+		return (-1);
+	}
+
+	/*
+	 * FreeBSD has two special kinds of system call redirections --
+	 * SYS_syscall, and SYS___syscall.  The former is the old syscall()
+	 * routine, basically; the latter is for quad-aligned arguments.
+	 *
+	 * The system call argument count and code from ptrace() already
+	 * account for these, but we need to skip over the first argument.
+	 */
+	syscall_num = regs.t[0];
+	if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) {
+		reg = 1;
+		syscall_num = regs.a[0];
+	} else {
+		reg = 0;
+	}
+
+	for (i = 0; i < narg && reg < NARGREG; i++, reg++)
+		cs->args[i] = regs.a[reg];
+	return (0);
+}
+
+static int
+riscv_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)&regs, 0) < 0) {
+		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+		return (-1);
+	}
+
+	retval[0] = regs.a[0];
+	retval[1] = regs.a[1];
+	*errorp = !!(regs.t[0]);
+	return (0);
+}
+
+static struct procabi riscv_freebsd = {
+	"FreeBSD ELF64",
+	SYSDECODE_ABI_FREEBSD,
+	riscv_fetch_args,
+	riscv_fetch_retval,
+	STAILQ_HEAD_INITIALIZER(riscv_freebsd.extra_syscalls),
+	{ NULL }
+};
+
+PROCABI(riscv_freebsd);

Property changes on: head/usr.bin/truss/riscv-freebsd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property