From patchwork Wed May 3 07:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678752 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp914519wrs; Wed, 3 May 2023 00:42:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5y8o+XfcI1FQUL+v1M9rhbH6gu6pRRxSMkNt3XzUqRcWPikAdAnX1pItg37apXCQFkVUve X-Received: by 2002:a05:622a:178b:b0:3ef:2649:44ae with SMTP id s11-20020a05622a178b00b003ef264944aemr29651440qtk.13.1683099737742; Wed, 03 May 2023 00:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099737; cv=none; d=google.com; s=arc-20160816; b=nhASA4rT3RldPqe4XTUEevV2lWPDZOwLCnY83CRgjLG1GO/iPIpgilYHJaLH7OvUEE a7wny6+Lx7pdhiWxLYZmuHPo7i262TE5IQ4PikpX8pf+buyMfRp3A5R95cGhoZD7IOUZ 2mTdFsDbFlDFJfpI+H/sRBC9L6FLhhoyB1ZQ/wPXEvh6LQuw6ArZg9vYY6bJvH7STi8M MjyYP/lyYV7ToFA8fqHMxlL5Vr2tcDfY++CJhC2UucMSQRJNb3C62VNxfSCITeuqqHq5 /XWTEFc8ADFNd4cKiTs5P3B1FBzic3dJvlRdyOSnh6MoCtO8qRhbkOtESCdjz+pin2X1 PNUg== 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:cc:to :from:dkim-signature; bh=ZDXkqK9mfdU3Cm8OqGXV0ryPCZnRW3rCBHGqASwnBPg=; b=If0XeNylMbYXOG+bG7WFZCHPBWSUSS25WUSIZIazsG0mkwTXhpjPzr4+fTyCEfsnCd C3T8W/A5DY08tateeDZcNffd62yNh68RuPdC0FH5HfMVQ8T42hjfkYRHxmgbNesyu6VR FGut/akGxit1ePWXdiTof53PtPCWOSCNzbTrhEzEAiVNYZD00r0pE7lWHy9FzU4Gol0n X0tsLxHgsmwWrGXWt6XRXRV5c2pbjERiD30whcg6QBeOh4aoN5PueuDN8qpG+ZsBASMp dA9ArvCpQDedTIpuVGHgq/EJYFfnDBOxohwGZNHBXbvvuLIwhL1IMWpiyfpO7rYYVbst mODw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="m6kMSS3/"; 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 h4-20020ae9ec04000000b007465c8340desi3805482qkg.313.2023.05.03.00.42.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:42:17 -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="m6kMSS3/"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pu6qq-0003dA-5J; Wed, 03 May 2023 03:24: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 1pu6qC-00029n-PS for qemu-devel@nongnu.org; Wed, 03 May 2023 03:23:58 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6qB-0001k4-3s for qemu-devel@nongnu.org; Wed, 03 May 2023 03:23:56 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-2f86ee42669so4561299f8f.2 for ; Wed, 03 May 2023 00:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098633; x=1685690633; 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=ZDXkqK9mfdU3Cm8OqGXV0ryPCZnRW3rCBHGqASwnBPg=; b=m6kMSS3/WUTVVuE6GWhPYXPqcs3Z2tX98anAOnlBzyKL7QoZlbYlNqL4ZuUm4yl3PD YKZXhatYIQJWF2W2yHazkEp404qvMJlZqWSnWk8WP9XWlnpxb8ULa8x1Dg0/4LBYP0PA e20IvxGpq6HkBEyT5kIaIhm7cOuf8plEBPU5hIyXkvxBoM0ZUeequ8NB2XtlL7rodIHW bO6sknBF4/nXWeBs1y6mYKTG8WUexsqWlfkbUNr8HnjoMkA8hlFM/ox/srIEyLZ/eEC7 UsqpjMCzvwwRoXXAYTaihjdrUP3v1R61RDaKRt7C3rQFGT3c6dA+VYh7nob1Nm5pxLpi M+Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098633; x=1685690633; 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=ZDXkqK9mfdU3Cm8OqGXV0ryPCZnRW3rCBHGqASwnBPg=; b=im9UnPfKOQ9uHqQj5f88be9GCTs2wpxIcGn2Dxt/ggkAlQ8WPot0fuiQFbh31KXIDQ hPK/aEW0DLOQHP824LyaI/gB8xJziWp0/4s+o77qWlqmayt5FUZK89BNt2hRfkA0xrWI 5oBS+0Sy/My8Xk3r3+hWdbdUXpoFnzcSbnS15MgDIdveuah/cwtzmQRUZiPiix8tXooe BtUGWLqt30YhE0iH2WWTKcsl15meEKWI45deMDi/OpbolmN6nYD4GWD2srAYsI/ysTZy kJzalDIJqNl0eu6UvH6qk/7QkiCmk5y7Skq1cCiF+ji+70AFVP6pXZtaK6EjNdlmXw7q Hgiw== X-Gm-Message-State: AC+VfDzcVeypSBDyKszw1tMXWjz6ZxU3ZcKIDjgndpd+zhHnEd3166Nr ozgt6FL/SFVtHOpGGVBrmUGlSsRrljwc7yN5TAzzIA== X-Received: by 2002:adf:dd88:0:b0:2d0:bba8:3901 with SMTP id x8-20020adfdd88000000b002d0bba83901mr13823845wrl.62.1683098633226; Wed, 03 May 2023 00:23:53 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id b14-20020a05600010ce00b0030627f58325sm9586745wrx.25.2023.05.03.00.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:23:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 26/84] tcg/riscv: Remove TARGET_LONG_BITS, TCG_TYPE_TL Date: Wed, 3 May 2023 08:22:33 +0100 Message-Id: <20230503072331.1747057-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x431.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, T_SCC_BODY_TEXT_LINE=-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org All uses replaced with TCGContext.addr_type. Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.c.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index 16e35ea6a6..fdc1faab1b 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -908,6 +908,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, TCGReg *pbase, TCGReg addr_reg, MemOpIdx oi, bool is_ld) { + TCGType addr_type = s->addr_type; TCGLabelQemuLdst *ldst = NULL; MemOp opc = get_memop(oi); MemOp a_bits, atom_a, atom_u; @@ -950,19 +951,19 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, TCGReg *pbase, addr_adj = addr_reg; if (a_bits < s_bits) { addr_adj = TCG_REG_TMP0; - tcg_out_opc_imm(s, TARGET_LONG_BITS == 32 ? OPC_ADDIW : OPC_ADDI, + tcg_out_opc_imm(s, addr_type == TCG_TYPE_I32 ? OPC_ADDIW : OPC_ADDI, addr_adj, addr_reg, s_mask - a_mask); } compare_mask = TARGET_PAGE_MASK | a_mask; if (compare_mask == sextreg(compare_mask, 0, 12)) { tcg_out_opc_imm(s, OPC_ANDI, TCG_REG_TMP1, addr_adj, compare_mask); } else { - tcg_out_movi(s, TCG_TYPE_TL, TCG_REG_TMP1, compare_mask); + tcg_out_movi(s, addr_type, TCG_REG_TMP1, compare_mask); tcg_out_opc_reg(s, OPC_AND, TCG_REG_TMP1, TCG_REG_TMP1, addr_adj); } /* Load the tlb comparator and the addend. */ - tcg_out_ld(s, TCG_TYPE_TL, TCG_REG_TMP0, TCG_REG_TMP2, + tcg_out_ld(s, addr_type, TCG_REG_TMP0, TCG_REG_TMP2, is_ld ? offsetof(CPUTLBEntry, addr_read) : offsetof(CPUTLBEntry, addr_write)); tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP2, TCG_REG_TMP2, @@ -974,7 +975,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, TCGReg *pbase, /* TLB Hit - translate address using addend. */ addr_adj = addr_reg; - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { addr_adj = TCG_REG_TMP0; tcg_out_ext32u(s, addr_adj, addr_reg); } @@ -996,7 +997,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, TCGReg *pbase, } TCGReg base = addr_reg; - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_REG_TMP0, base); base = TCG_REG_TMP0; }