From patchwork Thu Feb 2 00:51:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 649636 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp609438pva; Wed, 1 Feb 2023 16:53:27 -0800 (PST) X-Google-Smtp-Source: AK7set9ISQiR1Qef5E3HLhdbaeMyc2cAIqYp3HHwQmIKM6RdiML/LPUXwjnGBwQ4y/gyMd8Gn2Us X-Received: by 2002:a05:622a:413:b0:3b8:6ae9:b10d with SMTP id n19-20020a05622a041300b003b86ae9b10dmr8545581qtx.2.1675299207669; Wed, 01 Feb 2023 16:53:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675299207; cv=none; d=google.com; s=arc-20160816; b=bUlWJYUUlPBD/3Tm2/Pn4dQWDxr9bIKKerBwARt9vXwc8poDLDCp2irwV6VW4HQA3T fzgm5bwjkmZPLcw9gchicKRpxCG3oe+lrkeEVdesXFsq2VC0yO2/ExAnXHKn/wx/v2dP wb5SZvSJgv+o8CbmcTn4uBtZttvDph4fYpuNcvygh7+3KhBFjiwrlMqRvmLqdt0Blby8 aSfShZ6tKVvgUl4Qo3lDuk47CXpkcUmQSAbBK4/hjfR1KrLrMnT3TMSMzqyTLAnF1hg9 dlCmC+YG1WlGIqJIaX35oPdKjp9BDqi2Zdh251qAA+9XbsQfeH5jYNKSeMqKitR9tS60 a3qw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OkmjatRg9OxEuhuzHdWmE9IfcduIdOzoC0jbgvrF6fo=; b=VYNXe7Qulkn8jmWyLmRqRjsDSxkx9QrJzk7MgNSPfAj0lL15hg88ojPGfbG3tSpacb ESn/kfTuClgTCwr47so9cR9qxRb0iqnQPPRUNQBzk1O8TsUcRwWFm8Gwj9vdBpoP2L9b uuKgqB9PLyWpFR/ejx5yKp0U2Y4aW3xaCTHSRQnW4BDXxhuMoUZpAZ4cIxTkEcHposyb Lrs5W9fjiF8EtLQOqciYh1K6qt1Br34Afvob0ONTROK+E0eNvNvwjEEkR629hHKz/eNj Lmp2wkLTH2kjUdqKWfQGvGE0YRO42leZ/mWqY1ImnEB7DhwD2pzXS1VoVzzX7/kFP9RS wf4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g5tcX4sa; 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 q8-20020a05622a04c800b003ab73b7bb06si10524566qtx.488.2023.02.01.16.53.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Feb 2023 16:53:27 -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; dkim=pass header.i=@linaro.org header.s=google header.b=g5tcX4sa; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNNpu-00060u-OG; Wed, 01 Feb 2023 19:52:22 -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 1pNNpt-00060l-HJ for qemu-devel@nongnu.org; Wed, 01 Feb 2023 19:52:21 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNNps-0000Pm-0u for qemu-devel@nongnu.org; Wed, 01 Feb 2023 19:52:21 -0500 Received: by mail-pl1-x62b.google.com with SMTP id k13so334741plg.0 for ; Wed, 01 Feb 2023 16:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OkmjatRg9OxEuhuzHdWmE9IfcduIdOzoC0jbgvrF6fo=; b=g5tcX4sa0d+dYrQOiHYR+5f7vmbqAYswxTthUtFvnGB04HGmSKVLI3Oh0kxiU9rJJL GC0yQV1+ADE/zHLDTynR12H7MAYyakK/7bqfRIPyReFwZKN6fAj8N28dJgMlfGSwBruL h33Z0dzrZ0P9c8aTFPYfMGwJYdgWT/hg/DVFQMJFr6VG3kBCGPB+GFEsMCi/vkMdeRCt gd5bQhkVmcW/dgq1pJ8gd4pmXshf8R6/7/uTmOCRyvrW5d2I7jIWkeFuWBBBAht6f5fR tO2biHiHmPtL7LvxlnGc/OrEA5vCLxMT2NeS5C6b3bfVQG5WIKvUr6yc/bcCKuCquKPV jQUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OkmjatRg9OxEuhuzHdWmE9IfcduIdOzoC0jbgvrF6fo=; b=LmwFJeQRfOLQX/VqsZwy32TsxBidK3UKV7I3gomptxa9R3SX5PG3TleVT6Y4acFtl4 m90S7Jmc/RaTKZLLoM4RPJk9ofHTfBqNecJM+0FtgpNhiTvnlRA/D0GmmyOcGkuo5mma JS0RkrCZwTrHhhatlM9AqepU6YeY6XABjIOL2K6rj6BFPJrvlSUZq7CPctICvq3rZH56 tqsAvKSMfUc7BFzqrR9TzMVr2BZgQmpJbiRBQMEM947q3p5E+TeSktLuSSrMg9j4Nk1B vMaOddeUIaZYtyjS5vqg6Re3jVKYEizpTQPTQWqKrmItyd/lBoGFOWD7He4xoqFrobR3 HS0g== X-Gm-Message-State: AO0yUKVwrLXrmWvNqO7o2CoGAYXEVeNQJTWNDMCBeQfEXPa73Wce17ie a+mkzxmEebx1Qs/Wet+DcNC4qiVg4cmok6cP X-Received: by 2002:a17:902:cf08:b0:194:a6e0:3ba with SMTP id i8-20020a170902cf0800b00194a6e003bamr4933377plg.54.1675299138665; Wed, 01 Feb 2023 16:52:18 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id z3-20020a1709028f8300b00192cf87ed25sm12391334plo.35.2023.02.01.16.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 16:52:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, laurent@vivier.eu, iii@linux.ibm.com Subject: [PATCH 06/14] linux-user/sparc: Handle software breakpoint trap Date: Wed, 1 Feb 2023 14:51:56 -1000 Message-Id: <20230202005204.2055899-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202005204.2055899-1-richard.henderson@linaro.org> References: <20230202005204.2055899-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is 'ta 1' for both v9 and pre-v9. Signed-off-by: Richard Henderson --- 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 493845fe76..573d97c60b 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -210,6 +210,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 */ @@ -241,9 +246,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;