From: Avi Kivity <avi@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org
Subject: [PATCH 11/13] KVM: x86 emulator: simplify Group 1 decoding
Date: Mon, 26 Jul 2010 14:37:49 +0300 [thread overview]
Message-ID: <1280144271-328-12-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1280144271-328-1-git-send-email-avi@redhat.com>
Move operand decoding to the opcode table, keep lock decoding in the group
table. This allows us to get consolidate the four variants of Group 1 into one
group.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/emulate.c | 47 +++++++----------------------------------------
1 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 8834672..09ee418 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -105,8 +105,7 @@
#define X16(x) X8(x), X8(x)
enum {
- Group1_80, Group1_81, Group1_82, Group1_83,
- Group1A, Group3_Byte, Group3, Group4, Group5, Group7,
+ Group1, Group1A, Group3_Byte, Group3, Group4, Group5, Group7,
Group8, Group9,
};
@@ -165,8 +164,10 @@ static u32 opcode_table[256] = {
/* 0x70 - 0x7F */
X16(SrcImmByte),
/* 0x80 - 0x87 */
- Group | Group1_80, Group | Group1_81,
- Group | Group1_82, Group | Group1_83,
+ ByteOp | DstMem | SrcImm | ModRM | Group | Group1,
+ DstMem | SrcImm | ModRM | Group | Group1,
+ ByteOp | DstMem | SrcImm | ModRM | No64 | Group | Group1,
+ DstMem | SrcImmByte | ModRM | Group | Group1,
ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,
ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
/* 0x88 - 0x8F */
@@ -285,42 +286,8 @@ static u32 twobyte_table[256] = {
};
static u32 group_table[] = {
- [Group1_80*8] =
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM | Lock,
- ByteOp | DstMem | SrcImm | ModRM,
- [Group1_81*8] =
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM | Lock,
- DstMem | SrcImm | ModRM,
- [Group1_82*8] =
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
- ByteOp | DstMem | SrcImm | ModRM | No64,
- [Group1_83*8] =
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM | Lock,
- DstMem | SrcImmByte | ModRM,
+ [Group1*8] =
+ X7(Lock), 0,
[Group1A*8] =
DstMem | SrcNone | ModRM | Mov | Stack, 0, 0, 0, 0, 0, 0, 0,
[Group3_Byte*8] =
--
1.7.1
next prev parent reply other threads:[~2010-07-26 11:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 11:37 [PATCH 00/13] Emulator group simplification Avi Kivity
2010-07-26 11:37 ` [PATCH 01/13] KVM: x86 emulator: add macros for repetitive instructions Avi Kivity
2010-07-26 11:37 ` [PATCH 02/13] KVM: x86 emulator: consolidate inc/dec reg decoding Avi Kivity
2010-07-26 11:37 ` [PATCH 03/13] KVM: x86 emulator: consolidate push/pop " Avi Kivity
2010-07-26 11:37 ` [PATCH 04/13] KVM: X86 emulator: consolidate Jcc rel8 decoding Avi Kivity
2010-07-26 11:37 ` [PATCH 05/13] KVM: x86 emulator: consolidate MOV reg, imm decoding Avi Kivity
2010-07-26 11:37 ` [PATCH 06/13] KVM: x86 emulator: consolidate CMOVcc decoding Avi Kivity
2010-07-26 11:37 ` [PATCH 07/13] KVM: x86 emulator: consolidate Jcc rel32 decoding Avi Kivity
2010-07-26 11:37 ` [PATCH 08/13] KVM: x86 emulator: Make group storage bits separate from operand bits Avi Kivity
2010-07-26 11:37 ` [PATCH 09/13] KVM: x86 emulator: add Undefined decode flag Avi Kivity
2010-07-26 11:37 ` [PATCH 10/13] KVM: x86 emulator: mix decode bits from opcode and group decode tables Avi Kivity
2010-07-26 11:37 ` Avi Kivity [this message]
2010-07-26 11:37 ` [PATCH 12/13] KVM: x86 emulator: Allow LOCK prefix for NEG and NOT Avi Kivity
2010-07-26 11:37 ` [PATCH 13/13] KVM: x86 emulator: unify the two Group 3 variants Avi Kivity
2010-07-27 23:21 ` [PATCH 00/13] Emulator group simplification Marcelo Tosatti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280144271-328-12-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox