From patchwork Tue Jul 2 15:05:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 168328 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4362386ilk; Tue, 2 Jul 2019 08:11:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzi/UlNAersEGohJfWyTT9IdqzqlxLtqWa2XM03kjBtOfl1lKbxFcy2PM8uS4mWwCahrETv X-Received: by 2002:aa7:c619:: with SMTP id h25mr36091683edq.295.1562080312886; Tue, 02 Jul 2019 08:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562080312; cv=none; d=google.com; s=arc-20160816; b=MnoWGlYB4pVjlyHwnGyv3XDlplJFgDlW5bsFm86/RWw+lWBA+Z3+eo6kyo2E3NUmBq gH0tIHYJWNhA2n9G6NkuOnvOHJnZIdSXTIAubKbwTU+WPm5mkpkP9vPbuQl5A1KiWG2l QC/d03d6TyPeTeebHF7227g714ay5wo1vESh8EfMfvJj1s21Z4tZf6VgBRXeOFENeKtV aWYE0AFxpdMl4m5LVvUk1JUPoys/qwtOOkfmVpzw2GJVN0PoQ0eas9gjtl2AIItSHZKo +DF8nthnt0xiUX5p9UDJBnoK4VutOerh5b/7Pzq46BhBjzk666dU/oakjXiSadDvp6Cd +hGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cAdcykhsBr9KRoTt+e4UsNPsrOD05Rn6WRA4P8vaXKM=; b=Bu+Ld++dxwwq2WQdLqsfZnZVFTtKbGYrtPoaaoTCPOwczNzE9cUySKLT4geF8ty6IS jLpymq+0h9gfaA+zJ9tDQEMyXrUymAJyz2PHVSyrc02ewJoKAjw4Vqz1/bzbeZRrIK4M 0CXsU2Tnqyj7ZOi4QohSyfx/zOy3a/APhK89hME3EC2khtm7gr8xr9IxcDzOCydAvpO4 Vtp/Xj0QxeBxLc7sTdehxGhx/emeOIaeo/qfPGJaz1m0yfm7BMeycANFAX4jOPzRUFSS 5aILqTgaqS3bZCfdsTmui2lRgmFT9zI3W1h7CoMhbXswb/c2IPmd8jRXNIZeo+/1chJ+ JSBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U94X5p9d; 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=fail (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 w3si9078475ejb.101.2019.07.02.08.11.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jul 2019 08:11:52 -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=fail header.i=@linaro.org header.s=google header.b=U94X5p9d; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKRj-0001jb-Pf for patch@linaro.org; Tue, 02 Jul 2019 11:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58027) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKLz-0004w8-BY for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiKLv-0007aO-JQ for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:05:53 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hiKLt-0007Xd-Oc for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:05:50 -0400 Received: by mail-wr1-x442.google.com with SMTP id p11so7038147wro.5 for ; Tue, 02 Jul 2019 08:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cAdcykhsBr9KRoTt+e4UsNPsrOD05Rn6WRA4P8vaXKM=; b=U94X5p9dk+Ez+gN8gaKJ1FW8MyToLqAT1fp5T1gw45kWf0e79qSgm16XMo+S6O5dry LjMMYcn12U8neQd340btUsXYHC9PTm4X6TLoLwUJekGN3ipEJ3eVNOcxhvdR+/ZWZCWd JxjZPEPhsgCNTgYS3PnHUGmlg26dndq4GGutDf5ULJt1l+76ZmYuhZWROzONAvB8wGkq VNNJch7k2jL0aRcSjMjWZDDDvbrbsz9zPnW49FJnEXPgePVnQQDGfi3VkHH/GYvfIsYV YgCxzdfWKVcHA13cm3xHAhcUvXf26T4dXcpU1j+P1JCw8cgD/omQU622Al8iFFSSBcsi JxTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cAdcykhsBr9KRoTt+e4UsNPsrOD05Rn6WRA4P8vaXKM=; b=KQxNHo+4KDs7zjGDcXGhmMxNMIXVA4K+salYtJAVup/ek4IXLeFWPpNIbhNMkCvUnW DrDqbJSlIxm8UxINDCLmqBRm5WG/eWqhGCxNixYcRuVJtAtUP8B+V2GN+uvlytHuSVgm BzIsoa01xmkgPmqNkMBUw/QAd8w77tSyuqDK31XX7woOF2IPa6vQem+rgkflh+qPoLrm qNvQcdrT+nos4ZaphPvOCpycNMLVQ7+qBjFc8Rcw6N3wrhu48iqyh7CrYQzs5w1KM46v LUvaQe4uKVcVxN6LZVUrzAbppWwO1U409sHdLI7fFjB1QnEqHeL9sLReihxdViA2+rJk euoA== X-Gm-Message-State: APjAAAXmOzSTi0o7DY89QVxIYzw6DzKV8gXuhdaKSpdaMkQWm/7rzFJA GUwRJlvl3L29bEhLY7M0cDK+CyKyiLkEuw== X-Received: by 2002:adf:bc4a:: with SMTP id a10mr18369095wrh.230.1562079946734; Tue, 02 Jul 2019 08:05:46 -0700 (PDT) Received: from localhost.localdomain (93-34-153-63.ip50.fastwebnet.it. [93.34.153.63]) by smtp.gmail.com with ESMTPSA id w10sm12975657wru.76.2019.07.02.08.05.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 02 Jul 2019 08:05:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 17:05:41 +0200 Message-Id: <20190702150542.12008-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190702150542.12008-1-richard.henderson@linaro.org> References: <20190702150542.12008-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PULL 2/3] tcg/riscv: Fix RISC-VH host build failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Alistair Francis Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Commit 269bd5d8 "cpu: Move the softmmu tlb to CPUNegativeOffsetState' broke the RISC-V host build as there are two variables that are used but not defined. This patch renames the undefined variables mask_off and table_off to the existing (but unused) mask_ofs and table_ofs variables. Signed-off-by: Alistair Francis Message-Id: <79729cc88ca509e08b5c4aa0aa8a52847af70c0f.1561039316.git.alistair.francis@wdc.com> Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.inc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c index 1f0ae64aae..3e76bf5738 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc.c @@ -980,8 +980,8 @@ static void tcg_out_tlb_load(TCGContext *s, TCGReg addrl, int table_ofs = fast_ofs + offsetof(CPUTLBDescFast, table); TCGReg mask_base = TCG_AREG0, table_base = TCG_AREG0; - tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP0, mask_base, mask_off); - tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP1, table_base, table_off); + tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP0, mask_base, mask_ofs); + tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP1, table_base, table_ofs); tcg_out_opc_imm(s, OPC_SRLI, TCG_REG_TMP2, addrl, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS);