From patchwork Fri Dec 14 03:19:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153714 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1599390ljp; Thu, 13 Dec 2018 19:28:11 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xs6OGNgOr2O0b7JElxyKregCB9hEOP57VF5rMC2cA+qVbZSpHx38+IhtAc7qxgScP9Hfqo X-Received: by 2002:a0c:872a:: with SMTP id 39mr1256597qvh.1.1544758091488; Thu, 13 Dec 2018 19:28:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544758091; cv=none; d=google.com; s=arc-20160816; b=Zv1rQjDOp7+SKDhvmwueQ1qf9mNAZvb4vbpMHx+L/GFDLBy4phnhbYO+67z8Xl2KRe JDJwY15/D0ZI7Ehw+lrLBD+b95wtb4PzNjA8FtGAFsmX9VwlAPouWz55ffQtsX2JujjJ ioZVQxGEEM0UgknBMmviDlkABDxdPLXpH0EmIQu13fDX9y4LJvTd2zdKZT1sjtK5F1Zy mv/neyaMGhLoqV9r61mtyOStBU4uXbdzQ5Gm//6m1SeiuBywdpK9UtFJlRWPx6NzDKTX D5PPshcoQAX4GcjlEQtJ2i+7fLKSPYZjrP+9andaVcHRVt6YLhNoN29Z0GBT+EDEQQeW pWKQ== 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=CtqIyel2tpyuO1DikJ2tmjkdO7bVPfOV4BgRU7p4jzw=; b=OGEbCiN4xRwMu1a14WybbshhQKlSatz37Tv1oSvkwj+U7rk+zucFQMJPhI/QpcryNv 3opznee+gXkyan3P+Uv1rDcKGQ5iPFO/DkCnHCDawZFbOef32MZ7UUucj5EzDHX0SOtH oihyRQd8Si+SoilhrtJiG122yOu39K5aQdVbNZqKkJDLf4UIetuTwWK5DZa0ONIJD+6j UzjqV6edHkM/Ths8RYPyGZA0PotMjQNaBx3eXOcl2khqFna6Hiw71WO4Pfklj3KIvJRd PObXsSduAw51PRHJnl7JowlUSlyA0nZTWVNTgFJTNTS5yXJ9+SIF0LBiU508gg2gmh/Z j3VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LpCzDysW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j5si2154499qtd.148.2018.12.13.19.28.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:28:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LpCzDysW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:59094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe94-000451-TZ for patch@linaro.org; Thu, 13 Dec 2018 22:28:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe12-00068F-K5 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe10-0007Eu-Mo for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:52 -0500 Received: from mail-ot1-x32b.google.com ([2607:f8b0:4864:20::32b]:36802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe0y-00072h-I6 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:50 -0500 Received: by mail-ot1-x32b.google.com with SMTP id k98so4130215otk.3 for ; Thu, 13 Dec 2018 19:19:46 -0800 (PST) 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=CtqIyel2tpyuO1DikJ2tmjkdO7bVPfOV4BgRU7p4jzw=; b=LpCzDysWl3DQwLBav3HHyfIMHsjW3cCRew1zs78GEatcqSrzdfJ658qmJ1M/94f8o/ /1tf3hMIRw/rxBcYLmd4tmZw1oI2L+A1VPjJuF7cViLa+UwImD1s2QAj37W0NJb8vLY8 IR0iOItDvrQKiLOTiQZAzYiC7gZHZedYIAs1o= 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=CtqIyel2tpyuO1DikJ2tmjkdO7bVPfOV4BgRU7p4jzw=; b=S/SWHWajEkN9PFIZzIX/uuAo77qHDrIgSI2qOy7JxuCeH64Jd8gH96wCVBi7qtGfpE sY1bTDKzfvPdtgo4JGwcByArncFEsQoq6M86a0G6KiC8JWG0pFmXHctI96mWyvIhl9PA z7EWJyEUtdexWEePAe9vq5zbXVryQ1JULr6HfgyAhMaBgLvaNzUO9rHae5hov++dDOGS u5nzQSdf4butQ5XK6W9ylZJnIj5ZIgavu6QeE+e64At0ynCEoLH7cjZb1xAlKnYEQkdC R6DMkGM0vzfwiTLHtGhkGmmxq+hUeXzNNXvjpo6FQF+agLQdFp6Hutm+4Iyf+1pq7O2y cWmg== X-Gm-Message-State: AA+aEWZAtG3vcTkk+6BuuYgEzrfMeYGybxcwgd39pJwLxAlabAxo3ifV dfh77bXy+pVLYhqQA11zbZxRAQwmTEmiTw== X-Received: by 2002:a05:6830:1543:: with SMTP id l3mr1028463otp.180.1544757585259; Thu, 13 Dec 2018 19:19:45 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:19:08 -0600 Message-Id: <20181214031923.29527-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-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::32b Subject: [Qemu-devel] [PULL 17/32] tcg/i386: Propagate is64 to tcg_out_qemu_ld_direct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This helps preserve the invariant that all TCG_TYPE_I32 values are stored zero-extended in the 64-bit host registers. Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.inc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.17.2 diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index 28192f4608..6bf4f84b20 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -1883,10 +1883,11 @@ static inline void setup_guest_base_seg(void) { } static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, TCGReg base, int index, intptr_t ofs, - int seg, TCGMemOp memop) + int seg, bool is64, TCGMemOp memop) { const TCGMemOp real_bswap = memop & MO_BSWAP; TCGMemOp bswap = real_bswap; + int rexw = is64 * P_REXW; int movop = OPC_MOVL_GvEv; if (have_movbe && real_bswap) { @@ -1900,7 +1901,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, base, index, 0, ofs); break; case MO_SB: - tcg_out_modrm_sib_offset(s, OPC_MOVSBL + P_REXW + seg, datalo, + tcg_out_modrm_sib_offset(s, OPC_MOVSBL + rexw + seg, datalo, base, index, 0, ofs); break; case MO_UW: @@ -1920,9 +1921,9 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, base, index, 0, ofs); tcg_out_rolw_8(s, datalo); } - tcg_out_modrm(s, OPC_MOVSWL + P_REXW, datalo, datalo); + tcg_out_modrm(s, OPC_MOVSWL + rexw, datalo, datalo); } else { - tcg_out_modrm_sib_offset(s, OPC_MOVSWL + P_REXW + seg, + tcg_out_modrm_sib_offset(s, OPC_MOVSWL + rexw + seg, datalo, base, index, 0, ofs); } break; @@ -2010,7 +2011,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) label_ptr, offsetof(CPUTLBEntry, addr_read)); /* TLB Hit. */ - tcg_out_qemu_ld_direct(s, datalo, datahi, TCG_REG_L1, -1, 0, 0, opc); + tcg_out_qemu_ld_direct(s, datalo, datahi, TCG_REG_L1, -1, 0, 0, is64, opc); /* Record the current context of a load into ldst label */ add_qemu_ldst_label(s, true, oi, datalo, datahi, addrlo, addrhi, @@ -2045,7 +2046,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) } tcg_out_qemu_ld_direct(s, datalo, datahi, - base, index, offset, seg, opc); + base, index, offset, seg, is64, opc); } #endif }