From patchwork Thu Aug 11 12:05:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9275171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0368960780 for ; Thu, 11 Aug 2016 12:07:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7D8D28625 for ; Thu, 11 Aug 2016 12:07:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCA8428627; Thu, 11 Aug 2016 12:07:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B2ACD28625 for ; Thu, 11 Aug 2016 12:07:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bXojk-0005Bd-PJ; Thu, 11 Aug 2016 12:05:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bXojj-0005BP-Ti for xen-devel@lists.xenproject.org; Thu, 11 Aug 2016 12:05:24 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 5E/D7-15788-30A6CA75; Thu, 11 Aug 2016 12:05:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRWlGSWpSXmKPExsXS6fjDS5cpa02 4wdItkhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bVKzeYCh6LVmxru8newLheoIuRk0NIIE/i 3pJuRhCbV8BOYs7tqcwgtoSAocTT99fZQGwWAVWJyecPgtWwCahLtD3bztrFyMEhImAgce5oE ojJLKAvsW0dC0iFsICZxKVFC1ghpttJfNy/G2wip4C9xNdX05hAynkFBCX+7hAGCTMDlaxefI x9AiPPLITMLCQZCFtL4uGvWywQtrbEsoWvmWeB7ZWWWP6PAyLsLnH91HNGVCUgdpDE2mX3mBY wcqxiVC9OLSpLLdI10UsqykzPKMlNzMzRNTQw1stNLS5OTE/NSUwq1kvOz93ECAxUBiDYwdj4 xekQoyQHk5Ior3DM6nAhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKEryfM9aECwkWpaanVqRl5gBjB iYtwcGjJMIrnwmU5i0uSMwtzkyHSJ1i1OWYtfzOWiYhlrz8vFQpcd6bIDMEQIoySvPgRsDi9x KjrJQwLyPQUUI8BalFuZklqPKvGMU5GJWEeTVBVvFk5pXAbXoFdAQT0BEnzMCOKElESEk1MIr azL7Byab1o96n0DPs97OWZ303NuqmJ4c+X31la45bwgWGgpAQtaOqETtTj2WrTqsyNPL9PvXB X4s1fsX7bf48LhGve6We809+bcthEU2rCrPj5j4zhLJa1F59cfvwntOAVX0OE1fSi+7bxYKLB PP5OtvO80cKv+GezJO509Po0gX5Jv/TSizFGYmGWsxFxYkAjCmMhNoCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1470917120!55168069!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28997 invoked from network); 11 Aug 2016 12:05:22 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-8.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 11 Aug 2016 12:05:22 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 11 Aug 2016 06:05:19 -0600 Message-Id: <57AC861F02000078001050D2@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Thu, 11 Aug 2016 06:05:19 -0600 From: "Jan Beulich" To: "xen-devel" References: <57AC83530200007800105078@prv-mh.provo.novell.com> In-Reply-To: <57AC83530200007800105078@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 4/7] x86emul: fold SrcImmByte fetching X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP There's no need for having identical code spelled out twice. Signed-off-by: Jan Beulich x86emul: fold SrcImmByte fetching There's no need for having identical code spelled out twice. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1979,9 +1979,12 @@ x86_emulate( goto done; break; case SrcImm: + if ( !(d & ByteOp) ) + src.bytes = op_bytes != 8 ? op_bytes : 4; + else + case SrcImmByte: + src.bytes = 1; src.type = OP_IMM; - src.bytes = (d & ByteOp) ? 1 : op_bytes; - if ( src.bytes == 8 ) src.bytes = 4; /* NB. Immediates are sign-extended as necessary. */ switch ( src.bytes ) { @@ -1990,11 +1993,6 @@ x86_emulate( case 4: src.val = insn_fetch_type(int32_t); break; } break; - case SrcImmByte: - src.type = OP_IMM; - src.bytes = 1; - src.val = insn_fetch_type(int8_t); - break; } /* Decode and fetch the destination operand: register or memory. */ --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1979,9 +1979,12 @@ x86_emulate( goto done; break; case SrcImm: + if ( !(d & ByteOp) ) + src.bytes = op_bytes != 8 ? op_bytes : 4; + else + case SrcImmByte: + src.bytes = 1; src.type = OP_IMM; - src.bytes = (d & ByteOp) ? 1 : op_bytes; - if ( src.bytes == 8 ) src.bytes = 4; /* NB. Immediates are sign-extended as necessary. */ switch ( src.bytes ) { @@ -1990,11 +1993,6 @@ x86_emulate( case 4: src.val = insn_fetch_type(int32_t); break; } break; - case SrcImmByte: - src.type = OP_IMM; - src.bytes = 1; - src.val = insn_fetch_type(int8_t); - break; } /* Decode and fetch the destination operand: register or memory. */