diff options
author | Yonggang Luo <luoyonggang@gmail.com> | 2022-12-18 00:52:02 +0800 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2023-02-23 12:47:25 +0100 |
commit | 4961f9ae2f11795022166698aa15a15f48ec8c5b (patch) | |
tree | c26aaac0e7a185a8b5d66883ec498b105fb73d46 | |
parent | 9548a7f06e4bcfc640e8d470444c1cdbea5a6f73 (diff) | |
download | elfutils-4961f9ae2f11795022166698aa15a15f48ec8c5b.tar.gz |
libcpu: Remove the need of NMNES by using enum
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r-- | libcpu/ChangeLog | 9 | ||||
-rw-r--r-- | libcpu/Makefile.am | 3 | ||||
-rw-r--r-- | libcpu/i386_disasm.c | 14 | ||||
-rw-r--r-- | libcpu/i386_mne.h | 46 | ||||
-rw-r--r-- | libcpu/i386_parse.y | 9 |
5 files changed, 60 insertions, 21 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 6d4b717a..d14cd237 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,5 +1,14 @@ 2022-12-18 Yonggang Luo <luoyonggang@gmail.com> + * i386_mne.h: New file, extracted from i386_disasm.c. + * Makefile.am (noinst_HEADERS): Add i386_mne.h. + (i386_parse_CFLAGS): Removed. + * i386_disasm.c: Include i386_mne.h. + * i386_parse.y: Include i386_mne.h. + (instrtable_out): Use MNE_COUNT instead of NMNES. + +2022-12-18 Yonggang Luo <luoyonggang@gmail.com> + * i386_disasm.c (i386_disasm): Use __asm instead of asm. 2022-12-20 Mark Wielaard <mark@klomp.org> diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 57d0a164..4ba1be56 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -40,7 +40,7 @@ AM_YFLAGS = -p$(<F:parse.y=) noinst_LIBRARIES = libcpu.a libcpu_pic.a -noinst_HEADERS = i386_dis.h x86_64_dis.h +noinst_HEADERS = i386_dis.h i386_mne.h x86_64_dis.h libcpu_a_SOURCES = i386_disasm.c x86_64_disasm.c bpf_disasm.c riscv_disasm.c @@ -92,7 +92,6 @@ libeu = ../lib/libeu.a i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare \ -Wno-implicit-fallthrough i386_parse.o: i386_parse.c i386.mnemonics -i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`" i386_lex.o: i386_parse.h i386_gendis_LDADD = $(libeu) -lm $(obstack_LIBS) diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c index 09946273..dec62bfa 100644 --- a/libcpu/i386_disasm.c +++ b/libcpu/i386_disasm.c @@ -46,10 +46,7 @@ #define MACHINE_ENCODING LITTLE_ENDIAN #include "memory-access.h" - -#ifndef MNEFILE -# define MNEFILE "i386.mnemonics" -#endif +#include "i386_mne.h" #define MNESTRFIELD(line) MNESTRFIELD1 (line) #define MNESTRFIELD1(line) str##line @@ -71,15 +68,6 @@ static const union mnestr_t } }; -/* 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[] = { #define MNE(name) \ diff --git a/libcpu/i386_mne.h b/libcpu/i386_mne.h new file mode 100644 index 00000000..d5157515 --- /dev/null +++ b/libcpu/i386_mne.h @@ -0,0 +1,46 @@ +/* Disassembler for x86, MNE enums. + Copyright (C) 2007, 2008, 2009, 2011 Red Hat, Inc. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of either + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils 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 + General Public License for more details. + + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see <http://www.gnu.org/licenses/>. */ + +#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 = MNE_INVALID, + }; + +#endif /* i386_mne.h */ 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 <libeu.h> #include <system.h> +#include "i386_mne.h" + #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free @@ -1107,11 +1109,6 @@ print_op_fct (const void *nodep, VISIT value, } } - -#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 = 0; i < 3; ++i) |