From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KQsyIkhjYmrXVSoAWB0awg (envelope-from ) for ; Thu, 23 Jul 2026 14:54:00 -0400 Received: by simark.ca (Postfix, from userid 112) id 87CFD1E033; Thu, 23 Jul 2026 14:54:00 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EF1A31E033 for ; Thu, 23 Jul 2026 14:53:59 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09CF64BA23CF for ; Thu, 23 Jul 2026 18:53:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09CF64BA23CF Received: from angie.orcam.me.uk (angie.orcam.me.uk [IPv6:2001:4190:8020::34]) by sourceware.org (Postfix) with ESMTP id A75F04BA23D9 for ; Thu, 23 Jul 2026 18:53:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A75F04BA23D9 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=orcam.me.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=orcam.me.uk ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A75F04BA23D9 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2001:4190:8020::34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784832786; cv=none; b=iumlIDV4+NJayG7JP3aAQ6LOASb2LwQaM6DSafOwK2bZ47/Bho0qdGwwEzSl3xiKQ4F+VyHy7roMwvgtk9M4FGLsQMfZMQYHGk25jrIEXskwjJXUirzu73StU0tlcXcuIB2413Fv+Dqnu/b3bovL74KCyRuB1atH6uM9neD0Rw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784832786; c=relaxed/simple; bh=GgL7xCou8/mDs5Ecr77fuRNV+/AhY4fJGyJjLamtWnw=; h=Date:From:To:Subject:Message-ID:MIME-Version; b=STdUWfmBniqgZkMCPNMNQnk2uBsHWLR/iYNHCtCyePSFDD63vjW7j6auznFzagKzS0UdvDXhUZR5/vO7KIcDYu21QcGXUlABPs+gf2rvNVX6DjvlYsWExGPx2cvG797JzxzERcIiycL9ml8OXzs/mNvOLHwXOr5hyPY6EBqdv2c= ARC-Authentication-Results: i=1; sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A75F04BA23D9 Received: by angie.orcam.me.uk (Postfix, from userid 500) id 2C2259200BF; Thu, 23 Jul 2026 20:53:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by angie.orcam.me.uk (Postfix) with ESMTP id 279A49200BC; Thu, 23 Jul 2026 19:53:06 +0100 (BST) Date: Thu, 23 Jul 2026 19:53:06 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Jovan Dmitrovic , Djordje Todorovic , Milica Matic , "Maciej W. Rozycki" Subject: [PATCH 5/7] MIPS/testsuite: Verify MIPS II CPU branch stepping In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Maciej W. Rozycki" Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Maciej W. Rozycki Verify that breakpoints are correctly placed via `mips32_next_pc' while single-stepping through MIPS II CPU branches. Approved-by: Maciej W. Rozycki --- gdb/testsuite/gdb.arch/mips-allow.exp.tcl | 25 ++++++++ gdb/testsuite/gdb.arch/mips2-branch.c | 86 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.arch/mips2-branch.exp | 30 ++++++++++ 3 files changed, 141 insertions(+) gdb-mips2-next-pc-test.diff Index: binutils-gdb/gdb/testsuite/gdb.arch/mips-allow.exp.tcl =================================================================== --- binutils-gdb.orig/gdb/testsuite/gdb.arch/mips-allow.exp.tcl +++ binutils-gdb/gdb/testsuite/gdb.arch/mips-allow.exp.tcl @@ -59,3 +59,28 @@ proc allow_mips1_bal_tests {} { } \ {-Wa,-fatal-warnings -mno-mips16 -minterlink-compressed}] } + +# Check for MIPS II branch-likely support. These instructions may be +# absent, such as with MIPS I, MIPSr6, or MIPS16 compilations, or only +# supported as assembler macros, such as with microMIPS compilations. +# Make sure an actual BEQL machine instruction is produced and no macro +# expanded. +proc allow_mips2_branch_tests {} { + return [allow_target_tests "allow_mips2_branch_tests" \ + "MIPS II branch support" "Illegal instruction" \ + { + int main() { + asm volatile ( + ".set push\n\t" + ".set noreorder\n\t" + ".set nomacro\n\t" + "beql $0, $0, 0f\n\t" + " nop\n" + "0:\n\t" + ".set pop\n"); + return 0; + } + } \ + {-Wa,-fatal-warnings -mno-mips16 -mno-micromips + -minterlink-compressed}] +} Index: binutils-gdb/gdb/testsuite/gdb.arch/mips2-branch.c =================================================================== --- /dev/null +++ binutils-gdb/gdb/testsuite/gdb.arch/mips2-branch.c @@ -0,0 +1,86 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright (C) 2026 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Test single-stepping through MIPS II branch instructions. */ + +int +test_mips2_branch (void) +{ + /* Make 'err' available to the debugger to track the number of single + steps executed. Use `volatile' to prevent the variable from being + optimized away. */ + volatile int err = -1; + + int any = 0x55aa; + int mone = -1; + int zero = 0; + int one = 1; + + asm volatile ( + ".macro b_test op, args:vararg\n\t" + "\\op \\args, 0f\n\t" + " nop\n\t" + "nop\n" + "0:\n\t" + ".endm\n\t" + + ".set push\n\t" + ".set noreorder\n\t" + ".globl step_start\n\t" + ".type step_start, @function\n" + "step_start:\n\t" /* Units: steps. */ + "nop\n\t" /* NOP: 1s */ + "b_test beql, %[any], %[any]\n\t" /* Taken: 1s */ + "b_test beql, %[any], %[one]\n\t" /* Not taken: 2s */ + "b_test bnel, %[any], %[any]\n\t" /* Not taken: 2s */ + "b_test bnel, %[any], %[one]\n\t" /* Taken: 1s */ + "b_test bltzl, %[mone]\n\t" /* Taken: 1s */ + "b_test bltzl, %[zero]\n\t" /* Not taken: 2s */ + "b_test bltzl, %[one]\n\t" /* Not taken: 2s */ + "b_test blezl, %[mone]\n\t" /* Taken: 1s */ + "b_test blezl, %[zero]\n\t" /* Taken: 1s */ + "b_test blezl, %[one]\n\t" /* Not taken: 2s */ + "b_test bgezl, %[mone]\n\t" /* Not taken: 2s */ + "b_test bgezl, %[zero]\n\t" /* Taken: 1s */ + "b_test bgezl, %[one]\n\t" /* Taken: 1s */ + "b_test bgtzl, %[mone]\n\t" /* Not taken: 2s */ + "b_test bgtzl, %[zero]\n\t" /* Not taken: 2s */ + "b_test bgtzl, %[one]\n\t" /* Taken: 1s */ + "b_test bltzall, %[mone]\n\t" /* Taken: 1s */ + "b_test bltzall, %[zero]\n\t" /* Not taken: 2s */ + "b_test bltzall, %[one]\n\t" /* Not taken: 2s */ + "b_test bgezall, %[mone]\n\t" /* Not taken: 2s */ + "b_test bgezall, %[zero]\n\t" /* Taken: 1s */ + "b_test bgezall, %[one]\n\t" /* Taken: 1s */ + "nop\n\t" /* NOP: 1s */ + ".globl step_stop\n\t" /* Total: 35s */ + ".type step_stop, @function\n" + "step_stop:\n\t" + ".set pop\n" + : + : [mone] "r" (mone), [zero] "r" (zero), [one] "r" (one), + [any] "r" (any) + : "$31"); + + return err; +} + +int +main (void) +{ + return test_mips2_branch (); +} Index: binutils-gdb/gdb/testsuite/gdb.arch/mips2-branch.exp =================================================================== --- /dev/null +++ binutils-gdb/gdb/testsuite/gdb.arch/mips2-branch.exp @@ -0,0 +1,30 @@ +# Copyright (C) 2026 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test single-stepping through MIPS II branch instructions. + +require {istarget "mips*-*-*"} + +source $srcdir/$subdir/mips-allow.exp.tcl + +require allow_mips2_branch_tests + +standard_testfile + +set steps 35 +foreach flag {-mno-mips16 -mno-micromips -minterlink-compressed} { + lappend compile_flags "additional_flags=$flag" +} +source $srcdir/$subdir/mips-stepi.exp.tcl