From nobody Fri Nov 14 18:19:08 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=1760551479; cv=none; d=zohomail.com; s=zohoarc; b=DlkEJSGl+dLoWv/X4f+m3aopZpDtuJg28PcdbrJMezHcgVdHwRVSuEAT9BNjRVDQy5TTYB6Z3G11vOZvbmiz9AOBf0CWU6husLNDpMZA0Ey4R0Zebjhm3eusrQrVXyewmmL5pD/8vvd64xIFdvCn4P/hv/hJRJIQvtTmfJr6qjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551479; 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=SCri0L7dV7AYPB3fMfSxJmfn8bNy0nl7NoNTBNn5I19XRLqvycx9i8x4ex08WQYEuHMhEwMe+5GtrIzqoAFhte8Pi5y3c5B2TOxTfUEogMiXcP7NZr/6A+HDoXWrO+nVCSuIOE0JpoX1SkbzebG3pKI0ZLMCaYiv4O6GNpRd4V4= 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 1760551479444873.8356399340906; Wed, 15 Oct 2025 11:04:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95pC-0003rk-Ap; Wed, 15 Oct 2025 14:02:10 -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 1v95oi-0003nq-4s for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:55 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95oX-0006EL-Fx for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:38 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so5472185e9.1 for ; Wed, 15 Oct 2025 11:01:25 -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-426ce5e0a03sm30635110f8f.37.2025.10.15.11.01.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551282; x=1761156082; 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=bm7HAem/1s/8/FYYce/W/TqxupQIDRpOqHL9dDUv+20OsaGYez6bp2LXAw6tnka6Oy kIW2RBm5zlauqFlS6EDGC+0b2rSOE2QWf9yl3zGPdOBfhJOqdB7Mxo1JBafYO4fbH/D3 b/a0f8OJ/SooTNlAeScjvsbiSOlfiyvMGoWJxA4SW5RtRrDRgg3NMkNADCemvhDYUbFk SOul8ixUJV561YdmsJXVVZCL72Jw1GyJ8L+10a9xz9xf30fJJ4rukwa9Do743BYE3wtO 8Dcm6dzeuSB3rgttXsLMdl3pud09su0AauLccf1B6uksXpkItQN7QGIaGXOSQZ6T/nPc RaAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551282; x=1761156082; 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=TE7Dl5k6rUv0mYikTRLoMDFfzr7+PKpMsKUngnqmw40zQ0VeTEmmf/hZ6asORxrV3c dvGOZbAI6zoYcpRszVhDwIFlwUOP1a79+3BDxLu3RBVWz79s8PQkqDOBPx2Xa2D41zRu syI3o78dusyJouEzzylh0SE1w7q5GUoemqQCEuCzv5nTZf8QhPAuf/xCAkGKD3Zrs99r j2YMo2XhPojNsWVyn86P/YRu4iuhcXEhKGxNOme9aChzTTwF+e5hI9xnQQuTUZELXHQE JrU33DswfM2uTm3jNjb17sX4zzODtZG4MR2bZBRpouoLEzX6B7tqSl2kSNhMzgY2OOWT Rt+w== X-Gm-Message-State: AOJu0YxGrBIYku+9U7wFUGlK3P0GGzKrZlB1OZK6CytUMZ8El7NohxD6 QTIqjhDvDcvdf4UHmmNrx4ZCEQQKssjgZMvwZqsLaUsdw90o1kfbxXmgu2Y2gTFsXrbKKnn407T REEYfJukmag== X-Gm-Gg: ASbGncuW4VQTmWzMvVZPyVE/LoyZQNi2jBOZOU1C5ur6ZDNkB72jTuS7YZSgCzQfu8i jJy2U+a53VJYRn14BFhXRtqtFt4LRI7KBuGoltAekEqyvTaTVASuDVkxaq4mca/2mnv21OV9+92 eQJbr0LlGWeZT1BHfteLUzPHBQtYrfG55kt/NMyKhssosvijpRoCTkS39kGgClTG3xl6WGpUdne qsiKbBjjy+Uk+jTzAT3X420De6k82u1vDx9noSvvSqFUWqswVdc+8avkPJp5Cigyyb9IY5TDZu7 AVxIPut64TEY7DhjeAVHmYDtCC3/SqIuxL2ZW0T3kovRulvwE67BsJTbBU+/PVMlHrusHf3A3Tj mmSrpHRhaGc8hNtYQdHEhToqvEqqwR9cFAUqaXoQHLvzKviCtTxfez0X4ZxHkLU15CxRwixSqrZ ZOzYyPkCcBlha87CbaKbw= X-Google-Smtp-Source: AGHT+IHVZBxXqxecjdJMpdU/5agf8TLKb2ZHE9xB3DUsOXDWMLQE3PMNoJcRqEZrr7l7IEEAS93SGw== X-Received: by 2002:a05:6000:1a85:b0:3ee:1494:27f5 with SMTP id ffacd0b85a97d-426fb6aea97mr891783f8f.13.1760551282374; Wed, 15 Oct 2025 11:01:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/7] target/microblaze: Remove target_ulong use in cpu_handle_mmu_fault() Date: Wed, 15 Oct 2025 20:01:09 +0200 Message-ID: <20251015180115.97493-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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_PASS=-0.001, T_SPF_HELO_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: 1760551483033158500 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 Reviewed-by: Richard Henderson --- 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:19:08 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=1760551367; cv=none; d=zohomail.com; s=zohoarc; b=aWq8tWTjXD7Ot7TL9F/toTYzgm8WXJtoh2phbtsZkEcLTfOL1GiKXCDDrbAKx0zx4LVNzjnZYRFlpIe1wSTKtNB+vgQt2xCFVl+4mgeRUjOxcYT9IamYOCvFZ5C17tsjUF7DmnLdpg8KPQvzx7SRYSb1pXcjwlG2/1dugI0PoEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551367; 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=a+5QLqNF/C7AskPXf1q1Srqmcw16no0RiCbRDbsNij/MEwFqfLtJAGB6p+Sln1lN9d9Ch49tEe6vFIfzRZfsweGEgMGmIjXu4NxkntKrYGyRLn1enyvORd5gO++rSNPP9pLX95z1WL1uoKQZcddOHuCxSGSnP8TTNe5UOHO5Eww= 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 1760551367155205.17939729981333; Wed, 15 Oct 2025 11:02:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95pB-0003rh-WD; Wed, 15 Oct 2025 14:02:10 -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 1v95oh-0003nb-4z for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:55 -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 1v95oa-0006Ev-8d for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:38 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e504975dbso42616765e9.1 for ; Wed, 15 Oct 2025 11:01:28 -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-426ce582b44sm30437490f8f.16.2025.10.15.11.01.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551287; x=1761156087; 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=UTWHUHC0YmTuhlCCFVk07OoKmbXeZ1lFGUJ2DKAfwizGhQtNbMYglmfVRgOqM9oRwz FDnw5KVGLVaqw2e9f0M7QtG6yb/ZqMnbCzS3Xxz1S/TlEth88jwi5PlRmHGAe5rDbMhl +heKmwjrJesf9P0ZzNAgT22GYV2lzk9G2k9d1Kjx9GIYvNpgpJhTEZiKkgTQTFhQYrvv 0f4fueX8tcdOxGSzZoiFQVjGdGlOXksROv0NK52ono8F+sosXshckqJzv5P0wkcjSZrN 7dEbFUcZ0d3sLg0kp6bgKInjJWRUlGg+2tENASj8MPfEjE3TXaiFCoDKTH9dqBSkI7rx vybw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551287; x=1761156087; 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=IW4NinyowgbbO+aFMRHvoGOhLk0gm9o8fQV0WKrjyFTpCh4xRVk/0tbPjpHNhNzFvH hOSjNsBFESQXz7PXfzkN0XoYYPhI9cIEYh1Jc3eXcvTSA5bKJYcKQArfauJ7lZWOoXNJ x/IRQtEtZ5HUwl4VJOX4MzxibeAX3NZ/uzyMFo1Cmb1oAVPdxDf3Whas7SOZtuG2QCsw Pwl+gY36JgVZFgU0OEwWQv8drB9SGUmN5fKdK1+Z7bntK2CBVZ+Cc3QMXfajoHHuysw1 FD/Pjp0izQV6HflMAMQrn+xqoONOGJJunFqq+f8R/72G+3D0v0askd1JOtXOX2Do8f5X yv2g== X-Gm-Message-State: AOJu0YxBd8JIlOTUlL7uL6KM4pnLBfFhXkPe0cKHfoMHE9wHUR8BcP+e sjRYR/lcKCyr3mKVH0jrlzRMLnPTVQNoV7iDM0BmgU/XoRrRz24l0InCbeENZwyw3JXydGYcJMW S7lNU46ML6Q== X-Gm-Gg: ASbGncvdJJyS2axWFbYTEw3YCd0z0vsSv6mkVwQHlCrj7dhu8Dig/eV/NJ+IVzavIph dFghDUw6QrCHzkNCo4yFLjvggYGENqtLlTkpc96TJKq6oGwWUkcEyzwanZ7m+Si/beTYZa0IEG8 CWyQL3KA/OsErLhRBhiGADw3gZf+LMWNUxcijNcCEO4XEvcueSf0tFGwMa/IdWq3R6PCab2cT+K ew8YZ5NOOeg7fMXn2N3Ebm8D3pIPKLDjUDlavGP71cpzUZlYSRgQFtNflH3XZxhjUWMOSCBMnJs EIqZ5nhiNjahQawryEo1Rv7iyjA2YAHvg0fj3NIqjtHFP1tPE4Hhw5NsH0vWYlZLzoTNt7TR4Ea 43qyd7CLfmNRGKt4UL1hTRO11xofSO+gbzeBWPy0JqRp03cyFK3tJV6ZjNfnEsayppR7vfJlhrd cPweWQryPz/21RATFb0ccNrh7DqB+3cA== X-Google-Smtp-Source: AGHT+IHhLiNBQRa0K8lVXSig+HVcMpglP2pQxfDEQuaL4j9K0HvVfkVAwKmA9ddvpYkk0TRlXlD1Ig== X-Received: by 2002:a05:600c:1d11:b0:46e:5aca:3d26 with SMTP id 5b1f17b1804b1-46fa9aef840mr222269875e9.22.1760551287207; Wed, 15 Oct 2025 11:01:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/7] target/microblaze: Remove target_ulong uses in get_phys_page_attrs_debug Date: Wed, 15 Oct 2025 20:01:10 +0200 Message-ID: <20251015180115.97493-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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_PASS=-0.001, T_SPF_HELO_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: 1760551370230154100 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 Reviewed-by: Richard Henderson --- 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:19:08 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=1760551453; cv=none; d=zohomail.com; s=zohoarc; b=cEB0Gy7VhVeg90Totlf26nTz8pg+TXVbflBQ5Y9tQRF329dxaQgtYqWvkexx/35SZh7nfjJaSj/Pn/uhDh8oSxoMJq2E6LV67BUidmjfr/vrro1bPgiFw9BRX9PK7vC33PGrQkfEqj1pGymPNXxEeR/FgpShMINTZbcKLdFEeuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551453; 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=FkpLHmewKQAE3bC1WKkaUcUXyNwYtZ/v8V8Tztud9OVLTuWe5uPyluVkr0d6xSvIhMLmtssrer6i7IwIOWegyt9hkPUob1ZkiYlxoB7kajqNfCcHZH5BSwQ45L5OMj96WVqtuIGZ/m68pu3kKz5z3hrhSIYlek2C1E7K69uE8dA= 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 1760551453754533.664076816905; Wed, 15 Oct 2025 11:04:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95p8-0003r9-JX; Wed, 15 Oct 2025 14:02:06 -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 1v95ol-0003nt-HO for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:55 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95oe-0006Fa-33 for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:43 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-46e6c8bc46eso46478215e9.3 for ; Wed, 15 Oct 2025 11:01:34 -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-4710a20328asm8387755e9.1.2025.10.15.11.01.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551292; x=1761156092; 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=eeoxEsR9TCcbPnrGkL3iOyRwe51DRlmbO6vtxbA2ETd3rhLGHWoo9aR2LsYZKYIQVJ PwIECFcPAhZxT9BCjMqoO5dQdJSs9nZD3xC0GDXMfSJVEzeOFMRqXLOEyv9evT1m0IMl KtL6u79Kk52kHCpnn+yhY0fQXkHJe0KwZswcaywD9cP6cJiHuq7kPY/v3f9DW4OfFRtD iVi3+b/PelDANTfRdpnfM3Blq27Kz5aLGm2umfx5G3wfE/oWn4wlHr+leSkRYXry0Vdd qePTT4H3HRN+0XCxj4GEhccAdPvxeItQefHZ26+qmBN3OdjMgK+D/XWXe2ofNHk1HJad icGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551292; x=1761156092; 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=aZcHOfUzYZef1MwJ1U+/fCw7TcH36+8U6A3gI7rrLfBjFxgQBX9OZSkODC+fX8zUok tJeS4VgyyKJsSsW0UJFYUi5kJLUrVaWg5v5cLVB8DexmkUuUpI6vSTyOrE7BfERQ0V7P 9lHPb6P+Ik3KZEGZ1tWmMxz6BloqhiXA7DBSm1/SDdNspEB1XYcih1rV9ffmuOyC9LmV 103L8X3uIuEIWDH+GPOaWSwZKmazgDJaVLSzy53pEiITJlEtgDeBc8ljDsN/ckSfiOe8 ri6SOOW2WxVdZJRfUWw+pk378vu4RqhRVFFHrbH3VoiaGeclzbb429Udkz8AZ4im0zIk DMVw== X-Gm-Message-State: AOJu0Yxlhdc2NvTbtQEflRGajy7jP14gtitskR/JW9SBYuTxo8LwjAoA x9jSyLBCkvxM2oVcaToDxokHXiJ7pH0UcJcKMl0xNQSIC5jwFGQXYcX4Vib0kL2bMsvKquBZIir LoRfGeoerug== X-Gm-Gg: ASbGncuISar58OMlaCKn3zDj471Cphk0S0VrTPdt0rqaAcnw/BQCRIo6Svf+j4HBcX1 PvRRpQd/jmwlucnVl/4XFGbKaK9nuUuFTk3j9F5IxfNumU9RzGyyj+WKtAQUCCAHP6WYtcTBGqS 0aKlB9Nv85qTiaZ2yQo6D+fd7KGzdgjpXaNT+Hu8N6/It3ysJ/ElQAaRDaRwBFrPTskEwPrbauY F2pEBE4Hbs6ZY2Gm9suefv9uKz3aN4tKOoC/8fm6A5dEgXwufv10P0J8Rj6lF6W2IZKvSmDossA aYSNHQ6OyYglPYwng/g2pUIsvQXrCeBmlkw4ql3RZMHb80KS/EQh9mqmaenk0rJsC3y2KPa4TXe cYlO5YYBPwtE03cWAQWjAK9F85iDmmvWme9XqgT361SyytrcoBL8Ez0D7qhtJJ1RpGCWdloKbAb EuhvFBsFdLQBskNa6E3UXHBj9kWD3wQw== X-Google-Smtp-Source: AGHT+IHoOk0Y+TM0NcopWernL11ZV7KMHjfwjVzLtqw75+zPta1bkG5ZiFL5PJo2PDcs6BavtlVNCg== X-Received: by 2002:a05:600c:8b54:b0:46f:d897:516f with SMTP id 5b1f17b1804b1-46fd89758e7mr72203455e9.34.1760551291957; Wed, 15 Oct 2025 11:01:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/7] target/microblaze: Remove target_ulong use in gen_goto_tb() Date: Wed, 15 Oct 2025 20:01:11 +0200 Message-ID: <20251015180115.97493-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1760551457234154100 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:19:08 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=1760551363; cv=none; d=zohomail.com; s=zohoarc; b=SkD2Y+wInf0XtkamZannyF0Pfidog7EL1WgHz/8Nz0pObPk5grYeukvTVRJEZULEb0NpZlvvukID+rJWw6LOgKF5/2puiNUoOlZOw7R/W0us3vQDhVEBCDETiSWbpqx0TFDMXuK0iAjT++lWvIvBu/CNe9g77H0ADWlulIpD8mE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551363; 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=yrPHlsfsgalogJYV5kdJutsTBB8awCOsQOV06x5p5gM=; b=QUhJm4CFLjehf6eS1P2+MJPKKTbmYCimbYKfMUYZlzBcoxKIAg5LxsaGcA8/iEsx1lMpqR9AL6wC+uxw8+Ceg0r/PG3Dao/uycKQTk5E4yGYNmGxJFHa+Vh0M2TuNcCKMbkkhPcRKapAZy9nkxiGCaL0hRMkxdz9XsCFO0e9fjc= 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 1760551363767651.9877888172296; Wed, 15 Oct 2025 11:02:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95p7-0003qx-5y; Wed, 15 Oct 2025 14:02:05 -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 1v95ov-0003oR-It for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:55 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95ok-0006GM-CM for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:52 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-4060b4b1200so5307259f8f.3 for ; Wed, 15 Oct 2025 11:01:40 -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-426ce57d49bsm31762559f8f.10.2025.10.15.11.01.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551297; x=1761156097; 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=yrPHlsfsgalogJYV5kdJutsTBB8awCOsQOV06x5p5gM=; b=VCCHOJa79TO8nsBMTpTeio/r2gQhA2GiHojgtcbXrHdJcI0yphIiKyBpTUIXh94mEx uj/FKtoc4AO7mbO3Y/Nlg49V2LbcH2X6ptid4C5OwFTvsvK/aPueo14AnWsfsbhzh7uL oTES6vLMnKR+kd3GNriskmXbl1uIqVhlShc/z2HHJ61T/XZwQ970xm+PyuaQsg/t17tX tMO9eaPdVQkzUmU6fIoHKpYeFm6c46PmoDeZHyV16VAtBeAKueVrcNuQYxqCIKYKEU0l ncD3x82emcadesFo17e5TwmPDyloViaCmT7VeMHmyfaXwulAAHDMJW1Cumr2p0hag6nW jjVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551297; x=1761156097; 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=yrPHlsfsgalogJYV5kdJutsTBB8awCOsQOV06x5p5gM=; b=TFkcGywg5mspEPHR6lpU6GSLisCIc/TREEfzI4iv/ekF5IlQEznhQeHGUn++MwsioH 6rkR6OsG1pH0q7CZcsBG0ZGExjqFPU5qqADXQAnig67tfV4Jte/auJl5GEmzeQc5ssWc vcvGkMFElnoyuFK4t9+1sh80Ml+xWQvJFhtDt49N5JL9NTKYZSjuO8CZfHkt0W16vyG0 z9cqE2SFb81jsmUcxnBrVtOs9O5GErlA78MWIGhqlJ8fNBLJgq5SVCT4/HDWcTvNkVpM gfMv+6O280DmyzTwmmqx3PN0AXtMNOQXN6SsYyhmnRpItKqhFNI6vJSAXwRacnei38EI m1fg== X-Gm-Message-State: AOJu0YwS9py1eOWuZCr6TU0ScoTcmWZMfejQnKqBDs9p6AnJQm9GTNKq gDpbxwQbESpF8msTPpJhkJ24pjta5Skf5knSDXM1sSmNyYRrYbMw7Uey7uadyTVfaZL12WyvOiZ 7Cq8QQlihlw== X-Gm-Gg: ASbGncs9JAxHmUwLVbmNNGNfb6Onr9W4SsAlKee0RxX9XT3+GhBaZ/m6b8nGJgkOo9O PnPGmRJru2s8DUWx1x/Et19bATtIivIOPkgoxFE/03uPNjC4eqWnsOqVU7gfeWwTh6plHpCx5gZ ZMNiPyChVGbKGl8RcyvSDL9uwB7vyAYhPahR84gCAVg8PNH3GPXeg/DNpzbA6wPAabU5XD0/p9b Nm/27/0ux7gwga7ueAGveX28+3WUz7AdDRWIMbh8TcTwn6vnOGaxw4mNs3drcPVWtgEsyE3MUc6 ex1ZMq6V08+BWGs7Pqt+6AJIZ2wHqzjrgpeuR3hworvigIfUVrFSDiXUd5uhQN6HxSLAJypZKBa +jVPn+5fvJYRkyfJ7wOWtCZkhslab1m8yMs/UQuWbT20uJveCsragDovl4kOSm4spJiwFAI6oR5 84+xfzgTrV+x7TH+08bWqCL5yccp6T0g== X-Google-Smtp-Source: AGHT+IFC+NefnqddUSKxjh0l5NYKR/NIZLfhlDGGPJS9Jle9EJtDpPjETc4rorfbsat69fGq3hoLUA== X-Received: by 2002:a5d:5c84:0:b0:3ee:1461:165f with SMTP id ffacd0b85a97d-4266e8f801amr18061095f8f.31.1760551296717; Wed, 15 Oct 2025 11:01:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/7] target/microblaze: Remove target_ulong use in helper_stackprot() Date: Wed, 15 Oct 2025 20:01:12 +0200 Message-ID: <20251015180115.97493-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: 1760551366155154100 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..994e1d5cef0 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; + TCGv_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; + TCGv_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:19:08 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=1760551382; cv=none; d=zohomail.com; s=zohoarc; b=QN8NuNXEVGs9caKWrYY1xhA66JygvCuhSh5t7zsQGNoVP/fqvojO5pi+eqNFMr12emeg6E2qG5aBLZn7gXe85fCnjW7eXarXo7N1xHvXYBb8Lgc1DdtSuqIbeK6130UsdVyolRy8YapHfcVL/Qp4JRRcKJRQfdryDSgBpcABihY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551382; 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=tnmxi6Yf1MiEzeJwE97RY8q8VnjAUodXcAwkoIgszys=; b=JZRsQ4JccTVBMc2J3KD9dBhwkv9+X6wHZ6eBRaYpe8V97qpTfyHrbK1INzqRvFu6H0b0mzIM2tMVGkDzK0BiXYFYixVZNaNGSVgBX0LtSNNdod6yCxiwKPaho+nca2cRStv4X2zqeV/8pRymesWyazp7j/TlmBA/06qbUUKT5ks= 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 1760551382591472.1679659091311; Wed, 15 Oct 2025 11:03:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95pD-0003tf-1H; Wed, 15 Oct 2025 14:02:12 -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 1v95ov-0003oS-Uc for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:55 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95oo-0006H6-Qe for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:53 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e384dfde0so70259855e9.2 for ; Wed, 15 Oct 2025 11:01:44 -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-46fb483bcf9sm316996965e9.6.2025.10.15.11.01.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551302; x=1761156102; 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=tnmxi6Yf1MiEzeJwE97RY8q8VnjAUodXcAwkoIgszys=; b=kf3JikzebyhXefCRtUhTSfahVJI5YJJxyBJYrsXTBdQL2n/vdClIbhNxnhEHYCKLke LJT5O3+ln25MfMVypy9uPwjToTr89RC7dq8s9ltseYTvWggGizQBw8LlO4Zikw7OBDHJ aBTnb8FrY3MTGIwGZudUS6X6ZavpD6eoDvQgG5hyL9E32ChpIMGUTf7aMwO15t/O6nXT Cnjyu0bU3ZJmfBH5ppUqHHStjH1mLZFO3fRsdRCzynFXgTZsv6MvGD5MjWFEV2DS3e4g GsuNlMq9gY69N0mYckoUVIsNQw9p0l7ClDAb7gG8kwx0MiAyFuYymJyBjXJHM7bAzA3M Laig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551302; x=1761156102; 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=tnmxi6Yf1MiEzeJwE97RY8q8VnjAUodXcAwkoIgszys=; b=D0rufAuFe2VOzJjNXwiryLxweLOx1f1MM3FniaJsFObSNgnI3a9dp3dtqtyWDte4Ck XnN1PHhin8XT/Qdx8x0BHGcFsEZq8srP+/3SRGTfrr3i+OhZBAwv8XtdzuMIB0z/iPZF lCut0JwHBLTvtriiaYtzFiZ3lSReWhCXfut5LkVAhxRxB6pXYSElsEmzHgZHbHY/CsSH yY3mLd2SOd91Y5P4bi/P6eh7OSOuKRTkso+G8ZprGDtweLym553hNem2T1En4cZEILCG zNSRimW+qGh0hm61UQ//v/2ZYFGoN4JHWrKni3n44uZ0m80BnrBqjyJk+VMek8Sn1363 kgcg== X-Gm-Message-State: AOJu0YxkvTEYuqFK1RvdegNRaptMEbctPrP8y0v/bOu01pWbxcpeoATX 31HMyyGLHkTrkWPYpqzW3E4WgsVjOLJfGL0YtsQuoazuNIaehj2DPk6VPK1safFpcf1aDC7Ecrb wZMcHdqJx0w== X-Gm-Gg: ASbGncve48deCXzEAG3+dSWVERmQQZ1pKbpLV6xiEWVcUOY00nQFfuUGx+3Xj+Gifih lenqOwTcPyMJMElGbrn18hCQJ1LSzvAJQjUfsDrZmVwm+XyEZyCYwjrQJTyKjJETtkYMppuCbyJ A0sRQk4CdTq/3Vh6/2LHWsK4wESAKZIwcBSzHp4q5bGFTXVOQaOE9rklCTZ8Y6R+RWFMOUSqFUv bw+MGfI+5P5HXuTffMYuaRqqPfC862UBO6b8b/Tw4j2OTVKTc2gpK9rg/LZW5aSp8yKAGBQzz3+ Inb2nOSBh1G8uTYmHq7OakqF7i79PxH3f+0DGl0Luq9bMr6MRN9y7pg+2CmsRI1IPDUgU1zuTQN EqLb+nk2ZtSYiI3H+7StVY1z3nO6l3biE52D2mzSiajXSIPvnxcubrPE+CMe9VLkAl2XTk82tm+ 4wAVLaxH8NUC6G29+R7043zKs/DqGw9Q== X-Google-Smtp-Source: AGHT+IHxETPHhXfkvEHUPr6lIoDY0cpRUgl/peY+oC1AjcHDIEfgpYeuxeQprGMcN7VTmoLz+bDtPQ== X-Received: by 2002:a05:600c:4e47:b0:46e:652e:16a1 with SMTP id 5b1f17b1804b1-46fa9a8b482mr216328015e9.7.1760551301921; Wed, 15 Oct 2025 11:01:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/7] target/microblaze: Have compute_ldst_addr_type[ab] return TCG_i32 Date: Wed, 15 Oct 2025 20:01:13 +0200 Message-ID: <20251015180115.97493-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1760551385884158500 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 994e1d5cef0..1554b9e67b0 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 TCGv_i32 compute_ldst_addr_typea(DisasContext *dc, int ra, int rb) { TCGv_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 TCGv_i32 compute_ldst_addr_typeb(DisasContext *dc, int ra, int imm) { TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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); + TCGv_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:19:08 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=1760551371; cv=none; d=zohomail.com; s=zohoarc; b=V4U98TjFSjKHtNuXPU2l0W1TVApAEgJzYrjYC+zU/KKqC4uwQqeheyF+8RvWGdAD9BewZjBQzWMBXFrTZb2T7zzKwuKE3OjMHvw37FrLg2GCd6I9LIEVT7Gk1fKAg5iQGc5UTV8EolK0uD56RqOBR5xc2+aJW+2AxDm6RnqvgR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551371; 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=tU5Jl42ySH9NzEtX9tZDSKOaBw6Gcn2zbwhswZp5WFk=; b=fbX4LVG4dP7YJRJ35JKYvwgewXXLkD2bQamYCQ/9hCRtoBHvzx99VbAkNifkMXgFyQ62L7R+JU7F2oLQJ6XSrwtdP3yezo1TAWsgI7E6JoT6TMJU+R1mbI2VSAIc8mSAlZnYQhchs1VdGsos6C/a6RRwbjkswyRyp036PYhK2R8= 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 1760551371583203.04664375562947; Wed, 15 Oct 2025 11:02:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95pF-0003tg-2h; Wed, 15 Oct 2025 14:02:13 -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 1v95p1-0003pV-KV for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:02:00 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95ot-0006Hq-82 for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e33b260b9so55725845e9.2 for ; Wed, 15 Oct 2025 11:01:49 -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-426ce57d49bsm31763173f8f.10.2025.10.15.11.01.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551307; x=1761156107; 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=tU5Jl42ySH9NzEtX9tZDSKOaBw6Gcn2zbwhswZp5WFk=; b=goUdVvg3y7eyncT4S0oe/8BpTqgUMpV/4fK4vkdXwxMI9skzx+D2SZaRh+5RBIFHaZ o1d6dF/ULB+OSlqFQPSorvHzohgZpRbAIJ+Gb4x1AedBPo2FGvv0VQQLX4hGzF2yyidE IcTRACB8E/872FUMevIrve4WAOVwGOOaAFTGrf3peZuR4UHyfC2lhC1EY5Y6bQGUHutf /Xtpo/IbaqGzc7Oyhq0+BBFGT2BtQQyoTASKnVD8loCKljtefheYyxRp7DvLLPwb4VHO pMwYUU5zgUYDB/achk3SlR7qbXjc0sEcJxxvcUWJbKDLfZF5gfdNm78YEvdIVlIpKItv h+Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551307; x=1761156107; 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=tU5Jl42ySH9NzEtX9tZDSKOaBw6Gcn2zbwhswZp5WFk=; b=mth76h2pEDW8T3TwERGRM9dXzmRSXgRpGZxNJirTGoIXNS6YKuWa9qHP/C6ck6bWeN 7rfK+6vaDBwcaAUcY2plamR8F0Xc1KqI3LUiIu/4yUP2qC+6guUw/ooUZxy/vOPbtTog ykVIj4QUDUL+voUpzlw8AMY/2s6qx8wxKdHq9brmeXgdVUfRrrU9kHcsYA7yM1hQDXc3 r0ZYRIJi6Kr7V/O6EQ96ro9hixH35ev0e85NmTUni9scWypWwMQV1KvlFp77AofegXAh pEAEX+L1VjH8tMLl3CL3XqA3s6VlCxwyHCeC4B8GBlQpIxMx82aqotXgrL4bIktFDdg4 9urA== X-Gm-Message-State: AOJu0YzzlBUGiX2cDOc4zJlsSDn0fNAfxDhfhQAoGSFCdjR1EdvJ34Yg sS4GsmAd+jNQ1g6INKc6nnIyLtzKB97IXagw1hk6c9hEFxA6OtaNVTuysf0ZGQKOm8adE53S1vI 46OUu1phSgQ== X-Gm-Gg: ASbGncugO5QdfnnKGewroVASexpLvY/ig4hQrX9+wBk5BczptBBD/AjTdIYCZEGcC2a ZVbTKQVUiaI1srW8fiSu8OE8fktMcuTyOe5PPuUGMTJOzPWbx6c5/r4FAagohebOKSD/wKU9GUc 9YWSabfuMOhPCdWWWlU6XT47z1bgBFQYUsAgWTo4sbhA++AMTUCjZzoXze58fnVvQ7rL8bJf8By 2NcAxZ7y1mbjxC73hZmKoJ6sTMgZYNquqAaRKtnfGftcfc/TXiDnYfDd34ojEH+8g8tVzezE293 z+BbNUjOCyxbZHahTajt5Eoz0sGm2qm9u5qd4H2eCBFO4ru9W5/bjaaFGhr/rWKdA6rqErDTlV4 uQs0YtYLYr1LliwCpnPImZ98elGsnnZkCKLdvMiDtP13/Ue1vT47baOeSWhRno+zSk6XPh3ySY/ CIibB4VXRDxiDPPW3a8jtkcEub+W7BY86DOccKaSI0 X-Google-Smtp-Source: AGHT+IG6ReUke3arBgQWUWg1No6mGic5/1XOAGk4Y3b1kFH3GSZeu4IOW96kG1McchUKB69NDMe3eg== X-Received: by 2002:a05:600c:3d87:b0:46e:50ce:a353 with SMTP id 5b1f17b1804b1-46fa9aa1c5cmr209572115e9.14.1760551306977; Wed, 15 Oct 2025 11:01:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/7] target/microblaze: Have do_load/store() take a TCG_i32 address argument Date: Wed, 15 Oct 2025 20:01:14 +0200 Message-ID: <20251015180115.97493-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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, 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: 1760551373613158500 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 1554b9e67b0..ed53848bad5 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, TCGv_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, TCGv_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:19:08 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=1760551346; cv=none; d=zohomail.com; s=zohoarc; b=lWtZylg6BHTyGRndXleNUpDDlRBbIsXb/+YYXP2O8R5HJpRSoyzYt0QHAOQ5m/l0ci0582D+9K7+ojhrTcpJF5L045ULa0FAPDATH2DFC0Cjkif89zFe02c8AORs7phm6Bn244MpPpqCZVQDBHU+6rY1lsHGt5tHoC2glc9Z3w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760551346; 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=ydpGCC0LIW2PAhQ+ZiXzjeql1xkA2A/Rbq9DlidsyIQ=; b=cL4IjL5Pey9tZdGo1L2cgNWAfcaUPvx8qsoqv+8OGGUuBGMHmgXjD7oWJ7LiFEpzmejxCnRj9xRmVMRzTay8pzvMEciJL7DQ/Lt6LevpAb24pJPCle98veFZ9maP3GPg7IrRRFu8OiVxLIXS7XqZpobNrQa/C7ULDdQTSzSi8MY= 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 1760551346686318.16833620674026; Wed, 15 Oct 2025 11:02:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v95p7-0003r4-Ps; Wed, 15 Oct 2025 14:02:05 -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 1v95p0-0003p2-Kf for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:02:00 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v95ox-0006IY-Vl for qemu-devel@nongnu.org; Wed, 15 Oct 2025 14:01:58 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-471076f819bso6435755e9.3 for ; Wed, 15 Oct 2025 11:01:54 -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-426ce5e1284sm29982493f8f.45.2025.10.15.11.01.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Oct 2025 11:01:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760551312; x=1761156112; 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=ydpGCC0LIW2PAhQ+ZiXzjeql1xkA2A/Rbq9DlidsyIQ=; b=BLHTf7ATJ6+yL6O2Tc/tUtLIURvXeqxqtNJpXZlYethg+rdq0npio8RUSqdA/rh6dj 07apgJGCwLqvYWF9/7uMSPGzhxx85OzjZJNNE2UrcoJUzVFRqii00qYMd7T2geOshcXw f4jjHuV4hNYKn0LbTTjfUOatsJMD5UgAPyRa521xgJxlWq8/Jsm0rEE9PO33k1I9/3v1 jFV0dsxixSykpCw8SjNbPlkQdm8yVcAmtUnJ1XWFFMi/4Poz0hF2DxyhN9RN7c0LmrxZ SvdcOFCWiGmbfSUf03yl0vq074doCbRKdNU8W8kTXpu5L3751hUpzOgqHLvfvCFqLisr 95eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760551312; x=1761156112; 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=ydpGCC0LIW2PAhQ+ZiXzjeql1xkA2A/Rbq9DlidsyIQ=; b=gddQiakJ3D30lS+yt0x3Bp4YcZgXt4iO4f5NHNA6kI2Vn3YcTVPie9kc/sSQ1vUO16 3PHSQHZ+ECGzEfAcNgDI4AhDjgP333NHNpRaQKvlfNzQRtMW3DJY81haIjZLLkVyfteN D19ufOFbmrhmfehRS0BULHkbj9TTVUTfuuaecD5e3l7Ml5LORweSyPYzrndAI6YBxhhZ 8ixPzsC0g1GijW5BxmI/wQiCPb/BY5gzmzdYNKumpddwJ2Tt+vX7Et8eQVCmszApHUQ5 hs7NF9iFHvjHPu+anLeexX2NLLIG1yy+kQn4GPFdjSIJpffsZurj+6eTkyc51ov01hLf fhPg== X-Gm-Message-State: AOJu0YyEz+lT4Lv3jHqBSYl86KqKaSKeFF4XCjhakJkPhJrCygiHIAGk cBaNFvc5rbrwk8h2U5x1pFQ8Z/IhfJz3ujchu0xkQFFy6Y8iljy2s2GFMtAAndRQfv/F2KkhSh1 8X/eJf5khQMuo X-Gm-Gg: ASbGnctmCDapNv6ahzSZ0Ge6qjVMwc49vKbEBC8pZNM7qsz2Cf9hXc7JOeQg6FXYZoT BkcQtvX3Z4HoWnFjcDCP9AvDCXo3GeH5O9HtCxOKg6wSRyIn5JWbUHa68Ou0xKLZUg++b4MLJ96 jLwtInSMiGG0VWiviAUif/HCh86p+99ZtUBgoAwuQkkG0GQ4fNerkUaBj1dErNHOQ3ewkVPsPYa x2brwOj5OrNBk4hxnbycucel+L5VBRQdJG04vdmC1bVm0kV31LO8/5VggkklyCOBlc5uuQrYFle AvFKB4G9Nh+7oyMAW+xtYAWlBkcbISA0yH3touAmsXi9wKt9xc0k89qILgkwRZo4wnKec0LlZNV jbe9jvbQPa5uubJ7CxHAraFtbaIFNNQ0PKF3U8cpaCJieEY1/wdAP3DgH/6Z86YXIT6XgUGmbGf zKq94MgUoIFR/ySGVrKk8= X-Google-Smtp-Source: AGHT+IFdXO3naW5yJ+HbKMV5IS6jeFA7HB7J325a1M1NSWM9hLWX0tOuKoLNrZhFs47IsvBE80Bv9Q== X-Received: by 2002:a05:600c:3511:b0:471:60c:1501 with SMTP id 5b1f17b1804b1-471060c1576mr23190745e9.28.1760551311990; Wed, 15 Oct 2025 11:01:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 7/7] target/microblaze: Convert CPUMBState::res_addr field to uint32_t type Date: Wed, 15 Oct 2025 20:01:15 +0200 Message-ID: <20251015180115.97493-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015180115.97493-1-philmd@linaro.org> References: <20251015180115.97493-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::343; envelope-from=philmd@linaro.org; helo=mail-wm1-x343.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: 1760551347406158500 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 ed53848bad5..6442a250c5d 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