From patchwork Fri Dec 29 19:31:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 122951 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5055155qgn; Fri, 29 Dec 2017 11:33:57 -0800 (PST) X-Google-Smtp-Source: ACJfBos1NNvLvOEXLT9Xw+Atbi9oHMOea4sepH5jMIKObAHZ+wt2u+9cEi/Y7jrb4Di16VrQMNn5 X-Received: by 10.37.187.81 with SMTP id b17mr26019592ybk.175.1514576036995; Fri, 29 Dec 2017 11:33:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514576036; cv=none; d=google.com; s=arc-20160816; b=COsd1xs4+qwUSiz+Oj3HrZCaulWRsoPxIb1vjplCMvUWoisWPi0W2Cr6qkbDt0y9Jd zfa+61FO+qh7+nF/zujyDU6L1m6Rz2I4kMUAiUVFIuI41G5NwaPYuG4Wnt6gaU1tq8pA +VLh7KxjDAzIDatauDkSqZtUjNSPjSTUctsr1hf9Cc8gCLB7sdBTkiV5NfirWuaT5OZ4 Cuv71/QsIfwDfdLO5ECkwmjmNcU1eQo/+gUACAM68mgXCyF3h3EEqEmS8SHPXc88QM4B JMud0CYNF77OJQUDiok1TdRp5qpk3G9RRIeFxAGr5iZ/N7ezt0wIWB/AR3C5+Ppbbz1J Qt3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=+diEEgaVf9OhqavZX+bwDObM2qq57HE0VGJRFwhZUXg=; b=nK3+ZLM0hNI3J9rBCzljCnMjG5VOnwQwLi5EPasYJK1/seXvQkheq6RupDEGBNahhH v/PEcUvrw0J2iEQVyrLidS3yJMvontHEeV2o3mP3UZD9uCzdOBnBxo+FfYhp2T16cAsb +j1Rg5mgU+j2ifdMBZ3gd5b1+8vwWpj18sALYOb+c1d7ieFE6uZSybZ36w5h8Upx+qFr hqAKWzXpKWmbKGnq8ib94WIeelXVqSX4lWaUW/8oUzlXSIKLzZix+ng2K9vLOT/SW219 4sPQXV9azeCYli854i18xMgRlwHZEezq5zdzW9QDMrbHvtdELcx9XB6V61IB0AvqNqcj rvzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gxsR3ErS; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l37si1813772ybe.79.2017.12.29.11.33.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Dec 2017 11:33:56 -0800 (PST) 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 header.s=google header.b=gxsR3ErS; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eV0Pk-0001mU-Gx for patch@linaro.org; Fri, 29 Dec 2017 14:33:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eV0NE-0000jE-Vp for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eV0NE-00008z-8p for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:21 -0500 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:44119) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eV0NE-00007q-3y for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:20 -0500 Received: by mail-pl0-x241.google.com with SMTP id n13so23462370plp.11 for ; Fri, 29 Dec 2017 11:31:19 -0800 (PST) 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; bh=+diEEgaVf9OhqavZX+bwDObM2qq57HE0VGJRFwhZUXg=; b=gxsR3ErSRKv4cR8kRR4lSc/CtfmR4rEkswqGLIDHzIIcJ4IanOurD4ZBgLIyjuzM9v 8oG/GwdWLjsJd+KwW9xHgZW07FfeRDKCXJdEtuG8+X4PORxd3REy3969dTCGKJcJCJea uWGQfMWtp2ouo1wMm+vJO2X9cMOqbZyItkBHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+diEEgaVf9OhqavZX+bwDObM2qq57HE0VGJRFwhZUXg=; b=RDp11Uvd0bQ6clKTQiTWSYEZ8lZ84mWio41BIwQuTJgZtQuC9cUDXwtC33Gsf0mTZI dEHcA/5pgGhbUiOVJow3Wdy3Bt1Hy3q80z5KAkTESRoVHq2a3k1iXGGCwBKaaoesvypg e8pC2/94xI/M/DycDzROHKYUWm22IlTfRl7N30fyue+W2mx91pVC/z6clDzpTmRyZP9N 6xWJGQ5Hs85uxLWcQtFdTY9d4RlttNSg5pBKPCUqs4o58Aetmk2BhCw4K7Zd66fg1dmG lr8WCm5spBKMp//jocCsvHedya33Fq3OXX9+JRn0DulFGcHa1ZxT91Y04t8Sh0vcfliV vE7g== X-Gm-Message-State: AKGB3mLHyNv8zTyFA2+6620y35vQmTzorIHvWS6e7+ch1Lfmw8LPxn3E YYoR2LqKS/+jPfrV1hEc+l8B8lD5t6U= X-Received: by 10.159.252.76 with SMTP id t12mr36435531plz.323.1514575878836; Fri, 29 Dec 2017 11:31:18 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id q68sm71240492pfb.1.2017.12.29.11.31.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Dec 2017 11:31:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 29 Dec 2017 11:31:07 -0800 Message-Id: <20171229193113.11753-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171229193113.11753-1-richard.henderson@linaro.org> References: <20171229193113.11753-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PULL 2/8] target/moxie: Fix tlb_fill 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We should not exit unless moxie_cpu_handle_mmu_fault has failed. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/moxie/helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.14.3 diff --git a/target/moxie/helper.c b/target/moxie/helper.c index 2ecee89f11..6890ffd71c 100644 --- a/target/moxie/helper.c +++ b/target/moxie/helper.c @@ -36,9 +36,8 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, ret = moxie_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); if (unlikely(ret)) { - cpu_restore_state(cs, retaddr); + cpu_loop_exit_restore(cs, retaddr); } - cpu_loop_exit(cs); } void helper_raise_exception(CPUMoxieState *env, int ex)