From patchwork Wed May 14 12:56:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889862 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2606330wrr; Wed, 14 May 2025 06:00:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWsb42g6+ArrvaSOVfKY6VzOVZJxoohyAh3CAvehadlPD9NmwFQ0N9zHty001geky5FpgxT2A==@linaro.org X-Google-Smtp-Source: AGHT+IFAhgWGkrFUpRPeNg2LK/KJlm1UvxWFl962Hnngn66Trv0AdaGM6mrz/DOXn50aWWbfRMzY X-Received: by 2002:ad4:5bac:0:b0:6d8:a7e1:e270 with SMTP id 6a1803df08f44-6f896ef4a1emr42243066d6.40.1747227615750; Wed, 14 May 2025 06:00:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747227615; cv=none; d=google.com; s=arc-20240605; b=Ko3jDcwIk8fvVIvpuvsW9KK0yW8F2AtU1NZ9xdl1AycuShcGJj3YXW7UcsJOfsThX+ /7ZaxM8Oi6Fr9ahFTktLYssCcROOc2NULgKmVgNqtlhH252Ew6258+PJN6itptysHxnE ZWrVmFGB3DnzBHmu0ZFodjrZpOAkYdIxFEuqCjOdMuV7PaDKODClkK1vsQuPeZSDMOg2 nUyvd+F4h7Tj7tKTym0nLasBoRenVOOI9r97Oukaoumqh7yuOlK41iZx/dDUJ5D+WiOK s+ovtIFBEsTANvGTv1pDdeAMM7e0Mj+m3Z17lIluIZmdm/CZl5Fn9P4K1N0lpvwwVtc7 nBBA== 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=YR+rGvhCgEhDcTD5YMAOAY0f0vY99F0xCrWq7ccRCk8=; fh=slBUHiphGZf68YtXAZoDwMwGT4RM1dtceEFytJ1qTrs=; b=GF7kNQRIbDskG9Dt2YlJ9rZ5AdqDieY+eScwiFfJQuyZPE70vTYW4JZA8heNphYwoZ 0bC3j8uKuskSwQ2gwJgbsiT5k7Lwh/DBLMaLTxQE1VTRwv/w7xjeQkKpUg2OnDSEMLkZ SMuvvBq3pOTRcc1z4zJFD4QCgG9w9gJyQR7uCJPLW3SJib4+Tl2z/IfICuX4qKNnufba +O9ewatcMJnb9H4/qTOoqVBp9DKFyFhKtIyrjVWJrTbyAv8yXzMoAim2b3oQM5ounNlk KnOrrd3s3P9PdlhC5KeprbRADhrLmVp4HtQ3af8rTv0JUPWHWZOatOp5F5ogINfD8p3s FZEA==; 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 6a1803df08f44-6f6e39f730esi145462256d6.115.2025.05.14.06.00.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 06:00:15 -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 1uFBgF-0001a3-2C; Wed, 14 May 2025 08:57:51 -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 1uFBgB-0001UC-Uf; Wed, 14 May 2025 08:57:47 -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 1uFBg5-0007l1-Tl; Wed, 14 May 2025 08:57:47 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 631AA121ACD; Wed, 14 May 2025 15:56:31 +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 0EF8F20B845; Wed, 14 May 2025 15:56:41 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Pierrick Bouvier , Michael Tokarev Subject: [Stable-7.2.18 13/18] target/avr: Improve decode of LDS, STS Date: Wed, 14 May 2025 15:56:19 +0300 Message-Id: <20250514125640.91677-13-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: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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 2bed56f135..a1bfa500bf 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -1690,7 +1690,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); @@ -1925,7 +1924,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);