From patchwork Fri Apr 22 16:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564841 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp657928map; Fri, 22 Apr 2022 09:57:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv9q7pmgdu4RAHHZT8UCtms2NtcXwI7RoFVMR0lwQH1z3ljx/Q5FexvAjuz05Zy5tdD5F4 X-Received: by 2002:a05:622a:6206:b0:2f1:e40e:41b3 with SMTP id hj6-20020a05622a620600b002f1e40e41b3mr3984663qtb.196.1650646674384; Fri, 22 Apr 2022 09:57:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650646674; cv=none; d=google.com; s=arc-20160816; b=igJfc0Vg8/iRaRkJJi1ve2gsqTJZq7lauJMQ2TtNB3RQJHvYB+HJIune3CIpMdNuES /9LRiRw1nDzlpGhq4Xv4tTPM/uTAPf0FSz0a6MaIRwSsJj6LAGrcgBwRa2PQBsdNVEqq SFSA8bVSB5HnEqnzh9tWBsqqFsHhdL+bw+mqNZTkcL84vRIwZdGFogxRcCLfmyubhW0r JwL4oqutelQIhPnGxm2z2/hC8NDEqBYL+oT9TNyKEl1iS2Z4WBRPBnquaNoPoqa84x3B Vk8Ns8lIwgY1NAtZQ1CQk309X5R3qpwtlCdRTa9mZV0C+XAJaDI5Iqo+1SxvapXsMJhl 0uYA== 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 :dkim-signature; bh=RtRmXlsOxeVOyDOQBenqjq06keYpCIdFa3N3ui9g9FQ=; b=ZNy4X87hrbnB3hJNr8CUjOGsYjWnjAzD6WW4dDl1OunZz7UjpCa2zAoxmY0I71wHZc QPrgJfF/qcQjq8j+rA2LIxEQ9XXJlMhkh31q/knKbBZMat30Fm6jh78epCdKRiH88BOl z89/DNq5xNd6/sFMBGa/xaLhh9p3vYp+wNG/QxTmuWw8cjCeTFHPnqr7h6rdPnX4b/3y +rK8cIGWwv/vmzwpiSl4JOtbPhdwaW6v+fZTUlXCFKFnM8XqFKCgeHbllXDRzNrMDu6E d3tFdGVAi/pvr1b9+HMiwUlq1iUrbwAbQ7b8JdpOBCf029iZv8+wSSd+7uxuPWmcbrwx lrhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CDpliTbH; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a28-20020ac8611c000000b002ed0bdb8319si2175133qtm.764.2022.04.22.09.57.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 09:57:54 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=CDpliTbH; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhwbR-0006qB-N1 for patch@linaro.org; Fri, 22 Apr 2022 12:57:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhwWo-0000lC-Uz for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:53:07 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:36628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhwWl-0007FT-Ak for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:53:04 -0400 Received: by mail-pl1-x62c.google.com with SMTP id q3so12117299plg.3 for ; Fri, 22 Apr 2022 09:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RtRmXlsOxeVOyDOQBenqjq06keYpCIdFa3N3ui9g9FQ=; b=CDpliTbHxgW5H294WbMl5Si0tVpg4Nbyni/Q8XF9PMRIGKV/rfUUXlGNS2mXEYjP5R 31S6gp7FAGYm0cQplo12DjJoInZ8rpkJDpT1t7IzhMidrbJUInpugcZrX6iqnBa4LbeC YSGewge7YC68GkH7mwtLBn0tEo6y+LKbOB7nFWBLnp1K46LJAjhR0OZPHcDc+rv/z/Wp 0i1egB1WvhS7Ge843WN3OAVfwDkb7LprDo+21rFhTpQ6/QJrMRrg6heI9uxUz5Io9XyM pcnbsPSrfBmv+FU1eHj+4ZytBWhN0j+h2Gm8vj9qpRpTnu1hFdWPJZtTYxaP45rEO+7S ykmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RtRmXlsOxeVOyDOQBenqjq06keYpCIdFa3N3ui9g9FQ=; b=M6NKT+jeWWSCc0aUiWQ4Brrs21dGFfHa0jB4KhpRTHYO2srvNBXKMwEHKuOU78utBM 3K1pS+93jYGyXRfSVkIv2E9dM820sPz3iF9q/x1804lgnpb/Mn0WTUi5MnFAr1vAVDF+ bXZOdP878F+PtoP9jBisd+8fYgXWFqrvI5kXWm5wfeFcmS3kpuAJlllIT54FhXF7EoEr Y+Xd2GquE3NCXzj+85FSTU3UgQGj9Ny7n9lVjVIxbFUNUOu2H2/UZX+/V8Tf5w6F7Ot3 Nrr93PSH4y7Pgfg5pVhXcUl9QH5IpYzv4TNxv1OEvQ5dCnj44r3T1Av8m/LeTWkFJwmf cS7g== X-Gm-Message-State: AOAM530JuXp1lDKBxxQvmXXaWh+2EzovaVWitk2hAh+9hZeh47HCfTFl Bbepxc7A1yc1bZqvECbd/DL98KbQUUdKuTUe X-Received: by 2002:a17:903:2c1:b0:158:f9d0:839c with SMTP id s1-20020a17090302c100b00158f9d0839cmr5561800plk.118.1650646382058; Fri, 22 Apr 2022 09:53:02 -0700 (PDT) Received: from stoup.. ([2607:fb90:27d0:b0f2:934d:3e2:9f8c:dd1]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a030600b001cd4989ff5fsm6835904pje.38.2022.04.22.09.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 09:53:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v8 12/68] linux-user/nios2: Use force_sig_fault for EXCP_DEBUG Date: Fri, 22 Apr 2022 09:51:42 -0700 Message-Id: <20220422165238.1971496-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220422165238.1971496-1-richard.henderson@linaro.org> References: <20220422165238.1971496-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use the simpler signal interface, which forces us to supply the missing PC value to si_addr. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20220421151735.31996-13-richard.henderson@linaro.org> --- linux-user/nios2/cpu_loop.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index f37850fe81..e725036628 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -26,7 +26,6 @@ void cpu_loop(CPUNios2State *env) { CPUState *cs = env_cpu(env); - target_siginfo_t info; int trapnr, ret; for (;;) { @@ -121,10 +120,7 @@ void cpu_loop(CPUNios2State *env) 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->regs[R_PC]); break; default: EXCP_DUMP(env, "\nqemu: unhandled CPU exception %#x - aborting\n",