From patchwork Tue Jan 24 07:12:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 13113585 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 06125C38142 for ; Tue, 24 Jan 2023 07:13:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKDUO-00037q-2T; Tue, 24 Jan 2023 02:13:04 -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 1pKDUE-0002gs-7l for qemu-devel@nongnu.org; Tue, 24 Jan 2023 02:12:54 -0500 Received: from mail.ispras.ru ([83.149.199.84]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKDUC-0002iN-Lh for qemu-devel@nongnu.org; Tue, 24 Jan 2023 02:12:53 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 40E4244C1003; Tue, 24 Jan 2023 07:12:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 40E4244C1003 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1674544349; bh=TWAOjLkooBwZEu2UaJXs+LLyZ13Mqhg7vRWmDDIM4UM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=C6EpuDW5hqCoxlOrZ1KVMk7LKRQZ5kb+G/YF1Do2JnHmD/gd7+AnZ/k+u5N7AtDkv nLVZY1TNP8NgJWlvczG8VOMkPUXmJCrpso76ORqQ936MnNY2eU026rxKbGiF52MsxV 1y0iGRUfOSKDGeXexqaEBAgGK6xqWLIDaJ+KS7+E= Subject: [PATCH v2 1/5] target/avr: fix long address calculation From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Cc: pavel.dovgalyuk@ispras.ru, mrolnik@gmail.com, philmd@linaro.org, richard.henderson@linaro.org Date: Tue, 24 Jan 2023 10:12:29 +0300 Message-ID: <167454434906.3686700.5644953999357385238.stgit@pasha-ThinkPad-X280> In-Reply-To: <167454434356.3686700.6888237867240722060.stgit@pasha-ThinkPad-X280> References: <167454434356.3686700.6888237867240722060.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org AVR ELPMX instruction (and some others) use three registers to form long 24-bit address from RAMPZ and two 8-bit registers. RAMPZ stores shifted 8 bits like ff0000 to simplify address calculation. This patch fixes full address calculation in function gen_get_addr by changing the mess in offsets of deposit tcg instructions. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Richard Henderson Reviewed-by: Michael Rolnik --- target/avr/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/avr/translate.c b/target/avr/translate.c index 2bed56f135..552f739b3d 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -1572,8 +1572,8 @@ static TCGv gen_get_addr(TCGv H, TCGv M, TCGv L) { TCGv addr = tcg_temp_new_i32(); - tcg_gen_deposit_tl(addr, M, H, 8, 8); - tcg_gen_deposit_tl(addr, L, addr, 8, 16); + tcg_gen_deposit_tl(addr, H, M, 8, 8); + tcg_gen_deposit_tl(addr, addr, L, 0, 8); return addr; }