From patchwork Thu May 9 22:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163786 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1586333ilr; Thu, 9 May 2019 15:51:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqznpk+qiHt5XyUjOj3CWFOEhDKQ2TNZf7oxYDW8gYJ0KddudvbjxSq951Y8tLauVDuMA25P X-Received: by 2002:a1c:540e:: with SMTP id i14mr4408914wmb.129.1557442288461; Thu, 09 May 2019 15:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557442288; cv=none; d=google.com; s=arc-20160816; b=NLq16F19tMqnbv8zVELavdC7qWTLFTZdUBXQ7pCcEjyhsWerIR9TIDQG+SQFhvGBDo m4lY91ImxCbEHEB80+2NAye8UIcED2UclvEcgV1L8L/jUKlGVmAdIBCHY5GL3JZnrIDN VZXkvGS4IPqpM6bL7gD5XJzx1BYrbi8Tdhyrvanea7znRAz0Az5HlVvC3vPIct7TyvmK ozRYOvrzkoQ/43FQrBdK3sECnudYn97TWi86wfFw5xaUUgxbENcnRUBQTXqOLOgJdSpb WNdWgZG2ElPlhC81FZkJU7hPxH1PJUM0zWPzEjQOcdRQQ7xVAYwyDPJftgRb5e9kPqGn s+JQ== 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; bh=s4MN+agLoZqxLhzSptzqanZ4wwu5I/aQQC+BedaVD0U=; b=gFSdkPIrYNaLSJBQ/iFimuqGu566VtbjH9j0AeCAzT9jtoOok6sR7OS+hEClUR9PzH OZVbja41h+AOSh1Dhed/b8LT2iyp43otZkVy5np9jWVWM6EpmZBWAXF9ynS60GROBcEi Kv4q5KmU+a3FqYqdqZRRxWoryrxLck1VLEFGu4NQ98A2duC1Ky6I8jA7NFokDnJxt6Co NbKg93S/mM9+3a24IFfvBktxQBGFOkTxEpVor0+tYnRrXD+v2X72JO9DBNg4woxeZEMs XruG5GYIknYnxLGXj67IDNxbylpdlZqXzG0DiH/08DTOmhf38kQedkuFTZCLkfoBzyjd QlCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QoNp4NMj; 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 a3si2678679wrm.296.2019.05.09.15.51.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 15:51:28 -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=QoNp4NMj; 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]:33818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrst-0003yl-Fg for patch@linaro.org; Thu, 09 May 2019 18:51:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrVK-0007vj-6i for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOrVJ-0005bg-85 for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:06 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:41917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOrVI-0005ak-33 for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:05 -0400 Received: by mail-pg1-x541.google.com with SMTP id z3so1918334pgp.8 for ; Thu, 09 May 2019 15:27:02 -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; bh=s4MN+agLoZqxLhzSptzqanZ4wwu5I/aQQC+BedaVD0U=; b=QoNp4NMjX0nM18pO91UXdLYVqcxOqNZg+rTWEQaHWE2/xWgHVNVRuXjeZfu1D37zst DrP0WT+OOr/MecTTnX0tBngUkiHfy6tJ/fi4aMhAvY0YGVa9rSbPjXIiOnYD0RREOR3D o37Ba0KMXvR7yTnrrwb54v12MZ5RanGJEgejZUBtwh3368DTpH3P+VrsgXDhPzLMpHTx HneZ8on9m4n6ECs9JxPny8OaoxWuyAnq6VcNI0FkJGF5XO4HGyCiTCX23VBYw7ZqJOeD V6I4VPbqxFpimC1jfamFXVmaNnPWPVBi/m2of9Jpvsamjp12AlMQdOHPjvB3/FhmtDiu 7ltQ== 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=s4MN+agLoZqxLhzSptzqanZ4wwu5I/aQQC+BedaVD0U=; b=e+QCexx2c8baZTuk7VGLzuYmy33jhhbg/ynhZWCHEfp0RbqXtH4ZCaiapAjXqk3oHl zaei9z0xmdwcM3tPrEPOP3/qImVrVFaxu43nJZi6Ilw99qoMCwdxe4Ho52HPU4e7d2bH GFQC+pTICtvx8EbNn5PqBReZ3agnLcMYJZmySjblZ75HZLlCMWW7T8xfUvu6DzyfGrff 9sAfjlj4qz+u9MQyHG5iGGhCiPjMZnAUbNbR5Rz2PLTjZ+jvokIBtXG1gyjabjVHQUoW S02HT8jAd4L8Y9SW2aXnBdQn+rjqq3JV8IWlUMOTcAjEp/vt9exeYGREF1ytAoE5rCqf Wj4g== X-Gm-Message-State: APjAAAVHFkX3sh6ATsTnbukAe3jp99fJP9zkaaBT7AXGqX9I4d9IlmUN M7e/NFiEnpUWzOdk2y6Tt5DEhSxbI24= X-Received: by 2002:a63:61cf:: with SMTP id v198mr9074034pgb.29.1557440821617; Thu, 09 May 2019 15:27:01 -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.27.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 15:27:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:26:25 -0700 Message-Id: <20190509222631.14271-22-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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v3 21/27] target/tilegx: Convert to CPUClass::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" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/tilegx/cpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c index b9d37105fa..b209c55387 100644 --- a/target/tilegx/cpu.c +++ b/target/tilegx/cpu.c @@ -25,6 +25,7 @@ #include "hw/qdev-properties.h" #include "linux-user/syscall_defs.h" #include "qemu/qemu-print.h" +#include "exec/exec-all.h" static void tilegx_cpu_dump_state(CPUState *cs, FILE *f, int flags) { @@ -111,8 +112,9 @@ static void tilegx_cpu_do_interrupt(CPUState *cs) cs->exception_index = -1; } -static int tilegx_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, - int rw, int mmu_idx) +static bool tilegx_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { TileGXCPU *cpu = TILEGX_CPU(cs); @@ -122,7 +124,7 @@ static int tilegx_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, cpu->env.signo = TARGET_SIGSEGV; cpu->env.sigcode = 0; - return 1; + cpu_loop_exit_restore(cs, retaddr); } static bool tilegx_cpu_exec_interrupt(CPUState *cs, int interrupt_request) @@ -152,7 +154,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = tilegx_cpu_exec_interrupt; cc->dump_state = tilegx_cpu_dump_state; cc->set_pc = tilegx_cpu_set_pc; - cc->handle_mmu_fault = tilegx_cpu_handle_mmu_fault; + cc->tlb_fill = tilegx_cpu_tlb_fill; cc->gdb_num_core_regs = 0; cc->tcg_initialize = tilegx_tcg_init; }