From: Richard Henderson <rth@twiddle.net>
Date: Mon, 19 Nov 2012 20:43:14 +0000 (-0800)
Subject: tci: Fix type of tci_read_label
X-Git-Tag: v1.2.2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38c6d17e75f83363ef92582dd366a4b1d936dc2f;p=thirdparty%2Fqemu.git

tci: Fix type of tci_read_label

Fixes the pointer truncation that was occurring for branches.

Cc: Stefan Weil <sw@weilnetz.de>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Tested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
(cherry picked from commit c6c5063c7a5bb1d3fe6b9931a1ec15294e39b8b1)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/tci.c b/tci.c
index a4f7b784188..bb456d2fc6f 100644
--- a/tci.c
+++ b/tci.c
@@ -338,9 +338,9 @@ static uint64_t tci_read_ri64(uint8_t **tb_ptr)
 }
 #endif
 
-static target_ulong tci_read_label(uint8_t **tb_ptr)
+static tcg_target_ulong tci_read_label(uint8_t **tb_ptr)
 {
-    target_ulong label = tci_read_i(tb_ptr);
+    tcg_target_ulong label = tci_read_i(tb_ptr);
     assert(label != 0);
     return label;
 }