diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-03-15 16:38:29 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:15:47 +0300 |
| commit | c73e197bc525e67b71578126b679446f5b88b508 (patch) | |
| tree | fc0eac94860b101a552228504f3c080110bde32e | |
| parent | d6d367d6783e38634377bc66b62bff3ffd717e5f (diff) | |
| download | op-kernel-dev-c73e197bc525e67b71578126b679446f5b88b508.zip op-kernel-dev-c73e197bc525e67b71578126b679446f5b88b508.tar.gz | |
KVM: x86 emulator: fix RCX access during rep emulation
During rep emulation access length to RCX depends on current address
mode.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/emulate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 0b70a36..4dce805 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1852,7 +1852,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) if (c->rep_prefix && (c->d & String)) { /* All REP prefixes have the same first termination condition */ - if (c->regs[VCPU_REGS_RCX] == 0) { + if (address_mask(c, c->regs[VCPU_REGS_RCX]) == 0) { kvm_rip_write(ctxt->vcpu, c->eip); goto done; } @@ -1876,7 +1876,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) goto done; } } - c->regs[VCPU_REGS_RCX]--; + register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1); c->eip = kvm_rip_read(ctxt->vcpu); } |
