From patchwork Thu Jun 28 03:03:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140391 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1647498ljj; Wed, 27 Jun 2018 20:10:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpclkMoOeDXAoKyiknE6QzD3ht5I0iIvViw7iqIUxIGAszI202lE0vlWFOSyWgdsDwIsHGMb X-Received: by 2002:a37:4bd8:: with SMTP id y207-v6mr7045559qka.98.1530155405807; Wed, 27 Jun 2018 20:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530155405; cv=none; d=google.com; s=arc-20160816; b=Fp5JdTsvrBW5DuMTM6Fmj2Xy5SXg4h7QebsIHWMVePdaFptkX7TL5QLgu/gdCwEXQY 15w6dZ97Ci/p3outSdpBSWIQPNnkvS2siw8uXhV7tp6gCtbHCVYw9dYH9PjDT4A+ai9A 5nKM6XyKwn8SnKGicrslp9tIcDPjK+hTqsLSV9qMcXHOaqbfcvdnbWdQ/xhb4GvUXqEJ fRIiboYvBLDa1AZAwD9w33cX6AWktvODDUshw2St1gurTJAMuLSzsj1p0CxQloBrgiUM TTYGPArAN3TUSXY7BQpBGY9jASpGpuCq+SUdWvIE68mQQTeALexSE0cz8yKGZ5H4mjW9 LBOg== 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:arc-authentication-results; bh=Oiaw84aOleXkI3aNsvyBwT2UQxV+BKJ1RrZpjWmHXRA=; b=FIMlyIZMJ0u07yWDhCAskN7GJ3IsxDCn8w09G+QPrAmTHRg5fA/eiSTPQlrgj9MObk rZwd9ad4mvvHCp+tKiDep6Wbpg+jOUe4U+iLgj6rLaoQsY29jAKb2SbmnPVtGMMn1CHq cu8xetni5GeNakgAB82NYAzO978fskvqNSluW56tXOawrF5epPD1cGGu6cH+acfDM9/s PJaZYWRqcyAiIAx/p5ZED3FB1qQtYnJRuchwkmsKQj/tWboP0uh1X6xHe+ljvqdnJPM8 lqgJArnH/4c1B0Jvw2YGRgtUPGjx2M5mcOy47GIvhden1PM5UIH75hqySTsbVDDsCc1S YYTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=STy332Y+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z127-v6si1653057qkz.199.2018.06.27.20.10.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Jun 2018 20:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=STy332Y+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:34268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNJt-0001b1-71 for patch@linaro.org; Wed, 27 Jun 2018 23:10:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNDt-00051E-Ai for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYNDr-0007xk-OC for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:52 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:37548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYNDr-0007wI-I5 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:51 -0400 Received: by mail-pf0-x244.google.com with SMTP id y5-v6so1890337pfn.4 for ; Wed, 27 Jun 2018 20:03: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 :mime-version:content-transfer-encoding; bh=Oiaw84aOleXkI3aNsvyBwT2UQxV+BKJ1RrZpjWmHXRA=; b=STy332Y+LBrX50W4fjuGzcXWDeyNKCErtHWHo/1N7bPJK+/PH2exMhWy+0iDpoKWGm Xz7iLYGedv6A2hT4Whs7soJ1xnG3HdmLFoDqIN5Ca++ULi8acZdMkXCwG7erNRwo9cFA oZOg8fBow7QFG0KLfdSVQ/6zlwQMwi74w3R78= 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=Oiaw84aOleXkI3aNsvyBwT2UQxV+BKJ1RrZpjWmHXRA=; b=lYd313MhcUiGF2PI/4q0FW5QqR9jZMi09311IrDMh32x1Ckvl8506wUgShl8+EubuC ps7n4K1kkhmK62mKwyw4TFiW8HplBSO2Tu8dFXpZZrK3lRnX5fulp95EQmAieQcDNCQm d70+XbLT3ThuBKwUSjlb1+DITa/75Sgq7p7kHRjtsfu6Xqu7h5DnkUJ6/AnGntM98/N+ 4WgQIGL4LLjflEcJxuGAXSPvskopM7rV4W80qGnKgV+qBtIhk6i5nokl1p4SeLpzsKlj 4e3J0vfc3vprs6Pz/QE8ph2UG3L2p342wUyhnbSwJeFynuX/vdfOCGOZt8xIYv+UZAVD jy8A== X-Gm-Message-State: APt69E0pyBfyvlBJRoCjA6PWC+aPVQUk4wCxg5pf0Q9ZPmMXn9jBsh5U CD0APn6M/FBax/YG783fbPYZ5pWW0fo= X-Received: by 2002:a63:4002:: with SMTP id n2-v6mr7153477pga.285.1530155030276; Wed, 27 Jun 2018 20:03:50 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id y15-v6sm8030489pfm.136.2018.06.27.20.03.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 20:03:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 20:03:20 -0700 Message-Id: <20180628030330.15615-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628030330.15615-1-richard.henderson@linaro.org> References: <20180628030330.15615-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:400e:c00::244 Subject: [Qemu-devel] [PATCH v3 13/23] target/openrisc: Merge mmu_helper.c into mmu.c 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: shorne@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" With tlb_fill in mmu.c, we can simplify things further. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/openrisc/mmu.c | 11 ++++++++++ target/openrisc/mmu_helper.c | 40 ----------------------------------- target/openrisc/Makefile.objs | 2 +- 3 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 target/openrisc/mmu_helper.c -- 2.17.1 diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index b2effaa6d7..9b4b5cf04f 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -240,4 +240,15 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) return phys_addr; } } + +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + int ret = openrisc_cpu_handle_mmu_fault(cs, addr, size, + access_type, mmu_idx); + if (ret) { + /* Raise Exception. */ + cpu_loop_exit_restore(cs, retaddr); + } +} #endif diff --git a/target/openrisc/mmu_helper.c b/target/openrisc/mmu_helper.c deleted file mode 100644 index 97e1d17b5a..0000000000 --- a/target/openrisc/mmu_helper.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * OpenRISC MMU helper routines - * - * Copyright (c) 2011-2012 Jia Liu - * Zhizhou Zhang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/exec-all.h" -#include "exec/cpu_ldst.h" - -#ifndef CONFIG_USER_ONLY - -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) -{ - int ret; - - ret = openrisc_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); - - if (ret) { - /* Raise Exception. */ - cpu_loop_exit_restore(cs, retaddr); - } -} -#endif diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs index 8b8a890c59..b5432f4684 100644 --- a/target/openrisc/Makefile.objs +++ b/target/openrisc/Makefile.objs @@ -1,7 +1,7 @@ obj-$(CONFIG_SOFTMMU) += machine.o obj-y += cpu.o exception.o interrupt.o mmu.o translate.o disas.o obj-y += exception_helper.o fpu_helper.o \ - interrupt_helper.o mmu_helper.o sys_helper.o + interrupt_helper.o sys_helper.o obj-y += gdbstub.o DECODETREE = $(SRC_PATH)/scripts/decodetree.py