From patchwork Mon May 19 09:22:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 350172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FEEC140086 for ; Mon, 19 May 2014 19:27:54 +1000 (EST) Received: from localhost ([::1]:46836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJrM-0000Gg-6q for incoming@patchwork.ozlabs.org; Mon, 19 May 2014 05:27:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJql-0007kC-PA for qemu-devel@nongnu.org; Mon, 19 May 2014 05:27:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmJqf-0006Ad-Qv for qemu-devel@nongnu.org; Mon, 19 May 2014 05:27:15 -0400 Received: from mail-yh0-x22a.google.com ([2607:f8b0:4002:c01::22a]:46484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJqf-0006AB-Nj for qemu-devel@nongnu.org; Mon, 19 May 2014 05:27:09 -0400 Received: by mail-yh0-f42.google.com with SMTP id t59so6528545yho.15 for ; Mon, 19 May 2014 02:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NHSHcJpTD7XMg9Pp56MDqjICgiwVcp7Evs5UdV3+gjY=; b=K9R9FYx70GJhb6Orf3/Vgodp2V4jwjoSydWxIUsbEsnC7Y0nYcwHKzHLLLTXo/EGw1 k/U+XWSrfUT26JF4c8ep25Pw0JEqtfyhQbrk38J+1WDput2fC4g+fRaMZ3p0kdSQSx0t 1qp0ggPThYC5lF1cSIpd9FxDpB+7S6vgyJFdLgU/I+t3eXMuPt9So73JwAlolU9homR8 OMam6FcAN7HZnbKI/YHtxve4h7CJ8DFgqYONQjTl54ePMOH0QpuDUf3q+Py+On8KJAPh HNLXbKc+uCNLiK+/AynnbqsenZw5yMjf52bpM7VIzP/GDoDRPYtwIDu4/+7BYPGeYHQn 5w3g== X-Received: by 10.236.29.103 with SMTP id h67mr19652436yha.111.1400491629410; Mon, 19 May 2014 02:27:09 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id c8sm16714665yhb.39.2014.05.19.02.27.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 19 May 2014 02:27:07 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 19 May 2014 19:22:46 +1000 Message-Id: <1400491383-6725-6-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> References: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::22a Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 05/22] target-arm: Move get_mem_index to translate.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" So that it can be shared with the A32 code in the future. Signed-off-by: Edgar E. Iglesias --- target-arm/translate-a64.c | 5 ----- target-arm/translate.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 7fce05f..bfd139a 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -162,11 +162,6 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, } } -static inline int get_mem_index(DisasContext *s) -{ - return arm_el_to_mmu_idx(s->current_pl); -} - void gen_a64_set_pc_im(uint64_t val) { tcg_gen_movi_i64(cpu_pc, val); diff --git a/target-arm/translate.h b/target-arm/translate.h index 34328f4..db6f0af 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -52,6 +52,11 @@ static inline int arm_dc_feature(DisasContext *dc, int feature) return (dc->features & (1ULL << feature)) != 0; } +static inline int get_mem_index(DisasContext *s) +{ + return arm_el_to_mmu_idx(s->current_pl); +} + /* target-specific extra values for is_jmp */ /* These instructions trap after executing, so the A32/T32 decoder must * defer them until after the conditional execution state has been updated.