From patchwork Fri May 10 15:19:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163877 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2522576ilr; Fri, 10 May 2019 08:29:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXgDn4AQj4fb2jTDcJ//lnJdPW1esVM2WlHRbGwVA0GE4Cswjld8OaGshhYlyE7AxYaGa3 X-Received: by 2002:a17:906:1dc5:: with SMTP id v5mr9069398ejh.66.1557502189795; Fri, 10 May 2019 08:29:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557502189; cv=none; d=google.com; s=arc-20160816; b=dziPsnsUNOGq2BIryXXOhDhPwD2+cYUeaSm57MNme6mKAyuWVS+tEpNhFNMUBTyaph U0hqp41tDK104kRiOFTDsSzdc8JRH8vF7boPaHzePg3fRPvkHfzvA7wlLgkxwaAEV3ms T1+42f0TlPmvHMo9Xx/Cu6W6fsnijYYW/m5i9QKceUH5ppT+F4DDUvyRqltYPBaWo6O/ WxaOycFsHILqlJck0j7evhYMlLUGOawC05ZbsTYQ/70EciDmv7AkoNiZ1qR8JWBNPLsz 3ZI0IZP7sm4+/oGzhooaDUv0v9x/+n/wRZL/H3d/67u4dJ+reSbpY2v1D5IXXdiqC7C9 YJZA== 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; bh=SbdgfaYjW8ILfhiu0/mJqWKm/tBVnd5f44zvoNG8J24=; b=SLAza3x07wJX/SWdp4vPcAcGV8abowN0MUZYWKaoh0Iw19piW6FGRcObwIm5hBs705 oL1d64aLFynlSLvy/84Sf+5wTmsIjGPAo/9yqaQ2LabaKMc5N6DFTEMyAGmAawl50Du2 Xg1lSFPjIJg3stz38rPQt78yFTr+kX9i1tl1oyT0k/1s4HGMRl4cZHEsu95RP63EaNz8 GhlaXxFakcvyzvgrTfnhppVDSVI0k41XY+aS+qMnQ7WYrpDuNL1I2Gmg0S3bm/n6Cj5W NLKbGLxmSquoiyQzAer4R7rCExEb0p5H8UoZHlbHzwVJAja3avsGJs/4l+HEqWk/Rn0I 360A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=y6l5WHcH; 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 o33si989630edc.219.2019.05.10.08.29.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 08:29:49 -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=y6l5WHcH; 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]:45105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7T2-0008KX-H1 for patch@linaro.org; Fri, 10 May 2019 11:29:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7Jd-0007cO-S9 for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP7Jc-0008VE-Ok for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:05 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:44338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP7Jc-0008Uo-J1 for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:04 -0400 Received: by mail-pl1-x644.google.com with SMTP id d3so2980358plj.11 for ; Fri, 10 May 2019 08:20:04 -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; bh=SbdgfaYjW8ILfhiu0/mJqWKm/tBVnd5f44zvoNG8J24=; b=y6l5WHcHxqFLU9fWsT7tDzRc9SXW6pDNL6PQ8C9TsYLdi44PWcsYQm2e6IS/6Dq+jQ 1BZBcyL1FWghSJkzRBXbh+OEIro96F/sUu6Lq8HFuWUchlIR+hXZugk6TDRtN4oTLB6G +Nwht7yr6g/JnuSbPaK0ZNUbhQFyN2j1QcQ4E67dsadZ3tRnQd5Uh20hqSKR2YJH6pzQ muf1g2VplOlVhXmnFdJ3o1MU5f6H3LbaLkqFX9RjcncKFR7ceHKZqkP4sdd50Fz89IFG ysnesyb4oAj8pDOAEIqCoHScdXpFNl9nSsjRO4RxYWWJLB5lLgu90pJLdY6D/Ms/TxIH G9nQ== 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=SbdgfaYjW8ILfhiu0/mJqWKm/tBVnd5f44zvoNG8J24=; b=CEzE7/qHaA3kZYtrUTm9Gxa1GtE9KxhQgU5tmUs07Hb3KwCK2c8O6jUf5xh3g9qSe9 5rgoa6aRHyXVt8QskM//Ap0PqfepMau7/otZkle8XZiXPMf3Ur+bzCEYsPR9QPfP83H7 zgFWkipqSCzq0xoRdwRIdILqe+WjzR0PIXbh13S5Nso+vP8CcHlAvHVUvP0LkgXwTVcW mmrDQrHIBbBjC2rzOoC20hbKPUH8EQb+VQJoPDK+GJ9B/Wzt7vCNJ/5a9evXk6iV9oF1 WbNPnbczG/YS7Psg5+Fg2QFqQNJN7mevcR4B8QNVtOevV3cpWZC7fjW2SY+WGh4clcF6 tH1g== X-Gm-Message-State: APjAAAW8En4rmEWcvIB2vDBVRRQmVHCKHiBPypFEFJjfrP4JwYJkVn+6 jJ9TbgeKEc2vVYhItS/+8QIPOV/oOxE= X-Received: by 2002:a17:902:59db:: with SMTP id d27mr14068990plj.332.1557501603260; Fri, 10 May 2019 08:20:03 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id 19sm5920517pgz.24.2019.05.10.08.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 08:20:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 08:19:30 -0700 Message-Id: <20190510151944.22981-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510151944.22981-1-richard.henderson@linaro.org> References: <20190510151944.22981-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::644 Subject: [Qemu-devel] [PULL 13/27] target/moxie: 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: , Cc: peter.maydell@linaro.org, Anthony Green Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Remove the user-only functions, as we don't have a user-only config. Fix the unconditional call to tlb_set_page, even if the translation failed. Cc: Anthony Green Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/moxie/cpu.h | 5 ++-- target/moxie/cpu.c | 5 ++-- target/moxie/helper.c | 61 ++++++++++--------------------------------- 3 files changed, 19 insertions(+), 52 deletions(-) -- 2.17.1 diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h index f3b6d83ae7..a63a96bc05 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -139,7 +139,8 @@ static inline void cpu_get_tb_cpu_state(CPUMoxieState *env, target_ulong *pc, *flags = 0; } -int moxie_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, - int rw, int mmu_idx); +bool moxie_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); #endif /* MOXIE_CPU_H */ diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 46434e65ba..02b2b47574 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -112,9 +112,8 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) cc->do_interrupt = moxie_cpu_do_interrupt; cc->dump_state = moxie_cpu_dump_state; cc->set_pc = moxie_cpu_set_pc; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = moxie_cpu_handle_mmu_fault; -#else + cc->tlb_fill = moxie_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = moxie_cpu_get_phys_page_debug; cc->vmsd = &vmstate_moxie_cpu; #endif diff --git a/target/moxie/helper.c b/target/moxie/helper.c index 287a45232c..216cef057e 100644 --- a/target/moxie/helper.c +++ b/target/moxie/helper.c @@ -26,18 +26,10 @@ #include "qemu/host-utils.h" #include "exec/helper-proto.h" -/* Try to fill the TLB and return an exception if error. If retaddr is - NULL, it means that the function was called in C code (i.e. not - from generated code or from helper.c) */ void tlb_fill(CPUState *cs, target_ulong addr, int size, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { - int ret; - - ret = moxie_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); - if (unlikely(ret)) { - cpu_loop_exit_restore(cs, retaddr); - } + moxie_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, false, retaddr); } void helper_raise_exception(CPUMoxieState *env, int ex) @@ -85,53 +77,29 @@ void helper_debug(CPUMoxieState *env) cpu_loop_exit(cs); } -#if defined(CONFIG_USER_ONLY) - -void moxie_cpu_do_interrupt(CPUState *cs) -{ - CPUState *cs = CPU(moxie_env_get_cpu(env)); - - cs->exception_index = -1; -} - -int moxie_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, - int rw, int mmu_idx) -{ - MoxieCPU *cpu = MOXIE_CPU(cs); - - cs->exception_index = 0xaa; - cpu->env.debug1 = address; - cpu_dump_state(cs, stderr, 0); - return 1; -} - -#else /* !CONFIG_USER_ONLY */ - -int moxie_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, - int rw, int mmu_idx) +bool moxie_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { MoxieCPU *cpu = MOXIE_CPU(cs); CPUMoxieState *env = &cpu->env; MoxieMMUResult res; int prot, miss; - target_ulong phy; - int r = 1; address &= TARGET_PAGE_MASK; prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - miss = moxie_mmu_translate(&res, env, address, rw, mmu_idx); - if (miss) { - /* handle the miss. */ - phy = 0; - cs->exception_index = MOXIE_EX_MMU_MISS; - } else { - phy = res.phy; - r = 0; + miss = moxie_mmu_translate(&res, env, address, access_type, mmu_idx); + if (likely(!miss)) { + tlb_set_page(cs, address, res.phy, prot, mmu_idx, TARGET_PAGE_SIZE); + return true; + } + if (probe) { + return false; } - tlb_set_page(cs, address, phy, prot, mmu_idx, TARGET_PAGE_SIZE); - return r; -} + cs->exception_index = MOXIE_EX_MMU_MISS; + cpu_loop_exit_restore(cs, retaddr); +} void moxie_cpu_do_interrupt(CPUState *cs) { @@ -156,4 +124,3 @@ hwaddr moxie_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } return phy; } -#endif