From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id AAEE83858C5E for ; Thu, 23 Feb 2023 11:50:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AAEE83858C5E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 959C930067D6; Thu, 23 Feb 2023 12:50:53 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id 23A4034025A; Thu, 23 Feb 2023 12:50:53 +0100 (CET) Message-ID: Subject: Re: [PATCH v2 05/16] libcpu: Remove the need of NMNES by using enum From: Mark Wielaard To: Yonggang Luo , elfutils-devel@sourceware.org Date: Thu, 23 Feb 2023 12:50:53 +0100 In-Reply-To: <20b6e6b3798e69e410d16f9764f5573ce1dfb154.camel@klomp.org> References: <20221217165213.152-1-luoyonggang@gmail.com> <20221217165213.152-6-luoyonggang@gmail.com> <20b6e6b3798e69e410d16f9764f5573ce1dfb154.camel@klomp.org> Content-Type: multipart/mixed; boundary="=-y7OwWJ5w9N3it1M9QR6p" User-Agent: Evolution 3.46.4 (3.46.4-1.fc37) MIME-Version: 1.0 X-Spam-Status: No, score=-3035.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_BARRACUDACENTRAL,SPF_HELO_NONE,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: --=-y7OwWJ5w9N3it1M9QR6p Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, On Wed, 2022-12-21 at 18:56 +0100, Mark Wielaard wrote: > On Sun, 2022-12-18 at 00:52 +0800, Yonggang Luo via Elfutils-devel > wrote: > > Signed-off-by: Yonggang Luo > > --- > > libcpu/Makefile.am | 2 +- > > libcpu/i386_disasm.c | 14 +------------- > > libcpu/i386_mne.h | 36 ++++++++++++++++++++++++++++++++++++ > > libcpu/i386_parse.y | 9 +++------ > > 4 files changed, 41 insertions(+), 20 deletions(-) > > create mode 100644 libcpu/i386_mne.h > >=20 > > diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am > > index 57d0a164..259ed838 100644 > > --- a/libcpu/Makefile.am > > +++ b/libcpu/Makefile.am > > @@ -92,7 +92,7 @@ libeu =3D ../lib/libeu.a > > i386_lex_CFLAGS =3D -Wno-unused-label -Wno-unused-function -Wno-sign- > > compare \ > > -Wno-implicit-fallthrough > > i386_parse.o: i386_parse.c i386.mnemonics > > -i386_parse_CFLAGS =3D -DNMNES=3D"`wc -l < i386.mnemonics`" > > +i386_parse_CFLAGS =3D > > i386_lex.o: i386_parse.h > > i386_gendis_LDADD =3D $(libeu) -lm $(obstack_LIBS) >=20 > The new i386_mne.h file should be added to noinst_HEADERS (or it won't > be included in a make dist, so make distcheck fails). >=20 I added this. And did a make distcheck to check things work as intended. > > diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c > > index 599d1654..c34f03d6 100644 > > --- a/libcpu/i386_disasm.c > > +++ b/libcpu/i386_disasm.c > > @@ -46,10 +46,7 @@ > > #define MACHINE_ENCODING LITTLE_ENDIAN > > #include "memory-access.h" > > =20 > > - > > -#ifndef MNEFILE > > -# define MNEFILE "i386.mnemonics" > > -#endif > > +#include "i386_mne.h" > > =20 > > #define MNESTRFIELD(line) MNESTRFIELD1 (line) > > #define MNESTRFIELD1(line) str##line > > @@ -71,15 +68,6 @@ static const union mnestr_t > > } > > }; > > =20 > > -/* The index can be stored in the instrtab. */ > > -enum > > - { > > -#define MNE(name) MNE_##name, > > -#include MNEFILE > > -#undef MNE > > - MNE_INVALID > > - }; > > - > > static const unsigned short int mneidx[] =3D > > { > > #define MNE(name) \ >=20 > OK. >=20 > > diff --git a/libcpu/i386_mne.h b/libcpu/i386_mne.h > > new file mode 100644 > > index 00000000..41dacf61 > > --- /dev/null > > +++ b/libcpu/i386_mne.h > > @@ -0,0 +1,36 @@ > > +/* Compute hash value for given string according to ELF standard. > > + Copyright (C) 1995-2015 Free Software Foundation, Inc. > > + This file is part of the GNU C Library. > > + > > + The GNU C Library is free software; you can redistribute it > > and/or > > + modify it under the terms of the GNU Lesser General Public > > + License as published by the Free Software Foundation; either > > + version 2.1 of the License, or (at your option) any later > > version. > > + > > + The GNU C Library is distributed in the hope that it will be > > useful, > > + but WITHOUT ANY WARRANTY; without even the implied warranty of > > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + Lesser General Public License for more details. > > + > > + You should have received a copy of the GNU Lesser General Public > > + License along with the GNU C Library; if not, see > > + . */ >=20 > That looks like the wrong header. > Just copy the one from i386_disasm.c I fixed the header. > > +#ifndef _I386_MNE_H > > +#define _I386_MNE_H 1 > > + > > +#ifndef MNEFILE > > +# define MNEFILE "i386.mnemonics" > > +#endif > > + > > +/* The index can be stored in the instrtab. */ > > +enum > > + { > > +#define MNE(name) MNE_##name, > > +#include MNEFILE > > +#undef MNE > > + MNE_INVALID, > > + MNE_COUNT =3D MNE_INVALID, > > + }; > > + > > +#endif /* i386_mne.h */ >=20 > OK. >=20 > > diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y > > index d2236d59..459684c6 100644 > > --- a/libcpu/i386_parse.y > > +++ b/libcpu/i386_parse.y > > @@ -46,6 +46,8 @@ > > #include > > #include > > =20 > > +#include "i386_mne.h" > > + > > #define obstack_chunk_alloc xmalloc > > #define obstack_chunk_free free > > =20 > > @@ -1107,11 +1109,6 @@ print_op_fct (const void *nodep, VISIT value, > > } > > } > > =20 > > - > > -#if NMNES < 2 > > -# error "bogus NMNES value" > > -#endif > > - > > static void > > instrtable_out (void) > > { > > @@ -1123,7 +1120,7 @@ instrtable_out (void) > > fprintf (outfile, "#define MNEMONIC_BITS %zu\n", > > best_mnemonic_bits); > > #else > > fprintf (outfile, "#define MNEMONIC_BITS %ld\n", > > - lrint (ceil (log2 (NMNES)))); > > + lrint (ceil (log2 (MNE_COUNT)))); > > #endif > > fprintf (outfile, "#define SUFFIX_BITS %d\n", nbitsuf); > > for (int i =3D 0; i < 3; ++i) >=20 > OK. Pushed with those changes and a ChangeLog entry as attached. Cheers, Mark --=-y7OwWJ5w9N3it1M9QR6p Content-Disposition: inline; filename="0001-libcpu-Remove-the-need-of-NMNES-by-using-enum.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-libcpu-Remove-the-need-of-NMNES-by-using-enum.patch"; charset="UTF-8" RnJvbSA0OTYxZjlhZTJmMTE3OTUwMjIxNjY2OThhYTE1YTE1ZjQ4ZWM4YzViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBZb25nZ2FuZyBMdW8gPGx1b3lvbmdnYW5nQGdtYWlsLmNvbT4K RGF0ZTogU3VuLCAxOCBEZWMgMjAyMiAwMDo1MjowMiArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGxp YmNwdTogUmVtb3ZlIHRoZSBuZWVkIG9mIE5NTkVTIGJ5IHVzaW5nIGVudW0KClNpZ25lZC1vZmYt Ynk6IFlvbmdnYW5nIEx1byA8bHVveW9uZ2dhbmdAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBN YXJrIFdpZWxhYXJkIDxtYXJrQGtsb21wLm9yZz4KLS0tCiBsaWJjcHUvQ2hhbmdlTG9nICAgICB8 ICA5ICsrKysrKysrKwogbGliY3B1L01ha2VmaWxlLmFtICAgfCAgMyArLS0KIGxpYmNwdS9pMzg2 X2Rpc2FzbS5jIHwgMTQgKy0tLS0tLS0tLS0tLS0KIGxpYmNwdS9pMzg2X21uZS5oICAgIHwgNDYg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGxpYmNwdS9pMzg2 X3BhcnNlLnkgIHwgIDkgKysrLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMo KyksIDIxIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGxpYmNwdS9pMzg2X21uZS5o CgpkaWZmIC0tZ2l0IGEvbGliY3B1L0NoYW5nZUxvZyBiL2xpYmNwdS9DaGFuZ2VMb2cKaW5kZXgg NmQ0YjcxN2EuLmQxNGNkMjM3IDEwMDY0NAotLS0gYS9saWJjcHUvQ2hhbmdlTG9nCisrKyBiL2xp YmNwdS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMi0xMi0xOCAgWW9uZ2dhbmcgTHVv ICA8bHVveW9uZ2dhbmdAZ21haWwuY29tPgorCisJKiBpMzg2X21uZS5oOiBOZXcgZmlsZSwgZXh0 cmFjdGVkIGZyb20gaTM4Nl9kaXNhc20uYy4KKwkqIE1ha2VmaWxlLmFtIChub2luc3RfSEVBREVS Uyk6IEFkZCBpMzg2X21uZS5oLgorCShpMzg2X3BhcnNlX0NGTEFHUyk6IFJlbW92ZWQuCisJKiBp Mzg2X2Rpc2FzbS5jOiBJbmNsdWRlIGkzODZfbW5lLmguCisJKiBpMzg2X3BhcnNlLnk6IEluY2x1 ZGUgaTM4Nl9tbmUuaC4KKwkoaW5zdHJ0YWJsZV9vdXQpOiBVc2UgTU5FX0NPVU5UIGluc3RlYWQg b2YgTk1ORVMuCisKIDIwMjItMTItMTggIFlvbmdnYW5nIEx1byAgPGx1b3lvbmdnYW5nQGdtYWls LmNvbT4KIAogCSogaTM4Nl9kaXNhc20uYyAoaTM4Nl9kaXNhc20pOiBVc2UgX19hc20gaW5zdGVh ZCBvZiBhc20uCmRpZmYgLS1naXQgYS9saWJjcHUvTWFrZWZpbGUuYW0gYi9saWJjcHUvTWFrZWZp bGUuYW0KaW5kZXggNTdkMGExNjQuLjRiYTFiZTU2IDEwMDY0NAotLS0gYS9saWJjcHUvTWFrZWZp bGUuYW0KKysrIGIvbGliY3B1L01ha2VmaWxlLmFtCkBAIC00MCw3ICs0MCw3IEBAIEFNX1lGTEFH UyA9IC1wJCg8RjpwYXJzZS55PSkKIAogbm9pbnN0X0xJQlJBUklFUyA9IGxpYmNwdS5hIGxpYmNw dV9waWMuYQogCi1ub2luc3RfSEVBREVSUyA9IGkzODZfZGlzLmggeDg2XzY0X2Rpcy5oCitub2lu c3RfSEVBREVSUyA9IGkzODZfZGlzLmggaTM4Nl9tbmUuaCB4ODZfNjRfZGlzLmgKIAogbGliY3B1 X2FfU09VUkNFUyA9IGkzODZfZGlzYXNtLmMgeDg2XzY0X2Rpc2FzbS5jIGJwZl9kaXNhc20uYyBy aXNjdl9kaXNhc20uYwogCkBAIC05Miw3ICs5Miw2IEBAIGxpYmV1ID0gLi4vbGliL2xpYmV1LmEK IGkzODZfbGV4X0NGTEFHUyA9IC1Xbm8tdW51c2VkLWxhYmVsIC1Xbm8tdW51c2VkLWZ1bmN0aW9u IC1Xbm8tc2lnbi1jb21wYXJlIFwKIAkJICAtV25vLWltcGxpY2l0LWZhbGx0aHJvdWdoCiBpMzg2 X3BhcnNlLm86IGkzODZfcGFyc2UuYyBpMzg2Lm1uZW1vbmljcwotaTM4Nl9wYXJzZV9DRkxBR1Mg PSAtRE5NTkVTPSJgd2MgLWwgPCBpMzg2Lm1uZW1vbmljc2AiCiBpMzg2X2xleC5vOiBpMzg2X3Bh cnNlLmgKIGkzODZfZ2VuZGlzX0xEQUREID0gJChsaWJldSkgLWxtICQob2JzdGFja19MSUJTKQog CmRpZmYgLS1naXQgYS9saWJjcHUvaTM4Nl9kaXNhc20uYyBiL2xpYmNwdS9pMzg2X2Rpc2FzbS5j CmluZGV4IDA5OTQ2MjczLi5kZWM2MmJmYSAxMDA2NDQKLS0tIGEvbGliY3B1L2kzODZfZGlzYXNt LmMKKysrIGIvbGliY3B1L2kzODZfZGlzYXNtLmMKQEAgLTQ2LDEwICs0Niw3IEBACiAjZGVmaW5l IE1BQ0hJTkVfRU5DT0RJTkcgTElUVExFX0VORElBTgogI2luY2x1ZGUgIm1lbW9yeS1hY2Nlc3Mu aCIKIAotCi0jaWZuZGVmIE1ORUZJTEUKLSMgZGVmaW5lIE1ORUZJTEUgImkzODYubW5lbW9uaWNz IgotI2VuZGlmCisjaW5jbHVkZSAiaTM4Nl9tbmUuaCIKIAogI2RlZmluZSBNTkVTVFJGSUVMRChs aW5lKSBNTkVTVFJGSUVMRDEgKGxpbmUpCiAjZGVmaW5lIE1ORVNUUkZJRUxEMShsaW5lKSBzdHIj I2xpbmUKQEAgLTcxLDE1ICs2OCw2IEBAIHN0YXRpYyBjb25zdCB1bmlvbiBtbmVzdHJfdAogICAg IH0KICAgfTsKIAotLyogVGhlIGluZGV4IGNhbiBiZSBzdG9yZWQgaW4gdGhlIGluc3RydGFiLiAg Ki8KLWVudW0KLSAgewotI2RlZmluZSBNTkUobmFtZSkgTU5FXyMjbmFtZSwKLSNpbmNsdWRlIE1O RUZJTEUKLSN1bmRlZiBNTkUKLSAgICBNTkVfSU5WQUxJRAotICB9OwotCiBzdGF0aWMgY29uc3Qg dW5zaWduZWQgc2hvcnQgaW50IG1uZWlkeFtdID0KICAgewogI2RlZmluZSBNTkUobmFtZSkgXApk aWZmIC0tZ2l0IGEvbGliY3B1L2kzODZfbW5lLmggYi9saWJjcHUvaTM4Nl9tbmUuaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMC4uZDUxNTc1MTUKLS0tIC9kZXYvbnVsbAorKysg Yi9saWJjcHUvaTM4Nl9tbmUuaApAQCAtMCwwICsxLDQ2IEBACisvKiBEaXNhc3NlbWJsZXIgZm9y IHg4NiwgTU5FIGVudW1zLgorICAgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEx IFJlZCBIYXQsIEluYy4KKyAgIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIGVsZnV0aWxzLgorCisgICBU aGlzIGZpbGUgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y IG1vZGlmeQorICAgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIGVpdGhlcgorCisgICAgICogdGhlIEdO VSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUK KyAgICAgICBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNl bnNlLCBvciAoYXQKKyAgICAgICB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24KKworICAg b3IKKworICAgICAqIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkgdGhlIEZyZWUKKyAgICAgICBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAy IG9mIHRoZSBMaWNlbnNlLCBvciAoYXQKKyAgICAgICB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZl cnNpb24KKworICAgb3IgYm90aCBpbiBwYXJhbGxlbCwgYXMgaGVyZS4KKworICAgZWxmdXRpbHMg aXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0Cisg ICBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5 IG9mCisgICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UuICBTZWUgdGhlIEdOVQorICAgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRh aWxzLgorCisgICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgY29waWVzIG9mIHRoZSBHTlUgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSBhbmQKKyAgIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGlj IExpY2Vuc2UgYWxvbmcgd2l0aCB0aGlzIHByb2dyYW0uICBJZgorICAgbm90LCBzZWUgPGh0dHA6 Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LiAgKi8KKworI2lmbmRlZiBfSTM4Nl9NTkVfSAorI2Rl ZmluZSBfSTM4Nl9NTkVfSAkxCisKKyNpZm5kZWYgTU5FRklMRQorIyBkZWZpbmUgTU5FRklMRSAi aTM4Ni5tbmVtb25pY3MiCisjZW5kaWYKKworLyogVGhlIGluZGV4IGNhbiBiZSBzdG9yZWQgaW4g dGhlIGluc3RydGFiLiAgKi8KK2VudW0KKyAgeworI2RlZmluZSBNTkUobmFtZSkgTU5FXyMjbmFt ZSwKKyNpbmNsdWRlIE1ORUZJTEUKKyN1bmRlZiBNTkUKKyAgICBNTkVfSU5WQUxJRCwKKyAgICBN TkVfQ09VTlQgPSBNTkVfSU5WQUxJRCwKKyAgfTsKKworI2VuZGlmIC8qIGkzODZfbW5lLmggKi8K ZGlmZiAtLWdpdCBhL2xpYmNwdS9pMzg2X3BhcnNlLnkgYi9saWJjcHUvaTM4Nl9wYXJzZS55Cmlu ZGV4IGQyMjM2ZDU5Li40NTk2ODRjNiAxMDA2NDQKLS0tIGEvbGliY3B1L2kzODZfcGFyc2UueQor KysgYi9saWJjcHUvaTM4Nl9wYXJzZS55CkBAIC00Niw2ICs0Niw4IEBACiAjaW5jbHVkZSA8bGli ZXUuaD4KICNpbmNsdWRlIDxzeXN0ZW0uaD4KIAorI2luY2x1ZGUgImkzODZfbW5lLmgiCisKICNk ZWZpbmUgb2JzdGFja19jaHVua19hbGxvYyB4bWFsbG9jCiAjZGVmaW5lIG9ic3RhY2tfY2h1bmtf ZnJlZSBmcmVlCiAKQEAgLTExMDcsMTEgKzExMDksNiBAQCBwcmludF9vcF9mY3QgKGNvbnN0IHZv aWQgKm5vZGVwLCBWSVNJVCB2YWx1ZSwKICAgICB9CiB9CiAKLQotI2lmIE5NTkVTIDwgMgotIyBl cnJvciAiYm9ndXMgTk1ORVMgdmFsdWUiCi0jZW5kaWYKLQogc3RhdGljIHZvaWQKIGluc3RydGFi bGVfb3V0ICh2b2lkKQogewpAQCAtMTEyMyw3ICsxMTIwLDcgQEAgaW5zdHJ0YWJsZV9vdXQgKHZv aWQpCiAgIGZwcmludGYgKG91dGZpbGUsICIjZGVmaW5lIE1ORU1PTklDX0JJVFMgJXp1XG4iLCBi ZXN0X21uZW1vbmljX2JpdHMpOwogI2Vsc2UKICAgZnByaW50ZiAob3V0ZmlsZSwgIiNkZWZpbmUg TU5FTU9OSUNfQklUUyAlbGRcbiIsCi0JICAgbHJpbnQgKGNlaWwgKGxvZzIgKE5NTkVTKSkpKTsK KwkgICBscmludCAoY2VpbCAobG9nMiAoTU5FX0NPVU5UKSkpKTsKICNlbmRpZgogICBmcHJpbnRm IChvdXRmaWxlLCAiI2RlZmluZSBTVUZGSVhfQklUUyAlZFxuIiwgbmJpdHN1Zik7CiAgIGZvciAo aW50IGkgPSAwOyBpIDwgMzsgKytpKQotLSAKMi4zOS4yCgo= --=-y7OwWJ5w9N3it1M9QR6p--