From patchwork Thu Nov 7 01:05:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 289086 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E598F2C016E for ; Thu, 7 Nov 2013 12:28:51 +1100 (EST) Received: from localhost ([::1]:37105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeEOv-00089K-JQ for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 20:28:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE5P-0000fd-MC for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeE5J-0006bV-Q5 for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:39 -0500 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:53740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeE5J-0006bP-6T for qemu-devel@nongnu.org; Wed, 06 Nov 2013 20:08:33 -0500 Received: by mail-pa0-f54.google.com with SMTP id fa1so474173pad.41 for ; Wed, 06 Nov 2013 17:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=e8XFOr5oHwGKtj8SmdyIEKx4xhh5NM//bhG8wzvg+z8=; b=rNmSyI1dFnO2Otv+YnrEebg4sMHkkb4DwobdpldYEAsMKDAq+DJ55jJB4vpEWuGEVu glm5qzCDZYALTRd+lz1a2/Yb8V+C0DZCFmkP0zqgq9FPHiaDRx8W5TwZ3vRbPv4vrqPH KVlRfXDEmB/yUwklQDwRcqy9/7RUNISHPiCL1P4VVtexF8E0HK7NgbOqS8WCCtgjkJQD 65cXBvQrW8dHnX2/I49/Lr1oh4AXlx7OD3+ZGDGJCpJSaZdPjVu+/JTqPbG8cRG6L+3/ Mno8smUOq6QFlcqB36rjUcNNZ5jBBKtIURgp0NMyYd2kn5XwykZPu4UX0ohe8M6tCLqF oFhA== X-Received: by 10.67.4.197 with SMTP id cg5mr6837101pad.10.1383786512176; Wed, 06 Nov 2013 17:08:32 -0800 (PST) Received: from pebble.com (CPE-138-130-249-46.lnse4.cha.bigpond.net.au. [138.130.249.46]) by mx.google.com with ESMTPSA id xs1sm1726198pac.7.2013.11.06.17.08.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2013 17:08:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 11:05:21 +1000 Message-Id: <1383786324-18415-59-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1383786324-18415-1-git-send-email-rth@twiddle.net> References: <1383786324-18415-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::236 Subject: [Qemu-devel] [PATCH for-1.8 58/61] target-i386: Tidy some size computation 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 Clean up relics of multiple size domains: - MO_16 + 1 => - 1 + 1 => 0. Signed-off-by: Richard Henderson --- target-i386/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index f8290b3..61df97e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4767,7 +4767,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, break; case 3: /* lcall Ev */ gen_op_ld_v(s, ot, cpu_T[1], cpu_A0); - gen_add_A0_im(s, 1 << (ot - MO_16 + 1)); + gen_add_A0_im(s, 1 << ot); gen_op_ld_v(s, MO_16, cpu_T[0], cpu_A0); do_lcall: if (s->pe && !s->vm86) { @@ -4794,7 +4794,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, break; case 5: /* ljmp Ev */ gen_op_ld_v(s, ot, cpu_T[1], cpu_A0); - gen_add_A0_im(s, 1 << (ot - MO_16 + 1)); + gen_add_A0_im(s, 1 << ot); gen_op_ld_v(s, MO_16, cpu_T[0], cpu_A0); do_ljmp: if (s->pe && !s->vm86) { @@ -5409,7 +5409,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, goto illegal_op; gen_lea_modrm(env, s, modrm); gen_op_ld_v(s, ot, cpu_T[1], cpu_A0); - gen_add_A0_im(s, 1 << (ot - MO_16 + 1)); + gen_add_A0_im(s, 1 << ot); /* load the segment first to handle exceptions properly */ gen_op_ld_v(s, MO_16, cpu_T[0], cpu_A0); gen_movl_seg_T0(s, op, pc_start - s->cs_base);