Commit 4980ef9e authored by Richard Henderson's avatar Richard Henderson Committed by Blue Swirl
Browse files

target-i386: Don't modify env->eflags around cpu_dump_state 



We can compute the value in cpu_dump_state anyway, and gratuitous
modifications to eflags creates heisenbugs.

Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent c53de1a2

cpu-exec.c

+0 −3
Original line number Diff line number Diff line
@@ -571,10 +571,7 @@ int cpu_exec(CPUArchState *env) 
                if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) {

                    /* restore flags in standard format */

#if defined(TARGET_I386)

                    env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP)

                        | (DF & DF_MASK);

                    log_cpu_state(env, CPU_DUMP_CCOP);

                    env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);

#elif defined(TARGET_M68K)

                    cpu_m68k_flush_flags(env, env->cc_op);

                    env->cc_op = CC_OP_FLAGS;

target-i386/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ void cpu_dump_state(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, 


    cpu_synchronize_state(env);



    eflags = env->eflags;

    eflags = cpu_compute_eflags(env);

#ifdef TARGET_X86_64

    if (env->hflags & HF_CS64_MASK) {

        cpu_fprintf(f,