From patchwork Fri May 9 11:07:19 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: 888806 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp309509wrr; Fri, 9 May 2025 04:08:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWcMp4NLxCWeq9Dmm9asrOOK4qXb5hOptKR9UBOQ4NoTs0IzHfDCppVYPb82eW9o8evNmxezw==@linaro.org X-Google-Smtp-Source: AGHT+IEFemMUtohwADIJMlGv0CUsK9j7ft8tdLAuWc1MWTyyQClF00nZRz96WBxgA9E1oIMt1N/K X-Received: by 2002:a05:622a:2cf:b0:476:78a8:435c with SMTP id d75a77b69052e-49452727120mr43416301cf.16.1746788916503; Fri, 09 May 2025 04:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746788916; cv=none; d=google.com; s=arc-20240605; b=XT8vdfGi1PFpgd/wgPypM0ATUCxlr5pKRas/BtbEzyg+7D7EsbybvkPF75obt7NG4j US1U7xxZi0Iz/NoPEU/Bet9QaGK7xLmyTJsIP9/KveMR2bmWDUrF6NpSU0Tri5fzAoAH 0twv0gdyB74B0xn3+OP2mRsj7JxScqKAsaPy3E9nftkcghtk0Z1xtUqIBLDzYnABHr/1 b2AKYD1bijCgzFZEo07GMqha8+q+5kurytTij7R+5iizBkFMpDj+I9w8rvo3pYEeaolf Yn7GY3KVJGOupBWbvkiYjwWKJXMd3wBGCS0ihJPhwQJr+xPOb9kDnlzxMxffYHbi5Cpj iPiQ== 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=T3QDNycj2cfcdLF6s/SvwTLO4ogOTisZBN0TIphy6t0=; fh=Kwva4PF4MU0CAODI8dO98oDU5IqpAA4cnlOSgFn3sAk=; b=CgeQQv6AyKps1DYkcW5U3t8SJsljkkMpA2Q73yaedLdU3592j9zDJ3qqgJziojofOy Avg+H706rl3Q3Z6o0DVG5vELEFQN6OCUseVqrc2rlp2dDepbJ72bx/wnUiNiimNgxjyz hlNAS79Nns8inoxw68IFCPI5AbKrKVYcjVVtHNVN5MxVk1tQpaU6nGA1PP3/cxiZ4Eld T24SCxARK1L1BCy6cNRhO5ALY0XfGCffYukR0ca9sGidZ4KdaqFABKWCS9vLvLwDvHpk hRcg/i6E9KVL6P1BKUNLoqGcaC75myG/F/zOEupYQCumkCzeM1gAIMaOlU7vyLTLBB90 /ENg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IvFWKu8n; 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-4945259b14csi18813991cf.556.2025.05.09.04.08.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 May 2025 04:08:36 -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=IvFWKu8n; 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 1uDLa8-0007KZ-VB; Fri, 09 May 2025 07:07:57 -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 1uDLZx-00076A-0l for qemu-devel@nongnu.org; Fri, 09 May 2025 07:07:45 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDLZv-0000iz-0c for qemu-devel@nongnu.org; Fri, 09 May 2025 07:07:44 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-30ac5cc0df4so2667373a91.2 for ; Fri, 09 May 2025 04:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746788860; x=1747393660; 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=T3QDNycj2cfcdLF6s/SvwTLO4ogOTisZBN0TIphy6t0=; b=IvFWKu8naz4v7ubeXMbeuGvwjh3Xc5x3EkiaBnUh2pFWgvJwBbgi1ilSopEbbh5MCl qN9T19bWV88+I6fcP05F2jcLo2kFbmYFWB1azp+9ty+WkvGGnclHkD4K+VaTC+Y1JRVq jUawTmd93HzA4e8kez7n51w9CFTsmnpx/NWxp0OjAKus70tQDwtqKi6cX7iXrxluIOn0 repFOPIpSHGR36aB/fN6hw8DugUQWSmWblmYA1z2E6pYfBciVB9plQOu2wKx1ygglnkd TOkYKsSAKZmKjdFIMua8yk1VKAj4DMsqD7i3YSs2mffyak+dnuOtukIHFryD7ZC/66jj jolw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746788860; x=1747393660; 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=T3QDNycj2cfcdLF6s/SvwTLO4ogOTisZBN0TIphy6t0=; b=s3lWGFFUQcFv/E23v5fyBFYkPhl4X3B/eFHBrLlbs3K+G3GCMoHJLZfq4zRAmC6prC onNfwBYRjD/vDXb440a6WQJQ6qkvu1w/JEX9DMSenUsgoYzjd/bqJtfhckZlgEJuafRv Xs6mEmvBcZrOdV1z8mQIdH9KDbdsIUC4b+QW1tWj37O8BbBXVVHBH/xOaIp3RJRGPGO5 wC7gyLgHou0UnfPakWz1A1A+1Ztv543HwXAUQnHFv9IMhibcR5Tesk+7bG6L4EaCGTpe 9Exk1almO+m5AXb1/dgw3SVKzqrD+HLKN4oTn0wc+7O22dMTd2dF5laigl2pkKEcBFga PqEw== X-Gm-Message-State: AOJu0Yzxg3WfpxPLZGaVLXvTQwIiGqHhptcq0i0eVVBE/1LtXsBEh3LF ugaiFY+haiidOGHgefAHQCFkvRMYT+UL7YEjmYFuwDGXtR3PIfmmy1GC//XBDDhiGze8Asr9Dvm zbFQ= X-Gm-Gg: ASbGncutV2EzVrdX5esQRqR6jBWAyOJ+QlrNGwMWn4UZB9gD2hjr9nOlzxcjfGSTxa5 KXzufmBsxWuB04Xj7TUksSP5KA3jnWRyA9s1Le5Ye3Lqt8+gF65yT4R0G1fV+JaneyQ6LZ/RHsN hi11tguExLuZLAqZq9SogUVOKcGqZeXdwWIt9rEO3lEDUj6+yvFj1EfrEtxCYAh8Be5EjFdnnnu C+urf4oIMkgpoupCRswCP0M5MwbMzx4uAgoHQMlDjDhTXYcAFDb+drQo/Y8QCdajsV7lBo2rzL1 j7KOOtZqX9NkqgzqDZkWpIvrjld3KatJgSrQOboPdqmL/aIh9ou1IYDdnaM9TI1rPcxuV0iPx4r tXcznliHz1l+DpNk= X-Received: by 2002:a17:90b:164f:b0:30a:4d18:c71b with SMTP id 98e67ed59e1d1-30c3d3eb986mr4836926a91.20.1746788860455; Fri, 09 May 2025 04:07: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 98e67ed59e1d1-30ad4fe2248sm4170871a91.35.2025.05.09.04.07.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 May 2025 04:07:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v2 1/2] semihosting/uaccess: Remove uses of target_ulong type Date: Fri, 9 May 2025 13:07:19 +0200 Message-ID: <20250509110721.90447-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250509110721.90447-1-philmd@linaro.org> References: <20250509110721.90447-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=philmd@linaro.org; helo=mail-pj1-x1030.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Replace target_ulong by vaddr or size_t types to match cpu_memory_rw_debug() prototype in "exec/cpu-common.h": int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, void *ptr, size_t len, bool is_write); Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/semihosting/uaccess.h | 12 ++++++------ semihosting/uaccess.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/semihosting/uaccess.h b/include/semihosting/uaccess.h index 6bc90b12d6f..2093a498277 100644 --- a/include/semihosting/uaccess.h +++ b/include/semihosting/uaccess.h @@ -15,9 +15,9 @@ #endif #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/tswap.h" #include "exec/page-protection.h" +#include "exec/vaddr.h" /** * get_user_u64: @@ -89,8 +89,8 @@ * * The returned pointer should be freed using uaccess_unlock_user(). */ -void *uaccess_lock_user(CPUArchState *env, target_ulong addr, - target_ulong len, bool copy); +void *uaccess_lock_user(CPUArchState *env, vaddr addr, + size_t len, bool copy); /** * lock_user: * @@ -103,7 +103,7 @@ void *uaccess_lock_user(CPUArchState *env, target_ulong addr, * * The returned string should be freed using uaccess_unlock_user(). */ -char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr); +char *uaccess_lock_user_string(CPUArchState *env, vaddr addr); /** * uaccess_lock_user_string: * @@ -112,10 +112,10 @@ char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr); #define lock_user_string(p) uaccess_lock_user_string(env, p) void uaccess_unlock_user(CPUArchState *env, void *p, - target_ulong addr, target_ulong len); + vaddr addr, size_t len); #define unlock_user(s, args, len) uaccess_unlock_user(env, s, args, len) -ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr); +ssize_t uaccess_strlen_user(CPUArchState *env, vaddr addr); #define target_strlen(p) uaccess_strlen_user(env, p) #endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */ diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index 4554844e15b..ff944d8c2f7 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -14,8 +14,8 @@ #include "exec/tlb-flags.h" #include "semihosting/uaccess.h" -void *uaccess_lock_user(CPUArchState *env, target_ulong addr, - target_ulong len, bool copy) +void *uaccess_lock_user(CPUArchState *env, vaddr addr, + size_t len, bool copy) { void *p = malloc(len); if (p && copy) { @@ -27,7 +27,7 @@ void *uaccess_lock_user(CPUArchState *env, target_ulong addr, return p; } -ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr) +ssize_t uaccess_strlen_user(CPUArchState *env, vaddr addr) { int mmu_idx = cpu_mmu_index(env_cpu(env), false); size_t len = 0; @@ -75,7 +75,7 @@ ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr) } } -char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr) +char *uaccess_lock_user_string(CPUArchState *env, vaddr addr) { ssize_t len = uaccess_strlen_user(env, addr); if (len < 0) { @@ -85,7 +85,7 @@ char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr) } void uaccess_unlock_user(CPUArchState *env, void *p, - target_ulong addr, target_ulong len) + vaddr addr, size_t len) { if (len) { cpu_memory_rw_debug(env_cpu(env), addr, p, len, 1);