From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id q7IpK8KYz2r8ZAkAWB0awg (envelope-from ) for ; Wed, 14 Oct 2026 10:59:14 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 95D9D1E050; Wed, 14 Oct 2026 10:59:14 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED 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 7003A1E04E for ; Wed, 14 Oct 2026 10:59:10 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EC5174BA23E1 for ; Wed, 14 Oct 2026 14:59:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC5174BA23E1 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 520D44BA23C0 for ; Wed, 14 Oct 2026 14:58:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 520D44BA23C0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 520D44BA23C0 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791989920; cv=none; b=QNNXjJwBeugrWUvcXdvNaJ6OlrQiT+PW94u4J/Ln5+HxdhPq/u8+jOZ1MIirGPeAzuZS0ePtCNwM9BbMICr9Qg5+QMF+mR2/2dy+eo/WEkJkxf7cAwIolItUx3R6+7BDhOWsVpWCbotExjtvZ1iPPi8AMzZEwuglUhRujoEPARI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791989920; c=relaxed/simple; bh=onL7f1DL7b+O0DWUw0emmRjZkvy3W6fmdPPmIHY4XC4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=TNmWwpzm2sY3MR3qqWud9bCHt8iGn2g1wX5ZkJ4kiaG/QJKhXZJwAIVSRpJCL+sJjZOuNJMj2hKp3gGWldRvq8Fb51KdumiZs3ydO8i1vmUM5WFX9yabq4bNgtGi9H0OE9aMVS/5UIg3PlDfOdbhp7Mkj6nvEe7oWk2IXbb00Fs= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CcrJAOIv; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MJDWP7C9 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 520D44BA23C0 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3C75422249 for ; Wed, 14 Oct 2026 14:58:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791989919; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltpng3C+LjlhUKr9k3lyrHSuMvSRbRggbLYfdqHYyxE=; b=CcrJAOIv6ieh+3/thST++ClB7S1DGFcnkZaeODwiWB4ta+lW/dVAjlXKjxENC+yQKG9ZK/ MiFtJLR6uqoPCkiJVqVgLhSLDE7EaNaK7OMr0Mk1iaBCVsLchw0Bva5xDcLZSVAp6Dk6wp xxrosz6Nps0Ug9kox1JcaHkH514FycA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791989919; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltpng3C+LjlhUKr9k3lyrHSuMvSRbRggbLYfdqHYyxE=; b=MJDWP7C9VhIiCXdUyGx8HFEY+Ix+9jURijuNz8XKrs5kevuQNRQLvX9nizFKaJe5ujFBNv tKXbdXB9twigx5Cw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=CcrJAOIv; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MJDWP7C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791989919; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltpng3C+LjlhUKr9k3lyrHSuMvSRbRggbLYfdqHYyxE=; b=CcrJAOIv6ieh+3/thST++ClB7S1DGFcnkZaeODwiWB4ta+lW/dVAjlXKjxENC+yQKG9ZK/ MiFtJLR6uqoPCkiJVqVgLhSLDE7EaNaK7OMr0Mk1iaBCVsLchw0Bva5xDcLZSVAp6Dk6wp xxrosz6Nps0Ug9kox1JcaHkH514FycA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791989919; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltpng3C+LjlhUKr9k3lyrHSuMvSRbRggbLYfdqHYyxE=; b=MJDWP7C9VhIiCXdUyGx8HFEY+Ix+9jURijuNz8XKrs5kevuQNRQLvX9nizFKaJe5ujFBNv tKXbdXB9twigx5Cw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E6B3A1373D for ; Wed, 14 Oct 2026 14:58:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 92gBHp6Yz2qpIgAAD6G6ig:T3 (envelope-from ) for ; Wed, 14 Oct 2026 14:58:38 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 2/7] [gdb/testsuite] Factor out Term::_copy_line Date: Wed, 14 Oct 2026 16:58:33 +0200 Message-ID: <20261014145838.3560108-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20261014145838.3560108-1-tdevries@suse.de> References: <20261014145838.3560108-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 3C75422249 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] 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: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Factor out Term::_copy_line and use it in 5 locations. --- gdb/testsuite/lib/tuiterm.exp | 40 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 3ca961a3f7d..62025857651 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -138,13 +138,21 @@ proc Term::_ctl_0x08 { {bw -1} } { } } +# Helper function. Copy line FROM to TO. +proc Term::_copy_line { from to } { + variable _cols + variable _chars + + for {set x 0} {$x < $_cols} {incr x} { + set _chars($x,$to) $_chars($x,$from) + } +} + # Linefeed. proc Term::_ctl_0x0a {} { _log_cur "Line feed" { variable _cur_row variable _rows - variable _cols - variable _chars incr _cur_row 1 while {$_cur_row >= $_rows} { @@ -156,9 +164,7 @@ proc Term::_ctl_0x0a {} { # side. for {set y 0} {$y < [expr $_rows - 1]} {incr y} { set next_y [expr $y + 1] - for {set x 0} {$x < $_cols} {incr x} { - set _chars($x,$y) $_chars($x,$next_y) - } + _copy_line $next_y $y } incr _cur_row -1 @@ -428,15 +434,11 @@ proc Term::_csi_L {args} { _log_cur "Insert Line ($arg)" { variable _cur_row variable _rows - variable _cols - variable _chars set y [expr $_rows - 2] set next_y [expr $y + $arg] while {$y >= $_cur_row} { - for {set x 0} {$x < $_cols} {incr x} { - set _chars($x,$next_y) $_chars($x,$y) - } + _copy_line $y $next_y incr y -1 incr next_y -1 } @@ -454,15 +456,11 @@ proc Term::_csi_M {args} { _log_cur "Delete line ($count)" { variable _cur_row variable _rows - variable _cols - variable _chars set y $_cur_row set next_y [expr {$y + $count}] while {$next_y < $_rows} { - for {set x 0} {$x < $_cols} {incr x} { - set _chars($x,$y) $_chars($x,$next_y) - } + _copy_line $next_y $y incr y incr next_y } @@ -504,9 +502,7 @@ proc Term::_csi_S {args} { set count [_default [lindex $args 0] 1] _log_cur "Pan Down ($count)" { - variable _cols variable _rows - variable _chars # The following code is written without consideration for # the scroll margins. At this time this comment was @@ -518,9 +514,7 @@ proc Term::_csi_S {args} { set y $count while {$y < $_rows} { - for {set x 0} {$x < $_cols} {incr x} { - set _chars($x,$dy) $_chars($x,$y) - } + _copy_line $y $dy incr y 1 incr dy 1 } @@ -536,9 +530,7 @@ proc Term::_csi_T {args} { set count [_default [lindex $args 0] 1] _log_cur "Pan Up ($count)" { - variable _cols variable _rows - variable _chars # The following code is written without consideration for # the scroll margins. At this time this comment was @@ -550,9 +542,7 @@ proc Term::_csi_T {args} { set dy $_rows while {$dy >= $count} { - for {set x 0} {$x < $_cols} {incr x} { - set _chars($x,$dy) $_chars($x,$y) - } + _copy_line $y $dy incr y -1 incr dy -1 } -- 2.51.0