From patchwork Mon Mar 19 21:12:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 147625 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D78B6B7011 for ; Tue, 20 Mar 2012 08:12:46 +1100 (EST) Received: from localhost ([::1]:55055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9jsi-00046n-MT for incoming@patchwork.ozlabs.org; Mon, 19 Mar 2012 17:12:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9jsc-00046N-1v for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:12:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9jsY-0006AV-LQ for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:12:37 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:37866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9jsY-0006A8-EV for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:12:34 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 650F1728009F; Mon, 19 Mar 2012 22:12:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8DG2GNopCQc5; Mon, 19 Mar 2012 22:12:32 +0100 (CET) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id ADE3C72800A1; Mon, 19 Mar 2012 22:12:32 +0100 (CET) From: Stefan Weil To: qemu-devel@nongnu.org, Blue Swirl Date: Mon, 19 Mar 2012 22:12:29 +0100 Message-Id: <1332191549-1311-2-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1332191549-1311-1-git-send-email-sw@weilnetz.de> References: <1332191549-1311-1-git-send-email-sw@weilnetz.de> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.47.199.172 Cc: Stefan Weil Subject: [Qemu-devel] [PATCH 2/2] ppc: Use uintptr_t for arguments of 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 The previous commit changed function tb_set_jmp_target1 and is needed for w64 hosts. This patch is not needed for w64, but it synchronizes tb_set_jmp_target1 and ppc_tb_set_jmp_target so that both functions have the same signature. Cc: malc Signed-off-by: Stefan Weil --- exec-all.h | 2 +- tcg/ppc/tcg-target.c | 2 +- tcg/ppc64/tcg-target.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exec-all.h b/exec-all.h index a6d6519..9ffd778 100644 --- a/exec-all.h +++ b/exec-all.h @@ -199,7 +199,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 b0aa914..57000e5 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -1305,7 +1305,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; diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 409a1ac..c286322 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -1233,7 +1233,7 @@ static void tcg_out_brcond (TCGContext *s, TCGCond cond, tcg_out_bc (s, tcg_to_bc[cond], label_index); } -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) { TCGContext s; unsigned long patch_size;