From patchwork Fri May 10 15:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163869 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2515941ilr; Fri, 10 May 2019 08:24:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwHf0LXTmtxBLPSN2zoipC/vGS8XRTYqXUiGd2TUlHq2MIxmlcse3KDDfCsqPqMhGX1dCyV X-Received: by 2002:a17:906:d293:: with SMTP id ay19mr9215252ejb.92.1557501869094; Fri, 10 May 2019 08:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557501869; cv=none; d=google.com; s=arc-20160816; b=QasUFHvvvHSiFLqI34nP2P84Y1XvxbOUPm+ZQ3BFL3dyQRd1KwzhunmqJ427C6CwL+ chCtMrJvcaJRS74q8wSJZjCj7VkWj0NowapRsmvz1Jgedib5BUc3R2uFYmVYz5zt8jHI jtNmU8iOK5+CQ2O5YTuL8l17uuVcSlMw2LPBxFgC3HI+a595zKqWftjBCoj0Y9/iMf4K S1SRo0daLhspUfGmRzIMxSLssjnh4jCll9quqMBvXJJehul1vhwvTtWRcFXwNvW9EgMf 6cKOtyY0QwzweGY5b0wSf7u/VFMjR2kON1QuNnJHnE1X+9rcFounRVHrpq192bEYm22G qJ5A== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8AceDIzAKZ/IbsaMhEPVD0M5uShF47/3BlNlJvJR/2s=; b=m/Re1xZl3myUKD+JXxNDltUxlnyZPfTNsqbQiGeV3f5+7rrztDD3HKTgXDp+ZFYbXR VSReSLvl/F/hJ9THNH/OE7oBefxl9hOYRfwIjGfN8+B3WqHgP33f8iGmR9zvotVbIOGX QyuiAe56/vNrVBF3/wp0wZLasYhsbJ7DQCKVYBYc3wQtFuhxBRgPK1z+R72kUlZFKgDy 5YDXR2C8I/IvRtWeddmd6zZfxQoQ2nALc2owT87wZ4CX1uaFoe670ZC36Pfy4moMqAzB lyIsNp74PXmZ0LAGhKuS9xbzKqRbkaobeIVshHzswkTxYQnyvOCkbx82H1EuLsDAP2ax j6RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hGjmaRZJ; 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 a55si4248295edd.174.2019.05.10.08.24.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 08:24:29 -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=hGjmaRZJ; 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]:45024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7Nr-0003JN-SH for patch@linaro.org; Fri, 10 May 2019 11:24:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7Jc-0007bD-HH for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP7Jb-0008UC-5v for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:04 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:42737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP7Ja-0008Tn-W4 for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:03 -0400 Received: by mail-pl1-x643.google.com with SMTP id x15so2977956pln.9 for ; Fri, 10 May 2019 08:20:02 -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 :mime-version:content-transfer-encoding; bh=8AceDIzAKZ/IbsaMhEPVD0M5uShF47/3BlNlJvJR/2s=; b=hGjmaRZJ6SsroPsebkbxKe+CgoX8Ue3qK9qGRzCpeZx5LwtcCQjsp0Cevvq87jIwyM gdkFEP/UmiQ53GERO+lHAylJwhcMJqar83e2DCcXs3A0S3lF/4/i4XhuhTIAbJUTI5B5 WaCHyfDBEBp9aWX5dW+ZWsNlXV6Ok+cw5P7RI2IFa8Ggq6IhHFB77gCTSjkVEb+SqIps nlPzWjMQeNmsOhJbNniXC8rxy7O65GbAAnZT4l2OZFullsBn8IJjiokkpiCIA64vzTvl RKlkOM7NM4XOE7DVwjuLIqzZluK993mAX+jgKueRj3JO/IewQDVo1MsxWKSrZlrnq82J NuMg== 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:mime-version:content-transfer-encoding; bh=8AceDIzAKZ/IbsaMhEPVD0M5uShF47/3BlNlJvJR/2s=; b=A6R8mfD82G/GlINyL41MDV0YF3UBzjffQ/iny8+xX7G2Sb12gURJoaGttk9Tznjhfr ADA/zew0fmAKykzYAjISvRZEvYtnT1hZFdfCU68g+NKueDXQsOs5C+zWQL9/im6+rGLF 8YE1GjlzivDjZcvulweZwf6r6IqrKQOxrXt8BMgViKYkJgHA5/oYCW0MJntIGm0zAhQ5 tFOjmQPx9hW7UGvCLge58F2hoXburRrV4k5ELG7OFv1tKIegP8cmNmtiJyfKE75iEY34 a0W6MYuQqlCOieOxstgPADJ0+wki085jHKbxgBFiyPGShk4OGtNSf4ILEQOQf99Qq7uD oa7A== X-Gm-Message-State: APjAAAU9S1FP8v+XWgzaWsNo277iGRIKewO3SkQ65iwsFzElw9IwWTsG iBHB1t3KwrxT6MWLVfBn0kZ9VFBRWsw= X-Received: by 2002:a17:902:7c93:: with SMTP id y19mr13688072pll.55.1557501601785; Fri, 10 May 2019 08:20: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 19sm5920517pgz.24.2019.05.10.08.20.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 08:20:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 08:19:29 -0700 Message-Id: <20190510151944.22981-13-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> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PULL 12/27] target/mips: 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: Aleksandar Rikalo , peter.maydell@linaro.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Note that env->active_tc.PC is removed from the qemu_log as that value is garbage. The PC isn't recovered until cpu_restore_state, called from cpu_loop_exit_restore, called from do_raise_exception_err. Cc: Aleksandar Markovic Cc: Aleksandar Rikalo Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/internal.h | 5 +++-- target/mips/cpu.c | 5 ++--- target/mips/helper.c | 45 ++++++++++++++++++++++------------------- target/mips/op_helper.c | 15 -------------- 4 files changed, 29 insertions(+), 41 deletions(-) -- 2.17.1 diff --git a/target/mips/internal.h b/target/mips/internal.h index 286e3888ab..b2b41a51ab 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -202,8 +202,9 @@ void cpu_mips_start_count(CPUMIPSState *env); void cpu_mips_stop_count(CPUMIPSState *env); /* helper.c */ -int mips_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, - int mmu_idx); +bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); /* op_helper.c */ uint32_t float_class_s(uint32_t arg, float_status *fst); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index e217fb3e36..ebdb834b97 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -197,9 +197,8 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->synchronize_from_tb = mips_cpu_synchronize_from_tb; cc->gdb_read_register = mips_cpu_gdb_read_register; cc->gdb_write_register = mips_cpu_gdb_write_register; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = mips_cpu_handle_mmu_fault; -#else + cc->tlb_fill = mips_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->do_unassigned_access = mips_cpu_unassigned_access; cc->do_unaligned_access = mips_cpu_do_unaligned_access; cc->get_phys_page_debug = mips_cpu_get_phys_page_debug; diff --git a/target/mips/helper.c b/target/mips/helper.c index 86e622efb8..3a4917ce7b 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -874,31 +874,25 @@ refill: #endif #endif -int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { MIPSCPU *cpu = MIPS_CPU(cs); CPUMIPSState *env = &cpu->env; #if !defined(CONFIG_USER_ONLY) hwaddr physical; int prot; - int access_type; + int mips_access_type; #endif int ret = TLBRET_BADADDR; -#if 0 - log_cpu_state(cs, 0); -#endif - qemu_log_mask(CPU_LOG_MMU, - "%s pc " TARGET_FMT_lx " ad %" VADDR_PRIx " rw %d mmu_idx %d\n", - __func__, env->active_tc.PC, address, rw, mmu_idx); - /* data access */ #if !defined(CONFIG_USER_ONLY) /* XXX: put correct access by using cpu_restore_state() correctly */ - access_type = ACCESS_INT; - ret = get_physical_address(env, &physical, &prot, - address, rw, access_type, mmu_idx); + mips_access_type = ACCESS_INT; + ret = get_physical_address(env, &physical, &prot, address, + access_type, mips_access_type, mmu_idx); switch (ret) { case TLBRET_MATCH: qemu_log_mask(CPU_LOG_MMU, @@ -915,7 +909,7 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, tlb_set_page(cs, address & TARGET_PAGE_MASK, physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, mmu_idx, TARGET_PAGE_SIZE); - return 0; + return true; } #if !defined(TARGET_MIPS64) if ((ret == TLBRET_NOMATCH) && (env->tlb->nb_tlb > 1)) { @@ -926,27 +920,36 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mode = (env->hflags & MIPS_HFLAG_KSU); bool ret_walker; env->hflags &= ~MIPS_HFLAG_KSU; - ret_walker = page_table_walk_refill(env, address, rw, mmu_idx); + ret_walker = page_table_walk_refill(env, address, access_type, mmu_idx); env->hflags |= mode; if (ret_walker) { - ret = get_physical_address(env, &physical, &prot, - address, rw, access_type, mmu_idx); + ret = get_physical_address(env, &physical, &prot, address, + access_type, mips_access_type, mmu_idx); if (ret == TLBRET_MATCH) { tlb_set_page(cs, address & TARGET_PAGE_MASK, physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, mmu_idx, TARGET_PAGE_SIZE); - return 0; + return true; } } } #endif + if (probe) { + return false; + } #endif - raise_mmu_exception(env, address, rw, ret); - return 1; + raise_mmu_exception(env, address, access_type, ret); + do_raise_exception_err(env, cs->exception_index, env->error_code, retaddr); +} + +#ifndef CONFIG_USER_ONLY +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + mips_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, false, retaddr); } -#if !defined(CONFIG_USER_ONLY) hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, int rw) { hwaddr physical; diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 0f272a5b93..6d86912958 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -2669,21 +2669,6 @@ void mips_cpu_do_unaligned_access(CPUState *cs, vaddr addr, do_raise_exception_err(env, excp, error_code, retaddr); } -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) -{ - int ret; - - ret = mips_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); - if (ret) { - MIPSCPU *cpu = MIPS_CPU(cs); - CPUMIPSState *env = &cpu->env; - - do_raise_exception_err(env, cs->exception_index, - env->error_code, retaddr); - } -} - void mips_cpu_unassigned_access(CPUState *cs, hwaddr addr, bool is_write, bool is_exec, int unused, unsigned size)