[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 41/43] target-i386: Change LOG_PCALL_STATE() argument
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 41/43] target-i386: Change LOG_PCALL_STATE() argument to CPUState |
Date: |
Wed, 10 Jul 2013 16:34:18 +0200 |
Since log_cpu_state_mask() argument was changed to CPUState,
CPUArchState is no longer needed.
Choose CPUState rather than X86CPU to not hide type mismatches with CPU().
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/seg_helper.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index fc7ffad..e789102 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -30,11 +30,11 @@
#ifdef DEBUG_PCALL
# define LOG_PCALL(...) qemu_log_mask(CPU_LOG_PCALL, ## __VA_ARGS__)
-# define LOG_PCALL_STATE(env) \
- log_cpu_state_mask(CPU_LOG_PCALL, CPU(x86_env_get_cpu(env)), CPU_DUMP_CCOP)
+# define LOG_PCALL_STATE(cpu) \
+ log_cpu_state_mask(CPU_LOG_PCALL, (cpu), CPU_DUMP_CCOP)
#else
# define LOG_PCALL(...) do { } while (0)
-# define LOG_PCALL_STATE(env) do { } while (0)
+# define LOG_PCALL_STATE(cpu) do { } while (0)
#endif
/* return non zero if error */
@@ -1686,7 +1686,7 @@ void helper_lcall_protected(CPUX86State *env, int new_cs,
target_ulong new_eip,
next_eip = env->eip + next_eip_addend;
LOG_PCALL("lcall %04x:%08x s=%d\n", new_cs, (uint32_t)new_eip, shift);
- LOG_PCALL_STATE(env);
+ LOG_PCALL_STATE(CPU(x86_env_get_cpu(env)));
if ((new_cs & 0xfffc) == 0) {
raise_exception_err(env, EXCP0D_GPF, 0);
}
@@ -2020,7 +2020,7 @@ static inline void helper_ret_protected(CPUX86State *env,
int shift,
}
LOG_PCALL("lret new %04x:" TARGET_FMT_lx " s=%d addend=0x%x\n",
new_cs, new_eip, shift, addend);
- LOG_PCALL_STATE(env);
+ LOG_PCALL_STATE(CPU(x86_env_get_cpu(env)));
if ((new_cs & 0xfffc) == 0) {
raise_exception_err(env, EXCP0D_GPF, new_cs & 0xfffc);
}
--
1.8.1.4
- [Qemu-devel] [PULL 31/43] target-mips: Change gen_intermediate_code_internal() argument to MIPSCPU, (continued)
- [Qemu-devel] [PULL 31/43] target-mips: Change gen_intermediate_code_internal() argument to MIPSCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 28/43] target-lm32: Change gen_intermediate_code_internal() argument to LM32CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 29/43] target-m68k: Change gen_intermediate_code_internal() argument to M68kCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 19/43] target-cris: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 32/43] target-ppc: Change gen_intermediate_code_internal() argument to PowerPCCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 24/43] target-alpha: Change gen_intermediate_code_internal() argument to AlphaCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 35/43] target-sparc: Change gen_intermediate_code_internal() argument to SPARCCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 21/43] target-microblaze: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 37/43] target-xtensa: Change gen_intermediate_code_internal() arg to XtensaCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 38/43] target-i386: Change do_interrupt_all() argument to X86CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 41/43] target-i386: Change LOG_PCALL_STATE() argument to CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 34/43] target-sh4: Change gen_intermediate_code_internal() argument to SuperHCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 42/43] target-ppc: Change LOG_MMU_STATE() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 39/43] target-i386: Change do_smm_enter() argument to X86CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 33/43] target-s390x: Change gen_intermediate_code_internal() argument to S390CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 36/43] target-unicore32: Change gen_intermediate_code_internal() signature, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 43/43] cpu: Move reset logging to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 40/43] log: Change log_cpu_state[_mask]() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 09/43] cpu: Make first_cpu and next_cpu CPUState, Andreas Färber, 2013/07/10