From patchwork Fri May 13 00:13:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9087191 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1CD789F1C3 for ; Fri, 13 May 2016 00:28:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45A3A201F2 for ; Fri, 13 May 2016 00:28:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 52C85200DC for ; Fri, 13 May 2016 00:28:54 +0000 (UTC) Received: from localhost ([::1]:60424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10yL-0000AP-E3 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 20:28:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10l3-0001M5-84 for qemu-devel@nongnu.org; Thu, 12 May 2016 20:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b10kx-0002s7-8w for qemu-devel@nongnu.org; Thu, 12 May 2016 20:15:08 -0400 Received: from mail-qg0-x242.google.com ([2607:f8b0:400d:c04::242]:34257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kx-0002s2-4E for qemu-devel@nongnu.org; Thu, 12 May 2016 20:15:03 -0400 Received: by mail-qg0-x242.google.com with SMTP id e35so6833176qge.1 for ; Thu, 12 May 2016 17:15:03 -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 :mime-version:content-transfer-encoding; bh=oIgUWbiqzpoVvShHg/5SXU0pslkI+vYUmdhIdifQOhM=; b=JWpGvYDEdFOsJEeKzSd/18HrWbobfLFb9i2zFxO4KyoHv/S2XOpmJEXFk0I1XYwleC W4U1EhvT8RMrQ6USo6QNc1YCSbvLxgh7IKj4sxIY5Yv5hTR1MKnf2asBOVWTYyBQmzDS ZQQCD2OspzdgJxSNH2QtG+9uF1POngNQGwuszJbEbqDjWOVh+GZ2SNrEaSsRW4jyCSt/ L8ZdlR5yUt2K/FK9gqqQPmfD1Qz5D4F+Ic4mJN9GKtc7sktE2oGS5z3AE/5yMUmY0jFZ cZoA3nmq+uytQIFG3q4iJaUEFcm5jDJlCE2MS6nBA8lLEVhjyZ1/jBAMvNDwaZ2h64Kj 64iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oIgUWbiqzpoVvShHg/5SXU0pslkI+vYUmdhIdifQOhM=; b=aUO2LXvrUcgC0bEPoSSnxmWSQdyfVMB8osFG+iDO79KHOOVm0I0h8sHDtLKVxbyAez PN+367z9+ajoMIFl6SPeVPuML/rFeyYHYIdWYylDzmWVfSPwZW4hBDZGwGKW5w5M9eQ8 8iJmVlZFHcT/S3lCmpJyhsv2yVHL7/lobWzIpTRJQqGjjV2ZCXFohGlbSzwnh6hZsyjb kAtfdfBqF9xqQ1nY/0ljr/YCGhldAKXAWRpmmsTViB9wLM1oecY5UdtBTPF+FPet0zu2 vV0mwyBYRcQmuqVqSZ6VwwRnuzGDxoV9j6zH313gmUDYXG0mmQYYKVr6UPxP0Xxtp9oZ IPjw== X-Gm-Message-State: AOPr4FW1SWNBbze1WfzxR5o4kTng33tbrSxqCLrdun0Jdf7IRCVUcAx7xQfec8fpiiRHGQ== X-Received: by 10.140.163.85 with SMTP id j82mr13356316qhj.40.1463098502878; Thu, 12 May 2016 17:15:02 -0700 (PDT) Received: from bigtime.com ([172.56.44.137]) by smtp.gmail.com with ESMTPSA id w16sm7171321qka.35.2016.05.12.17.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 17:15:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 12 May 2016 14:13:18 -1000 Message-Id: <1463098420-29113-18-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463098420-29113-1-git-send-email-rth@twiddle.net> References: <1463098420-29113-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::242 Subject: [Qemu-devel] [PULL 17/39] tcg: Use uintptr_t type for jmp_list_{next|first} fields of TB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Sergey Fedorov , Sergey Fedorov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov These fields do not contain pure pointers to a TranslationBlock structure. So uintptr_t is the most appropriate type for them. Also put some asserts to assure that the two least significant bits of the pointer are always zero before assigning it to jmp_list_first. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 12 +++++++----- translate-all.c | 38 ++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 445d946..64c2a66 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -277,14 +277,16 @@ struct TranslationBlock { * jmp_list_first points to the first TB jumping to this one. * jmp_list_next is used to point to the next TB in a list. * Since each TB can have two jumps, it can participate in two lists. - * The two least significant bits of a pointer are used to choose which - * data field holds a pointer to the next TB: + * jmp_list_first and jmp_list_next are 4-byte aligned pointers to a + * TranslationBlock structure, but the two least significant bits of + * them are used to encode which data field of the pointed TB should + * be used to traverse the list further from that TB: * 0 => jmp_list_next[0], 1 => jmp_list_next[1], 2 => jmp_list_first. * In other words, 0/1 tells which jump is used in the pointed TB, * and 2 means that this is a pointer back to the target TB of this list. */ - struct TranslationBlock *jmp_list_next[2]; - struct TranslationBlock *jmp_list_first; + uintptr_t jmp_list_next[2]; + uintptr_t jmp_list_first; }; #include "qemu/thread.h" @@ -382,7 +384,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n, /* add in TB jmp circular list */ tb->jmp_list_next[n] = tb_next->jmp_list_first; - tb_next->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | n); + tb_next->jmp_list_first = (uintptr_t)tb | n; } } diff --git a/translate-all.c b/translate-all.c index c6613d1..2fb1646 100644 --- a/translate-all.c +++ b/translate-all.c @@ -928,17 +928,17 @@ static inline void tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb) static inline void tb_jmp_remove(TranslationBlock *tb, int n) { - TranslationBlock *tb1, **ptb; + TranslationBlock *tb1; + uintptr_t *ptb, ntb; unsigned int n1; ptb = &tb->jmp_list_next[n]; - tb1 = *ptb; - if (tb1) { + if (*ptb) { /* find tb(n) in circular list */ for (;;) { - tb1 = *ptb; - n1 = (uintptr_t)tb1 & 3; - tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); + ntb = *ptb; + n1 = ntb & 3; + tb1 = (TranslationBlock *)(ntb & ~3); if (n1 == n && tb1 == tb) { break; } @@ -951,7 +951,7 @@ static inline void tb_jmp_remove(TranslationBlock *tb, int n) /* now we can suppress tb(n) from the list */ *ptb = tb->jmp_list_next[n]; - tb->jmp_list_next[n] = NULL; + tb->jmp_list_next[n] = (uintptr_t)NULL; } } @@ -970,7 +970,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) PageDesc *p; unsigned int h, n1; tb_page_addr_t phys_pc; - TranslationBlock *tb1, *tb2; + uintptr_t tb1, tb2; /* remove the TB from the hash list */ phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); @@ -1006,19 +1006,20 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) /* suppress any remaining jumps to this TB */ tb1 = tb->jmp_list_first; for (;;) { - n1 = (uintptr_t)tb1 & 3; + TranslationBlock *tmp_tb; + n1 = tb1 & 3; if (n1 == 2) { break; } - tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); - tb2 = tb1->jmp_list_next[n1]; - tb_reset_jump(tb1, n1); - tb1->jmp_list_next[n1] = NULL; + tmp_tb = (TranslationBlock *)(tb1 & ~3); + tb2 = tmp_tb->jmp_list_next[n1]; + tb_reset_jump(tmp_tb, n1); + tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL; tb1 = tb2; } - /* fail safe */ - tb->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | 2); + assert(((uintptr_t)tb & 3) == 0); + tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ tcg_ctx.tb_ctx.tb_phys_invalidate_count++; } @@ -1492,9 +1493,10 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb->page_addr[1] = -1; } - tb->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | 2); - tb->jmp_list_next[0] = NULL; - tb->jmp_list_next[1] = NULL; + assert(((uintptr_t)tb & 3) == 0); + tb->jmp_list_first = (uintptr_t)tb | 2; + tb->jmp_list_next[0] = (uintptr_t)NULL; + tb->jmp_list_next[1] = (uintptr_t)NULL; /* init original jump addresses */ if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) {