From patchwork Tue Apr 15 17:22:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 881213 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp570105wrr; Tue, 15 Apr 2025 10:24:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxRKPdmE4QK75MJ7uFGfwoTDzpGSeG5LSZdTIHzIU6HZu6b/Ax0ebmmDM3qnG5XtkhYYp9Ow==@linaro.org X-Google-Smtp-Source: AGHT+IFuGYvXQ5ILjLCs9Gb8Si0gZsfhnFsbPSG7Gyj5xrm/pOhVDuTtick2YkAj+n9hsQDnYl6K X-Received: by 2002:a05:622a:1806:b0:475:287:12fb with SMTP id d75a77b69052e-47ad3acb886mr2161921cf.36.1744737870907; Tue, 15 Apr 2025 10:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744737870; cv=none; d=google.com; s=arc-20240605; b=H9A6DPCBFvl08DOekHhUoAEESkDTCnpzFyugWQw6iCx6N0CshDF2R85/HkfddOXRbS SaXOx/3dUsz1i3EHRkJTEQedc/DN2PJN+1fAE2BFKV+s8gXGLuE2gHfOxZ7xXA8KkMzL PvmDGvF1nYJRAOyzisdCVvWusI+2jo+WJ+jgP8YRu6ZcYJ3KN/re/h1pIQ0iDgFRE4yJ HMZkFnW8G+cUnTgIzq3zEj9qXOkNCBY4RQ800AkuYFIRGf/j6nBCy3k5CRuplttMwxEd VFJImjteIWc6IGzFgiWWF6a7abeyxEDb3UivI3LsiYdTorW+xdu3hjMK0vHrimIbzUTT k3rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Nbot2wM/CbjkQnVa9b2IWQsKjCHYPI93P9Z4ISNUVXc=; fh=5dDhRaRbX3tP9Vsj4H76VAlPUgnYVMxhznpdbMeD+Rc=; b=VGbzI7ZduxTMe2kABSzaX0GPwvSRP8R12+qMbMYIonaT1HuI0k7yAd8dAThLlnSvqz mc+Vm3JyWAQNOcmnCoZs4HHSBij1KXSK4qSkW1UpxLpHRCFWBV+NFHOOFxWO5dqU9M0E SShtJI13F6Gn9iNYttGDFhLrwFp3U6G+FTZXBE3L0CVbQLHQzGKSN07n0AMBwG/s6DCR EpqLXN6rN3Gs1AUfz8a4ThTeB1RSFWpG0B+591/LYDAW4y/+fAM9kWLf3Hv3OdZOhWdb LCn5RlzVPjl1jNZOKy3z4VWTvbJ6CeQ8YUsL5yyD4YdffCioh/A2nLiKnc8TUr2xAiaL HtPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qao/BCMK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4796edd3942si112031851cf.344.2025.04.15.10.24.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 10:24:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qao/BCMK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4jzv-0000BH-2A; Tue, 15 Apr 2025 13:22:59 -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 1u4jzt-0000Ab-28 for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:22:57 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4jzr-0006uL-7q for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:22:56 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-38f2f391864so3440070f8f.3 for ; Tue, 15 Apr 2025 10:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744737773; x=1745342573; 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=Nbot2wM/CbjkQnVa9b2IWQsKjCHYPI93P9Z4ISNUVXc=; b=qao/BCMKJSmx1ahPLuD/cGtxbGQXcWIc+1YpPps1aXqLLiRK248Z5xI87F1RDaeNLI p20J4PxkuOaPNjk+Y1ROKcwd7hqZvKRzgAIawe8NymyoyyxFIckmVllSsp85uXRCkbt/ s6bA+iVLyLDB/AwdzAVa5pWaV+an4hosB2XQPcLTQtuhbNTcvQcNnvj7/Lq83Rtpm1yM Dj3HTMzf29igmbFDC5769c2wGXnhiq//ejIwabQMhu+ivOzF6iG2o2bzqAib02QSc3ar LlD9ZHI6iRDOUvbqQWd8j9DOgmhjosL5vGrMv8wunIeC0Wt+Amf81UEj5DNIUZ0qWTUn iRPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744737773; x=1745342573; 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=Nbot2wM/CbjkQnVa9b2IWQsKjCHYPI93P9Z4ISNUVXc=; b=TEGZENUaoMbul9UsTNbrFTf4Kh4rL7LAsJwlC3bsdziOewkch3x5rq+O4WtbWf2DUs 1UMPB3bn5mkwe5Sgz+iv0fAQLo7K0STMgRF460KEZGTwVGVKGHfV1xMqgU18Th2zJ3Mp 2J4Wng8tP6CwK6DmImU/44izB+iUIwPUyVq+yZlwPlucG5HUFovFKgXRqOlryax0E4nh fB3W66hlmBckQr/lKRkqAretR/WWfZighy0DCx70uHvU4Bczh6g8iB6h7I3gidjyz+an jqlhTdccRNx2CZLTq4nlAn5PSzevDOody1fVt5Kjzu2bfoxkPQyz3BpCeove7izXO0Ex jBVw== X-Gm-Message-State: AOJu0YzDqZWNlZ62M5nHgGAiWcUxWyXeQOKrjAkcdTLSinaNgwcqnRmG fDav7Z6pFRReB9Yw0AUOLCvWZYUd3fbrz+Baut9UD5Q9xWTboONR6OPq2ouGUPQ3M5nzARlgeKO S X-Gm-Gg: ASbGncuFgYq5wIogxiSQW1+6e5vwd21E+rwYOTgLYqRHriuXgqYDsV+wGQ0XPvkrWn2 YCMCz2E+3oxPQxnTjMLCsUH8KQRSWo1dJxvObQ4m7OIJJzwKCLC7JY9jUij4wADtOPFxj0PnGDr kU4hzpvwBSIcoWwk5YTYFZ5lW688xWFxPKcYgu5cBU9z+buN3AV/vzTeMYESmXuLYsElGtou7Va scuUPdcMzlvc7lKnLFVCd9zBk4psI/ZApQKe0U44dA+kxJ/xdMvlxSdeZ3y8FNFqMR3tutMFUyI VlmWIr3By4XOMsHpN+zWxORRuaAizlwjuxFrKX3mOlkebl5utFP3SPfRR5lXSlXB1TvW7T3l0Aa jKa8rQlNhgXtYifnVoupK X-Received: by 2002:a05:6000:381:b0:39c:12ce:1052 with SMTP id ffacd0b85a97d-39ee272a0cemr262324f8f.7.1744737772634; Tue, 15 Apr 2025 10:22:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39eaf445454sm14808715f8f.83.2025.04.15.10.22.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Apr 2025 10:22:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Richard Henderson , Anton Johansson , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [RFC PATCH 1/3] target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo Date: Tue, 15 Apr 2025 19:22:44 +0200 Message-ID: <20250415172246.79470-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250415172246.79470-1-philmd@linaro.org> References: <20250415172246.79470-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/internals.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 28585c07555..175fb792375 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -25,6 +25,7 @@ #ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/hwaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -724,8 +725,8 @@ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; struct ARMMMUFaultInfo { ARMFaultType type; ARMGPCF gpcf; - target_ulong s2addr; - target_ulong paddr; + hwaddr s2addr; + hwaddr paddr; ARMSecuritySpace paddr_space; int level; int domain; From patchwork Tue Apr 15 17:22:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 881212 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp570069wrr; Tue, 15 Apr 2025 10:24:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlKUDj1W3n7DE49aXc8/BBSq7/4BNjpdRZ7dgZnDdbZmiz7SZ3SEVfsP+NEShLrzZ69gDpBw==@linaro.org X-Google-Smtp-Source: AGHT+IEIaWc8tYL4sbe/DqPoeMC2ZjM4u/pg43zZw9dUdYtZhQ3mKZrzivZFO7l/AjWnR1ctbUec X-Received: by 2002:a05:622a:1807:b0:476:7669:b947 with SMTP id d75a77b69052e-47ad3ada0f2mr2444481cf.36.1744737866680; Tue, 15 Apr 2025 10:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744737866; cv=none; d=google.com; s=arc-20240605; b=f2XEa+ZN3HphT0yBLMmGI5hxgICTVWfTb6ZN5LoMx1WGbkolIxw5L59slN7bqDG00Q Uy7MiFcGcf0lllz1uXmKXxWbzHU5Uah7b8eA4nzH8YKeT6FbSg6/DjAqxJaWUUFmBm+0 5AQZBxdiwI/SHvK2JDTzxywyVlQdNjbT9mOAJ93PGH951tTKucJ78m1SBN7hfFsh79Df cqR7THMH8rGT89Ba1mVMlWxPhKZ6RPYervTOGree/O0EQnd7xdHDSMGkkuYmWa7Vejnb pwAYP51DP1A/kQX6HF67boP5fHPxNCtwPgvn/3YrItn984J1GTQNj7N7VQRcONRy4qZr P1gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jGss4Nxm8QOt9jRxbySq3QwZ6ueqeO46lfbRBfyFEcU=; fh=5dDhRaRbX3tP9Vsj4H76VAlPUgnYVMxhznpdbMeD+Rc=; b=KsGtH8u/U9zgaiq8RBn/oWwBQiVO16rS6pAFz4v31thMRBow3CleDDET9Oz2Ps+XRh ZD37ViKvgZYnDwwiJ0XfCi+leq+L7sWp4TXnZlKInMuRY4SJ8szvopx/V6WfLm6lM1V/ 4dTMKmmJ34cR+1jPK4DoGXxUBG/eJD7s1lyWEWGt4bsD0zYi41Naqz/b1VBQJFO7gdFw mjJBTNvCtBEy+rGtL4nRhVoFSE6aK0cLqnU4Hvkucenv67oyt0FQIUecpSNDljnJ94AL nrqKLSae8xP5Tjcycgw3bLIKy0q8ovWv/aFISDpaG6wAktLDPtl9YFoh8N4nYbyCxLOw KxLw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dTUBzPUO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4796eb1feecsi117752711cf.196.2025.04.15.10.24.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 10:24:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dTUBzPUO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4jzy-0000CE-V0; Tue, 15 Apr 2025 13:23:02 -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 1u4jzx-0000Be-Em for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:23:01 -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 1u4jzv-0006v5-Gk for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:23:01 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso44404835e9.3 for ; Tue, 15 Apr 2025 10:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744737777; x=1745342577; 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=jGss4Nxm8QOt9jRxbySq3QwZ6ueqeO46lfbRBfyFEcU=; b=dTUBzPUOAajl7JnH26f8DaTzY07/UPbrbadhQ9BTz2N1AfzG7AgEq/yVCv3ymb8mgi OwrRITy+O5pjTjZ9FrV7oCdlgtiUXjyP7+Vof4gq1PZKGNYAoSGdggPpVJqq8rfpLL2n ZUWgI7AAWijW+vwFsGYZ/OzWxN1oXSM1Nbc9CFGXNHuv90vuxyF58Mn5wAqUGsaG9ZaB nUEGOym9HQ2xXAe/4d9OgFcjhNJ1xxOXqfCuIy4Tr5xDGa4qpQScSS2F7O6vHEX5nZKz 6vytjbklmrdK8dZYnwdcImx1V9JWWa6/Nc663qZIHnvPcq9jzkMNYbCR8Ujfm+r1fRQD PW4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744737777; x=1745342577; 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=jGss4Nxm8QOt9jRxbySq3QwZ6ueqeO46lfbRBfyFEcU=; b=TloLQZejL2DjUzTLJfya/3i4N8pLiFAkbwe9gDz1fJO+LwFrYCEYXKmaF3yeBwgBZB dIp5v8uQzWIh3pvoBjgTLmkqMT2cBq6+QJWLpZMCCe03Us2x94e2U+kpG6Uinh+T6pD7 l7XZAfBYlOKyilfBYHFqnoAPI0hoT146mo6Vd/lC4Rx6SglhEDRQbwbQaHsAhgbV/l5o 2nuAsRNOQNrrwupM0/3IwvC9A3y+DAGCzrNbgfcw81bmg2h7FDN5WAn38bc4iYO+GFsi D2nBLw/P1hnIzV/VuzucVwNprPQ3GwCYIfJXSIjrcRJp9S0Igv8oXe1tzKqC7NU5J0W3 IP5w== X-Gm-Message-State: AOJu0YzRXkM3Z2MXOmXRChxl7lpIpge0gTUCGxpNLTRKSDqRbL9HUbx5 Re7HZBXGT3PKrPFEhSaUJuPsyUJm8YQqbzwBjm+RNyXdBobGNIhJJiaS5sfY/wIzrve5PVTY3Ih 3 X-Gm-Gg: ASbGncsMATCDyCf6XtiDbcMfGp7+fiGyQt73M1EoDqnv6at7CZxW/Swn9H3ZYfoww8s aXwZiBhRI+CKTQfYxg6xQG4UzAD7FPsJ8O8nwvdd1flNba06up51VfAAQySa2WGktUpuw84wBO6 mQybsZNXaKB1FnWD4XK7SE5OFPNmuxC8oMmjUDne+V3BZsj0XhHkT6leQjVq0ZuwHcJ1XuXamZC JAqD/vVZASnSc/b2ObQU6mhUdwfNZh+7LLCZ/WxmQ+/a2Bxv5003GrPEvjnz2L4opqOYlh6oAJM AbRcMtMg3Xp0nZbrYo56Z3SOQ/wlKsDFBq2N4tnxutio+9jDibSUlvVgPPOD1Z7wTqcV2LMO8b6 /gN6f+A2Gf4roLVcroDmnXdJ4gClfyFI= X-Received: by 2002:a05:600c:190e:b0:43c:f513:9591 with SMTP id 5b1f17b1804b1-43f3a93fa76mr150829335e9.14.1744737777429; Tue, 15 Apr 2025 10:22: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 5b1f17b1804b1-43f20625eeesm217223645e9.11.2025.04.15.10.22.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Apr 2025 10:22:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Richard Henderson , Anton Johansson , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [RFC PATCH 2/3] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint Date: Tue, 15 Apr 2025 19:22:45 +0200 Message-ID: <20250415172246.79470-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250415172246.79470-1-philmd@linaro.org> References: <20250415172246.79470-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org CPUARMState::pc is of type uint64_t. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 175fb792375..05ceb9bcf5d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1942,9 +1942,9 @@ extern GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc); -int insert_hw_breakpoint(target_ulong pc); -int delete_hw_breakpoint(target_ulong pc); +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); +int insert_hw_breakpoint(uint64_t pc); +int delete_hw_breakpoint(uint64_t pc); bool check_watchpoint_in_range(int i, target_ulong addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 1e861263b3d..4e52d37ed80 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -54,7 +54,7 @@ GArray *hw_breakpoints, *hw_watchpoints; * here so future PC comparisons will work properly. */ -int insert_hw_breakpoint(target_ulong addr) +int insert_hw_breakpoint(uint64_t addr) { HWBreakpoint brk = { .bcr = 0x1, /* BCR E=1, enable */ @@ -80,7 +80,7 @@ int insert_hw_breakpoint(target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_breakpoint(target_ulong pc) +int delete_hw_breakpoint(uint64_t pc) { int i; for (i = 0; i < hw_breakpoints->len; i++) { @@ -226,7 +226,7 @@ int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) return -ENOENT; } -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc) +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) { int i; From patchwork Tue Apr 15 17:22:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 881214 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp570134wrr; Tue, 15 Apr 2025 10:24:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTgmBClvULLYAzxsMT/tAEen7UcrcWjByxGukD0JaWVMqfku8ddX1hstUbw+k2rJUmh0JqLg==@linaro.org X-Google-Smtp-Source: AGHT+IF5PTGFssoCFpGvmyDbLZtwtsUO8b8YVpYq2TV7QoYG41CxGIXNuIwxHxcHLYzVKL7j7WPh X-Received: by 2002:ac8:5802:0:b0:477:1ee0:50ea with SMTP id d75a77b69052e-47ad3b0a352mr2027321cf.44.1744737874455; Tue, 15 Apr 2025 10:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744737874; cv=none; d=google.com; s=arc-20240605; b=McNwAE+s/BnflgAMsCFQehyd70GZnEXwY26Q6EjgBXoyS1Q8vv3OPs51bzz+K14NGZ ww2W9INknnj219TaL0V9KNVgCMCZdKAmZ8CP9HseOW2hhRi3ik1CWRMXbXbSeF8u5Gco HvZNRgfV2qm8M2iMTRMxujlotb9Lk0NDYaklBosh1dNews5zwqgfEj9E1240aAbaKXfv 27Kp9rLYS6vTjnFrjRMiTZwnYDSGkhX9AcKcl7GHEy2o84s+pgQxQvSMh72/EUZ+veOD 30Pfd3RkNtyEJU3NcWo1QV3uByur4+eDUISdNh21xQ2787uvIVJnmsqIF7hDjeX8NadJ CiGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PeByU0jwFO7MH0hprr6LSgGx+kuJBq/jNjVmMX1KbGo=; fh=5dDhRaRbX3tP9Vsj4H76VAlPUgnYVMxhznpdbMeD+Rc=; b=bjnUt75b36YH6HOgojxgnvDy3eCQ+u9tZW85PmmZUZ5iX8ai1GOoFNq/GHNDjtKsaa aBCGkjLtrnFOOpRZO2PvfHDPvDeGVu1/isqDIafwB044pRqYgtbjvPgxJkE7gIHM0ARZ 2OfepDT8jvH308gn8WGeZM+Af6foAYCiRlpmVYiP6+P7+ZMyG+JpUbXznR4uCxhgKXGy vI+33jVTXcblaTUqjGws7GkIp78wPMjFr47QWMvjNB7RfM5GeVrGTf0NnWKPlewpghGM hKflUa7rdTUpSmpMIcoKD1FSQ/oqjFqu5BFhgfhdZ1LlofKK22N3oytoCDb6xOX4ALZI RD4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LQW3pQ8g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4796edd6f19si116092921cf.420.2025.04.15.10.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 10:24:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LQW3pQ8g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4k03-0000DO-7C; Tue, 15 Apr 2025 13:23:07 -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 1u4k01-0000Cd-Gr for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:23:05 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4jzz-0006vs-NO for qemu-devel@nongnu.org; Tue, 15 Apr 2025 13:23:05 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cf257158fso42056705e9.2 for ; Tue, 15 Apr 2025 10:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744737782; x=1745342582; 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=PeByU0jwFO7MH0hprr6LSgGx+kuJBq/jNjVmMX1KbGo=; b=LQW3pQ8gCiu/uJhNAoYXzSwFLB+9K+k1XV9UrhVjS3DrP0aPzj5wiQEAu+qmHClTlg mn5x8bX4Fib+Yj1RhY7636Cb/PdQIyQQHRUSuNFr0CpU6PuljMU/+kZrSuDJLd1SeG4S MM2Ab4A1Xm/A6ZIrwMI4BPZGvXVuDbXjiIBUu77ZeR05PTXvRyIwYNoejxxf0QiRZJvl sCVHX037ALe+c871YmCx6i2lh99Rfm+XHHWiLOoLPe533ZS05ae88enGmNzdp9kcYy/m 7NEZHGVaVicP8yvWK91DuleBHlpMh4aFJl3m2BBU3LyjQVXL0+ekfubMlzrnMdgCeGSl /CMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744737782; x=1745342582; 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=PeByU0jwFO7MH0hprr6LSgGx+kuJBq/jNjVmMX1KbGo=; b=L1Xc0otffBsM7dNTWse8pFEeYJF2+RO7Va+tsJOrj1bxfwxmHjl4lOodAhPVPlDhsl qkecc8dBg18SkupPlnOGcoBurm2o2JQDTINJ5WmKkto+O0wptRhdqM6leTJ8xGeaLwau Ivq9bZqVRrcJtkN8W29/X29Zl4U+ox5pE/xUaxaJIAjpyL3Xa1ZkFr78TiF1gybQ44tv N2bkiACzjHC3tDM/QPaUPt6L05wgCrBHF7ONI48VlL0ykO4Ge4tC/jAugQQbX29WtzEf c8kOXnUAgilel4C1JYsDA1vKo+LjM4SMLXj5fB+XHHRtrUJHPWGSP5AH7d83ZvTRAf7b z/rw== X-Gm-Message-State: AOJu0Yyl4Lcuow3/qrga72BF2Qv4BcQLMKQxwq99uqbPYJWgyb8JjPD/ l2jkvup6RaAnIghuMGJxWjM3HaTpE+gL2tWn0e9ruPsQeHqKg5lZJ7MO3NxbS0Kx8j+eAbp6v/c i X-Gm-Gg: ASbGncv0uRrfyQIukp2TRfUVKu4JXZbMvp8f4rUdVIW2ZW39NR+wVuaAEcNdMz6PhAY +S1Mn2QvRw9XIS3793IbonFbd5JQd2r4PN5macAOGTn7J5hqYFpAWBZg0IcMt6GXBdOjuGy489P YYNQaqQa+LUfF6+3PIBndMuGzcf3kzc0ArzYFFsBNmZ1qCwxwlH9r/eiTjCtSTZGcT92H+xmTKG HXmVuiGpvvZJV46nu7uK5yXnTlV6/EkUTccsxkZTa44TzExjB2nfIEGj7Egf3ZS1J3LeXm/FAKx tj+z/UJVgMrRRmdmH1Hq9I/4QyznNPyIGW9gwsl5v1B8LkqCAUbbDn/smFXogxd7jldvwVn5RzR 0CbvASwho4w31JS9rI+t9 X-Received: by 2002:a05:600c:500e:b0:43d:7588:667b with SMTP id 5b1f17b1804b1-43f3a93ca20mr185678855e9.10.1744737781985; Tue, 15 Apr 2025 10:23:01 -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-43f233a2f71sm214675675e9.15.2025.04.15.10.23.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Apr 2025 10:23:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Richard Henderson , Anton Johansson , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [RFC PATCH 3/3] target/arm: Replace target_ulong -> vaddr for CPUWatchpoint Date: Tue, 15 Apr 2025 19:22:46 +0200 Message-ID: <20250415172246.79470-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250415172246.79470-1-philmd@linaro.org> References: <20250415172246.79470-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org CPUWatchpoint::vaddr/len are of type vaddr. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/internals.h | 9 +++++---- target/arm/hyp_gdbstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 05ceb9bcf5d..a19c805af45 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -26,6 +26,7 @@ #define TARGET_ARM_INTERNALS_H #include "exec/hwaddr.h" +#include "exec/vaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -1946,10 +1947,10 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); int insert_hw_breakpoint(uint64_t pc); int delete_hw_breakpoint(uint64_t pc); -bool check_watchpoint_in_range(int i, target_ulong addr); -CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr); -int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type); -int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type); +bool check_watchpoint_in_range(int i, vaddr addr); +CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr); +int insert_hw_watchpoint(vaddr addr, vaddr len, int type); +int delete_hw_watchpoint(vaddr addr, vaddr len, int type); /* Return the current value of the system counter in ticks */ uint64_t gt_get_countervalue(CPUARMState *env); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 4e52d37ed80..4d8fd933868 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -125,7 +125,7 @@ int delete_hw_breakpoint(uint64_t pc) * need to ensure you mask the address as required and set BAS=0xff */ -int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type) +int insert_hw_watchpoint(vaddr addr, vaddr len, int type) { HWWatchpoint wp = { .wcr = R_DBGWCR_E_MASK, /* E=1, enable */ @@ -182,7 +182,7 @@ int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type) return 0; } -bool check_watchpoint_in_range(int i, target_ulong addr) +bool check_watchpoint_in_range(int i, vaddr addr) { HWWatchpoint *wp = get_hw_wp(i); uint64_t addr_top, addr_bottom = wp->wvr; @@ -214,7 +214,7 @@ bool check_watchpoint_in_range(int i, target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) +int delete_hw_watchpoint(vaddr addr, vaddr len, int type) { int i; for (i = 0; i < cur_hw_wps; i++) { @@ -239,7 +239,7 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) return false; } -CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr) +CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr) { int i;