From nobody Fri Nov 14 22:18:39 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=1759903352; cv=none; d=zohomail.com; s=zohoarc; b=Xg1yvSFoxGFpm/2w0DAe1erPLQ+1ynCya1weOFbWVI2sFrah9HRHW2VJBl9gESIQ9nUD0gdJAdo9aPHfeaWEmtOLi9JJZLvmwyiaCZSexCS3PNS99mrRICdSrxasqyH2satjt06pNJTw6LbpjtmtKSvVn4hAkWVFQNVTWDHTFI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759903352; 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=JDjZ8U4cTaxg8aqx2zZG6gVloPONIY9wFGLLwdhXBOY=; b=iCOCpDgUZ/VAmiY7Fv6vkAsqByLPFYMrIU9m2JJ3xxzsahnVah+ioI+CpeaCKQMfgAdRxQCHYYGAuWVxKHBBx6m6J0S1ngjZ8+K8liE6nXo3g/aaW47M/FM6YKJ+uenFYrkB2Q/hmMizZsSlCD3MZ9Ig7nxFbcXUYgx0dHE6ImM= 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 1759903352569628.850326445638; Tue, 7 Oct 2025 23:02:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6NF9-0000q5-31; Wed, 08 Oct 2025 02:01:43 -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 1v6NF6-0000or-Ec for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:40 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6NF4-0000Zv-OO for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:40 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46e6674caa5so2725065e9.0 for ; Tue, 07 Oct 2025 23:01:37 -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-46fa9b622cdsm22729895e9.0.2025.10.07.23.01.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 23:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759903296; x=1760508096; 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=JDjZ8U4cTaxg8aqx2zZG6gVloPONIY9wFGLLwdhXBOY=; b=h4nuItB7lV/tMDDiQeN/TsLdoZluzoFDICU2Somtxh3gOYVrF+ftVJVw66ejB2YfZs j3D9pKeTx/CTxuwkjtOPFN1GzGBsV8YRQOwV+g901BzNQFMSKNyCq0mo1FT6FyIKXxOk d5enc4TuXPgOvYly2CEx+uNQQAERxKViNAtQVYJkQIpFGbMJyjT0LATry51LhNopf++y AROWIe8L+jR+WqK7Ky9KJbFX95AqjSfoqTe05gZALAp0xhhhACYgIN9KC1y9+276vDpq ay48A9HhX7vNV2yy7OS0nbpz70BGozCPEGhisqXzFd18CEdGUqrtC9TQc486N+gwrGKk fUtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759903296; x=1760508096; 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=JDjZ8U4cTaxg8aqx2zZG6gVloPONIY9wFGLLwdhXBOY=; b=NxGAdux1o3ULWIXUcsiM0R/UnpmOb6YdA1enlAyiJ73NMKKqRSMUDJaOPAzzf3gv2g JQlFv3na7ZbJkMzSyDnRc3Tfdj5nJtNykdzauzdassT3n+es7v3pzcH4rcxNS5mOfWFu JJV29MZVbDer+IIhTrirtm5jFlaN4Ojm40uX4S0crxsLN5//qG84iHo/bilMdNhM/P/L tpzjSZ82zsXPzRDStwaaFuJaLGnn08Pg5/TXZZu2Ln1W9ysxTyu06Zs4U8RxslGT+s8N AP+hmev0j5qmo99/yLgG0V9Ujp4ogA5GqI1s7tFpiIFEfeHa5rlwowoi2GnVD7ryg37S yahw== X-Gm-Message-State: AOJu0YzhB4gZMHy+UH0ACZWi2/73MgAH0tIEDYBdkZORhIX/B5awOKo7 F6O+BSGTW18MSI5kdfRLazfzQGTpAB6osCIPtYZXNsx83BOCI18nvf6HcEcGUXR1Wn3zbgcIUOE WuHd/U/00mA== X-Gm-Gg: ASbGncvWclOQhbu2X4D84GdvL8gjwuuV1S/AtPWRB/qpGHc/XnDgFVDbdIV5uavgXc/ V3pKybirhGxeQki5/veUUSOMz/8ybksIfREZ0V9q8jmMjV/Snak29prz1bLEuqzuexkNOEIiK/R APf3CHnoHLrEusHUIYqjLmvFe8cRdrkHQYhv6QY/L8NvUP1rNQBAIsweqdUpUskrjcauOTqP+HQ R8/O20y91vOGHAe6kp7uqXDuyP3SPDAwUW+AHUS3OPliU1uWPtzJK1VWZIGqVn5xUs7vWRdAwiM iyCcQy5FOKDHNEexABkCZ78gLrpSujXR0Qg/1HAGenaPTrpU5Pr0hk2h8SgK2E24/j1SCP2QMuv GqeqSseDwzpqrf5R+82wBuDad+tmst3U0mjpI9Ato1imy3rn30RyBkArfXcMWa1KhoaR2bi4hr3 z4ugNpUdXKgVJF7ZD7nrfKrdAV X-Google-Smtp-Source: AGHT+IHoxOTGeMTYS+ZRcW8wNxZDTkxNrX/qIW+HqcPnHGBOtByIpdsxs79Tg/Z2oz5rMUwspPLezw== X-Received: by 2002:a05:600c:a105:b0:46d:83e7:45ec with SMTP id 5b1f17b1804b1-46fa29e1e0amr30050495e9.11.1759903295881; Tue, 07 Oct 2025 23:01:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Alistair Francis , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] target/microblaze: Remove target_ulong use in cpu_handle_mmu_fault() Date: Wed, 8 Oct 2025 08:01:25 +0200 Message-ID: <20251008060129.87579-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251008060129.87579-1-philmd@linaro.org> References: <20251008060129.87579-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1759903358179116600 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 22:18:39 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=1759903338; cv=none; d=zohomail.com; s=zohoarc; b=KigLYaqnNojny0X0+qoV4RS0Wk6iNbjew5lQOOksCrXZOcWNk67FdP4huTy4kgtHYv/qfe/qmAVCO0CyZCR7O+bmoB6nIQtCoKJSVVW3EOAnSzEt93Kesx8oTnfyuy2G4ReIc9d9jv1+Sc9p5y3vZNJk+hAyY6Xw9dX3WrUnRlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759903338; 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=cU/Z9f8hQK2W+I5bFCKgqWvOzfwEaQk014ZzzMuXKdk=; b=CM0pYjav7slBqE5WULp9gHjAd+OpJy48o+4HGbnP9wyH1wGIhXJn7DIYcfw2YmXT55B5j5EsNnhG5K5IadSbMdfJ+G01y3dj8vp6cPQpXaQche+SfTeQV/hh1ae/wyhxHqjRLUol7jVAVlC2SoSIBoWDLZu4EbQg1SmmbQOJEvo= 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 175990333799437.61576445924163; Tue, 7 Oct 2025 23:02:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6NFS-0000sP-7j; Wed, 08 Oct 2025 02: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 1v6NFA-0000rB-Ic for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:44 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6NF8-0000aP-FO for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:44 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-46e5980471eso34916475e9.2 for ; Tue, 07 Oct 2025 23:01: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 5b1f17b1804b1-46fa9d7f91esm22137655e9.20.2025.10.07.23.01.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 23:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759903300; x=1760508100; 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=cU/Z9f8hQK2W+I5bFCKgqWvOzfwEaQk014ZzzMuXKdk=; b=f7vysyrPrA/lK4MfIlZ5Xz+gK5cR/Ng8F4fTWCPTk1UhZAsBrBqd97wVE8aNlVKIzi vAixn/Iz3RKZG0eFKz3q6j2mS0O1loP39ODYDRAmObDgAwcwm4NdUHrA9RONRTDxvBY6 fdxUpBsghRVOKwW3S81WfzQuyQBKhyN1g65K8lOiLD//2XbaFEssIX8mxNimDr2rRQSO rKZWNkmZEAMoG5/b8Ium94U8Th6an/l1JLsT/yJBacP7tWc7UXqucqRzcELr8+CrvJuC PifsFi1dpZQd9L1ysxmXuVtKMzwiexHSGmEAZA7DXo0/RoKQyAbhNsX1gsp4GK3vJ/DK 9emA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759903300; x=1760508100; 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=cU/Z9f8hQK2W+I5bFCKgqWvOzfwEaQk014ZzzMuXKdk=; b=uq88g4mPvU1sdNUfEakHMMbKJoqaG/KyneIg/A7YeBDhA7uSPAuCANeRLgdrwei5KJ wNmP10Cg6G12Trh/AB9YwABGP/pJk4wjJfgQ1gOGmZfPDYKZzeZSWUpHrELObkf+qNOd GNPsBqaSEZQLJk7GYFEtN2M0H11OCsVc+a8vPnDcbAVHcVzaZl8b4oAaBXgTNXurdyWj W+OFaxUhT+4VxRW7Ucth3aE+VRHZ3hs6LfsqI7gNSkUT3WQXNIEddZD69ZxnDh8kQhRL Xb24Vz53wqtYhVonZjNTV2+V7f7URhhYm675RKmmIPgzwejCgp0ekAUSqam6y915ypJ0 QbTw== X-Gm-Message-State: AOJu0YzKcVGQcVWsC9hMLQGzmXyd1Qa8ZBVbkL+yVUW455TFU+AWmkPo 5N2YJr4AU45FnllaLmVe1nijht664tOaMko4f/gTWZpzAQrlP2SWxC9Y4nReZxhVZflk9ZmMOH/ Hl4KUiEwI8g== X-Gm-Gg: ASbGncuwyIAUrjF4AXH8a1iFcSVYapWZlv2oJFAbjHzq8gcik+gOi9I+H5g1eQt9xgQ 3PMXbpgH03bylJxZidQO2gZYIIHfKDOsP3wGDJTxNpDetkeUJT0/yOpmFRxmcDtbgRFsNITuuai 6dJiuYeAlFf51iiqQGwb7cUiH4GMm9cQOwiU4Inb9SwiqZ11Xnp5jXTsaqZInrbzyGid+M4Cb0l 8ozXueuJ7ZMWfgxX9nuCFyKfw+7DKtHY678c7O6f6ALNxUAGbA1n4k/OqqFpihgRgnTMomgrreY 2QLPtsU/Nn3R2qxCV4E8GuOOWcB35j2k+Hlx069StgYySNH7Izo546+BA1c4Ww1rypluQn9dhi0 5cIQ806pO7HPsJcYGyaIxHEk7AITF4CMsgOKlPETKeyDBOSkYdNMQxFXlerRGEMQiaB0uACdVWg SwiZjmahKiIghmvzOTjLUIaPpp X-Google-Smtp-Source: AGHT+IGe+M0Ewh7DUN0zDgrjRz377UolvuDev5/vJHg7PdcpbLPsJC4Mct/o7S4AkO4yoOfR8HuovQ== X-Received: by 2002:a05:600c:3b08:b0:456:1b6f:c888 with SMTP id 5b1f17b1804b1-46fa9af364bmr10987205e9.23.1759903300533; Tue, 07 Oct 2025 23:01:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Alistair Francis , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] target/microblaze: Remove target_ulong uses in get_phys_page_attrs_debug Date: Wed, 8 Oct 2025 08:01:26 +0200 Message-ID: <20251008060129.87579-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251008060129.87579-1-philmd@linaro.org> References: <20251008060129.87579-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1759903340984154100 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 22:18:39 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=1759903371; cv=none; d=zohomail.com; s=zohoarc; b=n3WzHomq0SsSFLRZnh1HbGdrBXACumx7USLTJO9LPiR6tRqW9Bmgg+GPK2VBhL3iLAzROa8TVs6ENQ0Azf1uU6vgzrBs9Q/EnUmuFdIiayYnBSnPLUnZoBd/NbLQji0IlDMSC3YAVDlX0WtjlHOkKFCxw9vMr9GCpZ4h1nBPlDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759903371; 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=METBz19oMX6CRWEew7m9bIZba5dshSYUEXQl793Ow70=; b=gAUPgHyRhkP7kv4Fveif0+shCz1euOfRLsNKaY+bLq4RcQ5l8DPIplkcROpJm5sylsdSJ8vGMctjJkJk7H2dEPIP27RoOnACqR/N9Sc2EG1i1LDowsUpy5bNuY8B0TuCgfid6CLjMKrE+phlBJrXJ0fCLizv4XJ9uJEHDHYlDYY= 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 1759903371308766.4245694141632; Tue, 7 Oct 2025 23: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 1v6NFY-0000xD-5J; Wed, 08 Oct 2025 02:02: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 1v6NFF-0000s9-64 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:49 -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 1v6NFD-0000c6-77 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:48 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e3a50bc0fso56029175e9.3 for ; Tue, 07 Oct 2025 23:01:46 -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-46fa9bf8288sm22477635e9.2.2025.10.07.23.01.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 23:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759903305; x=1760508105; 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=METBz19oMX6CRWEew7m9bIZba5dshSYUEXQl793Ow70=; b=aZj/CnNE53hOPRY5fwyUIwo2EoWyiSI0+jJ2n/r6+T+hA6HfyHcKZHo1YWDhg6JuEc pIsu5Y8M6Y8QK/ijRkBGN8TjKXyX7Jc5gHau2pqINR459p0fBzZgOhapB3ZHTFquUcc+ W0oSQp4uiS7V9BO2xiWePg9240yjhThAKApU0E6xTr5c+vJR/M3rXAqueeLwn6hJAuWp UniRI0rK8asMh0G7ONMsnMFsGiWa5VjZAY/ENe7NPtEIdp5rGc2+vy2Jjz2OB4r/xzAM NcilzGy2D+34aYPxo2jeT0aT1nFDCVFiggQ3hgJkDwYiS0LCNUS/exNvrglqaEqvWiEB E+hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759903305; x=1760508105; 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=METBz19oMX6CRWEew7m9bIZba5dshSYUEXQl793Ow70=; b=grrH47GolJdM98eDducd18dK8/iQWbOJTldyqQwmjwlm+F+kQe02djJy5AWbNaWlb8 C2J9bs5hS/CJfYh6cjNRmMm5dVhRlFckazrrFXQyjQkv8f9XN35BGJ19mPVlvnfxL+PJ J9hhQea6gdrYQPTdiqTu37uPpj22Fvr2J5egRW0+F/PHh2F6AdzSudskGpksACibZS/i 4Jl6TJZ8DNRwsS5tyMmVSrCMpWmzXK0Betjg5AIN7KFFvk2VsodMkeS/p4KXFl8FbxBs jHsWtSeXi5qwNIcQ050UqKR3YSrDT/jEynhyD11AH1FNFO3yGzufiISnhzCuwLPOXHI2 NW3g== X-Gm-Message-State: AOJu0YynP0PDqYcDgBWuUD9qRiVIDvw6BXYP+154m/uw7Jd3rUrwc6RO qUreejuLPvRpAx8nLKUxBVZMc1VP/m3KTwBhIj1S3HQutYDQCBqJYmMqshzt9rk65rPyxey4lAw zLXxm4qZn+w== X-Gm-Gg: ASbGncs9tOhCIII6cibTEQwu3xg+7vT8nGazipBOXdpKXKbs10f0fOPE/4g9Th3sd2z 9J7QbEDj68ixarBkSVLMzSWWHBMl7UqDalYEz5ewisXxX0gw1nToKkP89JlTcAWfmA4RNu4S+4F /XibYczsY/W6ry/8R3w0gJHVNy0EuS8Z04tS2FWM/mjDmJA1dxUPtwfB6H3XHbgmGBUWl2RMlXz a7LfpcoS4YT1h3+dv9/ajO+ymWki4a3nR652w8r/oAYv0C0glWdq8eYukVeF4LuB3TMlZa+1CYx x9YmYk3jPLZS9LYvsGyfe7c7U8uXzR8gh2YI7HVXPmgM0CiHhf69tQ+Xi8F6l8z3O4nF3eoqipJ Etn1IzAVxqlABB7ByPVDicYXTb92zQ7gsdz+G0RpRDTs1AMx+2k0orME1N08fHxPdJvoXo9jstq /uzWsuB43OWqHjU2o7kQKsyfm7 X-Google-Smtp-Source: AGHT+IFf1XQxIXBbZWa3U4rVg0H3J9SIu0muAxscgdqVCPihPdWI9B9JDKMk+juPjdrbmnC5anWjLw== X-Received: by 2002:a05:600c:699b:b0:46e:410f:f645 with SMTP id 5b1f17b1804b1-46fa9af8fa5mr15126635e9.21.1759903305096; Tue, 07 Oct 2025 23:01:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Alistair Francis , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] target/microblaze: Remove target_ulong use in gen_goto_tb() Date: Wed, 8 Oct 2025 08:01:27 +0200 Message-ID: <20251008060129.87579-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251008060129.87579-1-philmd@linaro.org> References: <20251008060129.87579-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, 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: 1759903372855154100 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 5098a1db4dc..ff33e64a710 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -116,7 +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, int n, target_ulong dest) +static void gen_goto_tb(DisasContext *dc, int n, vaddr dest) { if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(n); --=20 2.51.0 From nobody Fri Nov 14 22:18:39 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=1759903358; cv=none; d=zohomail.com; s=zohoarc; b=ezAOo9FAiJIwdgSQHaoxCHgxfNGnQMdqPynWyrClkZJKYKUXVQ5goK89hfpwPWkuIGbUw/8bRPS/aI3rgNWx/HiK0tYgG8qKFiZs+73RzQq/ECg+I8h9gintDDqhvtBYgHSl372fppdK4bcqTL7E2Mfn6Uq3/alOmwYPuM9rM7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759903358; 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=0Tv8yKkV1/Y6RhtpweElH9Zo9nKkr2eedVoUp7okr8A=; b=OiezeZkvwqfOxAt0dgB6c8BAAdViBr8KlyCHWu7AzLFEho6xVkLK6tHcuU1Jh+Ndsks3Lz86YT3OXYpsQW4h9PZ/1cQkJ8ofEOjAi4D9hhV0In2iPllnlNpfEN08hBjcO3kGgr0Wp9gpMtDZvDSvwdBn50l/yn3stusTu6J+Gs4= 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 1759903358701362.3879273786662; Tue, 7 Oct 2025 23:02:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6NFy-0001Mh-4O; Wed, 08 Oct 2025 02:02: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 1v6NFN-0000tN-40 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:02:02 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6NFJ-0000dh-02 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ed20bdfdffso6196635f8f.2 for ; Tue, 07 Oct 2025 23:01:51 -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-4255d8e97fbsm28101225f8f.34.2025.10.07.23.01.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 23:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759903310; x=1760508110; 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=0Tv8yKkV1/Y6RhtpweElH9Zo9nKkr2eedVoUp7okr8A=; b=P7JNx1rdSElkE4rsmcnbv1V/C9J/JE3bNfcbcmwOOFhsiZ5Md/9HNM3xML8kDEfd5Q Mila78ahymaGvsyf8SWp0CetqfqB24B8oK6kgi1su2jLCB7kIYQRj5rO4OXOHLhw83I7 g1qizRNRWrCa0VcB4RCz58EwhY2U2Rtsd7RlLhVLvlrffbyb0PlO3jg5+qrHmwEHu8D2 83SUpySn6PVdUQ40NdE5HpCzqv45EPn6miGnMaPw/BIfjva/OUCyYmyHTRz9nR6175r2 nqaps/3shV18TwWUOfJiIUp0OS4JirmjjcJ+t8a4HSVLgQk/LbCUNo4Qht/8aSzTIdDT AE8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759903310; x=1760508110; 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=0Tv8yKkV1/Y6RhtpweElH9Zo9nKkr2eedVoUp7okr8A=; b=WeUPbk2U+lyvRxdcF7i6cibbOcgWH/6Zau+UJJQ0b18+3G4IKaXuF0WVHXVDJJpdYH QGNNl5RNyqIv6HZnYkVpxaLEZMZVCinhedagxY5BFM53rdz4CyFpLu4U0stZjlHVKywi cGrx+9z6WSSA0ng5U5yyqKGcbUMDVlaIqZ0ghcKDR5lmDXZ8rXNaa/s/KeQjpdCsJOy9 IxV8jj0TxFyVlt9UH0rtHzocfiwmKrP4/XS/HJZDDk7h0PWD0mQlHJElL1uTfriqOI9e 0OnwFb0LedMkm9MwRRZdFY+e1pCq/OzUwWzoatLiD0mYRNy6ZvcmtaRXDBM9ixXzjbca ThIg== X-Gm-Message-State: AOJu0YzrTEn3ICCVGr3JnAGw5iq1K9I3IPHvFkS2oGVHfAhqcijXOUU+ JUemsXnIJuHT3I9ZRaxNZO+RWx7YTFbVjEsS9iedjvWZ5ReMhrbzxtzDsZjbGkilPfucXbkuChZ F3o7MZ3gLDw== X-Gm-Gg: ASbGncsmbKw/4JbBxjbVyDaEfl7x2foRJ6CsQJGTvMupxiRdIhN/N8OQR0G+HASHMwI 23thqbkCFCYKHPEX6UriKILjGZ/JfA+s8Srjp33x7TyPgWGJHU9Q76dDavyDLwdhfQFy5uF7mYA 0JExKOOZVpSfO7EinqDmltV2iaAAXk012vjM5bdnwRFhtROVWbD/ydrNYVAD/0ok8lQMBcXEsV2 XFfMmFMosnnI1H4VcGy8R+1IZapOUzWN3Wxe0GHRweffqpbl5+kTzkuw5iw/MJKnmlOppW6fn6s uqRO+BG92JobsFjbXskr8582k6qsz+OuR36aqP4+thvQG42Wm2xidJxUHR4o25ACWP/i0Mu7KsE cdAGC3eAlbczpeCYkCJFayxwVDetop5Gx8Dda7dOpMsUyQx8g4JkrJfBJxPgsMIc21pTkz3AUwG IwxXO9uoQz4Gww33p0SQqj5Yv8XWqyTX4sJxE= X-Google-Smtp-Source: AGHT+IHeRZl7K78VhOBfBI9cIv+APysV588NvbDoFY9CTV6xdwmSSvJiPYs/vCYgrPQdyrIInFvfOQ== X-Received: by 2002:a05:6000:200d:b0:400:818:bae9 with SMTP id ffacd0b85a97d-4266e7d91femr1010059f8f.32.1759903310442; Tue, 07 Oct 2025 23:01:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Alistair Francis , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] target/microblaze: Remove target_ulong use in helper_stackprot() Date: Wed, 8 Oct 2025 08:01:28 +0200 Message-ID: <20251008060129.87579-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251008060129.87579-1-philmd@linaro.org> References: <20251008060129.87579-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1759903360671154100 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 ++-- 2 files changed, 3 insertions(+), 3 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; --=20 2.51.0 From nobody Fri Nov 14 22:18:39 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=1759903357; cv=none; d=zohomail.com; s=zohoarc; b=HlKsDhedgG7oM0O79oig3GNIRb6X4GOg4F98UJZ9vXkvpLSfVDY9g2wMGfOJexk+ytMUAXogoKJRMjnoMxvzs2HLJCIdFrULF2w3RpsZMIfKFIQCyqanySC2F9wa4fhGX+P65vLSxkGNVbTtQmUHJJJLwhqSgqV7Sn8XGOSBRZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759903357; 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=IQsmpoPeW153QfGVuuE1WH9+2W3pcJi50GVTjfdpbVs=; b=AEzir6fxoNrUiRd+wkMCiMMZppeVTUFszLxVIKWkSjVIybPaCtX4M1tco0s3yUgBUwiu/gnjgWSiWMHIPeKSCswhkHVJ2mwZaRlcWo6CZZfVEKiunMBbHojKQLmQ+GxSCEzbBsFmBmbrO0W/64i3DZvHTFDDDh2EodkCZ7IQQrU= 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 1759903357509567.706884511846; Tue, 7 Oct 2025 23:02:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6NFY-0000xP-7k; Wed, 08 Oct 2025 02:02: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 1v6NFP-0000tg-Q0 for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:02:02 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6NFN-0000eW-DE for qemu-devel@nongnu.org; Wed, 08 Oct 2025 02:01:59 -0400 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-3ee12807d97so6084535f8f.0 for ; Tue, 07 Oct 2025 23:01: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-4255d8f4cc3sm28196503f8f.55.2025.10.07.23.01.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 23:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759903315; x=1760508115; 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=IQsmpoPeW153QfGVuuE1WH9+2W3pcJi50GVTjfdpbVs=; b=coeOLRatdeTb6EP9cSvVIuo/nYgePOeZmTW9ba75wIm6gVa2z8w22mMdlvgTdou7Tt ztmQ8VIDGudoHK8Is4c87u3RWxyWWhmRcXoMEY3VkUb+3jtUmQKb8haxLpXzgF2huhuU EryHyikm0Cj87Hj5pmB8XkU1ro+JL68YynHzraenpRCjsE5tzOKxovAf+D9aie2MRbdX LpC4Qf0xSfNRf5xPd8wS7JVY/ORP7m2r+nafIIcvdTh6ugsn4obZoCLAlC231UfibTRx X1LG1I/FLKAmJWPsN3nlzXmhYePO1EzAQu73u+mk3rgFnBtOPGz7TdnL7YZBH8IgcLEf FMzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759903315; x=1760508115; 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=IQsmpoPeW153QfGVuuE1WH9+2W3pcJi50GVTjfdpbVs=; b=qEuUWMWj3OQmGScD8JJPfvlG8oOucOD1IoN3/oon9p2L8DvXArlaZ8g2vy4YhX4d51 S4nvOudfCV03KJh7bKcCf7dCG9+15DG4KBbhqRGCQ+muoK7zaHPQBp5Dm55R4aGqrTnK zSlrJrUltk47BSBlQ7Kjzin55stFeGTiMLJ00hClbMLSJ0bRYgc72zvraLYaKuRhDK/R ov+1GuXZRiXegXWjx4RywMoCbjCNMIyXMpH8apTEy4dyZiI1BJpmhilAFo12VTHYubXr 7gX1+ixyTYCfKe314APyI25BfV0sP5d9uxo4yf2k9xdAhXhAMq7GWZoeiuTzvB70gkAu cvpw== X-Gm-Message-State: AOJu0YwGDl0qL77hbWBqdF3cf0n/evXUqBISEhyH3lCaTgRtTg1nTgKN /v79Q//cQm4UHWaeAvFs/Eu3qnaM5TTe1Yq1jiCcqbId+MAYWAAtPkZhDQDJXezhD6PDwGNtjXr 3pkpFF0D7yODX X-Gm-Gg: ASbGncs85E09TDbPrjoXzqIjYHEfexj0ojl3cyliZf4LgE0ZdXLhAR7z3cG4MR3Azdg /FGLsPK4Kx2GxTAFIYNRc8d/F/BjUKQbFV73/p6Lp6Km5ykW7uPxD05ZUxaq9hC20a7p1klX5t3 WZpTVHEUQYeSOXJjH2jYk755wbVETOAGCzHSFBfX5LYtBFT3Iz5TQ4k9HTHDiFIoVlp+8BOontt 3x9enKH68ew785JDpVYGyZvrVvwN+x2RA2OmHBR6IH7TQmOV18yKASVlJM53+JlLNoYbQZjkKBa TEp37R2PGXLB7SYI0XVV1DZptu47ocXP8NIh/m9uCng47hjb7f8cotu32AKQuCQDbLlbaXI0z0X e/BAPQlaz5hhUOCXKiBYKdTYgqzn1i+3bc3FyHo7sOjs58RHMA2qrDok0y6tqv5sKygrpzmDmLP oeTgP0w26IBctm2Dj/pFeYHfa3 X-Google-Smtp-Source: AGHT+IHkllW7Co1meslhNQIl9ob6K+Ub1q0nI7YMNqutZGBiOShVAOxGquX4cji9hRQ9unqJ3cHesg== X-Received: by 2002:a05:6000:4205:b0:3f7:b7ac:f3d2 with SMTP id ffacd0b85a97d-4266f752fb9mr1037761f8f.43.1759903315173; Tue, 07 Oct 2025 23:01:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Alistair Francis , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] target/microblaze: Convert CPUMBState::res_addr field to uint32_t type Date: Wed, 8 Oct 2025 08:01:29 +0200 Message-ID: <20251008060129.87579-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251008060129.87579-1-philmd@linaro.org> References: <20251008060129.87579-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::444; envelope-from=philmd@linaro.org; helo=mail-wr1-x444.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: 1759903383933154100 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 ff33e64a710..04fbd4fe17f 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