From patchwork Sun Sep 19 01:57:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 514283 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp896709jao; Sat, 18 Sep 2021 19:19:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym0DnQzz0Gb/87dgvD8ipLuBo43MONTF4M4FepWrZfYcqHGA7AR9VgWU4Clj++KtU8gp66 X-Received: by 2002:a25:9847:: with SMTP id k7mr22907110ybo.170.1632017953253; Sat, 18 Sep 2021 19:19:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632017953; cv=none; d=google.com; s=arc-20160816; b=yHRFvLsaJbtUjfzpdQmWj8EkUfFi656oLqPS1nSiPfBPCKGsgew6vVNAeG3fBOx/Vx fTlF6BJoJwRteEyWvJBJtacDj16Ahpx8fG0jDrsel4Np0HO/AilwBLzVWGVpIL5XgE5t bm/5ofohYFpYev9wUSIk5MmM6IMH2+1T2GNF2QPEKeFLFei4usd3AMCCakYJEUtwHok7 gqD4mTm//0L6SVs+OxvokvLSTKvB+a0BGhnZtJBi4n8qd3cuHmCq3f+GdRWKkzJMyCCG kUkdERyXwagy7npdKJoTkS6M7bi82BAGelFyLj1NSOQVXtvt38AVtjAfyM7VtKeHykmG S0TA== 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=56XZ3RwQ/YCK3yV+LJbUGYXQPwjh6Dg9hx9o+/5eyfM=; b=JjMRNaMz60EZNOzeohoOkh9y8FjuPLhrHzW2glC/swktmw/PAZJh/iNEzLsdKQPNEX mHqW8XXWidkCr0vfg3Mtj/Y4EtUczqNqBj0gnEw9sIgnXATv1H4x3OuH8BONxLnbJTvp dPMolgIuUEgfZjjQM7SftEHniEZUqlCfyQn24SVii6F8OwXYPqx2a8NIGvdLyB4if/83 VsKkXO9VUPj+N6l4jCibvP9ZajGh/vt2CrLRMliH/wvOr+iGrTkF1Yud5udGIfewSfSL sHSIT67NAuR/8ijf8qNcpd07aShQhvFuTb6u8xJ3mheqPCdmL4zh3QkQ7JCh1UHsx4Vp D7cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kw3nvOJ2; 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 a3si11302789yba.370.2021.09.18.19.19.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Sep 2021 19:19:13 -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=kw3nvOJ2; 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]:59170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRmQC-0006fh-PC for patch@linaro.org; Sat, 18 Sep 2021 22:19:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRm5P-00045o-Oh for qemu-devel@nongnu.org; Sat, 18 Sep 2021 21:57:43 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:44849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRm5M-0005HO-8n for qemu-devel@nongnu.org; Sat, 18 Sep 2021 21:57:43 -0400 Received: by mail-pf1-x434.google.com with SMTP id b7so12832540pfo.11 for ; Sat, 18 Sep 2021 18:57:39 -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=56XZ3RwQ/YCK3yV+LJbUGYXQPwjh6Dg9hx9o+/5eyfM=; b=kw3nvOJ20zIcHjeFQkjElNoKNm55ipCFPYJ2EY0Yvrjh9Eu9HCjazkoFYABUiwxgKj HrSOGgHBOU26/qcIW22RgajvesEc70M6SYhzxxy/hxsKHX0m0I0NnslY3PqFYkG7lkSq ANEogJjn+YLt84BuZaG/YIt8rigwjuiBF5JxihDacAHk+GG8jP/MvZ9G2qDUqSUSJ+ck iSI86lAXku8SsG/7nNULCMa2kwJyUPpALBvoQYVa4+Xs4v+wxdi4eDy+Q0unI2iVqneP byhjTSaXnxmEdye31vN0Nd8e240K/q9aqXIBNzcd3mf/6quMIjYoruBBdbxYoqqWu7C7 qwHg== 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=56XZ3RwQ/YCK3yV+LJbUGYXQPwjh6Dg9hx9o+/5eyfM=; b=K7biC4T/4c3I2xBrz6bIKG7xwd4HXc/PAa3Z0yFpgSzMaNeWm2jGjJgIVtx1DJJM3K beru7ya80kfvcsbWPzjMOGgIgqpCCbndLbNcUJkNqlc1w1fTfVQ5leLzC37XEm/eYETq h5/tc+Cid4R+XhX3UdHJ6G4cN2x0CX+LnoIBWZ0v4zaj35YJFusKFZspLZ7a70O7U/sK E2dIV3s+Vjag8BqLLbu7b+R0gEoMqg+iNgZGULuEaAgPoK9kCYlxvfnHJGlMpg4pz7j9 nlRrXuLRQ9RnAy33iGTLof+Sxw0Cl7t/AaiSDLowYFrlR+9OsCWkaZ3vT4Z9ZC4SRmtG 9Jyg== X-Gm-Message-State: AOAM530QFfyq2sHBCvSl+x9d61NBF53OHMK3tcYYviAjqAaJRgyyo8k6 GI5ya/kooGvOdXgMTmuefMD1heod3tl4ow== X-Received: by 2002:a62:3287:0:b0:439:bfec:8374 with SMTP id y129-20020a623287000000b00439bfec8374mr18555242pfy.15.1632016659015; Sat, 18 Sep 2021 18:57:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id k14sm6747899pgg.92.2021.09.18.18.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 18:57:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 23/25] linux-user/sh4: Use force_sig_fault Date: Sat, 18 Sep 2021 18:57:16 -0700 Message-Id: <20210919015718.466207-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210919015718.466207-1-richard.henderson@linaro.org> References: <20210919015718.466207-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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. Signed-off-by: Richard Henderson --- linux-user/sh4/cpu_loop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c index 8408d0c42d..3d0dd6d34e 100644 --- a/linux-user/sh4/cpu_loop.c +++ b/linux-user/sh4/cpu_loop.c @@ -21,12 +21,13 @@ #include "qemu-common.h" #include "qemu.h" #include "cpu_loop-common.h" +#include "signal-common.h" + void cpu_loop(CPUSH4State *env) { CPUState *cs = env_cpu(env); int trapnr, ret; - target_siginfo_t info; while (1) { bool arch_interrupt = true; @@ -58,10 +59,7 @@ void cpu_loop(CPUSH4State *env) /* just indicate that signals should be handled asap */ 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);