From patchwork Fri Aug 9 10:28:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 1970895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gjlay.de header.i=@gjlay.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=oMM+n8FF; dkim=pass header.d=gjlay.de header.i=@gjlay.de header.a=ed25519-sha256 header.s=strato-dkim-0003 header.b=uDeOLQD0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WgKs24Qj1z1ybS for ; Fri, 9 Aug 2024 20:29:10 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5D51E3858420 for ; Fri, 9 Aug 2024 10:29:07 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.217]) by sourceware.org (Postfix) with ESMTPS id DB5F83858D20 for ; Fri, 9 Aug 2024 10:28:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB5F83858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB5F83858D20 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.217 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1723199328; cv=pass; b=ZL7AgGReyZapPSikM9b7Mq6OFUxSALl+nCFUiJdBeVQy7eo6r6wSCaWu0hcZ4DYm25OYigGjfTmjO0U34FSMxBB6pBgPL3DGOPmeEMzxK8qqUihU7jcycqsSJCMrvnTKtNKJo+UFYuQgX6vorkgR3SHwDxxQ55jfaW9a0E7bj3c= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1723199328; c=relaxed/simple; bh=1TnZGGIAlQL5WEXzi8W29oI6w8oW7pz9+S/t4VGYGUc=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:From: To:Subject; b=hFJJZklemERgU14T7KDyr09HJIQPSTcZLkoqN/kV81OI7F0cwE7+cYMrBj/90cCILVmV7zYjBK2WwwswSQRiU5JFSK3Z76usgMfxkcytHL6cgiLbaf8fKNu6CN0L6TLZVZBLMjMfw4CgcLibRvQOIWO8aVoruCx0q6+N/sP3mu8= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1723199325; cv=none; d=strato.com; s=strato-dkim-0002; b=ng/VqcIRf3p2BGt3bHkZOXyOSK56EK+IyTKlwh7j3RodS/otVBY5lTmgMk6ypXRVsr wFZdyFXxADVibJUTmxWjJqodXp/BONocczCygafj1xEbHoJL8CM9U5WDnd7zyXVTSyWi WVKTzpXaFYa5KG65V7DMxb5k7jHgyco/S9dxtyhQANJMimiYIu3qzAiZF2ivlaS+OKJB sGYsAwxCch5AjlForlQ/sPjvYfYm3vjstzXyqKVAMe5rGakh4BL6Jy8yTQgNYW6Ly70f MNfgwewIrXmCtaVJHwEdTO5mxLaxBGv6gckzPRBDHku5eUTkNNavDjD35oydSI5uUnXu xabw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1723199325; s=strato-dkim-0002; d=strato.com; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=xAkthHxLYEoTuGP96eyX5OYPaUcPgcJyJpSy3fHlFuM=; b=aNIzH1xfdo9n0WkI4WudCENM9nbaG7zS54y2Z3LToxx+jqf/UchXiP5xS8aC0JliGT xHmLr2NFMubZj1Jm+K8XQSEqpEv3+RbVOYmn/QbrgOgEGWgGC4D9cjhB5WYNFWd672X3 TemqMEUO8JG3SguEsDdY8S25yXBuohxFUMuWS95yODFO0ZHqKK6mAZwUuoLSTAEgbRxM FwOnugc50AKOn9W6Rek0BWaCsvg+hqS8eZafQhKskAYFqEjXEDQH+ZEyeSm2VnfCpihn 07s97LEbtt4TCDvTdWgI7VIC+KjnHIesb0eZP+KOWbx8AKQQMIN9PKqne1f1pST0f7da bnlA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1723199325; s=strato-dkim-0002; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=xAkthHxLYEoTuGP96eyX5OYPaUcPgcJyJpSy3fHlFuM=; b=oMM+n8FFj2IxDQgQITRy6yYweBSE3B0ZAbJ36RIB+0gXqwGD6KvnZxx7sSG77yrZ+b ZpiqndrrEWid8WZOQq8iHqKIUoh2cvu7v1gOQkwkdl3gPg0pDvURGfffr6OIXpSgKubm D9mmIj9r/uA7G+BSti86bRLrgbJAUEs9+J3GiBT00c+Bx7WpVfMBM4pF6VW8u2VTb2Os ayX/gAuqHVEUCAZdQnSsjrBCNJ+G4I36mzgM2TvEYCeGR7mVUY3h8mnyXSgsOtr8sIrk ISmCZMFaAtKVSY3EvTChaGAiNsIWmCYawGeKVmq476S/BVhf0BlwzwCAoXUSNkh8kOh5 FWpQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1723199325; s=strato-dkim-0003; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=xAkthHxLYEoTuGP96eyX5OYPaUcPgcJyJpSy3fHlFuM=; b=uDeOLQD0FWI7Akxu697D7eVBswYXOEMq2A1pQIoX7VcUXE2+cLl5Ksbl0LM0DjzN7Q iOQ98qdGR9vS5Rh0LiAQ== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKXKoq0dKoR0vetzhr/2IDlGFRklUq" Received: from [192.168.2.102] by smtp.strato.de (RZmta 51.1.0 DYNA|AUTH) with ESMTPSA id xa21ea079ASjqkp (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Fri, 9 Aug 2024 12:28:45 +0200 (CEST) Message-ID: Date: Fri, 9 Aug 2024 12:28:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Georg-Johann Lay Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Subject: [patch,avr,applied] Tidy up code for __[x]load insns. X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Applied the patchlet below. Johann --- AVR: Tidy up code for __[x]load insns. gcc/ * config/avr/avr.md (*load__libgcc, *xload__libgcc): Tidy up code. commit a90c74ab161eab09802920fbd894bf55bc4fa797 Author: Georg-Johann Lay Date: Fri Aug 9 12:15:28 2024 +0200 AVR: Tidy up code for __[x]load insns. gcc/ * config/avr/avr.md (*load__libgcc, *xload__libgcc): Tidy up code. diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md index fce5349bbe5..84dfe4c40ec 100644 --- a/gcc/config/avr/avr.md +++ b/gcc/config/avr/avr.md @@ -536,7 +536,7 @@ (define_expand "load_libgcc" ;; "load_sf_libgcc" (define_insn_and_split "load__libgcc" [(set (reg:MOVMODE 22) - (match_operand:MOVMODE 0 "memory_operand" "m,m"))] + (match_operand:MOVMODE 0 "memory_operand" "m"))] "avr_load_libgcc_p (operands[0]) && REG_P (XEXP (operands[0], 0)) && REG_Z == REGNO (XEXP (operands[0], 0))" @@ -544,24 +544,18 @@ (define_insn_and_split "load__libgcc" "&& reload_completed" [(parallel [(set (reg:MOVMODE 22) (match_dup 0)) - (clobber (reg:CC REG_CC))])] - "" - [(set_attr "isa" "rjmp,jmp")]) + (clobber (reg:CC REG_CC))])]) (define_insn "*load__libgcc" [(set (reg:MOVMODE 22) - (match_operand:MOVMODE 0 "memory_operand" "m,m")) + (match_operand:MOVMODE 0 "memory_operand" "m")) (clobber (reg:CC REG_CC))] "avr_load_libgcc_p (operands[0]) && REG_P (XEXP (operands[0], 0)) && REG_Z == REGNO (XEXP (operands[0], 0)) && reload_completed" - { - operands[0] = GEN_INT (); - return "%~call __load_%0"; - } - [(set_attr "length" "1,2") - (set_attr "isa" "rjmp,jmp")]) + "%~call __load_" + [(set_attr "type" "xcall")]) ;; "xload8qi_A" @@ -657,7 +651,6 @@ (define_insn "xload_8" ;; "xload_si_libgcc" "xload_sq_libgcc" "xload_usq_libgcc" "xload_sa_libgcc" "xload_usa_libgcc" ;; "xload_sf_libgcc" ;; "xload_psi_libgcc" - (define_insn_and_split "xload__libgcc" [(set (reg:MOVMODE 22) (mem:MOVMODE (lo_sum:PSI (reg:QI 21) @@ -668,8 +661,8 @@ (define_insn_and_split "xload__libgcc" "#" "&& reload_completed" [(parallel [(set (reg:MOVMODE 22) - (mem:MOVMODE (lo_sum:PSI (reg:QI 21) - (reg:HI REG_Z)))) + (mem:MOVMODE (lo_sum:PSI (reg:QI 21) + (reg:HI REG_Z)))) (clobber (reg:CC REG_CC))])]) (define_insn "*xload__libgcc" @@ -679,12 +672,7 @@ (define_insn "*xload__libgcc" (clobber (reg:CC REG_CC))] "avr_xload_libgcc_p (mode) && reload_completed" - { - rtx x_bytes = GEN_INT (); - - output_asm_insn ("%~call __xload_%0", &x_bytes); - return ""; - } + "%~call __xload_" [(set_attr "type" "xcall")]) @@ -2278,7 +2266,7 @@ (define_insn_and_split "*addpsi3.lt0_split" [(set (match_operand:PSI 0 "register_operand" "=r") (plus:PSI (lshiftrt:PSI (match_operand:PSI 1 "register_operand" "r") (const_int 23)) - (match_operand:PSI 2 "register_operand" "0")))] + (match_operand:PSI 2 "register_operand" "0")))] "" "#" "&& reload_completed"