commit 49eb4d6a8baaa85e046f0a9fe9751da7dcce0275
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 17 02:59:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 17 02:59:22 2023 +0000
tree a76999769c9d8dce9d215263fa29bd6d60a751a6
parent 6f446dec6a10304e88ea0b4b4650fc3810fc3841
parent 199709a671183465c94895e4d72ce9fccd2d46ac

Merge "Trivial decode of __riscv_hwprobe()." into main am: 031a7e8414 am: 126acd4c18 am: e9650841b6 am: 8ce16f495f am: 199709a671

Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2708273

Change-Id: I7148d03c8638d3a9dbe1d800185fb60e72329fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

linux/riscv/syscallent.h

diff --git a/linux/riscv/syscallent.h b/linux/riscv/syscallent.h
index 3dfed89..0b5960a 100644
--- a/linux/riscv/syscallent.h
+++ b/linux/riscv/syscallent.h
@@ -1,4 +1,6 @@
 #include "64/syscallent.h"
 
+/* #define __NR_riscv_hwprobe (__NR_arch_specific_syscall + 14) */
+[258] = { 5,	0,		SEN(riscv_hwprobe),		"riscv_hwprobe"	},
 /* #define __NR_riscv_flush_icache (__NR_arch_specific_syscall + 15) */
 [259] = { 3,	TM,		SEN(riscv_flush_icache),	"riscv_flush_icache"	},

riscv.c

diff --git a/riscv.c b/riscv.c
index aaa3932..7b9ae88 100644
--- a/riscv.c
+++ b/riscv.c
@@ -50,4 +50,21 @@
 	return RVAL_DECODED;
 }
 
+SYS_FUNC(riscv_hwprobe)
+{
+	/* uintptr_t probes */
+	printaddr(tcp->u_arg[0]);
+
+	/* size_t probe_count, size_t cpu_count */
+	tprintf(", %lu, %lu, ", tcp->u_arg[1], tcp->u_arg[2]);
+
+	/* uintptr_t pcus */
+	printaddr(tcp->u_arg[3]);
+
+	/* unsigned flags */
+	tprintf(", %#lx", tcp->u_arg[4]);
+
+	return RVAL_DECODED;
+}
+
 #endif /* RISCV */

sen.h

diff --git a/sen.h b/sen.h
index fb29d69..c5febcc 100644
--- a/sen.h
+++ b/sen.h
@@ -273,6 +273,7 @@
 SEN_request_key,
 SEN_restart_syscall,
 SEN_riscv_flush_icache,
+SEN_riscv_hwprobe,
 SEN_rmdir,
 SEN_rseq,
 SEN_rt_sigaction,

sys_func.h

diff --git a/sys_func.h b/sys_func.h
index 22cb378..cdb6318 100644
--- a/sys_func.h
+++ b/sys_func.h
@@ -208,6 +208,7 @@
 extern SYS_FUNC(request_key);
 extern SYS_FUNC(restart_syscall);
 extern SYS_FUNC(riscv_flush_icache);
+extern SYS_FUNC(riscv_hwprobe);
 extern SYS_FUNC(rt_sigaction);
 extern SYS_FUNC(rt_sigpending);
 extern SYS_FUNC(rt_sigprocmask);