From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Vivier Subject: [PATCH 2/5] group all prefix decoding results in a structure called x86_prefix Date: Wed, 01 Aug 2007 11:13:29 +0200 Message-ID: <46B04EB9.5010103@bull.net> References: <46B04CCA.2010503@bull.net> <46B04DD6.7010702@bull.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2014927567==" To: kvm-devel Return-path: In-Reply-To: <46B04DD6.7010702-6ktuUTfB/bM@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --===============2014927567== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigABFDE00D76AC8E985A8BA661" This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigABFDE00D76AC8E985A8BA661 Content-Type: multipart/mixed; boundary="------------020009080705050507000102" This is a multi-part message in MIME format. --------------020009080705050507000102 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable To be able to extract easily prefix decoding from x86_emulate_memop(), gr= oup all prefix decoding results in a structure called x86_prefix. Signed-off-by: Laurent Vivier --=20 ------------- Laurent.Vivier-6ktuUTfB/bM@public.gmane.org -------------- "Software is hard" - Donald Knuth --------------020009080705050507000102 Content-Type: text/plain; name="x86_prefix" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="x86_prefix" Index: kvm/drivers/kvm/x86_emulate.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- kvm.orig/drivers/kvm/x86_emulate.h 2007-07-31 17:00:22.000000000 +020= 0 +++ kvm/drivers/kvm/x86_emulate.h 2007-07-31 17:03:26.000000000 +0200 @@ -141,6 +141,21 @@ #define X86EMUL_MODE_PROT32 4 /* 32-bit protected mode. */ #define X86EMUL_MODE_PROT64 8 /* 64-bit (long) mode. */ =20 +struct x86_prefix { + unsigned int op_bytes; + unsigned int ad_bytes; + int override_base; + + u8 lock; /* LOCK prefix */ + u8 rep; /* REP prefix */ + u8 rex; /* REX prefix */ + + int index_reg; + int base_reg; + u8 modrm_reg; + u8 modrm_rm; +}; + /* Host execution mode. */ #if defined(__i386__) #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32 Index: kvm/drivers/kvm/x86_emulate.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- kvm.orig/drivers/kvm/x86_emulate.c 2007-07-31 17:01:52.000000000 +020= 0 +++ kvm/drivers/kvm/x86_emulate.c 2007-07-31 17:07:30.000000000 +0200 @@ -430,18 +430,18 @@ =20 /* Access/update address held in a register, based on addressing mode. *= / #define register_address(base, reg) = \ - ((base) + ((ad_bytes =3D=3D sizeof(unsigned long)) ? (reg) : \ - ((reg) & ((1UL << (ad_bytes << 3)) - 1)))) + ((base) + ((prefix.ad_bytes =3D=3D sizeof(unsigned long)) ? (reg) : \ + ((reg) & ((1UL << (prefix.ad_bytes << 3)) - 1)))) =20 #define register_address_increment(reg, inc) = \ do { \ /* signed type ensures sign extension to long */ \ int _inc =3D (inc); \ - if ( ad_bytes =3D=3D sizeof(unsigned long) ) \ + if ( prefix.ad_bytes =3D=3D sizeof(unsigned long) ) \ (reg) +=3D _inc; \ else \ - (reg) =3D ((reg) & ~((1UL << (ad_bytes << 3)) - 1)) | \ - (((reg) + _inc) & ((1UL << (ad_bytes << 3)) - 1)); \ + (reg) =3D ((reg) & ~((1UL << (prefix.ad_bytes << 3)) - 1)) | \ + (((reg) + _inc) & ((1UL << (prefix.ad_bytes << 3)) - 1)); \ } while (0) =20 /* @@ -483,18 +483,18 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops = *ops) { unsigned d; - u8 b, sib, twobyte =3D 0, rex_prefix =3D 0; - u8 modrm, modrm_mod =3D 0, modrm_reg =3D 0, modrm_rm =3D 0; - int override_base =3D -1; - unsigned int op_bytes, ad_bytes, lock_prefix =3D 0, rep_prefix =3D 0, i= ; + u8 b, sib, twobyte =3D 0; + u8 modrm, modrm_mod =3D 0; + unsigned int i; int rc =3D 0; struct operand src, dst; unsigned long cr2 =3D ctxt->cr2; int mode =3D ctxt->mode; unsigned long modrm_ea; - int use_modrm_ea, index_reg =3D 0, base_reg =3D 0, scale, rip_relative = =3D 0; + int use_modrm_ea, scale, rip_relative =3D 0; int no_wb =3D 0; u64 msr_data; + struct x86_prefix prefix; =20 /* Shadow copy of register state. Committed on successful emulation. */= unsigned long _regs[NR_VCPU_REGS]; @@ -502,19 +502,21 @@ unsigned long modrm_val =3D 0; =20 memcpy(_regs, ctxt->vcpu->regs, sizeof _regs); + memset(&prefix, 0, sizeof(prefix)); + prefix.override_base =3D -1; =20 switch (mode) { case X86EMUL_MODE_REAL: case X86EMUL_MODE_PROT16: - op_bytes =3D ad_bytes =3D 2; + prefix.op_bytes =3D prefix.ad_bytes =3D 2; break; case X86EMUL_MODE_PROT32: - op_bytes =3D ad_bytes =3D 4; + prefix.op_bytes =3D prefix.ad_bytes =3D 4; break; #ifdef CONFIG_X86_64 case X86EMUL_MODE_PROT64: - op_bytes =3D 4; - ad_bytes =3D 8; + prefix.op_bytes =3D 4; + prefix.ad_bytes =3D 8; break; #endif default: @@ -525,37 +527,37 @@ for (i =3D 0; i < 8; i++) { switch (b =3D insn_fetch(u8, 1, _eip)) { case 0x66: /* operand-size override */ - op_bytes ^=3D 6; /* switch between 2/4 bytes */ + prefix.op_bytes ^=3D 6; /* switch between 2/4 bytes */ break; case 0x67: /* address-size override */ if (mode =3D=3D X86EMUL_MODE_PROT64) - ad_bytes ^=3D 12; /* switch between 4/8 bytes */ + prefix.ad_bytes ^=3D 12; /* switch between 4/8 bytes */ else - ad_bytes ^=3D 6; /* switch between 2/4 bytes */ + prefix.ad_bytes ^=3D 6; /* switch between 2/4 bytes */ break; case 0x2e: /* CS override */ - override_base =3D X86EMUL_BASE_CS; + prefix.override_base =3D X86EMUL_BASE_CS; break; case 0x3e: /* DS override */ - override_base =3D X86EMUL_BASE_DS; + prefix.override_base =3D X86EMUL_BASE_DS; break; case 0x26: /* ES override */ - override_base =3D X86EMUL_BASE_ES; + prefix.override_base =3D X86EMUL_BASE_ES; break; case 0x64: /* FS override */ - override_base =3D X86EMUL_BASE_FS; + prefix.override_base =3D X86EMUL_BASE_FS; break; case 0x65: /* GS override */ - override_base =3D X86EMUL_BASE_GS; + prefix.override_base =3D X86EMUL_BASE_GS; break; case 0x36: /* SS override */ - override_base =3D X86EMUL_BASE_SS; + prefix.override_base =3D X86EMUL_BASE_SS; break; case 0xf0: /* LOCK */ - lock_prefix =3D 1; + prefix.lock =3D 1; break; case 0xf3: /* REP/REPE/REPZ */ - rep_prefix =3D 1; + prefix.rep =3D 1; break; case 0xf2: /* REPNE/REPNZ */ break; @@ -568,12 +570,12 @@ =20 /* REX prefix. */ if ((mode =3D=3D X86EMUL_MODE_PROT64) && ((b & 0xf0) =3D=3D 0x40)) { - rex_prefix =3D b; + prefix.rex =3D b; if (b & 8) - op_bytes =3D 8; /* REX.W */ - modrm_reg =3D (b & 4) << 1; /* REX.R */ - index_reg =3D (b & 2) << 2; /* REX.X */ - modrm_rm =3D base_reg =3D (b & 1) << 3; /* REG.B */ + prefix.op_bytes =3D 8; /* REX.W */ + prefix.modrm_reg =3D (b & 4) << 1; /* REX.R */ + prefix.index_reg =3D (b & 2) << 2; /* REX.X */ + prefix.modrm_rm =3D prefix.base_reg =3D (b & 1) << 3; /* REG.B */ b =3D insn_fetch(u8, 1, _eip); } =20 @@ -596,18 +598,18 @@ if (d & ModRM) { modrm =3D insn_fetch(u8, 1, _eip); modrm_mod |=3D (modrm & 0xc0) >> 6; - modrm_reg |=3D (modrm & 0x38) >> 3; - modrm_rm |=3D (modrm & 0x07); + prefix.modrm_reg |=3D (modrm & 0x38) >> 3; + prefix.modrm_rm |=3D (modrm & 0x07); modrm_ea =3D 0; use_modrm_ea =3D 1; =20 if (modrm_mod =3D=3D 3) { modrm_val =3D *(unsigned long *) - decode_register(modrm_rm, _regs, d & ByteOp); + decode_register(prefix.modrm_rm, _regs, d & ByteOp); goto modrm_done; } =20 - if (ad_bytes =3D=3D 2) { + if (prefix.ad_bytes =3D=3D 2) { unsigned bx =3D _regs[VCPU_REGS_RBX]; unsigned bp =3D _regs[VCPU_REGS_RBP]; unsigned si =3D _regs[VCPU_REGS_RSI]; @@ -616,7 +618,7 @@ /* 16-bit ModR/M decode. */ switch (modrm_mod) { case 0: - if (modrm_rm =3D=3D 6) + if (prefix.modrm_rm =3D=3D 6) modrm_ea +=3D insn_fetch(u16, 2, _eip); break; case 1: @@ -626,7 +628,7 @@ modrm_ea +=3D insn_fetch(u16, 2, _eip); break; } - switch (modrm_rm) { + switch (prefix.modrm_rm) { case 0: modrm_ea +=3D bx + si; break; @@ -653,52 +655,52 @@ modrm_ea +=3D bx; break; } - if (modrm_rm =3D=3D 2 || modrm_rm =3D=3D 3 || - (modrm_rm =3D=3D 6 && modrm_mod !=3D 0)) - if (override_base =3D=3D -1) - override_base =3D X86EMUL_BASE_SS; + if (prefix.modrm_rm =3D=3D 2 || prefix.modrm_rm =3D=3D 3 || + (prefix.modrm_rm =3D=3D 6 && modrm_mod !=3D 0)) + if (prefix.override_base =3D=3D -1) + prefix.override_base =3D X86EMUL_BASE_SS; modrm_ea =3D (u16)modrm_ea; } else { /* 32/64-bit ModR/M decode. */ - switch (modrm_rm) { + switch (prefix.modrm_rm) { case 4: case 12: sib =3D insn_fetch(u8, 1, _eip); - index_reg |=3D (sib >> 3) & 7; - base_reg |=3D sib & 7; + prefix.index_reg |=3D (sib >> 3) & 7; + prefix.base_reg |=3D sib & 7; scale =3D sib >> 6; =20 - switch (base_reg) { + switch (prefix.base_reg) { case 5: if (modrm_mod !=3D 0) - modrm_ea +=3D _regs[base_reg]; + modrm_ea +=3D _regs[prefix.base_reg]; else modrm_ea +=3D insn_fetch(s32, 4, _eip); break; default: - modrm_ea +=3D _regs[base_reg]; + modrm_ea +=3D _regs[prefix.base_reg]; } - switch (index_reg) { + switch (prefix.index_reg) { case 4: break; default: - modrm_ea +=3D _regs[index_reg] << scale; + modrm_ea +=3D _regs[prefix.index_reg] << scale; =20 } break; case 5: if (modrm_mod !=3D 0) - modrm_ea +=3D _regs[modrm_rm]; + modrm_ea +=3D _regs[prefix.modrm_rm]; else if (mode =3D=3D X86EMUL_MODE_PROT64) rip_relative =3D 1; break; default: - modrm_ea +=3D _regs[modrm_rm]; + modrm_ea +=3D _regs[prefix.modrm_rm]; break; } switch (modrm_mod) { case 0: - if (modrm_rm =3D=3D 5) + if (prefix.modrm_rm =3D=3D 5) modrm_ea +=3D insn_fetch(s32, 4, _eip); break; case 1: @@ -709,15 +711,15 @@ break; } } - if (override_base =3D=3D -1) - override_base =3D X86EMUL_BASE_DS; + if (prefix.override_base =3D=3D -1) + prefix.override_base =3D X86EMUL_BASE_DS; if (mode =3D=3D X86EMUL_MODE_PROT64 && - override_base !=3D X86EMUL_BASE_FS && - override_base !=3D X86EMUL_BASE_GS) - override_base =3D -1; + prefix.override_base !=3D X86EMUL_BASE_FS && + prefix.override_base !=3D X86EMUL_BASE_GS) + prefix.override_base =3D -1; =20 - if (override_base !=3D -1) - modrm_ea +=3D ctxt->base[override_base]; + if (prefix.override_base !=3D -1) + modrm_ea +=3D ctxt->base[prefix.override_base]; =20 if (rip_relative) { modrm_ea +=3D _eip; @@ -729,13 +731,13 @@ if (d & ByteOp) modrm_ea +=3D 1; else - if (op_bytes =3D=3D 8) + if (prefix.op_bytes =3D=3D 8) modrm_ea +=3D 4; else - modrm_ea +=3D op_bytes; + modrm_ea +=3D prefix.op_bytes; } } - if (ad_bytes !=3D 8) + if (prefix.ad_bytes !=3D 8) modrm_ea =3D (u32)modrm_ea; cr2 =3D modrm_ea; modrm_done: @@ -752,13 +754,13 @@ case SrcReg: src.type =3D OP_REG; if (d & ByteOp) { - src.ptr =3D decode_register(modrm_reg, _regs, - (rex_prefix =3D=3D 0)); + src.ptr =3D decode_register(prefix.modrm_reg, _regs, + (prefix.rex =3D=3D 0)); src.val =3D src.orig_val =3D *(u8 *) src.ptr; src.bytes =3D 1; } else { - src.ptr =3D decode_register(modrm_reg, _regs, 0); - switch ((src.bytes =3D op_bytes)) { + src.ptr =3D decode_register(prefix.modrm_reg, _regs, 0); + switch ((src.bytes =3D prefix.op_bytes)) { case 2: src.val =3D src.orig_val =3D *(u16 *) src.ptr; break; @@ -778,7 +780,7 @@ src.bytes =3D 4; goto srcmem_common; case SrcMem: - src.bytes =3D (d & ByteOp) ? 1 : op_bytes; + src.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; srcmem_common: src.type =3D OP_MEM; src.ptr =3D (unsigned long *)cr2; @@ -790,7 +792,7 @@ case SrcImm: src.type =3D OP_IMM; src.ptr =3D (unsigned long *)_eip; - src.bytes =3D (d & ByteOp) ? 1 : op_bytes; + src.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; if (src.bytes =3D=3D 8) src.bytes =3D 4; /* NB. Immediates are sign-extended as necessary. */ @@ -823,13 +825,13 @@ dst.type =3D OP_REG; if ((d & ByteOp) && !(twobyte && (b =3D=3D 0xb6 || b =3D=3D 0xb7))) { - dst.ptr =3D decode_register(modrm_reg, _regs, - (rex_prefix =3D=3D 0)); + dst.ptr =3D decode_register(prefix.modrm_reg, _regs, + (prefix.rex =3D=3D 0)); dst.val =3D *(u8 *) dst.ptr; dst.bytes =3D 1; } else { - dst.ptr =3D decode_register(modrm_reg, _regs, 0); - switch ((dst.bytes =3D op_bytes)) { + dst.ptr =3D decode_register(prefix.modrm_reg, _regs, 0); + switch ((dst.bytes =3D prefix.op_bytes)) { case 2: dst.val =3D *(u16 *)dst.ptr; break; @@ -845,7 +847,7 @@ case DstMem: dst.type =3D OP_MEM; dst.ptr =3D (unsigned long *)cr2; - dst.bytes =3D (d & ByteOp) ? 1 : op_bytes; + dst.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; if (d & BitOp) { unsigned long mask =3D ~(dst.bytes * 8 - 1); =20 @@ -901,7 +903,7 @@ dst.val =3D (s32) src.val; break; case 0x80 ... 0x83: /* Grp1 */ - switch (modrm_reg) { + switch (prefix.modrm_reg) { case 0: goto add; case 1: @@ -945,16 +947,16 @@ * prefix. */ dst.val =3D src.val; - lock_prefix =3D 1; + prefix.lock =3D 1; break; case 0xa0 ... 0xa1: /* mov */ dst.ptr =3D (unsigned long *)&_regs[VCPU_REGS_RAX]; dst.val =3D src.val; - _eip +=3D ad_bytes; /* skip src displacement */ + _eip +=3D prefix.ad_bytes; /* skip src displacement */ break; case 0xa2 ... 0xa3: /* mov */ dst.val =3D (unsigned long)_regs[VCPU_REGS_RAX]; - _eip +=3D ad_bytes; /* skip dst displacement */ + _eip +=3D prefix.ad_bytes; /* skip dst displacement */ break; case 0x88 ... 0x8b: /* mov */ case 0xc6 ... 0xc7: /* mov (sole member of Grp11) */ @@ -973,7 +975,7 @@ break; case 0xc0 ... 0xc1: grp2: /* Grp2 */ - switch (modrm_reg) { + switch (prefix.modrm_reg) { case 0: /* rol */ emulate_2op_SrcB("rol", src, dst, _eflags); break; @@ -1005,7 +1007,7 @@ src.val =3D _regs[VCPU_REGS_RCX]; goto grp2; case 0xf6 ... 0xf7: /* Grp3 */ - switch (modrm_reg) { + switch (prefix.modrm_reg) { case 0 ... 1: /* test */ /* * Special case in Grp3: test has an immediate @@ -1013,7 +1015,7 @@ */ src.type =3D OP_IMM; src.ptr =3D (unsigned long *)_eip; - src.bytes =3D (d & ByteOp) ? 1 : op_bytes; + src.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; if (src.bytes =3D=3D 8) src.bytes =3D 4; switch (src.bytes) { @@ -1039,7 +1041,7 @@ } break; case 0xfe ... 0xff: /* Grp4/Grp5 */ - switch (modrm_reg) { + switch (prefix.modrm_reg) { case 0: /* inc */ emulate_1op("inc", dst, _eflags); break; @@ -1091,7 +1093,7 @@ } break; case OP_MEM: - if (lock_prefix) + if (prefix.lock) rc =3D ops->cmpxchg_emulated((unsigned long)dst. ptr, &dst.orig_val, &dst.val, dst.bytes, @@ -1118,7 +1120,7 @@ special_insn: if (twobyte) goto twobyte_special_insn; - if (rep_prefix) { + if (prefix.rep) { if (_regs[VCPU_REGS_RCX] =3D=3D 0) { ctxt->vcpu->rip =3D _eip; goto done; @@ -1129,13 +1131,13 @@ switch (b) { case 0xa4 ... 0xa5: /* movs */ dst.type =3D OP_MEM; - dst.bytes =3D (d & ByteOp) ? 1 : op_bytes; + dst.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; dst.ptr =3D (unsigned long *)register_address( ctxt->base[X86EMUL_BASE_ES], _regs[VCPU_REGS_RDI]); if ((rc =3D ops->read_emulated(register_address( - (override_base !=3D -1) ? - ctxt->base[override_base] : ctxt->base[X86EMUL_BASE_DS], + (prefix.override_base !=3D -1) ? + ctxt->base[prefix.override_base] : ctxt->base[X86EMUL_BASE_DS],= _regs[VCPU_REGS_RSI]), &dst.val, dst.bytes, ctxt->vcpu)) !=3D 0)= goto done; register_address_increment(_regs[VCPU_REGS_RSI], @@ -1148,7 +1150,7 @@ goto cannot_emulate; case 0xaa ... 0xab: /* stos */ dst.type =3D OP_MEM; - dst.bytes =3D (d & ByteOp) ? 1 : op_bytes; + dst.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; dst.ptr =3D (unsigned long *)cr2; dst.val =3D _regs[VCPU_REGS_RAX]; register_address_increment(_regs[VCPU_REGS_RDI], @@ -1156,7 +1158,7 @@ break; case 0xac ... 0xad: /* lods */ dst.type =3D OP_REG; - dst.bytes =3D (d & ByteOp) ? 1 : op_bytes; + dst.bytes =3D (d & ByteOp) ? 1 : prefix.op_bytes; dst.ptr =3D (unsigned long *)&_regs[VCPU_REGS_RAX]; if ((rc =3D ops->read_emulated(cr2, &dst.val, dst.bytes, ctxt->vcpu)) !=3D 0) @@ -1179,11 +1181,11 @@ pop_instruction: if ((rc =3D ops->read_std( register_address(ctxt->base[X86EMUL_BASE_SS], - _regs[VCPU_REGS_RSP]), dst.ptr, op_bytes, ctxt->vcpu)) + _regs[VCPU_REGS_RSP]), dst.ptr, prefix.op_bytes, ctxt->vcpu)) !=3D 0) goto done; =20 - register_address_increment(_regs[VCPU_REGS_RSP], op_bytes); + register_address_increment(_regs[VCPU_REGS_RSP], prefix.op_bytes); no_wb =3D 1; /* Disable writeback. */ break; } @@ -1194,20 +1196,20 @@ case 0x01: /* lgdt, lidt, lmsw */ /* Disable writeback. */ no_wb =3D 1; - switch (modrm_reg) { + switch (prefix.modrm_reg) { u16 size; unsigned long address; =20 case 2: /* lgdt */ rc =3D read_descriptor(ctxt, ops, src.ptr, - &size, &address, op_bytes); + &size, &address, prefix.op_bytes); if (rc) goto done; realmode_lgdt(ctxt->vcpu, size, address); break; case 3: /* lidt */ rc =3D read_descriptor(ctxt, ops, src.ptr, - &size, &address, op_bytes); + &size, &address, prefix.op_bytes); if (rc) goto done; realmode_lidt(ctxt->vcpu, size, address); @@ -1215,7 +1217,7 @@ case 4: /* smsw */ if (modrm_mod !=3D 3) goto cannot_emulate; - *(u16 *)&_regs[modrm_rm] + *(u16 *)&_regs[prefix.modrm_rm] =3D realmode_get_cr(ctxt->vcpu, 0); break; case 6: /* lmsw */ @@ -1233,12 +1235,12 @@ case 0x21: /* mov from dr to reg */ if (modrm_mod !=3D 3) goto cannot_emulate; - rc =3D emulator_get_dr(ctxt, modrm_reg, &_regs[modrm_rm]); + rc =3D emulator_get_dr(ctxt, prefix.modrm_reg, &_regs[prefix.modrm_rm]= ); break; case 0x23: /* mov from reg to dr */ if (modrm_mod !=3D 3) goto cannot_emulate; - rc =3D emulator_set_dr(ctxt, modrm_reg, _regs[modrm_rm]); + rc =3D emulator_set_dr(ctxt, prefix.modrm_reg, _regs[prefix.modrm_rm])= ; break; case 0x40 ... 0x4f: /* cmov */ dst.val =3D dst.orig_val =3D src.val; @@ -1310,7 +1312,7 @@ emulate_2op_SrcV_nobyte("bts", src, dst, _eflags); break; case 0xb6 ... 0xb7: /* movzx */ - dst.bytes =3D op_bytes; + dst.bytes =3D prefix.op_bytes; dst.val =3D (d & ByteOp) ? (u8) src.val : (u16) src.val; break; case 0xbb: @@ -1319,7 +1321,7 @@ emulate_2op_SrcV_nobyte("btc", src, dst, _eflags); break; case 0xba: /* Grp8 */ - switch (modrm_reg & 3) { + switch (prefix.modrm_reg & 3) { case 0: goto bt; case 1: @@ -1331,7 +1333,7 @@ } break; case 0xbe ... 0xbf: /* movsx */ - dst.bytes =3D op_bytes; + dst.bytes =3D prefix.op_bytes; dst.val =3D (d & ByteOp) ? (s8) src.val : (s16) src.val; break; } @@ -1352,12 +1354,12 @@ case 0x20: /* mov cr, reg */ if (modrm_mod !=3D 3) goto cannot_emulate; - _regs[modrm_rm] =3D realmode_get_cr(ctxt->vcpu, modrm_reg); + _regs[prefix.modrm_rm] =3D realmode_get_cr(ctxt->vcpu, prefix.modrm_re= g); break; case 0x22: /* mov reg, cr */ if (modrm_mod !=3D 3) goto cannot_emulate; - realmode_set_cr(ctxt->vcpu, modrm_reg, modrm_val, &_eflags); + realmode_set_cr(ctxt->vcpu, prefix.modrm_reg, modrm_val, &_eflags); break; case 0x30: /* wrmsr */ --------------020009080705050507000102-- --------------enigABFDE00D76AC8E985A8BA661 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.7 (GNU/Linux) iD8DBQFGsE659Kffa9pFVzwRAmLoAJ9uELug7ApO1FfdN0IFNZcwI6L+lgCgw41i pi97X5xB+nTz7ygi+18Gw8o= =Ifp7 -----END PGP SIGNATURE----- --------------enigABFDE00D76AC8E985A8BA661-- --===============2014927567== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ --===============2014927567== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/kvm-devel --===============2014927567==--