From patchwork Thu May 1 15:44:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 344565 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B5E7B14011A for ; Fri, 2 May 2014 01:46:19 +1000 (EST) Received: from localhost ([::1]:40306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WftBh-0005hL-LC for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 11:46:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WftAu-0004Ya-TS for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WftAo-0006mG-PP for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:28 -0400 Received: from mail-qc0-x22d.google.com ([2607:f8b0:400d:c01::22d]:34551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WftAo-0006m9-LK for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:22 -0400 Received: by mail-qc0-f173.google.com with SMTP id r5so3441597qcx.4 for ; Thu, 01 May 2014 08:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=q8TVavEo9zQUETv+97y8CwlZca+imsJfFI4YxQIGi6s=; b=fjXkRwQI9LbBkXSNHC1d1pn7tntsCiMCSUmp331tOI8HoTv4IJu8MIeRHrk6oqyapj rrveIAp4d+pV+vp+1sw8wwzUr7MqcyJ9DICGhwJYetlQP4HBC2n7dLAgBuOLsnnTy4yF xB732mPgPfEIOg1E+iyD4mMR6LljpB+rFRAfj3CVsD0Mc3MdBxWCb7vFMaRPl1o/4Ud2 iuS/7xB1WeNOg1otrnNwoCeyrzLU9eWy6m1AyYIDFJRq6YdyIdTwAK2gS9o5Rtjn1nD0 GcAxQJmm8WDYBA/WVDSjhZSiQrY5biBD3fdIu+qmgB0I+2HpyYeYcJltM60LF35GKRKn 3Knw== X-Received: by 10.224.30.131 with SMTP id u3mr15053792qac.50.1398959122205; Thu, 01 May 2014 08:45:22 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id i5sm53034811qab.0.2014.05.01.08.45.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 May 2014 08:45:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 1 May 2014 08:44:22 -0700 Message-Id: <1398959087-23590-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398959087-23590-1-git-send-email-rth@twiddle.net> References: <1398959087-23590-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22d Cc: av1474@comtv.ru Subject: [Qemu-devel] [PATCH 01/26] tcg-ppc: Use uintptr_t in ppc_tb_set_jmp_target 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 Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 2 +- tcg/ppc/tcg-target.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 0766e24..612b447 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -223,7 +223,7 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) /* no need to flush icache explicitly */ } #elif defined(_ARCH_PPC) -void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr); +void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr); #define tb_set_jmp_target1 ppc_tb_set_jmp_target #elif defined(__i386__) || defined(__x86_64__) static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 436b65b..d64eaa5 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -1318,7 +1318,7 @@ static void tcg_out_brcond2 (TCGContext *s, const TCGArg *args, tcg_out_bc (s, (BC | BI (7, CR_EQ) | BO_COND_TRUE), args[5]); } -void ppc_tb_set_jmp_target (unsigned long jmp_addr, unsigned long addr) +void ppc_tb_set_jmp_target (uintptr_t jmp_addr, uintptr_t addr) { uint32_t *ptr; long disp = addr - jmp_addr;