From patchwork Wed May 14 12:57:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889873 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2614813wrr; Wed, 14 May 2025 06:13:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmo/ulI2LcB2WqBYGk3KGpXLIJADqtxf1ZSkNo34JrnPLMeARoFu1XoReVUtm+9x8eQV1FBg==@linaro.org X-Google-Smtp-Source: AGHT+IGlaDnNoFLhhTfNpUDT7qIOB1D8gFkyQwUA2ejATjAAku686QJ/09qHUxucuXB077CQ5lMM X-Received: by 2002:a05:620a:2a01:b0:7ca:c5a4:f7b with SMTP id af79cd13be357-7cd28800d8dmr590879885a.15.1747228397685; Wed, 14 May 2025 06:13:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747228397; cv=none; d=google.com; s=arc-20240605; b=Xm7NeJjrq6GKnAcR/RbmRQ5WFd0RQgcBy5tBMXGHIGpdY15wEMPNVCMQKiBNY5E7+a aE0MNkdVQYf5CGmCBSe+7xS4CDCADLNdRH6VDd5upE8vhpps7aGFVIdCTLpm9OveOgLj oiANaU6OV2xIT4s5seMn2Jn/U8h/px/xVDot/O6abuM2ywKsu36Tb+lhYEDgQtheTqni N3ySWqdLbFuJE0Di61ak3YC41DV5zNyctBjpHarQIbI3XdRx77UxbqA6OV3//QqTUb2e OkUSPa1KKJnODQBSH+tRwlJ19gvaJ+OKOu24rMS2uP3kzJhn5eiIjtRUzSBSIZ7jtX07 kkBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=Vhg5qHSFST6oh6col2iHU8gb5me1yHBJyqf2gaCO5qg=; fh=slBUHiphGZf68YtXAZoDwMwGT4RM1dtceEFytJ1qTrs=; b=fJLnba4QlbszxMqn3NyNDgZp/Tsp9LIOTAJDlqoAb4mU09qG7JPw3/I2FJWIozLti8 rqAcXq87/Ro8jvc7jpOSPFggQdiqYZ/PNDaU5J2xrcBARGuEyqN5ZT5BC413Q1ZqXNXC cFYTxYdrtdI6M1NzSuVfCT0A7zsR8DFQcT4fN3vAh9UxU9tBBbNg4W4j4ZoqXMklhcHX q0wt9YcxLWYaO5BFH5zAwc8Ko58N5UAqzgDHA4Lt183sxs7pCJ8jMuFgJpLTxlA+J9nj Bms7fAFbr7/Xgqq2beVj/SeF3PqRzFawkAE/4PIDIxFF6zUbI0ew6vjh9oUD6xQ3Trpg 5TOQ==; dara=google.com 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 af79cd13be357-7cd00fed640si1343896585a.493.2025.05.14.06.13.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 06:13:17 -0700 (PDT) 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 1uFBkl-0000KP-Ak; Wed, 14 May 2025 09:02:32 -0400 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 1uFBid-0007IP-2i; Wed, 14 May 2025 09:00:22 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBiV-0008Ap-Cl; Wed, 14 May 2025 09:00:18 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 11F74121AF2; Wed, 14 May 2025 15:57:50 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id B23CB20B860; Wed, 14 May 2025 15:57:59 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Pierrick Bouvier , Michael Tokarev Subject: [Stable-9.2.4 20/34] target/avr: Improve decode of LDS, STS Date: Wed, 14 May 2025 15:57:42 +0300 Message-Id: <20250514125758.92030-20-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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 From: Richard Henderson The comment about not being able to define a field with zero bits is out of date since 94597b6146f3 ("decodetree: Allow !function with no input bits"). This fixes the missing load of imm in the disassembler. Cc: qemu-stable@nongnu.org Fixes: 9d8caa67a24 ("target/avr: Add support for disassembling via option '-d in_asm'") Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson (cherry picked from commit 6b661b7ed7cd02c54a78426d5eb7dd8543b030ed) Signed-off-by: Michael Tokarev diff --git a/target/avr/insn.decode b/target/avr/insn.decode index 482c23ad0c..cc302249db 100644 --- a/target/avr/insn.decode +++ b/target/avr/insn.decode @@ -118,11 +118,8 @@ BRBC 1111 01 ....... ... @op_bit_imm @io_rd_imm .... . .. ..... .... &rd_imm rd=%rd imm=%io_imm @ldst_d .. . . .. . rd:5 . ... &rd_imm imm=%ldst_d_imm -# The 16-bit immediate is completely in the next word. -# Fields cannot be defined with no bits, so we cannot play -# the same trick and append to a zero-bit value. -# Defer reading the immediate until trans_{LDS,STS}. -@ldst_s .... ... rd:5 .... imm=0 +%ldst_imm !function=next_word +@ldst_s .... ... rd:5 .... imm=%ldst_imm MOV 0010 11 . ..... .... @op_rd_rr MOVW 0000 0001 .... .... &rd_rr rd=%rd_d rr=%rr_d diff --git a/target/avr/translate.c b/target/avr/translate.c index 2d51892115..e8279a18df 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -1577,7 +1577,6 @@ static bool trans_LDS(DisasContext *ctx, arg_LDS *a) TCGv Rd = cpu_r[a->rd]; TCGv addr = tcg_temp_new_i32(); TCGv H = cpu_rampD; - a->imm = next_word(ctx); tcg_gen_mov_tl(addr, H); /* addr = H:M:L */ tcg_gen_shli_tl(addr, addr, 16); @@ -1782,7 +1781,6 @@ static bool trans_STS(DisasContext *ctx, arg_STS *a) TCGv Rd = cpu_r[a->rd]; TCGv addr = tcg_temp_new_i32(); TCGv H = cpu_rampD; - a->imm = next_word(ctx); tcg_gen_mov_tl(addr, H); /* addr = H:M:L */ tcg_gen_shli_tl(addr, addr, 16);