From patchwork Tue Mar 29 19:48:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Fedorov X-Patchwork-Id: 64622 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2213798lbc; Tue, 29 Mar 2016 12:51:27 -0700 (PDT) X-Received: by 10.140.240.3 with SMTP id l3mr5557593qhc.93.1459281087186; Tue, 29 Mar 2016 12:51:27 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v8si328263qka.28.2016.03.29.12.51.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 29 Mar 2016 12:51:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akzfi-0007G1-N8 for patch@linaro.org; Tue, 29 Mar 2016 15:51:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akzcx-0002tt-3P for qemu-devel@nongnu.org; Tue, 29 Mar 2016 15:48:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akzcr-00089s-12 for qemu-devel@nongnu.org; Tue, 29 Mar 2016 15:48:35 -0400 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:36356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akzcq-00089f-LY for qemu-devel@nongnu.org; Tue, 29 Mar 2016 15:48:28 -0400 Received: by mail-lb0-x22e.google.com with SMTP id qe11so17890412lbc.3 for ; Tue, 29 Mar 2016 12:48:28 -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=UkNrzkr5uCbZQfqs0jxoVBpJtFa7WQ7UDBSHXHFvorM=; b=AlNiR9Mv3lSKQrlEIIYf16NdxQxfX4nHAdB+XD75ZY+6GfTJiORmYOU6D83S66U7L1 UClybiSxVeEA8NR6ETxr98Sxio8JMf9f9Q7ZdUHnmycVt3AmWHSsk06np1LI9cVkFzIf mhHN8702jtzIjPSH8SPwFum851t4W9jexiDrA= 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=UkNrzkr5uCbZQfqs0jxoVBpJtFa7WQ7UDBSHXHFvorM=; b=BjoHNaaV9dyY5me9YS6KJ4QHK5XJBYIMb0KMMNGJGNcfTBKgwftnV5dQFI0Xbk15Eq m49kNAu3vxU8ww5Du15X7grbt3aDoarbxxPh3tOxW7jvpZ8fMUtfd+OpIM7+iV/rRH6L 2yT2q54YY22t/LlvUXCfKN4IMjWJCloE8UDW+q4DSnJu//PwEfjBrthoaNgHxvLRF9FE 2G9bZQQ2jBTfqrmZR8Pf3y1SN8zhD15RQvDshZ1QLBE0OGgl3+VCnLgPynkva9knpFiv JJrIYwm93uXCpuTzzfIiJoazAQ7wNESAYdAFtVfhgNJ6od0k9loVBkEMWQEAvK4lyouX 73XQ== X-Gm-Message-State: AD7BkJIAlH2PhKo1BmyidKl19pWRqmne5ihvd1eXW1BP4HTj2d1B3aclZMCioTZEyBfxnVTI X-Received: by 10.112.161.225 with SMTP id xv1mr1969533lbb.127.1459280907890; Tue, 29 Mar 2016 12:48:27 -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 e141sm49001lfe.18.2016.03.29.12.48.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Mar 2016 12:48:26 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2016 22:48:11 +0300 Message-Id: <1459280892-8789-3-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1459280892-8789-1-git-send-email-sergey.fedorov@linaro.org> References: <1459280892-8789-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:c04::22e Cc: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH v2 2/3] tcg: reorganize tb_find_physical loop 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 --- cpu-exec.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) -- 2.7.3 diff --git a/cpu-exec.c b/cpu-exec.c index fd92452f16f6..44116f180859 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -214,10 +214,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; @@ -225,37 +224,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; }