From patchwork Fri May 5 11:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 90411 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp317335vqo; Fri, 5 May 2023 04:14:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4g56J48zTspgkmZOwa4SZUDsPHWR8gnpvcJ6Jf3t1wUvxwobuEgsnI4ZadhE0j3h8Vd5VK X-Received: by 2002:a17:906:7943:b0:93f:9b4a:12f3 with SMTP id l3-20020a170906794300b0093f9b4a12f3mr868691ejo.10.1683285265036; Fri, 05 May 2023 04:14:25 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u20-20020a17090657d400b00965b0a7cc4fsi1071276ejr.67.2023.05.05.04.14.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 04:14:25 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="s/XILjQ/"; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 2674A385414E for ; Fri, 5 May 2023 11:14:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2674A385414E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683285247; bh=vWab9UqcDgqlO6osCYu5hfyuqmFz96TEW9XSnXE0+RI=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=s/XILjQ/tEkStB22pfWMa/cwgyaBSEtG3eItLlo+CabV06mEXfn4vlzoPnBNzSfUg CMfUZlhxZUG9LKddQ/KZtJbV/jMNW841V848VHgw88Ki04FG6k7ufBaH/vmNukKUQK 1zOWZSet8cAbZFSOVe7OeG/FBJPKa/5JgfnYWC70= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 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 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> In-Reply-To: <9369c14f-ce90-61ac-c2fd-8588c82b35a5@suse.com> 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?q?Jj4KqemZBnM/oM5jbgDa7WSQhgiC?= =?utf-8?q?m4Er4iR08aEc3NqIk0uKikaoh3P7poVZoi/qthbh2l2+Xoy9J0HLq2wpt3pqGyMWR?= =?utf-8?q?dHfcJjma6Ypyjw1V9gr9b6cFbWD12pVhzEGAmElJFHNeyaKY8XjNeIlkziYZl+LSn?= =?utf-8?q?jvcofBV+UQFQFLtVO1Vuwb+DM7HY2YUtd/TC+kzVAQJ/RSUqO736f0ayC6Bkwndf7?= =?utf-8?q?M4TNRjDfQqg5sp2pap2Q4RDJ1GSiWv4XIxgHf6gEjYKWsm7H8XCm8PxL1sZskLOOM?= =?utf-8?q?fgfbME2lIHFhNhjWOzloXJMAbk1fdtZXMec6XjrOXTcjQlLW3t6AxEcLVU78lSVn3?= =?utf-8?q?Nz7iX4YI4fD9pT2qUqKcMWW6eNROCK1nijU0eCrjwXru5qyEwW1pJ3FJM1/CZNIMx?= =?utf-8?q?M7TcrQWFMPCbrSjR1UgmF9/xYC5gZTrK6+I+T+Pv2ZWfUis2Dc2BBkT0JxhuPDKgm?= =?utf-8?q?Oa2XhrfBCFeWFyUwWLZB41IOo+55nUCtkzuaEdVT1mcl51tjOZQT8zbaRcvQnxtT3?= =?utf-8?q?CLzomcrdXGmJ6QHtXlISyqvfHJyUWQrCXCKLEYVTMJUg2qmnaktogZEei5tpI571z?= =?utf-8?q?RVIjWK+olIJKIDxn8cqPpVKuQ8zjWTO/oL2XXqGWeCB89YEm2FgdsT6IKPaZA0sBI?= =?utf-8?q?JInXhEQQh3HMtT9a8Dk2cqsEUEVvIAABiR3jbCGWAZgjWrKo4y4N3oht2fRUbAElT?= =?utf-8?q?d9Zrlnn3D/RhSwU1yl1iY/rEo8h6iUIyX02COX+bHGgSAl0HwAucHYDuzsjaqCydZ?= =?utf-8?q?gDnHc6dia/YOy/GnNpvUbhuXgHdsvcghti9iT/1zq6kCn61Diq07Mk3QSrtU393QO?= =?utf-8?q?3ml5OL/pGEizc4507wL44HFEalgta9HQP7e9uWkyvexjaCSk3n014dkGyH+guTmhY?= =?utf-8?q?ENsCyNSdj/GzIal1ozlOiOP94A1G3510wzlzWjUDtD0tgjj6mPN2h7n8BeTV0OzXL?= =?utf-8?q?0Q4YGTx7HTSlKxrTH1ayNPv36ED73ZZHzdYWWwp9SBBItHKi1rLD0m+I88YHVU9bY?= =?utf-8?q?yTKYiwqL57J97ibWYFPROPUKbF6sIry9NqFXX5UKQJQ5NbBRMXdVy5/BwrcfapW2p?= =?utf-8?q?4yw0pnoeQ8mU9FQ+fDt5m7Zj5kVARVGIvVKvFbhdD4UaGhJdNlFvckkuhnBqeyYuv?= =?utf-8?q?4B/jBxvr/C6SZX/SdOjfzEwHypv1/V/U1+ZEM/6UeTEvUsKbtO/MVjzRuowZUVdU8?= =?utf-8?q?kDTGMeDfLESE5Gz8ByCgqvkwY2OjpqFWJfeHNqQmA1uFPTND32Xxa5HOje1RCNAv4?= =?utf-8?q?QaSTvlV0eAI5s0wJW0uQhitEmcqgRVwNy6AvvhtDcyxIH+UswdBCJ70TNJKSc8LU9?= =?utf-8?q?jYRBExSgjbAT8TULVKmF+7amTJkqU/zEYVMKGLY9j1Yd7WnD2e3km5xUygSalhMGs?= =?utf-8?q?7r94AmULijCyBaWTNoX9bMgwa9qnhdGyzSCDZqwhimfCGk4bQtjmwR3YaXWPJIJzl?= =?utf-8?q?xO460OmbBHk610ylyLgHgIe18eBeoMexItT/I9DEVsWw5oZZ6TjnoZPq4t1NhOMyn?= =?utf-8?q?hSxCzKV3QZFM?= 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 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: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich 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?1765052530217586271?= X-GMAIL-MSGID: =?utf-8?q?1765052530217586271?= ... 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) {