From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551112; cv=none; d=zohomail.com; s=zohoarc; b=EaRVPiU68M7BTImYgIvrXG5PVVjnUgXEuSGvBnS4tUnjjCwQAcYng/eL01kF7pSW8fQJUNrS8yj13pSE9vKT0VvqPeDK3rcfiR6+s/ncBq6OKCFkQsLs8NixXKad70xIZkbHA7Yk8rt+jvqxbLJNhBPMKEbNcyq8Nt/4gmh1BLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551112; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ucmd8j+eG32g5SXQ6QBL+cAm3PPY8er77ne5+2rIckk=; b=MFW/1mrmhuDQauUZDx7LrawU2uviUqAvxToefl63pCfPo9Mi2cCa/aGvuzrp/Aqi6ENB9mr/RjuSDpG1nUUVL9to+WJczQU/C1711EgsAzRCVTYhr1rJcr7fIqJwMqgoIzPKPZfhr83sjsYYFu3hxEJCD6HsrQuLG179vafodLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551112265307.8906480445312; Wed, 15 Oct 2025 10:58:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95kk-0007cJ-PH; Wed, 15 Oct 2025 13:57:34 -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 1v95ki-0007bf-IM for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:32 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95ke-0005SP-NA for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:32 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so7285145e9.1 for ; Wed, 15 Oct 2025 10:57:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb483bcf9sm316851195e9.6.2025.10.15.10.57.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551045; x=1761155845; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ucmd8j+eG32g5SXQ6QBL+cAm3PPY8er77ne5+2rIckk=; b=IJ6rMbkkForw+AdIPRfvg5xRF9tbvggKelifmvscT7thgu7ju/KcOrr0AtnhZq2FSq 5RZYhIHBd/efLn8aoZUbvzsmKhtFEzotyzplLNp9PFucjlDH9CisKs1fpPfktqKsnpGt 13JtrHSy9PqlRXf49TkwEZbu2mx/EXneIkxSq3UWl/eoGQhn9F+j6On2MpED2utZjPw3 zpg5DLvXdNHxR1LSqnlY+hSAXSYhNA1sV4IK2WxJZbcwADbRqp9mNVyM82ozmB32q0mW eez6duPlv1NHOGon2Qq/j3RR6uAM/AiaC9CKt5idAp6467QOEWQ6llvLHn/hSCYTH4YB 7o7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551045; x=1761155845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ucmd8j+eG32g5SXQ6QBL+cAm3PPY8er77ne5+2rIckk=; b=gZWVNuFV6AieFLf5Hnlvyxe2aM6qWB/xsHEXO/HpuxDObSm0Q9iK3djwPxVu8WFxGK BZVIqTTDG3d1r4i29Arvou9sZ6qKS5dDq1GuTMFTPvu5zKhruD8tfpr4OWUvkFDFyb91 rB1iMQsRcFSeyL6J6DXbbhRCisJi+19GldE0TqiG6Nr6l/MNl2Xse6dAdXgL7YPEP4Oq YDJ6ITIOBlihIXFkGY7yWa9/lhIi7SuFiYqM4b0mk/+xVeR8mP8vls/iMcI38U+VpkQy /3ilHazWREVnxtfso5VmMYeSIv5/IykJFiIb1Uq/4vub9eJ21QEmw3c9stXadMKai9Ei ap0g== X-Gm-Message-State: AOJu0YweNTopGp6nugkXD8ZR/qLA2JEKFSkIhkgPiTSdBkDpR8RWU0a4 HETlUvq6Wujf6SdMKzWmEjLV+bOjH3EWqsgugh5WHIdwTacGKE6ebWmSc90mcwKF+j4kJoshMxU FZaZ/cZq7hw== X-Gm-Gg: ASbGncvVdDODVFZSqvOKJSFiPwmJI2nEUmuW9NRB2El5PuVc9oojI0w2BTf7IXzONyh RC4ikQjAkiD7pMgfxFbOrG2iuC12baj88iZgVdQZwqCHJQVLRTZr/+Bx9P0JhwOc9jnKJC5V7Kq DdYz0sOe+/tx8iOw8G65Vr9p5HoXCj2hQ5kokAO+KqSvi0mZzXVUFMM2LURX1O+Ujgi8LYiAmn/ lOaEkOsNh8ieUZEbp/PvDZ9lUf3YAXmsPUIkGrcR+RydryUUbjZ6/C4lGMJaKdKD3Kt1RefZ3OX fli2QlAw9Zc+RFL7qCzcCMU77OytH3PIabRjMGr9j25+fs0+j3h3b1R7FstG9RYH0UtCve8FYpr R6TRN+MC+ZRsja/IA7IcDo8qKJl9IcVM1bspSdYJVnnwXUf8EG96Z77SYGRS7FP4bDwP5AOi2jc +wii9cpX/wusesjWzSRPLs2EWIIottKQ== X-Google-Smtp-Source: AGHT+IHekwfQIpIHcjeVx/rRNo5yHmBPlY2B54G0TBIeJsfVfQS0rzFMJWIbkh2nEOwcV890SStSJw== X-Received: by 2002:a05:600c:5248:b0:45b:88d6:8ddb with SMTP id 5b1f17b1804b1-46fa9b1968dmr220713045e9.37.1760551045287; Wed, 15 Oct 2025 10:57:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/7] target/microblaze: Remove target_ulong use in cpu_handle_mmu_fault() Date: Wed, 15 Oct 2025 19:57:11 +0200 Message-ID: <20251015175717.93945-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551115056158500 cpu_handle_mmu_fault() -- renamed in commit f429d607c71 -- expects a vaddr type for its address argument since commit 7510454e3e7 ("cpu: Turn cpu_handle_mmu_fault() into a CPUClass hook"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/microblaze/mmu.h | 2 +- target/microblaze/mmu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/microblaze/mmu.h b/target/microblaze/mmu.h index 1068bd2d52b..2aca39c923b 100644 --- a/target/microblaze/mmu.h +++ b/target/microblaze/mmu.h @@ -86,7 +86,7 @@ typedef struct { } MicroBlazeMMULookup; =20 unsigned int mmu_translate(MicroBlazeCPU *cpu, MicroBlazeMMULookup *lu, - target_ulong vaddr, MMUAccessType rw, int mmu_i= dx); + vaddr vaddr, MMUAccessType rw, int mmu_idx); uint32_t mmu_read(CPUMBState *env, bool ea, uint32_t rn); void mmu_write(CPUMBState *env, bool ea, uint32_t rn, uint32_t v); void mmu_init(MicroBlazeMMU *mmu); diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index 8703ff5c657..db24cb399ce 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -78,7 +78,7 @@ static void mmu_change_pid(CPUMBState *env, unsigned int = newpid) =20 /* rw - 0 =3D read, 1 =3D write, 2 =3D fetch. */ unsigned int mmu_translate(MicroBlazeCPU *cpu, MicroBlazeMMULookup *lu, - target_ulong vaddr, MMUAccessType rw, int mmu_i= dx) + vaddr vaddr, MMUAccessType rw, int mmu_idx) { MicroBlazeMMU *mmu =3D &cpu->env.mmu; unsigned int i, hit =3D 0; @@ -172,7 +172,7 @@ unsigned int mmu_translate(MicroBlazeCPU *cpu, MicroBla= zeMMULookup *lu, } done: qemu_log_mask(CPU_LOG_MMU, - "MMU vaddr=3D0x" TARGET_FMT_lx + "MMU vaddr=3D0x%" VADDR_PRIx " rw=3D%d tlb_wr=3D%d tlb_ex=3D%d hit=3D%d\n", vaddr, rw, tlb_wr, tlb_ex, hit); return hit; --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551117; cv=none; d=zohomail.com; s=zohoarc; b=ebfIbYV6r6pLKcjLbtwgTNaLWCO3jl/LQ13uvDgKfiqxzMQWTReU7sE4LNzkzuC4eIsSmkdkphjUlbqP9g8ENBQpQjlWGsboPeP3cvIs1ZvyDWlF+NE4vU26jzf0bXAzsUxLfunHzTc8TNUQvtEtAQb2DxfJt6NmCOjDv/TOTvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551117; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=r9t3e/KyULfBPeswO6U630O9UE06JlPP7NTUsO6O4Tg=; b=bo51HuIuRtc8Lv0ryJaRMKf+qXYTU0IX4k69Uu3hXnMiW4ZzacUZufiTcPr/Oa+uogQiNKJPDBbzdbnSTvZYU16M8Tt8GeJ8HGHAj+Wvom72uTEJb8eb56ncBw7MUsKcXxrr31YIxXnTKOggeM3pWMAmiN2uhFg+Gu1+fuPNjak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551117894694.6118229296056; Wed, 15 Oct 2025 10:58:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95ko-0007dR-NK; Wed, 15 Oct 2025 13:57:38 -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 1v95kn-0007d9-8Y for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:37 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95kl-0005T1-0J for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:36 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e2e363118so58143155e9.0 for ; Wed, 15 Oct 2025 10:57:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47101be3468sm41805785e9.2.2025.10.15.10.57.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551050; x=1761155850; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r9t3e/KyULfBPeswO6U630O9UE06JlPP7NTUsO6O4Tg=; b=BUfNm6sVi69scjZwNzgBYtYYrdO1SbWpY4iHTWO+KwicIAYrfUIHg8fLVdB4miIEmN TOVJSvBV+yFcQCteEKwtOXgNUUiGjz46LZ3XwLhicwCIO4SJqYO7n4CY5z12Na8b28m0 ZSS4XTDOoNnD4xu9nPTusZX3ofHVenMqz9P0GpAMkSMgzWMIok52d36eQE9dp0xqwQl0 plQzIrqnBo/yeqUTiRH04h1u93V8JTrSNT2ttJcXGE0KEqbrX6Bky3QWx8kUDhhzpabn GQsw3HqQocH9tSBhyV9iW5qMhuksOQIfvHJmiuqDIwmVjTd/e/QsLxv/cZfj96YlFMQ5 HXHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551050; x=1761155850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r9t3e/KyULfBPeswO6U630O9UE06JlPP7NTUsO6O4Tg=; b=pPlViIHYMpC3/UDXbyuOq+B0b9tI7Wn9AwMyk/NpYQPScdBrRNKiy2dWiUOVhHm+ds ilRFu2mGPNIsIxmVeIk6na2JzOeiJkxnR3D2+FdUh4N97Ugk3DUqJf+KtCSmdZlf6a5q Sc0JeuM1uITF5VejF+3zqmWwAZrJwtx2Biua22XpQpdz6Ku4j8nIZ81afNxyXT9MYxW9 wLZxiR8GmMHZvqxZHm28ZKmkjMuwlHBpLCTklyhMF1vAhvZCc22/Ijs3cwvDdbTcR/gi DryfZcPjfwV2X1SIfRAPPQUwMp0CmnMnPT2YRjEwsg8qIPK+sIxt+hDFjlRZRrS01c2i vzTw== X-Gm-Message-State: AOJu0YzSf6CJzTadFh7LjoH69ROfH13co4PosqCLnKQiLW8yn2zeaOLi C0PR+x+ZjSssusuyju2n9PaIyifaPG6Zk/nd5e3kBr8bjniMuYYAnA2skSgblo88UOR1+LOcXDD qyxMwSnOmoQ== X-Gm-Gg: ASbGnctCbjPtR//7p9ZDCNjnrHQ/DeBQysnd+rfKwRrtvtyXh9AnYou1gb4WCR+ikrl WmGgKLFWQHsF1wZv6CisE9OAx6rgZ2j+E3Entg3rslrvLgMJ63xAf4FZf2OLuFdy46l73unM5qB 3WPgXADbqcXeIMFkYI+ygkQhQszK+gjBsKD1bHSII+cbuHT9bj0frI92aCzBJ6FxeM/vXpm6Z3v lLQbAQgMO5lBiHdYybG40/6kCjAIEa/KkMeUbglvsm7IT/4VQspmz9hAiYoPZHYDdOnH6jPJBmx h050RyfMM4vaumPZn1tm7DQGAfgULAtSK/ktjLWFMapUJMewhTZD9pjNcX6W/BSCGY+VPn04QU/ jVBABipfxFPZiPJnJYx+O7LG+YR2qyjkB7VbBN1uYiLnc2QGDshRM4+jsV1ICd8GVXXsb66Ssg4 flEfx9gIpEVv7rss+y8dAEvW92fqZgmsXPnD5K0Fff X-Google-Smtp-Source: AGHT+IGqgQWfe/egh3Wdd2AGMMIdnIOdq9GKdxCDso6DCiDN2raIdxY2BtsmciW0F8SUNidV/1bvIw== X-Received: by 2002:a05:6000:2c0c:b0:3ff:d5c5:6b0d with SMTP id ffacd0b85a97d-42666abb559mr17497104f8f.4.1760551050100; Wed, 15 Oct 2025 10:57:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/7] target/microblaze: Remove target_ulong uses in get_phys_page_attrs_debug Date: Wed, 15 Oct 2025 19:57:12 +0200 Message-ID: <20251015175717.93945-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551119394154100 The CPUClass::get_phys_page_debug() handler takes a 'vaddr' address and return a 'hwaddr' type since commit 00b941e581b ("cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/microblaze/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index ef0e2f973fa..cf577a72268 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -274,7 +274,8 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cs, v= addr addr, MemTxAttrs *attrs) { MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); - target_ulong vaddr, paddr =3D 0; + vaddr vaddr; + hwaddr paddr =3D 0; MicroBlazeMMULookup lu; int mmu_idx =3D cpu_mmu_index(cs, false); unsigned int hit; --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551112; cv=none; d=zohomail.com; s=zohoarc; b=ZwTDblVq6GemszdH/ctiAp/tC3W5Nu0RdxpxJefkqtLmxsaLATWjv40uj0TR9AbN+8Vx+SnV51kqx8V6cOuzuWrF857SmzvKGiFzmz+QcxzYwnyj1dAREkJ3hI8QOAbL7x8x+v7YBknVL+qGz6u8z5Z4tI1bGiXudAwgQy760Bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551112; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V994PTOYXfSbgqk3wPN+Ltq5BghnfXGjVQUSgxw4NwA=; b=Q11Wu6nJlar/rWtaHlMl1/0LDUZMhfMumK+GHo8zpfbcVZeDV+P5DlwfWcVXiZkHfM6Es8U2Gyj6iv2jafzaPIzMy+XtjSIJTBInM24BYD1WYUT8Ctr3SFRXO3hRF+SUZ+md1h3J6BKyekouuVXMHf8cSo6VXqHBSmpKjTw8Zz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176055111204385.50579513976368; Wed, 15 Oct 2025 10:58:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95kw-0007em-5N; Wed, 15 Oct 2025 13:57:46 -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 1v95ks-0007eX-Lg for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:42 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95kp-0005Tu-AW for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:41 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4710683a644so7587575e9.0 for ; Wed, 15 Oct 2025 10:57:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47101be0c5bsm60632615e9.1.2025.10.15.10.57.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551055; x=1761155855; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V994PTOYXfSbgqk3wPN+Ltq5BghnfXGjVQUSgxw4NwA=; b=PfK6n5cC7kfZ8L7hzCOB0k3Ql7/r43r2LdAnjYwGiueL1UntaJvckXeBw99fybVWqw 5R1juUH8yOHsGiYK55eXu6r9PbibEPk74nXHMbHPteg5LUIL9v1H3DWJLV0LrSp7QGQ3 cs4SpZ5yplgNfTIAnKxEeYdob20JMtFxegn8ZTYH4/sAbzkzQRN9cPWid92i2LV3UWeJ P4EXLkX4Qt2SCyUETOaNvsHm0V8shpExEtkRPu1loJp8IFAduv1FJ4jCx1TT/THU1XI5 9Ne69qIbHMJ9cUz/fHdh00e8r0smxbwR0gdyjTwi4VlVHBfNL44rUhHT6QB8JNT6ndk7 978g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551055; x=1761155855; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V994PTOYXfSbgqk3wPN+Ltq5BghnfXGjVQUSgxw4NwA=; b=lF4GqNGpxX2xc0K8H2LIBSbWLxxJwInaL0kYUrWMdDl1U/TxuWRqhEZvXHzp1atyWO hBUfOilCyaJiwXc+jiuaFHkrLt2tH6Os3LEL/FqTkZW4C0KUH42Jr1Tmj143GyyZC6gG OPnZ/LG9dcf7EXSosZNsO4pNhw1XiRWhbfTsm45TQp94chGTvCSV6A9L6i+x8/qZrYQe M6K84xkTgG9ijt4cGWpz2jlyMl+yMkVVz/LNQzWKiyLhVv6uvfFMUJdicfJzap2K5obv s8aEAEtHq8YiPEMKyZprQKDRBAuq/vh+fMXnNdK8DDOVue3Dvkq3A44Of1TJSY6iXGIN QFkA== X-Gm-Message-State: AOJu0YzO1/+swQjzbvzvv039Z0rACENwGJ9zVaAsygSAW6NvJQWQwlFq CVyRzFT+haMVadB8PSekLGcitsHqvwSg7wY39n9OzGhw3/CA0bWhgyhflVmj5S84BxBXb7NeYNX HEuDMS2j7bw== X-Gm-Gg: ASbGnctK91aqka25imeVCGG7sFZr90RI2yKQrswzXyhfgrl2TA8++iK4O/9YqJnHUfR 4xPnRWx3nvoErHv4JRoQ3uSRZ7yCHHsaWmUozxIMmOyidF5W0/SOnMm8FyCFuPl0Lds4LCGP2xL ZdX9nX6EGkfdW4HLAVK2w/6Ccyg+/VJS/U6xaidFr9GPsd2/KORuHrOdduZHBp1dJJvJb4aKCVT yQTZ1SBQM6ojqIB+J+oGk7NjUV0oQ4OKUvluKzWOdgECinteMpEEpvAzkndmCm4qJEQ9Bht2Yzx ShYfvEnLGm+LzgIS1OQDVVsBIYTtaEC9oVUyfTIMJOmxSud0CTtPQQJkWlE0lHOmEg526PJwuQJ Qz3d3p4YKrmnlmDgOj1NFoBYtY7UMWzDPtemPxr98mK6dapl0dyF1kvioHrTdPnNjEqNv+EfYYs iUfLf9TL87gxpvpccpQS8= X-Google-Smtp-Source: AGHT+IHgD0ggpcN351iqvcfnspHVYiaOHvOLpFhBdxDsMBlyEHJ7wRaPvmsI+ac1ILSh1cG8D1+zKQ== X-Received: by 2002:a05:600c:4f95:b0:46e:6339:79c5 with SMTP id 5b1f17b1804b1-47109a227b8mr9955865e9.5.1760551054798; Wed, 15 Oct 2025 10:57:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/7] target/microblaze: Remove target_ulong use in gen_goto_tb() Date: Wed, 15 Oct 2025 19:57:13 +0200 Message-ID: <20251015175717.93945-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551115257158500 translator_use_goto_tb() expects a vaddr type since commit b1c09220b4c ("accel/tcg: Replace target_ulong with vaddr in translator_*()"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/microblaze/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 3dd74b021e8..b93a40fedbc 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -116,8 +116,7 @@ static void gen_raise_hw_excp(DisasContext *dc, uint32_= t esr_ec) gen_raise_exception_sync(dc, EXCP_HW_EXCP); } =20 -static void gen_goto_tb(DisasContext *dc, unsigned tb_slot_idx, - target_ulong dest) +static void gen_goto_tb(DisasContext *dc, unsigned tb_slot_idx, vaddr dest) { if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(tb_slot_idx); --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551113; cv=none; d=zohomail.com; s=zohoarc; b=EDGKDAvFXwn35mhnN75T6o1msGwkB6SwrWdWXSJT0AtVOtnld6xlaYSPp6QO+B+FSoxA/iQ791aF0xfoNbuQHDklgcnIax4jVt16HU6c3SS29ZUMTzo2qW1RGw8StHNRguLfRq/ZqbkjwSPEQaFhtmU5Ei7kHHoumNMEyE7L+XE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551113; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yLu3e9Eqgay3pYMDRNyYdIv4urmYssz3/strFFntMuE=; b=CLhDmGkPDYpG47ggoupDZoUzegC3LX3ZIHIVS673jIHPKr0vrfphUc4D6D24p/lpiqGtORHFN0Slxnm/Dap/8ZYW1qrCUZMqYcYC/1icifpN2tF8iWipHIZGgpw7qarNQG8/O4umbbGE6Vi5056h8Ecoax6LXCYvsKpk096XMNI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551113635307.58727300132455; Wed, 15 Oct 2025 10:58:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95ky-0007gH-Tx; Wed, 15 Oct 2025 13:57:48 -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 1v95kw-0007f3-2e for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:46 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95ks-0005Uh-OO for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:44 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3ee64bc6b90so3923294f8f.0 for ; Wed, 15 Oct 2025 10:57:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5cf790sm29202697f8f.28.2025.10.15.10.57.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551060; x=1761155860; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yLu3e9Eqgay3pYMDRNyYdIv4urmYssz3/strFFntMuE=; b=mqeJx8KjyGvmHKTx4ugMbKF4z9zMV9KgOPsg4F0qUauLv2g4myg8x16zjy0tcJdYMg FF/aMUN4q3TEO25jQAh3d2DvSThp7BENLSGwQ8z8KqM+5LEhzhIokEC5KO3FWNBiG/VT SJ59kKV7U1UHoyeKPIljz7W3cORC3LhyaUpDkSFLwEDJg7wq15+WWn2Ncolkn3WEZQm9 8gPcf9ux20m+1rzDShsVApAHO8hdlpWPIIpbKPiGxaEvPGVkm/vkYXthN6hsaTcVYbOT OvMjPS93gkkRX4u0emxwtVQQ0T3Zk0OGrFAwQjlD3gPBPmuKPfC6s69Jhd4HzjLQzNvj EObA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551060; x=1761155860; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yLu3e9Eqgay3pYMDRNyYdIv4urmYssz3/strFFntMuE=; b=ZGgakAVYc1qkA2dGYsSaOu2orqQRY5yoBRZFK8Qcy2UwIj+vdFKsdjwb8E2hTEyJgV TrIwiuYJD19TGWyL6rts8GMnp2e43FnduhKRZhEQosGZoElvv/vq2hRVoz+2JyucgEch HcRe6e9HH5rzkyROc+gC8iJvE0E8rPvDSsYMWcQP4zC/ln47zL9hy7H35nEqGclAI2v9 xxTHzm0d+aE0fOARDokym1zoMbxsWVHqSXtAWmtO8TikWMLNVWqpNLJ60x6nERPuxrXF tYd/8n/YoBnEnqOLOE3AChL6IWJc5R1VWVwo8CuMXQltfdd5R1nzbVY2TxmcNccy7zT2 cP/g== X-Gm-Message-State: AOJu0Yx9TRWXmKvLNZTVLnY0WIgc2R++9dtSS/CMDfb/s/DOC9nELmyu k4DAvanN3L6TW1xGK/H/8DnSQG7TyaTfaNgCl80v/6CQefp/puyAb1qbDVOflc1kGBXSExrredH pYm5BXJVeyw== X-Gm-Gg: ASbGncsx7fGih7an5pergCHb9PeJYiYv7tqbHHHE3lcqKsZikDwD5SXgYknx7DvjAw8 26iBYZgBSmMHz1OlU3LHsPCWLTcjOuhafik6aey0eVGawFZpDG1BN/R9tlfja5rAotAHIkVlC6D f8cW+QUF1qAx2q4CT3dNF99yQI5Y/Nn2rGNbtiC6WHc+ZVlHcbUguAeH8gLlPkULeJzi/qNKQah eHrQk5npzIT6VZ6tq5CfPdhd4sjgukS+okvB/tUrIMrBuoFHaDzsZKcQiT6g0lTLQc17k6hTaRY OsmUBrqBOFLWd9KMSd7X44j+pyuD8isoIaw95CFsE9WZ1pVqetyQgOGMn+mhA9PrAbe3ayZRQ9/ Il2ISX796RmDdy8lFFcguC/lzriJhg/8KhMsDSqK3kyDzn/la+WPKJ+kCFtInB30PEAY2FIUZg8 0uHbyLNK0GQq0c+7g6GzA= X-Google-Smtp-Source: AGHT+IEK+jOU9NgZheBtv88kAeU7elbFeuRppPxCONLLyhZ9xLQS+uoXeQA9tJHXXLe7OBXodyzPKQ== X-Received: by 2002:a05:6000:2207:b0:426:d5ab:789 with SMTP id ffacd0b85a97d-426d5ab07a9mr12001829f8f.53.1760551059615; Wed, 15 Oct 2025 10:57:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/7] target/microblaze: Remove target_ulong use in helper_stackprot() Date: Wed, 15 Oct 2025 19:57:14 +0200 Message-ID: <20251015175717.93945-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551115794154100 Since commit 36a9529e60e ("target/microblaze: Simplify compute_ldst_addr_type{a,b}"), helper_stackprot() takes a TCGv_i32 argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/microblaze/helper.h | 2 +- target/microblaze/op_helper.c | 4 ++-- target/microblaze/translate.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index ef4fad9b91e..01eba592b26 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -20,7 +20,7 @@ DEF_HELPER_FLAGS_3(fcmp_ne, TCG_CALL_NO_WG, i32, env, i32= , i32) DEF_HELPER_FLAGS_3(fcmp_ge, TCG_CALL_NO_WG, i32, env, i32, i32) =20 DEF_HELPER_FLAGS_2(pcmpbf, TCG_CALL_NO_RWG_SE, i32, i32, i32) -DEF_HELPER_FLAGS_2(stackprot, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(stackprot, TCG_CALL_NO_WG, void, env, i32) DEF_HELPER_FLAGS_2(get, TCG_CALL_NO_RWG, i32, i32, i32) DEF_HELPER_FLAGS_3(put, TCG_CALL_NO_RWG, void, i32, i32, i32) =20 diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index b8365b3b1d2..df93c4229d6 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -365,13 +365,13 @@ uint32_t helper_pcmpbf(uint32_t a, uint32_t b) return 0; } =20 -void helper_stackprot(CPUMBState *env, target_ulong addr) +void helper_stackprot(CPUMBState *env, uint32_t addr) { if (addr < env->slr || addr > env->shr) { CPUState *cs =3D env_cpu(env); =20 qemu_log_mask(CPU_LOG_INT, "Stack protector violation at " - TARGET_FMT_lx " %x %x\n", + "0x%x 0x%x 0x%x\n", addr, env->slr, env->shr); =20 env->ear =3D addr; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index b93a40fedbc..bc38ff0af92 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -606,7 +606,7 @@ DO_TYPEBI(xori, false, tcg_gen_xori_i32) =20 static TCGv compute_ldst_addr_typea(DisasContext *dc, int ra, int rb) { - TCGv ret; + TCG_i32 ret; =20 /* If any of the regs is r0, set t to the value of the other reg. */ if (ra && rb) { @@ -628,7 +628,7 @@ static TCGv compute_ldst_addr_typea(DisasContext *dc, i= nt ra, int rb) =20 static TCGv compute_ldst_addr_typeb(DisasContext *dc, int ra, int imm) { - TCGv ret; + TCG_i32 ret; =20 /* If any of the regs is r0, set t to the value of the other reg. */ if (ra && imm) { --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551146; cv=none; d=zohomail.com; s=zohoarc; b=ecPt5SBTk07D29HTuH8X4zQvwxDSqZW0x9v+RaJDDaSnKwIDPN0lvMRt+Z0g2zBT3bu/xDrbzy9a0GU1l2iDleVOkxMx0Vrc0o8wQSyjkfm4XHL18fDuoj8yqvm7+W0e9Hkyl1lmGkOWmPk5xuw/D72XIkPoMZT7Xg46UQSQa5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551146; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rTsaST6lePmYx1qPUDkEPn28HRnlM7KXopVayGlL5c0=; b=VtUrFyfxdz7x/LDFJk7W0oET4ZDhlt4obxQyaVnfgQUlEKuUEHC6n2qB785zJAxlI7bkc7n8idjXGInl63Ncyjq2cmEuqgMPOlS/vZClGJz3YqUQWT6SJ+0P9gaLN1TAVxqRZhuqmpwDqE7Dl0zDHFAQkcziWndHWN/L1wGmAVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551146433645.1443536946986; Wed, 15 Oct 2025 10:59:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95lA-0007gx-I5; Wed, 15 Oct 2025 13:58:00 -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 1v95l8-0007gb-SZ for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:58 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95l3-0005VV-4f for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so5452595e9.1 for ; Wed, 15 Oct 2025 10:57:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426e50ef821sm16121119f8f.38.2025.10.15.10.57.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551065; x=1761155865; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rTsaST6lePmYx1qPUDkEPn28HRnlM7KXopVayGlL5c0=; b=T0eTVrbsWuLesEnajo3qYgaa0KKQ8X/jR3KfjxbkthTVgTuwcUizDz49JJ+GMMNxac y1Bs1OwkWRU457L7MBEdFjxCICD9spuGyc0Z+eDkubOWbu1nNpojZYJL35umU63p2NGL ld5sSPP/4NdFuFGPf/etWVoAlowBJE0rUP73Rl2pUT7ymaC1SqMvL0mEHOyLHAz/NAaE Ut8dMO0OG+HocVpixoIxV7Cit2fsaF5OmhHRBlrclK7knxoUCN1gVC/HdYDqakdS+rVV OtcFGxxY4hXvmNKXI0/EAo7lnRL3zNrNdkJ7qy4lne6t8If1CagMOqa8OkN3LthTrln6 lfuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551065; x=1761155865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rTsaST6lePmYx1qPUDkEPn28HRnlM7KXopVayGlL5c0=; b=wCYJMK3KWULy/r1I9x35+Eri8Lz5Wbd7Rt1/M/Kn4BKmNtFS3/6fMSMiisfxnk3g7l WgpRAODglg1FEwpX7xLNdLUMkM2rKPfrgkADQtxe3xHgyDIYeTik/5GHd1+6lYO9NiOv hup3GNy91Z4jC9GvxS1SoXx+OS5OyDTby1dgJiNczUKMHz7bxcvFRydKhQzqskCBQfgv RbeXdeWb2FMEhJphk9h2vdQalEkBKwXcnid+EEvm4IlPZyDiwNjHGo99qgMwFhx7boNg /u5Fg4PR+rRdh8fkQhpaWcVumCv0h2kFCC32OSyiOJwpfTW9ykellox/q3WDQYMZJ7rm EfGg== X-Gm-Message-State: AOJu0YyRe/1vkgoJGrVaXkyKIvGkzRerX3pX/q8D3KM42AvjQZMEOMcZ D0VIbbofjjNe3HPUHAr5kmn0PKY5SyXfMKgS1GO8ATr6uHpi4fQWqF37Jxs5GEt+usGx8uuib9z 0ukZvCzzu3g== X-Gm-Gg: ASbGncuxdPN7ih9H6z7EYB1+0uCFg4vJ/r1mItKxnQElGAV+F3qhch2eElGlk7bCcvC xfywJw7MF1Bt2KTic1jBcDxtQn0b/bOV6OAkUMjrH9aOQJURFTTQz4epTOB6VR1wNOxvdRg6nxu a1JiJ6YHwaLvWDXRKePKcv+0Vugw3EeFcmP/ams7qaesLU6aC9J1/3/Q3sSrUyh9RxVQ7GaYSPk FBFscDvmHJj0CadPgtFpEKHPwIz7RFrX+vivRZVzYqYknGWXoNTfcvg0h7K07cGn1b1zFi9zQL3 sikYLRi76SBm2WZ7XnqR0jcu4/nJ/OQOKnxY7xRFsbd1dPSfZGmgVVi4FCWYE0+FPAbHM48cRkT 7LiYRpH+14tDpxlArtdEhF5XRdWAx99rJ+c4Y3efdCloqSVRtALwLKGbK12LJGOBbuayil4ygqi 7rbKkH2iG+BpZd6szHvEs= X-Google-Smtp-Source: AGHT+IG1ziTPZvC4QhQI996xRwm3UmDe+i3bRjWF6FFzbesbyFHViH435V7K3jV9UyLADaplQEq6cg== X-Received: by 2002:a05:6000:2509:b0:3ee:11d1:2a1e with SMTP id ffacd0b85a97d-426fb6a748bmr796908f8f.10.1760551065038; Wed, 15 Oct 2025 10:57:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/7] target/microblaze: Have compute_ldst_addr_type[ab] return TCG_i32 Date: Wed, 15 Oct 2025 19:57:15 +0200 Message-ID: <20251015175717.93945-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551147908154100 Both compute_ldst_addr_typea() and compute_ldst_addr_typeb() bodies use a TCG_i32, so return the same type. Suggested-by: Anton Johansson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/microblaze/translate.c | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index bc38ff0af92..002f921e00f 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -604,7 +604,7 @@ static bool trans_wdic(DisasContext *dc, arg_wdic *a) DO_TYPEA(xor, false, tcg_gen_xor_i32) DO_TYPEBI(xori, false, tcg_gen_xori_i32) =20 -static TCGv compute_ldst_addr_typea(DisasContext *dc, int ra, int rb) +static TCG_i32 compute_ldst_addr_typea(DisasContext *dc, int ra, int rb) { TCG_i32 ret; =20 @@ -626,7 +626,7 @@ static TCGv compute_ldst_addr_typea(DisasContext *dc, i= nt ra, int rb) return ret; } =20 -static TCGv compute_ldst_addr_typeb(DisasContext *dc, int ra, int imm) +static TCG_i32 compute_ldst_addr_typeb(DisasContext *dc, int ra, int imm) { TCG_i32 ret; =20 @@ -750,13 +750,13 @@ static bool do_load(DisasContext *dc, int rd, TCGv ad= dr, MemOp mop, =20 static bool trans_lbu(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UB, dc->mem_index, false); } =20 static bool trans_lbur(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UB, dc->mem_index, true); } =20 @@ -776,19 +776,19 @@ static bool trans_lbuea(DisasContext *dc, arg_typea *= arg) =20 static bool trans_lbui(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_load(dc, arg->rd, addr, MO_UB, dc->mem_index, false); } =20 static bool trans_lhu(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UW, dc->mem_index, false); } =20 static bool trans_lhur(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UW, dc->mem_index, true); } =20 @@ -810,19 +810,19 @@ static bool trans_lhuea(DisasContext *dc, arg_typea *= arg) =20 static bool trans_lhui(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_load(dc, arg->rd, addr, MO_UW, dc->mem_index, false); } =20 static bool trans_lw(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UL, dc->mem_index, false); } =20 static bool trans_lwr(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_load(dc, arg->rd, addr, MO_UL, dc->mem_index, true); } =20 @@ -844,16 +844,16 @@ static bool trans_lwea(DisasContext *dc, arg_typea *a= rg) =20 static bool trans_lwi(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_load(dc, arg->rd, addr, MO_UL, dc->mem_index, false); } =20 static bool trans_lwx(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); =20 /* lwx does not throw unaligned access errors, so force alignment */ - tcg_gen_andi_tl(addr, addr, ~3); + tcg_gen_andi_i32(addr, addr, ~3); =20 tcg_gen_qemu_ld_i32(cpu_res_val, addr, dc->mem_index, mo_endian(dc) | MO_UL); @@ -910,13 +910,13 @@ static bool do_store(DisasContext *dc, int rd, TCGv a= ddr, MemOp mop, =20 static bool trans_sb(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UB, dc->mem_index, false); } =20 static bool trans_sbr(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UB, dc->mem_index, true); } =20 @@ -936,19 +936,19 @@ static bool trans_sbea(DisasContext *dc, arg_typea *a= rg) =20 static bool trans_sbi(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_store(dc, arg->rd, addr, MO_UB, dc->mem_index, false); } =20 static bool trans_sh(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UW, dc->mem_index, false); } =20 static bool trans_shr(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UW, dc->mem_index, true); } =20 @@ -970,19 +970,19 @@ static bool trans_shea(DisasContext *dc, arg_typea *a= rg) =20 static bool trans_shi(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_store(dc, arg->rd, addr, MO_UW, dc->mem_index, false); } =20 static bool trans_sw(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UL, dc->mem_index, false); } =20 static bool trans_swr(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); return do_store(dc, arg->rd, addr, MO_UL, dc->mem_index, true); } =20 @@ -1004,19 +1004,19 @@ static bool trans_swea(DisasContext *dc, arg_typea = *arg) =20 static bool trans_swi(DisasContext *dc, arg_typeb *arg) { - TCGv addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); + TCG_i32 addr =3D compute_ldst_addr_typeb(dc, arg->ra, arg->imm); return do_store(dc, arg->rd, addr, MO_UL, dc->mem_index, false); } =20 static bool trans_swx(DisasContext *dc, arg_typea *arg) { - TCGv addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); + TCG_i32 addr =3D compute_ldst_addr_typea(dc, arg->ra, arg->rb); TCGLabel *swx_done =3D gen_new_label(); TCGLabel *swx_fail =3D gen_new_label(); TCGv_i32 tval; =20 /* swx does not throw unaligned access errors, so force alignment */ - tcg_gen_andi_tl(addr, addr, ~3); + tcg_gen_andi_i32(addr, addr, ~3); =20 /* * Compare the address vs the one we used during lwx. --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551132; cv=none; d=zohomail.com; s=zohoarc; b=OuOs8SMOTUUuOCIZxo2u42ZBrXCOG39y2ZT8WqiByKaOyALv32td2eOw/Nl06dPqess+3gXs/ZHYppmQkOEUUZ1qY2Bp382dTL862JHAxP4XeW6Odvf0CSLdjCyNf5V2RIDN0hH3LUCkUMcgGRqLpoc1UYmOein+MWyPHJaSuaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551132; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=U4fhoCLIyqRadUb5nIbhTUh8Lb6uUpWCjNs2kXoymgQ=; b=CRiEu5NYDYU2Rg1hNIwsv/ias2P5bwIVW8KRMfgWOziAGawXPqYp9b2x0VbuYZ27VJhPiR/KIZDH9I/FwElA97VfnM+TsOtcUkOwCz5PnuFzGfwOIASpkFQkKMoYZ3SDdeb0F7lfyeyHy0r0NLF6HgKpEAOZl++ZmJIm+qnVSYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551132219336.3283581346237; Wed, 15 Oct 2025 10:58:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95lB-0007gy-6Y; Wed, 15 Oct 2025 13:58:01 -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 1v95l8-0007ga-OJ for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:59 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95l5-0005Vt-3Z for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:57:58 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so5453075e9.1 for ; Wed, 15 Oct 2025 10:57:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb489197dsm317075475e9.10.2025.10.15.10.57.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551070; x=1761155870; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U4fhoCLIyqRadUb5nIbhTUh8Lb6uUpWCjNs2kXoymgQ=; b=LVxFCi4CubaCM4BoZRM1/mVQhJeR4zPLE7q5XH3jXJzhiBufaYDPc2rBJVgK7tx6wX VOqu1wLeVm3SSxO5H4N0N8O9YfoPtdHrhMFY7Q+A6HL5nSII2D+Hj5IPyQy6SZXfDCQt 8p/TooaWbmeBXEThbBxtnFZud6QGmWY2374tIiNmVOq+LOeSMnH+v0tlDdPJgObeudrV Mzg4quoufatohZaNXxq3XXNbG48YfqGVyy1KuwSsKEu6A5HfNzZ18uk2iiMJs9wrh5lE m8YNU5TJ05JPMbqkVR21G85Qmyf5K0VE708JMgSQurGKYXdIP+l4RCkYdzmpemCQBFnh gFXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551070; x=1761155870; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U4fhoCLIyqRadUb5nIbhTUh8Lb6uUpWCjNs2kXoymgQ=; b=guwPt7Gg5siInPh28Yhy8E6qojHZSWYB9vucznlUq2I+vDzPxm3gAw4Y0LV74VnA1f B9MkSy4SSrT4nR+5hpTciSZis1ZZjotH7ZXQdKAbfYlXxiTdS9TkdEefQWsyi/WE3Z+y KhR2k50o7DpO5XRTVCPbxNzjtlOyjnLgiYVJ5O0ArqHakbI7Pn+e93zkv2Ja50s9SL8U oY8K7TP0AQWLqzYAgzAWsWG/mAeh3Q6+TYZ6jlEPb2ESa76jWhrx/2WtO61oTGcf3jRI mX5gFd+FOCmUmDkoxvr7ybMiWz69fYqMMleD8iMk5NbmlDfoAp2r/SvvvhZZ45TkczYP ejsw== X-Gm-Message-State: AOJu0YxvxJ3mxo38hTMv5Va/QEv2tON+1LJXi6vQWsshjr6+eoeRf+mx S/hN8bMUsUxK4UuA8KtfsuH/NdyCJ9ndDBeadLgBjyEDlSwczg36e6RhJgRgUd/ofcqHYIQJ4b/ 9GXtnOMvH7Q== X-Gm-Gg: ASbGncvPcdQtHbeHP+q/NgjCqqj69e5vZP//9I97jCsjcZRMy4V1c25M0AyPZYASTvh 5jwyW64oVvqbY8Vtb1Xazamvz5pzak2XY6lHZxzx7mrdsSVGVf6sUf0ADLF+d5NhQa50GDyB/bv rVBIyHZAyJ8FIq+pzpzzDn0H/zza2eGANyAi7wRSpKiE8MeeMPYYsO4RktnTXERm9bMwNoCu3ym gz7B8SywdcztAPWV9BOhT9TJYU/oSYfjDSnY9dpyOpYjxDquazzLiyx5a8NVJLEc4wR+PcfpBMw QyNzbM5zE7AqVpO1nfa9qepXo6iEnmhHAAoJJbSo3q2wlVg20vFO3jaDoNBkESljGdf8iIJCZW3 N7kwqHVft6jA+Mrr7Le9jM8RMZb/2zx5bC3EnDF7wkQ13yxmZgfVv6z+6Pdyt3LDcGbJFaZm3Qs Ia+yqQzFD/DnGvbhz2OIEuxnQUwtPrxA== X-Google-Smtp-Source: AGHT+IGMLdxDmgFJGj86jaPCx5isb+ag8PwEql7qNlwH9OMESXYvP3DqWMAC3Whu+8REx638s8H1Ow== X-Received: by 2002:a05:600c:181d:b0:46e:7dbf:6cc2 with SMTP id 5b1f17b1804b1-47109a22a51mr6727735e9.8.1760551070430; Wed, 15 Oct 2025 10:57:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/7] target/microblaze: Have do_load/store() take a TCG_i32 address argument Date: Wed, 15 Oct 2025 19:57:16 +0200 Message-ID: <20251015175717.93945-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551133636154100 All callers of do_load() and do_store() pass a TCG_i32 address type, have both functions take a TCG_i32. Suggested-by: Anton Johansson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/microblaze/translate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 002f921e00f..0fc8faafd09 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -708,7 +708,7 @@ static inline MemOp mo_endian(DisasContext *dc) return dc->cfg->endi ? MO_LE : MO_BE; } =20 -static bool do_load(DisasContext *dc, int rd, TCGv addr, MemOp mop, +static bool do_load(DisasContext *dc, int rd, TCG_i32 addr, MemOp mop, int mem_index, bool rev) { MemOp size =3D mop & MO_SIZE; @@ -726,7 +726,7 @@ static bool do_load(DisasContext *dc, int rd, TCGv addr= , MemOp mop, mop ^=3D MO_BSWAP; } if (size < MO_32) { - tcg_gen_xori_tl(addr, addr, 3 - size); + tcg_gen_xori_i32(addr, addr, 3 - size); } } =20 @@ -868,7 +868,7 @@ static bool trans_lwx(DisasContext *dc, arg_typea *arg) return true; } =20 -static bool do_store(DisasContext *dc, int rd, TCGv addr, MemOp mop, +static bool do_store(DisasContext *dc, int rd, TCG_i32 addr, MemOp mop, int mem_index, bool rev) { MemOp size =3D mop & MO_SIZE; @@ -886,7 +886,7 @@ static bool do_store(DisasContext *dc, int rd, TCGv add= r, MemOp mop, mop ^=3D MO_BSWAP; } if (size < MO_32) { - tcg_gen_xori_tl(addr, addr, 3 - size); + tcg_gen_xori_i32(addr, addr, 3 - size); } } =20 --=20 2.51.0 From nobody Fri Nov 14 18:17:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760551159; cv=none; d=zohomail.com; s=zohoarc; b=W9fXBWvLzasqSXa5FQEepIVu6/Avu2B4IbxFq1daUao3bH0VeMIaaqz/IGh0duVlY+xlBm3GGegjhxgbib4Eh63PVGPbY0h8zxTEVulRmBuZgd7pyLpD6FGOofxPb2LJiS+XoQqWwEzclGBmxy/yNvA6y88RrF7D2bxMiPGMxt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551159; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Sm0VhjiosRZGEONgmdQidUwgeCNLAFiEbQdZpOa2Z2o=; b=VnZkD0h4vALxeiehnD3LneiQFnfkWpuygM2OhoMj/sum0TZLG6/aiCEtNqW3gu7T59LG/PC0WWG8Z3KEv+rEmsVy+IfwuZJmMNTHNtbqJ4qwlAJ2NWBGvoUrVi/Bq/ZeMhuzaHPjQcCG9aqvknH3afbEmdbpe3xZdJg5fZlUI3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760551159159473.6362223308507; Wed, 15 Oct 2025 10:59:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95lI-0007i6-8C; Wed, 15 Oct 2025 13:58:08 -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 1v95lG-0007hq-Qw for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:58:06 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95l9-0005Wk-60 for qemu-devel@nongnu.org; Wed, 15 Oct 2025 13:58:06 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-46e491a5b96so40443805e9.2 for ; Wed, 15 Oct 2025 10:57:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5e83e1sm30438690f8f.51.2025.10.15.10.57.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 10:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551075; x=1761155875; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sm0VhjiosRZGEONgmdQidUwgeCNLAFiEbQdZpOa2Z2o=; b=Qisy+cflQI1vWQtx5G908ijAT6qXbcijMxQXjfwlYC7QqRW7U4U8ZsXkDFu7lO+1yM JOZT76Scke/KEvdWTEoT8Lg1KtgNjjLqrPv9Acfzwd3QPXIJYwFTUzurS89X1B1BMzRm +52AT/G0hAzSex+mRlo1w+47ODtO3cL5pL4ssaDZuHJ/jXDDDgyMSxc5gdZoqsCos/EG Tw9Ow2CwOkm7aOIPQ4xxJJYmZK3lhUDl4H/mYaghemS+5PeTjgR4kwX68AeSzbjpFc4T 7osHM1DdN/xmiB0SQlDeNU7Qc0oPKmNM2Ks5GfHdtoNQtlcUpkCGtBYO1S7j+s9iZFS7 Ipuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551075; x=1761155875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sm0VhjiosRZGEONgmdQidUwgeCNLAFiEbQdZpOa2Z2o=; b=HrQhktjm/YWt30epsCWBdjVr3QhXJ0hc10HKRKyfY6ta3SbdVtM1Nis5GY2mxetefx y6VkD2Dxo290CWW1rHVTmdxKoRio8bt2MtTEe/gu+KGmXRDCgG+iOw+g3AiBf/JJjX4U agupVWj5UGiPyl/dil8z/u+d3FE7N4WLrCR3vh4QFqup6GkScUfbMHIiyi9QMS38k5Ug gCYA0Rz3RC9h0SN7vpW5jpY2EadNMmyajD2CJGZ/4gAQMMOdEyuLtse1M9CWKPz2FxRV xu3V8xNf9yr4zXwWalfdQBdZAW1uhpQPhdsaYG8TZ9BvKl5jyLS4ee+x1tFJoOw/O931 i47g== X-Gm-Message-State: AOJu0Yz537vi3xU8tRzD18WW4mYdEIYECcg1k1bixDVbdRabkI7u9mcJ RcmqDWhK+S2qR/WxTwGjFRCpMEtIkB+qM4InxyxDuxivHrGwyWrOVaemLSVSo8dvxT3fhKCLFXZ NqclxotYp/f7y X-Gm-Gg: ASbGnctq67JFO46X8NeV0SCH1rpT1UJeCIvMbtU5qDJnC0Tc5nm9+cjjO3UGNERtPcn 1ojg/2r1GGct1CNdjc5iQoUDh6LBTmcgIympuJe6Jql5y+ARwKJHIqsmK5UZNnoG5ZmVjLV6T5E 7ul1gRidtplHhZguwugXpkIJsFlMWbqGP8YcIiu4v3o0XZL93yHnc2oSpdfUL4qe1JppBIB3J2G BBCC3d8p8g/WQ/9tbqcGwxJ0vCeaYaQCiGMn6xCnWBGV4kNEqdjFvFKM7LSFMeEQlFhz0zllhHG YRpq8GOdXk24rz3/57JkpV1nH+zreRYeaw/Vs5aGaA/H059JUMmsXPepMeLRZsOFVuHHgD0av9I /tzn9/W5RZ0zi5N3n09KzQ7H571Ye+BYtme6S+HVH1L1sL2Tqu8xozz73ew0sQ4c713Fw0OVCGO nZKIMbIXrT2+F7xLt6bKGthVXsh8vPv3Ruisj3PnYt X-Google-Smtp-Source: AGHT+IGmoY9I4vfr3ZVBrmO4Z2nyPgWMrPv/jsCg0GPsAanIus0e+UAONaoDgE/pvx7myKMVF3RC2Q== X-Received: by 2002:a05:600c:5488:b0:46e:45f7:34fc with SMTP id 5b1f17b1804b1-46fa9b105ffmr206303385e9.29.1760551075457; Wed, 15 Oct 2025 10:57:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , "Edgar E. Iglesias" , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/7] target/microblaze: Convert CPUMBState::res_addr field to uint32_t type Date: Wed, 15 Oct 2025 19:57:17 +0200 Message-ID: <20251015175717.93945-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015175717.93945-1-philmd@linaro.org> References: <20251015175717.93945-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philmd@linaro.org; helo=mail-wm1-x342.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760551162193154100 CPUMBState::@res_addr field is used as u32 since commit cfeea807e5a ("target-microblaze: Tighten up TCGv_i32 vs TCGv type usage"). Convert it as such, bumping the migration version. Use the RES_ADDR_NONE definition when appropriate. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/microblaze/cpu.h | 2 +- target/microblaze/machine.c | 6 +++--- target/microblaze/translate.c | 17 +++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 3ce28b302fe..14b107876a4 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -259,7 +259,7 @@ struct CPUArchState { =20 /* lwx/swx reserved address */ #define RES_ADDR_NONE 0xffffffff /* Use 0xffffffff to indicate no reservat= ion */ - target_ulong res_addr; + uint32_t res_addr; uint32_t res_val; =20 /* Internal flags. */ diff --git a/target/microblaze/machine.c b/target/microblaze/machine.c index a4cf38dc891..48efa546d39 100644 --- a/target/microblaze/machine.c +++ b/target/microblaze/machine.c @@ -78,7 +78,7 @@ static const VMStateField vmstate_env_fields[] =3D { VMSTATE_UINT32(iflags, CPUMBState), =20 VMSTATE_UINT32(res_val, CPUMBState), - VMSTATE_UINTTL(res_addr, CPUMBState), + VMSTATE_UINT32(res_addr, CPUMBState), =20 VMSTATE_STRUCT(mmu, CPUMBState, 0, vmstate_mmu, MicroBlazeMMU), =20 @@ -87,8 +87,8 @@ static const VMStateField vmstate_env_fields[] =3D { =20 static const VMStateDescription vmstate_env =3D { .name =3D "env", - .version_id =3D 0, - .minimum_version_id =3D 0, + .version_id =3D 1, + .minimum_version_id =3D 1, .fields =3D vmstate_env_fields, }; =20 diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 0fc8faafd09..fe0101683e2 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -55,7 +55,7 @@ static TCGv_i32 cpu_imm; static TCGv_i32 cpu_bvalue; static TCGv_i32 cpu_btarget; static TCGv_i32 cpu_iflags; -static TCGv cpu_res_addr; +static TCGv_i32 cpu_res_addr; static TCGv_i32 cpu_res_val; =20 /* This is the state at translation time. */ @@ -857,7 +857,7 @@ static bool trans_lwx(DisasContext *dc, arg_typea *arg) =20 tcg_gen_qemu_ld_i32(cpu_res_val, addr, dc->mem_index, mo_endian(dc) | MO_UL); - tcg_gen_mov_tl(cpu_res_addr, addr); + tcg_gen_mov_i32(cpu_res_addr, addr); =20 if (arg->rd) { tcg_gen_mov_i32(cpu_R[arg->rd], cpu_res_val); @@ -1024,7 +1024,7 @@ static bool trans_swx(DisasContext *dc, arg_typea *ar= g) * branch, but we know we can use the equal version in the global. * In either case, addr is no longer needed. */ - tcg_gen_brcond_tl(TCG_COND_NE, cpu_res_addr, addr, swx_fail); + tcg_gen_brcond_i32(TCG_COND_NE, cpu_res_addr, addr, swx_fail); =20 /* * Compare the value loaded during lwx with current contents of @@ -1052,7 +1052,7 @@ static bool trans_swx(DisasContext *dc, arg_typea *ar= g) * Prevent the saved address from working again without another ldx. * Akin to the pseudocode setting reservation =3D 0. */ - tcg_gen_movi_tl(cpu_res_addr, -1); + tcg_gen_movi_i32(cpu_res_addr, RES_ADDR_NONE); return true; } =20 @@ -1173,7 +1173,7 @@ static bool trans_brk(DisasContext *dc, arg_typea_br = *arg) tcg_gen_movi_i32(cpu_R[arg->rd], dc->base.pc_next); } tcg_gen_ori_i32(cpu_msr, cpu_msr, MSR_BIP); - tcg_gen_movi_tl(cpu_res_addr, -1); + tcg_gen_movi_i32(cpu_res_addr, RES_ADDR_NONE); =20 dc->base.is_jmp =3D DISAS_EXIT; return true; @@ -1194,7 +1194,7 @@ static bool trans_brki(DisasContext *dc, arg_typeb_br= *arg) if (arg->rd) { tcg_gen_movi_i32(cpu_R[arg->rd], dc->base.pc_next); } - tcg_gen_movi_tl(cpu_res_addr, -1); + tcg_gen_movi_i32(cpu_res_addr, RES_ADDR_NONE); =20 #ifdef CONFIG_USER_ONLY switch (imm) { @@ -1885,6 +1885,7 @@ void mb_tcg_init(void) tcg_global_mem_new_i32(tcg_env, i32s[i].ofs, i32s[i].name); } =20 - cpu_res_addr =3D - tcg_global_mem_new(tcg_env, offsetof(CPUMBState, res_addr), "res_a= ddr"); + cpu_res_addr =3D tcg_global_mem_new_i32(tcg_env, + offsetof(CPUMBState, res_addr), + "res_addr"); } --=20 2.51.0