Commit 649ea05a2ca8f940e6e179490b67c217016124e2
1 parent
7664728b
x86_64 lcall fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1673 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
3 deletions
target-i386/helper.c
@@ -1732,11 +1732,11 @@ void helper_lcall_real_T0_T1(int shift, int next_eip) | @@ -1732,11 +1732,11 @@ void helper_lcall_real_T0_T1(int shift, int next_eip) | ||
1732 | /* protected mode call */ | 1732 | /* protected mode call */ |
1733 | void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | 1733 | void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) |
1734 | { | 1734 | { |
1735 | - int new_cs, new_eip, new_stack, i; | 1735 | + int new_cs, new_stack, i; |
1736 | uint32_t e1, e2, cpl, dpl, rpl, selector, offset, param_count; | 1736 | uint32_t e1, e2, cpl, dpl, rpl, selector, offset, param_count; |
1737 | uint32_t ss, ss_e1, ss_e2, sp, type, ss_dpl, sp_mask; | 1737 | uint32_t ss, ss_e1, ss_e2, sp, type, ss_dpl, sp_mask; |
1738 | uint32_t val, limit, old_sp_mask; | 1738 | uint32_t val, limit, old_sp_mask; |
1739 | - target_ulong ssp, old_ssp, next_eip; | 1739 | + target_ulong ssp, old_ssp, next_eip, new_eip; |
1740 | 1740 | ||
1741 | new_cs = T0; | 1741 | new_cs = T0; |
1742 | new_eip = T1; | 1742 | new_eip = T1; |
@@ -1744,7 +1744,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | @@ -1744,7 +1744,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | ||
1744 | #ifdef DEBUG_PCALL | 1744 | #ifdef DEBUG_PCALL |
1745 | if (loglevel & CPU_LOG_PCALL) { | 1745 | if (loglevel & CPU_LOG_PCALL) { |
1746 | fprintf(logfile, "lcall %04x:%08x s=%d\n", | 1746 | fprintf(logfile, "lcall %04x:%08x s=%d\n", |
1747 | - new_cs, new_eip, shift); | 1747 | + new_cs, (uint32_t)new_eip, shift); |
1748 | cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP); | 1748 | cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP); |
1749 | } | 1749 | } |
1750 | #endif | 1750 | #endif |