From patchwork Wed Mar 8 13:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 660441 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp329771wrb; Wed, 8 Mar 2023 05:34:14 -0800 (PST) X-Google-Smtp-Source: AK7set/z/JV8f6tHMzzFdiLWSu9wpM5Q9hI2OrnLaCF2DEdyh16AzJkjzWL0iWzHrQFmjptcf/W0 X-Received: by 2002:a05:6214:3014:b0:56b:f308:caab with SMTP id ke20-20020a056214301400b0056bf308caabmr30278621qvb.13.1678282453850; Wed, 08 Mar 2023 05:34:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678282453; cv=none; d=google.com; s=arc-20160816; b=VFWuOm9v4Arwz2MV0UW6G21mVStl4AUpfFqq7w5/lQONMcuyyPskdZ1cOLU6m4DnZo KsEXm5LoxqpVlWg24wlK6l4uI6Y+IbN2EwkMJxdA25THvfYE7Tg5VDr0NCJTVytHJCUr 2p/R1jud69zA/Xbr3aMw1KrRohi7rrHKOxXeGpMN5A4YG4aFTIGbhi97e1mARMqPGNdm IFLzNKXKTFxwFTeeLHX93f5TXYG0JUveg8R2MQUD5+ocsjIod+WSEjxxfyJ9T4p4CcqC 0joALQKKxVpc3agRRJDSVhNdWqwZ6k07/s0J9mfl7vwBHfh9VP2uGQZGs8B1GrhFxeXA txNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=0ZZ+tPgHVSYSmK305rK7KZRTZCmOpPPrDTUrn0qkjcY=; b=c7QGc43+EzBupGF6RomGH+FJuMMUaerhzWJzR3Kb7GKVy9sfBEqvKSUdYZx1bLWZGX XEgiZRPlib+1ssxU+Spjl9QuxZmovry75MJIYAk2fn7IHrBCqgHjVFcVVfea7Ymnls8q TWFezjLY/6zUZT/5C+MpMuhi30YYvwJ7Xc+ZcOH/q3p2Hlw4qASiQ0kP49aq6glvDF90 Dy72t3NGWSzbrh9pEKyBJ2XLvpklnxvF8Y3nqMYuwFD8lNrbaEXjbZz15czwKqBHn3UA tc+sqmDE+0wzBnuXRYSPxiLeNzkORiWs53exIkoM57RI+42W2xa0Q/Z9suG0eJHStKZl ZPSA== 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 s14-20020a0ce30e000000b0056eb1a4165esi11719223qvl.401.2023.03.08.05.34.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Mar 2023 05:34:13 -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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZtuQ-0004oE-CV; Wed, 08 Mar 2023 08:32:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZtrD-0001qi-OC for qemu-devel@nongnu.org; Wed, 08 Mar 2023 08:29:35 -0500 Received: from mout.kundenserver.de ([217.72.192.73]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZtr3-00067b-5v for qemu-devel@nongnu.org; Wed, 08 Mar 2023 08:29:21 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MJn4B-1ppdK23Qb3-00KCjf; Wed, 08 Mar 2023 14:29:12 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier Subject: [PULL 19/28] linux-user/sparc: Handle software breakpoint trap Date: Wed, 8 Mar 2023 14:28:48 +0100 Message-Id: <20230308132857.161793-20-laurent@vivier.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308132857.161793-1-laurent@vivier.eu> References: <20230308132857.161793-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:fjBjZoyqHCNl+BtvDE4YQ1hdwGAVI/hga55gLu4BFzIK1YmjYbu pxWR04QZ3RRbyXWpPtCZC4wzUK7HMfgRTWrhpB/jPhP7jw96OgQAztkMEDCZy8UTkOgdnyQ BFwp632Xm5UrRL9tldhJ1DevggeV8nc7gLdNBSJvkUMQwpwrZ2Gtkm6aNWvAXGaYuhW5oGv h+wk7yXxR5YEWgiuWWqIQ== UI-OutboundReport: notjunk:1;M01:P0:WQIRc56swgY=;hy6jrCoeqyfBxFVSav+JeJ0OnR5 3nywoACUmsrnRink8vj5W6+QT6nrB/CmsiArqk5FRVAERceNtG8OSefpxzx2Lw+l5HXA20+iL PhJ6IG8igfPr8qV9G/8mmQDN7I6dsN5OejLsKzdy4G0AXzW8bsI5Zu5g87JlkTYcuvfL1u0ts Eb+ilfYeOObxVuD+fAzpR+iZruxqpFtyqPyQqk1OVcDT9CNIJEgiYCxexzAGyIDyRfLh0nmJj bEtzKrDw552BD/9+UfAqsxCsp9eluQr8uBjCT4ODiRZ8sqhJ2di0aC0neFs0YNONd/miysxKJ 76gONd3e9iZYr/AgBYcSHwnnRuUOYpAbUknsa8hEWlhDa0UfhPeszzaBVTvg8He95U1hwz1w0 siPfDeWnTGer1DeZoqz+uQCwfElh5gqCCAdULAHd7LUxLhp9Hj/wDXxd7a7BIoCfdOAqIVaDk Bwq3LNccn6hfEcbR8W1ojVe4tL+25RAmqWSDZBLd8BXHV4fvDz8Om6L+r8p6vGSwbwAHEhZeu R0kyTPVylhfjO4gVgEQKR/6/QtNylyYNQZuL/SPOGVU5NfM76xtighxQ0jN2L21Leh7tgVMU5 bH43fJMkHG/1l2yxQ1Da0atJENQXfU+8HpgKjdM6q5C7PcmoiURfbCYgPUKOpxatAORbdj0Dr ChhcnSMzxpxLONifGXnGgN3o4xU1D1OYr+EJt8xldg== Received-SPF: none client-ip=217.72.192.73; 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_H2=-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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson This is 'ta 1' for both v9 and pre-v9. Signed-off-by: Richard Henderson Message-Id: <20230216054516.1267305-8-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/sparc/cpu_loop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index edbc4f3bdcbf..c14eaea16370 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -206,6 +206,11 @@ void cpu_loop (CPUSPARCState *env) env->npc = env->npc + 4; break; + case TT_TRAP + 0x01: /* breakpoint */ + case EXCP_DEBUG: + force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc); + break; + case TT_TRAP + 0x03: /* flush windows */ flush_windows(env); /* next instruction */ @@ -237,9 +242,6 @@ void cpu_loop (CPUSPARCState *env) case TT_ILL_INSN: force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc); break; - case EXCP_DEBUG: - force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc); - break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs); break;