From patchwork Thu May 9 22:26:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163761 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1566576ilr; Thu, 9 May 2019 15:27:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvK7XV1Si2GQSz4cz3SWRoKNFYzK9ZB5RK0TWV5S1GaslbuHr7U43tk51jmAQmsAHhY5a6 X-Received: by 2002:adf:9084:: with SMTP id i4mr4709119wri.259.1557440841962; Thu, 09 May 2019 15:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557440841; cv=none; d=google.com; s=arc-20160816; b=f1h/ofE6G5ed+yAgdHP5oFoJoBH6ZJ1u8mdGP+ZXthlEyCp0IpLgloIpK+5Dcdw83e ycKYIEIjNedV+8UNCS3mSDaIf+q++4YGhmHtlekkYeEQixcF/lkB1HVTyXoF/B/GevwB rMVLEtFJ1KNe0UwgjqzBEvIHpuwjZOvLrbEkb1/PLGKurEbGZwGqfDev9R+bVryfR0yw vT9bdAkhjFUscUyfvHrio/7d801d26T0XCmGudtJuppIUgLL0NM6JSVH+QYmmis96pH6 Zn3YjEtvhpL/ljzZ8hKFXtgVdDKDyjb6iypUdfeDjwMMrOV/cCJ0gbkHVIpoMACtQ2Sg vI4w== 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=z3f9zQxOGIXqf3i213zatFVnzu0qhQzSCIqsdS6Zek8pCOaXL+4duryKZffAqGKAZM PZTHCWOAvLlxogmpIjVko+ucvf+6V282fBniA8Fi360iP/vUMLcvhO/T7Rr4UAE2rCFz SpLjwzaJOAZr3TcnNUBbbuHXjvcGsLSisF3vGf+Wu14DOWOnGQf69IQ5KFDh4+vpwwmO r3Tp45HDts+PRdwICvt36m1/x2z5HSjgAyUdDSIkct1TUWyhHFqEbudylvo1thX8rbYX MPvbiP+vlRdCzdKoueU/GgpdP45aoTwqWiaY1EH73KsSkcvoEzqXMavhRRKxeuoP40Mj Q3sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yrmaTw1i; 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 s9si2766374wri.262.2019.05.09.15.27.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 15:27:21 -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=yrmaTw1i; 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]:33438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrVY-0007mJ-Or for patch@linaro.org; Thu, 09 May 2019 18:27:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrV6-0007ju-Im for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOrV5-0005VB-Dk for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:52 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:34376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOrV5-0005Uo-7E for qemu-devel@nongnu.org; Thu, 09 May 2019 18:26:51 -0400 Received: by mail-pf1-x443.google.com with SMTP id n19so2057572pfa.1 for ; Thu, 09 May 2019 15:26:51 -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=yrmaTw1isYlaWL0h+7ulMQ5InyN7qPN1b6Vv8b3I86iMq+GoPcz0+KSzsakznlng0B JDD5fj8I4FK3bxucKKhEpvlWt+7wCYbD6jHWh6fI49PU8Sd9OKat5nuo2w3taJSvOkkI 8GNDqQjYUPDWUnOgHgwt/C2DzyeHctU07jK++Vdg6v9Gmr9bdcO445CPlddAN885sMqr WLW9oSlyEDJw8+FN9SQ2D8gRQw45siWMhhLMNF+TIp7PC9EaDWGTywBsRHOP4n5TiCxr OyVJkoB4mv7eodqTpo+N6/d7uMfpBWr+N+bx7ZGe7I7IFpjRvxKRFo+ZdUPwTHkHlryt /VrA== 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=HucpIPX2+9GhkFk9PWJr1hW+BuSqN6lWnr2MOdGQx+KQ0fdIgjzEwpiypQGwyV/mbX l9QeccyquBIdkiaJd6tY5FE3Sk9RCsROkxb6DKEu4RttjLypXw4L98MfYjncSh80n05P NUlW3J8TfdH7x8UCALEnfDkexQEXpqWPmiWUHCnXPfirfdAYQOt7LrbQSKfdk8GN2uPj HA7ENbSDbGpRH/RbELY3jXp/IjWhvd0/C3ICQZ2YpBFdtsc000RzD965RfhZuBpvBHsx WPAcQYRBdA3idtWm9kUWx3cFLzkfZbMpc5Uro/HaXaSxIBCuypoEOwEUYs0uxLdXkuSo iv9g== X-Gm-Message-State: APjAAAVk/v6VrvXSFZ1Es5ZI/rnRQAXfaWsmmLZyatkHyeWNnwApib+I sGAkP8hcQd/wUH/5N1dCX3655bvr9do= X-Received: by 2002:aa7:8ec6:: with SMTP id b6mr8882550pfr.234.1557440809813; Thu, 09 May 2019 15:26:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 15:26:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:26:17 -0700 Message-Id: <20190509222631.14271-14-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::443 Subject: [Qemu-devel] [PATCH v3 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: 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