From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by sourceware.org (Postfix) with ESMTPS id 7AC263850419 for ; Wed, 24 Mar 2021 01:22:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7AC263850419 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12O1JHLl117591 for ; Wed, 24 Mar 2021 01:22:11 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 37d8fr94ep-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 24 Mar 2021 01:22:11 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12O1KPZc116851 for ; Wed, 24 Mar 2021 01:22:10 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2106.outbound.protection.outlook.com [104.47.55.106]) by aserp3020.oracle.com with ESMTP id 37dtxyyvxu-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 24 Mar 2021 01:22:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RquYpn/f3PSHXtaQP7GDJbHgu8nutz3Kv4tHeMN/9p28lj0rSuFszWstDLR+onQ6pAIueEqowPQCv/FkDSIGaW+ikRxy2Xjs7hY3AWWF7evU1syrcHFdKifxYCjKEQauzImablZzdTWXSGrswM+El1ajLqkVFv3ilyt0uYHYVw85d7IG3B8Ujwn2m4janXMcc+q8XVOmuXQYbGPihZpR2xrlQvIetgfzZi0OMlDikjgFhGW9BKLIUIpWIXlzLZ8WCqxEvnikRVHSX4a09tWifiW10TfGegp5JSY3HbbanHElQKj/tYAleYd5MuzX6kJdt7B5NnxFb/dJJsBDE0YGGw== 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=wgDISmhCxJaDZocbeGmp0fheVSsd7sKCUSMPE/1l41Y=; b=CKQvCpW1kjVX04auOy525hh/XCUcNQRdtPpfZ6OUv2AjhmVhS2pOWOnV4N3TOHaLfw5wEkxY1QZ3Hz5nTHKK7bS7VNXQ3y/LvpTqTPl2tiIV8HVaE5oZPyBGqLo26tOVUfMeNabFfa+JuvBnp+6px9W8a33Kx9UXPzhWCzTXnD83w2+WGCzorhiKT2fKckzqrqe9F15tYlSiVVW0PERbBcekYbDH44+D7rtllVbz6gBMPvJZ52rtkdLkt6tOs5alYKkYqGe5ONK4HA2P3V3Q8RoXtCOzvGMUqcbegaihbyaCbpqontqfrbBvN8j0kO+zIxSGCQw9G7ZK5kHTeixfeQ== 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 SA2PR10MB4715.namprd10.prod.outlook.com (2603:10b6:806:fb::10) by SA2PR10MB4555.namprd10.prod.outlook.com (2603:10b6:806:115::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.27; Wed, 24 Mar 2021 01:22:09 +0000 Received: from SA2PR10MB4715.namprd10.prod.outlook.com ([fe80::bdcf:f0:1350:5fa2]) by SA2PR10MB4715.namprd10.prod.outlook.com ([fe80::bdcf:f0:1350:5fa2%6]) with mapi id 15.20.3977.024; Wed, 24 Mar 2021 01:22:08 +0000 From: Nick Alcock To: binutils@sourceware.org Subject: [PATCH 2/8] include: always do unsigned left-shift in CTF_SET_STID Date: Wed, 24 Mar 2021 01:21:52 +0000 Message-Id: <20210324012158.35472-2-nick.alcock@oracle.com> X-Mailer: git-send-email 2.31.0.253.gdec51257f3 In-Reply-To: <20210324012158.35472-1-nick.alcock@oracle.com> References: <20210324012158.35472-1-nick.alcock@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [2001:8b0:1101:10::2] X-ClientProxiedBy: LO4P123CA0384.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::11) To SA2PR10MB4715.namprd10.prod.outlook.com (2603:10b6:806:fb::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from loom.srvr.nix (2001:8b0:1101:10::2) by LO4P123CA0384.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.24 via Frontend Transport; Wed, 24 Mar 2021 01:22:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9297c923-0147-4ecb-2f6f-08d8ee633e59 X-MS-TrafficTypeDiagnostic: SA2PR10MB4555: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bEBNtZJyw9QJf1yPIVOeO/g/1QWL7ZgJwXX0JipYXmnCnK2kOkl5FmSE6QctFknY6jazXLyVCuyNccFsvVpECH6o3+bZQTQKQLtCdu/44cvDQSk0prrR+OAVbI+9Qx12TMnRpXwCAq8KZiMfumlYHEzwPkq55HmfxOLGt0vjGgPD/sY35AeanoiNrQue7TsfuOuq2QAAZ2NcLkG6+7wPu7W/hWB5laGRnVZA5fBl16+FdStteb4qMfryOV4JGAD0Ewo6u6EYrNqI2CvZPIyyJzSiDqn3ydIZlutYI+GT8mk7GLHU20vyDSDLYoy14+LZUcWz70joRHuaBoGJr9V6eeZJDf4Ag5JU9jrm986JB+2L2Ytlcib+S14AKGT7Qoldvc0crXsjERHC11RAtZK/IhRk+MVzWJ5kx9J/s1KZbLiSbwXRCr7Azk8b67clCZLkJ2nFjrv4CxYEvfVylKFfVKQBtwYc05mdlVlG7NGucaIxTI1qjrPG5kZQBMTdMkn1dxMfyLyiHbi+XmAukVQYvKoAigRho4vvvUlfzgpP5qR9JCaB2o38dYYn+k+PAozmRvDSrShGLjPvyYMchLAOEEkHlf7GnL+vuFAmBnhWk+1X4lg9199CvQs/PWCkcmDXTD3lPgYdOGobNgex7EiMT7VXthgMQPsny/ao5qj3yks= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4715.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(39860400002)(396003)(366004)(376002)(346002)(83380400001)(8936002)(6916009)(2616005)(6506007)(44832011)(5660300002)(8676002)(36756003)(6666004)(1076003)(52116002)(478600001)(66946007)(2906002)(16526019)(66476007)(186003)(66556008)(86362001)(6486002)(316002)(38100700001)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?01j2QML33GPCtyaL70/DcP5gcmmDctiVY1dFqhBe2q7Sp9Sbvv/KM3aMSLch?= =?us-ascii?Q?eKEPy6cvHf0xAQwJCCnwokiQpVp33F7jdczIaoB+a3gGfSW7f4y45sZH7Xz7?= =?us-ascii?Q?xGTYUeyWWeFy76OrGEScJXGNEGHq3S10Ag8ghgrSt4AYibeVbgwzXGW0o7Rp?= =?us-ascii?Q?3Yv85JYLrh4j1ZWinwt098/QNi93UiXFyLgH9XJvXd66mZql0uSRsCtOrcgH?= =?us-ascii?Q?h2IZT25PVDk+jna38PvtIPECG4zehMqY6EDDqwh/tVmEg/J2aHK0kUcrDCQM?= =?us-ascii?Q?J9ObEudInw1jQLsLwKCSuIBTWTQF7jZmXpOXeDuzRHKIbIsOoAqyBwRZMxJO?= =?us-ascii?Q?DufLnBl2ZqDMlhKFRATddPg9qfgvIQLEi3/2wyT+o2NhC8Y4s3+nMZ4W4fy9?= =?us-ascii?Q?06QgNNNg0T9+eLxulWBZXXQq7ugxvdqvEYM5k1Y+LWQTCPO1kvwpEzKi1DXT?= =?us-ascii?Q?ODrW+Ph8p690IGSp+AJn8QI8209U6i+1ZZGQ8oJaaSGnXu8FrL783JxKYHw+?= =?us-ascii?Q?iA7/AU2lqg2xH9awD4ZmwjWG3TttE7AjnOrC7HpMcuZrn01vgEhKnU7txeR5?= =?us-ascii?Q?wVu2jHdFFstSd7gjuX7ViBECGmPMUKvT/fDZrFNJF3xNzGRlkGmXj5C8SlBu?= =?us-ascii?Q?widkLkSQbdutT3Q+UE24bx6gu/6j+H/uzDYAtfpOxoza/OZ93i2ValVs4CyT?= =?us-ascii?Q?FEUj2njASML9nFtXGOm/9XHUC5H5hOQlYJQoXw5qsT5oBBQO9/2i2NrYjG3Z?= =?us-ascii?Q?mUimE/nfCxDs4lqMyEWFGyJf3B8lZlx/FVuzKiRjQfAapz5X9VZIQgMsyPAZ?= =?us-ascii?Q?8kkU/7jMhyVkVFvsM5XoG6fsjDutiXiSImQYRWg0eOEGaiUOotfrGBnBJtiG?= =?us-ascii?Q?oS9WW9uEesb4y5YMomYs3DldwGMWKG9xW6XUuO0Y+eJbBB5+Ob0utHCMM9Ob?= =?us-ascii?Q?AODpFjc7MPbCrkODQndKaEyhGmDN1VDobD6YJUEaloY89Lzy/SqTtFxhAdwy?= =?us-ascii?Q?C7ULIql7XlscEjkoiCJ5eevtmfNkHbSD2o7VOqrT9OmsbC4/L7hY78ieiDPL?= =?us-ascii?Q?+d25w8+FHEt0cyNmwwHAB9QlqSUQ26qEclY4qzvoDA2x5NTeuPTRzviqAUTQ?= =?us-ascii?Q?EbYQDdLwOBxI9NlgQCEtA4TUgfUbZa5tZHzya/zAAGmkuG5+l8DoBLT57Uld?= =?us-ascii?Q?gco02ph7SYUFxHPdYltqsWKkcbMoF+oepra/B6LKixD3dzGQEmvHI5FOXn2x?= =?us-ascii?Q?q/e+eNJuzl0Eq0XE+MBws82grwsku8DMkIe5mJg9NzCaeOc2W3haLIUyVQrv?= =?us-ascii?Q?x0cKIa2XQXBQ8Xv+07LQAAyVJtwBcOX0zrORpsKboQoy7w=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9297c923-0147-4ecb-2f6f-08d8ee633e59 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4715.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2021 01:22:08.9026 (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: Ruzxoz02faC/GOamsEg18awF8+N6vN2Q6syZTaabNOP5IcEs92HWB+9F/4XoTfscYyxA67/jqC1z65cHAoW5DA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4555 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9932 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103240007 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9932 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 spamscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 adultscore=0 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103240007 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Wed, 24 Mar 2021 01:22:16 -0000 This turns into a signed left shift by 31 bits, otherwise. This is an offset and is always treated as unsigned in any case, so add an appropriate cast. include/ChangeLog 2021-03-23 Nick Alcock PR libctf/27628 * ctf-api.h: Fix some indentation. (CTF_SET_STID): Always do an unsigned shift, even if STID is signed. --- include/ctf.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/ctf.h b/include/ctf.h index 50605743ab6..90631fccbd6 100644 --- a/include/ctf.h +++ b/include/ctf.h @@ -358,9 +358,9 @@ union c.ctt_info = CTF_TYPE_INFO(kind, vlen); c.ctt_name = CTF_TYPE_NAME(stid, offset); */ -# define CTF_V1_INFO_KIND(info) (((info) & 0xf800) >> 11) -# define CTF_V1_INFO_ISROOT(info) (((info) & 0x0400) >> 10) -# define CTF_V1_INFO_VLEN(info) (((info) & CTF_MAX_VLEN_V1)) +#define CTF_V1_INFO_KIND(info) (((info) & 0xf800) >> 11) +#define CTF_V1_INFO_ISROOT(info) (((info) & 0x0400) >> 10) +#define CTF_V1_INFO_VLEN(info) (((info) & CTF_MAX_VLEN_V1)) #define CTF_V2_INFO_KIND(info) (((info) & 0xfc000000) >> 26) #define CTF_V2_INFO_ISROOT(info) (((info) & 0x2000000) >> 25) @@ -368,7 +368,7 @@ union #define CTF_NAME_STID(name) ((name) >> 31) #define CTF_NAME_OFFSET(name) ((name) & CTF_MAX_NAME) -#define CTF_SET_STID(name, stid) ((name) | (stid) << 31) +#define CTF_SET_STID(name, stid) ((name) | ((unsigned int) stid) << 31) /* V2 only. */ #define CTF_TYPE_INFO(kind, isroot, vlen) \ @@ -387,10 +387,10 @@ union #define CTF_V2_TYPE_TO_INDEX(id) ((id) & CTF_MAX_PTYPE) #define CTF_V2_INDEX_TO_TYPE(id, child) ((child) ? ((id) | (CTF_MAX_PTYPE+1)) : (id)) -# define CTF_V1_TYPE_ISPARENT(fp, id) ((id) <= CTF_MAX_PTYPE_V1) -# define CTF_V1_TYPE_ISCHILD(fp, id) ((id) > CTF_MAX_PTYPE_V1) -# define CTF_V1_TYPE_TO_INDEX(id) ((id) & CTF_MAX_PTYPE_V1) -# define CTF_V1_INDEX_TO_TYPE(id, child) ((child) ? ((id) | (CTF_MAX_PTYPE_V1+1)) : (id)) +#define CTF_V1_TYPE_ISPARENT(fp, id) ((id) <= CTF_MAX_PTYPE_V1) +#define CTF_V1_TYPE_ISCHILD(fp, id) ((id) > CTF_MAX_PTYPE_V1) +#define CTF_V1_TYPE_TO_INDEX(id) ((id) & CTF_MAX_PTYPE_V1) +#define CTF_V1_INDEX_TO_TYPE(id, child) ((child) ? ((id) | (CTF_MAX_PTYPE_V1+1)) : (id)) /* Valid for both V1 and V2. */ #define CTF_TYPE_LSIZE(cttp) \ -- 2.31.0.253.gdec51257f3