From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 094EB3858295 for ; Sun, 25 Feb 2024 07:16:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 094EB3858295 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 094EB3858295 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708845369; cv=pass; b=fS0CdixDi9+qHwd7h/XPvVpvXRDHwyyd2X3tbkMQS4XLgPEOIk9fOTHUgyExXbm69up8hA/UaniqW42cXG3wQFTopXkgkbjTivE4dKdIEUt2hpKRt/i53Le9qr0Khi5y1vB0jMYHq1KuRvWQRnK92+lUJvu4WvFdgRJ1oILht/4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708845369; c=relaxed/simple; bh=EBdwP+mZgJMBx2Ce7IL89Zm4qX5Fpp+cLnZeWfEhD0s=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:Subject:To:From: MIME-Version; b=vijyKWw6IQkYmXKGd8OyQALN0sCNWtPkaxzRLi2hcgEARj94Ldv20Rl18iEIXC5f6YUxa+kHoJXkeEoqtlHkXp2tjA0h3M7VghAU+hXON5k4Hx50FPvvyRFKne9ALYO4AIR6ZfJWwmfkVB49V3zXopQmKV+Su442SS9Cnwiae2w= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41P6iaQD029245; Sun, 25 Feb 2024 07:16:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2023-11-20; bh=2HlbZzy7TRX6+MU1TsegJ3+QPxnIYg1kl/sqULMwYhs=; b=JH7xpk1Nk1t/Q8EBOwl1vZ5qxlrJKbnOpq1c9TNIJxj8eF9Y3+X8LFs+0g8LTgaf/CZE g18K1qw8ilH4AKLrAKhwCWiirJRWhvlU0A/k/99DZh/CrLXnVUJFUX38jTk3/ZTOc0GR lZXKbC/gu8r4997PZ0JX+Uu9HucxYLxsM/JAJrH+seXfipewwARdASW9FXkR6mEMfviB RhIEUemvggBx4jV8lEs4CKKcOfbZHGzWqQSlqlnK3ZgTCEwbSntyoPSBjhWQ64fYx30d D6dnt3xOyZWlFFf++o7zfwoA14U6oKegoDJyHq3B2VPKTW9F0AlqMbFBbUJTu9xhlwnq QQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wf6vdted3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 25 Feb 2024 07:16:06 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41P44qTN017692; Sun, 25 Feb 2024 07:16:05 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2041.outbound.protection.outlook.com [104.47.51.41]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wf6wararh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 25 Feb 2024 07:16:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LNLhLZgiW/GeSKOyPDnkkPU0n0GChCuY2tbUsUFkIIbELFa4Ain79AyNNqoqQBYacOT5JS8jquwPm+UD0eoJbREVpYrZ9fsp8ab7LCV9rhhNMBJ2nYjEaUn0UOWb7TkrOxU/92PQ+PPqxyERnqNodD6RQYMSpS9y/kzZxV6BCr0UUZpA7gdI6lX0gkyCITu2RDmy+VNm0HEr64Np+6fGb+JY1xaJ7Skm9uFwvKwjLKOOGKFBfqElM0Vq7ynWgbLuhcAKp2KSQkvggG4GktXHy+06tLC9tqnnIk/BZsOcKHo0irAftKGuP9WALzeTf//ZMZjiw3VBLcRPPK3FS4z8oA== 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=2HlbZzy7TRX6+MU1TsegJ3+QPxnIYg1kl/sqULMwYhs=; b=g94nb8ccKQGsPAUykGmc8evSg5lP5jiGPdVz1Mo93bj3VNnHyXnMB0no/patlXQJyHjJiL4Stsi3veI9cKg3MxkHnFdM0oZrgZKVrpn9XQD60wZZJRLM1Bw+5ozngiSqB7NpmdqKxeA8OaYnyf81fhF5+XyrQZcyXf8/mylOAHMvRN7sYtahS6ZxWam7CHOrgrtmpn7Xu2xIYdLHQlu8TRQ72WsXuSR9Y3e/mX6ZRmwCpr/I/8fSGgKXZR5EsLYmZRmyTtisyHKVSsQdlsKCKJHqimniJXAn0gVhSuaeq4EHQU9JCobZVXsliAMD3QEnhZeCWqxDsENVd7KA0tTDgA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2HlbZzy7TRX6+MU1TsegJ3+QPxnIYg1kl/sqULMwYhs=; b=cA55aT/NuJ6YKbR8Te+WRH5e26olxana9o5UvIhNkk0eWVaa5Hna95y0+JwoBKEy6zJ1EHrDaYak6LK3O/z6e+MAJou3r1ETqWEFaR5cnekoaqxWkkPHKxAMVmQfMVYCNeClnZZka0IWrwtm3VwK+iBU/Nl1Jx1Q9S/rC0F8IBY= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by CH3PR10MB7329.namprd10.prod.outlook.com (2603:10b6:610:12c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.24; Sun, 25 Feb 2024 07:16:03 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a450:c423:d1fb:3f86]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a450:c423:d1fb:3f86%5]) with mapi id 15.20.7316.032; Sun, 25 Feb 2024 07:16:03 +0000 Message-ID: <15616ebd-59d0-4443-80bc-3624747de0de@oracle.com> Date: Sat, 24 Feb 2024 23:16:01 -0800 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] x86: adjust which Dwarf2 register numbers to use Content-Language: en-US To: Jan Beulich , Binutils Cc: "H.J. Lu" References: From: Indu Bhagat In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MW4P222CA0030.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::35) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|CH3PR10MB7329:EE_ X-MS-Office365-Filtering-Correlation-Id: efd68e17-89c1-4916-e01c-08dc35d1a03c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BXoITWbuLDLTp8Phj8N6MWfOv1IyFHF02wlu2jW81xHkuEiHSSUbs1nCjs7d0DrOHwNGLF3nbKG9cBpBHpcaxCcS69kVEpcO9RfZgzJ6J0sAInrN0AkEL3T+nrxO5nx2V79GpFRJyBZlEaKpba6DNPV/TC2HDoTLkRipEJCrrt4tnTapYur0rW8GZ5I4Ke4Vno+d2Ml8uDqiwJkdxM5Obd1s8UYZSJGPGEqt/x6xFjGS8/P7xqAnrTQYxTxlscCvr1kYMKD6zyBhry+wuM17+Wgk77O9BzTODal8xvnVQMv5kIkD5eR2c1VgvdNmApzTLwTJ4Q+cxYtlI1/Y/QZpuhK+02Dt/WIReM2zxnML7yLfi0NlZEeLsIhV5oFiUVRPwPV011AX1UHAD5z+dl4Rw0caCZDQ6ygVrGVGGTPo9gTsIa1WNokMiPI2FSOzRcfC3uS+zRK96khFeER2y7f3rkrnC8CQ2Z/+wCl5NiRKTcnGVQlekrJNd4hhbFaa5cDKMZSf/FEiXKtHNSFMC7X+/jRVgR0K6LAVhddeIt270CU= 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:(13230031);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bjNwbEpnNzhBSnJlSFNqRnpEOSs4bTdlbmd4cTcrbFVmR0dvUnl5dFZ0aVJT?= =?utf-8?B?ZWhGaXk2TW1ldERzeHk3Rzd5WkNJSGZFMmhNTXBuTkJ4RWFsMXJhWkY0S0p0?= =?utf-8?B?cXBUTk56ZjFiL2dCclhtS0VzdkpVRW9NQlVSTEdwUFIyMjRzN1doc1JlT2Ni?= =?utf-8?B?Y3htN3EzcXRRQ0o1SmQzUHBIYzhDUFEvaUEyeVVxOUsweFBjcDFxUXN3SVU2?= =?utf-8?B?em0yVHRpaU4xSFZZYzQyRE5zbHVEODBsdHg2MTVXQnlUQnliOHE4ZDhCMUp2?= =?utf-8?B?empaQ3BqcVNmanNpay9qc0FuZW04OVpVYTl0UFcxeHJIWmZYbitkQW9oWkFN?= =?utf-8?B?WnFXbnJXMjI5a1k0RHNZVHBsaUJPVUFxNWdUbzJKVzRvMnpKcTI1VThDY1Jz?= =?utf-8?B?WmVHYm5zbDI4ZUEvbWR6TkF4VDlzbHNrODNROFAwdllvZGZIL01tK3NTS2k1?= =?utf-8?B?R2FHQVVFZk84UnlZb2daNyt0R0cwNlE4QzEwSE40U2Fzbng3U2ZOdmRGNGVU?= =?utf-8?B?YWI1c3d0YS9YTGRXODRYb0pnUWg1VllJT3U0ZERkUVlrR3NvYVBpd09BVlp5?= =?utf-8?B?dEVqc3NyYmZ1SHFiMGxjUkhabjl0Z1BYM3BBZ2ZlREQ3Q3hod1dpOWhtK3h0?= =?utf-8?B?SS9wR051SUh6U3F3WjFxUEtLSm1zY2prWGtGUUkrdmVWNE9VMllJOGJvLzRK?= =?utf-8?B?SERKT2VsdUUwa0tuSjFjQnlvNDJ0VEdOblMvWkcvd1NLWFFldW9VelNBcGNi?= =?utf-8?B?emV6Z0ZuTzFPaVMvNmNxdVQvdkVIdVZLYmpoTFkxNUNDTE5wUktDei9UcGJ3?= =?utf-8?B?ZWl5N1lYNjUxWlF0clkwV1lCekxGcHgrMDZHZ1RiTmUxaW11azluMG9mODNO?= =?utf-8?B?dUs5L2RUc0pQRXFzd09nRVRWRFR1em1ubzhXbFJoT08zaXJOSWxtZW1nNEhB?= =?utf-8?B?Mi9obGI2RDlVc3hlVS9iREtTRVlGRE5uYllaUmk4ckFnSFpLQTlwaTVhOXEx?= =?utf-8?B?VXd3Zy9vS204ODJnZ3kzdlNQM3N1L2JaeHBWMXFMUE45emZWTm9GYjN0OEho?= =?utf-8?B?RGxoSjY1OFBPQlIyWGs1VHdkQ2tzcjE0YmtoTjFFUzIyMWdzOEEwd2xmaWw1?= =?utf-8?B?WDR1dGRNSXVyaFNycHFBeVVHZHowNDJvWUhMbkRSN2cwWTRRdnZjMktDYy95?= =?utf-8?B?NWNhMHNXbU9Fa2lxUkE4V1d5d0dOVTZBQkJBWHFGaVY1K2ltQ1FLTkg0MlRv?= =?utf-8?B?YU0wUDBYRytvWXRIMnY1MmUyVVdhKzV2Sk4xM1VrUmwyODFDSXJHUi9taisw?= =?utf-8?B?aHJUdUkva090SlFVM1R6R2N2L0pYcjNHZDdicmJTSVVQZm01dm5VZjRUMURK?= =?utf-8?B?KzZzUk1yNXdmdjArSnF0VHRQT1B4QVlDRTdvVkswRnUwV3NaRjNRdktaSFFu?= =?utf-8?B?UW14Rjlsa1lGdnNGa3VNcEdPQ2t6VHJwV0FXb21DVGVlajFxWkg1WUl4b0JF?= =?utf-8?B?S0p2MmpVcWVUSTdYQ3dmQ2llSzJSWDF0UE8wZHdPZWxFbXo1OFZVbTcwZVN0?= =?utf-8?B?ZWVpcE1kUjFVbEJxMkdQTVpHdm9razRCUXgxc1RjOWlKT21neTlKS3h5K1Nz?= =?utf-8?B?Nkw4RVdUZlk4clR3NGtnSTRKWjBoZVV5Zkg2YzlwaFJpQy93WVB6ZGNqaU0y?= =?utf-8?B?bTNtc212VDQ0elZ4NGY0Sjh2WGpWTFdUVTVUTkJsVVM4SU5kMlJUOGlkTWdo?= =?utf-8?B?Ritrcm5KYzBzSExhRW5ONmUzRlVSMm53VitPci9QRG9pakdPWVQ0UGtPWWJl?= =?utf-8?B?WWZFV2ZDdDVCTjNSQmtJOWZJYjBLSFljcjVueEVnbGdoVUVmYU0yMTdKS0lF?= =?utf-8?B?bjRPaFVjNHBiaGxsdGo1MzYwbEErTVNBZ3hSR3hHQjlMaFh1WjdJZkZTdmZG?= =?utf-8?B?M2R6YnJHaUM3V3AyMmFoWTVIVDQ2TWMwL3dFOWgvdGVuRE93YndUbVBaZVhO?= =?utf-8?B?aHVXRUhrdEtWKzZCRlFLb0xPZDZqUFpnNk1wODR0N1BJNlcyNEphUW1USFFD?= =?utf-8?B?TjlHeTUxMVVLTGVnam5LekRCTlo2amtITHRNb2RzdkM5azlLOXFkMkRJNDNL?= =?utf-8?B?NmZVZGEvVWxNWDlTRGVGdHJOcngyVEtVZlV4Z0dPK2dhdk5JY0JSY3E3NHNV?= =?utf-8?Q?gFZ3jgLBs/4ENOzGeVRbaPg=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QuBxilgDnGVAQkigILeux71LmTup4VzLJNn1NS4a+UEaqQzOnhxgQP8EtdG+rKfjHb+EwpeFo1SH4PcywG5GcWf4pUcZ3o8ZPHd1sLlGu+wmJyoPIjBc2ezZH5ZdYGfQQQ3FDYbCz4EMEGT8I5J+xUiQv5tTe3KNdJXk+34q7uR5m1k02BAugs6KD6mEhOW2Gwt+HYoEASRAQ3X8L3XZP/lAFmG2noqFXqjkaAZhhVvlcjuPI39pYV40zvSY4Uq2Gx2OzTxtNlCaAtBLxcAgmv0yTZczmM9+KnuDSm1UK2GWTkmnQ2VDHlEV4jdekIP4VNCRMvpT7HvMGT16V9gbi65QpK6uDCc9hZEc6GfTrc8/p6CoziiripooGNNgBLYuAidqjMeb3SPG8BArX8GaAw8rSHn/lUcRpAfhghKnU1uKWEJhceRx6tSSg3TlqNKlwjcx47uHGQ1+J70A1QCVQ+IZJ/aF5f65pmXcswWgsIlXOwXpL45sKYXTScAm9xar5CbamCOR3XZM/dAKeBTyl23TKnifkoABg5ulj9B6lfkDkm4GrECyfr6jTKJ2C6vqV75JuCLNUQpoewFEfc5c7JB5d6Db0xdSWU4+MovsIhs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: efd68e17-89c1-4916-e01c-08dc35d1a03c X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2024 07:16:03.4792 (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: slD0oSl9AdqjTtGeoetZ9A+ehuDd0p4KJFqtgEQA1fmnAJovsGuEDlYuYCS/+X232T8akIjPVtSyP/zgP+FGkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7329 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-25_06,2024-02-23_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402250057 X-Proofpoint-ORIG-GUID: T4diuB2HniJQAGxbb44RT4v-oLlIBe4F X-Proofpoint-GUID: T4diuB2HniJQAGxbb44RT4v-oLlIBe4F X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,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 List-Id: On 2/23/24 03:07, Jan Beulich wrote: > Consumers can't know which execution mode is in effect for a certain > piece of code; they can only go from object file properties. Hence which > register numbers to encode ought to depend solely on object file type. > > In tc_x86_frame_initial_instructions() do away with parsing a register > name: We have a symbolic constant already for the 64-bit case, and the > 32-bit number isn't going to change either. Said constant's definition > needs moving, though, to be available also for non-ELF. While moving > also adjust the comment to clarify that it's applicable to 64-bit mode > only. I have no further comments. Thanks for the patch, Indu > --- > x86_cie_data_alignment, independent of this change, likely needs > adjusting as flag_code changes. > > The COFF/PE setting of x86_dwarf2_return_column looks bogus as well: 32 > is already in use for %xmm15 for 64-bit. Commit ca19b261ecc3 sadly has > no explanation at all. Nor did it adjust objdump accordingly. Given that > the author has moved on (couldn't find an applicable email address), I'm > inclined to simply revert that change. If anything a proper complete set > of Windows register number mappings (wherever those are formally > documented) would need putting in place. > --- > v3: Also adjust tc_x86_frame_initial_instructions(). > v2: Also adjust md_begin(). > > --- a/gas/config/tc-i386.c > +++ b/gas/config/tc-i386.c > @@ -3276,7 +3276,7 @@ md_begin (void) > operand_chars[(unsigned char) *p] = *p; > } > > - if (flag_code == CODE_64BIT) > + if (object_64bit) > { > #if defined (OBJ_COFF) && defined (TE_PE) > x86_dwarf2_return_column = (OUTPUT_FLAVOR == bfd_target_coff_flavour > @@ -5410,7 +5410,7 @@ ginsn_dw2_regnum (const reg_entry *ireg) > if (ireg->reg_num == RegIP || ireg->reg_num == RegIZ) > return GINSN_DW2_REGNUM_RSI_DUMMY; > > - dwarf_reg = ireg->dw2_regnum[flag_code >> 1]; > + dwarf_reg = ireg->dw2_regnum[object_64bit]; > > if (dwarf_reg == Dw2Inval) > { > @@ -17548,7 +17548,7 @@ tc_x86_parse_to_dw2regnum (expressionS * > if ((addressT) exp->X_add_number < i386_regtab_size) > { > exp->X_add_number = i386_regtab[exp->X_add_number] > - .dw2_regnum[flag_code >> 1]; > + .dw2_regnum[object_64bit]; > if (exp->X_add_number != Dw2Inval) > exp->X_op = O_constant; > } > @@ -17558,22 +17558,7 @@ tc_x86_parse_to_dw2regnum (expressionS * > void > tc_x86_frame_initial_instructions (void) > { > - static unsigned int sp_regno[2]; > - > - if (!sp_regno[flag_code >> 1]) > - { > - char *saved_input = input_line_pointer; > - char sp[][4] = {"esp", "rsp"}; > - expressionS exp; > - > - input_line_pointer = sp[flag_code >> 1]; > - tc_x86_parse_to_dw2regnum (&exp); > - gas_assert (exp.X_op == O_constant); > - sp_regno[flag_code >> 1] = exp.X_add_number; > - input_line_pointer = saved_input; > - } > - > - cfi_add_CFA_def_cfa (sp_regno[flag_code >> 1], -x86_cie_data_alignment); > + cfi_add_CFA_def_cfa (object_64bit ? REG_SP : 4, -x86_cie_data_alignment); > cfi_add_CFA_offset (x86_dwarf2_return_column, x86_cie_data_alignment); > } > > --- a/gas/config/tc-i386.h > +++ b/gas/config/tc-i386.h > @@ -396,6 +396,11 @@ extern void tc_x86_parse_to_dw2regnum (e > #define tc_cfi_frame_initial_instructions tc_x86_frame_initial_instructions > extern void tc_x86_frame_initial_instructions (void); > > +/* DWARF register number of the frame-pointer register in 64-bit mode. */ > +#define REG_FP 6 > +/* DWARF register number of the stack-pointer register in 64-bit mode. */ > +#define REG_SP 7 > + > #define md_elf_section_type(str,len) i386_elf_section_type (str, len) > extern int i386_elf_section_type (const char *, size_t); > > @@ -425,10 +430,6 @@ extern void x86_cleanup (void); > R15 (15). Use SCFI_CALLEE_SAVED_REG_P to identify which registers > are callee-saved from this set. */ > #define SCFI_MAX_REG_ID 15 > -/* Identify the DWARF register number of the frame-pointer register. */ > -#define REG_FP 6 > -/* Identify the DWARF register number of the stack-pointer register. */ > -#define REG_SP 7 > /* Some ABIs, like AMD64, use stack for call instruction. For such an ABI, > identify the initial (CFA) offset from RSP at the entry of function. */ > #define SCFI_INIT_CFA_OFFSET 8