From patchwork Tue Oct 28 19:24:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 39693 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 35EF624091 for ; Tue, 28 Oct 2014 19:24:09 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf1096674wiw.7 for ; Tue, 28 Oct 2014 12:24:08 -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=BKW9R4OQB1bgVTqF6z2XG/d0q37iHPSL0oCpye/nJ8Q=; b=EyqGmXI0XBwlZZHRKslCcg4mUfYO2LB3J9cYMiHJw4Blwalk25T7vZwqx4aeDmfZls 4czSlp5EKKdVDRaTGDxbQ6SJx9JUGROk0OEW+ZeY/6znoTYgThcgIrq08DqTtKQuRvSD Xf12VHeVDGgVbEYFmrM1VkCvkfX+Mrje6FZvDWh1QFtPDoXjFG+iO4uPCl8wSbp5fkjv 2abSbvuNW9DQTT5+gjqCnTZc3O4x8/aAvQftRjfD73exo2YIoUssxZSzRk5VLJi8iYKv E+M1vFy5FD9J7z4w7cEsSelJ1H9wOvenHxQI8XB/h8aQhkuN6kxq2KENWLMaBDZ00l1e yt5g== X-Gm-Message-State: ALoCoQnK49UZctxplhq5W6tq60aa3elJ+SYBPR8DenyBn8V8SWboNA6HfYfkeBznkbzUyh9y2gxz X-Received: by 10.152.42.171 with SMTP id p11mr945324lal.4.1414524248264; Tue, 28 Oct 2014 12:24:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.167 with SMTP id kr7ls99855lac.94.gmail; Tue, 28 Oct 2014 12:24:08 -0700 (PDT) X-Received: by 10.112.42.198 with SMTP id q6mr6199207lbl.69.1414524248030; Tue, 28 Oct 2014 12:24:08 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id c6si4036071laa.50.2014.10.28.12.24.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Oct 2014 12:24:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id n15so1244310lbi.17 for ; Tue, 28 Oct 2014 12:24:07 -0700 (PDT) X-Received: by 10.112.140.5 with SMTP id rc5mr6275699lbb.32.1414524247630; Tue, 28 Oct 2014 12:24:07 -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.112.84.229 with SMTP id c5csp541940lbz; Tue, 28 Oct 2014 12:24:07 -0700 (PDT) X-Received: by 10.112.169.106 with SMTP id ad10mr6268402lbc.13.1414524246022; Tue, 28 Oct 2014 12:24:06 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id bf9si3967558lab.114.2014.10.28.12.24.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 28 Oct 2014 12:24:05 -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 1XjCNA-0005IS-UG; Tue, 28 Oct 2014 19:24:04 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 5/5] target-arm/translate.c: Don't pass CPUARMState * to disas_arm_insn() Date: Tue, 28 Oct 2014 19:24:04 +0000 Message-Id: <1414524244-20316-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1414524244-20316-1-git-send-email-peter.maydell@linaro.org> References: <1414524244-20316-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.217.172 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: , 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 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 9e2dda2..932fa03 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) {