From patchwork Wed Apr 3 03:43:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161656 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2514524jan; Tue, 2 Apr 2019 20:50:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIJYpyWPJNZizc80uGmhHyBxbJt81T52UPTAjJUXlKv64GYMSXdkk4y/uzRrqyxfuEu2hI X-Received: by 2002:a25:5985:: with SMTP id n127mr1275090ybb.36.1554263440509; Tue, 02 Apr 2019 20:50:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554263440; cv=none; d=google.com; s=arc-20160816; b=bwSagBnfeIiWl9hNnVHQk4iN3vnk3hbCsMIvXjjBGH84tt0hhdPb62GOyPdb2h5QbV vA1EKJKCm4Wkf5BQ7s8PxwyVJHhBR32ivJfBwqhOwL/3EkSOJneT8ljb3AGnc/8AEAEi Yp4KJz+VFqzEvYYVwFBS4N97OrWqgmuG5Ltt4J915wMsc2TnOTwQPkpzEkEMVMw9Oxi+ fJJl3cajXHwklIgWOBCaIBb2993KZNhiKfDCMjlmwUiP2Tk6LoxitpRoZNbg4tv71eMY BxbnBDUd0lR9b1O10y6IZOEwWiPzyTeD/q/aecGk0MAy3jtrl6cwVFWHdd5v7MrPzgf1 VASQ== 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=IUotWWo3041r0D9XZuJ8LGQL3RkKcjD1vbj2Rf1RYCg=; b=pxZLj+xSLC8M9tQeLMuHL1/59Tqjca07IZu0HbNv0x+hsLNw2mOxRV+987kBLBKr5A /9m8Y27K6emaVa99376Ay7/FGhfFbMcGNfUZq3+0Sm7J1Cfvs3997K+ykBpZoSx0n1MX 8x8dVZXkX13mb0mWP9XA1JMywAyHIbQKXia3Wils7qM2o/gFx6wQrs0ZlonSqQGqWMZ9 B+2IJ5apdYp44F3D/2m/vKpNuMN312IbdKFgnhpWfzZ20eD3KPVeAIOs54I+LAkuYVwc Kb+cAfItptQ+7Wf9u2jSSs8R3UAXfKETvxT9l3WmfbU4h7McxGO6un8lDG7YBduPo589 Fa5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="j/hfGQxb"; 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 207si6313011ybd.327.2019.04.02.20.50.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 02 Apr 2019 20:50:40 -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="j/hfGQxb"; 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]:52792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBWvA-0008Ga-0z for patch@linaro.org; Tue, 02 Apr 2019 23:50:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBWoy-0002j3-K8 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBWox-000886-AP for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:16 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:43627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBWow-00085l-W5 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:15 -0400 Received: by mail-pf1-x444.google.com with SMTP id c8so7423651pfd.10 for ; Tue, 02 Apr 2019 20:44:14 -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=IUotWWo3041r0D9XZuJ8LGQL3RkKcjD1vbj2Rf1RYCg=; b=j/hfGQxb4HN4Oq7ZnNKVlrY1vg9d0a/wCof84WTJaC0+jvydRWr3S8jGTfVVw8kcJm pDSgyrmPi4AZtd46/6YsslJetNH9N+73HZjpNKlrxtpO6Li9B+LqxRfm4+Yo3EqYMwJZ JJRK9IEVB5AhkKyCejImovpVI2ST7xyC1DdMJdZdwwXZaf7dk8omjmlCrXBpqpVcJ8kA 3ktYCyO0HP56cGuiJM/4dX2FgbWMfuK8atORXHRMtpS9wmfcAD+FL0HZqQzZOyRfTAh3 6Q/JKysMhpX6dmpXA4iH3wJe2yJyzt5YydpRFf7KZHXEEYiqXsA/P+Iht3aQhAgGSEIx I/OQ== 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=IUotWWo3041r0D9XZuJ8LGQL3RkKcjD1vbj2Rf1RYCg=; b=b962x3IMXSYB/oORhNLUPottRL99VNu2N0l/Q8DxMcWNGk/yeYgi6OxY3d1KYox9pA aYilBK8FqKmycR1SostBJLdpCoRp1v77iXW0fbdsdpSBx4MjpM3s9VGbbrauDJj1rqNm /47GrLPqhdyjzpnyZr7Z9XpG02zgz9l0NqMeLpFfr0hoT4txJt7IR18baaQWX/2n7c3u nHwH4KhzZ2vzjZ6CtWkZLrCqnjtwFYL1CPRexT5iqCWINMo6N1iJUES7V+4VrDznBwHf tIosLitaSDFMWdNL6jYRPoj7e2QDKwnoBMA62ddJKiB1ALlC7Ljk4UQf9NRzgzEuKfWj /tWw== X-Gm-Message-State: APjAAAX8+/IfwZfFjZOAut9KtdgHAfqj16/7VfGhYnLcoPHlCe03kjJn roi1zpISx9j0rEdjsOt7SKrUpLpHN093Bw== X-Received: by 2002:a62:14c3:: with SMTP id 186mr72968440pfu.21.1554263053557; Tue, 02 Apr 2019 20:44:13 -0700 (PDT) Received: from cloudburst.imgcgcw.net ([147.50.13.10]) by smtp.gmail.com with ESMTPSA id z6sm26753214pgo.31.2019.04.02.20.44.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 20:44:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2019 10:43:38 +0700 Message-Id: <20190403034358.21999-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190403034358.21999-1-richard.henderson@linaro.org> References: <20190403034358.21999-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::444 Subject: [Qemu-devel] [PATCH 06/26] target/hppa: 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" Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 8 ++++---- target/hppa/cpu.c | 5 ++--- target/hppa/mem_helper.c | 22 +++++++++++++++++----- 3 files changed, 23 insertions(+), 12 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index c062c7969c..e0e5d879e1 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -360,10 +360,10 @@ int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void hppa_cpu_do_interrupt(CPUState *cpu); bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); void hppa_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function, int); -#ifdef CONFIG_USER_ONLY -int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, - int rw, int midx); -#else +bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); +#ifndef CONFIG_USER_ONLY int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 00bf444620..46750980f7 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -167,9 +167,8 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) cc->synchronize_from_tb = hppa_cpu_synchronize_from_tb; cc->gdb_read_register = hppa_cpu_gdb_read_register; cc->gdb_write_register = hppa_cpu_gdb_write_register; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = hppa_cpu_handle_mmu_fault; -#else + cc->tlb_fill = hppa_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = hppa_cpu_get_phys_page_debug; dc->vmsd = &vmstate_hppa_cpu; #endif diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index c9b57d07c3..f61b0fdb9f 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -25,8 +25,9 @@ #include "trace.h" #ifdef CONFIG_USER_ONLY -int hppa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, - int size, int rw, int mmu_idx) +bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { HPPACPU *cpu = HPPA_CPU(cs); @@ -34,7 +35,7 @@ int hppa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, which would affect si_code. */ cs->exception_index = EXCP_DMP; cpu->env.cr[CR_IOR] = address; - return 1; + cpu_loop_exit_restore(cs, retaddr); } #else static hppa_tlb_entry *hppa_find_tlb(CPUHPPAState *env, vaddr addr) @@ -214,8 +215,9 @@ hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) return excp == EXCP_DTLB_MISS ? -1 : phys; } -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType type, int mmu_idx, uintptr_t retaddr) +bool hppa_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, + MMUAccessType type, int mmu_idx, + bool probe, uintptr_t retaddr) { HPPACPU *cpu = HPPA_CPU(cs); CPUHPPAState *env = &cpu->env; @@ -237,6 +239,9 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, excp = hppa_get_physical_address(env, addr, mmu_idx, a_prot, &phys, &prot); if (unlikely(excp >= 0)) { + if (probe) { + return false; + } trace_hppa_tlb_fill_excp(env, addr, size, type, mmu_idx); /* Failure. Raise the indicated exception. */ cs->exception_index = excp; @@ -253,6 +258,13 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, /* Success! Store the translation into the QEMU TLB. */ tlb_set_page(cs, addr & TARGET_PAGE_MASK, phys & TARGET_PAGE_MASK, prot, mmu_idx, TARGET_PAGE_SIZE); + return true; +} + +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType type, int mmu_idx, uintptr_t retaddr) +{ + hppa_cpu_tlb_fill(cs, addr, size, type, mmu_idx, false, retaddr); } /* Insert (Insn/Data) TLB Address. Note this is PA 1.1 only. */