From patchwork Tue Jul 3 03:40:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 938321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-480883-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="UBlaqY0A"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41KVJC63XJz9s3Z for ; Tue, 3 Jul 2018 13:40:26 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=pJCjiYli95r/VQVZWCUb0UvNO1Qnw4AF90LcwHbvfdWUfSgsc/ 2wgrAumJg7TIzKo9wxxwzpDl0i3BYGHmcd/QZUdl1lWOHgBRZUymmbMEQUR6c/RT 4Y9wYrEZXTmWu83WyGzDFU6UIauaEcs0+xU+ZZ4uyTgt5A4pycbdIdjUs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=2//d7umTv/51zVjpELxdDYx1RqM=; b=UBlaqY0AV+vg+e6TRZ60 v/IHELwXNjZg+cRyoV/+oAPGiTTFxshvpBb9hG0/pne98ekeNSZuT2neggZq+L5S +t1Dwv0V0sdqb1tWp+Vr+TNO3DsbQCqacyO2q+v3fdyEBKhHsZ76j+lCwL+mEb9E x6wch82QkpenAi7o3NrNTxg= Received: (qmail 16369 invoked by alias); 3 Jul 2018 03:40:19 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 16358 invoked by uid 89); 3 Jul 2018 03:40:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, MEDICAL_SUBJECT, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=nn, ru, rU, stc X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Jul 2018 03:40:16 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E4F6F3082A45 for ; Tue, 3 Jul 2018 03:40:12 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-54.rdu2.redhat.com [10.10.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 029BB5DD82 for ; Tue, 3 Jul 2018 03:40:11 +0000 (UTC) To: gcc-patches From: Jeff Law Subject: [committed] Fix whitespace issues in h8300.md Openpgp: preference=signencrypt Message-ID: <7fdb46c2-e8bf-8b0a-81e4-60c4100ed302@redhat.com> Date: Mon, 2 Jul 2018 21:40:10 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 X-IsSubscribed: yes So the H8 port is the next planned conversion away from cc0. Given that nearly every insn (including simple register moves) hits cc0, essentially every pattern is going to need twiddling. Sigh. This seems like a good time to fix some nits since the whole file is about to change anyway. This commit just fixes trailing whitespace problems. Jeff diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8c2629cdac..15becdc2466 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2018-07-02 Jeff Law + + * config/h8300/h8300.md: Remove trailing whitespace. + 2018-07-02 Jim Wilson * config/riscv/riscv.c (riscv_expand_epilogue): Use emit_jump_insn diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md index 8464565a8a4..846fd735de0 100644 --- a/gcc/config/h8300/h8300.md +++ b/gcc/config/h8300/h8300.md @@ -880,7 +880,7 @@ ;; ---------------------------------------------------------------------- (define_insn "" - [(set (cc0) + [(set (cc0) (compare (zero_extract:QI (match_operand:QI 0 "bit_memory_operand" "r,U") (const_int 1) (match_operand 1 "const_int_operand" "n,n")) @@ -902,7 +902,7 @@ (set_attr "cc" "set_zn")]) (define_insn_and_split "*tst_extzv_1_n" - [(set (cc0) + [(set (cc0) (compare (zero_extract:SI (match_operand:QI 0 "general_operand_src" "r,U,mn>") (const_int 1) (match_operand 1 "const_int_operand" "n,n,n")) @@ -927,7 +927,7 @@ (set_attr "cc" "set_zn,set_zn,set_zn")]) (define_insn "" - [(set (cc0) + [(set (cc0) (compare (zero_extract:SI (match_operand:SI 0 "register_operand" "r") (const_int 1) (match_operand 1 "const_int_operand" "n")) @@ -939,7 +939,7 @@ (set_attr "cc" "set_zn")]) (define_insn_and_split "*tstsi_upper_bit" - [(set (cc0) + [(set (cc0) (compare (zero_extract:SI (match_operand:SI 0 "register_operand" "r") (const_int 1) (match_operand 1 "const_int_operand" "n")) @@ -1004,7 +1004,7 @@ (set_attr "cc" "set_zn,set_zn,set_zn")]) (define_insn "*tstqi" - [(set (cc0) + [(set (cc0) (compare (match_operand:QI 0 "register_operand" "r") (const_int 0)))] "" @@ -1169,7 +1169,7 @@ "TARGET_H8300 && epilogue_completed" [(const_int 0)] { - split_adds_subs (HImode, operands); + split_adds_subs (HImode, operands); DONE; }) @@ -1233,7 +1233,7 @@ "" [(const_int 0)] { - split_adds_subs (HImode, operands); + split_adds_subs (HImode, operands); DONE; }) @@ -1262,7 +1262,7 @@ (plus:SI (match_operand:SI 1 "h8300_dst_operand" "%0,0") (match_operand:SI 2 "h8300_src_operand" "i,rQ")))] "(TARGET_H8300H || TARGET_H8300S) && h8300_operands_match_p (operands)" -{ +{ return output_plussi (operands); } [(set (attr "length") @@ -1289,7 +1289,7 @@ "TARGET_H8300H || TARGET_H8300S" [(const_int 0)] { - split_adds_subs (SImode, operands); + split_adds_subs (SImode, operands); DONE; }) @@ -1585,7 +1585,7 @@ "TARGET_H8300SX" "divu.w\\t%T2,%T0" [(set_attr "length" "2")]) - + (define_insn "divhi3" [(set (match_operand:HI 0 "register_operand" "=r") (div:HI (match_operand:HI 1 "register_operand" "0") @@ -1593,7 +1593,7 @@ "TARGET_H8300SX" "divs.w\\t%T2,%T0" [(set_attr "length" "2")]) - + (define_insn "udivsi3" [(set (match_operand:SI 0 "register_operand" "=r") (udiv:SI (match_operand:SI 1 "register_operand" "0") @@ -1601,7 +1601,7 @@ "TARGET_H8300SX" "divu.l\\t%S2,%S0" [(set_attr "length" "2")]) - + (define_insn "divsi3" [(set (match_operand:SI 0 "register_operand" "=r") (div:SI (match_operand:SI 1 "register_operand" "0") @@ -1609,7 +1609,7 @@ "TARGET_H8300SX" "divs.l\\t%S2,%S0" [(set_attr "length" "2")]) - + (define_insn "udivmodqi4" [(set (match_operand:QI 0 "register_operand" "=r") (truncate:QI @@ -2263,7 +2263,7 @@ if ((GET_CODE (operands[2]) != REG && operands[2] != const0_rtx) && TARGET_H8300) operands[2] = force_reg (HImode, operands[2]); - h8300_expand_branch (operands); + h8300_expand_branch (operands); DONE; }) @@ -2648,7 +2648,7 @@ [(const_int 0)] "" { - h8300_expand_prologue (); + h8300_expand_prologue (); DONE; }) @@ -2656,7 +2656,7 @@ [(return)] "" { - h8300_expand_epilogue (); + h8300_expand_epilogue (); DONE; }) @@ -2671,7 +2671,7 @@ else if (TARGET_H8300H) return "mov.l\\ter0,@-er7\;stc\\tccr,r0l\;mov.b\\tr0l,@(4,er7)\;mov.l\\t@er7+,er0\;orc\\t#128,ccr"; else if (TARGET_H8300S && TARGET_NEXR ) - return "mov.l\\ter0,@-er7\;stc\tccr,r0l\;mov.b\tr0l,@(4,er7)\;mov.l\\t@er7+,er0\;orc\t#128,ccr"; + return "mov.l\\ter0,@-er7\;stc\tccr,r0l\;mov.b\tr0l,@(4,er7)\;mov.l\\t@er7+,er0\;orc\t#128,ccr"; else if (TARGET_H8300S && TARGET_NEXR && TARGET_NORMAL_MODE) return "subs\\t#2,er7\;mov.l\\ter0,@-er7\;stc\tccr,r0l\;mov.b\tr0l,@(4,er7)\;mov.l\\t@er7+,er0\;orc\t#128,ccr"; else if (TARGET_H8300S && TARGET_NORMAL_MODE) @@ -2930,7 +2930,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (QImode, ASHIFT, operands)) + if (expand_a_shift (QImode, ASHIFT, operands)) DONE; }) @@ -2940,7 +2940,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (QImode, ASHIFTRT, operands)) + if (expand_a_shift (QImode, ASHIFTRT, operands)) DONE; }) @@ -2950,7 +2950,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (QImode, LSHIFTRT, operands)) + if (expand_a_shift (QImode, LSHIFTRT, operands)) DONE; }) @@ -2960,8 +2960,8 @@ [(match_operand:QI 1 "h8300_dst_operand" "0") (match_operand:QI 2 "const_int_operand" "")]))] "h8300_operands_match_p (operands)" -{ - return output_h8sx_shift (operands, 'b', 'X'); +{ + return output_h8sx_shift (operands, 'b', 'X'); } [(set_attr "length_table" "unary") (set_attr "cc" "set_znv")]) @@ -2973,7 +2973,7 @@ (match_operand:QI 2 "nonmemory_operand" "r P3>X")]))] "" { - return output_h8sx_shift (operands, 'b', 'X'); + return output_h8sx_shift (operands, 'b', 'X'); } [(set_attr "length" "4") (set_attr "cc" "set_znv")]) @@ -3001,7 +3001,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (HImode, ASHIFT, operands)) + if (expand_a_shift (HImode, ASHIFT, operands)) DONE; }) @@ -3011,7 +3011,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (HImode, LSHIFTRT, operands)) + if (expand_a_shift (HImode, LSHIFTRT, operands)) DONE; }) @@ -3021,7 +3021,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (HImode, ASHIFTRT, operands)) + if (expand_a_shift (HImode, ASHIFTRT, operands)) DONE; }) @@ -3031,8 +3031,8 @@ [(match_operand:HI 1 "h8300_dst_operand" "0") (match_operand:QI 2 "const_int_operand" "")]))] "h8300_operands_match_p (operands)" -{ - return output_h8sx_shift (operands, 'w', 'T'); +{ + return output_h8sx_shift (operands, 'w', 'T'); } [(set_attr "length_table" "unary") (set_attr "cc" "set_znv")]) @@ -3044,7 +3044,7 @@ (match_operand:QI 2 "nonmemory_operand" "r P4>X")]))] "" { - return output_h8sx_shift (operands, 'w', 'T'); + return output_h8sx_shift (operands, 'w', 'T'); } [(set_attr "length" "4") (set_attr "cc" "set_znv")]) @@ -3072,7 +3072,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (SImode, ASHIFT, operands)) + if (expand_a_shift (SImode, ASHIFT, operands)) DONE; }) @@ -3082,7 +3082,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (SImode, LSHIFTRT, operands)) + if (expand_a_shift (SImode, LSHIFTRT, operands)) DONE; }) @@ -3092,7 +3092,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_shift (SImode, ASHIFTRT, operands)) + if (expand_a_shift (SImode, ASHIFTRT, operands)) DONE; }) @@ -3103,7 +3103,7 @@ (match_operand:QI 2 "const_int_operand" "")]))] "h8300_operands_match_p (operands)" { - return output_h8sx_shift (operands, 'l', 'S'); + return output_h8sx_shift (operands, 'l', 'S'); } [(set_attr "length_table" "unary") (set_attr "cc" "set_znv")]) @@ -3114,8 +3114,8 @@ [(match_operand:SI 1 "register_operand" "0") (match_operand:QI 2 "nonmemory_operand" "r P5>X")]))] "" -{ - return output_h8sx_shift (operands, 'l', 'S'); +{ + return output_h8sx_shift (operands, 'l', 'S'); } [(set_attr "length" "4") (set_attr "cc" "set_znv")]) @@ -3210,7 +3210,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_rotate (operands)) + if (expand_a_rotate (operands)) DONE; }) @@ -3231,7 +3231,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "" { - if (expand_a_rotate (operands)) + if (expand_a_rotate (operands)) DONE; }) @@ -3252,7 +3252,7 @@ (match_operand:QI 2 "nonmemory_operand" "")))] "TARGET_H8300H || TARGET_H8300S" { - if (expand_a_rotate (operands)) + if (expand_a_rotate (operands)) DONE; }) @@ -3555,7 +3555,7 @@ (clobber (match_operand:HI 0 "register_operand"))] "TARGET_H8300SX" { - h8300_expand_store (operands); + h8300_expand_store (operands); DONE; }) @@ -3566,7 +3566,7 @@ (clobber (match_operand:HI 0 "register_operand"))] "TARGET_H8300SX" { - h8300_expand_store (operands); + h8300_expand_store (operands); DONE; }) @@ -3577,7 +3577,7 @@ (clobber (match_operand:HI 0 "register_operand"))] "TARGET_H8300SX" { - h8300_expand_store (operands); + h8300_expand_store (operands); DONE; }) @@ -3609,7 +3609,7 @@ operands[5] = gen_rtx_COMPARE (VOIDmode, operands[3], operands[4]); } [(set_attr "cc" "set_znv,compare")]) - + (define_insn "*bstz" [(set (zero_extract:QI (match_operand:QI 0 "bit_memory_operand" "+WU") (const_int 1) @@ -3650,7 +3650,7 @@ operands[6] = gen_rtx_COMPARE (VOIDmode, operands[2], operands[3]); } [(set_attr "cc" "set_znv,compare")]) - + (define_insn "*condbset" [(set (match_operand:QI 0 "bit_memory_operand" "=WU") (if_then_else:QI (match_operator:QI 2 "eqne_operator" @@ -3683,7 +3683,7 @@ operands[6] = gen_rtx_COMPARE (VOIDmode, operands[2], operands[3]); } [(set_attr "cc" "set_znv,compare")]) - + (define_insn "*condbclr" [(set (match_operand:QI 0 "bit_memory_operand" "=WU") (if_then_else:QI (match_operator:QI 2 "eqne_operator" @@ -3719,7 +3719,7 @@ operands[6] = gen_rtx_COMPARE (VOIDmode, operands[2], operands[3]); } [(set_attr "cc" "set_znv,compare")]) - + (define_insn "*condbsetreg" [(set (match_operand:QI 0 "bit_memory_operand" "=WU") (if_then_else:QI (match_operator:QI 2 "eqne_operator" @@ -3756,7 +3756,7 @@ operands[6] = gen_rtx_COMPARE (VOIDmode, operands[2], operands[3]); } [(set_attr "cc" "set_znv,compare")]) - + (define_insn "*condbclrreg" [(set (match_operand:QI 0 "bit_memory_operand" "=WU") (if_then_else:QI (match_operator:QI 2 "eqne_operator" @@ -4472,7 +4472,7 @@ (ashiftrt:SI (match_dup 0) (const_int 1))) (clobber (scratch:QI))])] - { + { operands[2] = gen_rtx_REG (HImode, REGNO (operands[0])); }) @@ -4687,7 +4687,7 @@ "TARGET_H8300S && !TARGET_NORMAL_MODE && REGNO (operands[0]) != SP_REG" [(set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))] - { + { operands[0] = gen_rtx_REG (SImode, REGNO (operands[0])); }) @@ -5968,7 +5968,7 @@ (if_then_else (match_dup 3) (label_ref (match_dup 2)) (pc)))] - { + { operands[3] = gen_rtx_fmt_ee (GET_CODE (operands[1]) == GTU ? NE : EQ, VOIDmode, cc0_rtx, const0_rtx); }) @@ -6319,5 +6319,5 @@ && !reg_overlap_mentioned_p (operands[0], operands[2])" [(set (match_dup 2) (match_dup 1))]) - +