From patchwork Thu Apr 28 22:10:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Fedorov X-Patchwork-Id: 66933 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp460638qge; Thu, 28 Apr 2016 15:12:06 -0700 (PDT) X-Received: by 10.141.47.66 with SMTP id y63mr17178448qhe.74.1461881526693; Thu, 28 Apr 2016 15:12:06 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 193si3849175qhs.97.2016.04.28.15.12.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Apr 2016 15:12:06 -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]:51337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avuAI-0007b0-8y for patch@linaro.org; Thu, 28 Apr 2016 18:12:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avu9R-0006Ss-HY for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avu9Q-0006ZN-IK for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:13 -0400 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]:34914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avu9Q-0006ZC-5v for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:12 -0400 Received: by mail-lf0-x230.google.com with SMTP id c126so112914878lfb.2 for ; Thu, 28 Apr 2016 15:11:12 -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=DS0qxzR5RhWsjS6UhTKeP+Wv2FIqCv+bJ7C+CsDrKDw=; b=dcUviid2TwtNvmpoUQd3gDgnqTEGCKOPgB7o3NvgcCANUxnkTLO0g0vziqB3PPl4qY uBjzAhkfoyTkTvaVAtWrGYp7AiYypZlhFwdAVS3SphSyTBQreaiJ706F9kBwCfr5Jx0w /Ibo79oJBK1VEn1Rftz8l27yhyeMp1xTLmS40= 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=DS0qxzR5RhWsjS6UhTKeP+Wv2FIqCv+bJ7C+CsDrKDw=; b=CFVX7yZ7snMBDTRQYwdz6osvN6RZy6dVbZAi9Qf8orG3WGo6pBLYbq5e51Hw+d4+0x wMFoWQHd4CuOUksOE8tddgqPl4rMWoS2S9JFFnhSWamFXjaTW7gunt+XPeWzSLrFTzZz Jy9m8u9+Eh5AE6M0eTDHV2SV2/xn2C2ZytOo1VYerHzn294GCsEvxyT9Ku09qkjaOUw6 Q+HIOxrLSuCnDNzoMAHgy5l1aK9UBayDM3cOeTFeMfTuS3lgf8ECd4F1mJvH9d8+wBXF CzqxHBLhfu+2KycpoAQZ2Yv9WDO4ql6VKdC0PEtTMqu8MRC7O73EVLMIJztWw+uwYniY Exew== X-Gm-Message-State: AOPr4FVnGmmGhPMZ8MrLnueBvxzF0eoYjT/bq7XA1jwL465DjRkUge/fbQD8Qb4PO5F/mxZX X-Received: by 10.25.22.203 with SMTP id 72mr7300673lfw.84.1461881471324; Thu, 28 Apr 2016 15:11:11 -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 xg1sm1925567lbb.10.2016.04.28.15.11.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 15:11:10 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Fri, 29 Apr 2016 01:10:55 +0300 Message-Id: <1461881459-14297-3-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461881459-14297-1-git-send-email-sergey.fedorov@linaro.org> References: <1461881459-14297-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::230 Subject: [Qemu-devel] [PATCH v6 2/6] 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+patch=linaro.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(-) -- 2.8.1 diff --git a/cpu-exec.c b/cpu-exec.c index f984dc71cbf1..02a49070b9dd 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -223,10 +223,9 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, uint32_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; }