From: Avi Kivity <avi@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org
Subject: [PATCH] KVM: x86 emulator: simplify ALU opcode block decode further
Date: Thu, 26 Aug 2010 18:34:55 +0300 [thread overview]
Message-ID: <1282836895-806-1-git-send-email-avi@redhat.com> (raw)
The ALU opcode block is very regular; introduce D6ALU() to define decode
flags for 6 instructions at a time.
Suggested by Paolo Bonzini.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
Requires the patchset that introduces D2bv.
arch/x86/kvm/emulate.c | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 9e02565..72d0505 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2335,6 +2335,11 @@ static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
#define D2bv(_f) D((_f) | ByteOp), D(_f)
#define I2bv(_f, _e) I((_f) | ByteOp, _e), I(_f, _e)
+#define D6ALU(_f) D2bv((_f) | DstMem | SrcReg | ModRM), \
+ D2bv(((_f) | DstReg | SrcMem | ModRM) & ~Lock), \
+ D2bv(((_f) & ~Lock) | DstAcc | SrcImm)
+
+
static struct opcode group1[] = {
X7(D(Lock)), N
};
@@ -2387,35 +2392,25 @@ static struct group_dual group9 = { {
static struct opcode opcode_table[256] = {
/* 0x00 - 0x07 */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
+ D6ALU(Lock),
D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
/* 0x08 - 0x0F */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
+ D6ALU(Lock),
D(ImplicitOps | Stack | No64), N,
/* 0x10 - 0x17 */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
+ D6ALU(Lock),
D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
/* 0x18 - 0x1F */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
+ D6ALU(Lock),
D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
/* 0x20 - 0x27 */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm), N, N,
+ D6ALU(Lock), N, N,
/* 0x28 - 0x2F */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
- N, I(ByteOp | DstAcc | No64, em_das),
+ D6ALU(Lock), N, I(ByteOp | DstAcc | No64, em_das),
/* 0x30 - 0x37 */
- D2bv(DstMem | SrcReg | ModRM | Lock), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm), N, N,
+ D6ALU(Lock), N, N,
/* 0x38 - 0x3F */
- D2bv(DstMem | SrcReg | ModRM), D2bv(DstReg | SrcMem | ModRM),
- D2bv(DstAcc | SrcImm),
- N, N,
+ D6ALU(0), N, N,
/* 0x40 - 0x4F */
X16(D(DstReg)),
/* 0x50 - 0x57 */
@@ -2566,6 +2561,7 @@ static struct opcode twobyte_table[256] = {
#undef D2bv
#undef I2bv
+#undef D6ALU
static unsigned imm_size(struct decode_cache *c)
{
--
1.7.1
next reply other threads:[~2010-08-26 15:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-26 15:34 Avi Kivity [this message]
2010-08-26 19:14 ` [PATCH] KVM: x86 emulator: simplify ALU opcode block decode further 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=1282836895-806-1-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