From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ6pm-0002c0-3v for qemu-devel@nongnu.org; Wed, 26 Oct 2011 13:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJ6pj-0007p2-9e for qemu-devel@nongnu.org; Wed, 26 Oct 2011 13:00:09 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:51344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ6pi-0007lq-Vq for qemu-devel@nongnu.org; Wed, 26 Oct 2011 13:00:07 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so2090182wyh.4 for ; Wed, 26 Oct 2011 10:00:06 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 26 Oct 2011 09:59:18 -0700 Message-Id: <1319648358-18812-3-git-send-email-rth@twiddle.net> In-Reply-To: <1319648358-18812-1-git-send-email-rth@twiddle.net> References: <1319648358-18812-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 2/2] ppc64-linux-user: Fix syscall return type. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, agraf@suse.de Use target_ulong instead of hard-coded uint32_t. Remove the disabled printf's that are redundant with -strace. Signed-off-by: Richard Henderson --- linux-user/main.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index e7dad54..dd55648 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1332,7 +1332,7 @@ void cpu_loop(CPUPPCState *env) { target_siginfo_t info; int trapnr; - uint32_t ret; + target_ulong ret; for(;;) { cpu_exec_start(env); @@ -1695,27 +1695,20 @@ void cpu_loop(CPUPPCState *env) * PPC ABI uses overflow flag in cr0 to signal an error * in syscalls. */ -#if 0 - printf("syscall %d 0x%08x 0x%08x 0x%08x 0x%08x\n", env->gpr[0], - env->gpr[3], env->gpr[4], env->gpr[5], env->gpr[6]); -#endif env->crf[0] &= ~0x1; ret = do_syscall(env, env->gpr[0], env->gpr[3], env->gpr[4], env->gpr[5], env->gpr[6], env->gpr[7], env->gpr[8], 0, 0); - if (ret == (uint32_t)(-TARGET_QEMU_ESIGRETURN)) { + if (ret == (target_ulong)(-TARGET_QEMU_ESIGRETURN)) { /* Returning from a successful sigreturn syscall. Avoid corrupting register state. */ break; } - if (ret > (uint32_t)(-515)) { + if (ret > (target_ulong)(-515)) { env->crf[0] |= 0x1; ret = -ret; } env->gpr[3] = ret; -#if 0 - printf("syscall returned 0x%08x (%d)\n", ret, ret); -#endif break; case POWERPC_EXCP_STCX: if (do_store_exclusive(env)) { -- 1.7.6.4