From patchwork Tue Jan 11 19:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 531144 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3784895imp; Tue, 11 Jan 2022 12:01:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUzM39xWKiV2nVta5vqRCiPgXYtAvIK5oaYRPRF7ZxX2zYMmsHhXLVfFuwukXqLt4IUZBF X-Received: by 2002:ac8:4142:: with SMTP id e2mr5036739qtm.603.1641931269791; Tue, 11 Jan 2022 12:01:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641931269; cv=none; d=google.com; s=arc-20160816; b=F3hpL/yhDHZ8e4o8Khr2xJQhj88ExroTm/w3+ox2hDQy+zFrcGLlvKvizxkdwjIgGL tU6sh5L5wcXfYOpVz9mPNSmSFOvoAI7Rtl0t7M++ZPqBZBcaI1drz9opamHIvRcXLYQR BzuIGorGTfUheckb8OSGMWe8T0uYhZQBKxWPX8rK4Q8HKRzcJJkBat4CkQuaj2DW+kie Bix92tIYuzQMTvI4UUJa1dEPbul9A3P+HJRFsGChCKOmFHVlvV9rKJ4oRuzwLGr/dVoz gVoyEdg/GQVCY20uI0TGrHjQqlG+solfxOJ+gh3c8+iWjcJu23+PlXKoezAnHXcB2R9v kgFw== 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=rTxlw7pqzvjbZzGAFjgCa3iY4ZsXh7yX4Rgy6Piftvg=; b=pAbwkv3oUyLzWpG29pHtt03uCGNEVBJkdxsQqmi/fcS+memtWHEM15TlVDCI5XMKkS GkrTdHGx0UpCC9nHee2viZm7N8gHQoo8Jl0fCC6cj4IH9r3ooqYbSc4zO9BRJSZUFcDZ G10vapl9D3vo11Y8mqvXF+6z+BOXXdwLZ5pS+zs7mIAD8tSqefbvdKupA9Opi210t75Q 7iEH4GnnJJWZXGprwC8f8EQq++7prpqL0Eudm79BFaQEGkQAlz9CaTnx6zaAkmtzawrp KBqIissgwSDyjRuHjt64dVRJ7nLK7x3a3ZpTQzxrFRgNWK9Xt5oLy1J7KdWMQeayVrNw urTA== 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 y3si1473989ybq.823.2022.01.11.12.01.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 12:01:09 -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]:36214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7NKO-0004E5-Qs for patch@linaro.org; Tue, 11 Jan 2022 15:01:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCQ-0007ib-MT for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:52:54 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:33723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCO-0008E1-LA for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:52:54 -0500 Received: from quad ([82.142.23.158]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N64FC-1mIYw60qsK-016Rin; Tue, 11 Jan 2022 20:52:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/30] linux-user/cris: Use force_sig_fault Date: Tue, 11 Jan 2022 20:52:21 +0100 Message-Id: <20220111195247.1737641-5-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:zqtwRw+ig3JKJVHP9PCTZrVb6v55lA8kSHVK1gRfKq84IuG4imq /9jxzDi0yFL1tlLhYnolVnFQZAFFGThp+a6x1WhC7kxm1RBryPpYpDp0c3a0Qq+T8mbbUav s/E/CP8SpBqT/WnTxfGuH1Vlyhec05nBRT7RI0RsFuO3YtrYv2c6lO72SX7o0sHzhjlvWMs nZgexZztaQiSdPjXjb3bw== X-UI-Out-Filterresults: notjunk:1;V03:K0:GkQKE3HP49M=:6UL42okBykWQhIv2IdlTEf 34OPeRndZTAPm0kM4dJYacFKuGaTOiiq2Qllccv1ZZkvqJiDmJHuds9GO8Xo2WyGhqqxvmOFA yESzM3BjVaLdkiah5w36F4zmqXcWi7ZA5S9ePXG5DvMX2AE1RGJS9ybdsQJsLoCtqfJwB9kDW 7pVDzBp+UWRCCgiMljSNMfXtDl0xzqEZkryJF3JlRw5wu9LSm5BVNpsqqkE+miLi9cUbNeJe8 X3TTgTfkBm7QMIsVZrZ7GcOhaXfvyN6TaRBWZ1Q4BUNtz3oz7K886UXlA/STu56TP0tI6WqsS Yi4WD8B31I+BUbbfZ1l2qUXMOXzhje8aTdeYOz7fmer9L9ey91txyhgWGhPVN++jNgSGL8kRx N42YicW4W9S+osKXB9bDm0Ns0vPR9G/973zx7Je4hqEBV6w9HaXOSJp7lJOMpVzSfZqLzKoNA z/nkb+657cIA/pAH60TKgp6gCBvNjTMUJNtRmzbTVtfjTzSv6oR6TysOA9rMrMvC007iVyU++ nsmnFzRDGLFG04bPyhQ6TEUqZljaapmwiTGWX+NdI5Eu3QWXoET+0OYM489uNwGtIhUZpxkCx LZ+RnNj0dKoR3aQoZYYdgdoZNXyzhWld3fvh1B2bRk+U6F5T0pYVlfFMUyELMNjvq5tBaxvap Pz47f4LqMMcNAqdhCOCBWv/6XHcFxhv116UsE+L2ZpNH4eGWGXwKiAMOR7R/ibbGJctE= Received-SPF: none client-ip=217.72.192.75; 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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-5-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/cris/cpu_loop.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c index 5213aebf5549..0f46b3c1a87a 100644 --- a/linux-user/cris/cpu_loop.c +++ b/linux-user/cris/cpu_loop.c @@ -28,8 +28,7 @@ void cpu_loop(CPUCRISState *env) { CPUState *cs = env_cpu(env); int trapnr, ret; - target_siginfo_t info; - + while (1) { cpu_exec_start(cs); trapnr = cpu_exec(cs); @@ -38,8 +37,8 @@ void cpu_loop(CPUCRISState *env) switch (trapnr) { case EXCP_INTERRUPT: - /* just indicate that signals should be handled asap */ - break; + /* just indicate that signals should be handled asap */ + break; case EXCP_BREAK: ret = do_syscall(env, env->regs[9], @@ -57,10 +56,7 @@ void cpu_loop(CPUCRISState *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->pc); break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs);