From nobody Sat Nov 15 17:47:15 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747927152; cv=none; d=zohomail.com; s=zohoarc; b=dPFGixJZAChnZ/Ut19NNcNFIdT1p/mDMLRR/X7Y7bRmGr8nEGEj848yW50EQa7T+CxUrdqLSpNsUqmdBDUQLVFeFWCmf50uFx9SqV9kDwszyAH5H7CETIT7PwIf9oiLspFbIGYvu+f2Tg8fIAUSrCWPgP3SvlnXqqbNySfMLF8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747927152; h=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=Go/jatOKtlAjZefV0JEAoAPDqQyoCGHsk+o50Hmjd5k=; b=XpX5b8IN49KPu9o/p3LNQHUXaGxZGoxZPm+Bq0z6wD/4MvrTMrYZ5BP8McepU3+P8H645yHFuxiOyrhYCjq1avPVKKo9zBi5hw7y7hMFwlQXrPGNjGofCN5U3cbnig14Bl4LavFmF5j60durj+UihPZa5i8WTGZQsHKPjPeKM4k= 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 1747927152268549.5953225211226; Thu, 22 May 2025 08:19:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI7h9-0005a4-EI; Thu, 22 May 2025 11:18:55 -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 1uI7gW-0005HQ-9z for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:23 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uI7gT-0007ix-8i for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:15 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b26df8f44e6so7737822a12.2 for ; Thu, 22 May 2025 08:18:11 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:c732:a88c:b916:8b9f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4b017dasm110443555ad.98.2025.05.22.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 08:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747927090; x=1748531890; 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=Go/jatOKtlAjZefV0JEAoAPDqQyoCGHsk+o50Hmjd5k=; b=Fudb3mpALPQJ2pbI3FLHcigX4NzbkFgkU+E8EfOeVGoavX8aAeZAW8IflxUHtZJZ4F NdJcG7YBYUs5L5jDOFUMmPMK8uo9vcL2hNfDVt7QywlYYWOqlVI/o2sp81Tl7eYTXSt1 wbC2UhwVsWIB01M8ZT1rDxWv0g4w1K7M7ZCPgBpzCja0PbXHKLdieG2NX6u273qjkDa7 oPezGf5egZF0GEDpHSzPbw+fyo3vckFBjktsKYiHEpTN8HhQRd5awE45tlpLfqtnZt6f 8Ib560Ev2WzXmOz5PH8UAbf09TVdhuuiNPK/f0pK7MWeyz1S8nMJaR8RscVBx69EfH5V wBYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747927090; x=1748531890; 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=Go/jatOKtlAjZefV0JEAoAPDqQyoCGHsk+o50Hmjd5k=; b=g2VOhv2JoiBV34t7+wjtwSQzTYih70P6Ill2i6rs9n7776biSv1M/RbXHI0sJv9gHL JhGg1pMQ7rSSRHeTZAmspiRZKD+8qonKLF7fd7q/SdNYm5TTkOfpvBjXAKVifVEalaLd YgL8SwDo2ZT7RQs0n476+1U7jp0wZsIlM7FhAREbaaFDIo52n53BfmpmOtKNGW5mj36/ HhhmQosi1H07bbvA78xp9mnQWHLX09W7u7TBsZth8LVcqtj9x06GmGshYXTby2ikeZSx OVWcdHA8tBDSqa+a1GkhiJ1VzrKX8P3Dmmumj6H5pESTIjuSxPlzouofWDNXdZ+Cr1AF kAkw== X-Gm-Message-State: AOJu0YyTZAdoZSr0wRiESpV1hooL3zdOaU3fS/Syk0E5ATDJAyDTxW4p Q8xUu1WGc/aDVMI5pHjpuWbps6dzAsfGQaXjC5j3a1LFpK/9e8ar4lr2TTXX0g== X-Gm-Gg: ASbGncv3oGCD/IrpAV5Cjl9n0lo3I7Mqg/q+hQidpBlOYyh7pWPiVkF/zrF/Z3GsbhW vlxAPjcPz3vpuyl9iymtqZe4a8tdLG5VXgzR0JyIZ2DwvJ7MgAGiQGH5uKnLMcIbW1v8UAMsvuz yDRKTxlmunChtXc8XyU0cQJZ2zp/0uKlnAAyFUANidtg/PNcV/DdT+mmCM+6OQhPqbBKDpL7uxx Bn+6hpOZhSjqE8kbFJue8v8kBazRvnqwqAPROjInz5ZGv6F3pHsqSEdUv9nHkmheIHHjxnuelPe 99hwwoTPZb4QiehCiaWv72E+4H0HsqZYDBx1JV3ax0uBwIry6Ys= X-Google-Smtp-Source: AGHT+IFmVcLBoWWpigk2FYgdlvz4Uxp6os1f7Ol3kCTog8B8OBZl3ImoywrnKjRR+BEOgjN/GxQF8A== X-Received: by 2002:a17:903:17cb:b0:229:1cef:4c83 with SMTP id d9443c01a7336-231d438b415mr364805865ad.4.1747927090423; Thu, 22 May 2025 08:18:10 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Stefan Hajnoczi , ktokunaga.mail@gmail.com Subject: [PATCH 1/5] meson.build: add TCG_VADDR_BITS for defining the vaddr size Date: Fri, 23 May 2025 00:17:26 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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=2607:f8b0:4864:20::531; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pg1-x531.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747927154598116600 Content-Type: text/plain; charset="utf-8" This commit introduces TCG_VADDR_BITS in meson.build to explicitly define the vaddr size. For non-wasm hosts, this is set to the value of host_long_bits, preserving the original behaviour of the check in the target loop. For the wasm host, it's explicitly set to 64 to enable support for 64bit guests. Signed-off-by: Kohei Tokunaga --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ad2053f968..185ec96149 100644 --- a/meson.build +++ b/meson.build @@ -3229,6 +3229,9 @@ endif =20 # Detect host pointer size for the target configuration loop. host_long_bits =3D cc.sizeof('void *') * 8 +tcg_vaddr_bits =3D host_arch =3D=3D 'wasm32' ? 64 : host_long_bits + +config_host_data.set('TCG_VADDR_BITS', tcg_vaddr_bits) =20 ######################## # Target configuration # @@ -3327,7 +3330,7 @@ foreach target : target_dirs target_kconfig =3D [] foreach sym: accelerators # Disallow 64-bit on 32-bit emulation and virtualization - if host_long_bits < config_target['TARGET_LONG_BITS'].to_int() + if tcg_vaddr_bits < config_target['TARGET_LONG_BITS'].to_int() continue endif if sym =3D=3D 'CONFIG_TCG' or target in accelerator_targets.get(sym, [= ]) --=20 2.43.0 From nobody Sat Nov 15 17:47:15 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747927166; cv=none; d=zohomail.com; s=zohoarc; b=Be8WtIdNyq6HrWkdi5Wb+1o4m+Yl8cpfikxY8I4OMFh/bLFST73W/TWCF0urhfx89nFbckHeiOBUw9d9pulnWxw/waEKLi3vhh2Yrhr9hGyKI9yDWaF57nm7BaPjPctCsecZvSce9WveJTVpYkIrgh509KcRg4marL4UVcsAzgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747927166; h=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=L1boImOkNO9u05Axbzk7QIsP79Tfds3gPvrPsWXaqBM=; b=A6ifOgcyFTUyLQXVbTSJG2Tn4/4agE8/mozrDyGexfbuSohTvoLni+Aq7uOu8TOTkqVHx0vY5PGbx8vgikhupJvdiC9RkegICrPv4X1Vzz+Aqsme20V3z4NOunKO/f+wLzLZDlnh6ykijKkpcuEdruyS9VGjNrjlhDtQ62oegSQ= 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 1747927166340343.35221584791407; Thu, 22 May 2025 08:19:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI7gu-0005Lz-G3; Thu, 22 May 2025 11:18: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 1uI7gb-0005Hr-Ou for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:24 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uI7gW-0007jF-0Y for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:19 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22c336fcdaaso64931555ad.3 for ; Thu, 22 May 2025 08:18:14 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:c732:a88c:b916:8b9f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4b017dasm110443555ad.98.2025.05.22.08.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 08:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747927094; x=1748531894; 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=L1boImOkNO9u05Axbzk7QIsP79Tfds3gPvrPsWXaqBM=; b=SDFP5/n7Kxd+fSnVj/PKhk6/I4c/aIhgk9+WFmPHcPjdHrWvhb0MxaQN9tjt4r69Oq FQLJU6KSfEfSivLo4s7XFSnnVrk26Sp/m1zrdZiScWYZLBh25nc0cDmfc46N0MfDvYtQ RaQTHIT/qLnFt3BWKnVLhShRqFxQpmWbyW7XW1HieTn9TKhlA+wbcNL4CWfNpIkDBiIG Q9iWlB1Jx4axbOisnCs04i8Y7/uARPsisKWXl6lyaoDwWvJrvmjCSq2/D8AYdPWGlxLp Qo7UyCvOLDgfahoEhERrlncsio3A8ofA+rYOLz78yzFPDpB0CvgmnjDCkxKKlUZ5J1ph 3tLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747927094; x=1748531894; 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=L1boImOkNO9u05Axbzk7QIsP79Tfds3gPvrPsWXaqBM=; b=XuSQitR5rOiant2z7kOC3JbYJGKzzY1oXLmoD6kua81L9nVj42QsT37sUQ6yciFFrI YXAeZryJFC2iHvDUocMEvvSUoc2QMcdpfdKJS1wR8ZwAiw/uYktHEti4oUt5cM8uwJiB zvuvBBeTerv9TaZwCghtcBXFmgTuBOEf380Oj2/jtNMPZwNYYrf435n6tu9QaSwrTayL I+xHElpIwVVJ1YhFTNI6dHS6W+OfVVvvvZvfqb7kRUjLKCpxHeg0/SPQSCpHjSm6d/KV C0W9Cul3iBPP44Scd1JNpswPKp1OvPFm/HAaSHZqC6pGocGMkPgZEd0FDnHXhYh6a3Ke rrUg== X-Gm-Message-State: AOJu0Ywrpo1YuI8qcLdVLnriAoz+tstceaoanTJ9uuiJokwiS9XMoF3F h3G1JqZMx9v/8BaK0Mt7QfFbweQTa2NRitOYcZeXaihwnHTxV/5oPOHCPPWhWw== X-Gm-Gg: ASbGncuRQ8hkB72zymoo6nMuU+A0IlcGIiUKmvS2OflzO+/fvwOOxme8wEZ1q4UsB1d DO819y2fG3pgC0JyH915Jh8XkIcFOtXayXJx6TP0sbFeEtxepna+prD9gq50IwhPVfVmHCGs5JI 3FFIkwDIoK0gX7JLZJz4vRW1ZfXPbnw4W7L/YWhaE/qYUi44ean6VaLXifVtJru6Q18ir2xKKr+ DT3E5Papf+PC3nN+Z/GPFbSjHJgcAxTiTA38R6HgHKeOzX5GhFhAI3tAVeErYg2eIjdNpfRaj0P 8VtMIAZhqdHyHVN4xryU7CDmHqOanepr8PZb2clZlehJohCEeKs= X-Google-Smtp-Source: AGHT+IHJRDmhG6UKcTyuWDscDV0MVynO7XlaLRfMjSgW3MyuXJu4jZzPqkdu1+9eT6vDXOdETSWU8A== X-Received: by 2002:a17:902:ea0a:b0:231:8030:74a5 with SMTP id d9443c01a7336-231d45a9c7cmr360757065ad.32.1747927093645; Thu, 22 May 2025 08:18:13 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Stefan Hajnoczi , ktokunaga.mail@gmail.com Subject: [PATCH 2/5] include: define vaddr based on TCG_VADDR_BITS Date: Fri, 23 May 2025 00:17:27 +0900 Message-ID: <7e749b8c93fc15ceb042eef95e49ac27cc917e75.1747922170.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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=2607:f8b0:4864:20::62d; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62d.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747927168835116600 Content-Type: text/plain; charset="utf-8" This commit defines vaddr based on TCG_VADDR_BITS. For non-wasm hosts, TCG_VADDR_BITS maches the pointer size, so this change preserves the original behaviour. Signed-off-by: Kohei Tokunaga --- include/exec/helper-head.h.inc | 9 +++++---- include/exec/vaddr.h | 28 +++++++++++++++++++--------- include/tcg/tcg.h | 6 +++--- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/include/exec/helper-head.h.inc b/include/exec/helper-head.h.inc index 5b248fd713..cbeb7bc371 100644 --- a/include/exec/helper-head.h.inc +++ b/include/exec/helper-head.h.inc @@ -58,16 +58,17 @@ # define dh_ctype_tl target_ulong #endif /* COMPILING_PER_TARGET */ =20 -#if __SIZEOF_POINTER__ =3D=3D 4 +#if TCG_VADDR_BITS =3D=3D 32 # define dh_alias_vaddr i32 # define dh_typecode_vaddr dh_typecode_i32 -#elif __SIZEOF_POINTER__ =3D=3D 8 +# define dh_ctype_vaddr uint32_t +#elif TCG_VADDR_BITS =3D=3D 64 # define dh_alias_vaddr i64 # define dh_typecode_vaddr dh_typecode_i64 +# define dh_ctype_vaddr uint64_t #else # error "sizeof pointer is different from {4,8}" -#endif /* __SIZEOF_POINTER__ */ -# define dh_ctype_vaddr uintptr_t +#endif /* TCG_VADDR_BITS */ =20 /* We can't use glue() here because it falls foul of C preprocessor recursive expansion rules. */ diff --git a/include/exec/vaddr.h b/include/exec/vaddr.h index 28bec632fb..ff6184a31e 100644 --- a/include/exec/vaddr.h +++ b/include/exec/vaddr.h @@ -6,15 +6,25 @@ /** * vaddr: * Type wide enough to contain any #target_ulong virtual address. - * We do not support 64-bit guest on 32-host and detect at configure time. - * Therefore, a host pointer width will always fit a guest pointer. */ -typedef uintptr_t vaddr; -#define VADDR_PRId PRIdPTR -#define VADDR_PRIu PRIuPTR -#define VADDR_PRIo PRIoPTR -#define VADDR_PRIx PRIxPTR -#define VADDR_PRIX PRIXPTR -#define VADDR_MAX UINTPTR_MAX +#if TCG_VADDR_BITS =3D=3D 32 +typedef uint32_t vaddr; +#define VADDR_PRId PRId32 +#define VADDR_PRIu PRIu32 +#define VADDR_PRIo PRIo32 +#define VADDR_PRIx PRIx32 +#define VADDR_PRIX PRIX32 +#define VADDR_MAX UINT32_MAX +#elif TCG_VADDR_BITS =3D=3D 64 +typedef uint64_t vaddr; +#define VADDR_PRId PRId64 +#define VADDR_PRIu PRIu64 +#define VADDR_PRIo PRIo64 +#define VADDR_PRIx PRIx64 +#define VADDR_PRIX PRIX64 +#define VADDR_MAX UINT64_MAX +#else +#error Unknown pointer size +#endif =20 #endif diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 3fa5a7aed2..256a7b059c 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -218,13 +218,13 @@ typedef struct TCGv_ptr_d *TCGv_ptr; typedef struct TCGv_vec_d *TCGv_vec; typedef TCGv_ptr TCGv_env; =20 -#if __SIZEOF_POINTER__ =3D=3D 4 +#if TCG_VADDR_BITS =3D=3D 32 typedef TCGv_i32 TCGv_vaddr; -#elif __SIZEOF_POINTER__ =3D=3D 8 +#elif TCG_VADDR_BITS =3D=3D 64 typedef TCGv_i64 TCGv_vaddr; #else # error "sizeof pointer is different from {4,8}" -#endif /* __SIZEOF_POINTER__ */ +#endif /* TCG_VADDR_BITS */ =20 /* call flags */ /* Helper does not read globals (either directly or through an exception).= It --=20 2.43.0 From nobody Sat Nov 15 17:47:15 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747927170; cv=none; d=zohomail.com; s=zohoarc; b=IZ/VF/Qg665gMyf5B2id1aLoXlp1RYu3bwA47u2J3clSGyer3EhwXlrLSvq//+3KSUz5JheDYgpX/NATgGiGlyQrZdGd2gvF+LxkB2Be9YQjjawc2E0UkqiSQed8wGRAWtmInzTBP4RzqaV6Xs/mPeexHmtFOlleKVNg/ZDamSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747927170; h=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=pdWtyILUVkLh4rqVNXXy+skYMS+HEC2iR5mqTybr0fU=; b=QWW50U6nIK6M5r2i8nbmxXQRMoNSAE8QZlBHG9G0JcALZHnHGRdOTACPecT3rmzjvOFVXzTZfSCfNMvuTVX24mQEESRbO6HHjFFOYGN81CrxdMyxUQIdbab63TSVJXxnN1F69kvoqdmACFpFApAfJM3KPs+WOQM1UBJ59R76adc= 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 17479271699211017.137455116818; Thu, 22 May 2025 08:19:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI7hJ-0005kZ-4W; Thu, 22 May 2025 11:19: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 1uI7gh-0005KE-U6 for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:28 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uI7gY-0007jc-Oz for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:26 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b26df8f44e6so7737900a12.2 for ; Thu, 22 May 2025 08:18:18 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:c732:a88c:b916:8b9f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4b017dasm110443555ad.98.2025.05.22.08.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 08:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747927097; x=1748531897; 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=pdWtyILUVkLh4rqVNXXy+skYMS+HEC2iR5mqTybr0fU=; b=eNkTE2KziTG37tjG4dDeJmKDAQkAzy5J4LGCOSzur9eORCFywAHmNskTx2pDk9zNPY I4CLHm12/cVKN+h7ORtReTksK9bIrilRHvgCn0JQ7XrIxif3Fv6zJdSOWWmhVThRwdVv m8OMUpOXQWWPPdkGk7vU6SxT1yn24voMKccy9Poqto2sYVlJye/7B0PHWR1KxD+UiMpe LxLPKQZhW8FwGvkIhTvwuh14HZTidNHGT52mbahkNV0uFv8edPPKQl/PaQb7wBppCwhT tvDzOt8xEFDdRrXBpzJe4trRJq/Sgk/Np1Rhua5BjodvqFqRkM8hoipf+9ekDJrYG6TP 6iyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747927097; x=1748531897; 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=pdWtyILUVkLh4rqVNXXy+skYMS+HEC2iR5mqTybr0fU=; b=bU6x7gdccLtLBJQYWeqtQFroV3eKeougT6hlV6AJhvVe2zZemzBo3Wntal0q3N2M4r i78NxISQdN0BwfwDBOFNWgWgXcG+BPI/clBGG8ogRYG68dbsglNYLm6mvfmjJQx/7BPl xRCadqw8NOTWurA64dbtsgWG5PU/6M7RivqtSC9mAFHlrYM6KsorTkzPKAcEs85S6UUh aWa71tcaJiC9g90Ag/N2Tgz7rRVj4QXJO3K0kU6ZSUUn6aVuHVMJ60sylWpBYHbHhWdu 75kcRvCRXUlWmsmwo62sQoEuhwzkYiRC0/fu2BGs5tuOE4q/ry69qjkoK1aGfgfv3Da2 uiXw== X-Gm-Message-State: AOJu0Yx6s3jCi48s0otst2DRR5NHLhs77DeXJjG/e8jSShNLwZgxct+G X0z08/uIZa+Qu1sqY5z49WGEviSmXvIfJtjITLitNhNgWLGaju3MXNGvIQlUjQ== X-Gm-Gg: ASbGncvacP8C91qZh6LnuE/GNd15A7ddgDggqHofjgpm1EmraNErOUuF+fWYS3tgPvI lA3oxsvoHNttIE8Lt4Hy+PDKlvXb8vnPRKfN07rLPPxdHqaga4Kcu9+DIUFVncGVLhS6yVnFQQa cytZXff3EyevWwia7h23edyzufqvxxP1uuvXcvSG1622Dd/tIpag97UZ7sWD67FeJWkMLL96hHv Iq7LgyBJq63EjLvbeuYma4YN16HZMtV0i6Q/S5gT553Db5Dt37VzwUSro9FPN4rtDnwobbHhwyK wQxdAoOY4yJZRuxlBSqjisFKRgOexAPZhiM6mvA0vF1P7vXvIHw= X-Google-Smtp-Source: AGHT+IEjAs9RNfvRXxiqnGOGVuceI9Q1+Y4N5bQZ11RNzBeuCezOjWUvRqx0W2yCA7krLpR8n7wCgg== X-Received: by 2002:a17:903:2ec3:b0:231:d0dc:f2d4 with SMTP id d9443c01a7336-231d438b4efmr340721465ad.2.1747927096843; Thu, 22 May 2025 08:18:16 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Stefan Hajnoczi , ktokunaga.mail@gmail.com Subject: [PATCH 3/5] tlb: specify address field size based on TCG_VADDR_BITS Date: Fri, 23 May 2025 00:17:28 +0900 Message-ID: <4fae51045e4364957ad7bb0220748932d4febd66.1747922170.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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=2607:f8b0:4864:20::534; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pg1-x534.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747927172903116600 Content-Type: text/plain; charset="utf-8" This commit sets the address field sizes in CPUTLBEntry based on the value of TCG_VADDR_BITS. For non-wasm hosts, TCG_VADDR_BITS matches the pointer size so this change preserves the original behaviour. WebAssembly supports 64bit atomics even though sizeof(void *) is 4. This commit also updates ATOMIC_REG_SIZE value for the wasm build to ensure assertions pass. Signed-off-by: Kohei Tokunaga --- accel/tcg/cputlb.c | 8 ++++---- include/exec/tlb-common.h | 18 +++++++++++++----- include/qemu/atomic.h | 4 ++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5f6d7c601c..b15e9e80ee 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -109,13 +109,13 @@ static inline uint64_t tlb_read_idx(const CPUTLBEntry= *entry, { /* Do not rearrange the CPUTLBEntry structure members. */ QEMU_BUILD_BUG_ON(offsetof(CPUTLBEntry, addr_read) !=3D - MMU_DATA_LOAD * sizeof(uintptr_t)); + MMU_DATA_LOAD * sizeof(tlb_addr)); QEMU_BUILD_BUG_ON(offsetof(CPUTLBEntry, addr_write) !=3D - MMU_DATA_STORE * sizeof(uintptr_t)); + MMU_DATA_STORE * sizeof(tlb_addr)); QEMU_BUILD_BUG_ON(offsetof(CPUTLBEntry, addr_code) !=3D - MMU_INST_FETCH * sizeof(uintptr_t)); + MMU_INST_FETCH * sizeof(tlb_addr)); =20 - const uintptr_t *ptr =3D &entry->addr_idx[access_type]; + const tlb_addr *ptr =3D &entry->addr_idx[access_type]; /* ofs might correspond to .addr_write, so use qatomic_read */ return qatomic_read(ptr); } diff --git a/include/exec/tlb-common.h b/include/exec/tlb-common.h index 03b5a8ffc7..87f8beab9a 100644 --- a/include/exec/tlb-common.h +++ b/include/exec/tlb-common.h @@ -19,14 +19,22 @@ #ifndef EXEC_TLB_COMMON_H #define EXEC_TLB_COMMON_H 1 =20 -#define CPU_TLB_ENTRY_BITS (HOST_LONG_BITS =3D=3D 32 ? 4 : 5) +#if TCG_VADDR_BITS =3D=3D 32 +#define CPU_TLB_ENTRY_BITS 4 +typedef uint32_t tlb_addr; +#elif TCG_VADDR_BITS =3D=3D 64 +#define CPU_TLB_ENTRY_BITS 5 +typedef uint64_t tlb_addr; +#else +#error Unknown pointer size +#endif =20 /* Minimalized TLB entry for use by TCG fast path. */ typedef union CPUTLBEntry { struct { - uintptr_t addr_read; - uintptr_t addr_write; - uintptr_t addr_code; + tlb_addr addr_read; + tlb_addr addr_write; + tlb_addr addr_code; /* * Addend to virtual address to get host address. IO accesses * use the corresponding iotlb value. @@ -37,7 +45,7 @@ typedef union CPUTLBEntry { * Padding to get a power of two size, as well as index * access to addr_{read,write,code}. */ - uintptr_t addr_idx[(1 << CPU_TLB_ENTRY_BITS) / sizeof(uintptr_t)]; + tlb_addr addr_idx[(1 << CPU_TLB_ENTRY_BITS) / sizeof(tlb_addr)]; } CPUTLBEntry; =20 QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) !=3D (1 << CPU_TLB_ENTRY_BITS)); diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index f80cba24cf..76a8fbcd8c 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -56,6 +56,7 @@ */ #define signal_barrier() __atomic_signal_fence(__ATOMIC_SEQ_CST) =20 +#ifndef EMSCRIPTEN /* * Sanity check that the size of an atomic operation isn't "overly large". * Despite the fact that e.g. i686 has 64-bit atomic operations, we do not @@ -63,6 +64,9 @@ * bit of sanity checking that other 32-bit hosts might build. */ #define ATOMIC_REG_SIZE sizeof(void *) +#else +#define ATOMIC_REG_SIZE 8 /* wasm supports 64bit atomics */ +#endif =20 /* Weak atomic operations prevent the compiler moving other * loads/stores past the atomic operation load/store. However there is --=20 2.43.0 From nobody Sat Nov 15 17:47:15 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747927133; cv=none; d=zohomail.com; s=zohoarc; b=fIC0qj855opj5oHsdNrZ8z8CSWy2US4UqdtJgVxAJveaSH9en4s/QziEghkq6bQLTbvdBjdQ3gSLqvTh4wXjgU5SaDH/0Rb11jqaQEl1di03SG/i6vVDzr6KJ40wrOZUmPEBUt1CQMAZw+0OGH5dVc79RmQbwWFXpObtl4+ab8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747927133; h=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=cCq9WAUGr8u3zKF9/a0wp/dlu28iL3FkRTchvocCuNo=; b=m6KT56hAbeEl8axy8QzsYWeVfbZDRvFVPxlvYS2la8pXFoTOrPjA1NR8DN9IBpaPkD5Tt98QLEx4nU/Wkym7XWtW1U6mtdYkon8o8//r7RQnrajVjRtZhz1B4Gn36VmFpsFJ2FLvxcLL6w3z8DI2Y5/rVhoAiBbiPD/6CpwV/Hg= 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 1747927133511207.84921599229017; Thu, 22 May 2025 08:18:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI7gs-0005L9-Id; Thu, 22 May 2025 11:18:39 -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 1uI7ge-0005IT-TE for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:27 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uI7gb-0007ju-IP for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:24 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2320e53167dso58582155ad.3 for ; Thu, 22 May 2025 08:18:21 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:c732:a88c:b916:8b9f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4b017dasm110443555ad.98.2025.05.22.08.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 08:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747927100; x=1748531900; 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=cCq9WAUGr8u3zKF9/a0wp/dlu28iL3FkRTchvocCuNo=; b=TPYaqX87SkkP+uNrxUG56/jIZnARyhMlwS5UTLykFDUzNeSAnce6e5AE2VD9hX31HZ Db7Bs3sGM9NFJ0vJt6g34rsaNnZJHLq5Nqab1+sxwD9HBdsSKjZM3fSrgXz861SWD/D/ 6Yjq04Ug1sPKvNLnydBpcpFVZCsE29Pg/Ycqcgz9sA86M3sCBkgakstJBLL+weiNqufc k9iI8ab4cfHjuqcE1Akl8dEb4Rx/hZqoHqRlP1SkdFaaa94CDZ6csHLrNd3OeQiWTFW6 YJ6uhGZ0brP/kFbdK+ifzToOe4Win66W1b6+fBWltMZuKKZpmnMj6z+3G2jXo15Vqp00 JGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747927100; x=1748531900; 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=cCq9WAUGr8u3zKF9/a0wp/dlu28iL3FkRTchvocCuNo=; b=BMkQR6blfRHr1aAC15I5WB2BXpQLEWrRtfYwfyvgjjBi9zPfE1Krk4RidD/8oIrXV0 26EPx+3eYIk8wr+dbfR39UzTHIpnFJyWUhU1q+oH6fFoniRz5/S8Y6Oujfg3gnJcmpq8 xOGZAbWd30pdiZ1qj4MEECMUwV1tleJTRIZ71La3PkBd1nj5RI8sbFdf3zO4u8Pi6PlF id6u/A0ym6S40mhbbNJcvO3Gl/9N/HhhVyKlZqHHXGYRMUsMYFhJTVo1akxpsb0NKmlf 9b67EHE0hiGujk3d2HhUtb7N4rSXzf0kzVEWEwmiwibtMQ6qCnu2ORbLWXb1M8zzXB9j 1XCQ== X-Gm-Message-State: AOJu0YzFONTFt9SgxgFG919cHRMqzH6Gmf8awKMl9Y8qG4Y3Fvv0+tJZ wNX5I6NHYEIkVRTtJsB1SQz0gPGIEq0ERgZeB+1XTw3nudHyabEqMFtwN/CMKw== X-Gm-Gg: ASbGncsmbIVW6xPmmP8gxIDrOkPCqi/SCc7ohqZMZAtLjSoHe+Dj6/FzoAppmR0BnMj gF83O6qSWzOqpg2S8x0gNT01EvkbRrg7HauN1UDGIMslw2RQoi19ErI2wRD5MoKMa6b61DuLXTT Y+zl7m5u1dZ4/gdnV3Zuy2MSv3DBkwhW39JznNEOYUBaOcT/m16+RLSjKX88V4cBmWuYSEbCUWV W6ikolEyR+GuZFBBzwvWsxMnOfihW7iMGV6DJ2TZmNMsLIoUf/7KMMFebAShAm0ArwppVra1Nt8 k6W0uXuJnH7E53EYI5likG5HmHNRJAK8vREMOnJDp9yxTNYq7KI= X-Google-Smtp-Source: AGHT+IGhJnc7Z1q2+r+pY4vXa3hJe36Qf0wt5hdjKlEsyT708xfaMOH+EYfSc04YXasZ7ymtVggpkA== X-Received: by 2002:a17:902:ea08:b0:22e:6801:b9c9 with SMTP id d9443c01a7336-231d43dcc72mr309468365ad.8.1747927099882; Thu, 22 May 2025 08:18:19 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Stefan Hajnoczi , ktokunaga.mail@gmail.com Subject: [PATCH 4/5] tci: define TCG_TARGET_REG_BITS based on TCG_VADDR_BITS Date: Fri, 23 May 2025 00:17:29 +0900 Message-ID: <3edb13f42740984e2272425478bb58a6d985269e.1747922170.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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=2607:f8b0:4864:20::62e; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62e.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747927134543116600 Content-Type: text/plain; charset="utf-8" This commit defines TCG_TARGET_REG_BITS based on the value of TCG_VADDR_BITS. For non-wasm hosts, TCG_VADDR_BITS matches the pointer size, so this change preserves the original behaviour. For the wasm host, this change enables support for 64bit guests. Signed-off-by: Kohei Tokunaga --- tcg/tci/tcg-target-reg-bits.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcg/tci/tcg-target-reg-bits.h b/tcg/tci/tcg-target-reg-bits.h index dcb1a203f8..0e5db44e22 100644 --- a/tcg/tci/tcg-target-reg-bits.h +++ b/tcg/tci/tcg-target-reg-bits.h @@ -7,9 +7,9 @@ #ifndef TCG_TARGET_REG_BITS_H #define TCG_TARGET_REG_BITS_H =20 -#if UINTPTR_MAX =3D=3D UINT32_MAX +#if TCG_VADDR_BITS =3D=3D 32 # define TCG_TARGET_REG_BITS 32 -#elif UINTPTR_MAX =3D=3D UINT64_MAX +#elif TCG_VADDR_BITS =3D=3D 64 # define TCG_TARGET_REG_BITS 64 #else # error Unknown pointer size for tci target --=20 2.43.0 From nobody Sat Nov 15 17:47:15 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747927167; cv=none; d=zohomail.com; s=zohoarc; b=eMza3kwAEMGUv0+AvozH7ah2aLrTEFGBllwyYGObF3s+pkmVfO1Kly6aYc0mA4co0RPjfOxYOAjuocQAPfug931FRwuLf6l23KQyGX8ezERwVRpo5NeNZTmHTmj1ZdbsVq1Toydnh9IzqmQnQGBu7juBg7q5mUWxE8WqmnOr72U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747927167; h=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=edXpGQQK83lOkWaFk7S4cvE7PVc3Wlv6jUv6RWOBqJ0=; b=EI/roeTlo0qZSVaNusnI5Sz5mWWk7EzWn0o52P97aEj413BVvGjnH6Y8G1fcsncc7DV6K6cxBIkq5VRmEFoTVP6wBUlBboaeMCtKk2z8Y8bNdWzx54dNShjbsjgRm9yQan5k8G5yDqH8SWjInVbIqjuJ7DDhgIHZugkEcXLH6EI= 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 1747927167510436.2308974593602; Thu, 22 May 2025 08:19:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI7hL-0005oy-Q6; Thu, 22 May 2025 11:19: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 1uI7gh-0005Ik-9O for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:27 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uI7ge-0007kG-JF for qemu-devel@nongnu.org; Thu, 22 May 2025 11:18:26 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-7fd581c2bf4so6410062a12.3 for ; Thu, 22 May 2025 08:18:24 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:c732:a88c:b916:8b9f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4b017dasm110443555ad.98.2025.05.22.08.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 08:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747927103; x=1748531903; 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=edXpGQQK83lOkWaFk7S4cvE7PVc3Wlv6jUv6RWOBqJ0=; b=Z/lxIsh/qTxSO90CB8NeuylbQJn/w1gEBBU4ZsAT6aHjaGvc0r7mn3pLUc9w6TWj5P y+UI993fondWRXrtvQiDbhOI1dV46ha3KdvUd/RYsu0+BxrKPNYt/7byMPTPqnsPRbXY L1G+dQfgOi0o3YxZtYHasAPzjxmgT1dVhVIgGqLeRtDc1eVCxu4u4XlXgitYNYKgW4qQ VSkbjU7uyWHma3fpbitHnlmGI1H/RyONt64HxzkOkJPi6ThHc8HaU0GtSaajnr5Ckb7x xxvJnPTUqbjf2GEzbMh9HJQFunAHjJatU1xs42/WYk1F2IV+waNgK8fATXYr4VSY7e7r Q/Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747927103; x=1748531903; 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=edXpGQQK83lOkWaFk7S4cvE7PVc3Wlv6jUv6RWOBqJ0=; b=IKk+fxUTSE+sTWk425TDAboNvJ49OEvBDhXuiEktBEwZkN758NU/6UCHaMrQAuzVTg Pun7ewDum+westVds9IZB9Na/nXXYLwyraEupUPrtQ626scEmluAZIp9izAwGgaux+7s eQsMKxHVcXTqW3K4TObfZ2G5vp+0hXOfDUy5H/dEAiudsBLs12R7TK78QTcWKdPIP6H4 5VaxrokL1OrBwPBz4Z2zIXywXb7jphen0HGOqedpVEng7AMGVFPOHIuaMTV4WQGnYZfF PDsCuBEpksL7zKxGydCmhLhO3VjEnTVr+1pT5U70GbRiXRNiRFqUNVmTDoQ0fV5jOf+9 8WjA== X-Gm-Message-State: AOJu0YybHJ94rR5GBs+/Pty8aIb8EdEvYivPHIyD+fGzodYnNLptFSse Lt/xUnlGFH8U1vMtja7K2kvPZ+600RK77Gd2AacSSYab34hSWHecbkJGB6vZCQ== X-Gm-Gg: ASbGncts16p8VHf2jItKTm7oqqS5G1EZ3uBkXZbOJYgTV7kpzfsII+649dbIVm0AIIy sj6DmjrIp31bV9w5byihj6aHZE6A8AIas0rHYZgbpsefvYebRpbaS9D36h4f59rVDsuBOYmIlOH r2PMlRPXu5+ktRcnZz61CC1jSb8qy33m+cqU8/2FWXXm+6MNOIe8g7GrwkkJuy0XS9FdLdSBw52 gpm6DMax4wqWNEHIPGIxPwb7caLAz/x5KUgznRfQi1ExQL7LjczztMeYbJePZhYUEM1MYxeShU1 +n0NjOHclM12ukfDS/Jwuk5GQEoflSV1Uojn5MED2mU2+SEtDuSBwcm05dr5rg== X-Google-Smtp-Source: AGHT+IGUVf3g1XiI9/kpr82fHFFb6dQtpnyJ8dnGvQGzSzqNH8K7oZoP7yVfd0YjliecXkQUQrJh8w== X-Received: by 2002:a17:903:2990:b0:22e:1740:e561 with SMTP id d9443c01a7336-231d4515b85mr398278555ad.19.1747927103005; Thu, 22 May 2025 08:18:23 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Stefan Hajnoczi , ktokunaga.mail@gmail.com Subject: [PATCH 5/5] tci: use tcg_target_ulong when retrieving the pool data Date: Fri, 23 May 2025 00:17:30 +0900 Message-ID: <3ec0f9bd69a42965f55e079739045ef10f4d4d82.1747922170.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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=2607:f8b0:4864:20::52a; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pg1-x52a.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747927168770116600 Content-Type: text/plain; charset="utf-8" TCI's tcg_out_call stores "func" and "cif" as tcg_target_ulong in the TB using the pool feature. On non-wasm hosts, tcg_target_ulong matches the pointer size so this commit preserves the original behaviour. On the wasm host, tcg_target_ulong differs from the pointer size so this change ensures TCI retrieves the data using the correct type consistent with how it was stored using the pool feature. Signed-off-by: Kohei Tokunaga --- tcg/tci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index 700e672616..cee65bceea 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -367,10 +367,12 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchSt= ate *env, ffi_cif *cif; void *func; unsigned i, s, n; + tcg_target_ulong *data; =20 tci_args_nl(insn, tb_ptr, &len, &ptr); - func =3D ((void **)ptr)[0]; - cif =3D ((void **)ptr)[1]; + data =3D ptr; + func =3D (void *)data[0]; + cif =3D (void *)data[1]; =20 n =3D cif->nargs; for (i =3D s =3D 0; i < n; ++i) { --=20 2.43.0