From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: brad@comstyle.com, Alistair.Francis@wdc.com, palmer@dabbelt.com,
qemu-riscv@nongnu.org
Subject: [PATCH 2/3] util/cpuinfo-riscv: Support OpenBSD signal frame
Date: Thu, 27 Jun 2024 11:03:49 -0700 [thread overview]
Message-ID: <20240627180350.128575-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240627180350.128575-1-richard.henderson@linaro.org>
Reported-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/cpuinfo-riscv.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
index 6b97100620..abf799794f 100644
--- a/util/cpuinfo-riscv.c
+++ b/util/cpuinfo-riscv.c
@@ -13,7 +13,14 @@ static void sigill_handler(int signo, siginfo_t *si, void *data)
{
/* Skip the faulty instruction */
ucontext_t *uc = (ucontext_t *)data;
+
+#ifdef __linux__
uc->uc_mcontext.__gregs[REG_PC] += 4;
+#elif defined(__OpenBSD__)
+ uc->sc_sepc += 4;
+#else
+# error Unsupported OS
+#endif
got_sigill = 1;
}
--
2.34.1
next prev parent reply other threads:[~2024-06-27 18:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 18:03 [PATCH 0/3] util: Add cpuinfo support for riscv Richard Henderson
2024-06-27 18:03 ` [PATCH 1/3] util/cpuinfo-riscv: Support host/cpuinfo.h " Richard Henderson
2024-07-02 19:55 ` Philippe Mathieu-Daudé
2024-07-02 23:04 ` Richard Henderson
2024-07-03 7:32 ` Philippe Mathieu-Daudé
2024-07-02 22:17 ` Daniel Henrique Barboza
2024-07-02 23:56 ` Alistair Francis
2024-07-03 8:46 ` LIU Zhiwei
2024-06-27 18:03 ` Richard Henderson [this message]
2024-07-02 19:58 ` [PATCH 2/3] util/cpuinfo-riscv: Support OpenBSD signal frame Philippe Mathieu-Daudé
2024-07-02 22:16 ` Daniel Henrique Barboza
2024-07-02 23:56 ` Alistair Francis
2024-06-27 18:03 ` [PATCH 3/3] util/cpuinfo-riscv: Use linux __riscv_hwprobe syscall Richard Henderson
2024-07-02 22:15 ` Daniel Henrique Barboza
2024-07-02 23:08 ` Richard Henderson
2024-07-02 23:58 ` Alistair Francis
2024-07-02 16:26 ` [PATCH 0/3] util: Add cpuinfo support for riscv Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240627180350.128575-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=Alistair.Francis@wdc.com \
--cc=brad@comstyle.com \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).