From patchwork Thu Jun 1 17:33:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 102114 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp500068vqr; Thu, 1 Jun 2023 10:33:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5H+Zo2RaZzbkZv03xPvRPC6cjJdl7xUHF6QQdVfvYWAHW5AJjGEf+9X6E6a7LpWN7quL5c X-Received: by 2002:aa7:d80f:0:b0:514:9e26:1f51 with SMTP id v15-20020aa7d80f000000b005149e261f51mr501618edq.24.1685640820637; Thu, 01 Jun 2023 10:33:40 -0700 (PDT) Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b15-20020a05640202cf00b00514b296d207si2959825edx.445.2023.06.01.10.33.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 10:33:40 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=up9xdtBq; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 848393857355 for ; Thu, 1 Jun 2023 17:33:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 848393857355 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685640819; bh=pBzny8rYxwJmmlzJhq57gDtAhA7FaDcFYD9qkBZ/zz8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=up9xdtBqBTM4f2O1a0Gpm4meqJhO5d6kL/17phisPi+46wtwkX6OeGSLQuI249t9X yZU1WB7BH6e/bGG+CWDd18+HOVMHWMODJHMw42Tlgbcgs9bHoEcCndOCSTeXnM6Vwi xG/hElW4R1r7XxQ+n3zrSnGsu2DH3R85mJATBFmc= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id D87FA3858421 for ; Thu, 1 Jun 2023 17:33:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D87FA3858421 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 351E4SFx028591 for ; Thu, 1 Jun 2023 17:33:19 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qvhjkscsn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 01 Jun 2023 17:33:18 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 351G6RYI030014 for ; Thu, 1 Jun 2023 17:33:18 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2174.outbound.protection.outlook.com [104.47.56.174]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qu8a88gc8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 01 Jun 2023 17:33:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIsRHl8syIBmmN2l1yODuvYvbwLNqjGjhlZxc4pJJm0m7PrfPIUxhJRxisPUKqWHUPhd4oYP+IpFCgkwU+NdYLFCs1HhB/IQcT/K6QHPsAp8bZTPoeLzINGsggY+pQATvztSTk97tilxm/E7VZcrHnAowt8CAIgXm3qd6AccZKce2SyGiQ7bkCeHTua6xSVmBNZTyjY0/EwFtrjKZ+wXOQKBSRmJvi89oxz1mnDqeaQ7odma1eg9GTt6eRlzuOmhE2Bin43htfs+HOK4oT7ACnQJkRlNFUJ1bzveJbpMQV6B25P4MA6rgcejlnqmhBGQ4RBYXmqngCDsmlBZP867lQ== 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=pBzny8rYxwJmmlzJhq57gDtAhA7FaDcFYD9qkBZ/zz8=; b=MmwJ+8O/ipG+KG0H6BPvYA5sdAMbkCbzY9UOQPiktD09Hh/1OMDH20SEVen6YWIwRExJ/xZl1VFu1V2jx4vWRoELonbB8q3gvor9ZkNp+XhvDQm4su2H6aXOEDnMWUFaBm6duddKLlA0rJkhWho6oq1SCvkr11HezDW/YUYSmLcfjAQo/bP9O/hEHU2i63Evu11wPu25oSTwiWKEGcnn7oHXSj3q5a6kYH6nVgJ00064T6Xfg5pLBZwI7RXsVAWpK8FWRTYzl5N7gaTv57j7kj58X7Leel4Z4IYjQY/k8XM03l92JIg6b5n+3AHCjJEAmLnJZg/MIuZQdW4AL0ULkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by MW4PR10MB6608.namprd10.prod.outlook.com (2603:10b6:303:22e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Thu, 1 Jun 2023 17:33:16 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44%4]) with mapi id 15.20.6411.025; Thu, 1 Jun 2023 17:33:16 +0000 To: binutils@sourceware.org Cc: Indu Bhagat Subject: [COMMITTED] libsframe: avoid using magic number Date: Thu, 1 Jun 2023 10:33:12 -0700 Message-Id: <20230601173312.3176329-1-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.39.2 X-ClientProxiedBy: MW4PR03CA0139.namprd03.prod.outlook.com (2603:10b6:303:8c::24) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|MW4PR10MB6608:EE_ X-MS-Office365-Filtering-Correlation-Id: e28bded3-9e7a-4458-1f6b-08db62c6484d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6HwGkchD5vxgJTpeCWFdUoIU+0z42kHCgBX4flyCXIdzE8uzY8YpjavfFmGEHOFpOhOoYWmY8jfQsqY0SqieXqLECMNwBcBmujbSnK9FHEweau881hgrAHj3Vu4EWzk5gLxSdvgBT1mmh3V0+Dq2QaAyS/ID0E7XheAk2AVsfCUVLp/jimZFfMFYpjzanA+T+haKc3gpl7qSml0SyUcjgC9yDGXG1uh3WudA0jrYaQ0m7SOoPlxiuvZWD47UI+b2hYdFHQ73CftiGeKiIHdHvNaz1bP+EcC9dedMeRPZZgCxUXvwFw4veAJcq7BWhLHt4dg4DaWEeFHJYVyADUHgF9hlvUNVVEheWQyVQ/E8G0AMORNfPUkreQqP0bLhmqWkhU9jCnzhD6JgPRBMswwvym8E6IxDUeNU23fq531Ww+WXQIJQeii0jbogXxgXoa7MFd0DQfbrqRin85FIVEiokgZizmLEZHoIzhPtL7EqEwdlo3YlYBhtGI/c/OZe6Cu7AKjpL1yHRsni2VLuaLZn2yOXXXmZperFWSbS1ciPVFqC4WJSTLABeybdAAN8Zsm7 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(366004)(396003)(39860400002)(346002)(376002)(136003)(451199021)(6506007)(186003)(2616005)(6512007)(2906002)(1076003)(26005)(478600001)(44832011)(83380400001)(41300700001)(8676002)(6486002)(38100700002)(66476007)(66556008)(66946007)(6666004)(5660300002)(4326008)(316002)(8936002)(86362001)(107886003)(36756003)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3J0s7AFZtT6J2YENXK9nWD0CAE/JrCARoSvkZzQxXSImialM4ZRdRSpr+jt6eTe9oaDlVA+WHoEAbynS0Nk5SVHl2+pKwKvZB8G930KhgG2RykrdMvAWG/TSWN3sxrrQrSnf1EJnGDSrjd+egMScenBX/JWMKVB+tzNb1he8oxs0PLoIQ1lgXBpXH3qjBz+CpCnkMuFituMhl5brRsWS+MwL2rhZHy5WDGnwXyRx6U6v2e4GKxrWfYzyO3Mj7yGr83g2YyEz+4YWJl+JuZ5xyoYMgtGoTCfnfgUYwI/Pa4hfZUyaGBdMwSSFLMWoAbP6OLj9RSYZ+nIPYmDZTuI7A11dgwxb+9qBeAcpPdJIquC5mWWg49ke/qmRwjcOOwtOd/MGOTZtBYZjVAGu4DSJaPtk/S5RWpEHSY1s6JLLZRNHKnnaAAM9SXEgP6Xc83YiJAO9QABbobOfga6a5VBx9y04diD7pODAXLk6rWM+i8Y59rAAZXQI2ETK+FQX9fUeCBoozVzwCed3ALWqkgW2m1pNfvzU5wNT7W6hdp2L4XbbIXHNhFTo/DE+YpcEpVWNGuE67XIl0Q/3TwEnHX0lzl+JwyZZThgbdSTsqQ6pNp3hjJgkOXGhvLrovikD1po/VLj/j3xBEMs0hw16uZaq4/5H22k+GYnhUn2EP4CMJtm0F547GZNwniPPvnNKQFHu9GQ5SC3bn7A9y/UQi9rfs7KHrQ/5tBJ3s+JcL9xc5QSGnJoCKYQ0Km0Qijh/jNLn2WVKkLWPWr+Svo5Y1f9+V2dcOEB+y/i6KBmAd+VIKMAvbSwwgSenIm4Hi3HFtNXjgbx79CPP3XsAd36Jizfy7ciL5zvip9Wf5jIbIlSsKiSZF7e1OzM5uJHYgZPOQOCbyFw7TUKk2aoQuMuUWkfsRMADmvrKTPk2N6hRc0aoSnwUAwcir744cbb2vXgyEK569VU5ikFh3tcLAY3u/fWiL0NdU25qWQor92vwOD2QY1gylurAL9rTuLbzhf/0rRtDGjzL9PeQOImjbZp0TM50kqIzKqm1JkHHDQNMTQ435+mBvMUyWpQo0Q0FHzpaclvP+pwSOXFbdeZmiQbe3Z8acaOUTA1KzAxuJqZ3L+Arg/8I+G5bFr+nlSzweRZL6vvXAEy/p6VZrc1ke5CW8uofbfmFcXYTVSwZlZdOqcx2I2ujk4mnN9ZNHusE3pyIHfM9f6sfYOls9uh4ZxrGFHi96WVx7swwSr4aXHvUoxeZWqo9nYFziT94xvZIhEi3zZMAPOjYF9Sisw/K/pijbIvtFHl586M3JA+aNOftX8K12CXl/vWQGXWu9YqItIbHRV5aB9k6qFK8ktc1eNNKNF4ZdjwTPl7k2PEH3iuZBbQw7mQlez45NVobszAm/egETuiTaiW4OSgpVJkQO8l9wkLN/VBjp4y8hf3mtna8lAfss/anAzoFsDFmPTJdpipNZ5GGOk5rMr20Sp2zTDoe+5nc6i0YBFrrGZmOMd6/SN8X0Jj1zZVVABDND9T/xPHFy2Y0fMUKINl7RnvJlyxi6qR15rF2130Toq2G6wJBIOMnTlzLQW08M0B1MRX5Ahh4f+N9 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CgpHo9kmrrndrrpgZPEMICSO7QeatYMM9SgisWzk2TfHTmOEKqVchSVwNBoPBvF4y0eujJQlTBXBkbmhg2i6vPnFsq4XfY7ERCHFgK7e7H9sBPPajvbhuadtY95clPoVyf7VjKiSsDazC0U7JgXEiSZiKotl7NggeHPK1ejymmJsHvAHfppO8rEBCjlAsK6nBMbrkjoFzaACenLdL60HIebSGtwYykPJCrfEbdUuUBYSzHl4KgIfP3zVBDTkDlf3ODhTeuanbcyfh2jqwQeUkLxb3b5kX+mpegQG2M6u8a2ZtaVsfHXLiPag6SVHrR/7YuuIaaLYD9f0uHoEEQTWD9Wy8HuSL52mCaG/Ol9Orqs1YlyxY4jFtVvmwz7f6446tC733QWEk/pCSdm+VrS5VPdcmQBwOPBRXhQOEbnvVHB6cJQ6+jWOi5J+FzC60ZnXy0vMq/s5ZsQcoj+fti+ls/gP5m7GbKZkjXeoAbOwIFhLmpYVHFf6mS7TiL1ffPWWD3jadV/sLIJAYy8egAMOQ9sjuOAfmyXf3Qgfn6uXexlTffiFx4MNR7useaVNrZuQH4JKIQ4mv2NHJuIayTAgMVz//wM4JgUn0uSTafekTvyvbTxxuv+R4ZXBYfydoVPBF+aAdiW92l78XwY/berEHsD+SdnnJ9DU4iHkRpCyHmam823VGsF/hKN6yZsxF37xP33M0hi4MPj3QyJ9N2LZJEe1q8e7N8UIac++i9egDojaVnt0q9JAC0t/99s6Dkgx X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e28bded3-9e7a-4458-1f6b-08db62c6484d X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 17:33:16.0540 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ptzlTXUsOjasrqUSXwKEG9d0kRm6TMsfApIG0fXAUUP1OUyor9RyY+2txoD2kQwo++OuXDRgBDSuW9RWJwwMiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6608 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-01_08,2023-05-31_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306010151 X-Proofpoint-ORIG-GUID: t3Y9LBBMbro5UelA_tGhN3TOWT4NvSXW X-Proofpoint-GUID: t3Y9LBBMbro5UelA_tGhN3TOWT4NvSXW X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Binutils From: Indu Bhagat Reply-To: Indu Bhagat Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767522508987221155?= X-GMAIL-MSGID: =?utf-8?q?1767522508987221155?= Define a new constant for the maximum number of stack offsets handled in libsframe, and use it. Note that the SFrame format does not define such a constant (limit). This is an implmentation-defined constant in libsframe. include/ * sframe-api.h (MAX_NUM_STACK_OFFSETS): New definition. libsframe/ * sframe.c (sframe_fre_sanity_check_p): Use it. --- include/sframe-api.h | 5 ++++- libsframe/sframe.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/sframe-api.h b/include/sframe-api.h index 405e30c27e8..3245bc8ac90 100644 --- a/include/sframe-api.h +++ b/include/sframe-api.h @@ -31,7 +31,10 @@ extern "C" typedef struct sframe_decoder_ctx sframe_decoder_ctx; typedef struct sframe_encoder_ctx sframe_encoder_ctx; -#define MAX_OFFSET_BYTES (SFRAME_FRE_OFFSET_4B * 2 * 3) +#define MAX_NUM_STACK_OFFSETS 3 + +#define MAX_OFFSET_BYTES \ + ((SFRAME_FRE_OFFSET_4B * 2 * MAX_NUM_STACK_OFFSETS)) /* User interfacing SFrame Row Entry. An abstraction provided by libsframe so the consumer is decoupled from diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 97b49106e39..a97c64f7a9b 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -299,7 +299,7 @@ sframe_fre_sanity_check_p (sframe_frame_row_entry *frep) return false; offset_cnt = sframe_fre_get_offset_count (fre_info); - if (offset_cnt > 3) + if (offset_cnt > MAX_NUM_STACK_OFFSETS) return false; return true;