From patchwork Fri May 20 20:13:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 96663 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 247F0B71D7 for ; Sat, 21 May 2011 06:13:42 +1000 (EST) Received: from localhost ([::1]:45223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNW4p-0004vp-0s for incoming@patchwork.ozlabs.org; Fri, 20 May 2011 16:13:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNW4h-0004vZ-EC for qemu-devel@nongnu.org; Fri, 20 May 2011 16:13:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNW4g-00084c-GO for qemu-devel@nongnu.org; Fri, 20 May 2011 16:13:31 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:57584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNW4g-00084Q-8x for qemu-devel@nongnu.org; Fri, 20 May 2011 16:13:30 -0400 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id 6FAD91A02BEDD; Fri, 20 May 2011 22:13:28 +0200 (CEST) Received: from [87.173.100.166] (helo=af.local) by smtp07.web.de with asmtp (WEB.DE 4.110 #2) id 1QNW4e-0004Hu-00; Fri, 20 May 2011 22:13:28 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 20 May 2011 22:13:24 +0200 Message-Id: <1305922404-44379-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <77BCB74E-BE17-44EF-AA56-DBCDDAFBF0F1@web.de> References: <77BCB74E-BE17-44EF-AA56-DBCDDAFBF0F1@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/qRuIJ4iG5FTqHCxJvRDpyBN+bv0bA2dD0jGOc 8548jth8aST0P2hgxaqHwavc1mf+N2bwPznsZUAHrq57wYy9gD 63I7wyXo0ZBYjDANB3vg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH] target-ppc: Don't use ulong 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 ulong is undefined on Darwin. Use uintptr_t instead. Cc: Alexander Graf Signed-off-by: Andreas Färber --- target-ppc/cpu.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 7a6a7df..8e4582f 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1929,8 +1929,8 @@ static inline void cpu_set_tls(CPUState *env, target_ulong newtls) #if !defined(CONFIG_USER_ONLY) static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe) { - ulong tlbel = (ulong)tlbe; - ulong tlbl = (ulong)env->tlb; + uintptr_t tlbel = (uintptr_t)tlbe; + uintptr_t tlbl = (uintptr_t)env->tlb; return (tlbel - tlbl) / sizeof(env->tlb[0]); }