From: Alessandro Di Federico <a...@rev.ng> Extend gen_tcg_funcs.py in order to emit calls to the functions emitted by the idef-parser, if available.
Signed-off-by: Alessandro Di Federico <a...@rev.ng> --- target/hexagon/gen_tcg_funcs.py | 28 ++++++++++++++++++++++-- target/hexagon/hex_common.py | 10 +++++++++ target/hexagon/idef-parser/idef-parser.y | 10 +++++---- target/hexagon/meson.build | 25 ++++++++++++--------- 4 files changed, 57 insertions(+), 16 deletions(-) diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs.py index fe4d8e5730..c3f04949a0 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -394,7 +394,29 @@ def gen_tcg_func(f, tag, regs, imms): if (hex_common.is_read(regid)): genptr_src_read_opn(f,regtype,regid,tag) - if ( hex_common.skip_qemu_helper(tag) ): + if hex_common.is_idef_parser_enabled(tag): + declared = [] + ## Handle registers + for regtype,regid,toss,numregs in regs: + if (hex_common.is_pair(regid) + or (hex_common.is_single(regid) + and hex_common.is_old_val(regtype, regid, tag))): + declared.append("%s%sV" % (regtype, regid)) + if regtype == "M": + declared.append("%s%sN" % (regtype, regid)) + elif hex_common.is_new_val(regtype, regid, tag): + declared.append("%s%sN" % (regtype,regid)) + else: + print("Bad register parse: ",regtype,regid,toss,numregs) + + ## Handle immediates + for immlett,bits,immshift in imms: + declared.append(hex_common.imm_name(immlett)) + + arguments = ", ".join(["ctx", "insn", "pkt"] + declared) + f.write(" emit_%s(%s);\n" % (tag, arguments)) + + elif ( hex_common.skip_qemu_helper(tag) ): f.write(" fGEN_TCG_%s(%s);\n" % (tag, hex_common.semdict[tag])) else: ## Generate the call to the helper @@ -455,12 +477,14 @@ def main(): hex_common.read_attribs_file(sys.argv[2]) hex_common.read_overrides_file(sys.argv[3]) hex_common.calculate_attribs() + hex_common.read_idef_parser_enabled_file(sys.argv[4]) tagregs = hex_common.get_tagregs() tagimms = hex_common.get_tagimms() - with open(sys.argv[4], 'w') as f: + with open(sys.argv[5], 'w') as f: f.write("#ifndef HEXAGON_TCG_FUNCS_H\n") f.write("#define HEXAGON_TCG_FUNCS_H\n\n") + f.write("#include \"idef-generated-emitter.h.inc\"\n\n") for tag in hex_common.tags: ## Skip the priv instructions diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index b3b534057d..648ad29e94 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -28,6 +28,7 @@ macros = {} # macro -> macro information... attribinfo = {} # Register information and misc tags = [] # list of all tags overrides = {} # tags with helper overrides +idef_parser_enabled = {} # tags enabled for idef-parser # We should do this as a hash for performance, # but to keep order let's keep it as a list. @@ -201,6 +202,9 @@ def need_ea(tag): def skip_qemu_helper(tag): return tag in overrides.keys() +def is_idef_parser_enabled(tag): + return tag in idef_parser_enabled + def imm_name(immlett): return "%siV" % immlett @@ -232,3 +236,9 @@ def read_overrides_file(name): continue tag = overridere.findall(line)[0] overrides[tag] = True + +def read_idef_parser_enabled_file(name): + global idef_parser_enabled + with open(name, "r") as idef_parser_enabled_file: + lines = idef_parser_enabled_file.read().strip().split("\n") + idef_parser_enabled = set(lines) diff --git a/target/hexagon/idef-parser/idef-parser.y b/target/hexagon/idef-parser/idef-parser.y index 80490101ca..9adf165c76 100644 --- a/target/hexagon/idef-parser/idef-parser.y +++ b/target/hexagon/idef-parser/idef-parser.y @@ -357,7 +357,7 @@ assign_statement : lvalue ASSIGN rvalue $9 = rvalue_truncate(c, &@1, &$9); } OUT(c, &@1, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n"); - OUT(c, &@1, "process_store(ctx, 1);\n"); + OUT(c, &@1, "process_store(ctx, pkt, 1);\n"); OUT(c, &@1, "}\n"); OUT(c, &@1, "tcg_gen_qemu_ld", size_suffix, sign_suffix); OUT(c, &@1, "(", &$11, ", ", &$9, ", 0);\n"); @@ -1228,9 +1228,11 @@ int main(int argc, char **argv) buffer = yy_scan_string(context.input_buffer, context.scanner); /* Start the parsing procedure */ yyparse(context.scanner, &context); - fprintf(stderr, "%d/%d meta instructions have been implemented!\n", - context.implemented_insn, - context.total_insn); + if (context.implemented_insn != context.total_insn) { + fprintf(stderr, "%d/%d meta instructions have been implemented!\n", + context.implemented_insn, + context.total_insn); + } fputs("#endif " START_COMMENT " HEX_EMITTER_h " END_COMMENT "\n", defines_file); /* Cleanup */ diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index c094adff57..7a0fc96844 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -74,15 +74,6 @@ helper_protos_generated = custom_target( ) hexagon_ss.add(helper_protos_generated) -tcg_funcs_generated = custom_target( - 'tcg_funcs_generated.c.inc', - output: 'tcg_funcs_generated.c.inc', - input: 'gen_tcg_funcs.py', - depends: [semantics_generated], - depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [prog_python, '@INPUT@', semantics_generated, attribs_def, gen_tcg_h, '@OUTPUT@'], -) -hexagon_ss.add(tcg_funcs_generated) tcg_func_table_generated = custom_target( 'tcg_func_table_generated.c.inc', @@ -224,7 +215,7 @@ idef_parser = executable('idef-parser', idef_generated_tcg = custom_target( 'idef-generated-tcg', - output: ['idef-generated-emitter.c.inc', + output: ['idef-generated-emitter.c', 'idef-generated-emitter.h.inc', 'idef-generated-enabled-instructions'], input: preprocessed_idef_parser_input_generated, @@ -232,4 +223,18 @@ idef_generated_tcg = custom_target( command: [idef_parser, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@', '@OUTPUT2@'], ) +idef_generated_list = idef_generated_tcg[2].full_path() + +hexagon_ss.add(idef_generated_tcg) + +tcg_funcs_generated = custom_target( + 'tcg_funcs_generated.c.inc', + output: 'tcg_funcs_generated.c.inc', + input: 'gen_tcg_funcs.py', + depends: [semantics_generated, idef_generated_tcg], + depend_files: [hex_common_py, attribs_def, gen_tcg_h], + command: [prog_python, '@INPUT@', semantics_generated, attribs_def, gen_tcg_h, idef_generated_list, '@OUTPUT@'], +) +hexagon_ss.add(tcg_funcs_generated) + target_arch += {'hexagon': hexagon_ss} -- 2.30.0