From patchwork Thu May 23 14:00:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165010 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2245951ili; Thu, 23 May 2019 07:13:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1aDeOFSaNUETeUHTH48KaPkZTiDotzLvwa2esWyS6mLc7AqCmopQYhBI2+45Ve045JbB9 X-Received: by 2002:aa7:ca4f:: with SMTP id j15mr96593584edt.276.1558620807847; Thu, 23 May 2019 07:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558620807; cv=none; d=google.com; s=arc-20160816; b=TMZ8KtCRkaNAgcw4VkhFqy5H0m90Aj/ZlH15EmwdUfNBd8iRkc8XD7iRwUzxwB7OB/ PmPCeQoe2gJVf7YN6JdUB/ciVkmvnj2J6HqyVANkoe6MZbw2dhJSSWEAHlonV/SlNnD9 OWup0S08CF3QLtzQ/iPIe3UcR4Qjip5SzGHAmWbzQWL6TtOe01tt9PJsjhmhqQ6GJYtn vnAlD9ZKvpKAbmPABRq5D7alO6mbokBl3GzK0Wd+z6VGR7/9byMC4Zh8g9+cGUWswh2K 0SCCYEs/J2OXNVQttFKs416IOZXxoDbt7qz89h4TJu2AhbYHZMvuSq66WbvS5v9gTbmL wv5Q== 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=YB1fZJoA1Y1wxrdEJayHVTCzPLNtdm/r4TsjTEPf7eE=; b=AHat5l7m5uzHFoveKL79fR1fBiF97g+vAI2uTgN5xLysQmjxDOpNPoyn8tdP/YMTdD vpThalj5cjS3xQ9i+2p+xOB7MBfeYDEL/OTJApA0rZy8wsyGp8xcIYHT7FwbfmOJfcvk 9QLsXVO6wDEMmwlwkEYRdJwXjydqWml5+04UJq0k3PVaR9EFYKJ9Rl0MyJqqscO13cxc 0UPk2aBUJi0fKeXqQ1KVrBBjIQoD9/WIHMtpPFThHKmkBQDbbViJwdkr3IC+rtwVjhqc JPdvh6dAA8sJcfmoHz35sygVjfvJX4twkCnhKzPoLzRQU6S3HwYxeRRL6VQA1ellBLY3 rGqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="B/UmNJcU"; 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 pk12si7675712ejb.77.2019.05.23.07.13.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 07:13:27 -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="B/UmNJcU"; 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]:37133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hToTG-0000SW-Nq for patch@linaro.org; Thu, 23 May 2019 10:13:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hToHa-0006G8-9y for qemu-devel@nongnu.org; Thu, 23 May 2019 10:01:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hToHZ-0004W9-3X for qemu-devel@nongnu.org; Thu, 23 May 2019 10:01:22 -0400 Received: from mail-vs1-xe42.google.com ([2607:f8b0:4864:20::e42]:45553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hToHY-0004V3-VW for qemu-devel@nongnu.org; Thu, 23 May 2019 10:01:21 -0400 Received: by mail-vs1-xe42.google.com with SMTP id k187so3619909vsk.12 for ; Thu, 23 May 2019 07:01:20 -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=YB1fZJoA1Y1wxrdEJayHVTCzPLNtdm/r4TsjTEPf7eE=; b=B/UmNJcUfwurBTD6GtX5T1UFo3oDrI9OrwB33nF75S8mgqcvqfX3UiVKP44FXt5k26 HM0h9BNes+T/SMLulrdNgGcj0Bi/KkMfqLXoEoM6YH1oQPQDw5r22DjMP+MxpvKbGVZV wcr7bfoNvGxihu4BD0af04Gy0SZMOuRZEAsoyo71jKy02ikihniIfWrd1oAWpyUfUXtF J6yJfZfwWHnbaN129rNak1qpNIFrtxCswSEC5J+qgmgrrzomIK18lDsWb0HpmUX3cJl0 dWA5nzeremXvnhcWkFmiOYV9uDmLomV4iFM/01ihwKdt/xCDP2vDjoe2XLb0D60PGFk5 yRjQ== 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=YB1fZJoA1Y1wxrdEJayHVTCzPLNtdm/r4TsjTEPf7eE=; b=q3cgk/lYWYUDvm7+i5E4nzf9gBqoXcfkZfM1Uby3H9bVG9RsMIo8FMmSWfh5AAo9i2 Dr0lj7MmlBzc0dS6D5JynFdY7zfMWPMzgtTyrpMhtDrt2kAW2SR0Zi82iXGcPeIQH/eG h/y3xp8prpZR3KUJQMrqbpvsn896hzpiACQwjgD14fwrn1sRtdXZCcW+oUYFXySAoVvy u4F67i31kEvtGiy0rO45LptbCp8mXcWPcm62fvS10cIldDOlLZrGLHZR9lAQvoEwf6KQ zBeOEAlFAu7eXJJfTfp8LkwEQ63Qe84U5hYJC4SA2cBctjHTkYhWQzlQ1wh4vBkz/l9x IiXg== X-Gm-Message-State: APjAAAUX38+6+i29URhkt24URvD6gj26K1kjBVWQzaqyzvE7G+Nch4nK WWTPaw7e8FjjCEStNMrIop59PX+oOB1W/Q== X-Received: by 2002:a67:eb82:: with SMTP id e2mr45758309vso.13.1558620079920; Thu, 23 May 2019 07:01:19 -0700 (PDT) Received: from localhost.localdomain (ip-173-130-215-183.orldfl.spcsdns.net. [173.130.215.183]) by smtp.gmail.com with ESMTPSA id v133sm1984166vkv.5.2019.05.23.07.01.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 07:01:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 10:00:57 -0400 Message-Id: <20190523140059.18548-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523140059.18548-1-richard.henderson@linaro.org> References: <20190523140059.18548-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::e42 Subject: [Qemu-devel] [PULL 11/13] target/rx: 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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: Richard Henderson --- target/rx/cpu.c | 14 ++++++++++++++ target/rx/op_helper.c | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 4b96f2e463..3268077d08 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -143,6 +143,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); @@ -177,6 +190,7 @@ static void rxcpu_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); -}