From patchwork Sun May 4 20:57:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 887214 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1753452wrq; Sun, 4 May 2025 13:59:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9MrTvh55Yehn0f417Ku2tzdxpZ7CAGA7G7EEEKRLYEAemwbHwk4vQq05UBsXCxLqS9y+q2g==@linaro.org X-Google-Smtp-Source: AGHT+IF3O08ey+KQa5j5yrIhIuo6+7OCmRMNz5MrawvcjDyVqRBn7ez0VJFtCUlKES7tKZgmw3q4 X-Received: by 2002:a05:622a:344:b0:476:6cd3:d898 with SMTP id d75a77b69052e-48dff9dc588mr82180951cf.18.1746392369000; Sun, 04 May 2025 13:59:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746392368; cv=none; d=google.com; s=arc-20240605; b=FfI9J0UVhx3FCneOo1dYhnpwfAd+VPZgOTlr1jicJo35RNzezFWC+jFYVGKnIajVE8 Hu5KXG/VZxYS7DVGcULSiCPeWMoclzfx0io1qAUMpZsg+ev1JTYAehrWXIT/4OWfJZ7k tLXHwHa6vxfZUn7Cw2c2D+tUfLXMSVYrnCDx4VJ3+mU5P9lxOnZq7SVfdHCTWRXNs67q UNux/6RuBdfEX3IfWW8borUKLXt+CHYufa7x+e+z/BN+fAX/GGLCWg+ctWGnxvoLAeKH Io1wAMZoII1paNTbV56Xex0/xwTYa9o9LCy9O36ldflSbvhOpcx01AeYX/S3UsVPKMWX pWwA== 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=TIQELB2tRYMc57jWwkjeMWxsQZONjOqCuvRT3H/S0gQ=; fh=Pv3pulUVvXUhrKyZbO+p3N5iLb5JXHomPjLnjWqGrjA=; b=KPUBYW+f7NDIAtEAJgLCnJIBmtU1MILqCE/kB/8+nKI+tb2n+W/E+2yxPeuGONUqnP jZhlbsvPWA8HOREwDfxxWdBC7+4ir0o0juQGcYU6FSt6Nm2AgnIcNoyYk3gufgF5rth4 DSNSuilePENBbW633NdHwbCuUgaue2rsQLMOAICT6887nTekc9JGC9on6BdjBuFZOQlA EAdGUi5h5Z1fwQB/AhTLAxx6yYJH0rH9LRMjPHR7cX/aeYEa0ahps2RSw3ojcGm7QOUm 2v5FlvqPqJubWxKp1YGUhtWai0M0GcAvBRMMLWRRsU0NuPDqTMFf2FOqO+QKVC38kF6n pv7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GAZluYBC; 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-48b990fc353si73778781cf.625.2025.05.04.13.59.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 13:59:28 -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=GAZluYBC; 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 1uBgP2-0008Sc-GP; Sun, 04 May 2025 16:57:36 -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 1uBgOt-0008Nh-Gc for qemu-devel@nongnu.org; Sun, 04 May 2025 16:57:27 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBgOq-0006x9-Ih for qemu-devel@nongnu.org; Sun, 04 May 2025 16:57:26 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso3366093a91.0 for ; Sun, 04 May 2025 13:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746392243; x=1746997043; 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=TIQELB2tRYMc57jWwkjeMWxsQZONjOqCuvRT3H/S0gQ=; b=GAZluYBCncTuczWvE4cR417NM6PCdrwlFl4Q4DRzu1w9PwzhzgzYniqJ65+2D2PbnY sE3BHBga0e4Z18GDsxK+xextGbzghbcGjnKt4lC8doe17n6VnxTOhotNNlSj0OvXFYwU bZK7BwrpbVFlo70kuMlv5EgnxLTJoo0vgVshnvOmN6zf55eiQXhCpyaBkzsR8P7SX9Nc 0GQnNad+GNJNqGKOiL3taDAZ/CQHWXAcKeh3YyWkE9rWdMnEgSzTa+EJBTRAS/C7IuhH qF5R7yaWV5fH5Ur6jrlIvixuH0TzHurdnbcE+bIXDnNG/iOUY4esE4D1O2dGmL5C2Kjd 0AJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746392243; x=1746997043; 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=TIQELB2tRYMc57jWwkjeMWxsQZONjOqCuvRT3H/S0gQ=; b=Wlw3NUSs2b1sYWlVT3BjUrLTSHjB/G1EhSDy3DSE+xqR9tgFhMRKoLF3zRW79QYIOK PELWTcktghHlXUmSIr4eqqvSVE4yrioedP9IFJRmOsz3o7mRccxfQofc9gXlBOD7XS9j yM0Ewy5Wu87OMSpkM9R9hj1AznPU18MqZIXYnvQfWDBjkP7L6TQrfNxHbH1vHt0ZGPp3 g7Co2Q+pMxwKa1SZeJ8+KJYa0U/GMdIdX59RmVAL0XMRCVQ2+meCa/QtzPiEq3SbGBw8 vp0Iqc0+rZoBwV/uztBEoJ0BvI5gd4hzEOkO5iyiX40y4vEOaecbZcVrOqikOCjLh+XC 3H5A== X-Gm-Message-State: AOJu0YxMaUJAmWxj0lVpTY7LDjHAjmf9Xt7BkYNGNbOE5q45bVDkpIdN KtuYFoPOmi8W0N4rU0tshIZJx0v3REl9DKpWZIMLktCcIebWL31+O3UYaih6Va//g6mlotMGf15 o X-Gm-Gg: ASbGnctT81ZJG1y9oKfFzNILGgQKssmj4zSLcQysih4K8qN6Q56sLCmPlsBci3dGdar vkywtDHPKnDEXV7Nbh/1uCaqNRpgEsUKb82ECFtRE8IxkCHJhdUpvZ8cQfVANBRpjUysmzoBuWx hiVaAA7iThZJr8rsMn2U3Z6zkw9U32f6OpS2KDh9O4v8Uw51gBpntf5526P4jSikLBKrk5peViT f2Pdkw9MaQCfcjvGm1hU0nu7G7NJ6y/kUlKKXBFn1xqBQXmPJiaWPnuKKKynw8XQMjoRS/PN/Hj xXI7F+6ohd0MtmEJi5iaM7dIUWZZbCt+dQgmVkZICZk6s68eSUs4WbUeyqE8vlTc2TSidqn9Jcs 0FGYufk/eVg== X-Received: by 2002:a17:90b:578f:b0:2ee:f076:20f1 with SMTP id 98e67ed59e1d1-30a6174fda0mr9082464a91.0.1746392242797; Sun, 04 May 2025 13:57:22 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e150eadfcsm41346425ad.32.2025.05.04.13.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 13:57:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: foss@percivaleng.com, qemu-riscv@nongnu.org Subject: [PATCH 09/12] target/riscv: Fill in TCGCPUOps.pointer_wrap Date: Sun, 4 May 2025 13:57:10 -0700 Message-ID: <20250504205714.3432096-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250504205714.3432096-1-richard.henderson@linaro.org> References: <20250504205714.3432096-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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 Check 32 vs 64-bit and pointer masking state. Cc: qemu-riscv@nongnu.org Signed-off-by: Richard Henderson --- target/riscv/tcg/tcg-cpu.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 55e00972b7..267186e5e3 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -237,6 +237,31 @@ static void riscv_restore_state_to_opc(CPUState *cs, env->excp_uw2 = data[2]; } +#ifndef CONFIG_USER_ONLY +static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_idx, + vaddr result, vaddr base) +{ + CPURISCVState *env = cpu_env(cs); + uint32_t pm_len; + bool pm_signext; + + if (cpu_address_xl(env) == MXL_RV32) { + return (uint32_t)result; + } + + pm_len = riscv_pm_get_pmlen(riscv_pm_get_pmm(env)); + if (pm_len == 0) { + return result; + } + + pm_signext = riscv_cpu_virt_mem_enabled(env); + if (pm_signext) { + return sextract64(result, 0, 64 - pm_len); + } + return extract64(result, 0, 64 - pm_len); +} +#endif + const TCGCPUOps riscv_tcg_ops = { .mttcg_supported = true, .guest_default_memory_order = 0, @@ -250,6 +275,7 @@ const TCGCPUOps riscv_tcg_ops = { #ifndef CONFIG_USER_ONLY .tlb_fill = riscv_cpu_tlb_fill, + .pointer_wrap = riscv_pointer_wrap, .cpu_exec_interrupt = riscv_cpu_exec_interrupt, .cpu_exec_halt = riscv_cpu_has_work, .cpu_exec_reset = cpu_reset,