From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2131.outbound.protection.outlook.com [40.107.104.131]) by sourceware.org (Postfix) with ESMTPS id 09B3A385E010 for ; Mon, 6 Jun 2022 09:28:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 09B3A385E010 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=Syrmia.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Syrmia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jHZz4JcigWWlqtqoHQInCBhsxgnQ83vh7tExQbFVvE1uQb7tgxgSsd4ve2vdAH9qvMftgbGCVp2FHbh8C7b2pOc1LHpV/V3Rn2T/eFHjBcsYDtUTUzRFCr1fIjsdjZlz59KwE8wKUYw9k8VRBzfOyR7x4DO9khmOyx6odj3/F8xPJyzXGCRZY8hTF+RYcJ3AlALMweGqNlXDhI93zrDDUvUQaxhuW95fQNYwyoQ/OVisTG2nVwtCUrDrGFG5KeVKNzMf9qKTpt58QsBkeDersS5Udc6pE0O4AxakyiqZmr9b6/5/O+jnYHHKh0Vd9qLeQMJ2zDVcWl/IOrsZ0Bjwyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BKhBdaC2phVFZifz22RZvRsbVjCZSDDh4ZHCVXWOYYk=; b=kbX7WG/Cpzd9jy0lfPFwbPuSxcZiqYzf5AiDD4R10JoKg9NHhq8LKPtVRZRKQh8K7tJnFhHbSljC84xs0mp6gMnyz3MPZTsy4UoeVPRLAprl/h3cxHx8f00e7uJn2dxa/WdvExEAeB33F2uEOnIZn/hrHoRgcMxgWNQP8qp1pv+FsCrRKRg8iqECLB7/+1IpRtw8Z7KWg60XEhjSmreCYgFBHCpkiGLiAGLmKGW1v2TpP6NtizR8RbKwYMmLMJBcxTkiG305SnuOMhRnEyDFs4us+db/uxCqf/o4fvG6aVLPIlaUHh4WPbIDOgWvYZey4t5rRIZ9uZKvy4nK4vBcYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=syrmia.com; dmarc=pass action=none header.from=syrmia.com; dkim=pass header.d=syrmia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syrmia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BKhBdaC2phVFZifz22RZvRsbVjCZSDDh4ZHCVXWOYYk=; b=lZJwKXBTi2Lrn9G8GzHskNy5SzHBIzG/DXPLkojGNvcqFpmqY6ISec4SI2vmMt6RwvNQx6ixBWC1fU6hSRbrTJrJdAHiXaEHGqws3jfW3VrVvzjG1RIpdf8AZ/nwZl3mqQpKyXYxFI8z6jzU8539LpTMPStNxJB0VlongpLl1Ow= Received: from AM0PR03MB4882.eurprd03.prod.outlook.com (2603:10a6:208:fb::17) by PR2PR03MB5228.eurprd03.prod.outlook.com (2603:10a6:101:18::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:28:36 +0000 Received: from AM0PR03MB4882.eurprd03.prod.outlook.com ([fe80::3926:6805:c765:27ec]) by AM0PR03MB4882.eurprd03.prod.outlook.com ([fe80::3926:6805:c765:27ec%7]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:28:36 +0000 From: Dimitrije Milosevic To: "gcc-patches@gcc.gnu.org" CC: Djordje Todorovic Subject: [PATCH] Mips: Fix the ASAN shadow offset hook for the n32 ABI Thread-Topic: [PATCH] Mips: Fix the ASAN shadow offset hook for the n32 ABI Thread-Index: AQHYeXLW+Ux1t4W5F0O8YudMGLDc5g== Date: Mon, 6 Jun 2022 09:28:36 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 52807da6-9145-cbaa-b345-e096c4929e87 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=Syrmia.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7ad5eef3-91fc-4db9-e369-08da479eeefe x-ms-traffictypediagnostic: PR2PR03MB5228:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mXf7lWYVh4JkGq/uZz45ja0vJ3H1XZ4BkBo7L57lmbPkeln1irPZ7afYrS1cvpk0rIBCXMNzdarE+ludjNvlB2qaansQZt77iL9m72PWgbCHeyogGIHwObrrt6mE1VLqD+4HgI09vK8hBd2smeMhlnkCA8EZqLtN8tMkFSegp5OKjDmwd7+dJvl5w0txBP3H0pZ/My9hXN4LjjvZmJaPfQRB+jViFNJXAfVWNoK0yTY9LnG8vJNxurfuOxiQx8N8F2RiDygPmttxyZ1SHyFM7158aKWElMRxuzP8s7koEghskhe7QBYJx4rxBGz6Rqa6WhL3ICX0aUH9RI7guagn9LUoMGGPzfP/rYdbBWDGWBdG9krdAiX/mB/hPMxTSAV2uBV3F6wp/wqrXFIEQaMoQXmaHIXoakbCprMnm3Sf47j0B7vOvbouGJvboPAu3tCBFsgAjMNFEksG1EvRTzoL+U5DI2CpZYWTAIWdL3tzDt0k0M4O/LOJTU8OpubF5Ssw2/qlmtIA6WBu7HMbAUibNCZq1PtYIOTY0WZ/IqVu1pU9DV2WRX0cD3nlK6MhiRdTiV41HaAUfcFuoJ/z5HlWsvK1FQEQpGvE/PjcEiN7UnHeJqFxU0O8OG7pqY10CDDH4W++jc8tstwbMlZ1vzxRMP8KY9SIXbxs9VROAkSLg6SADXaG2IQg1EY3K4pMFKNuLGSj1/HpyKKEzqW0hk5ODA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4882.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(39830400003)(346002)(366004)(376002)(136003)(396003)(2906002)(38070700005)(83380400001)(19627405001)(71200400001)(55016003)(107886003)(9686003)(26005)(41300700001)(6916009)(316002)(6506007)(7696005)(186003)(33656002)(8936002)(5660300002)(508600001)(91956017)(38100700002)(66476007)(66446008)(8676002)(76116006)(64756008)(52536014)(122000001)(86362001)(66556008)(66946007)(4326008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?xW2ZIHePVw7tgXl6GXz2fZARHiOaMdSGSyyyCihyT0SfGpFem1DWK39PM5?= =?iso-8859-1?Q?reDa0BAgfvSsg/cqBrL0AeahG+m6IfqTT4o9BCkhm+Q3f2uuDfoFmV+z3/?= =?iso-8859-1?Q?icaEax9Nuic0bOdhVEePfjtfZr6k/qEeOVaYvWMguak+JvTVn4BndOFtdp?= =?iso-8859-1?Q?vQL25GaP5IAIOwyeSTLkkryGDPt4nWlHc6bXIbB9RfqvCtp3XBuv0AFV3L?= =?iso-8859-1?Q?JASRw/JKBUQvRX7Vy6bYOFaYaH2p8mgU39rPuiFUtcb3HMzOKQoQtM3nx6?= =?iso-8859-1?Q?My+vwQGgjFCvnY0QRjdBaf2sQ4GECQE8zH642ipBoynknHuak1ZdUIJ+Q5?= =?iso-8859-1?Q?SkNSGcCCW/RU54FQsy9W/frxlfFYcorQjB8ysMcv9ZOAE+E17iYXlpJiUT?= =?iso-8859-1?Q?vb/GThWWA+Vjdge6nDM0H6E3MrN/ukiGJr6g84oz5eBFalLkZSuuT9iSfo?= =?iso-8859-1?Q?EmDRROML5sLtd6qitIRskNdfi0g0VHf3YYMYVcLLj2Bwc1Oy3jeVRlXWjT?= =?iso-8859-1?Q?K4tEv41pllmrIJqWm/HuRlakdyUdFlRyD1N110ZY3Yux66S8c9NH5sEw6l?= =?iso-8859-1?Q?X7SW2QTeS/4UiI7jhXDGu6UZjmEzPdEw88reu0Gjb3O2+j89Mds6ZfcZeR?= =?iso-8859-1?Q?ABjksZdUslor9ylMwU0vXlPV5YC+B00UAKItKiRfbpLf2YcJWgaYaQWbjZ?= =?iso-8859-1?Q?QXXuMVEbK/4N1ch3WfSWqVXOHwrNNCc2+cCdY0HgxvYOiKRdSUfR+bQuZA?= =?iso-8859-1?Q?k2tWRm6hTxskxS64oYndAJNhNx2RjbYSO3RGUNH/tPF94AGLuccoeSbHoV?= =?iso-8859-1?Q?shglRaXpte7ENlZZtD8IcyywHDMQ3PyM1mTQrNVzYMZwe62+F6tXui5CZy?= =?iso-8859-1?Q?3pp2fR23zOe4XBRnX9x3jylcbsPstr5mz76dzJwH7Wcw47wVQ/YChUqbjm?= =?iso-8859-1?Q?xL6bW/BiyhLwjk5bEM5mY6wY1tny74LDueijtLRYC3mPOqrDmpOj+ighN2?= =?iso-8859-1?Q?4Nou17QMUucBeRz7V/Wjf9Ohm6Gfg/2/ior/c/5Z1dIoU4LFGrM1FR3n6/?= =?iso-8859-1?Q?yTXdF2t6eLgUj8olqBvt/za8TEg5ggDy+kDH8Pis84u3o5N6yT23NFuDQd?= =?iso-8859-1?Q?F6xx9vmkvNfXM2QMamFRt+GinemBXbJbNFKKkmGvajMeHJO9PffEGCey+r?= =?iso-8859-1?Q?Q1FQ0cb3odFFxxZs7Mh3ZnH26eFjVvF4EYyJUIfuB774VbFPfW3MUnzJqY?= =?iso-8859-1?Q?bEo21PQLK9ji6hTYVvkGKnVM6GtPoURVp63i3y8zkVKwptAkhVV+pmpVAR?= =?iso-8859-1?Q?vA7tz/r7mpdkbnH8IfwCBjpnDpYvocNFxbkGISxBMPj76y1/t/BmFk63PK?= =?iso-8859-1?Q?5pyfUNN990SHn8Rh7AqbyP/aUadd0JvT1fYJSaXLo5VfvGOtV74CmP0n4J?= =?iso-8859-1?Q?aQy5accxvFkmY83lJEhv8WKpFrlruYaWb3SU8bfGh8X/3FjdaoZeLo7Cwz?= =?iso-8859-1?Q?hfnbSEltcgzfQp5hEusH47Af06o4ea5pMPZI4jwHoUadx6H294dDR27peE?= =?iso-8859-1?Q?XgUcwjBryu0Xj9A1Hdv1popN4l1xockba4+tt91PSLdYJfEguTKFb3BAnu?= =?iso-8859-1?Q?gxWCJqaUnLQYuMjfjNNV+Ysjryhs1jHcufmWvsB7B8u3/0mTT8QCkBkV5i?= =?iso-8859-1?Q?y21MY6ZJpIXJ7flvsmJCnEHq5cJsG3AvKpFvoPIx6ec2VCR9PNmpOl7FEC?= =?iso-8859-1?Q?oXYrYg9sVY5OUGHYcjv8NFNKPXFUIeruwkSRjxEYSnd9K7Id8n8hDL2B6U?= =?iso-8859-1?Q?rQXAeAu9JYXZO4aTQ+z962cpOidXNxM=3D?= MIME-Version: 1.0 X-OriginatorOrg: syrmia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4882.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ad5eef3-91fc-4db9-e369-08da479eeefe X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jun 2022 09:28:36.6120 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: +y/++7XqyG47XUzs/gS1EHYiStMnHbxnAX/7yOke7AS4/9jlBwIHuzh1GmoIcQUTYEK7d9zFmb4fcrqUruzPc6Sq2OFCUkMdlLC17iCbjSg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR03MB5228 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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-List-Received-Date: Mon, 06 Jun 2022 09:28:41 -0000 Fix the ASAN shadow offset hook for the n32 ABI. gcc/ChangeLog: * config/mips/mips.cc (mips_asan_shadow_offset): Reformat to handle the N32 ABI. * config/mips/mips.h (SUBTARGET_SHADOW_OFFSET): Remove the macro, as it is not needed anymore. --- gcc/config/mips/mips.cc | 7 ++++++- gcc/config/mips/mips.h | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc index 2dce4007678..91e651c458e 100644 --- a/gcc/config/mips/mips.cc +++ b/gcc/config/mips/mips.cc @@ -22745,7 +22745,12 @@ mips_constant_alignment (const_tree exp, HOST_WIDE= _INT align) static unsigned HOST_WIDE_INT mips_asan_shadow_offset (void) { - return SUBTARGET_SHADOW_OFFSET; + if (mips_abi =3D=3D ABI_N32) + return (HOST_WIDE_INT_1 << 29); + if (POINTER_SIZE =3D=3D 64) + return (HOST_WIDE_INT_1 << 37); + else + return HOST_WIDE_INT_C (0x0aaa0000); } /* Implement TARGET_STARTING_FRAME_OFFSET. See mips_compute_frame_info diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 858bbba3a36..0029864fdcd 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -3463,10 +3463,3 @@ struct GTY(()) machine_function { && !TARGET_MICROMIPS && !TARGET_FIX_24K) #define NEED_INDICATE_EXEC_STACK 0 - -/* Define the shadow offset for asan. Other OS's can override in the - respective tm.h files. */ -#ifndef SUBTARGET_SHADOW_OFFSET -#define SUBTARGET_SHADOW_OFFSET \ - (POINTER_SIZE =3D=3D 64 ? HOST_WIDE_INT_1 << 37 : HOST_WIDE_INT_C (0x0aa= a0000)) -#endif ---