From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A394FC30658 for ; Tue, 2 Jul 2024 19:59:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOjeN-0007R1-7x; Tue, 02 Jul 2024 15:58:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOjeL-0007Qf-JM for qemu-devel@nongnu.org; Tue, 02 Jul 2024 15:58:49 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOjeJ-0008JD-Oa for qemu-devel@nongnu.org; Tue, 02 Jul 2024 15:58:49 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-42567ddf099so32446735e9.3 for ; Tue, 02 Jul 2024 12:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719950326; x=1720555126; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=HdfM3AJgLCAm/n1O+Ehmm95l9bagbbT1YMOamZ+0NSQ=; b=I2f+HFeXWey+mxLXIUy9I8v5twKRA3hzEzBw3rquOLYWiODdID7x1ZIk9Jvn4qkjBl OR5cAGbNWzfOHRcWy+c7BShtQpzQPYMNIPmoAmzMu1xATkipmt24TyxYScQluyWHAIzv YxVklYch/4ZBzhInVikLi9OwOC246JZ8dfyRrHlG94nMk/12Ja8qyYPVgfrTlLfHCgTM 49ZLCrGmD9T7wtpKcdISC0MJBSc4NSEE9bIGu+pBa0ZpeeA0tvU6B3B+os3cJbcy+0aU 25jOL3QT3jSewvCzxtCmVlN9t1jy1rULPKguioy4T9ANj9S5iK5cUICKNkut29sERkvN TX9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719950326; x=1720555126; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HdfM3AJgLCAm/n1O+Ehmm95l9bagbbT1YMOamZ+0NSQ=; b=qN/l6Fx6NIJ31K6YROSTQoh6xSJdj7BPpNrtwRxi0GBdCgzLF/UNAFOUHxdcfIrFD3 mjNmbDp+T3r+KQXNbn7TZEe5d+bqJtotnEGCTMjjQziAizZE3QVrT9i6W9icB6y/vLA9 4zeWnIjZaR2+uSGjH5L5m1UPSbjNHsDoLoNFNcu5OgkPHh6n0i7/yYOQNzlaLsu+3eWx 5DGe7p5omZWTXm9QhNsVpkJPkQbs3qlWEz82fHCUF0Jc52BWAe8k6YRTwmlHltQNZS0J tPwThearl6zqMgVY9acokQgMqRFOMQQ35Yaeptrvuvr828uwcx0PNYtRvrf4iKMfc7cn 3QFg== X-Forwarded-Encrypted: i=1; AJvYcCXjp/HARzYBzYr95Bjmjcjcy4tXMq7zpNeHlNjGbOiJhHy4blq3V+nAwe7C8AL8wVVEZQSMG/a95NUuNEuV1lm40JqlzMk= X-Gm-Message-State: AOJu0YxFRk6IKuYarsS/YpnUs/HyWBEYWB+sUGd/JGfnR29HvpIIWiDh z4A8etQy3xVWZFHaHDXA24I5MG7pFVCo5aapIIoEyRsNkhunOew/Lo6K2+LaCRM= X-Google-Smtp-Source: AGHT+IGJpUTBcc0MKIXyR6J0VE89pXsDulSDB8+dvxKkDMOmJT5GeasJ3y3A2neSn/8ePUlLqTXtNQ== X-Received: by 2002:adf:f5c4:0:b0:365:ebb6:35e4 with SMTP id ffacd0b85a97d-367756a836amr7137150f8f.23.1719950326127; Tue, 02 Jul 2024 12:58:46 -0700 (PDT) Received: from [192.168.69.100] ([176.187.220.97]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-425787f37casm76802355e9.1.2024.07.02.12.58.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Jul 2024 12:58:45 -0700 (PDT) Message-ID: Date: Tue, 2 Jul 2024 21:58:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] util/cpuinfo-riscv: Support OpenBSD signal frame To: Richard Henderson , qemu-devel@nongnu.org Cc: brad@comstyle.com, Alistair.Francis@wdc.com, palmer@dabbelt.com, qemu-riscv@nongnu.org References: <20240627180350.128575-1-richard.henderson@linaro.org> <20240627180350.128575-3-richard.henderson@linaro.org> Content-Language: en-US From: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= In-Reply-To: <20240627180350.128575-3-richard.henderson@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 27/6/24 20:03, Richard Henderson wrote: > Reported-by: Brad Smith > Signed-off-by: Richard Henderson > --- > 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; To the best of my non-existent OpenBSD knowledge reviewing corresponding https://github.com/openbsd/src/blob/master/sys/arch/riscv64/riscv64/sig_machdep.c, Reviewed-by: Philippe Mathieu-Daudé > +#else > +# error Unsupported OS > +#endif > > got_sigill = 1; > }