From patchwork Fri May 23 00:42:01 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: 351672 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 02D9F140082 for ; Fri, 23 May 2014 10:46:22 +1000 (EST) Received: from localhost ([::1]:40260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wndcp-0003Sb-OD for incoming@patchwork.ozlabs.org; Thu, 22 May 2014 20:46:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WndcM-0002qW-G3 for qemu-devel@nongnu.org; Thu, 22 May 2014 20:45:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WndcF-0006GV-BI for qemu-devel@nongnu.org; Thu, 22 May 2014 20:45:50 -0400 Received: from mail-qc0-x22b.google.com ([2607:f8b0:400d:c01::22b]:42872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WndcF-0006GJ-8C for qemu-devel@nongnu.org; Thu, 22 May 2014 20:45:43 -0400 Received: by mail-qc0-f171.google.com with SMTP id x13so7180580qcv.30 for ; Thu, 22 May 2014 17:45:42 -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=PxFc18wj5ct25PgmfPEPkbRBhF+xi573AnupMgKkwuE=; b=gF5INDPbHOSKtT18JmOeul1VAagrnvgQiH4QL9XvBaT2a4f0F1kKbjFPyY4SgDFA8X C8+P2kPSqqsQL5FzIfEv17ErKlt9zOcTmIZiRljiNNarhUn0q9WRoSKLu6/GTVHacFUj Bw/On1SwgKcor3K5V7lmnsRBoD+NDJVrkfRIirdcCcfjYoTRDnGwZF4KQEYNjpioQ92Z GWvJVR9++52qGAJxwJt3IuHR71aNSqUq850VaoBh3sXeWqLkJu8C88efZLmj/4ucYGX4 evpZYrW2bN4v+b+SgSLECqvTINMeVQ1aQGSSpvUmQ4hd3GIUmdQ9tDNWD5HdVVYAmBam 0rew== X-Received: by 10.140.97.197 with SMTP id m63mr1639164qge.15.1400805942780; Thu, 22 May 2014 17:45:42 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id b5sm934225qge.17.2014.05.22.17.45.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 17:45:41 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 23 May 2014 10:42:01 +1000 Message-Id: <1400805738-11889-5-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400805738-11889-1-git-send-email-edgar.iglesias@gmail.com> References: <1400805738-11889-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:400d:c01::22b 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 v4 04/21] 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 AArch32 code. Signed-off-by: Edgar E. Iglesias --- target-arm/translate-a64.c | 9 --------- target-arm/translate.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index b62db4d..bfd139a 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -162,15 +162,6 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, } } -static int get_mem_index(DisasContext *s) -{ -#ifdef CONFIG_USER_ONLY - return 1; -#else - return s->user; -#endif -} - 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..8737af0 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -52,6 +52,15 @@ static inline int arm_dc_feature(DisasContext *dc, int feature) return (dc->features & (1ULL << feature)) != 0; } +static inline int get_mem_index(DisasContext *s) +{ +#ifdef CONFIG_USER_ONLY + return 1; +#else + return s->user; +#endif +} + /* 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.