T0b1/fadec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parseinstrs: Write mnemonics to separate file

Browse Source
This commit is contained in:
Alexis Engelke
2020-07-04 14:35:51 +02:00
parent dc668691d8
commit 9b6caeb2ae
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
decode.c
View File

@@ -11,13 +11,13 @@
#define FD_DECODE_TABLE_DATA #define FD_DECODE_TABLE_DATA
static __attribute__((aligned(16))) const uint16_t _decode_table[] = { static __attribute__((aligned(16))) const uint16_t _decode_table[] = {
#include <fadec-decode-table.inc> #include <fadec-table.inc>
}; };
#undef FD_DECODE_TABLE_DATA #undef FD_DECODE_TABLE_DATA
// Defines FD_TABLE_OFFSET_32 and FD_TABLE_OFFSET_64, if available // Defines FD_TABLE_OFFSET_32 and FD_TABLE_OFFSET_64, if available
#define FD_DECODE_TABLE_DEFINES #define FD_DECODE_TABLE_DEFINES
#include <fadec-decode-table.inc> #include <fadec-table.inc>
#undef FD_DECODE_TABLE_DEFINES #undef FD_DECODE_TABLE_DEFINES
enum DecodeMode { enum DecodeMode {

4
fadec.h
View File

@@ -29,10 +29,8 @@ typedef enum {
} FdReg; } FdReg;
typedef enum { typedef enum {
#define FD_DECODE_TABLE_MNEMONICS
#define FD_MNEMONIC(name,value) FDI_ ## name = value, #define FD_MNEMONIC(name,value) FDI_ ## name = value,
#include <fadec-decode-table.inc> #include <fadec-mnems.inc>
#undef FD_DECODE_TABLE_MNEMONICS
#undef FD_MNEMONIC #undef FD_MNEMONIC
} FdInstrType; } FdInstrType;

4
format.c
View File

@@ -9,13 +9,13 @@
#define FD_DECODE_TABLE_STRTAB1 #define FD_DECODE_TABLE_STRTAB1
static const char* _mnemonic_str = static const char* _mnemonic_str =
#include <fadec-decode-table.inc> #include <fadec-table.inc>
; ;
#undef FD_DECODE_TABLE_STRTAB1 #undef FD_DECODE_TABLE_STRTAB1
#define FD_DECODE_TABLE_STRTAB2 #define FD_DECODE_TABLE_STRTAB2
static const uint16_t _mnemonic_offs[] = { static const uint16_t _mnemonic_offs[] = {
#include <fadec-decode-table.inc> #include <fadec-table.inc>
}; };
#undef FD_DECODE_TABLE_STRTAB2 #undef FD_DECODE_TABLE_STRTAB2

6
meson.build
View File

@@ -57,9 +57,11 @@ endif
instr_data = custom_target('tables', instr_data = custom_target('tables',
command: [python3, '@INPUT0@', '@INPUT1@', '@OUTPUT@'] + generate_args, command: [python3, '@INPUT0@', '@INPUT1@', '@OUTPUT@'] + generate_args,
input: files('parseinstrs.py', 'instrs.txt'), input: files('parseinstrs.py', 'instrs.txt'),
output: ['fadec-decode-table.inc'], output: [
'fadec-mnems.inc', 'fadec-table.inc'
],
install: true, install: true,
install_dir: get_option('includedir')) install_dir: [get_option('includedir'), false])
libfadec = static_library('fadec', 'decode.c', 'format.c', instr_data, libfadec = static_library('fadec', 'decode.c', 'format.c', instr_data,
install: true) install: true)

13
parseinstrs.py
View File

@@ -398,8 +398,6 @@ def bytes_to_table(data, notes):
template = """// Auto-generated file -- do not modify! template = """// Auto-generated file -- do not modify!
#if defined(FD_DECODE_TABLE_DATA) #if defined(FD_DECODE_TABLE_DATA)
{hex_table} {hex_table}
#elif defined(FD_DECODE_TABLE_MNEMONICS)
{mnemonic_list}
#elif defined(FD_DECODE_TABLE_STRTAB1) #elif defined(FD_DECODE_TABLE_STRTAB1)
{mnemonic_cstr} {mnemonic_cstr}
#elif defined(FD_DECODE_TABLE_STRTAB2) #elif defined(FD_DECODE_TABLE_STRTAB2)
@@ -416,7 +414,8 @@ if __name__ == "__main__":
parser.add_argument("--32", dest="modes", action="append_const", const=32) parser.add_argument("--32", dest="modes", action="append_const", const=32)
parser.add_argument("--64", dest="modes", action="append_const", const=64) parser.add_argument("--64", dest="modes", action="append_const", const=64)
parser.add_argument("table", type=argparse.FileType('r')) parser.add_argument("table", type=argparse.FileType('r'))
parser.add_argument("output", type=argparse.FileType('w')) parser.add_argument("decode_mnems", type=argparse.FileType('w'))
parser.add_argument("decode_table", type=argparse.FileType('w'))
args = parser.parse_args() args = parser.parse_args()
entries = [] entries = []
@@ -429,6 +428,9 @@ if __name__ == "__main__":
mnemonics = sorted({desc.mnemonic for _, desc in entries}) mnemonics = sorted({desc.mnemonic for _, desc in entries})
mnemonics_lut = {name: mnemonics.index(name) for name in mnemonics} mnemonics_lut = {name: mnemonics.index(name) for name in mnemonics}
decode_mnems_lines = ["FD_MNEMONIC(%s,%d)"%e for e in mnemonics_lut.items()]
args.decode_mnems.write("\n".join(decode_mnems_lines))
modes = [32, 64] modes = [32, 64]
table = Table(root_count=len(args.modes)) table = Table(root_count=len(args.modes))
for opcode, desc in entries: for opcode, desc in entries:
@@ -446,11 +448,10 @@ if __name__ == "__main__":
defines = ["FD_TABLE_OFFSET_%d %d"%k for k in zip(args.modes, root_offsets)] defines = ["FD_TABLE_OFFSET_%d %d"%k for k in zip(args.modes, root_offsets)]
file = template.format( decode_table = template.format(
hex_table=bytes_to_table(table_data, annotations), hex_table=bytes_to_table(table_data, annotations),
mnemonic_list="\n".join("FD_MNEMONIC(%s,%d)"%entry for entry in mnemonics_lut.items()),
mnemonic_cstr=mnemonic_cstr, mnemonic_cstr=mnemonic_cstr,
mnemonic_offsets=",".join(str(off) for off in mnemonic_tab), mnemonic_offsets=",".join(str(off) for off in mnemonic_tab),
defines="\n".join("#define " + line for line in defines), defines="\n".join("#define " + line for line in defines),
) )
args.output.write(file) args.decode_table.write(decode_table)