From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80071.outbound.protection.outlook.com [40.107.8.71]) by sourceware.org (Postfix) with ESMTPS id 927D03852C47 for ; Fri, 18 Nov 2022 09:12:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 927D03852C47 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=TtZbCjpJlO3k09r7mfD1YgFVjmcjK3cUuM8RcSBEmh7Wb/uwBOseScvbcWFWxCk1orFEyfAOfpJflsZmf6J9oqnXPHEXut05tVphTdaCiEeDqJ5zaOgripmQCRd3J9mLW6Wx7xXqnsMIXyzD8FJQMbafGDAMwsUwRyf09eIGd3ITUhpV9KCB6LuBMTAHN7/36/Rq6M4LH3JSU4xdu8apyJ534kyIz+Mu2Uk/yPnxPilOpdfCpJLLbWDqid69pDjkpQbSPa0XGrVASye7BkPwoFbAT0/GNTFQ9HRDZCVbzoRDzRuEJWvgYUsyg/rqcCBkk0tQndKM8dqGqwTdhaJ/mw== 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=b1v47YXEeNVBtOKjpH+o47V6lSr/4dKT+Encjojca1U=; b=ErNlFkaYlQCPYlGzzul1Natw6Obf104qM9IYeVM/hANw+dLzT8uj8hnjG/GFZ5XNxduCfbi7lCyQsocAFIcI4f9biwd3Of1VxRmcRidNNuUM1qAec0taSz2C8SfyzwuDuDl38cSTyp/PlH25vucKcZjVsxjDEO9hPQhtlJMbrn64BbakZgcJErqFVPXEiPbhRjkUWxaFooB+caEKv8577DuW/BVFNkeeYLee11Z/Ari9bwluPP0AwmgN9y3FDez+C2QJlh1iWRSnWVpaqNMCEL6n7q8SLLUOj7YSqIOZZI19uaaEHga3VllYmDxid9zDakp9wGNwbGLawO1tS7VveA== 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=b1v47YXEeNVBtOKjpH+o47V6lSr/4dKT+Encjojca1U=; b=Y3AOeO0zDYkPs9ks7E6kNlu25aIVlEDG7/+n55PdfQgA6azFjxzqnf2C+V1SVEsgkii+PIVXTCqkpZtCdhbgOp/R1zd2D7DuhJaIhHTY+ETEAMhBd22mEuQforWUxBf0q2rvcMA6cCRDlEvS6YAnIy+0W8yS81ZddH1V2wf8y24GInE1TMGpi9yInQIF569OZm885dgI0BCeSxoKRAD1BObZuLbdvZ1NnAFH/ALkQVDez6tRWpR7MI7SFKW+PHrO6glo/x5nqhSpPXRJjUP0J9onuad/HOPrJfOt+n3m4bnP6O9bk2tD7Um3+vvG3zdfHqSxq4zgLRMzVxmzex5eUQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB9094.eurprd04.prod.outlook.com (2603:10a6:20b:445::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Fri, 18 Nov 2022 09:12:12 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5813.018; Fri, 18 Nov 2022 09:12:12 +0000 Message-ID: <028280ab-56ad-2380-6bdd-3c944695ec5f@suse.com> Date: Fri, 18 Nov 2022 10:12:10 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH v2 1/4] x86: instantiate i386_{op,reg}tab[] in gas instead of in libopcodes Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: <7a1ee76a-5b54-32a6-6301-a1741b5c1883@suse.com> From: Jan Beulich In-Reply-To: <7a1ee76a-5b54-32a6-6301-a1741b5c1883@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0123.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::9) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB9094:EE_ X-MS-Office365-Filtering-Correlation-Id: 847bc68c-6bb3-4982-2925-08dac944fa46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lKoS0Gv65xC/07A/pdQXUOINWFFnkfg4lV62eMl1EvbSAKWgfaTKOvcS4KJK/QFprG0lHLjiZAEVY+BAk0XlyAPJzUGyjVouflSgNRcsPU2RgDslhP2JL53Iu+wJAUbe2HepF98ukXcUP27YHcArz8enChlvgo7pzFdaYLAaM4UGm9QkSWCFXFU4iRekDLPFQjZ4zV706Xdfg7O0kNrxWrvBhKhVjsYwgMRzhUaRPicqxUKKi25N1BjSKSkuiGOrFfU8UcvyaggSU2VkJ4Mlbdhr9hupXONdIpZFZhkZFpAgGdfJEuRaTk1L4AIYPaQlJgazykaioymNj2OEeS7Sych10qwOcy6fDsuhumqEj+oV/alddSTgn/N+d1DhuXwSXQv03w+v+HUlA6/9ZtezfXTJRcRNTxU4nsNu8ZJ/3c8m77Cj70dfDoHE8i8a0K2NNYAbRXvnt9JTUMx2kR3kpDGjl8GQeL/LSW6oix8x04udcmzMUS+oFBYPLLh0LA8KjCG+uY9+OAwIzQb/wCMCIuEx4NtwsfY9nQg4uILQuNTnq2jUQhATwAQXS/CEdVzCCVgE2mdK2DOMLkT82cJYg41J8RLALLN5v+YLxRABWbNhx3Bgr91lSQ9aaiubz7S/YaqfsBMGxKQB581TRt2nMlCWCuUCU2KGvHAQEkpiyKn0MmW7jUvGfKCCu+H4BbJHT1DrsEpu2JfKyVb0N74E9wVvNP313HnbtcuBPBhxUUA= 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:(13230022)(136003)(366004)(39860400002)(376002)(346002)(396003)(451199015)(316002)(6916009)(31696002)(6512007)(26005)(8676002)(38100700002)(4326008)(66476007)(86362001)(66556008)(66946007)(83380400001)(2906002)(36756003)(2616005)(41300700001)(5660300002)(186003)(8936002)(31686004)(478600001)(6486002)(6506007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?emw0dkJSWnJWcXprdkwzOWhqSlZXZkxKZWw2VGtRUzFuNW9PbVVhZW1EU1hX?= =?utf-8?B?NTJ2emo0QVl4TWc4em5WUU16N01PSzFIWnQ5UW9taklIOFd0MWNoNm5YeVNi?= =?utf-8?B?bkh4am90cHJaZlJWZzM5ZUNiVGFHV3k1N0hiSWFaUWdzNG12OHA4c2tGekxi?= =?utf-8?B?cG93cCtaMC9FTFp1aVM2UFVobUNZMHErbFVFOFJ4RFphZ0JqelZoT2hjcUxu?= =?utf-8?B?WktQOHNFb3hSZHZndXRRa2gwU1VwMDZWdTJzZ0VleXI1dURxNHhOd0ZPRXZa?= =?utf-8?B?MjZxVFRlK1hRRFJhV0JTT2V6b0ppTitlR3BkZGhxNDJac2NjSGhJejY1NG9m?= =?utf-8?B?LytyQnZERjVJTy9BakRhWFV0S3ZLREQxRXVzWVhwYTJFTkE3OUY4TURZMGNN?= =?utf-8?B?eCtzbURueDNxdldMK0FHU1QycU96cy9obzE3NXlLdHpqNDJpSTBLMUo1Nm9O?= =?utf-8?B?TkJ6OVduWUkreGd2Z0xacVZjQlk5YnZQMVFGTjczTjVDa0ducDRqdVk2NkJS?= =?utf-8?B?M3BMV1lkcFd0MjI4NmRaUXUxNE15ak9zdiswYXU0eGRGVjNyVkhSdEdrSi8r?= =?utf-8?B?N2VPOVhNeWgvZ283R1Rxa0lWYld5NHB2S24xM0Jvb25HNW9kQTNUSXQvOWo4?= =?utf-8?B?SWN2b2R6VHVFb053YTJsT3dmY2tZUDRSNllOcVo4MDVJOFVoZXdNL1p1SERs?= =?utf-8?B?Y2M2SDh1a2dLM04rZ2JhamxQam9iYVlmQXBDUFRpUE16Ylo0ZkwrREFQTlBS?= =?utf-8?B?bEFOUXVCczREL3EyZVBWUTlzRkZzNG12aU0zUDNXTzBscVlnTzZRbGNYdUFF?= =?utf-8?B?SThoV0NITEJvQlpKckNOT1kzZkw1OThHUVpqNTVRNXZNaEJFTzFBOGpQRkda?= =?utf-8?B?OHlwdTdvTnN5UXE2NGxjdUlaTExOblhUT1VlL3RObHlJMm1DUU4xNkowQnls?= =?utf-8?B?ZFZhZEFMN2dKMVlpamZ6ckN3OWQ0TG1nd2FZZ2lJcVdDQjNTVjFRbHNVTlJi?= =?utf-8?B?SDBaOE9reUoyT0NFZXR3NWFVRFQ1RzA5c2F1UlpzUHZvbzV5Wm9DckVHNG8z?= =?utf-8?B?cHh3M0Y3OExuVkhaUkk2WWZjaVpwcDQ5ZXc4cCtuZkw1YlgzQ3NZL1FUTGVj?= =?utf-8?B?blI4a0Q3SE1pZHFxamp4UHliaFFGWkdtNC9lZlF1NUY0dllQWmFDMUN2cWpT?= =?utf-8?B?a1VCT1lEdWZWd2lmQmx3UytDTTIyaDZabXpsdnhxa0lBSEpJWlJxYUlhdnNX?= =?utf-8?B?NzBOQlNCb2JqbWZ1b3UxRG92SEV4b3lWaGVkTTJPOExWVExSUjQ4RFErTFRk?= =?utf-8?B?Um9KQXN5NWVFRDdKYVZlMlo3SHlyUElYOVJ0R1dLckI2RXlROEhIV2M5anFz?= =?utf-8?B?c0FKcUFmOHYxZTlnMnM4dEYzak9IdlZ3WTNhL3NrUEJadkUrU2VEdDRwM1lK?= =?utf-8?B?MG8xTEJsWThSanZ3bU1VNlk3emp2UWIwTEprVVBraDM1b2hDVzZtVVQxeUdB?= =?utf-8?B?YmV2Z0p3ei9vMTlYK3BzS2hUM0pOSFZRa1lwaXVOcWVuWlNPeVh3dUZreTVJ?= =?utf-8?B?YUxMc243VVJvNC9tUFVEektBbGplcThzL3VtclpEZndXY29KR09Lc3FoTUQ1?= =?utf-8?B?aHBGK29zNFZsN052Ni96L2NxWjR0bEZyY25MVVdKUFVwa3ozNlBpay9hNWI2?= =?utf-8?B?L21LZXY1KzRtZHFtYWVUcnVLSTMyQlZ4bG51ZFdNUmloY2tKWVpGTmxPdlpH?= =?utf-8?B?WENJV2RKNm1tSFZqYzFIQmhUdWdrd0RLeEs0SVN6Mmt4TGNtc0hCN2JPSklU?= =?utf-8?B?R08wbktGK1lYcFBpTk1OUVRiV0czRzZXSmV0eDZ0Q3pkbEVYYkZNVU5ZVmpH?= =?utf-8?B?RHhUcGppY255b2F5RTFPc3BNWXJoL3QxaDA0VlY1QkFEdStWd0gwWHZ2THpN?= =?utf-8?B?TTU3MlF4SXpkN2ZURGVoODB0MUJzcFRVc2x1RHBqaFJNQmh2UXFsalRqL2ND?= =?utf-8?B?VzBPYzgweXo2WFM3QWgvZlB1WVcxSkRBdWlaVHkrd3VsTlU0M1gzcXF2UjNa?= =?utf-8?B?Nm9ZNjA1Wnp0QVBaa2l3Q3pDcVJCNVlockp0NGlTUitYcG9rS2dwL3hVVDBZ?= =?utf-8?Q?Qqg0ghqmWKbTzJNJeFNirAETf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 847bc68c-6bb3-4982-2925-08dac944fa46 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2022 09:12:12.1457 (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: GZS5ymSrxZq63b78OlyCMoB4ns8IXWV1v3gYfaYhRtozMDgyasZ8SH6VQzh+1xDB4NDY2GZd7NFwo/RJ1nluFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9094 X-Spam-Status: No, score=-3029.3 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 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: Unlike many other architectures, x86 does not share an opcode table between assembly and disassembly. Any consumer of libopcodes would only ever access one of the two. Since gas is the only consumer of the assembly data, move it there. While doing so mark respective entities "static" in i386-gen (we may want to do away with i386_regtab_size altogether). This also shrinks the number of relocations to be processed for libopcodes.so by about 30%. --- v2: Re-base over the (premature) moving of i386_seg_prefixes[]. Move inclusion point of opcodes/i386-tbl.h. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -2969,6 +2969,8 @@ i386_mach (void) as_fatal (_("unknown architecture")); } +#include "opcodes/i386-tbl.h" + void md_begin (void) { --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -1816,7 +1816,7 @@ process_i386_opcodes (FILE *table) xcalloc, free); fprintf (table, "\n/* i386 opcode table. */\n\n"); - fprintf (table, "const insn_template i386_optab[] =\n{\n"); + fprintf (table, "static const insn_template i386_optab[] =\n{\n"); /* Put everything on opcode array. */ while (!feof (fp)) @@ -1946,7 +1946,7 @@ process_i386_registers (FILE *table) xstrerror (errno)); fprintf (table, "\n/* i386 register table. */\n\n"); - fprintf (table, "const reg_entry i386_regtab[] =\n{\n"); + fprintf (table, "static const reg_entry i386_regtab[] =\n{\n"); while (!feof (fp)) { @@ -2009,7 +2009,7 @@ process_i386_registers (FILE *table) fprintf (table, "};\n"); - fprintf (table, "\nconst unsigned int i386_regtab_size = ARRAY_SIZE (i386_regtab);\n"); + fprintf (table, "\nstatic const unsigned int i386_regtab_size = ARRAY_SIZE (i386_regtab);\n"); } static void --- a/opcodes/i386-opc.c +++ b/opcodes/i386-opc.c @@ -21,4 +21,3 @@ #include "sysdep.h" #include "libiberty.h" #include "i386-opc.h" -#include "i386-tbl.h" --- a/opcodes/i386-opc.h +++ b/opcodes/i386-opc.h @@ -924,7 +924,7 @@ typedef union i386_operand_type typedef struct insn_template { /* instruction name sans width suffix ("mov" for movl insns) */ - char *name; + const char *name; /* Bitfield arrangement is such that individual fields can be easily extracted (in native builds at least) - either by at most a masking @@ -990,8 +990,6 @@ typedef struct insn_template } insn_template; -extern const insn_template i386_optab[]; - /* these are for register name --> number & type hash lookup */ typedef struct { @@ -1011,6 +1009,3 @@ typedef struct #define Dw2Inval (-1) } reg_entry; - -extern const reg_entry i386_regtab[]; -extern const unsigned int i386_regtab_size; --- a/opcodes/i386-tbl.h +++ b/opcodes/i386-tbl.h @@ -20,7 +20,7 @@ /* i386 opcode table. */ -const insn_template i386_optab[] = +static const insn_template i386_optab[] = { { "mov", 0xa0, 2, None, { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, @@ -59958,7 +59958,7 @@ const insn_template i386_optab[] = /* i386 register table. */ -const reg_entry i386_regtab[] = +static const reg_entry i386_regtab[] = { { "al", { { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, @@ -61114,4 +61114,4 @@ const reg_entry i386_regtab[] = 0, 0, { 39, 64 } }, }; -const unsigned int i386_regtab_size = ARRAY_SIZE (i386_regtab); +static const unsigned int i386_regtab_size = ARRAY_SIZE (i386_regtab);