From patchwork Sun Mar 13 02:17:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8572671 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 867899F7CA for ; Sun, 13 Mar 2016 02:17:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC4C220306 for ; Sun, 13 Mar 2016 02:17:32 +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 CADA5202E5 for ; Sun, 13 Mar 2016 02:17:31 +0000 (UTC) Received: from localhost ([::1]:34211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevb0-0002FZ-OR for patchwork-qemu-devel@patchwork.kernel.org; Sat, 12 Mar 2016 21:17:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevan-0002F5-0s 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 1aevam-0005bW-4y for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:16 -0500 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]:34006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeval-0005ap-UL for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:16 -0500 Received: by mail-pf0-x22d.google.com with SMTP id x3so16881346pfb.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 :mime-version:content-transfer-encoding; bh=bAeLUfo1Csp+cvtWp3XS0r7yORj57C001BlzSZ9xgBc=; b=G+8/0ANQ17owbVryz5+C9JWeSg4bwPPVb/SO7KM76qOP7tQNnx9l0anzdzDfELdOY7 EFr7wRDm24UhL9J8D9YGVXmgK+uUG49jGKuu9HSVXDFxnxlWhF6aARwU/QUqsKfEMJRi T+r5nYif9DPF4KZ2Keorf3ah07DZhjcJBTHjC9hojvcgrmruxEmBp/OyZugSyOG2tvSj Pw9TS8ER3vstLdxd181AfwdQ8q7Tvq1Rs34gDeVO8130dSN6Zf2M3fYuK3B4sB+NRAhD t9IzazbWd0ga2DDlB1jiF0yipE+PvlDis+eb3oVGpcGfs52XCKq90Nj7biCG31O4iA1d /a0Q== 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:mime-version:content-transfer-encoding; bh=bAeLUfo1Csp+cvtWp3XS0r7yORj57C001BlzSZ9xgBc=; b=ms8D54KuH0fL+TG/QtNccpq6GD8gVvYquSknOL6+Vury8SaImeM5wybizjK18UpGX7 8ukL97ESo0xcswx1E1kY+vtW4y+A8t97Z2rVeMUxWRETyLViYc11JoHSv1azpk5zk9sw sGYwoZzyuYDbbAC/IvX4s8/zmKAtv7rIrVRnWUelXrxyV73q++CQ/C74BMKjmMjbSEdp 5hvhZF3flcDLDpmSvAHLIcIBklAUD1wTBA59nZrXYDUJrAPN6nV/5VkgvwxHVkSvQDU7 77ynOS9JoCLjKEkV2LStBE/NAduEYTFTqB2YiS1OlcEm0rrL1u+TqeUWHKG90iZp47zu UCOA== X-Gm-Message-State: AD7BkJJWD+6KQVw52qRQT+9NLU+wk2uQWn2lCX7+0EYXu7SgO60DuGT6JhlZqrVnAIvJfA== X-Received: by 10.98.10.133 with SMTP id 5mr19422478pfk.75.1457835435306; Sat, 12 Mar 2016 18:17:15 -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.14 (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:06 -0800 Message-Id: <1457835429-17843-5-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> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::22d Cc: peter.maydell@linaro.org, Paolo Bonzini Subject: [Qemu-devel] [PULL 4/7] target-i386: Fix addr16 prefix 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 From: Paolo Bonzini While ADDSEG will only be false in 16-bit mode for LEA, it can be false even in other cases when 16-bit addresses are obtained via the 67h prefix in 32-bit mode. In this case, gen_lea_v_seg forgets to add a nonzero FS or GS base if CS/DS/ES/SS are all zero. This case is pretty rare but happens when booting Windows 95/98, and this patch fixes it. The bug is visible since commit d6a291498, but it was introduced together with gen_lea_v_seg and it probably could be reproduced with a "addr16 gs movsb" instruction as early as in commit ca2f29f555805d07fb0b9ebfbbfc4e3656530977. Reported-by: Hervé Poussineau Signed-off-by: Paolo Bonzini Message-Id: <1456931078-21635-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Richard Henderson --- target-i386/translate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index b73c237..0b67165 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -466,15 +466,15 @@ static void gen_lea_v_seg(DisasContext *s, TCGMemOp aflag, TCGv a0, break; case MO_16: /* 16 bit address */ - if (ovr_seg < 0) { - ovr_seg = def_seg; - } tcg_gen_ext16u_tl(cpu_A0, a0); - /* ADDSEG will only be false in 16-bit mode for LEA. */ - if (!s->addseg) { - return; - } a0 = cpu_A0; + if (ovr_seg < 0) { + if (s->addseg) { + ovr_seg = def_seg; + } else { + return; + } + } break; default: tcg_abort();