From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2078.outbound.protection.outlook.com [40.107.21.78]) by sourceware.org (Postfix) with ESMTPS id D82E9385694B for ; Fri, 5 May 2023 11:13:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D82E9385694B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWSCIN/XtLoqvd+lwHgeFwdJWIwili7oM53cpVeofBIEwNupsfLwzT13U8aTafFBxyvZmm2LVpiBw4MsNIC/zUgJQvJSyvjQe8iBICdcljN+dYaEWmo0j884axN4VeORs64DEj3K82m8tQ/grOHgAeijvjpjgmsWYZcCJ+Q/XgSNru2OBbLEqoEPScTht3ZhZlkEprq6VCqtI7VcjVX5FXqqOQ61cVGSGeghncMHC6jeduO1oT8JscXle7vRqcqot/js6VYLC5J4rHJaDZo1jZYK7JAaQsus6++SxV7Hk3RDheTTtndUGGagLV9IAaGosF7e9OdL4GZvdQZp0kbbnA== 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=vWab9UqcDgqlO6osCYu5hfyuqmFz96TEW9XSnXE0+RI=; b=QzMqG7rXccWJ9ej4M55dX2dakh1mQn8B/qQMj3wR0QZ3DqFOpSGRU11/GfmpeaJJaONivWe+5IWgHf03Pek2fKOXlD1saVFg76vBdWf2/Y4RUA0NltJI+UUEfsUJJL3oKX37cVdfxMqRsiv8VZM/BC57QCTNGdcZc5vN71yOOCpGnNO6PbGnfnMVfajm31y/pk7ZTjXbuSXVzXaSSi9a0ASITyn1P77GU/23v2cbF0tIN0uRyJB/7fScoQmvC7fm3Kn7YdgOjrt5c6fNZfF3DTn+0qbg86XMGNc3ZvathgagCimKELXfOFcmxof2Dwu56MYlmLZEnj4sVza6evDSiw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vWab9UqcDgqlO6osCYu5hfyuqmFz96TEW9XSnXE0+RI=; b=pgedtdcyCfCMN3fcvnt3oGMrYqV2nGAt30MscrVLvNbQeUNxzQmBd7Zabs4VuOJWsyNpnBaf7FEAGPp3805AesSZBIwiUOafb/VXzeuhACL6/36du2fxhVMoNLW8w6NdP+ZXemgx7Swr01txLHvVGPXeZR2vrESRbE58/j4juMqgSyuJwvyk47e/8Y/qS+1kTv4JFG3NS+vN/f4ZUNnXK12TMMauCJpyIHHVSKGn1k9F7o7ZMBNEMAqkK5pp9VzhqKaJPNehCBOHzSkHZGHfjirUqkFOKZpR/Tst/Zkzfw7vrggJt/ZTx0yWOnULtjMLZLatpyLNdl590OWbVJ3c1g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DB9PR04MB9867.eurprd04.prod.outlook.com (2603:10a6:10:4c0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.25; Fri, 5 May 2023 11:13:12 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7%7]) with mapi id 15.20.6363.027; Fri, 5 May 2023 11:13:12 +0000 Message-ID: <666d8c60-5ffe-a307-f260-0c4bbd674887@suse.com> Date: Fri, 5 May 2023 13:13:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH 2/2] x86: move a few more disassembler helper functions Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: <9369c14f-ce90-61ac-c2fd-8588c82b35a5@suse.com> From: Jan Beulich In-Reply-To: <9369c14f-ce90-61ac-c2fd-8588c82b35a5@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0158.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::8) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6551:EE_|DB9PR04MB9867:EE_ X-MS-Office365-Filtering-Correlation-Id: 0270cfbb-4b37-45f6-696e-08db4d59b746 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ZSXJZFAPGj9qQiqqHFd2/lxsC+wxnx2qUPshbNwMBgrQ63JVFhLqNwU0GAOrh7xi1803YHjs/OCrz70Eo2IeR3MwkLaATKTEkJ5TpzD4xVvjb7XxhDaV+Q0P8N2rVZR2TVQX7xQxVFLlfrDjIC4hqFMUYAPw9ZQvl9BEko4vtSB1wTkBYT31SPe9hxAUKUbJm1T/gc7mtAHrkZVSZG5GtpCyoAm5bVUs+nL19zS9LnYl2TbELVJf1/TYA/Px8udLKPwB8fWlInWSzPxcRUvIWIrnYZ5OTV7ch3AKpnTDYJL2rt1GXqgFyCMuZL5GbYacmQg0iRFgoyuGja6+C9k/ginFkjlj4X475sl1I5y6rIwcFKhagMRGautFZuxxyBvVnNt4u1Yxc8L6dOMj2FlJUOHc3SHLo1gkl4td5pMP9lR+pZZIdLf+MnTLoIEoTTBA7GV0vNypZ8XZqlIBrXBNfu9Qe9+Q1l2mzB8VyiR/TB6cR8P3w9Uq10pJdiK+E2cEB2cZmjXmjZU3w8D7DbwVDjc868YdhYvaxrraV+J2lso7TAwLsz5As2cr5l2BYiH1lEAf8EuC+fsyBHaplu/UzSFeLFUOV4IGO6vU0miy4fiYv0Ce4+hbg+pK54wzTBo7ziyiWXp7T6oclSC47yKTw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(39860400002)(346002)(396003)(376002)(366004)(451199021)(316002)(31686004)(6512007)(186003)(41300700001)(6486002)(31696002)(6506007)(2616005)(6916009)(66476007)(2906002)(4326008)(26005)(66946007)(66556008)(86362001)(36756003)(38100700002)(478600001)(8676002)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Smo0S3FlbVpCbk0vb001amJnRGE3V1NRaGdpQ200RXI0aVIwOGFFYzNOcUlr?= =?utf-8?B?MHVLaWthb2gzUDdwb1Zab2kvcXRoYmgybDIrWG95OUowSExxMndwdDNwcUd5?= =?utf-8?B?TVdSZEhmY0pqbWE2WXB5ancxVjlncjliNmNGYldEMTJwVmh6RUdBbUVsSkZI?= =?utf-8?B?TmV5YUtZOFhqTmVJbGt6aVlabCtMU25qdmNvZkJWK1VRRlFGTHRWTzFWdXdi?= =?utf-8?B?K0RNN0hZMllVdGQvVEMra3pWQVFKL1JTVXFPNzM2ZjBheUM2Qmt3bmRmN000?= =?utf-8?B?VE5SakRmUXFnNXNwMnBhcDJRNFJESjFHU2lXdjRYSXhnSGY2Z0VqWUtXc203?= =?utf-8?B?SDhYQ204UHhMMXNac2tMT09NZmdmYk1FMmxJSEZoTmhqV096bG9YSk1BYmsx?= =?utf-8?B?ZmR0WlhNZWM2WGpyT1hUY2pRbExXM3Q2QXhFY0xWVTc4bFNWbjNOejdpWDRZ?= =?utf-8?B?STRmRDlwVDJxVXFLY01XVzZlTlJPQ0sxbmlqVTBlQ3Jqd1hydTVxeUV3VzFw?= =?utf-8?B?SjNGSk0xL0NaTklNeE03VGNyUVdGTVBDYnJTalIxVWdtRjkveFlDNWdaVHJL?= =?utf-8?B?NitJK1QrUHYyWldmVWlzMkRjMkJCa1QwSnhodVBES2dtT2EyWGhyZkJDRmVX?= =?utf-8?B?RnlVd1dMWkI0MUlPbys1NW5VQ3RrenVhRWRWVDFtY2w1MXRqT1pRVDh6YmFS?= =?utf-8?B?Y3ZRbnh0VDNDTHpvbWNyZFhHbUo2UUh0WGxJU3lxdmZISnlVV1FyQ1hDS0xF?= =?utf-8?B?WVZUTUpVZzJxbW5ha3RvZ1pFZWk1dHBJNTcxelJWSWpXSytvbElKS0lEeG44?= =?utf-8?B?Y3FQcFZLdVE4empXVE8vb0wyWFhxR1dlQ0I4OVlFbTJGZ2RzVDZJS1BhWkEw?= =?utf-8?B?c0JJSkluWGhFUVFoM0hNdFQ5YThEazJjcXNFVUVWdklBQUJpUjNqYkNHV0Fa?= =?utf-8?B?Z2pXcktvNHk0TjNvaHQyZlJVYkFFbFRkOVpybG5uM0QvUmhTd1UxeWwxaVkv?= =?utf-8?B?ckVvOGg2aVVJeVgwMkNPWCtiSEdnU0FsMEh3QXVjSFlEdXpzamFxQ3lkWmdE?= =?utf-8?B?bkhjNmRpYS9ZT3kvR25OcHZVYmh1WGdIZHN2Y2dodGk5aVQvMXpxNmtDbjYx?= =?utf-8?B?RGlxMDdNazNRU3J0VTM5M1FPM21sNU9ML3BHRWl6YzQ1MDd3TDQ0SEZFYWxn?= =?utf-8?B?dGE5SFFQN2U5dVdreXZleGphQ1NrM24wMTRka0d5SCtndVRtaFlFTnNDeU5T?= =?utf-8?B?ZGovR3pJYWwxb3psT2lPUDk0QTFHMzUxMHd6bHpXalVEdEQwdGdqajZtUE4y?= =?utf-8?B?aDduOEJlVFYwT3pYTDBRNFlHVHg3SFRTbEt4clRIMWF5TlB2MzZFRDczWlpI?= =?utf-8?B?emRZV1d3cDlTQkJJdEhLaTFyTEQwbStJODhZSFZVOWJZeVRLWWl3cUw1N0o5?= =?utf-8?B?N2liV1lGUFJPUFVLYkY2c0lyeTlOcUZYWDVVS1FKUTVOYkJSTVhkVnk1L0J3?= =?utf-8?B?cmNmYXBXMnA0eXcwcG5vZVE4bVU5RlErZkR0NW03Wmo1a1ZBUlZHSXZWS3ZG?= =?utf-8?B?YmhkRDRVYUdoSmRObEZ2Y2trdWhuQnFleVl1djRCL2pCeHZyL0M2U1pYL1Nk?= =?utf-8?B?T2pmekV3SHlwdjEvVi9VMStaRU0vNlVlVEV2VXNLYnRPL01WanpSdW93WlVW?= =?utf-8?B?ZFU4a0RUR01lRGZMRVNFNUd6OEJ5Q2dxdmt3WTJPanBxRldKZmVITnFRbUEx?= =?utf-8?B?dUZQVE5EMzJYeGE1SE9qZTFSQ05BdjRRYVNUdmxWMGVBSTVzMHdKVzB1UWhp?= =?utf-8?B?dEVtY3FnUlZ3Tnk2QXZ2aHREY3l4SUgrVXN3ZEJDSjcwVE5KS1NjOExVOWpZ?= =?utf-8?B?UkJFeFNnamJBVDhUVUxWS21GKzdhbVRKa3FVL3pFWVZNS0dMWTlqMVlkN1du?= =?utf-8?B?RDJlM2ttNXhVeWdTYWxoTUdzN3I5NEFtVUxpakN5QmFXVE5vWDliTWd3YTlx?= =?utf-8?B?bmhkR3l6U0NEWnF3aGltZkNHazRiUXRqbXdSM1lhWFdQSklKemx4TzQ2ME9t?= =?utf-8?B?YkJIazYxMHlseUxnSGdJZTE4ZUJlb01leEl0VC9JOURFVnNXdzVvWlo2VGpu?= =?utf-8?Q?oZPq4t1NhOMynhSxCzKV3QZFM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0270cfbb-4b37-45f6-696e-08db4d59b746 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 11:13:12.6475 (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: W8SJAKXK6K9NWdieTVqmsPxwSs3OtN+P4uFHbmkmn9AfBRnWIVRs0YTZBWr1tQ2VATk9l31DBom236NqhsrSAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9867 X-Spam-Status: No, score=-3028.0 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 List-Id: ... such that they wouldn't need forward declarations anymore. Note that append_seg() already was suitably placed. --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -45,9 +45,6 @@ static bool dofloat (instr_info *, int); static int putop (instr_info *, const char *, int); static void oappend_with_style (instr_info *, const char *, enum disassembler_style); -static void oappend (instr_info *, const char *); -static void append_seg (instr_info *); -static void set_op (instr_info *, bfd_vma, bool); static bool OP_E (instr_info *, int, int); static bool OP_E_memory (instr_info *, int, int); @@ -90,8 +87,6 @@ static bool OP_0f07 (instr_info *, int, static bool OP_Monitor (instr_info *, int, int); static bool OP_Mwait (instr_info *, int, int); -static bool BadOp (instr_info *); - static bool PCLMUL_Fixup (instr_info *, int, int); static bool VPCMP_Fixup (instr_info *, int, int); static bool VPCOM_Fixup (instr_info *, int, int); @@ -9504,7 +9499,15 @@ get_sib (instr_info *ins, int sizeflag) return true; } -/* Like oappend (below), but S is a string starting with '%'. In +/* Like oappend_with_style (below) but always with text style. */ + +static void +oappend (instr_info *ins, const char *s) +{ + oappend_with_style (ins, s, dis_style_text); +} + +/* Like oappend (above), but S is a string starting with '%'. In Intel syntax, the '%' is elided. */ static void @@ -11201,14 +11204,6 @@ oappend_with_style (instr_info *ins, con ins->obufp = stpcpy (ins->obufp, s); } -/* Like oappend_with_style but always with text style. */ - -static void -oappend (instr_info *ins, const char *s) -{ - oappend_with_style (ins, s, dis_style_text); -} - /* Add a single character C to the buffer pointer to by INS->obufp, marking the style for the character as STYLE. */ @@ -11781,6 +11776,26 @@ get64 (instr_info *ins, uint64_t *res) return true; } +static void +set_op (instr_info *ins, bfd_vma op, bool riprel) +{ + ins->op_index[ins->op_ad] = ins->op_ad; + if (ins->address_mode == mode_64bit) + ins->op_address[ins->op_ad] = op; + else /* Mask to get a 32-bit address. */ + ins->op_address[ins->op_ad] = op & 0xffffffff; + ins->op_riprel[ins->op_ad] = riprel; +} + +static bool +BadOp (instr_info *ins) +{ + /* Throw away prefixes and 1st. opcode byte. */ + ins->codep = ins->insn_codep + 1; + ins->obufp = stpcpy (ins->obufp, "(bad)"); + return true; +} + static bool OP_E_memory (instr_info *ins, int bytemode, int sizeflag) { @@ -12316,17 +12331,6 @@ OP_G (instr_info *ins, int bytemode, int return true; } -static void -set_op (instr_info *ins, bfd_vma op, bool riprel) -{ - ins->op_index[ins->op_ad] = ins->op_ad; - if (ins->address_mode == mode_64bit) - ins->op_address[ins->op_ad] = op; - else /* Mask to get a 32-bit address. */ - ins->op_address[ins->op_ad] = op & 0xffffffff; - ins->op_riprel[ins->op_ad] = riprel; -} - static bool OP_REG (instr_info *ins, int code, int sizeflag) { @@ -13350,15 +13354,6 @@ OP_Monitor (instr_info *ins, int bytemod return true; } -static bool -BadOp (instr_info *ins) -{ - /* Throw away prefixes and 1st. opcode byte. */ - ins->codep = ins->insn_codep + 1; - ins->obufp = stpcpy (ins->obufp, "(bad)"); - return true; -} - static bool REP_Fixup (instr_info *ins, int bytemode, int sizeflag) {