qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Brad Smith" <brad@comstyle.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
	"Alistair Francis" <alistair.francis@wdc.com>
Subject: [PULL 5/7] util/cpuinfo-riscv: Support OpenBSD signal frame
Date: Wed,  3 Jul 2024 10:42:24 -0700	[thread overview]
Message-ID: <20240703174226.2117169-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240703174226.2117169-1-richard.henderson@linaro.org>

Reported-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.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 1236ee5fa4..7dcfbee2ab 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



  parent reply	other threads:[~2024-07-03 17:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-03 17:42 [PULL 0/7] tcg patch queue Richard Henderson
2024-07-03 17:42 ` [PULL 1/7] util/cpuinfo-ppc: Fix building on OpenBSD Richard Henderson
2024-07-03 17:42 ` [PULL 2/7] util/cpuinfo-ppc: Add FreeBSD support Richard Henderson
2024-07-03 17:42 ` [PULL 3/7] util/cpuinfo-aarch64: Add OpenBSD support Richard Henderson
2024-07-03 17:42 ` [PULL 4/7] util/cpuinfo-riscv: Support host/cpuinfo.h for riscv Richard Henderson
2024-07-03 17:42 ` Richard Henderson [this message]
2024-07-03 17:42 ` [PULL 6/7] util/cpuinfo-riscv: Use linux __riscv_hwprobe syscall Richard Henderson
2024-07-03 17:42 ` [PULL 7/7] tcg/optimize: Fix TCG_COND_TST* simplification of setcond2 Richard Henderson
2024-07-03 22:36 ` [PULL 0/7] tcg patch queue 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=20240703174226.2117169-6-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alistair.francis@wdc.com \
    --cc=brad@comstyle.com \
    --cc=dbarboza@ventanamicro.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@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).