From patchwork Mon Dec 20 21:05:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 526086 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp4457661imb; Mon, 20 Dec 2021 13:17:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjU2lFd8jnvJihRtKMv2jRDvKHSvadUiPSnUS52UKjVQzTMfNIyJWD4ydwE/jInflPHlpm X-Received: by 2002:a05:6e02:1d1b:: with SMTP id i27mr9901789ila.248.1640035060152; Mon, 20 Dec 2021 13:17:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640035060; cv=none; d=google.com; s=arc-20160816; b=KZFaFk02iMvdx6NMaizUfbvxF+DbXmFZItFjRuqNOppFrWYQu8JklKRTiumDeH2wVx n71C2wXvC2dHRqXE1SbzJuKqeiSvG+VQaZj4Ml3ZOACkgBQAjab8b6qJuGcIUd2xzCtE 4V2/aD37OE/y8P3E+y9h21aZCmQTmXM5vyeuR1w5RzFRa9ldzWdIrlBCcCN3Bc8OPap3 x7KHNlfdKZENMMUCWrLslVDTrbn7e0Fg6/iuRqwvvwHHjafEgRPs7S6jg7uP+seippff OQ7rJ3In5Yu3lRnyuRCBOoZau2MgzJaLXH38uh8w/oWeQJi0xy0Y423/pMeTKXz5C1GM 8J5Q== 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=aSGoNpLJmGSYi5bNrETBfs3C1lY0kiG6L8JLO5qLPZk=; b=oU3bckq2ROWtGsNoDzzjp/e2pHoCqxI963aM5cixARlJhDsZDaErCY4bon96ACBLUe vRGIKMoXi8kRXjnAAy65ys1zm2hJA3fx8wU1X66wCWLJs2ILbhloWIURcJKBDpYrltCj I7Nyxwd0YAx2Ps83qz3v30fHuRxIkKoGYeTiaipWWcR1AD0BBLDkkSR4DvxEYEODUKvy RwWvtmv+EOz8rLHe2hMuS7FqFKm5FbkguwW0D/w+MndrjQtCHEZ5KT0j14PY/EjTNSsC R5n6GPM3lN55vRgFC5WorA/gNJzfKZB/2D804ZgfyQcNRlpij5uiHTnVkVTerOhow0ZL o+dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="n7wLEY/7"; 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=fail (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 d5si17405750iow.84.2021.12.20.13.17.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Dec 2021 13:17:40 -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; dkim=fail header.i=@linaro.org header.s=google header.b="n7wLEY/7"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzQ2N-00075T-L7 for patch@linaro.org; Mon, 20 Dec 2021 16:17:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzPr2-0000ow-DM for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:57 -0500 Received: from [2607:f8b0:4864:20::632] (port=39782 helo=mail-pl1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzPr0-0005wn-LP for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:56 -0500 Received: by mail-pl1-x632.google.com with SMTP id z6so9030138plk.6 for ; Mon, 20 Dec 2021 13:05:50 -0800 (PST) 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=aSGoNpLJmGSYi5bNrETBfs3C1lY0kiG6L8JLO5qLPZk=; b=n7wLEY/73s568cM9RrtDPQwjHMyuIZZptCK0zOFXh/gPxMoUkYArncRg6HEfOsuqIa QxJITT1TIAzMwIFNR9cXZ7IHycLoDlTzyvSAinn7XmCj7ObXDTobCQrzooKZrRffa7Sn d8hdH6uqg/XaUbqr3/OFBvFND/WLuqbvKtC/P7iHWRkKtJtz72dLGVgekIqqn8QG5G8j YKHRXqxoVEAIDNdpfSGtQ1fRifBgVHxV5fb4/O2qLUf8kg04IPqKZ0va5zldP29PpfcE vbInF+4YsVx0UmfBUDR4btGWZMM5CSeI/qVgA3Cgj2+s/bxIYaG+xaVHw1e/NHygZL8t F4aA== 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=aSGoNpLJmGSYi5bNrETBfs3C1lY0kiG6L8JLO5qLPZk=; b=4TFryICj5xQxvuCbMx1PkQo6kXjdKdZaGJSO1jVfpSCZPZcY4GYORBZbtTdUfsH7iT a27izFX3wwFUa86OWCmzse/9LhTkKeCSnSva+Iu7xbHgYfWFqtIqfWTc8c/vnxf9AinB 5KoxTytYnHj0AwzMs00so/u22UwgACRZRhIC4f66PHo2SJSxc51dbUHCPk6JUuaR9Y2T d59T9jpDGOODzet8ePlZ6aiJYQhc6IlP6odzmD+jLH2ZXKgoE8v/5Kh5wxrCQp+LfgJ4 XvZN91Qc9154WHjK6G3M/JrtSUVk/LM7L3xfdWNZJyZVf1GU7Ak6R+Xbx2oMTbO+gCz/ hboA== X-Gm-Message-State: AOAM533q+wq86J9ciDxK86LtGDDqRITOUVIxqREkthvbeNRLGh3b5E/r kOsF/cKJ6W1UKsQFd0tmAOVnTnWEvcocHQ== X-Received: by 2002:a17:90b:4a81:: with SMTP id lp1mr7161pjb.19.1640034349826; Mon, 20 Dec 2021 13:05:49 -0800 (PST) Received: from localhost.localdomain ([156.19.246.20]) by smtp.gmail.com with ESMTPSA id d13sm20091021pfu.213.2021.12.20.13.05.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 13:05:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 23/24] linux-user/sparc: Use force_sig_fault Date: Mon, 20 Dec 2021 13:05:27 -0800 Message-Id: <20211220210529.150423-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211220210529.150423-1-richard.henderson@linaro.org> References: <20211220210529.150423-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::632 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 , laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/sparc/cpu_loop.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index 0ba65e431c..b3e44bc1aa 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -155,7 +155,6 @@ void cpu_loop (CPUSPARCState *env) CPUState *cs = env_cpu(env); int trapnr; abi_long ret; - target_siginfo_t info; while (1) { cpu_exec_start(cs); @@ -241,19 +240,10 @@ void cpu_loop (CPUSPARCState *env) /* just indicate that signals should be handled asap */ break; case TT_ILL_INSN: - { - 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_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);