From patchwork Sun Mar 13 02:17:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8572681 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9DCAB9FC82 for ; Sun, 13 Mar 2016 02:17:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 096A6202E5 for ; Sun, 13 Mar 2016 02:17:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF3AF2034B for ; Sun, 13 Mar 2016 02:17:32 +0000 (UTC) Received: from localhost ([::1]:34213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevb2-0002GD-9b for patchwork-qemu-devel@patchwork.kernel.org; Sat, 12 Mar 2016 21:17:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevam-0002F4-LK for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeval-0005aU-9y for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:16 -0500 Received: from mail-pf0-x235.google.com ([2607:f8b0:400e:c00::235]:34004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeval-0005Zt-3C for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:15 -0500 Received: by mail-pf0-x235.google.com with SMTP id x3so16881227pfb.1 for ; Sat, 12 Mar 2016 18:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mftKODoJlkyrh1FD7tNNawTbCz5tnjU5G/hTHbEqKJc=; b=SUMi52sUhGnUkAPSC33zpFQYKuhsJeCEEExqWf1CRno44Nm1jh/4t8KTpl4Mr5KhXU 7XkhWXqiaCIgTy6hfVSxfeuGGklvHNBdCivqjszGHz0xceV3gWnVGvXkzrxEBQti3LtE zzptA+ZkP1rGVIfUy4t8H0QpE+Y0aovwvuVCd7xTQj+g8Q6qh1OUtZi8x0jGOaqeEMNN rdmQ9pC9tvzfN371RksPv2AMon7A1hBEJHe+Z8KxSqqrvj7qt5licZemCg2jYcq+TZmK 0LCb65Uny51ofQtbFsWqwSGSTbWESvvd/a6P3cNAGznu9ZXFxyI7jj4oZ90GkqO62bvx RmAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mftKODoJlkyrh1FD7tNNawTbCz5tnjU5G/hTHbEqKJc=; b=HB7Nt/P6rl4kbrinAdmtPhmG9m6ugQhnMJY26/zrAa5vnBzJ58kjE9UZxfCeRP2vx+ PnE9Nbfnko1ZkJ9Kb0dNOzH9Tm2qfufhvVBtHJ0bn0k5grJNrzSyexsIctD6mpmNYJA9 Jhcy7KoQbPTcZZzSqW/SgumIqvL8ydA9XKtYbPYFJEfrVP7jkvzdQ/1tUno8mgVGgz/U J+Hiv2FQuMfvyD3uu5udxdMBG2c0ASBpkmGanyVhyYgX98aOS+tL6zEOGs+PHqS6MZ1l Fmoq0ATtIWaMkDpd3yk9diCq54M9wcaYmOijPVut0D1MWQ1XFlxNIblzjvj5ygCKq9hO 1IRQ== X-Gm-Message-State: AD7BkJKtO14bs2H1tsu/Fx/asqN4BrAlU0VJu0DW7QgHQ+Q/yqTfXeX3/xoYbAh8po9vkg== X-Received: by 10.98.66.75 with SMTP id p72mr19708279pfa.50.1457835434480; Sat, 12 Mar 2016 18:17:14 -0800 (PST) Received: from bigtime.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id 16sm22445576pfk.28.2016.03.12.18.17.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Mar 2016 18:17:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 12 Mar 2016 18:17:05 -0800 Message-Id: <1457835429-17843-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457835429-17843-1-git-send-email-rth@twiddle.net> References: <1457835429-17843-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::235 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 3/7] target-i386: Fix SMSW for 64-bit mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In non-64-bit modes, the instruction always stores 16 bits. But in 64-bit mode, when the destination is a register, the instruction can write 32 or 64 bits. Signed-off-by: Richard Henderson --- target-i386/translate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 10cc2fa..b73c237 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7282,12 +7282,14 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, CASE_MODRM_OP(4): /* smsw */ gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0); -#if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN - tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]) + 4); -#else - tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0])); -#endif - gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 1); + tcg_gen_ld_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0])); + if (CODE64(s)) { + mod = (modrm >> 6) & 3; + ot = (mod != 3 ? MO_16 : s->dflag); + } else { + ot = MO_16; + } + gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); break; CASE_MODRM_OP(6): /* lmsw */