From patchwork Tue Apr 26 18:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566063 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3834375map; Tue, 26 Apr 2022 11:22:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwti8sTOy3xXWhTGmIBfcz4ybaNoEzmQfPHBhyBr59cZ2k3dTsT7JWUC3YHxYiA+xSMT5QD X-Received: by 2002:a0d:f103:0:b0:2eb:488:f0e1 with SMTP id a3-20020a0df103000000b002eb0488f0e1mr23275970ywf.487.1650997324994; Tue, 26 Apr 2022 11:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650997324; cv=none; d=google.com; s=arc-20160816; b=lTwqln7muybcmN64aTykh3dIoSRbIS+irxIOOmn1/aai2Z65Lr/e/fqyjbjMr8hhJd Zzcrp/eObQuwwsbsh/S4ToXTFlVCQRffhfmKZRBrvqdSErOqcelLLHTFB8L4HbRuNcfI xGDn99Wzjeq3NAo650OnYC+kk4vdtNTA67RxG87MB63q6HUth9KXSpBNxG7iGHiepnxU 2Hb//jo/GbLXR4MvDBlWagnuYrPerXSLCQi8OVArFzMJill1212dkY5BJKnHTq4muxzs Q/M2Z+RK6DYsFPiejf4yAUhoQTz3cGq0LQ2cIXrknobMjgPlpH9FwXNrlbyjX65pk+OB iHcQ== 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=AH+OtSNGl7zWMNDrJP5BB3fDoeV75vOJA2Ehcw/FQ6In6XmPUFgakWpuAUrrv5gBMb crTHrz6jth3u+4YKh/toqFzSKaL1/g+QAOa+SuQVjKMEclya0zPIHWszo2R+rCEa7nS8 uNRUSK0mkH+gXRZBp/zYoW7Sj/ODQQBPvfrMV0vTSYXYDyke3nqiEDCgoccp2w+TH+g1 nwVZBB9CdbS4lTSOQ7RQXqZ6kAJ5dlb8tAZo1eQz5BGU4E6mDs9qXPZncyHGGB2OnFO2 QZbwk+yZORREOesNPRDUx2Itm+Bv2HYQKdO2Xd+glwroCzNXMz+W0yCZMEo0tzVX8SrI 2oqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Tmp/u/OG"; 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 d66-20020a25e645000000b00645732b5571si13194094ybh.77.2022.04.26.11.22.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 11:22:04 -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="Tmp/u/OG"; 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]:48450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njPp6-0005w2-FC for patch@linaro.org; Tue, 26 Apr 2022 14:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njPmX-0002YI-OR for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:26 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:34640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njPmV-0004Lz-A8 for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:25 -0400 Received: by mail-pf1-x42c.google.com with SMTP id a11so7470966pff.1 for ; Tue, 26 Apr 2022 11:19:19 -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=Tmp/u/OGcMCpu5xMjc019OXaLZ88WXwF+9yvUdJun4TxxrAmIypzUUjCdSEMd2CqKk UPxdMkKYB+WuNvC/aKbVPT5XT1ViIBwnMDBi1DRyuYiczKUioy5INWTz9TC/6LITT87i O/23oNcfJLPGMbqXaBKCuFnZPIWBSLYad1rlf0jD5syhYZTSpjR7VxOTgrW3tuRYOLya Ju3xbHcfz8zVtN3YsrAuWTyfQzMG67RNKPM21gqPOcNFyTFaRBIL4Jf3JtgV7vdu6HCb CIAuuZwCexYVW7AWMU5YCxwKHGMigBU00/fV4+SHxLgScn+n70+kZ8i/H7NDAGtj9Isr oxeQ== 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=I/V4qJoPu4nRtzy4RWV7ZOYeNZ63ErXQS6ApUkhwAU2RBUumpwTke6x4Dp9IydfG+j k3bKoR6juQ+d7IxWLC9a441w2Nxbg7wL4xoj6lG1VIBnR4XNgQi+kA1kxjIUroNiqtIQ Y8EiHOt7DDk9JB0LFcXaR3Qsv1xrM+6s8lTdtKOtXyxkenbFfsSdu7KDCL6TsbivK3Hx XOCH1T1uHbM0m/1Hl70zANY+DBgLloNRnwzOaRObs6DbmQNN9VLz/ocICzcE97w5vXEc bCuSUC2yqt2K4v3zNLRlAZ5/lJgSWXgQKOX1KMoY4OrYaCQjQJgvf3Rplz7W4466YcRF xcxw== X-Gm-Message-State: AOAM533vAEkItYMmd5TrNnAVqCUI+fCL59qs8IaDISRE/8mcgYJvowXD nMSdxSShVcQe8TucYv7LBzW+D7GWZ6PGpA== X-Received: by 2002:aa7:83c2:0:b0:505:723f:6ace with SMTP id j2-20020aa783c2000000b00505723f6acemr26064489pfn.86.1650997159068; Tue, 26 Apr 2022 11:19:19 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j7-20020a056a00130700b004b9f7cd94a4sm16482827pfu.56.2022.04.26.11.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:19:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/68] linux-user/nios2: Use force_sig_fault for EXCP_DEBUG Date: Tue, 26 Apr 2022 11:18:11 -0700 Message-Id: <20220426181907.103691-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426181907.103691-1-richard.henderson@linaro.org> References: <20220426181907.103691-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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",