From patchwork Mon Dec 3 22:08:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 203468 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 706A02C00A8 for ; Tue, 4 Dec 2012 09:33:15 +1100 (EST) Received: from localhost ([::1]:38349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeZc-00023T-E3 for incoming@patchwork.ozlabs.org; Mon, 03 Dec 2012 17:33:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIy-00088u-Ez for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:16:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfeIx-0003B1-Jx for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:16:00 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:43922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIv-0002tM-FN; Mon, 03 Dec 2012 17:15:57 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so4875430iej.4 for ; Mon, 03 Dec 2012 14:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Neh+kGmqI8vDGzR4M02flxkdP0T1bafJCUHhs2OLA/A=; b=mMbVpt7+vo9Qp6pm0X1ErkCPrNqpuOcqSSmLl19Mz88hpGyZmgvzVfXT1dC3I0dH6Z xQjRh9BXpeuZnUvjxcet5c5+P68JvVcFYOLdNDU9peJa3M5Bdg05ajLjDTmaf+vxTygL GRUMt+QXAsfnfJ8vFQZ5qeEN12oyW2BgHdQ2uB7m8cWBlVJwFbsx22Z8uJOxEXcxfZUO W0r4x2ruNXcGaxoX+MhZ2w+r9yadLdQyVXHifZoX+2hA7cmoB740v6anN9aKdpfF2Aok +Rg8km6Rxts671WZ2XLH4TBjOKIHEuOeEZ251WySn7+Ynk79qBLqg9s3K0PUV26CuVNc UCHQ== Received: by 10.50.34.200 with SMTP id b8mr554119igj.52.1354572957256; Mon, 03 Dec 2012 14:15:57 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id u4sm8863523igw.6.2012.12.03.14.15.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:15:56 -0800 (PST) From: Michael Roth To: qemu-stable@nongnu.org Date: Mon, 3 Dec 2012 16:08:51 -0600 Message-Id: <1354572547-21271-28-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 27/43] tci: Fix type of tci_read_label 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 From: Richard Henderson Fixes the pointer truncation that was occurring for branches. Cc: Stefan Weil Cc: Blue Swirl Signed-off-by: Richard Henderson Reviewed-by: Stefan Weil Tested-by: Stefan Weil Signed-off-by: Blue Swirl (cherry picked from commit c6c5063c7a5bb1d3fe6b9931a1ec15294e39b8b1) Signed-off-by: Michael Roth --- tci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tci.c b/tci.c index a4f7b78..bb456d2 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; }