From patchwork Tue Nov 4 12:30:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 40141 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8A9BB240A6 for ; Tue, 4 Nov 2014 12:31:58 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf4022905eek.2 for ; Tue, 04 Nov 2014 04:31:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=pUy/AWTCEC8MznmuX87wOzZLIb2CT6GdduAOYMFfyuQ=; b=Uq+uNtLmM1oLAeu4BKQoBJYGeb6HGn7aIKLPTjMd62H+qmuoWKocT1Nj2//Tred0bj Z2biljiEkutBCPbcjT2EFrnS1Ir+grFcTNaN7IA6faIWiG+YnGdidrHMBLKewzbnPu4c xv4uipOR130aaK387dS9ViQVJLa9GmUI8zUzbLzNoytKLTf+H9ZgRhlTG5Y9uvGVf+qz xjthH1ykxQWSsCAPixPy2tQBSTqobhLb3D9VpPZ4eNT/4/l8WTxOiAEtzrU0GlHDUv5e LaekOYciAxn4P/STX9AdJvkpSIC85c/7Q59joR8jFG4uzaUamjg8h768/PZuwC6dhluD Tz5A== X-Gm-Message-State: ALoCoQlyxklfk3X0TNYJsL6ibj/Yd6OtC7YTDKpn1lF5f/Gd37zJeQrT6fddUt+4DU7M4gJ2PB2o X-Received: by 10.152.26.72 with SMTP id j8mr8584657lag.3.1415104317319; Tue, 04 Nov 2014 04:31:57 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.167 with SMTP id kr7ls825926lac.94.gmail; Tue, 04 Nov 2014 04:31:57 -0800 (PST) X-Received: by 10.113.5.7 with SMTP id ci7mr60044226lbd.9.1415104317052; Tue, 04 Nov 2014 04:31:57 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id kz1si502895lbc.63.2014.11.04.04.31.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 04:31:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id s18so774190lam.27 for ; Tue, 04 Nov 2014 04:31:56 -0800 (PST) X-Received: by 10.152.29.8 with SMTP id f8mr59034803lah.56.1415104316932; Tue, 04 Nov 2014 04:31:56 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp107242lbc; Tue, 4 Nov 2014 04:31:56 -0800 (PST) X-Received: by 10.229.7.133 with SMTP id d5mr75664994qcd.24.1415104313843; Tue, 04 Nov 2014 04:31:53 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m5si296100qav.130.2014.11.04.04.31.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 04 Nov 2014 04:31:53 -0800 (PST) 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; Received: from localhost ([::1]:40164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldH6-0002Ei-TU for patch@linaro.org; Tue, 04 Nov 2014 07:31:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldFu-000110-A3 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:30:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XldFs-0005Pm-W7 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:30:38 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XldFs-0005OQ-CE for qemu-devel@nongnu.org; Tue, 04 Nov 2014 07:30:36 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XldFi-0002mN-P4 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:26 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 4 Nov 2014 12:30:24 +0000 Message-Id: <1415104226-10638-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415104226-10638-1-git-send-email-peter.maydell@linaro.org> References: <1415104226-10638-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 5/7] target-arm/translate.c: Don't pass CPUARMState * to disas_arm_insn() 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Refactor to avoid passing a CPUARMState * to disas_arm_insn(). To do this we move the "read insn from memory" code to the callsite and pass the insn to the function instead. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Message-id: 1414524244-20316-6-git-send-email-peter.maydell@linaro.org Reviewed-by: Claudio Fontana --- target-arm/translate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index c9c6d91..af51568 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7560,18 +7560,15 @@ static void gen_srs(DisasContext *s, tcg_temp_free_i32(addr); } -static void disas_arm_insn(CPUARMState * env, DisasContext *s) +static void disas_arm_insn(DisasContext *s, unsigned int insn) { - unsigned int cond, insn, val, op1, i, shift, rm, rs, rn, rd, sh; + unsigned int cond, val, op1, i, shift, rm, rs, rn, rd, sh; TCGv_i32 tmp; TCGv_i32 tmp2; TCGv_i32 tmp3; TCGv_i32 addr; TCGv_i64 tmp64; - insn = arm_ldl_code(env, s->pc, s->bswap_code); - s->pc += 4; - /* M variants do not implement ARM mode. */ if (arm_dc_feature(s, ARM_FEATURE_M)) { goto illegal_op; @@ -11199,7 +11196,9 @@ static inline void gen_intermediate_code_internal(ARMCPU *cpu, } } } else { - disas_arm_insn(env, dc); + unsigned int insn = arm_ldl_code(env, dc->pc, dc->bswap_code); + dc->pc += 4; + disas_arm_insn(dc, insn); } if (dc->condjmp && !dc->is_jmp) {