From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D35D8D31A0D for ; Wed, 14 Jan 2026 04:48:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfsn5-0003XB-L3; Tue, 13 Jan 2026 23:47:31 -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 1vfsn4-0003TS-3t for qemu-devel@nongnu.org; Tue, 13 Jan 2026 23:47:30 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfsn2-0003iP-Hq for qemu-devel@nongnu.org; Tue, 13 Jan 2026 23:47:29 -0500 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2a09757004cso75432035ad.3 for ; Tue, 13 Jan 2026 20:47:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768366047; x=1768970847; darn=nongnu.org; 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=TEeiGtHI7wQnEBEREwud4A0M1u+cTyhF8Eoqx55wGmE=; b=GKZsEtIQu9hcC1qWsGGH3e2Cvsm4h1A6qN1S+Jn01Xa6cWHCd6yQ3oPtkFJI13TY1C CWYiPxYOWHP9M6feUWt0ULhN05YBBqptLjOHqQPJPfYxaxAoZUhswDfxOWXLavs97nNo x1iPb9sCNfQhlhaSZwHhGzlRWrN5Tf3VcqU0bJOXMJo6tjhHL8uBkT7RjdLAaEFXzS9O /3oiAOZ2izO/L/9hAbsp8ZRjIPa8jxm7FHJ73qQbScuZA6NFQRXOV2tr8H6sWW4+wpv8 +aXpDZAZng4I7ecZKjl8z6mc68RZYbq4pGhv7soBaSLxfaN4YCZIt5GkSN2qLowptJ70 AYDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768366047; x=1768970847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TEeiGtHI7wQnEBEREwud4A0M1u+cTyhF8Eoqx55wGmE=; b=lTWQYwvgUcxIYHCzPJIj5qZO8G1GCYIhWxFWNIHfZ8PWltr5wu7V7TLK6JVu06FL26 W5DG1dtm/nJoPG7YNRWdyMAAs5itdoFNxyR2Ik7XbNFRPvpOTgKRzO/JY5eVtusGBODm pRz3j1hruQtiCBfTtUImchb2kXoVagVo2YRV/Z5sl/xXNpK8XTjvGlTtQzN+QgUnIA8Q NQ2lHcNOQoRC8TEvPh+ETLuR8TP1VJ359sbQ2c7PYftN9rojPVNLY+UEsAdcoJ0NuN3I Mewk3U+vZ+EqXMWwQ8mruiPkoFl8hjeV39R2pyjCmzOH0YEf6w9kmHoZEGqh+DETWsKh +j6Q== X-Forwarded-Encrypted: i=1; AJvYcCVBh0LlxGsS5nKxstx+dODLIt3j8dlaCLE+KMqtRNwuE8+1rl4sYH8sY9UF70BcW266u4jU1x80Iq4W@nongnu.org X-Gm-Message-State: AOJu0Yx1hVZgrRF4fXa32gUOi3ITX4rTAUykKkiHkJlN2DH2F3Ok5SDm A0pwncwhMi49LkFqhawR55n881U5fxXSKr3e93Ki/7ipNjgXF7y4odBV X-Gm-Gg: AY/fxX4LdgsDC1/bCgJiqFzw2xE7HzRVYNiRRBJTeH8/u4QpKpeNl5RwiuvjKzp0mdc xmgrHEXmBmuUmtNOpWeJCgAdfGTUNkKwZrxYBdkblSHZD25SZ2wsVJHAfxfBYF0RfiSxNEtzSAe eiIqQyUDLNXZFRJR5Fox2I3HJUTCwdZNbgP2F32nAtQD+964J29l/fpaJ/hln7EPvdQUxbq3V+9 4eVth0YT4sdRiJZ2C+L9CKHnm+E8Wiy//+TRHUm9zTRkj6UZN8DxyyGZpvL6z+WiiROO3Tai5BP 2OZoVg3xWFVA6YPkt0+DYPRgFWZO95u3bWGdqeM8ovn9AtLmsWQlwvkAIKq2v974mNQ1lzhASUv P+mFkgqFDQhfJ38iqJL8XV9wLmEuMwYSPGVW07cg4DWBgvxaJWsmET+m3IVa+RDR/k77fQMbcjM r9djxs2aMFSx6viSF/PWvD+XhhWYXDKVUIbBqmU202yV6zl029GOvz3EALkmA= X-Received: by 2002:a17:903:b43:b0:2a0:7f87:2347 with SMTP id d9443c01a7336-2a59bc43dadmr7737515ad.46.1768366047122; Tue, 13 Jan 2026 20:47:27 -0800 (PST) Received: from lima-default (123.253.188.110.qld.leaptel.network. [123.253.188.110]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c49037sm216111905ad.36.2026.01.13.20.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 20:47:26 -0800 (PST) From: Nicholas Piggin To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: Nicholas Piggin , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , bin.meng@windriver.com, vivahavey@gmail.com, Alvin Chang , Yu-Ming Chang , Joel Stanley Subject: [RFC PATCH 01/25] target/riscv/debug: Check only mcontrol triggers for break/watchpoint matching Date: Wed, 14 Jan 2026 14:46:34 +1000 Message-ID: <20260114044701.1173347-2-npiggin@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260114044701.1173347-1-npiggin@gmail.com> References: <20260114044701.1173347-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=npiggin@gmail.com; helo=mail-pl1-x635.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, FREEMAIL_FROM=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org trigger_common_match() has some warning log messages in it for unsupported triggers. Don't call it in BP/WP checking except for mcontrol/mcontrol6 triggers applicable to BP/WPs. Signed-off-by: Nicholas Piggin --- target/riscv/debug.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 5664466749..4273ab7a8d 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -952,6 +952,14 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) for (i = 0; i < RV_MAX_TRIGGERS; i++) { trigger_type = get_trigger_type(env, i); + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + case TRIGGER_TYPE_AD_MATCH6: + break; + default: + continue; /* No other types match breakpoint */ + } + if (!trigger_common_match(env, trigger_type, i)) { continue; } @@ -976,8 +984,7 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) } break; default: - /* other trigger types are not supported or irrelevant */ - break; + g_assert_not_reached(); } } } @@ -998,6 +1005,14 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) for (i = 0; i < RV_MAX_TRIGGERS; i++) { trigger_type = get_trigger_type(env, i); + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + case TRIGGER_TYPE_AD_MATCH6: + break; + default: + continue; /* No other types match watchpoint */ + } + if (!trigger_common_match(env, trigger_type, i)) { continue; } @@ -1036,8 +1051,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) } break; default: - /* other trigger types are not supported */ - break; + g_assert_not_reached(); } } -- 2.51.0