| Message ID | 20210828121718.263200-1-yunqiang.su@cipunited.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cipunited.onmicrosoft.com header.i=@cipunited.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-cipunited-onmicrosoft-com header.b=Z0Ehpg8l; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GxbGW5rtzz9t0k for <incoming@patchwork.ozlabs.org>; Sat, 28 Aug 2021 22:18:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C27B3857010 for <incoming@patchwork.ozlabs.org>; Sat, 28 Aug 2021 12:18:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-eopbgr1320100.outbound.protection.outlook.com [40.107.132.100]) by sourceware.org (Postfix) with ESMTPS id 06827385741F for <gcc-patches@gcc.gnu.org>; Sat, 28 Aug 2021 12:17:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 06827385741F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=cipunited.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cipunited.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WK+8l4X6fQ1sWa/je+K9ZBmHuIAZkEEk5om6OZt3jLZGhldqohP4OaXneomfGqZct/PXWxdIOVWHAEhHh68D+4a2DtGhcdLRk0gPXVocT/oUM706ox1EvpiwRgHdNk3XQnMxqkw6l3ZugfHUFiAWkNtLhgiNSn2QLGV3DR4REHy27LF1lQ+7Tubxurg9YaLA/Be4KEz11L5M3C+VSdc3naVYpLYkxdYcZ8vaUePb8Ljb+DL0nyjXpL67tETWqKV+UHS7TWHo1fB4QTaM4RopHw7b25Lr/yhhDsjNHbFuY35rE9YV6DZ4923NhkbsTUd/lLmT5upncyA1jZB77LS+ug== 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-SenderADCheck; bh=iX0L/MaEeIhhUCN3TPPVc4hTaEubkXrbkipr36Z3+w0=; b=A02XTmlfzBxOVIq7WXXZaiaL2FLOt7umUwSZ+PvNTB2umpWYwI2fBb4LuQH7eU5LasW/hyfgMwCm5EYvvTTd+dvxLsqOIEgRtTzvcVUVN6PDrATBSKNHBoDH8fg1MbBB4ni53c5klcImDCn4Lz9x5A1rbbmuJA1+k4E5BJX3cHYMJocfgNAehauHN5M/v6IAry23caIddS/Giqpfge2v9d3rwv8y9T3W7RsnYGxOvuZtTWvKinJYlU2ntSjwauxm8g0rBVemVn5CcgkwxAWrIL5qBrz5V0ZRJdgqjppBHcEe50yqOEx/Txq+n94STblF8UwASNsFlIQQ657ZNjQgNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cipunited.com; dmarc=pass action=none header.from=cipunited.com; dkim=pass header.d=cipunited.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipunited.onmicrosoft.com; s=selector1-cipunited-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iX0L/MaEeIhhUCN3TPPVc4hTaEubkXrbkipr36Z3+w0=; b=Z0Ehpg8ll/fPqC7X/TMTIXSKhssD2vcnwoWoVtFMpRGsjlH78BR1hOphAcjmQg9U9zfwbEuf66Skw7d7QhMWuUofgWqu38Pzs5D2ZhZcZ9byAOoxZN2U6rvHYnLXaR0oMPSn/Zs/241UIFRc8UKpzqofEmvK+dGgsoCzItUzn+Q= Authentication-Results: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=cipunited.com; Received: from HKAPR04MB3956.apcprd04.prod.outlook.com (2603:1096:203:d5::13) by HK2PR04MB3603.apcprd04.prod.outlook.com (2603:1096:202:32::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sat, 28 Aug 2021 12:17:41 +0000 Received: from HKAPR04MB3956.apcprd04.prod.outlook.com ([fe80::acc9:82fe:c04:97f9]) by HKAPR04MB3956.apcprd04.prod.outlook.com ([fe80::acc9:82fe:c04:97f9%6]) with mapi id 15.20.4436.027; Sat, 28 Aug 2021 12:17:41 +0000 From: YunQiang Su <yunqiang.su@cipunited.com> To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] libffi: Fix MIPS r6 support Date: Sat, 28 Aug 2021 08:17:18 -0400 Message-Id: <20210828121718.263200-1-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BY3PR05CA0054.namprd05.prod.outlook.com (2603:10b6:a03:39b::29) To HKAPR04MB3956.apcprd04.prod.outlook.com (2603:1096:203:d5::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:da8:20f:4435:feda::b016) by BY3PR05CA0054.namprd05.prod.outlook.com (2603:10b6:a03:39b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Sat, 28 Aug 2021 12:17:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c0d7e54-8253-4101-be1b-08d96a1dd553 X-MS-TrafficTypeDiagnostic: HK2PR04MB3603: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <HK2PR04MB36037049ED2C314D6E16ACA1F2C99@HK2PR04MB3603.apcprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JTLRxod6kHLi2JsgCt1fAzG6HP5jglauaziXDHDrUFuruPD7gqAxOVNMvv/CWiMUYhJ9mEv2jw+krJbFhW7HE9RfZ8NgnqNc4U7lmiehXB4mNP+v0iqiFqMXssxy1G4ogB9ISfxGIv6C3n0brEhnYNpeEkBAk2qvhXfuG+oqfOdRM9ZIuEQFs4Xr8HCB7nvsPUlvciJakrJJGF9ZwWjWZGE1EZ7CcIVAB6zWhkKuW/XvN5d88bHYB9L9KDqH1z78pEQ0xx7uT5awOHrselfOWpnPr7RmhqKXiK2sRjufcRv1keNZAw6aGzb9zxSBvWkzW98eXivBWyS+UKUHhtzK4VIeDmKdqu7lQtJaJV4fwkuFbbM9OwTW5dP9WsH0H6Bbk5656DFCr7Jrvn5KnlLBpRaLRduTiaU/P+aM4glhlAMrWIysb3XPQbviO4yIk7FcBoSDS42n4kHa5OQBeHMmZZgXXiRTrS+X7MpUQStM6jEWTnOUHmYLJqud2AZK+Q2X+yEBVEpQOlCzCv/LgaSj7KvqxMy0pIjCntK4T+Upbt0JuybWQU9KAwJnHTZOyu4cFQdzoQvhXLHJtcfHcmqH9fubytc3QKiN/5Vs4CRpYrq2zzCA4fKaLH/Q2DDD9/Jba1+kDg8tGbFEKMUpWyVw+H++ow1FM4woJVG3Vb0rBoZghspWJcNd1dF9mtgEvcQTUKi/lq8BkFYxChQHq1O5A6Wl5kaAzIlOn0hsW0AZ/h4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HKAPR04MB3956.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(39830400003)(346002)(376002)(136003)(2906002)(966005)(8936002)(186003)(107886003)(1076003)(4326008)(6666004)(478600001)(6512007)(316002)(6486002)(38100700002)(2616005)(86362001)(6506007)(6916009)(5660300002)(8676002)(83380400001)(66556008)(52116002)(36756003)(66946007)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BQr685mWfxEiHUpEW9+uYCA9ZVYNrxIUBsndMJhZOLy7fclfldRuHPMFentm3UIfOzV+G3NLUu9RRzA9yCV9Eyfx/pFyq+NWf0u+htBA8+BdRAI3dHdFiHu3V6IcQsWPERTE++nbfU5fuJeDS8sJ6P1DYlO41BysZPnD/WYMmtw+4aPBvzp1NdZT/Ke3dujnC8vf2ZJY5JXCb0aNgjAxNyBbXwUsAtslO4L7uVSQsdGu1dSg/4nm9eVW2tptbsCwgmCFQQ/pGKkDSxZpJbP9fAljeFckTV1gFeY/NTmgJvwsS33OuRoMUv1H86W2CmJx8ziYT7PVpwB9xpecsTuCOr3X/8w/jIkTnbRPvMawivqYyASwwEXfT757xi7IxyCa/gmTFlDt9Tq0BxpC4OAjbPp7FLj67XHuNv/8svj8VFE9zHjuS7VPogb4aAO+FUJr09X6nKGTnXHj6HNUMksq/cmdR2aqjRGMg9yYx2MSHKBAVr1YVUkecHVjbCt5ZaWPsj+F8HiVYkR9R3IbGNzdGaQgmSwF4aW8o0Sit0AIGXisqgXr2cKqxfV3CZCDni4bQ5CklF30HSPHAactjZa398fuDJvrBjUEDDQEOe2pWRoMlZQ+EOhOFFlfslCnAGqO0Je2xMERPtuI40weUP9WaNMgGhs65Jow5eByi4jkNukP+PnoMln8jlAptEjMy99FznYvNkPq63gaybUqD8XQSbJkFkbJsSnIl0UTDscp9XdnHhWaT3fHeRC3ljKGqn0W1tl5cK6N1MFxuXW6yEZxmTvgo7z07QD3Xq65SlEmVULP3LHKhPRpGbN9cNtpHvzymPzDRfapxOX7q/5g5aLOCC4yJXdFjFHTXzD9qC/jBM95QQkFPAVtyrJa9Uhw/OCqZshSmQmQRj+Tw2n41qxakW3Aet3/Bevng8RxpTLWnZuX7a6YYPLX1TaCCGmRQByLbXhATO237qxOZD2LaFuamwsy2a/A8Y5EoHpzIajEGMPnEmADNlZ52mRKG3+efR1qEf9NUkLeqo4pYHcK97JIbbMBy86gZFwhs4XMdguFDsA6xfmVMhTQruzLqWadRwkwiW3QEbGUckIA5YzorZ0OgRznlqP9TNnP8ON//YGJXeGw90yGLrI4QxcxUvoT8fczZ95uTpn6IN7hSg+cPPnD56pGd6b+oVmDiJ6UARiPbelAUkxj/wgL1N+pYfg1OfhBeA7mzkehQHYp7/MP+7uXP2lyjFZpTfVi9D6TeATjwe1B6NMc8EpTbGjEU8i+eAMl5B4RnFjOHidHoih2pXvCnnF1ybgg3Ym9rbocp2g6MnCtnoIlJXcIhQOIo5mQVLDslPZkUYguzLrTk8B+ZYSvRx58lSG2EYY11ShXVfwT3ig= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c0d7e54-8253-4101-be1b-08d96a1dd553 X-MS-Exchange-CrossTenant-AuthSource: HKAPR04MB3956.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2021 12:17:41.7676 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e31cf5b5-ee69-4d5f-9c69-edeeda2458c0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: b261jk8RibZJB+pEqjKqLdjfqkE/MYHhtgws5LqjFj+SBLvSGL2LPgQOmfv33O02VY1rZ8X7B/0AKZ3Eth7Bvyc9C2wGvFj2xXy3klu06M0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR04MB3603 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS, TXREP, T_SPF_HELO_TEMPERROR 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Cc: YunQiang Su <yunqiang.su@cipunited.com> Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org> |
| Series |
[v2] libffi: Fix MIPS r6 support
|
expand
|
diff --git a/libffi/src/mips/ffi.c b/libffi/src/mips/ffi.c index 5d0dd70cb..ecd783a56 100644 --- a/libffi/src/mips/ffi.c +++ b/libffi/src/mips/ffi.c @@ -698,7 +698,11 @@ ffi_prep_closure_loc (ffi_closure *closure, /* lui $12,high(codeloc) */ tramp[2] = 0x3c0c0000 | ((unsigned)codeloc >> 16); /* jr $25 */ +#if !defined(__mips_isa_rev) || (__mips_isa_rev<6) tramp[3] = 0x03200008; +#else + tramp[3] = 0x03200009; +#endif /* ori $12,low(codeloc) */ tramp[4] = 0x358c0000 | ((unsigned)codeloc & 0xffff); #else @@ -726,7 +730,11 @@ ffi_prep_closure_loc (ffi_closure *closure, /* ori $25,low(fn) */ tramp[10] = 0x37390000 | ((unsigned long)fn & 0xffff); /* jr $25 */ +#if !defined(__mips_isa_rev) || (__mips_isa_rev<6) tramp[11] = 0x03200008; +#else + tramp[11] = 0x03200009; +#endif /* ori $12,low(codeloc) */ tramp[12] = 0x358c0000 | ((unsigned long)codeloc & 0xffff); diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S index c6985d30a..06e6c4607 100644 --- a/libffi/src/mips/n32.S +++ b/libffi/src/mips/n32.S @@ -43,7 +43,9 @@ #ifdef __GNUC__ .abicalls #endif +#if !defined(__mips_isa_rev) || (__mips_isa_rev<6) .set mips4 +#endif .text .align 2 .globl ffi_call_N32
for some instructions, MIPS r6 uses different encoding other than the previous releases. 1. mips/n32.S disable .set mips4: since it casuses old insn encoding is used. https://github.com/libffi/libffi/pull/396 has been accepted as: 94c102aa69b04337f63498e0e6551fcdce549ae5 2. mips/ffi.c: the encoding for JR is hardcoded: we need to use different value for r6 and pre-r6. https://github.com/libffi/libffi/pull/401 has been accpeted as: 746dbe3a6a79a41931c03b51df2972be4d5e5028 libffi/ PR libffi/83636 * src/mips/n32.S: disable .set mips4 * src/mips/ffi.c: use different JR encoding for r6. --- libffi/src/mips/ffi.c | 8 ++++++++ libffi/src/mips/n32.S | 2 ++ 2 files changed, 10 insertions(+)