Index: head/usr.bin/truss/Makefile
===================================================================
--- head/usr.bin/truss/Makefile	(revision 327056)
+++ head/usr.bin/truss/Makefile	(revision 327057)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 #NO_WERROR=
 PROG=	truss
 SRCS=	main.c setup.c syscalls.c
 
 LIBADD=	sysdecode
 
 #CFLAGS+= -I${.CURDIR} -I. -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/sys
 
 ABIS+=		freebsd
 # Each ABI is expected to have an ABI.c, MACHINE_ARCH-ABI.c or
 # MACHINE_CPUARCH-ABI.c file that will be used to map the syscall arguments.
 .if ${MACHINE_ARCH} == "aarch64"
 ABIS+=		cloudabi32
 ABIS+=		cloudabi64
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
 ABIS+=		i386-linux
+ABIS+=		cloudabi32
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
 ABIS+=		amd64-linux
 ABIS+=		amd64-linux32
 ABIS+=		freebsd32
 ABIS+=		cloudabi32
 ABIS+=		cloudabi64
 .endif
 .if ${MACHINE_ARCH} == "powerpc64"
 ABIS+=		freebsd32
 .endif
 
 .for abi in ${ABIS}
 # Find the right file to handle this ABI.
 abi_src=
 ABI_SRCS=	${abi}.c ${MACHINE_ARCH}-${abi}.c ${MACHINE_CPUARCH}-${abi}.c
 .for f in ${ABI_SRCS}
 .if exists(${.CURDIR}/${f}) && empty(abi_src)
 abi_src=	${f}
 .endif
 .endfor
 SRCS:=		${SRCS} ${abi_src}
 .endfor
 
 .include <bsd.prog.mk>
Index: head/usr.bin/truss/i386-cloudabi32.c
===================================================================
--- head/usr.bin/truss/i386-cloudabi32.c	(nonexistent)
+++ head/usr.bin/truss/i386-cloudabi32.c	(revision 327057)
@@ -0,0 +1,98 @@
+/*-
+ * Copyright (c) 2015-2017 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/ptrace.h>
+
+#include <machine/psl.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <sysdecode.h>
+
+#include "truss.h"
+
+static int
+i386_cloudabi32_fetch_args(struct trussinfo *trussinfo, unsigned int narg)
+{
+	struct current_syscall *cs;
+	struct ptrace_io_desc iorequest;
+	struct reg regs;
+	lwpid_t tid;
+
+	if (narg > 0) {
+		/* Fetch registers, containing the stack pointer. */
+		tid = trussinfo->curthread->tid;
+		if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) == -1) {
+			fprintf(trussinfo->outfile,
+			    "-- CANNOT READ REGISTERS --\n");
+			return (-1);
+		}
+
+		/* Fetch arguments. */
+		cs = &trussinfo->curthread->cs;
+		iorequest.piod_op = PIOD_READ_D;
+		iorequest.piod_offs = (void **)regs.r_esp + 1;
+		iorequest.piod_addr = cs->args;
+		iorequest.piod_len = sizeof(cs->args[0]) * narg;
+		if (ptrace(PT_IO, tid, (caddr_t)&iorequest, 0) == -1 ||
+		    iorequest.piod_len == 0)
+			return (-1);
+	}
+	return (0);
+}
+
+static int
+i386_cloudabi32_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) == -1) {
+		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+		return (-1);
+	}
+
+	retval[0] = regs.r_eax;
+	retval[1] = regs.r_edx;
+	*errorp = (regs.r_eflags & PSL_C) != 0;
+	return (0);
+}
+
+static struct procabi i386_cloudabi32 = {
+	"CloudABI ELF32",
+	SYSDECODE_ABI_CLOUDABI32,
+	i386_cloudabi32_fetch_args,
+	i386_cloudabi32_fetch_retval,
+	STAILQ_HEAD_INITIALIZER(i386_cloudabi32.extra_syscalls),
+	{ NULL }
+};
+
+PROCABI(i386_cloudabi32);

Property changes on: head/usr.bin/truss/i386-cloudabi32.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