From patchwork Fri Jun 7 15:37:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 166179 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp896390ili; Fri, 7 Jun 2019 10:10:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTzeKeM2zKluCBFqwou0wHuZR6DNsTH5cU9WhYbYHuE5xVeAa4VqLpEf7rcbNxe9ffWDSB X-Received: by 2002:ac8:1751:: with SMTP id u17mr33205008qtk.305.1559927423188; Fri, 07 Jun 2019 10:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559927423; cv=none; d=google.com; s=arc-20160816; b=sTokQWpzi8GOugx46TeHtFcc7YMfA5WE4fZD/4F344PvTwK8kh9g16mRRtlI4xLz3Y P4BkjOHyOygHq/1O+aKL/4mGjfXMlBAF9LWzHRc/ckXXQoPPWvxF+5oqG374i2EN9ek5 TvAd9XBgKQ3VrheNyKKMALx7lLAhhMBmxgxG7CJn/bgMmXYnIUaR6q0DIcrKUeE3uqd1 3nq+pIJfeSsoYfuOJ5FEdkOM4QaXy9XiJBWSALQ/oFVpEw/iSKnoGienAJyVn1yj2mIn tk60IocQ+/ivcfOoA9zTJptHRr1mY8vhDwjXL7+7cfYYZFONofj+NeCICb9rj3v9w7RN qP9Q== 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; bh=zRn4K2xRQOuoqH211bU4Zf9s4Z36VUpnuRoTC1Mq4p4=; b=EoFilLkb0f+WBe0QjK4vWRFbGq1yOsBGAnISoD7WppF7jv7d7CaG7SDG0npyYMyoYU OsoRfIkFw0ZOldWTJl2lAD2TTjcDVElVOJ0wR8oETnUcr7ZfR2Fg4EAKyhR6AaKsAkOW vndET8epbxBZIgiOEX02aMB6tJN6HKPDBgYx1OjPyrbKgAPg2rpFAcl3JnPvw5Q0CQQM FpiB01Z9GdX3KTQo/Lz3EZZ7hu1W6CQL2qwfOfM4ncHaS5tFi4cTykczpcwGZCmIVM9T 0JH+whCiITV03sA31dAfF084ch7euKbmvN9poRbI6gCUWnD1j1D6ai4yy8tdqs6eeu6/ xcLg== ARC-Authentication-Results: i=1; mx.google.com; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p45si1640022qvf.13.2019.06.07.10.10.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jun 2019 10:10:23 -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; 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=redhat.com Received: from localhost ([::1]:49678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZINi-0007EX-PQ for patch@linaro.org; Fri, 07 Jun 2019 13:10:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53453) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZGzy-0003ZH-Cq for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:41:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZGwq-0001Z9-J2 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:38:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36096) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZGwq-0001Wp-BK for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:38:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1DAAC3001702; Fri, 7 Jun 2019 15:38:31 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2752498BD; Fri, 7 Jun 2019 15:38:26 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Yoshinori Sato , qemu-devel@nongnu.org, Igor Mammedov , Richard Henderson Date: Fri, 7 Jun 2019 17:37:10 +0200 Message-Id: <20190607153725.18055-15-philmd@redhat.com> In-Reply-To: <20190607153725.18055-1-philmd@redhat.com> References: <20190607153725.18055-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 07 Jun 2019 15:38:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v18 14/29] target/rx: Convert to CPUClass::tlb_fill X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The interface for tlb_fill has changed very recently. Move the function into cpu.c so that it may be static while assigning to the CPUClass methods. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Yoshinori Sato Message-Id: <20190607091116.49044-12-ysato@users.sourceforge.jp> Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/rx/cpu.c | 14 ++++++++++++++ target/rx/op_helper.c | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/target/rx/cpu.c b/target/rx/cpu.c index c370f65faa..3eef1329a1 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -154,6 +154,19 @@ static void rx_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_rx; } +static bool rx_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) +{ + uint32_t address, physical, prot; + + /* Linear mapping */ + address = physical = addr & TARGET_PAGE_MASK; + prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + tlb_set_page(cs, address, physical, prot, mmu_idx, TARGET_PAGE_SIZE); + return true; +} + static void rx_cpu_init(Object *obj) { CPUState *cs = CPU(obj); @@ -188,6 +201,7 @@ static void rx_cpu_class_init(ObjectClass *klass, void *data) cc->get_phys_page_debug = rx_cpu_get_phys_page_debug; cc->disas_set_info = rx_cpu_disas_set_info; cc->tcg_initialize = rx_translate_init; + cc->tlb_fill = rx_cpu_tlb_fill; cc->gdb_num_core_regs = 26; } diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 9a460070e9..fb7ae3c3ec 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -468,14 +468,3 @@ void QEMU_NORETURN helper_rxbrk(CPURXState *env) { raise_exception(env, 0x100, 0); } - -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) -{ - uint32_t address, physical, prot; - - /* Linear mapping */ - address = physical = addr & TARGET_PAGE_MASK; - prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - tlb_set_page(cs, address, physical, prot, mmu_idx, TARGET_PAGE_SIZE); -}