From patchwork Tue Jul 9 07:50: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: 168727 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8211359ilk; Tue, 9 Jul 2019 00:53:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwo4No2kqbZ1as1LN/eBNPRQQfzSi2D1RFrINZPDMu+uktTsU1Y95lqC/74CeGUe7YQ6u1l X-Received: by 2002:a17:906:6d2:: with SMTP id v18mr19930256ejb.279.1562658810122; Tue, 09 Jul 2019 00:53:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562658810; cv=none; d=google.com; s=arc-20160816; b=uHLl6zz442DCqZYHpZN2pThcdcxdB68vxipdTzvFxRfXD5mtbQv5pzuIVs4UxfrGkb cgfPo6LrSlnAPM8+Iuog0OPXdJg4Xlz8rkjebkuY1eZaAyHo0EZuBp0O9iZxna71o7nA PcgwiCJXpgHlWxAvO3OzK8MocN8POCn50EHWvXjhwmsE7iziKXNld5DO3mQN1v12/dLx IwK/gs14z6e2PV4SorKYy6HqAF3gg8PzR9lGC97BcBQWID0JzDEuwwtK48le5U1u0KHy 6oiYMFdQWYyve3C0LwlSiMpiTBy1q4BuFoJNfQAJsCt3JkVXgsv4smHSuKLdzfmP2+MC oJhQ== 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=NRUk6h1lF8IVkfyjDgjJrh2kPlr6bkgzoZE5aWacfw9b7WE3J2V/62ue3rH/cj6RsJ j7R25iMyKARTH4Qmaq3KVN/I3BDEDCeU65GqHTeNWCFgGw3mHVwBmKLAcHnmXoKLEaNM V/qZEOZ+W4POTfaNNHQxnBkrqlIG5dKWIzfF5ejnBUF/k4RGUMl6t/I5Xdz1XF7ePGTC vnyPW9+VtzFdSQBv/2IVqoE6ZG2YbdubcpgZzCMqlpeLZLrstZOcAaydEfB2bFTyqpgk hbQ+WHMifp6sm2rhlBiq3IySlg5N0GJlmzyOEdWcmEqFHxQNsAwjLHSXG1OC6uDrzbcw XZdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IvdT9PAZ; 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 c55si15760090edc.323.2019.07.09.00.53.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jul 2019 00:53:30 -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=IvdT9PAZ; 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]:47590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkkwL-0008OS-5D for patch@linaro.org; Tue, 09 Jul 2019 03:53:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52192) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkku6-0005nV-Th for qemu-devel@nongnu.org; Tue, 09 Jul 2019 03:51:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkku4-000172-Ml for qemu-devel@nongnu.org; Tue, 09 Jul 2019 03:51:10 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:45718) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkku4-00016I-He for qemu-devel@nongnu.org; Tue, 09 Jul 2019 03:51:08 -0400 Received: by mail-pf1-x443.google.com with SMTP id r1so8855704pfq.12 for ; Tue, 09 Jul 2019 00:51:08 -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=IvdT9PAZy8N2D6zvG5Wihafmu35j7J+nSrR8+Jl77k5MNpvS15ARUiwieBpX7Uopto NTZJZOljZejZRiQ0wK8wMT1e69HRcMfh39TwBwKKvHsaQ57xkL/guds7xc465CrWzrq1 M2NfiLwIVihAAgxDxpnVItPBaZV/OPfiFy71gsDyuaAVUgzF5kTWvIgN1YcysTyE+NcQ cvb17H6OYx/RKZ1yPPG9Y7rf74z6b1rAd5lhNCSpbbV57hpMICwGTvw1vRIwk3ORqpjp biphoWUtxMLjivOpLhJA/irx3Xb7lyaef7+EXZBB69eN3NZEpO2NyexDIlOsM/mRmGDX 9DsA== 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=k6fdO2BjDIrG3Xpkqh1lWNQehYQMx3bPlAqD1+0hBqXLbSzIOuNRgcoAAVdhi11CxM B03egwnchVs9oTLWksdihg9bAImlNa0NEQMRmjlUWfC6VOJ8FrDOewBT1FTTP0xRFXGw KjpxNMl/dFGeUGjLQV55uW8XEFunnWcLu3BfzGCYOf6rnT0hWLVMrKM4/umaO62Vv/rw bfFW9nd7KM5AcG4KMz1TnnnsfUerup4u/2PvS8q8RrfSg5expONTDI28PDtE/u9r70rq 5CEv1wb/3uhoW4VgnF4Wu611h1AeB9+WRb8VqpmGCXZuCS95UaLhgIX9MCM9jS4QhTEF z2MA== X-Gm-Message-State: APjAAAXHO7nk6N8c3vuGkRl4I1Zeo356n/BEv1b/1SrCDdfJBB75JxRr jie4racod96y6KSRXrDrXj3En+125ZuHow== X-Received: by 2002:a63:5048:: with SMTP id q8mr28651020pgl.446.1562658667243; Tue, 09 Jul 2019 00:51:07 -0700 (PDT) Received: from localhost.localdomain ([172.56.12.212]) by smtp.gmail.com with ESMTPSA id y22sm28237375pfo.39.2019.07.09.00.51.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 00:51:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 09:50:41 +0200 Message-Id: <20190709075042.13941-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709075042.13941-1-richard.henderson@linaro.org> References: <20190709075042.13941-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 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);