From patchwork Tue Mar 1 18:28:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 590689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A99A1401C7 for ; Wed, 2 Mar 2016 05:29:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=nSoOKB4K; dkim-atps=neutral Received: from localhost ([::1]:51654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aap37-0006zf-Cs for incoming@patchwork.ozlabs.org; Tue, 01 Mar 2016 13:29:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aap2r-0006il-UD for qemu-devel@nongnu.org; Tue, 01 Mar 2016 13:29:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aap2n-0005cN-MW for qemu-devel@nongnu.org; Tue, 01 Mar 2016 13:29:17 -0500 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]:33770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aap2n-0005c7-Hb for qemu-devel@nongnu.org; Tue, 01 Mar 2016 13:29:13 -0500 Received: by mail-qg0-x22c.google.com with SMTP id d32so93149919qgd.0 for ; Tue, 01 Mar 2016 10:29:13 -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; bh=Gc2vqGTVsuyWCVZayinl6+87DHMjyuQJC54b3vtoIi0=; b=nSoOKB4Ko/0fQo9MdWx9vNIS34JwzaBU2Edmw1qbN34y4P8pRALeT+/EhnhTkLK4UD pqaoOX7W02mhfnYbk1jwEBhv43SwrDBLV2mzs3H4zstT+zc4SkFPJZXfIVkJ3iy0vOZb xVC+7fLEwdGMvYedEVjZikcKEPcXa/xUe5eVjHlUYbO0j3cjonDiC0vzddUJ8PHEk0Xk 2qds1DGFqa+8OfkzuxU3c43qM7aETtEkCrVVf3ef273NcWZ5PMgyiWnmHHk5w5EhZ7Ju xK7IBW3S/eLjcCloG7tRU7lExjYAMfCqyWVYoTXnW5S88DkN3DwJuVGxUUzD95mT8EWV rZfg== 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; bh=Gc2vqGTVsuyWCVZayinl6+87DHMjyuQJC54b3vtoIi0=; b=KdXyYP//BfDY2COI+ZfovT1RbN5xkx02lDUwFUoKwOwGEeqUOnNxpqb0cuTAfykrDZ hWH3Ula2UvfHho7+h9JxTN5GYf7p29sogjLQhr5BazmCvp1Cl07UB+XnciFXjqWWqrb6 Ruvo7sysFCMFnTl2zNsGp8FzV+qXkp/YzNqF3SNA9TlL/vCEEeBsnRCV+xJ/hgR/2fDR XLbkzlA9UBENF0hYXO8xdm5nfk6E4Rbbq0VzSfhZBJS+S/0JuKGEfm+2w9YAYgVIWixa aDnRiWtw6pH3P8EZCb/3iCnbXIvCTRWbsqe+YByXylPWZon9PZQhvkB4UGUpR9Bo8ugE BwTA== X-Gm-Message-State: AD7BkJKyafrdBTB6czyBeoOqlYUtbRXpEM2jiTDGSeYyUBcrUzExu415eqLgTQVlDqxIxg== X-Received: by 10.140.228.68 with SMTP id y65mr22205585qhb.78.1456856953038; Tue, 01 Mar 2016 10:29:13 -0800 (PST) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id v74sm4435688qkl.36.2016.03.01.10.29.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Mar 2016 10:29:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 1 Mar 2016 10:28:39 -0800 Message-Id: <1456856919-32447-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::22c Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 1413069..482e93a 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 */