sim: callback: add a kill interface
This will make it easier to emulate the syscall. If the kill target
is the sim itself, don't do anything. This forces the higher layers
to make a decision as to how to handle this event: like halting the
overall engine process.
diff --git a/include/sim/ChangeLog b/include/sim/ChangeLog
index b98631b..3faea58 100644
--- a/include/sim/ChangeLog
+++ b/include/sim/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-23 Mike Frysinger <vapier@gentoo.org>
+
+ * sim/callback.h (struct host_callback_struct): Add kill.
+
2021-06-22 Mike Frysinger <vapier@gentoo.org>
* sim/callback.h (struct host_callback_struct): Add getpid.
diff --git a/include/sim/callback.h b/include/sim/callback.h
index a6c536b..8d61ebb8 100644
--- a/include/sim/callback.h
+++ b/include/sim/callback.h
@@ -92,6 +92,7 @@
int (*ftruncate) (host_callback *, int, int64_t);
int (*truncate) (host_callback *, const char *, int64_t);
int (*getpid) (host_callback *);
+ int (*kill) (host_callback *, int, int);
int (*pipe) (host_callback *, int *);
/* Called by the framework when a read call has emptied a pipe buffer. */
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index bb1a967..c32e747 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,11 @@
2021-06-23 Mike Frysinger <vapier@gentoo.org>
+ * callback.c (os_kill): New function.
+ (default_callback): Add os_kill.
+ * syscall.c (cb_syscall): Handle CB_SYS_kill.
+
+2021-06-23 Mike Frysinger <vapier@gentoo.org>
+
* Make-common.in (srcdir): Change to abs_srcdir.
2021-06-22 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/common/callback.c b/sim/common/callback.c
index 06d76b4..c0ace6e 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -570,6 +570,16 @@
}
static int
+os_kill (host_callback *p, int pid, int signum)
+{
+ int result;
+
+ result = kill (pid, signum);
+ p->last_errno = errno;
+ return result;
+}
+
+static int
os_pipe (host_callback *p, int *filedes)
{
int i;
@@ -752,6 +762,7 @@
os_truncate,
os_getpid,
+ os_kill,
os_pipe,
os_pipe_empty,
diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index 7ef34b9..6efddcf 100644
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -583,6 +583,24 @@
result = (*cb->getpid) (cb);
break;
+ case CB_SYS_kill:
+ /* If killing self, leave it to the caller to process so it can send the
+ signal to the engine. */
+ if (sc->arg1 == (*cb->getpid) (cb))
+ {
+ result = -1;
+ errcode = ENOSYS;
+ }
+ else
+ {
+ int signum = cb_target_to_host_signal (cb, sc->arg2);
+
+ result = (*cb->kill) (cb, sc->arg1, signum);
+ cb->last_errno = errno;
+ goto ErrorFinish;
+ }
+ break;
+
case CB_SYS_time :
{
/* FIXME: May wish to change CB_SYS_time to something else.
