From patchwork Sat Jun 7 17:03:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31523 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 616722100A for ; Sat, 7 Jun 2014 17:03:07 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf22606749iec.0 for ; Sat, 07 Jun 2014 10:03:06 -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=PIHxjQtaOMa8u8m1oiSDutGhhmbUiEiUA8pm06YOLOg=; b=c9dDqdoYYV0N2gFisBUb9K0UDx3HdRWyxqyK7OTr7zUSXdQRGDvonhdiF6ZNgryZN4 9uH7Sm39SVvmcQCw6KXMzNHlOP2T6O9PXfvHmg2Sn+LWt2yDdjfSEf5Q+m/Fnwmtupzq v8GW2PaWQHvol9t9a813JNl7LpZyXSn4WVrwUFGVdr6MqAVqWDv43VXrVnwrQ0FBXfnX jMSzZTDVuNPL2AWwO9MKpE02qLG2Exx67raidbxYOJdxvucq2gQLFRrn/3CjWHvFhzBZ 4TrJFDQ24JOuH8AJbUTThzKMUn/0SWIoYvwElrP8joHaxbOY64Y+bLI3nkQa8juIN6OX fyzg== X-Gm-Message-State: ALoCoQnh2z35Ov0Q4WWG4S4LryuAG6nmzFff6rgsEl14fVSMM90Fit2HI+VWXhdmQAFNOt8u0VFt X-Received: by 10.42.185.16 with SMTP id cm16mr653376icb.10.1402160586873; Sat, 07 Jun 2014 10:03:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.244 with SMTP id j107ls990288qgj.24.gmail; Sat, 07 Jun 2014 10:03:06 -0700 (PDT) X-Received: by 10.52.164.9 with SMTP id ym9mr11933796vdb.19.1402160586776; Sat, 07 Jun 2014 10:03:06 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id lv1si8066988vcb.85.2014.06.07.10.03.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 07 Jun 2014 10:03:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy10so361228vcb.1 for ; Sat, 07 Jun 2014 10:03:06 -0700 (PDT) X-Received: by 10.52.64.225 with SMTP id r1mr12020424vds.30.1402160586680; Sat, 07 Jun 2014 10:03:06 -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.221.54.6 with SMTP id vs6csp29883vcb; Sat, 7 Jun 2014 10:03:06 -0700 (PDT) X-Received: by 10.69.20.10 with SMTP id gy10mr495983pbd.162.1402160585741; Sat, 07 Jun 2014 10:03:05 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id au5si26055728pbc.93.2014.06.07.10.03.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 07 Jun 2014 10:03: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 1WtK1G-0003eE-7X; Sat, 07 Jun 2014 18:03:02 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" Subject: [PATCH 1/2] target-cris/translate.c: Remove t_gen_mov_TN_reg and t_gen_mov_reg_TN Date: Sat, 7 Jun 2014 18:03:01 +0100 Message-Id: <1402160582-13994-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402160582-13994-1-git-send-email-peter.maydell@linaro.org> References: <1402160582-13994-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.170 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: , Remove the t_gen_mov_TN_reg and t_gen_mov_reg_TN wrappers: the latter is completely unused, and the former only used in a few places (which are thus inconsistent with the rest of the decoder which directly accesses cpu_R[]). Signed-off-by: Peter Maydell --- My main aim here is to remove the unused function; I think dropping the used-a-few-times function makes the code clearer, but am happy to drop it if you disagree. --- target-cris/translate.c | 21 +++------------------ target-cris/translate_v10.c | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/target-cris/translate.c b/target-cris/translate.c index 90fe0a2..eaea633 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -163,21 +163,6 @@ static int preg_sizes[] = { #define t_gen_mov_env_TN(member, tn) \ _t_gen_mov_env_TN(offsetof(CPUCRISState, member), (tn)) -static inline void t_gen_mov_TN_reg(TCGv tn, int r) -{ - if (r < 0 || r > 15) { - fprintf(stderr, "wrong register read $r%d\n", r); - } - tcg_gen_mov_tl(tn, cpu_R[r]); -} -static inline void t_gen_mov_reg_TN(int r, TCGv tn) -{ - if (r < 0 || r > 15) { - fprintf(stderr, "wrong register write $r%d\n", r); - } - tcg_gen_mov_tl(cpu_R[r], tn); -} - static inline void _t_gen_mov_TN_env(TCGv tn, int offset) { if (offset > sizeof(CPUCRISState)) { @@ -1811,7 +1796,7 @@ static int dec_swap_r(CPUCRISState *env, DisasContext *dc) cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); - t_gen_mov_TN_reg(t0, dc->op1); + tcg_gen_mov_tl(t0, cpu_R[dc->op1]); if (dc->op2 & 8) { tcg_gen_not_tl(t0, t0); } @@ -2119,7 +2104,7 @@ static int dec_move_rp(CPUCRISState *env, DisasContext *dc) t[0] = tcg_temp_new(); if (dc->op2 == PR_CCS) { cris_evaluate_flags(dc); - t_gen_mov_TN_reg(t[0], dc->op1); + tcg_gen_mov_tl(t[0], cpu_R[dc->op1]); if (dc->tb_flags & U_FLAG) { t[1] = tcg_temp_new(); /* User space is not allowed to touch all flags. */ @@ -2129,7 +2114,7 @@ static int dec_move_rp(CPUCRISState *env, DisasContext *dc) tcg_temp_free(t[1]); } } else { - t_gen_mov_TN_reg(t[0], dc->op1); + tcg_gen_mov_tl(t[0], cpu_R[dc->op1]); } t_gen_mov_preg_TN(dc, dc->op2, t[0]); diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c index 2ad2b14..efb3639 100644 --- a/target-cris/translate_v10.c +++ b/target-cris/translate_v10.c @@ -516,7 +516,7 @@ static void dec10_reg_swap(DisasContext *dc) cris_cc_mask(dc, CC_MASK_NZVC); t0 = tcg_temp_new(); - t_gen_mov_TN_reg(t0, dc->src); + tcg_gen_mov_tl(t0, cpu_R[dc->src]); if (dc->dst & 8) tcg_gen_not_tl(t0, t0); if (dc->dst & 4)