From patchwork Fri May 5 11:12:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 90410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp316509vqo; Fri, 5 May 2023 04:13:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7oSH26Qs5t8AWmZPRwrkFsWnW4No2H2gdaFy6NsuBRxIJHgBC/c7w7bsjRkRLytqsDOuuO X-Received: by 2002:a17:907:2d9f:b0:94e:d688:c36d with SMTP id gt31-20020a1709072d9f00b0094ed688c36dmr934257ejc.38.1683285180105; Fri, 05 May 2023 04:13:00 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id h8-20020aa7de08000000b0050bfd300a00si3731807edv.642.2023.05.05.04.12.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 04:13:00 -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="YSEPt/8X"; 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 4789D3856960 for ; Fri, 5 May 2023 11:12:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4789D3856960 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683285178; bh=O6dQ+SBl1wEt5AmmPur8aHh/x4lnqc+ZbHWbhS2SvHs=; 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=YSEPt/8XG1/5KmCzy2bCm/hb8n+z0OyCzPhSumNmIUEk9CVInCfztK+AfunAGKmJH IJ5r0LNRsk/ZfLIKL33XK9sU5dE6k3RREOwvPI948oVp6ntpxzaUEW7MED1NNONr8o HPTRhWJAvhgsXd8hu3iZ2i6ifqQ+S+jaReOKSPTo= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) by sourceware.org (Postfix) with ESMTPS id D25BB3856DFC for ; Fri, 5 May 2023 11:12:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D25BB3856DFC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oggBHaKJfg76Kidj05qO6JBKgySdmSc3zCK8TAOeAzz1OrFfjDhMftIY4V8FokGY5v7QKZXlEShfKupTLsyRK9ZI3wVGDOTA25Janqqw8q8hxHE/WYdlx3tAH28ZASfhdMhAaG/pojqcz1u0KQA4WqcNYE685q2FzcQHrd9W2+laTWZqOTvxaXAk0ss4W4pO7NYbaV7JAclnsQonx6ZUGPfmaswZL74jmkyuEsbQn8qXCLtVi/7z0iCmbCf8ts2POf6OVnYjS3RFBYgeQeRMoo6kBHn/teLQ26mNi+iEZGwY9tjKjXgUUMDhURu9Z3UwkWJyNuaf6yUJ8ds27/uosA== 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=O6dQ+SBl1wEt5AmmPur8aHh/x4lnqc+ZbHWbhS2SvHs=; b=NOudVJH+G+IH4s1CRFIhOUsXDtW2id2IeAGESCkImKtlAhcmsj7tpgGnE13FDfz5Sauv2iH6FBfti2/ZD6I5LIBFlcL/wcFCDbdR/zZLJqoI04pmT1mX47iAflC1sEYcHMNo7XaIVF3anKhC+61b0cgO2PMgtvk41ESi6BYE4cVJlnbnrqfvqvX1MIn9ru7eQqv+6l+gaQwF24eCcwPv4r28J6qGhHnp3L2Zi5NwQokYeVMC2tXV5mJ3bzuqQQfFXYVql55sgILVfX4ATvbfCLGolZhxSVWutBD04PwxiCPaRPAVCQBQadfBHuJ6JWSzYKYGcdz5d7QTMDcesd/IFQ== 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:12:45 +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:12:45 +0000 Message-ID: <52d14c6e-e232-efe3-d486-06cda1c19fdf@suse.com> Date: Fri, 5 May 2023 13:12:44 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH 1/2] x86: move get() 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: FR3P281CA0187.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::15) 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: 4ad61897-47fc-466c-cf0d-08db4d59a72e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kij2h8nxVC7VVHzdjTMoit55n7OYFrAxt/xZEuvvDwvGMpdg9WWwZ0jeIgRUFXgpFsvX1ebb0E9PcFIL+f3afgaYqeu2J4JFeEOGzD++wZkvckt3ZHsnKAlCqEHc3GNaNTQb7Duj5TGwr8ZNCafApCawKqFSjw5Y5+pQ3x3SR02dqD1CNFbj1Om1nUGQZWMG8FVLlvknf6B2Yod1Km16JNdTF5t3kAnfCPExUnq8/LRLeAaWqWlQSF003ndfoLCC0OSDIBO7pcehC3I0CgyenfCFjix3O6JymAINqpTKH0zP8527D2XogaHHWm6fH9B4wW8rLLtx5YRkipJqpT9MBmT6kBHZYWnTgongF0KNYsKysjmB2oU0vO9p9VrfRvju2+lAlxlT50T1zIFChPL5rI1rFjdDbY+UlX2CVxAD3mMpkEN/Ma4u5H+YQkSujd/jpGa2eNs35gghU83K4N6MPt+DRKxj+94jXoL8zXlrvFQU0FnHvOMzznToORmVW/myVN0SMb5T5z5/5DcGEBPzbeQOlBRM1OnswAtbUOpuxFk8KUCFFGwqAvWbeNQvINEcxj6WinIuMj5oPCNUuZHBkp54xHAwPsCddJSO2t0vARgfcMi3B8WzlJm+8yZ9Qy4aOLwaHcSsQzIku4FRvYNj5Q== 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?cuzq3WvZZGPTwl40aaBkzG/CiqU0?= =?utf-8?q?UlWISbbsW/HEQh3M5Ybcv34v5cnC2RoVcuzVXsiLWfUKFEeABeELxfzERUcCWc8Kj?= =?utf-8?q?thtzvxeP+WiPw4j4UQOw6Bm1PLAr6iAOdYT5e9xgN9nmNzLC1pfzV94MJAxNL4AWt?= =?utf-8?q?zvm1pGlWnDH1b4DytGJ1gL1MpYAKAA7KOsZPH70BUwLn0iVGR0OLUZCd0DITnK12j?= =?utf-8?q?gLlS3SduAuv0hXX/NnaqfOtRYLECQeAwfOS61LMkhFbFayoB21i+j5XXUsS9tUuci?= =?utf-8?q?ZoQKQaNojPvDqLofJEf+PIjfBPEmMk19arybtgPEedQ86k7ZAC5DtKHR/wokzZY0w?= =?utf-8?q?9MqfsJuUmEU5/xF1JtW7JwjqvObrlcMx9ho2uCv+rmtrRmgzlB5vD3WfNVldM0kEF?= =?utf-8?q?oLniuu+dSOd943FdNkBvu+ZD4xRql1PWOKDFyK60rED+LJeE3E0OugIkaAXtSsM7X?= =?utf-8?q?YikCVQNtWfmxQS9ItJP6ySikSMZOiXYhkSIaM3Ib125uNGaRm2inplCl5tyM4tCmQ?= =?utf-8?q?+HJyEnwnyor7+ypgYudkjqCTJe0XdeOf1+iENGwzZUBmBjCzcq8fO0LT31vCyX8w/?= =?utf-8?q?NfFr2KD5eL+K4lN8zwH1pSvIBxqBkDmUU8su9a8nuM4EkSQhLOP5Vd8VYAru4ylyq?= =?utf-8?q?d3a9TVNKoBwqBh/UAUOxsjGTTEnRh5XzXPRY6tb3PQrA0HM0QvVMC2jJreVxEIOqZ?= =?utf-8?q?CYiqPkl+b48Vch9o7xbLdYC5j+NuSBTklsyrIe2BNCDV8w9nT3s/2boRBwg4nJ1UL?= =?utf-8?q?0HMKLMKlaDGRYdwXgL+5eR7o+zYi3/mWpBei6QwDd73rTKSdZTphuG7eE7deVcUvV?= =?utf-8?q?XLiFtPVbvzfohABkRpi02+jTd4VtO7AlXCVEgRbsnwjn5VVy4/fMjt2Ty7YdEXrvT?= =?utf-8?q?KzW53yBU/rWhyw/Ie/ixMGfaBauubLVdn8ftdwlMQ0IiWFivqDs9RYrxjdBfCGTUC?= =?utf-8?q?311TFVA9vWbbC1B66fQjhlqyR9rtggD9PCyCEsZy82ieL9IfHcnwO2EtIeCsO30up?= =?utf-8?q?nUKaThXcsudiDdtcLChiH4W67s4ymXME6fJ7NCChE/Fos4tc2MABDU7msgJGi46Ir?= =?utf-8?q?2piR0nkzQXJUxZvsbKKP12hz+B4lyjmU7OcCEtQ2szALuRiXSOs9R3opBWdDHFksM?= =?utf-8?q?9aUwnF1rYgNySTy0jitZfozp9aRTo1D2cOv9BLpv/Rms/lettG6kxeR3JpPgT/YKe?= =?utf-8?q?qgl1FVcxjqCNu+MwluriGM6wmXvFdgJ/zpF0L8cgblSNukn3e1/cmz1H3DJurV1BE?= =?utf-8?q?8ip9ZnwEck+INN47QYrFiYA4RuvM/ygzNPEbBhCL/Gnmgw5hvFFCpgwwSmHZFH+Bv?= =?utf-8?q?1CRM11CadOlpiLwl25Bv3FQBZWXfd8tJq5fpc6NwFB/xZ177FIOm+FIgedZzei6j/?= =?utf-8?q?pqdA0zk/5Vt9XJkWMV2bf1RjlKcMQqaVe0j+bl6rr5sAguo17lehXV4m41hl+vype?= =?utf-8?q?FCQA1Mllv9tYN4YTlwNlEnJ5x2CrasEpFFRnVe768m7FGhKhGCi/4tsmMprTiS+Bi?= =?utf-8?q?awUkjMuyEvq+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad61897-47fc-466c-cf0d-08db4d59a72e 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:12:45.6638 (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: MHGCHsbbvs1eLrrq0cbSfnTXVNr5wxYjo1buv6yTqp5FizIhS4ol9xo6ebfRd87AQpu4Ga9In8Ks01xCn3szDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9867 X-Spam-Status: No, score=-3028.1 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?1765052440937733787?= X-GMAIL-MSGID: =?utf-8?q?1765052440937733787?= ... such that none of them would need forward declarations anymore. --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -47,10 +47,6 @@ static void oappend_with_style (instr_in enum disassembler_style); static void oappend (instr_info *, const char *); static void append_seg (instr_info *); -static bool get32s (instr_info *, bfd_vma *); -static bool get16 (instr_info *, bfd_vma *); -static bool get16s (instr_info *, bfd_vma *); -static bool get8s (instr_info *, bfd_vma *); static void set_op (instr_info *, bfd_vma, bool); static bool OP_E (instr_info *, int, int); @@ -11715,6 +11711,77 @@ print_register (instr_info *ins, unsigne } static bool +get8s (instr_info *ins, bfd_vma *res) +{ + if (!fetch_code (ins->info, ins->codep + 1)) + return false; + *res = (((bfd_vma) *ins->codep++ & 0xff) ^ 0x80) - 0x80; + return true; +} + +static bool +get16 (instr_info *ins, bfd_vma *res) +{ + if (!fetch_code (ins->info, ins->codep + 2)) + return false; + *res = (bfd_vma) *ins->codep++ & 0xff; + *res |= ((bfd_vma) *ins->codep++ & 0xff) << 8; + return true; +} + +static bool +get16s (instr_info *ins, bfd_vma *res) +{ + if (!get16 (ins, res)) + return false; + *res = (*res ^ 0x8000) - 0x8000; + return true; +} + +static bool +get32 (instr_info *ins, bfd_vma *res) +{ + if (!fetch_code (ins->info, ins->codep + 4)) + return false; + *res = *ins->codep++ & (bfd_vma) 0xff; + *res |= (*ins->codep++ & (bfd_vma) 0xff) << 8; + *res |= (*ins->codep++ & (bfd_vma) 0xff) << 16; + *res |= (*ins->codep++ & (bfd_vma) 0xff) << 24; + return true; +} + +static bool +get32s (instr_info *ins, bfd_vma *res) +{ + if (!get32 (ins, res)) + return false; + + *res = (*res ^ ((bfd_vma) 1 << 31)) - ((bfd_vma) 1 << 31); + + return true; +} + +static bool +get64 (instr_info *ins, uint64_t *res) +{ + unsigned int a; + unsigned int b; + + if (!fetch_code (ins->info, ins->codep + 8)) + return false; + a = *ins->codep++ & 0xff; + a |= (*ins->codep++ & 0xff) << 8; + a |= (*ins->codep++ & 0xff) << 16; + a |= (*ins->codep++ & 0xffu) << 24; + b = *ins->codep++ & 0xff; + b |= (*ins->codep++ & 0xff) << 8; + b |= (*ins->codep++ & 0xff) << 16; + b |= (*ins->codep++ & 0xffu) << 24; + *res = a + ((uint64_t) b << 32); + return true; +} + +static bool OP_E_memory (instr_info *ins, int bytemode, int sizeflag) { int add = (ins->rex & REX_B) ? 8 : 0; @@ -12249,77 +12316,6 @@ OP_G (instr_info *ins, int bytemode, int return true; } -static bool -get64 (instr_info *ins, uint64_t *res) -{ - unsigned int a; - unsigned int b; - - if (!fetch_code (ins->info, ins->codep + 8)) - return false; - a = *ins->codep++ & 0xff; - a |= (*ins->codep++ & 0xff) << 8; - a |= (*ins->codep++ & 0xff) << 16; - a |= (*ins->codep++ & 0xffu) << 24; - b = *ins->codep++ & 0xff; - b |= (*ins->codep++ & 0xff) << 8; - b |= (*ins->codep++ & 0xff) << 16; - b |= (*ins->codep++ & 0xffu) << 24; - *res = a + ((uint64_t) b << 32); - return true; -} - -static bool -get32 (instr_info *ins, bfd_vma *res) -{ - if (!fetch_code (ins->info, ins->codep + 4)) - return false; - *res = *ins->codep++ & (bfd_vma) 0xff; - *res |= (*ins->codep++ & (bfd_vma) 0xff) << 8; - *res |= (*ins->codep++ & (bfd_vma) 0xff) << 16; - *res |= (*ins->codep++ & (bfd_vma) 0xff) << 24; - return true; -} - -static bool -get32s (instr_info *ins, bfd_vma *res) -{ - if (!get32 (ins, res)) - return false; - - *res = (*res ^ ((bfd_vma) 1 << 31)) - ((bfd_vma) 1 << 31); - - return true; -} - -static bool -get16 (instr_info *ins, bfd_vma *res) -{ - if (!fetch_code (ins->info, ins->codep + 2)) - return false; - *res = (bfd_vma) *ins->codep++ & 0xff; - *res |= ((bfd_vma) *ins->codep++ & 0xff) << 8; - return true; -} - -static bool -get16s (instr_info *ins, bfd_vma *res) -{ - if (!get16 (ins, res)) - return false; - *res = (*res ^ 0x8000) - 0x8000; - return true; -} - -static bool -get8s (instr_info *ins, bfd_vma *res) -{ - if (!fetch_code (ins->info, ins->codep + 1)) - return false; - *res = (((bfd_vma) *ins->codep++ & 0xff) ^ 0x80) - 0x80; - return true; -} - static void set_op (instr_info *ins, bfd_vma op, bool riprel) {