From patchwork Wed Oct 26 16:59:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 121948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A0E271007D2 for ; Thu, 27 Oct 2011 04:00:36 +1100 (EST) Received: from localhost ([::1]:54682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ6q3-00030O-5S for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2011 13:00:27 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=/wUFcRqjbuTDsr9jgwcfT5GR7cVlkJbGduXdgprc5UM=; b=ARZ2Bsgywjxv5gxYDYnIAqZpayz//xX68H4AJWGszkpv4gKBDg6jZT/bVaYdx++yqb jDiIJmHkctal5wPt/kgh2LkwG2AbdKDRwrbbuw4qXR8AsQhuGyn9a2bXUOTDOwKMck3C NESHRg2pCff8zDBAHkar4PhN+JYnHiFYKsuRg= Received: by 10.227.60.3 with SMTP id n3mr11178523wbh.25.1319648406436; Wed, 26 Oct 2011 10:00:06 -0700 (PDT) Received: from localhost.localdomain (c-98-203-235-125.hsd1.wa.comcast.net. [98.203.235.125]) by mx.google.com with ESMTPS id fi11sm4242888wbb.9.2011.10.26.10.00.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Oct 2011 10:00:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2011 09:59:18 -0700 Message-Id: <1319648358-18812-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1319648358-18812-1-git-send-email-rth@twiddle.net> References: <1319648358-18812-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: riku.voipio@iki.fi, agraf@suse.de Subject: [Qemu-devel] [PATCH 2/2] ppc64-linux-user: Fix syscall return type. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use target_ulong instead of hard-coded uint32_t. Remove the disabled printf's that are redundant with -strace. Signed-off-by: Richard Henderson Acked-by: Alexander Graf --- 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)) {