From patchwork Thu May 9 22:26:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163771 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1574709ilr; Thu, 9 May 2019 15:36:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvSJ6lN4yAV2YQCy24nm7nsH/R+8L3aB0wg3uIiwJMrcJWPTI4JoCmmfe6dj/FOsDHhLii X-Received: by 2002:a05:6000:1203:: with SMTP id e3mr5058691wrx.300.1557441396671; Thu, 09 May 2019 15:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557441396; cv=none; d=google.com; s=arc-20160816; b=itIuUR1zK9jtOdSr6MA4Hi/RrKU9m03AotLdP1qfZ7iteCm9qSQuiQvg4fB3lz4g+B iaoxEO4MPJhRq+SCSi6Kc/wMBVZv3xv9HQMqOYFaXNCe0/SfqCgBZqB7QoT3bHfu6ckx Yhh1BafBTQ29vFoAPMFi9CPOk62m6M/2q0WCucbq2ycgoAofke355+mjCbLROw93IhvR bCr6XUCCWZFPCGLJw/eDxCmReg1/yJEXEg+BfexCeCylXCHtbDHD/mo4Fd5AnVTp68t7 sJb/Es8SznCFp/0HlQVQlx/34CQnYAIlVM/j5G/z5gQvLaYHIl412jazmvyrl88gU6iX dTPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ZTH91pjxahUuQtOu1GsBhTY4d5CvJ+Jx8ktGJV35Xwc=; b=A+lGAFSdmANZYxp7UFjnax3kaipLY7AbewgbVyAF7MI5kWxLX52XNBKMsbxpjK/0v9 1yOcePeidbdjhTel4ovA3KEwjRLnT5/oEgaqX3KisGjblzzfUSlEYEdQ4LnidAKdXYK3 RUr+MeuEU8mV2Hl07yNB/t/FJuH22GLs/kEzkyTL8ZYCIclXUMZGw5D3Aad0D3u4v+o3 Hvm96JDIzoXzjSSO4N8jHUloMhLvwki9Y5tswsTnwiUOkqvFVpX8BJRKV85lV6sF4tjO /yXvTnMeU9wpBiJdGarFBJb3/2w2w9LOjD7+nyKNftEr3fYnYnvaKNQJGlD0tuLDnhZS 6rgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jly0vXlb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a4si2765906wrs.4.2019.05.09.15.36.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 15:36:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jly0vXlb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:33577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOreV-0008Lu-Kw for patch@linaro.org; Thu, 09 May 2019 18:36:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrV4-0007gz-12 for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOrV3-0005Tn-1W for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:50 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:44541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOrV2-0005Tc-SF for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:48 -0400 Received: by mail-pg1-x542.google.com with SMTP id z16so1911988pgv.11 for ; Thu, 09 May 2019 15:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZTH91pjxahUuQtOu1GsBhTY4d5CvJ+Jx8ktGJV35Xwc=; b=jly0vXlbBuquNpT6dXPh+FN3uq0/7K1FJmQH0+R8quBHx1OTzckS1blXc4YX/vcxPF fF0TUDOiBZcNFZaG6LMQVAVDghzFMnUSv9nsiGm0JdOGuNp2llFzl3WkhST2DgEoohaF s8umaHYI0UPob0NwUkyKe+CM0cOwKGg82UZ/AA8zkNr2oJ+lCd0CdhN9ObN8FopS0oR8 SmRAVh1uXHGWEPD2PAL7k1t5PSJXJbml/SZFvBAYYIjUcEHWtNj8P6c+dcwaHxdJqORD 5WZ/t8BtrggpdSO00JlAr9ZKOk7EN/SpwoaiYV7HzWHK5UwuUvDbbp8a7l4fxlZ+q3UJ OkEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZTH91pjxahUuQtOu1GsBhTY4d5CvJ+Jx8ktGJV35Xwc=; b=WHBvc6odtoPlRAIwa5nNzrT4/XI7yvNgG24Ip4DaiF40bK9Ji9ut5DDnCMkV3fjP/Z uQDPimKlJiTO+Z+ZgCSRFBs+Eni662pIwQfk9F0on9VKPgSuy2bM7HvwdX3XsTFchyo8 nD/Qj/q8fBlReqjzle5otLe3FmcVRMpEDeg10mQYVWvQu4CslQmZBm5opMfbdxpS8oFJ 8X3gN8ZMQpG6OXpZctGjvLMVF0UbUOELXff1J2V9ftCCa00miq6EPQQx5a7X68rDrEfK tw/mtGCFbf+DtrUICOkrKb2xRM6PMmx+P9q3OrRV3bgYnQkO5jiCPB+jKJIMl2YJM8ls ZoGw== X-Gm-Message-State: APjAAAVB7y/ippPwaUpqiXq4TWgBCh9Db4002fou9XYGOHBWVL+SF8LB j4IPP76jrZrFCFSTL/0IOQmMpRprkMw= X-Received: by 2002:a62:3381:: with SMTP id z123mr9242587pfz.42.1557440807632; Thu, 09 May 2019 15:26:47 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id m2sm4490521pfi.24.2019.05.09.15.26.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 15:26:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:26:15 -0700 Message-Id: <20190509222631.14271-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190509222631.14271-1-richard.henderson@linaro.org> References: <20190509222631.14271-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v3 11/27] target/mips: Tidy control flow in mips_cpu_handle_mmu_fault 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since the only non-negative TLBRET_* value is TLBRET_MATCH, the subsequent test for ret < 0 is useless. Use early return to allow subsequent blocks to be unindented. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/helper.c | 54 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 30 deletions(-) -- 2.17.1 diff --git a/target/mips/helper.c b/target/mips/helper.c index cc7be7703a..86e622efb8 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -915,41 +915,35 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, tlb_set_page(cs, address & TARGET_PAGE_MASK, physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, mmu_idx, TARGET_PAGE_SIZE); - ret = 0; - } else if (ret < 0) -#endif - { -#if !defined(CONFIG_USER_ONLY) + return 0; + } #if !defined(TARGET_MIPS64) - if ((ret == TLBRET_NOMATCH) && (env->tlb->nb_tlb > 1)) { - /* - * Memory reads during hardware page table walking are performed - * as if they were kernel-mode load instructions. - */ - int mode = (env->hflags & MIPS_HFLAG_KSU); - bool ret_walker; - env->hflags &= ~MIPS_HFLAG_KSU; - ret_walker = page_table_walk_refill(env, address, rw, mmu_idx); - env->hflags |= mode; - if (ret_walker) { - ret = get_physical_address(env, &physical, &prot, - address, rw, access_type, mmu_idx); - if (ret == TLBRET_MATCH) { - tlb_set_page(cs, address & TARGET_PAGE_MASK, - physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, - mmu_idx, TARGET_PAGE_SIZE); - ret = 0; - return ret; - } + if ((ret == TLBRET_NOMATCH) && (env->tlb->nb_tlb > 1)) { + /* + * Memory reads during hardware page table walking are performed + * as if they were kernel-mode load instructions. + */ + int mode = (env->hflags & MIPS_HFLAG_KSU); + bool ret_walker; + env->hflags &= ~MIPS_HFLAG_KSU; + ret_walker = page_table_walk_refill(env, address, rw, mmu_idx); + env->hflags |= mode; + if (ret_walker) { + ret = get_physical_address(env, &physical, &prot, + address, rw, access_type, mmu_idx); + if (ret == TLBRET_MATCH) { + tlb_set_page(cs, address & TARGET_PAGE_MASK, + physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, + mmu_idx, TARGET_PAGE_SIZE); + return 0; } } -#endif -#endif - raise_mmu_exception(env, address, rw, ret); - ret = 1; } +#endif +#endif - return ret; + raise_mmu_exception(env, address, rw, ret); + return 1; } #if !defined(CONFIG_USER_ONLY)