From patchwork Tue Jan 11 19:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 531155 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3793849imp; Tue, 11 Jan 2022 12:12:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWOIzcxYsfokjfdol3jX2Xk4CSKMgXQDDckXpS7+9TpQWufAsqP0/rpSH6IHKOLN/Upq25 X-Received: by 2002:a25:1483:: with SMTP id 125mr8566546ybu.548.1641931977396; Tue, 11 Jan 2022 12:12:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641931977; cv=none; d=google.com; s=arc-20160816; b=nxpDJsUa+bPZ1+6Md01lOT7viXHDg4q7uKEQcb8m+P9Kauw57SS9LggbRo+i+c8R49 MKWIcPHIF49oeyqt+JueJrBcKmsJfAKlWDC5kuiUmSIVyqueO5XvpVm1ZG7G4chA79It Rn9u3vqPAwBCVLuSHm0k+wTXrTY4PGxWpN2ONiY6guI7RXFI2xs0tSoFyXigqKBGMacl zj3+tOzVss7AXcH61IQ+VI/7C9kACQ6XXIghxvfB0q9UPcizWRK3Qu7CqpE5EcIcbYHE Ftci51oSrkIqJqDHu3zMkevxEzjaonkMIexkV1uKyM3SqsyjNfWlxvJes0+bl5ireLaQ Yujw== 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; bh=82h90smh8L18PHO8SfKf9wuT+9TyefyO1GTXr5ZLbVg=; b=NnlZnO2NDhxA9iDFW0pP7rYLt99Prj1Knj0hxyiM9OMwFl36KEMFFxJLke2qjN4Od/ HDZAlP9TFXNEfqyPYUcNr76oZLAgYRVN9QMCReXwoFQm7ZaKux+oKj6wLUEzax7onP/K ILonOjcrQ2vJuHz/o0hsE9Hj+6zcLT3QN++9Qk/gUBzk0nu+Kf8nys32Oxp+01RBHKi3 9JokLIyX8elUSHyhB7C+8H+nHBm2LHbSPYM0xYOaIGweyZ6U1MbTIRgxq8k+avnAcPHj 5HEZynFhOWZAjV8C7QG2IjH4r+mD2gUvjEw/w2SMqL4tfYGXsd4In09nwI47zd6QiYKG XkdQ== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q1si8255581ybp.228.2022.01.11.12.12.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 12:12:57 -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; 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" Received: from localhost ([::1]:33794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7NVo-0005Xg-RJ for patch@linaro.org; Tue, 11 Jan 2022 15:12:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCb-00082I-88 for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:05 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:38127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCZ-0008HD-Fb for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:04 -0500 Received: from quad ([82.142.23.158]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxmBc-1m9FnG1WtK-00zJDs; Tue, 11 Jan 2022 20:53:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 23/30] linux-user/sparc: Use force_sig_fault Date: Tue, 11 Jan 2022 20:52:40 +0100 Message-Id: <20220111195247.1737641-24-laurent@vivier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220111195247.1737641-1-laurent@vivier.eu> References: <20220111195247.1737641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ygX5BjSRQiIlCvBEMpI8fe/3afRBof4vum2DYpje31DUOmHiwlK EnPSyl7skrAg38WiVq2BzK0naoMffllYRgOefjMJygpiJZ26wKOzSe8sLHjv4nUUDcVz+qe Dszj6neIBbiwEeVQoeOtrNWU+exi0iVCnvdyUKB64nvFDmnBfSxloOCSMrR+8m5hiDCJXIu 0JIcoROe+ljMO262nzaSg== X-UI-Out-Filterresults: notjunk:1;V03:K0:oDZ88V+z/Dc=:Jbgr/6xVwAklUeG9tGlvCY nG/ukMYVSvJx9Ze2/hXMFamjJfFeaWaSFYDnPn0HzoxqUWjSTcXh+HWlOnAO/5GJXL4m4lul5 /oLxTs8L0424ocA4hAvBCntafgRV2FDau4lWyg2nJkqY7FgG3/Qbu7C+Wi41gE1J1kDchwUyU HE8qnVrDsGz6eh3YveQ68T+/zC1UveiV+eZPYwnZ4fo06//i1wLp4bQgUEOEjWshATPuEWL61 BO5Ggooq5B3j8bBi7AzCq+C5PCjtL5In/n51Z0t01STU52mlaxCgSrhZ/hrw5BlBEdXWnoQZ3 tTz0F/0KnShUn0vuighjG0T9tIZLr5F8IcJ1Y83v9CS9+zc4yPaxbmFrWy6FDvyCm5cZui92x 4X8YBpzv//jqTWbej+0ixbhbbv//arGze8pU0hyK8N+bLZqWTEoCi48bu+j3Z9wn2x6CrQFKv O7kg/y2RDJ4FINADSpXbx+cmY3j42Nj+oPiFShsZBPRSlRATxL/iUGpRkxtt+NxOFMNDXCJCR C+RRpUIpU0tJGKq5TxrApvT9I35A56LawMI73eODuL2Mz4k8p6qYNwe8SvXrWs8lj74ymkq/T qz0UkBdMJHHC4biGClp4hzs6+Oao+8GWxDPEtZ2WcCXKQ/6Mz3EtYSZsO+emFI8Q3DgAhMhqy JzY/wmkmL9c9TMzesrjRuqHawyK272Fndi5ykrxmCyDdCgG7zovBftkB5lzscEbCZHxo= Received-SPF: none client-ip=217.72.192.74; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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 , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Message-Id: <20220107213243.212806-24-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- 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 8765ab60205c..baf3d9ae011f 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);