From patchwork Mon Dec 3 16:08:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152712 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7045433ljp; Mon, 3 Dec 2018 09:04:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ur5DeeBJA0DaMIZm83UkwHeFlE/lnrPdtnhsi1KfvvkIWiMQNOXp3wqTJFya/Uz/tkfvF3 X-Received: by 2002:ac8:1d12:: with SMTP id d18mr15903897qtl.343.1543856691545; Mon, 03 Dec 2018 09:04:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543856691; cv=none; d=google.com; s=arc-20160816; b=h9/ZqCbRjMP3mMO3GWreffPXoRlCkKGA23uLc+2CKlQkpsmjgPrZuoXv5UQ39+fbyT oCcemjNAXZ4qbFTgM+ZwweU0H+t285ag2NDM3wABi5tYjWGwn7EHT6ezXUUC6ZNmU1Bv Snkl2hO7W2BvVktwMLxd9VsbyPDSy7XDxIPxlDz6bl7dwRMnx7lN//FDMYefPJ/OOkvt Ab08Wlr37r7cKQFCr5U/aDodn5v5CBCp/ciODZcYWEdlX/KvoI+x+kOK9ky0obhWrcVZ JJn+9sQTY+tOesCds0zo2LqQ40OzrQIYwWqJQpRjZcBw0Ea4QzqSgSbMmSFjzwFBLXwU wX/g== 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=Bcz+HCUhPqRxfn13yNCbaWu/SKDHzkxNnSaGXMB7UVk=; b=yr9TOGhzcyLmLQbCXyC6/BGUX3czu39ydFAoVtMmQijqQnPXL25q327nIP/vJSDutx OvIeEFAo7pvQCHc2Ds7/V1BvKrnz088McJle+2z5zGJbA8wJEs0aArr2p4RBkFPgrfsU i1zt+xvsWMElOmcZcNmqg66CwJ76URsGQBrLP2d38e+c2uMHVRWSxjibI4ix3MjHL6yR EjKcpaSKoCubYIPLaRsxyA2Q/926rUW9fzZe+P8BC59NI4Rms0Ry5AqueQbKakGB1PkM UYs8E1bPXpA0NGH53T7OtI0QudX3h7qHvhdLEqv/jqarbFE+m2sSBrP5meWrn3lnqENl MudQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WUueTVhm; 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 c143si5313674qka.3.2018.12.03.09.04.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 03 Dec 2018 09:04:51 -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=WUueTVhm; 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]:50692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTreM-0005sr-Vu for patch@linaro.org; Mon, 03 Dec 2018 12:04:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTqm8-0001ZO-CN for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTqm6-0003Ni-QE for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:08:48 -0500 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:46648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTqm6-0003NT-Lq for qemu-devel@nongnu.org; Mon, 03 Dec 2018 11:08:46 -0500 Received: by mail-oi1-x244.google.com with SMTP id x202so11327176oif.13 for ; Mon, 03 Dec 2018 08:08: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=Bcz+HCUhPqRxfn13yNCbaWu/SKDHzkxNnSaGXMB7UVk=; b=WUueTVhm+r984tBpA1SoBA8wsMj2uCBM+iy/dDkB+AnYPk+mK0iduwjQcr7+MHMBE1 WneGinymIQhRgiaXeKy1NF1tehjRkJ1UFKb8Y4pVFRc/1dMZSWw853E2RoFfh3GCt4mD IaRrbNoEG8sQQts4uGcdHmjJ1UMSbgFGPkkHs= 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=Bcz+HCUhPqRxfn13yNCbaWu/SKDHzkxNnSaGXMB7UVk=; b=uBgQVvN6ZjSVg+WBZtOzYrUzlgsg3KtWN+j75O6IT6H3qYnxksYAz3r4l7WcNLAciy dN3Bx/8/6fopiViyEUuBzHSbIFXCeflKtPevKfEab2RH0bb0LZSKRCs9olXck7lzC39P WMosxCYarh18bKa/WdXEfAtXqsBtoruDCFiQCU7QeIc9LnoxruMezKe3XsjhpYsJmlSM xUaYJo2bapazys4y2X4Ipl3EF9sA7ePORKJSXOjQ2g+/7A6q6OatSNyolzU4TNj0o+mL 9j4BvwqVWOOd5bK2XjkKncZ5ZWlhhhDHt8nmB5kIHLERGL4bChUd4tIVztl49ysd15ve ia3Q== X-Gm-Message-State: AA+aEWZupLAdNf0Dngmy/xerrSDyh3M739/X3z3JwXOqJIxHZiCAYc5Q nPP0PORHyZWS9sinhnVTAKSbJrUzrmO7Lg== X-Received: by 2002:aca:b7c2:: with SMTP id h185mr10592314oif.298.1543853325578; Mon, 03 Dec 2018 08:08:45 -0800 (PST) Received: from cloudburst.twiddle.net (172.189-204-159.bestel.com.mx. [189.204.159.172]) by smtp.gmail.com with ESMTPSA id c19sm6338165otl.16.2018.12.03.08.08.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Dec 2018 08:08:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 3 Dec 2018 10:08:36 -0600 Message-Id: <20181203160840.15115-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181203160840.15115-1-richard.henderson@linaro.org> References: <20181203160840.15115-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::244 Subject: [Qemu-devel] [PATCH for-4.0 1/5] 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: cota@braap.org, alex.bennee@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. 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 }