Commit fc9f715de8bc5aaed89ada800c1ead43c19f5784
1 parent
b359d4e7
i386-user compile fix (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1395 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
16 additions
and
0 deletions
cpu-exec.c
| @@ -322,14 +322,30 @@ int cpu_exec(CPUState *env1) | @@ -322,14 +322,30 @@ int cpu_exec(CPUState *env1) | ||
| 322 | if ((loglevel & CPU_LOG_EXEC)) { | 322 | if ((loglevel & CPU_LOG_EXEC)) { |
| 323 | #if defined(TARGET_I386) | 323 | #if defined(TARGET_I386) |
| 324 | /* restore flags in standard format */ | 324 | /* restore flags in standard format */ |
| 325 | +#ifdef reg_EAX | ||
| 325 | env->regs[R_EAX] = EAX; | 326 | env->regs[R_EAX] = EAX; |
| 327 | +#endif | ||
| 328 | +#ifdef reg_EBX | ||
| 326 | env->regs[R_EBX] = EBX; | 329 | env->regs[R_EBX] = EBX; |
| 330 | +#endif | ||
| 331 | +#ifdef reg_ECX | ||
| 327 | env->regs[R_ECX] = ECX; | 332 | env->regs[R_ECX] = ECX; |
| 333 | +#endif | ||
| 334 | +#ifdef reg_EDX | ||
| 328 | env->regs[R_EDX] = EDX; | 335 | env->regs[R_EDX] = EDX; |
| 336 | +#endif | ||
| 337 | +#ifdef reg_ESI | ||
| 329 | env->regs[R_ESI] = ESI; | 338 | env->regs[R_ESI] = ESI; |
| 339 | +#endif | ||
| 340 | +#ifdef reg_EDI | ||
| 330 | env->regs[R_EDI] = EDI; | 341 | env->regs[R_EDI] = EDI; |
| 342 | +#endif | ||
| 343 | +#ifdef reg_EBP | ||
| 331 | env->regs[R_EBP] = EBP; | 344 | env->regs[R_EBP] = EBP; |
| 345 | +#endif | ||
| 346 | +#ifdef reg_ESP | ||
| 332 | env->regs[R_ESP] = ESP; | 347 | env->regs[R_ESP] = ESP; |
| 348 | +#endif | ||
| 333 | env->eflags = env->eflags | cc_table[CC_OP].compute_all() | (DF & DF_MASK); | 349 | env->eflags = env->eflags | cc_table[CC_OP].compute_all() | (DF & DF_MASK); |
| 334 | cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP); | 350 | cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP); |
| 335 | env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); | 351 | env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); |