From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10087.outbound.protection.outlook.com [40.107.1.87]) by sourceware.org (Postfix) with ESMTPS id 4C083385AE61 for ; Tue, 14 Jun 2022 10:07:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4C083385AE61 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TDsDB9hXo1O9tVtvMdp+ZHrEto9IOCydXmkHhwQhJXT9wfYO+pbw8u8xqavt1TnvPuBNd+79GHFYm16kwXMbLPWQ1Y9oPPdeQ1vUHzFSUnSPvHbrC0bkL2EFteXPTcrPKyIBVjSbpYoCQL4l6qIGpv5lV6eMxqlPPikBa0125szxCc7qrVr9zPlqmcfP4kQjJ8/CygbCj1t2LRYcVyIwq1VEGZQqph5eMPzy3BYFypEPzcbEHKFXx7znqwRI/N7mHt0zJDLheff4kI5ywNf22vSdhHVbOausO9yWsJwL0jt3D6sobFZM/4QA0/ZoTHiT6pJ/r6s2VUMG3kTChLvSlw== 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=u8X/XtwTq1KQkPRIFSQGxmJBn2mcwmcESumPdHfFnkE=; b=KAQBS2qEgggH+1RlPcg2hMPwU3svSBxBCj9TfB1klxAFtz2VaiBoUjTmURpRHZ+empLnoDjjpFomugiqfL5E4c1EvDOh9ZiexZrd0ff7IhSD7+C10wqaq55iCb3Yz/76Qq0esST7//ir/2gJu1hHtWVi4ojuNlpvv1x1LWx2Wq/bkHEuTcEnaJHPcp2xoY+UviKp8GVxeOYd9Z2t28+ZfkwrZ40oW27mXde14tvKxMq9Xr4r8fgAkMBPBwbsrotDuVq9NOs6ptrubcPnkDSxjmtRA3AaZuxZUaQbQIKYidw/9KR8x82KPJbKHxc/1Wg8sZA/K48viJFW2gvP/2rZdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB7PR04MB4810.eurprd04.prod.outlook.com (2603:10a6:10:17::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.19; Tue, 14 Jun 2022 10:06:57 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5332.020; Tue, 14 Jun 2022 10:06:57 +0000 Message-ID: Date: Tue, 14 Jun 2022 12:06:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: Binutils From: Jan Beulich Subject: [PATCH] x86: drop print_operand_value()'s "hex" parameter Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0213.eurprd06.prod.outlook.com (2603:10a6:20b:45e::12) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06b01fde-f23f-4dc7-7b8e-08da4ded9d7e X-MS-TrafficTypeDiagnostic: DB7PR04MB4810: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: GkTtSAwmGZ+yzSevSQoltl2LZtrud9eTG7XrmiKC8vaeHXCYFw1wDqg/kBGj6j8x7ohRR+cJZ9GxFn0i3GOhRPI1caVQ0dMwYNYm1b7CnVOXqOrPDlzLGmNu8h+RPTbsRF70gh4YLuneM9ZoRD3qYmnr4tPYSMsDU/AjTCSOLCn8yDnkDciMS0B997cu7W74jt6eJLfQh1Q6lpaj+z1B8wCH5+ULA3jQ0YkbwaTkJ0RIMJBeVXyiRba1R/epoThEKqH8voQ4xelX9gR7lnRNempqZdt8AOVM6WRtqc7SS1LlDHrHM5h7gej/dBKhDNgFa+80xpjibwv8xcVjcVcHW9cmR5CTBtassJI9M5nC+ia1OP+DMssRdhAXL2KcEL8drsV8TUDAf315D7RjkZWNrVxgMX8Tc9f1N1h1bmphJ5CAx3mqCXC5UQEjFJ1Maeyk2XQTOTAw+a9pdweYi4c5AHfJZ+Y8d3n14gHMzoq/RASGTgqPlTK2wQmOUfSil6V431c9YqoOr7R7RQe+vEWVQFS/VJj0e3DB08Qx449c/qVpBdWMjoP584Xsnw7IgY8vS3Wv5h4LEvNC3axvr7UvtmN353tnioitxR8hHJHgCzfRsN4XgMdUywmyko4FfzjfjEOTe4fOdBnsJPNQjSsSQ85xXflhK3k4Z0svx+SJ8n/gRZR/NqL74eiwd6xGEzffhX6aFHD17SsrQYStjk7S6/B8VY3grb9uMeyAk4gq8A0oQULPAmimsrsnFDZjX/Q0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(26005)(6512007)(6506007)(66476007)(2616005)(66556008)(2906002)(4326008)(83380400001)(6486002)(38100700002)(31686004)(86362001)(66946007)(186003)(8936002)(508600001)(6916009)(5660300002)(36756003)(8676002)(316002)(31696002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Zm03UjQydktEMUNiWkoxM3RVTHZDUWxFNHN1bkgrNE54RERXNURTWmV4S1Zl?= =?utf-8?B?anRMRHVvYUozTXJJTS8wak81M3puc2xxVS9PVmNCaXZQK1JCdS9scVBKSUpt?= =?utf-8?B?NXhrSDI2THhzYlVXRVlmN2tjZG5STWMyTnlqVDM0dkhtcFBVMkJkREJ1cEkz?= =?utf-8?B?THVaTDA1RDFzRnRDNWYzQlBhbHR5K1Ywd2cyemV2UmU3Ukp5RDkwMDZWTGxi?= =?utf-8?B?VFFVZkYvbkNPMzVieVJxSlJtVGZlMTd0cGJVbWVVSkhiUUlrQy9CTElJbWNB?= =?utf-8?B?Z2JaNzk5a1QvSGc2akZxWVltalNQdlBOUjQyUU50ZGlaRGRoV3p3Q2xqMEFY?= =?utf-8?B?SjJFL1pUYjFwOUhnWk9mQVdlYkhJc1VmcWRYZU9mMVpjSWJjcDdIa0tON211?= =?utf-8?B?eXYvOTJGVVNtajJpM3lJTVJRQmZscWpsdlJ5V2xiVXdrenYrZmVtaHNPa3po?= =?utf-8?B?ajhKTDZCVTVkMTloeGhKMDlDQk1CTDhDclRnNlNkQmZjVkUyWFVJRDlHaVhC?= =?utf-8?B?QzZlM2MrWjZYaHhkZ1BlOGZoc252KzJUU1ZZc3dYNlZPODRFSjgyZWs4MVox?= =?utf-8?B?aE1aQml0Y2cxbmNpemFraGdGcTFxaDI3Qjh6amVvaDZVYnRicWtFdnUrVk43?= =?utf-8?B?QnE1M0E0aXpGdCtzZGErK0dKL1QzR1lnbTVTalFDZjBHVVRpU29NYkVhTkZr?= =?utf-8?B?TEpGS1lGVndVQzJrM0lwc1pUMTE2Mld2ZngxVm9ORlB5dVVFb2wwWFBwWUd2?= =?utf-8?B?M3VQUjlzcDE1Z0RjdjBkZSs1eUg5Y3luWllMNllIckNvVHlFT21UUEZydklY?= =?utf-8?B?elFtb2ZuZHRPZHlpNmk3aDJUdEpNWVA0Ky82UFduZW5tN0JWclRFQTBHZGxV?= =?utf-8?B?SU9kb0hFYnYzZVV5UGliZlZsOEtjUGpZVUQxT0I3RHFnN1hQN1phL1A4VmZ1?= =?utf-8?B?T0V5eXhUaFhmSjZXVUFtQW1HMEtDS2JZOHloekd1N1JQUkNBclFBZUFzTHBU?= =?utf-8?B?cHZzbFpZQ1VmR3Zlbk8xYUhWc3ROVzdSeDRuU2VKTDE1dmk4WVJDc204bzNk?= =?utf-8?B?Mkk5a3Ntb0hpR1FPQ21QRVc3cDdybmt6S1p1NXh0ME94MnhrdjdGb0l0eFd4?= =?utf-8?B?ME1uUlBIZnpVUVR1aFBIb21yVnJtZlZ2VkF5QkYrWThEZGxtY0hQR2x3aTE5?= =?utf-8?B?M044TGt5TmtTZElLVFBMZlc1MTlzSlBsUGw5UDJibjdoNFp1dkNqQTBnWVN0?= =?utf-8?B?eHZ5TUZhR3c3bFV4ajV0TlF2amVrRzdmNDc4aW81bWNiZGRyeFNJbEgxNnIx?= =?utf-8?B?WkZYem14SGtqUmFNbENQTDZqNFdxdjZaYlNCOVNSV2NYTjFHOFFnaWkrNHEr?= =?utf-8?B?TlRRWGc2bGRCQnZaZHJQR284ZU9uZm9ubXhXVFhTazkyRFdIVzJyVWRuTjlF?= =?utf-8?B?Y1g4bmdKK21IMDZ6VE1KZG5rSnh4czhXOU1GSXNXbyt6MGZLbXdLUVMwSHoy?= =?utf-8?B?U1ZoamhpWllIdkE1MXBHamhZVjlhUnUyQjF0TkhUaVBJUjFFMkloMDRUUVdq?= =?utf-8?B?ZmwrTkVMOHJFVlpIby83K0xKSC9zVTRkQ0JFbGd5RW5FbStpZ0ZFMGNpdEV1?= =?utf-8?B?MEsvY1hYR1ZlODRWc2xLelJMRUszelIzakpHWDNOZDVCREpVQTFCdUpaWi90?= =?utf-8?B?MDBCclRaQWNicWU3eFR2L0lNVVFLU3Z0RGZjVllKbFU4Mm5zRUdiQTdYNWR6?= =?utf-8?B?RkFzNVc2alRwNTIwVFlnQlV4bmwyVGtRUFVVZjdNV3greHhzc3VUQ2Q5L3BJ?= =?utf-8?B?STdzQnJoVmZHNFRDWC9PMHZwNnZ1bkljSzZpQ2Zad2hidTdyYU94S1hWb2J0?= =?utf-8?B?WTU1VjM3bzJ3cFZSekd0eU5YTGRxRjcrMFcvTWtMMit2TUxjclRGc3pIanNy?= =?utf-8?B?YUpJUGY0RFN3OTFpdWdWMG1KU2NDVEdhYWNhUER5bVo1Z0pwZElkU0Y3c3hH?= =?utf-8?B?Y2NsNG9GRWkrcWkrZzMxN2xOMW5uZ3lCc1g4dG1SMDlNNnRVN1EvQ0swTGFF?= =?utf-8?B?WjY5WU5pRUc2a3FXVXN5bWZPdTZ4am9vNWlpNEM3MFZTQlBCSEM4REEyUDd6?= =?utf-8?B?V2Z6M054OUE5dDJVNzZhUEttaGp0ZjhrVWl0VHVXVkhFeG8vbitQWXF2bnFD?= =?utf-8?B?ajdMWnZKNlR5eVF5SXNwdXppQmFwV2dHUjloamRlZnl0cmpKVnJRMFdRQXVk?= =?utf-8?B?MjRVN0lwUzNjSHFneitxR0Z2QU50MGYvU0tRTklPeUY1ZnFaTmtISmwvWmdy?= =?utf-8?B?cDlDUEJNMzZ4NFlKL05mZ0lVamNnd3N4OU5rcWZtR0o1ZmI5VWhhZz09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06b01fde-f23f-4dc7-7b8e-08da4ded9d7e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2022 10:06:57.2027 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MvffmIFENBecGQgZrPTwGuhaEMPaXGX+HXoA365RN7CSRNhJTFa/ECrYtYFg3nL50G1zIRbSefjP3Q6z4y7tWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4810 X-Spam-Status: No, score=-3030.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, 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 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: Tue, 14 Jun 2022 10:07:09 -0000 For quite some time all callers have been passing 1 / true. While there fold the final oappend_with_style() calls. --- Instead of 0x%x I could see us using %#x, thus printing at least zero without the redundant 0x prefix. Thoughts? (I expect there'll be quite a bit of testsuite fallout from such a change, but I don't think that's a major concern.) --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -10969,61 +10969,22 @@ OP_indirE (instr_info *ins, int bytemode } static void -print_operand_value (instr_info *ins, bool hex, bfd_vma disp, +print_operand_value (instr_info *ins, bfd_vma disp, enum disassembler_style style) { char tmp[30]; + unsigned int i = 0; if (ins->address_mode == mode_64bit) { - if (hex) - { - int i; - oappend_with_style (ins, "0x", style); - sprintf_vma (tmp, disp); - for (i = 0; tmp[i] == '0' && tmp[i + 1]; i++); - oappend_with_style (ins, tmp + i, style); - } - else - { - bfd_signed_vma v = disp; - int i; - if (v < 0) - { - oappend_char_with_style (ins, '-', style); - v = -disp; - /* Check for possible overflow on 0x8000000000000000. */ - if (v < 0) - { - oappend_with_style (ins, "9223372036854775808", style); - return; - } - } - if (!v) - { - oappend_char_with_style (ins, '0', style); - return; - } - - i = 0; - tmp[29] = 0; - while (v) - { - tmp[28 - i] = (v % 10) + '0'; - v /= 10; - i++; - } - oappend_with_style (ins, tmp + 29 - i, style); - } + oappend_with_style (ins, "0x", style); + sprintf_vma (tmp, disp); + while (tmp[i] == '0' && tmp[i + 1]) + ++i; } else - { - if (hex) - sprintf (tmp, "0x%x", (unsigned int) disp); - else - sprintf (tmp, "%d", (int) disp); - oappend_with_style (ins, tmp, style); - } + sprintf (tmp, "0x%x", (unsigned int) disp); + oappend_with_style (ins, tmp + i, style); } /* Like oappend, but called for immediate operands. */ @@ -11033,7 +10994,7 @@ oappend_immediate (instr_info *ins, bfd_ { if (!ins->intel_syntax) oappend_char_with_style (ins, '$', dis_style_immediate); - print_operand_value (ins, true, imm, dis_style_immediate); + print_operand_value (ins, imm, dis_style_immediate); } /* Put DISP in BUF as signed hex number. */ @@ -11721,7 +11682,7 @@ OP_E_memory (instr_info *ins, int bytemo if (havedisp || riprel) print_displacement (ins, disp); else - print_operand_value (ins, true, disp, dis_style_address_offset); + print_operand_value (ins, disp, dis_style_address_offset); if (riprel) { set_op (ins, disp, true); @@ -11798,7 +11759,7 @@ OP_E_memory (instr_info *ins, int bytemo if (havedisp) print_displacement (ins, disp); else - print_operand_value (ins, true, disp, dis_style_address_offset); + print_operand_value (ins, disp, dis_style_address_offset); } oappend_char (ins, ins->close_char); @@ -11825,7 +11786,7 @@ OP_E_memory (instr_info *ins, int bytemo oappend_register (ins, att_names_seg[ds_reg - es_reg]); oappend (ins, ":"); } - print_operand_value (ins, true, disp, dis_style_text); + print_operand_value (ins, disp, dis_style_text); } } } @@ -11900,7 +11861,7 @@ OP_E_memory (instr_info *ins, int bytemo oappend_register (ins, att_names_seg[ds_reg - es_reg]); oappend (ins, ":"); } - print_operand_value (ins, true, disp & 0xffff, dis_style_text); + print_operand_value (ins, disp & 0xffff, dis_style_text); } } if (ins->vex.b) @@ -12370,7 +12331,7 @@ OP_J (instr_info *ins, int bytemode, int disp = ((ins->start_pc + (ins->codep - ins->start_codep) + disp) & mask) | segment; set_op (ins, disp, false); - print_operand_value (ins, true, disp, dis_style_text); + print_operand_value (ins, disp, dis_style_text); } static void @@ -12430,7 +12391,7 @@ OP_OFF (instr_info *ins, int bytemode, i oappend (ins, ":"); } } - print_operand_value (ins, true, off, dis_style_address_offset); + print_operand_value (ins, off, dis_style_address_offset); } static void @@ -12459,7 +12420,7 @@ OP_OFF64 (instr_info *ins, int bytemode, oappend (ins, ":"); } } - print_operand_value (ins, true, off, dis_style_address_offset); + print_operand_value (ins, off, dis_style_address_offset); } static void