From mboxrd@z Thu Jan 1 00:00:00 1970 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) 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) Sender: Richard Henderson From: Richard Henderson Date: Thu, 7 Nov 2013 11:05:21 +1000 Message-Id: <1383786324-18415-59-git-send-email-rth@twiddle.net> In-Reply-To: <1383786324-18415-1-git-send-email-rth@twiddle.net> References: <1383786324-18415-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH for-1.8 58/61] target-i386: Tidy some size computation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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); -- 1.8.3.1