summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-08-26 08:56:06 (GMT)
committerAvi Kivity <avi@redhat.com>2010-10-24 08:51:35 (GMT)
commit8d8f4e9f66ab36e4fcc75eca1e828af8466309f1 (patch)
treeeac8232b0446d4d7cd853da7d0ce5583680e8ebc
parent081bca0e6b87d0c7b9ade7ffee1f44aca336a8fa (diff)
downloadlinux-fsl-qoriq-8d8f4e9f66ab36e4fcc75eca1e828af8466309f1.tar.xz
KVM: x86 emulator: support byte/word opcode pairs
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> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/emulate.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 2b9b0fe..1a230b5 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2330,6 +2330,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
};
@@ -2572,6 +2575,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;