From patchwork Thu Apr 21 14:57:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Fedorov X-Patchwork-Id: 66397 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp212233qge; Thu, 21 Apr 2016 08:22:49 -0700 (PDT) X-Received: by 10.55.9.139 with SMTP id 133mr21437140qkj.74.1461252169575; Thu, 21 Apr 2016 08:22:49 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 68si867761qgi.22.2016.04.21.08.22.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Apr 2016 08:22:49 -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]:42909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atGRN-0006an-5m for patch@linaro.org; Thu, 21 Apr 2016 11:22:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atG2z-0005vu-CU for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atG2y-0005Dh-8n for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:37 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:35877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atG2x-0005DS-MU for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:36 -0400 Received: by mail-lf0-x22e.google.com with SMTP id g184so62308638lfb.3 for ; Thu, 21 Apr 2016 07:57:35 -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=SQEaKCfyXGmd9ODd5gJ6xb1IQXwMnykWQRiZnCUbA5CLtgRwbiiTsFzSV+9OjyQVeC XN9JJNCGYDHHZkUDCON9qpdAInzoHC15M0bdA+L6/w4030ObThT32y2BqS9LGJY8mCtn 85IjphDwr2qMp2yv0/Mhv9tYKLGe2IxDm4tr4= 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=Cym63jYbr5sVIPUw1KikIrXbUHth01RSOL2EC+0psp/yXd1tf8F6B2vQMq1szTFw1d tQP3R0PAHHHKOEXKPlezJxTcOD9ZQBBTyfq4tgJtUthXMAqC+WFKH0KL/ZZt0grLreea 6PCBnE2eBDs4yB+4nv401U7izoK5pv1U15GOVWXQJcNao0u1qNgYALjneVFIn0ubC6hY cD6iscrNcoSs+fuZcrXld0yBSqYOrXcYUDmqGA4sgDjtULBHfaFLYN/iAJzWnUGTKmK5 KBeBfLW467fag2FcF7TzmiMQ1sMHCyO9aHdsEC5R+nxX01fKYsj3UqfekrTwC5WbygUD rpfA== X-Gm-Message-State: AOPr4FVSNEjKqvOv4uREdeIc7SQaZyV5olSaqkXTR5PyW8xIMs1Q4CT3p+pQ251emOkslwql X-Received: by 10.25.212.82 with SMTP id l79mr5833029lfg.72.1461250654279; Thu, 21 Apr 2016 07:57:34 -0700 (PDT) Received: from localhost.localdomain ([195.91.132.170]) by smtp.gmail.com with ESMTPSA id i1sm631327lbs.22.2016.04.21.07.57.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Apr 2016 07:57:33 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 21 Apr 2016 17:57:19 +0300 Message-Id: <1461250642-27729-3-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461250642-27729-1-git-send-email-sergey.fedorov@linaro.org> References: <1461250642-27729-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::22e Subject: [Qemu-devel] [PATCH v4 2/5] 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 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; }