From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTo-0000N4-A6 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:35:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwvTc-0003fs-13 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32826 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTb-0003fQ-AJ for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:39 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BA80DA535C for ; Wed, 10 Jul 2013 16:34:38 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 10 Jul 2013 16:34:18 +0200 Message-Id: <1373466860-32732-42-git-send-email-afaerber@suse.de> In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> References: <1373466860-32732-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 41/43] target-i386: Change LOG_PCALL_STATE() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= 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=C3=A4rber --- 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 @@ =20 #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_DUM= P_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 =20 /* return non zero if error */ @@ -1686,7 +1686,7 @@ void helper_lcall_protected(CPUX86State *env, int n= ew_cs, target_ulong new_eip, =20 next_eip =3D env->eip + next_eip_addend; LOG_PCALL("lcall %04x:%08x s=3D%d\n", new_cs, (uint32_t)new_eip, shi= ft); - LOG_PCALL_STATE(env); + LOG_PCALL_STATE(CPU(x86_env_get_cpu(env))); if ((new_cs & 0xfffc) =3D=3D 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=3D%d addend=3D0x%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) =3D=3D 0) { raise_exception_err(env, EXCP0D_GPF, new_cs & 0xfffc); } --=20 1.8.1.4