From patchwork Tue Jan 11 19:52:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 531152 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3790907imp; Tue, 11 Jan 2022 12:08:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIDbUw7sUs+fjggb6MhpewFTFI8bdkDVlCE9cWIn12XxMc5YBDZfKjp9QwMEz5ZbUB+c83 X-Received: by 2002:a25:1082:: with SMTP id 124mr8169146ybq.530.1641931721613; Tue, 11 Jan 2022 12:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641931721; cv=none; d=google.com; s=arc-20160816; b=Al6Xp/kTIbCLkvOau/FxPqhrQVxIG2aiNyLpwPPydJDBwAZSZfGTarSQ32VrwUXLcv HprE2IRDdRpxS1iRomEPzNbeW0YoXfoW3/LR76EuPPne4LNqdXU68fyojVE5OfbrFF2U Tv4Y5/aUGSEqLJCyX6a9KA57lHfmO5WJshxPnvtZ05JLYXtSxmPswReRQtR4PIhNvNd1 5w/TIZfgroNeGLaqPrZYdYusHwfpYn0tYHYxGTm0aowyNIp01MwMryTMf8SMWdJiK3nY 3/pVGugGW6/Ykfbbcjzks48vk9qMc6U9Y09ezy91kHvLbHg9/eRSiim0JR1dYQauwMDr Q+EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=Z849zir6geY2ICot8epPuzwtuBAvKNKy7PzqMl4QRaI=; b=mAuvzxf5dzmA9sF1xeZ184Y3voQwHhb/+qp0xagOMY6/n8braaY9iQJ3BVm5zXhIDj uM8JpbPDIw6lyfGMT18267Qpy4FGudAQ1CewHPUBS1Gj71sqSizGCMAmTtIGMK+dpudG JvufP0S1QpD3sjxrpQEHlr/dqVJ21NwkrPar0f3KJgUG3hLiS0dRyzc2u5MDoKNHQdwa ct6aCJxzAL1MGKpG1hQ/z0I8tlR/lh4g/UlIU/KUMJp2vE7MNpCe826NHX7om3UV4X+F beqoEbuBJMv8kLsN2wsmRciS5IC2zxkzwIfkbBK9fo1J7C7xBKlApbFda7dJ19ZNC5pB 3h5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u17si9619950ybj.113.2022.01.11.12.08.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 12:08:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:53570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7NRh-00084A-2S for patch@linaro.org; Tue, 11 Jan 2022 15:08:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCX-0007tu-5d for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:01 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:57511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCV-0008GU-Cy for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:00 -0500 Received: from quad ([82.142.23.158]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M6m1g-1n0FvC3iEY-008GJf; Tue, 11 Jan 2022 20:52:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 18/30] linux-user/openrisc: Use force_sig_fault Date: Tue, 11 Jan 2022 20:52:35 +0100 Message-Id: <20220111195247.1737641-19-laurent@vivier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220111195247.1737641-1-laurent@vivier.eu> References: <20220111195247.1737641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:cdvF8q/Jys4QuCzSI6kxTZvivKO55tbItbk0cs+UTZUxUrCYBMY gPIp/QWd2Ia4MSKeKEbHDtpLAF3tI66Jk0P/Ystp3n7GxURfxZNup/psLzzB3GR9pwDHbPU z0tLg8gyRzN0oj3zFpciOZ015/7xYTRj1ynP39+xZ9q+mFiTnm0njPgRLQkZ5Fp2QHWXwqt eh6U+WDO/gB4WPWCn9j6g== X-UI-Out-Filterresults: notjunk:1;V03:K0:bQrn4owSXOQ=:+3gU/wK5GkGlYyMUkgQbg7 3mPAe1kBmKWYo55VVezMEPDVgr7PkyroZHFTNjG5DwzfWz4j7MzfPRxfXh6cLOYFXn603tRMS P6rOmxQ3LfzhVdTh3Z+QKIqVWKg+LhUusgBNo9vVkU+Ypm8tW7uqm3kQlYqMDA6DueoUYfgij lSc1t7ugGu6/+o3+X5HT6FO6kKD8V9e5dVPcFDViWAjqyaHihwi5UGgeMDDRDr8hs3YezmVzZ iig8Yn2Wxmf3IYC/ynj3Za8xboz44Ru5l79/vDu8NlezxvdmHFdKo5R57uLqgafi2Aa5hMUqA j+BchySYOkLJ+oXkS3WSYTx03GNFY1J6dvn6FnH/l41Whtct0TpRpOYtrj9NSnroQWVZjyTBD 07tfumD8K+cHfw1nGCOAInXi90XSLLFVbZdTdMOOlziQvpOVlKKkpT8kekGzgI6jdlkjSK7vo 3fbIoKmeTuCIz+2gDovxjDDoprIbWwTOkHA51eRpePrvCREQZaYm5uC+eB8jMVSsPla0RPMsc cOh8IS3jCYIcytHSPHBuS9hlAxEUSbaaHrh1yC9W+1mcdWg3nZC2hAE0KbydYRaosvykB7e+7 Sf3H/WcGCCrA0IBavuUUhPAw0qdhxOh+576OZqqvC9NhRWJbjJWOqT/c4EboKUAyxu4t8y0+E dM7NCHham5Wv+NWg3O2fX/fIccUcVXtkz/Lxtybyi548phfjqipnzxSaWAoYZOQFi5Kk= Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: Stafford Horne , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Use the new function instead of setting up a target_siginfo_t and calling queue_signal. Fill in the missing PC for SIGTRAP. Reviewed-by: Stafford Horne Signed-off-by: Richard Henderson Message-Id: <20220107213243.212806-19-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/openrisc/cpu_loop.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c index 592901a68b73..7683bea0649e 100644 --- a/linux-user/openrisc/cpu_loop.c +++ b/linux-user/openrisc/cpu_loop.c @@ -29,7 +29,6 @@ void cpu_loop(CPUOpenRISCState *env) CPUState *cs = env_cpu(env); int trapnr; abi_long ret; - target_siginfo_t info; for (;;) { cpu_exec_start(cs); @@ -55,27 +54,16 @@ void cpu_loop(CPUOpenRISCState *env) } break; case EXCP_ALIGN: - info.si_signo = TARGET_SIGBUS; - info.si_errno = 0; - info.si_code = TARGET_BUS_ADRALN; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, env->eear); break; case EXCP_ILLEGAL: - info.si_signo = TARGET_SIGILL; - info.si_errno = 0; - info.si_code = TARGET_ILL_ILLOPC; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc); break; case EXCP_INTERRUPT: /* We processed the pending cpu work above. */ break; case EXCP_DEBUG: - info.si_signo = TARGET_SIGTRAP; - info.si_errno = 0; - info.si_code = TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc); break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs);