From patchwork Wed Dec 7 14:09:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9464573 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 197A86022E for ; Wed, 7 Dec 2016 14:12:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21C0428480 for ; Wed, 7 Dec 2016 14:12:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 166CD284B0; Wed, 7 Dec 2016 14:12:04 +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 D30A728480 for ; Wed, 7 Dec 2016 14:12:01 +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 1cEcuu-0006ws-2p; Wed, 07 Dec 2016 14:09:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cEcut-0006wm-6H for xen-devel@lists.xenproject.org; Wed, 07 Dec 2016 14:09:51 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 12/30-12362-E2818485; Wed, 07 Dec 2016 14:09:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRWlGSWpSXmKPExsXS6fjDS1dXwiP CYM97bYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePIoqtMBQedKp5M2M3YwNhl0MXIySEkkCfx +Nc5ZhCbV8BOYsbCx+wgtoSAocTT99fZQGwWAVWJL7Mmg9WwCahLtD3bztrFyMEhImAgce5oE ojJLKAvsW0dC0iFsICRxKXNXSwgYV4BQYm/O4RBwsxAw0/uWMQ4gZFrFkJmFpIMhK0l8fDXLR YIW1ti2cLXzLPA5ktLLP/HARF2lJj6aBU7qhIQ20di1f51zAsYOVYxahSnFpWlFukaGeglFWW mZ5TkJmbm6BoaGOvlphYXJ6an5iQmFesl5+duYgSGXj0DA+MOxuYTfocYJTmYlER5d01wjxDi S8pPqcxILM6ILyrNSS0+xKjBwSHwbO3qC4xSLHn5ealKErwK4h4RQoJFqempFWmZOcDogCmV4 OBREuG1BknzFhck5hZnpkOkTjEqSonz8oIkBEASGaV5cG2wiLzEKCslzMvIwMAgxFOQWpSbWY Iq/4pRnINRSZj3oRjQFJ7MvBK46a+AFjMBLZ53wx1kcUkiQkqqgTGgc3sk32Sm3PsqbZJFdro PefdntM9yfMDvYH+7e3Ju6sTV5yt/rBGSCHvcPueg34OJxgZtbAkLuO7nZSekyogftLfmLnv9 upTHd4UEb6ovz9YdQbc5e159MLjk/M7wXAvrmorJQtf/PGqee9x1ln986td2YYFfQpx23YxXp qdtuT8jX3dGpBJLcUaioRZzUXEiAKviOyLDAgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1481119787!74259288!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30287 invoked from network); 7 Dec 2016 14:09:49 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-10.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Dec 2016 14:09:49 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 07 Dec 2016 07:09:47 -0700 Message-Id: <584826390200007800126459@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Wed, 07 Dec 2016 07:09:45 -0700 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH] x86emul: fold SReg PUSH/POP cases 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 Now that segment registers are numbered naturally this can be easily done to achieve some code size reduction. Also consistently use X86EMUL_OKAY in the code being touched. Signed-off-by: Jan Beulich x86emul: fold SReg PUSH/POP cases Now that segment registers are numbered naturally this can be easily done to achieve some code size reduction. Also consistently use X86EMUL_OKAY in the code being touched. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2670,51 +2670,40 @@ x86_emulate( break; case 0x06: /* push %%es */ - src.val = x86_seg_es; - push_seg: - generate_exception_if(mode_64bit() && !ext, EXC_UD); + case 0x0e: /* push %%cs */ + case 0x16: /* push %%ss */ + case 0x1e: /* push %%ds */ + generate_exception_if(mode_64bit(), EXC_UD); + /* fall through */ + case X86EMUL_OPC(0x0f, 0xa0): /* push %%fs */ + case X86EMUL_OPC(0x0f, 0xa8): /* push %%gs */ fail_if(ops->read_segment == NULL); - if ( (rc = ops->read_segment(src.val, &sreg, ctxt)) != 0 ) + if ( (rc = ops->read_segment((b >> 3) & 7, &sreg, + ctxt)) != X86EMUL_OKAY ) goto done; src.val = sreg.sel; goto push; case 0x07: /* pop %%es */ - src.val = x86_seg_es; - pop_seg: - generate_exception_if(mode_64bit() && !ext, EXC_UD); + case 0x17: /* pop %%ss */ + case 0x1f: /* pop %%ds */ + generate_exception_if(mode_64bit(), EXC_UD); + /* fall through */ + case X86EMUL_OPC(0x0f, 0xa1): /* pop %%fs */ + case X86EMUL_OPC(0x0f, 0xa9): /* pop %%gs */ fail_if(ops->write_segment == NULL); /* 64-bit mode: POP defaults to a 64-bit operand. */ if ( mode_64bit() && (op_bytes == 4) ) op_bytes = 8; - if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), - &dst.val, op_bytes, ctxt, ops)) != 0 || - (rc = load_seg(src.val, dst.val, 0, NULL, ctxt, ops)) != 0 ) + if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, + op_bytes, ctxt, ops)) != X86EMUL_OKAY || + (rc = load_seg((b >> 3) & 7, dst.val, 0, NULL, ctxt, + ops)) != X86EMUL_OKAY ) goto done; - if ( src.val == x86_seg_ss ) + if ( b == 0x07 ) ctxt->retire.mov_ss = true; break; - case 0x0e: /* push %%cs */ - src.val = x86_seg_cs; - goto push_seg; - - case 0x16: /* push %%ss */ - src.val = x86_seg_ss; - goto push_seg; - - case 0x17: /* pop %%ss */ - src.val = x86_seg_ss; - goto pop_seg; - - case 0x1e: /* push %%ds */ - src.val = x86_seg_ds; - goto push_seg; - - case 0x1f: /* pop %%ds */ - src.val = x86_seg_ds; - goto pop_seg; - case 0x27: /* daa */ case 0x2f: /* das */ { uint8_t al = _regs.eax; @@ -5042,14 +5031,6 @@ x86_emulate( dst.val = test_cc(b, _regs.eflags); break; - case X86EMUL_OPC(0x0f, 0xa0): /* push %%fs */ - src.val = x86_seg_fs; - goto push_seg; - - case X86EMUL_OPC(0x0f, 0xa1): /* pop %%fs */ - src.val = x86_seg_fs; - goto pop_seg; - case X86EMUL_OPC(0x0f, 0xa2): /* cpuid */ { unsigned int eax = _regs.eax, ebx = _regs.ebx; unsigned int ecx = _regs.ecx, edx = _regs.edx; @@ -5107,14 +5088,6 @@ x86_emulate( break; } - case X86EMUL_OPC(0x0f, 0xa8): /* push %%gs */ - src.val = x86_seg_gs; - goto push_seg; - - case X86EMUL_OPC(0x0f, 0xa9): /* pop %%gs */ - src.val = x86_seg_gs; - goto pop_seg; - case X86EMUL_OPC(0x0f, 0xab): bts: /* bts */ emulate_2op_SrcV_nobyte("bts", src, dst, _regs.eflags); break; --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2670,51 +2670,40 @@ x86_emulate( break; case 0x06: /* push %%es */ - src.val = x86_seg_es; - push_seg: - generate_exception_if(mode_64bit() && !ext, EXC_UD); + case 0x0e: /* push %%cs */ + case 0x16: /* push %%ss */ + case 0x1e: /* push %%ds */ + generate_exception_if(mode_64bit(), EXC_UD); + /* fall through */ + case X86EMUL_OPC(0x0f, 0xa0): /* push %%fs */ + case X86EMUL_OPC(0x0f, 0xa8): /* push %%gs */ fail_if(ops->read_segment == NULL); - if ( (rc = ops->read_segment(src.val, &sreg, ctxt)) != 0 ) + if ( (rc = ops->read_segment((b >> 3) & 7, &sreg, + ctxt)) != X86EMUL_OKAY ) goto done; src.val = sreg.sel; goto push; case 0x07: /* pop %%es */ - src.val = x86_seg_es; - pop_seg: - generate_exception_if(mode_64bit() && !ext, EXC_UD); + case 0x17: /* pop %%ss */ + case 0x1f: /* pop %%ds */ + generate_exception_if(mode_64bit(), EXC_UD); + /* fall through */ + case X86EMUL_OPC(0x0f, 0xa1): /* pop %%fs */ + case X86EMUL_OPC(0x0f, 0xa9): /* pop %%gs */ fail_if(ops->write_segment == NULL); /* 64-bit mode: POP defaults to a 64-bit operand. */ if ( mode_64bit() && (op_bytes == 4) ) op_bytes = 8; - if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), - &dst.val, op_bytes, ctxt, ops)) != 0 || - (rc = load_seg(src.val, dst.val, 0, NULL, ctxt, ops)) != 0 ) + if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, + op_bytes, ctxt, ops)) != X86EMUL_OKAY || + (rc = load_seg((b >> 3) & 7, dst.val, 0, NULL, ctxt, + ops)) != X86EMUL_OKAY ) goto done; - if ( src.val == x86_seg_ss ) + if ( b == 0x07 ) ctxt->retire.mov_ss = true; break; - case 0x0e: /* push %%cs */ - src.val = x86_seg_cs; - goto push_seg; - - case 0x16: /* push %%ss */ - src.val = x86_seg_ss; - goto push_seg; - - case 0x17: /* pop %%ss */ - src.val = x86_seg_ss; - goto pop_seg; - - case 0x1e: /* push %%ds */ - src.val = x86_seg_ds; - goto push_seg; - - case 0x1f: /* pop %%ds */ - src.val = x86_seg_ds; - goto pop_seg; - case 0x27: /* daa */ case 0x2f: /* das */ { uint8_t al = _regs.eax; @@ -5042,14 +5031,6 @@ x86_emulate( dst.val = test_cc(b, _regs.eflags); break; - case X86EMUL_OPC(0x0f, 0xa0): /* push %%fs */ - src.val = x86_seg_fs; - goto push_seg; - - case X86EMUL_OPC(0x0f, 0xa1): /* pop %%fs */ - src.val = x86_seg_fs; - goto pop_seg; - case X86EMUL_OPC(0x0f, 0xa2): /* cpuid */ { unsigned int eax = _regs.eax, ebx = _regs.ebx; unsigned int ecx = _regs.ecx, edx = _regs.edx; @@ -5107,14 +5088,6 @@ x86_emulate( break; } - case X86EMUL_OPC(0x0f, 0xa8): /* push %%gs */ - src.val = x86_seg_gs; - goto push_seg; - - case X86EMUL_OPC(0x0f, 0xa9): /* pop %%gs */ - src.val = x86_seg_gs; - goto pop_seg; - case X86EMUL_OPC(0x0f, 0xab): bts: /* bts */ emulate_2op_SrcV_nobyte("bts", src, dst, _regs.eflags); break;