From patchwork Sun Feb 27 02:04:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546431 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp1608701imf; Sat, 26 Feb 2022 18:07:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxB6FVvS/bqRv0WzLb8tepHiJomwwYoxYQpDzQiQpR2vOWa3qB22TrkMNNHqD2IKoQ0DdOq X-Received: by 2002:a25:9a02:0:b0:628:1f48:8f64 with SMTP id x2-20020a259a02000000b006281f488f64mr1441649ybn.149.1645927620029; Sat, 26 Feb 2022 18:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645927620; cv=none; d=google.com; s=arc-20160816; b=0AEh/xqBaB6dgMHcXzRZEDxUJiGSH7FLBloxCCvJNjKtyWf7+HPv6LGRfxz3IBHI1+ yASkMXRCl48W5p8hp3ugmPRTz453JsbKGZZN5qTy8opTzZxOJb/y3yzkBpYdR0P3+9Ca IW4QtnXm1FHiVHueJiZ9Y6kHs3ErLZW4jL4LB4d+u1mMIImBDZYWaVU0HG2hiRy0PFA+ cYtutodS0aMfvvJk2OTgaAkxHQ1ROYEmXzCxifrUJwbuAtvu6tvXr9nfQoEgd/wZzFMZ D++TvLahnMdNbrxTyJjgnCmIvPt576aRvhqfP+XRVNrcbf3dRHNivwczWzbFI4uotFk2 KKqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from :dkim-signature; bh=MvxCNCGUBInjDmFx14YA3wZL3SPbsmtyRwG14WPc7Rs=; b=nnCgoS7U+8CpzAqU8TsWrQwWSDL/i4JXDDMabmvSvLyusRx47aEViAGewPDzJhzoWv VszI/RygwkDjjwD0LBLMisLpsM8JZCzeX2nT/pokLjN9DiuIGW83RcrZXrD+BzBNhIiK tL8ocy3JCMZvFxKVuBCU9GeHP2lFSNRSe7pfPcPa/ez8pngtGFwmI2Z8hv0Ivdo4vaNf SGsTg5Z+YHdh4KsyKT2o7Fw4w+eeFZa73OrpD+OA41qpO/Je6S/7qVz1X6WuH+Zc7TnB ZTh8dbogOBkxq4bC2mKE0GCSZ/GNBAlYMMfv+oFH4DeSMA/a0P7sn4S/MzKXcSo+dhvb JJzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="keIznYC/"; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bd6-20020a05690c010600b002db396cea2fsi3876511ywb.246.2022.02.26.18.06.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Feb 2022 18:07:00 -0800 (PST) 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="keIznYC/"; 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 Received: from localhost ([::1]:38192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO8xf-0002U3-IA for patch@linaro.org; Sat, 26 Feb 2022 21:06:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO8v9-0002Qq-JY for qemu-devel@nongnu.org; Sat, 26 Feb 2022 21:04:23 -0500 Received: from [2607:f8b0:4864:20::534] (port=35596 helo=mail-pg1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO8v7-0007Rw-Eu for qemu-devel@nongnu.org; Sat, 26 Feb 2022 21:04:23 -0500 Received: by mail-pg1-x534.google.com with SMTP id e6so6942927pgn.2 for ; Sat, 26 Feb 2022 18:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MvxCNCGUBInjDmFx14YA3wZL3SPbsmtyRwG14WPc7Rs=; b=keIznYC/Z1JY+KJR7oMM1Q57SAHBei7AkD5c4BKmwDG9uOhUiSmTueQaDhYg03B/cC PGJyPTc7iw9bCWPAxWsJGt1WGoc2r0gPiGAew796cnzl+MfwUTQOPbqd+yA2TxIKkXJa T6LQdDkJUJXbNhPm+c1IFyCB1d7cVccRNNYsH0ewXocxPcf7LBRRmPbXeBnLD6Ak+N8m tpP/5uSw3k7HkP0XqFQWmmZktE/b9hh0sJoxIFDmzWMk0rOJVvChqrS+1pXHuqHJ0mKu YtNsfOxWQNcwJRmp5voCqe+oRKu5IpngxcsqSlFSp93Bi9mo5kmTeyv2VYmWrWVkMJqn jIIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MvxCNCGUBInjDmFx14YA3wZL3SPbsmtyRwG14WPc7Rs=; b=RVzETB8p8iDXZGZREDA+1wEvHq4S6/vatWQ3mAT7vXVeukwEI57o1HB2saY4Ihiaix 4momHElpHhzxV4DGboBDKuzTP2uaViX9esipmysfInZ/mkVCz0sKQdCxuzK6zRMNbX2/ gcd7y+PtdAOgbYUhtaPcwgVJIIuOiHKK5tq7Zk7G7mNxMdJ2IIrdgZKDN3Gnmk0gIyIU vl/PY7aYdQIEYA/T0PJoJJ+q5iPUS7+1HodTm4mElDUnF7Ycqot62oNaTOlwC9cXqtSH +zFmRFmZ8uaq1xyEEj8osEApLRJva0nniUX2PSHYM3JixqYKbi1bQZcsosn9GD2ZkeqZ jlwQ== X-Gm-Message-State: AOAM531434Xquxi0o/Ssrq51K5U7pYwFrxKQuLLYTyK+URRukslPDB0g LcsZRAPuygEUu00aQpJLGaYgos0b2Lwxg6Zs X-Received: by 2002:a63:ac58:0:b0:373:9e90:3b7a with SMTP id z24-20020a63ac58000000b003739e903b7amr11925100pgn.262.1645927460242; Sat, 26 Feb 2022 18:04:20 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-9001-d56a-9ee0-0246.res6.spectrum.com. [2603:800c:1201:c600:9001:d56a:9ee0:246]) by smtp.gmail.com with ESMTPSA id q13-20020a056a00088d00b004e1bea9c582sm8304021pfj.43.2022.02.26.18.04.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 18:04:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 3/9] accel/tcg: Support TCG_TARGET_SIGNED_ADDR32 for softmmu Date: Sat, 26 Feb 2022 16:04:07 -1000 Message-Id: <20220227020413.11741-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227020413.11741-1-richard.henderson@linaro.org> References: <20220227020413.11741-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::534 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" When TCG_TARGET_SIGNED_ADDR32 is set, adjust the tlb addend to allow the 32-bit guest address to be sign extended within the 64-bit host register instead of zero extended. This will simplify tcg hosts like MIPS, RISC-V, and LoongArch, which naturally sign-extend 32-bit values, in contrast to x86_64 and AArch64 which zero-extend them. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- accel/tcg/cputlb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 0e62aa5d7c..0dbc3efbc7 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -40,6 +40,7 @@ #include "qemu/plugin-memory.h" #endif #include "tcg/tcg-ldst.h" +#include "tcg-target-sa32.h" /* DEBUG defines, enable DEBUG_TLB_LOG to log to the CPU_LOG_MMU target */ /* #define DEBUG_TLB */ @@ -93,6 +94,9 @@ static inline size_t sizeof_tlb(CPUTLBDescFast *fast) static inline uintptr_t g2h_tlbe(const CPUTLBEntry *tlb, target_ulong gaddr) { + if (TCG_TARGET_SIGNED_ADDR32 && TARGET_LONG_BITS == 32) { + return tlb->addend + (int32_t)gaddr; + } return tlb->addend + (uintptr_t)gaddr; } @@ -1244,7 +1248,13 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong vaddr, desc->iotlb[index].attrs = attrs; /* Now calculate the new entry */ - tn.addend = addend - vaddr_page; + + if (TCG_TARGET_SIGNED_ADDR32 && TARGET_LONG_BITS == 32) { + tn.addend = addend - (int32_t)vaddr_page; + } else { + tn.addend = addend - vaddr_page; + } + if (prot & PAGE_READ) { tn.addr_read = address; if (wp_flags & BP_MEM_READ) {