From patchwork Wed Nov 3 14:08:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516753 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp709664iml; Wed, 3 Nov 2021 07:22:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiq+Cn/qyKIFgXdO3Qms0a4Dg53VIJJqxgvrV2Elva5uuvlwj57Mc2WZFeKYdHzx+oKJWK X-Received: by 2002:a9d:2247:: with SMTP id o65mr33221828ota.265.1635949356067; Wed, 03 Nov 2021 07:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635949356; cv=none; d=google.com; s=arc-20160816; b=MGO4en2diyjWGLOPQTfRujNvETfHTnDd24lqZwcsOVTryxnihRkJo80zUJVLbIuADx XPGFVus4p34cc5I9CLkxNiWw0hgOCwxg6bKEwGJHufDnLeessA1tD1NE2/uy0wJ8nihY aOP7JyeQNi7wLcHxj/fDp8nUunJEGLUIh4/RK9ZEI5MAfSEMalhFBoZ17tEvidKfdXZl qAKn43KeALLsfEsegAci+j8h+R6EHbMIFPbtSZ+Z3FgfyV2hjPM4XsUNdvllccsD1NnW EzS/wVVh0qGnyy/D7AdFq0VVbbOUlFH9zGApJEaIkjBEKFbwMyt7yh0eSRpH1rRYFeGp rZMA== 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=iWaf/hTEOaE+FcWR/0UYD6LtsFkbYU+QC3bnYVqhNsSXRLG1OaDliczB/9gaRb8yFt Mb/cVjGi0n8BNE17bgjYzto0pmfegIwvr9ROFwh1Kc/pVhfjTVwm1ppgqEDMHs7kVQQP 4MD3YyIQuVq1a41LCYvAxWYbcfnilzXQXIfLhMia7ao6hg3xJddgNuebolecGYjoLLmx H2mGLOZPuXQYaUQUnYB7k3S0C37ybYZhBVijjyf0MClpnlVaPz5U5Vq/tYb2lAhrCStd kL2JFLxcOYCymNLDpv8HGwKx+45sFonOnsVg57vMYv5oshyqYPhxu37eAYIkVzRVGm/n Wsgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wqd4CS5X; 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 o14si4324011oik.119.2021.11.03.07.22.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Nov 2021 07:22:36 -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=fail header.i=@linaro.org header.s=google header.b=Wqd4CS5X; 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]:39384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miH9v-0008BZ-Fu for patch@linaro.org; Wed, 03 Nov 2021 10:22:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miGx4-0003NG-4b for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:09:18 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:43961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miGx1-0005Lb-Ug for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:09:17 -0400 Received: by mail-qk1-x72b.google.com with SMTP id bp7so2345046qkb.10 for ; Wed, 03 Nov 2021 07:09:14 -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=aSGoNpLJmGSYi5bNrETBfs3C1lY0kiG6L8JLO5qLPZk=; b=Wqd4CS5XGxU3NVIgsYd88Auk4RqpxUhlmGbeuszjR7kGKz0IxEdCJIWTmeGGDx832m MO6qpxCnRpEGcok0+FYdIh0UnPHkH47VOJmFXlrukDxTCT1lUdHmWVTkctU16rSSFdw6 YFK/mrhjUxkHsymHSY9N0pI5e8GvER65+PmVHY62pT3d4qYwTs/B5I8Wb4jhfLbHFCS1 a/mXXnYwUXdmH39oRiZzUWJJOnTluxInY7hR8TRY8+3OndH6nKhRfVy7bVu65OxE1mPg OwE/KVc4qr/fKU2sAGYtho6mlKucnFOj0oXgH9p/JDZBiP0dlM9g3uIcannMbv5Wth9O P3Fw== 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=BesMvOFz7dVw4WClpaqtPR+CdPNG1an7kLLGUNIor9hteCX0VQH6JoKbqvGS2+5Eew 8Ux+3AWA5KaIW/OotbxcW1RJcoSY/YNn8gh/lWBLscJa7LGnvZeWnUJgrbbI66O/u50t AWzEnhinDI9TZ2/RROrAIbpq223kBL4HzKjS3B/9I+3jAmv6Yp8DE/IZi+B8Et+Z1SM9 V8RTue0eYvqDS0iShBGsHJQeS5Lo7FJPTN9wBj6NfV0hdrska9Mw7YEX0kqy0AL4x72e kmXYy6resurDupmNLSeNf0gtu/w8Onn+x8NA7PaLr3+pdaEF5Zl4DDRvZjMsz6joV1lN CLKQ== X-Gm-Message-State: AOAM533nZk941TSolZzNfowDD2yIlXhOgCkoMrpxqlgN3T9DPHTDMFOW lFbQF0QVUrk0/hQvvv7vfvyNWjmnpRN1Iw== X-Received: by 2002:a05:620a:4588:: with SMTP id bp8mr28073316qkb.292.1635948543552; Wed, 03 Nov 2021 07:09:03 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id z5sm1669377qtw.71.2021.11.03.07.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 07:09:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 22/23] linux-user/sparc: Use force_sig_fault Date: Wed, 3 Nov 2021 10:08:46 -0400 Message-Id: <20211103140847.454070-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103140847.454070-1-richard.henderson@linaro.org> References: <20211103140847.454070-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72b; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72b.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: , Cc: peter.maydell@linaro.org, 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(-) -- 2.25.1 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);