From patchwork Mon Jul 18 11:36:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Zissulescu Ianculescu X-Patchwork-Id: 1657392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Qb7heS6X; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lmg0n4Fptz9sFr for ; Mon, 18 Jul 2022 21:36:56 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D395A3857C71 for ; Mon, 18 Jul 2022 11:36:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D395A3857C71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658144212; bh=+8raqENi0nKNLqX49iJdQtuNm2usr9DH+CNZXQmZWGE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Qb7heS6X3xgoYpofjWYB2khQEu82l6jtqETaEOjJsQ5NJmZcn/Z2apnsWDr5uUAVi 2XaHLUwyquROF/QLKZ7UwjWnOGPwmXQ3wu2KNOSWyRuRM8uyfKIU7ObMGDhkfClZoH 4seKpcyWdbyU9FgkRetOLYvbxFcTcN4lLw+tenig= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id B79E63858D33 for ; Mon, 18 Jul 2022 11:36:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B79E63858D33 Received: by mail-wm1-x333.google.com with SMTP id x23-20020a05600c179700b003a30e3e7989so4964097wmo.0 for ; Mon, 18 Jul 2022 04:36:30 -0700 (PDT) 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=+8raqENi0nKNLqX49iJdQtuNm2usr9DH+CNZXQmZWGE=; b=cvmqTuaI22cr4PxAG3AUf/aDcUKjVk4z1NREZT9emO7gTY5cFZqES/cCOiZd3uP7LH 2N98GCi3C9vZqBYwObHD4DVUyARiIk3qITZj27Qa9t/o0cHQIutdAcHo4t+oJjvPJ6Uv vr7qjr2lfUOu6HnUoYJcKZccdLky0s4GQG0us5M7zxdsZOic3gwWtjrKMrgCh2xmAIch rQ8VNMzWy5nSoUFEvXEfmS30bzroPNbyh/lNIHlVUqkKdU3VOw1u29a4Mz1pRKiLjIGg GnJ42XAvxsRiG8NRuQeb9OcxoyblFUw8EpRjDUjOWFYxCNFi9Dk7Xg7ANjRMZdr9JzkE aG3A== X-Gm-Message-State: AJIora+pQsMFhZlE/5v7/kSIgGValtFsdJqm3L62NFs5LtFodX14vEIQ rDCsOEFcSRAUUfJtR2/7Y7cbVLqLw8E= X-Google-Smtp-Source: AGRyM1sDJeg42gbIxJQLQBrxfnDeXzN0qAqJSAFazuOgpjiiewQeO0fisZaUYYIh4pxGAxgdAXqSBg== X-Received: by 2002:a05:600c:3ca4:b0:3a0:1825:2e29 with SMTP id bg36-20020a05600c3ca400b003a018252e29mr25545183wmb.11.1658144189194; Mon, 18 Jul 2022 04:36:29 -0700 (PDT) Received: from fatty.nomansland ([193.187.151.25]) by smtp.gmail.com with ESMTPSA id z11-20020a05600c0a0b00b003a033177655sm21283260wmp.29.2022.07.18.04.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 04:36:28 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [committed] arc: Fix interrupt's epilogue. Date: Mon, 18 Jul 2022 14:36:27 +0300 Message-Id: <20220718113627.3288368-1-claziss@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Claudiu Zissulescu via Gcc-patches From: Claudiu Zissulescu Ianculescu Reply-To: Claudiu Zissulescu Cc: fbedard@synopsys.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The stack pointer adjustment in interrupt epilogue is happening after restoring the ZOL registers which is wrong. Fixing this. gcc/ * config/arc/arc.cc (arc_expand_epilogue): Adjust the frame pointer first when in interrupts. gcc/testsuite/ * gcc.target/arc/interrupt-13.c: New file. Signed-off-by: Claudiu Zissulescu --- gcc/config/arc/arc.cc | 2 +- gcc/testsuite/gcc.target/arc/interrupt-13.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/arc/interrupt-13.c diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc index fbc17e684a0..77730c88e55 100644 --- a/gcc/config/arc/arc.cc +++ b/gcc/config/arc/arc.cc @@ -3965,7 +3965,7 @@ arc_expand_epilogue (int sibcall_p) if (size) emit_insn (gen_blockage ()); - if (ARC_INTERRUPT_P (fn_type) && restore_fp) + if (ARC_INTERRUPT_P (fn_type)) { /* We need to restore FP before any SP operation in an interrupt. */ diff --git a/gcc/testsuite/gcc.target/arc/interrupt-13.c b/gcc/testsuite/gcc.target/arc/interrupt-13.c new file mode 100644 index 00000000000..0ed8451c512 --- /dev/null +++ b/gcc/testsuite/gcc.target/arc/interrupt-13.c @@ -0,0 +1,15 @@ +/* { dg-options "-O2" } */ + +extern int foo (int *); + +void __attribute__((interrupt("ilink"))) +irq (void) +{ + struct { + int x0; + int x1; + } a = {1 ,2}; + foo ((int *)&a); +} + +/* { dg-final { scan-assembler "add_s\\s+sp,sp,8.*pop_s\\s+r0" } } */