From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0d-0002kP-1k for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGX0Y-0005lh-8c for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:46 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:36742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0Y-0005lW-09 for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:42 -0400 Received: by mail-pa0-f47.google.com with SMTP id kl13so5329462pab.6 for ; Mon, 02 Sep 2013 09:29:41 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 2 Sep 2013 09:29:00 -0700 Message-Id: <1378139354-28602-16-git-send-email-rth@twiddle.net> In-Reply-To: <1378139354-28602-1-git-send-email-rth@twiddle.net> References: <1378139354-28602-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 15/29] tcg: Use uintptr_t in TCGHelperInfo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net, anthony@codemonkey.ws Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/tcg.c | 6 +++--- tcg/tcg.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 75df845..714b0c7 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -634,7 +634,7 @@ void tcg_register_helper(void *func, const char *name) s->helpers = realloc(s->helpers, n * sizeof(TCGHelperInfo)); s->allocated_helpers = n; } - s->helpers[s->nb_helpers].func = (tcg_target_ulong)func; + s->helpers[s->nb_helpers].func = (uintptr_t)func; s->helpers[s->nb_helpers].name = name; s->nb_helpers++; } @@ -864,11 +864,11 @@ static int helper_cmp(const void *p1, const void *p2) } /* find helper definition (Note: A hash table would be better) */ -static TCGHelperInfo *tcg_find_helper(TCGContext *s, tcg_target_ulong val) +static TCGHelperInfo *tcg_find_helper(TCGContext *s, uintptr_t val) { int m, m_min, m_max; TCGHelperInfo *th; - tcg_target_ulong v; + uintptr_t v; if (unlikely(!s->helpers_sorted)) { qsort(s->helpers, s->nb_helpers, sizeof(TCGHelperInfo), diff --git a/tcg/tcg.h b/tcg/tcg.h index 715812a..d27df66 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -402,7 +402,7 @@ typedef struct TCGTemp { } TCGTemp; typedef struct TCGHelperInfo { - tcg_target_ulong func; + uintptr_t func; const char *name; } TCGHelperInfo; -- 1.8.1.4