From patchwork Fri Dec 15 17:07:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 122138 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp735836qgn; Fri, 15 Dec 2017 09:10:40 -0800 (PST) X-Google-Smtp-Source: ACJfBotmYXjUGkR0II3lLbbwX01/hgt10TX5VEAMAbzNtcwsRKgA1WmIcYhf0birV5EenDZX6Mkl X-Received: by 10.129.166.131 with SMTP id d125mr7428149ywh.96.1513357840413; Fri, 15 Dec 2017 09:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513357840; cv=none; d=google.com; s=arc-20160816; b=P/QlPYfpZsGgBGP90cUaJOAs9Be8NGWaB8Mq/nEy0l1geHdQMFVw+bZm7JF8i4sWkY fWoS6H/LsQ4VvUsWxeHKpBu+v0xS5nv3u9d+v3Jq4bGIe58HY396OV5G6sQ1XN2BGbG9 1SoTdg3IBk0lE0g42QeLO0QsU2S6emxCTsnHjlyzCHj4T5/L2rCiiLlaSI3gYC0ybail eDS3KOYiUgK4D77aZzh0Z4E2jgweFJXkqVxUASaTCX0cEjxBq09mkOtxLCh3JgX7PDYl LdBEf7ZvlFCdgnGUzmWpZKINrKznTxppQAt1OwLK1Epuk4MkL44heBlRE1JWioUmxS2Y zxJA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=duqz0zTygyg/WZ14UBKd2/c6PKeoS+BjyHmQuSaknYk=; b=gWvEnovd+weCfQApBXiymltp8Nnrwm3vRD1/eMdglhXc9zN3PfZyzhkf8fGAPU/5Ih eyQS3zKZDuDmf4Is4FNaYT/OqLFttDuyRCDyLgXWxpdtvyZSTjPw1t8WMHeP4UJnW4xr MJ3Gq5ObL2QVHsMEqtfjGt4t56WIWwEMvReIsjfD9fjYU1hBw4fvgQeS4k09hRbmULTM NTYLhE/4v2gykBoXn0gEe6+8awSxV0kjpXNuRo1C/X57wz3bU7T9iFtHTBECxknNh3N0 VDkA4UGcB6JU55xEqzYBIVtOn3tgYrb0nvULmZKTCfBPibawvQFg8gY3RUmB7oEoM0oS qwdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EutE1jq0; 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 d1si1068284ybk.350.2017.12.15.09.10.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Dec 2017 09:10:40 -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=EutE1jq0; 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]:47792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePtVP-0003iy-S2 for patch@linaro.org; Fri, 15 Dec 2017 12:10:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePtSX-0001Rh-RI for qemu-devel@nongnu.org; Fri, 15 Dec 2017 12:07:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePtSX-0002t0-0F for qemu-devel@nongnu.org; Fri, 15 Dec 2017 12:07:41 -0500 Received: from mail-it0-x243.google.com ([2607:f8b0:4001:c0b::243]:46709) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePtSW-0002sp-SO for qemu-devel@nongnu.org; Fri, 15 Dec 2017 12:07:40 -0500 Received: by mail-it0-x243.google.com with SMTP id t1so21004808ite.5 for ; Fri, 15 Dec 2017 09:07:40 -0800 (PST) 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; bh=duqz0zTygyg/WZ14UBKd2/c6PKeoS+BjyHmQuSaknYk=; b=EutE1jq0VyBUcIJ/vJiSFVyTZr8DDYZxmU3mO37+k1EHRsdtwFHYHutwnbRtu2FyyZ PjA45A82kaW4ZYmrg8qIZQxS8bQ/DIyBxXKy2UVBJQNUefh+z3NJsCC73ypkEzrcDfM6 wXA32KkTzwQoOMkIZnCzZf4Dmuzcgjx12SJVE= 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; bh=duqz0zTygyg/WZ14UBKd2/c6PKeoS+BjyHmQuSaknYk=; b=AFXwAVZZKSLKXMpNr9Gy4tjHU6kTz06b9FxyG94pxwLJ/HE3rO/jsAEuBJm1v5ONSY x7UZtoSRIhKNNiVHQ5IubnIB3QpZyBMZRPmB1kk/SfEht3glMJriXqTlEhNld7UR4+ig OtX4ES+jpj+1t//aFfgVmp1A0taklag2+jVps+jXINRecXdfb9ceonvRhcuykh6sxpVq 1CAmsn/Y0Vu3p0dfzKubmlT2+kFuT2oH1y9AullIh2DPPpcbthTi3k4+P+XOLQuAqIb5 Mt4e2x9sCSw+dXlRP0rrZo3YmL97sM8q2ROJk1nUFdziRu159C08WQe267BJ5i0nJeBf MO9w== X-Gm-Message-State: AKGB3mJvyqqo8k4/1QBFkzhBXcP9NmPb74sUccTKrtEp9Ce+oJn0IIHK KKVdiMDQ8e8Hkvy5rJBScjSxxaXlRas= X-Received: by 10.36.135.5 with SMTP id f5mr9675542ite.85.1513357660046; Fri, 15 Dec 2017 09:07:40 -0800 (PST) Received: from cloudburst.twiddle.net (141-126-166-226.dhcp.chtrptr.net. [141.126.166.226]) by smtp.gmail.com with ESMTPSA id k23sm4012974iti.22.2017.12.15.09.07.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Dec 2017 09:07:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 15 Dec 2017 11:07:27 -0600 Message-Id: <20171215170732.31125-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215170732.31125-1-richard.henderson@linaro.org> References: <20171215170732.31125-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c0b::243 Subject: [Qemu-devel] [PATCH 2/7] 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: , 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. Signed-off-by: Richard Henderson --- target/moxie/helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.14.3 Reviewed-by: Peter Maydell 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)