From patchwork Fri May 23 15:31:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 30817 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 973C320AEA for ; Fri, 23 May 2014 15:31:50 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id jt11sf18868252pbb.2 for ; Fri, 23 May 2014 08:31:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Oi6YfGQjKGLMswA6xpQrKdVn0oUeH5sDYGK+o8QY9LY=; b=O3pv0g3G05qtjXfU7bV+FfOg6jjOBF9bNRKW2LoVUems2R4RdSx0c8ZTKCCcxslv2Q Ykbhzxr45QdZwgIryp8R9rk9MUOYn7hMqiZ8q0MB8t4Lk6kGDvSNvoiJJxAjPx69/kC0 VJ0rsGIsz8RkdHu4bx2h+AM1OZ1NMLzrzYQYcMN0GEEQ7KxB/5GuwPXo+gRIZwx8FQmY c0VmMHpNfF1sOO8fMDtsnDDjkSpbI1gbEpGhESLS7BLn6G6rIPD7wPZWo+DaLNw/rTg7 3OEOnVO4p0cm2qDoEACJY5J/ruKKqRlQulYZIrwS+AkQNz9ovK3UOBX2E979bN+mJAvK CrDQ== X-Gm-Message-State: ALoCoQlaMPnf2KpulG5faMYjqrR+iAyrqbcDo5/hZpf3CnKhxQi/MiGv/XADUQBdli5yjWxXrEE3 X-Received: by 10.66.169.231 with SMTP id ah7mr2572906pac.40.1400859109631; Fri, 23 May 2014 08:31:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.229 with SMTP id j92ls1787852qgf.14.gmail; Fri, 23 May 2014 08:31:49 -0700 (PDT) X-Received: by 10.58.228.163 with SMTP id sj3mr4924744vec.28.1400859109502; Fri, 23 May 2014 08:31:49 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id h18si1824959vdg.75.2014.05.23.08.31.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 08:31:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so640099vcb.8 for ; Fri, 23 May 2014 08:31:49 -0700 (PDT) X-Received: by 10.58.245.2 with SMTP id xk2mr4840147vec.9.1400859109435; Fri, 23 May 2014 08:31:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp40966vcb; Fri, 23 May 2014 08:31:49 -0700 (PDT) X-Received: by 10.182.128.168 with SMTP id np8mr5808545obb.21.1400859107430; Fri, 23 May 2014 08:31:47 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ir10si5019265obb.94.2014.05.23.08.31.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 23 May 2014 08:31:47 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WnrRe-000472-8G; Fri, 23 May 2014 16:31:42 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" , peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, aggelerf@ethz.ch, rth@twiddle.net Subject: [PATCH 1/5] target-arm: Move get_mem_index to translate.h Date: Fri, 23 May 2014 16:31:38 +0100 Message-Id: <1400859102-15779-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400859102-15779-1-git-send-email-peter.maydell@linaro.org> References: <1400859102-15779-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Edgar E. Iglesias" So that it can be shared with the AArch32 code. Signed-off-by: Edgar E. Iglesias Message-id: 1400805738-11889-5-git-send-email-edgar.iglesias@gmail.com --- 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.