From patchwork Thu Apr 14 20:45:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 610645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qmCQL0vXQz9t40 for ; Fri, 15 Apr 2016 06:46:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=dISE+IAO; dkim-atps=neutral Received: from localhost ([::1]:46530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqoA4-0003VW-2W for incoming@patchwork.ozlabs.org; Thu, 14 Apr 2016 16:46:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqo9N-0001wt-Qa for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqo9J-0004tb-H0 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:05 -0400 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:34720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqo9J-0004tE-1v for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:01 -0400 Received: by mail-lf0-x22d.google.com with SMTP id j11so123060425lfb.1 for ; Thu, 14 Apr 2016 13:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cFDa0fXgZsg+orHmUY8MTCCSARJLMbLqudHtlofcvh0=; b=dISE+IAO3HTZTEJXv9qUpxzcHAqb2JVQqz1jXnBboizDeuP/q3S6STgoPWLgDDYyH0 xB70TPpLn9yArTYsm/P73i+8eRv+BmI+D/JoYwmDGoSzdg4w4AptYj1oVNVe4VZqookf 3sVXTrre9AD228YKvjEIh0K1vSKm/Zy4aGvLQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cFDa0fXgZsg+orHmUY8MTCCSARJLMbLqudHtlofcvh0=; b=fZAaBhLqN1JPcDRYNQx+abh4w31fdL7UzmzBOZsmU7KYvLgFC0kWCMu8jhi7g6Qfsu COrlhp52ZtIDD3Ekj6ivJTiDfwlp/i2yqoNc1H635zw5NQbKe2EJNeEksVx8ZhaTP4Hp pwJIef8zlXwe89dFUjtC0GUEIvrh2coYFYDsU9BH6ZGpDXp5KhOmYNhN0VUI/qFnXfvN 9eJxKfvd/ltetG/B4D0WfHtvD0/Q8Hvm+2GYFoBlzqyLa0rh+AdMib5ZDuPibyKoQlB5 MxKZqaB8S96RZtOiKxPodAMG5C+0zAF96sJGS/nO7xAujasw6D2b45JSOnh3wl7Xpj7+ 0p6w== X-Gm-Message-State: AOPr4FWOoIuu5FkwpxR1x9sIiSmPk7MlzBw8XwxLsyoRKJAYjSPn8xgqX9j0tzusE46Seu6f X-Received: by 10.25.169.73 with SMTP id s70mr6499363lfe.141.1460666760314; Thu, 14 Apr 2016 13:46:00 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-121-115.2com.net. [46.188.121.115]) by smtp.gmail.com with ESMTPSA id k137sm7210474lfg.16.2016.04.14.13.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Apr 2016 13:45:59 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 14 Apr 2016 23:45:47 +0300 Message-Id: <1460666749-24452-3-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460666749-24452-1-git-send-email-sergey.fedorov@linaro.org> References: <1460666749-24452-1-git-send-email-sergey.fedorov@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22d Subject: [Qemu-devel] [PATCH v3 2/4] tcg: reorganize tb_find_physical loop 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: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Put some comments and improve code structure. This should help reading the code. Signed-off-by: Alex Bennée [Sergey Fedorov: provide commit message; bring back resetting of tb_invalidated_flag] Signed-off-by: Sergey Fedorov Reviewed-by: Richard Henderson --- cpu-exec.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index bbfcbfb54385..4cba4efc92b2 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -223,10 +223,9 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, uint64_t flags) { CPUArchState *env = (CPUArchState *)cpu->env_ptr; - TranslationBlock *tb, **ptb1; + TranslationBlock *tb, **tb_hash_head, **ptb1; unsigned int h; tb_page_addr_t phys_pc, phys_page1; - target_ulong virt_page2; tcg_ctx.tb_ctx.tb_invalidated_flag = 0; @@ -234,37 +233,42 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, phys_pc = get_page_addr_code(env, pc); phys_page1 = phys_pc & TARGET_PAGE_MASK; h = tb_phys_hash_func(phys_pc); - ptb1 = &tcg_ctx.tb_ctx.tb_phys_hash[h]; - for(;;) { - tb = *ptb1; - if (!tb) { - return NULL; - } + + /* Start at head of the hash entry */ + ptb1 = tb_hash_head = &tcg_ctx.tb_ctx.tb_phys_hash[h]; + tb = *ptb1; + + while (tb) { if (tb->pc == pc && tb->page_addr[0] == phys_page1 && tb->cs_base == cs_base && tb->flags == flags) { - /* check next page if needed */ - if (tb->page_addr[1] != -1) { - tb_page_addr_t phys_page2; - virt_page2 = (pc & TARGET_PAGE_MASK) + - TARGET_PAGE_SIZE; - phys_page2 = get_page_addr_code(env, virt_page2); + if (tb->page_addr[1] == -1) { + /* done, we have a match */ + break; + } else { + /* check next page if needed */ + target_ulong virt_page2 = (pc & TARGET_PAGE_MASK) + + TARGET_PAGE_SIZE; + tb_page_addr_t phys_page2 = get_page_addr_code(env, virt_page2); + if (tb->page_addr[1] == phys_page2) { break; } - } else { - break; } } + ptb1 = &tb->phys_hash_next; + tb = *ptb1; } - /* Move the TB to the head of the list */ - *ptb1 = tb->phys_hash_next; - tb->phys_hash_next = tcg_ctx.tb_ctx.tb_phys_hash[h]; - tcg_ctx.tb_ctx.tb_phys_hash[h] = tb; + if (tb) { + /* Move the TB to the head of the list */ + *ptb1 = tb->phys_hash_next; + tb->phys_hash_next = *tb_hash_head; + *tb_hash_head = tb; + } return tb; }