From patchwork Wed Nov 17 19:44:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 47846 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4FEE8385800F for ; Wed, 17 Nov 2021 19:45:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FEE8385800F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637178333; bh=iTmaNbcpKQg4RT9LKr2/n7Lt0SRW5h0+91WnlghemJY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FonyFgJ9pK9DkEgOTO3D/tYnfWIclMTzkEoSmwMFOTuNpd0bvOs/MA9TJsJFY8vVF cQCOWtrlZbL/zQxYnoHG4dXOYHf5RKjZ/j80RPth37cen7a0Mr7rkY0c1aI2X8bG0X 2/HkjUDP38fpl84nvN9mu0I5W607PmAdNOQs2+LU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 4C1C8385840C for ; Wed, 17 Nov 2021 19:44:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4C1C8385840C Received: by mail-pj1-x1031.google.com with SMTP id np6-20020a17090b4c4600b001a90b011e06so3466457pjb.5 for ; Wed, 17 Nov 2021 11:44:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iTmaNbcpKQg4RT9LKr2/n7Lt0SRW5h0+91WnlghemJY=; b=X682FPloX6W8i7mxlvZ29YgCqlEZl9zsfsQQP1W4/F8R8GANi6lFY0Mdf1gQDKiVYU 4UmBZ7OGiBtj2xnqOMwSxGafkTS5HsVfREnfi1EQd3UntRhMPr3nEsWO7C0TUh99zwuJ mzPYsgKrvCYaTYXrSVCi1u/1XqsY+pVsSQTHEAI/ubIas1EZfaULk6/HNkSTnWkcGUoW 00GyPG81SwHe19cqiLleFUM5hhCBffUT7mKMCU/CJDylwAN6baEQK0HYVsWXDuKajfho QzYm4XF0Kqpohc/O+58H11tvkvqTFO+8kjFdxf5nmRMVx6oiCx2/1ndW9Us39wpaI1kT 0IeQ== X-Gm-Message-State: AOAM532QE5AU0cVYXOmymCxACKt/QO0eB0dd/zJECTPIfx/Bwhu8BtCE TteQZRqlOOo4NAy8s9wDGRpRPCX+8Yw= X-Google-Smtp-Source: ABdhPJze+jyNW2djQBEfTUvQaK9yD+enY040rIx0ax8nYexfL60NTl5i3OMqmeTr8zcRV+sSXO0vjw== X-Received: by 2002:a17:902:f54e:b0:143:cc29:c058 with SMTP id h14-20020a170902f54e00b00143cc29c058mr22764074plf.57.1637178268248; Wed, 17 Nov 2021 11:44:28 -0800 (PST) Received: from gnu-cfl-2.localdomain ([2607:fb90:a63f:468b:b937:402b:0:c66]) by smtp.gmail.com with ESMTPSA id z71sm456492pfc.19.2021.11.17.11.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 11:44:27 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 19E2F1A0142; Wed, 17 Nov 2021 11:44:27 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 122E7300323; Wed, 17 Nov 2021 11:44:26 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Remove "%!" before ret Date: Wed, 17 Nov 2021 11:44:25 -0800 Message-Id: <20211117194426.31538-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3031.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Before MPX was removed, "%!" was mapped to case '!': if (ix86_bnd_prefixed_insn_p (current_output_insn)) fputs ("bnd ", file); return; After CET was added and MPX was removed, "%!" was mapped to case '!': if (ix86_notrack_prefixed_insn_p (current_output_insn)) fputs ("notrack ", file); return; ix86_notrack_prefixed_insn_p always returns false on ret since the notrack prefix is only for indirect branches. Remove the unused "%!" before ret. PR target/103307 * config/i386/i386.c (ix86_code_end): Remove "%!" before ret. (ix86_output_function_return): Likewise. * config/i386/i386.md (simple_return_pop_internal): Likewise. --- gcc/config/i386/i386.c | 4 ++-- gcc/config/i386/i386.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 73c4d5115bb..95d238e9efc 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6116,7 +6116,7 @@ ix86_code_end (void) xops[0] = gen_rtx_REG (Pmode, regno); xops[1] = gen_rtx_MEM (Pmode, stack_pointer_rtx); output_asm_insn ("mov%z0\t{%1, %0|%0, %1}", xops); - output_asm_insn ("%!ret", NULL); + output_asm_insn ("ret", NULL); final_end_function (); init_insn_lengths (); free_after_compilation (cfun); @@ -16278,7 +16278,7 @@ ix86_output_function_return (bool long_p) } if (!long_p) - return "%!ret"; + return "ret"; return "rep%; ret"; } diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 73d15de88b2..7b2de60706d 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -14705,7 +14705,7 @@ (define_insn_and_split "simple_return_pop_internal" [(simple_return) (use (match_operand:SI 0 "const_int_operand"))] "reload_completed" - "%!ret\t%0" + "ret\t%0" "&& cfun->machine->function_return_type != indirect_branch_keep" [(const_int 0)] "ix86_split_simple_return_pop_internal (operands[0]); DONE;"