[PATCH v2 1/8] KVM: x86 emulator: support byte/word opcode pairs

Avi Kivity
2010-08-26T08:36:16Z

Many x86 instructions come in byte and word variants distinguished with bit
0 of the opcode. Add macros to aid in defining them.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/emulate.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index d613690..8f4575e 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2332,6 +2332,9 @@ static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
#define I(_f, _e) { .flags = (_f), .u.execute = (_e) }

+#define D2bv(_f) D((_f) | ByteOp), D(_f)
+#define I2bv(_f, _e) I((_f) | ByteOp, _e), I(_f, _e)
+
static struct opcode group1[] = {
X7(D(Lock)), N
};
@@ -2574,6 +2577,9 @@ static struct opcode twobyte_table[256] = {
#undef GD
#undef I

+#undef D2bv
+#undef I2bv
+
static unsigned imm_size(struct decode_cache *c)
{
unsigned size;
--
1.7.1