diff options
| author | Rudolf Marek <rudolf.marek@sysgo.com> | 2018-10-19 14:24:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-11-06 21:35:05 +0100 |
| commit | 1a1435dd61e28c1e3b70971107d72a7d05b28d03 (patch) | |
| tree | 92e697cf8825ee0933f0240c21f2c142ec654574 | |
| parent | 2185fd67d2f277ebb1d2946cf5f7cdc773e04198 (diff) | |
| download | focaccia-qemu-1a1435dd61e28c1e3b70971107d72a7d05b28d03.tar.gz focaccia-qemu-1a1435dd61e28c1e3b70971107d72a7d05b28d03.zip | |
target/i386: Clear RF on SYSCALL instruction
Fix the SYSCALL instruction in 64-bit (long mode). The RF flag should be cleared in R11 as well as in the RFLAGS. Intel and AMD CPUs behave same. AMD has this documented in the APM vol 3. Signed-off-by: Roman Kapl <rka@sysgo.com> Signed-off-by: Rudolf Marek <rudolf.marek@sysgo.com> Message-Id: <20181019122449.26387-1-rka@sysgo.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/seg_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index 33714bc6e1..63e265cb38 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -991,11 +991,11 @@ void helper_syscall(CPUX86State *env, int next_eip_addend) int code64; env->regs[R_ECX] = env->eip + next_eip_addend; - env->regs[11] = cpu_compute_eflags(env); + env->regs[11] = cpu_compute_eflags(env) & ~RF_MASK; code64 = env->hflags & HF_CS64_MASK; - env->eflags &= ~env->fmask; + env->eflags &= ~(env->fmask | RF_MASK); cpu_load_eflags(env, env->eflags, 0); cpu_x86_load_seg_cache(env, R_CS, selector & 0xfffc, 0, 0xffffffff, |