From d18ab247459e7781b41f9c504034bd3756d704de Mon Sep 17 00:00:00 2001 From: Alex Antonov Date: Mon, 6 Dec 2021 18:18:24 +0300 Subject: [PATCH 1/5] [mplfe] Fix the build with hir2mpl --- build/config/BUILDCONFIG.gn | 2 +- src/mplfe/BUILD.gn | 234 ++++++++++++++++++------------------ src/mplfe/test/BUILD.gn | 132 ++++++++++---------- 3 files changed, 184 insertions(+), 184 deletions(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 8778bcbb63..4bcad3e17e 100755 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -60,7 +60,7 @@ AST2MPL_ROOT = "${MAPLE_ROOT}/src/ast2mpl" IS_AST2MPL_EXISTS = getenv("IS_AST2MPL_EXISTS") MAPLEALL_ROOT = "${MAPLE_ROOT}/src" MAPLEALL_ROOT = "${MAPLE_ROOT}/src/mapleall" -HIR2MPL_ROOT = "${MAPLE_ROOT}/src/hir2mpl" +HIR2MPL_ROOT = "${MAPLE_ROOT}/src/mplfe" MAPLE_MRT_ROOT = "${MAPLE_ROOT}/src/mrt" THIRD_PARTY_ROOT = "${MAPLE_ROOT}/third_party" diff --git a/src/mplfe/BUILD.gn b/src/mplfe/BUILD.gn index faa0af3bc8..c9622a1434 100644 --- a/src/mplfe/BUILD.gn +++ b/src/mplfe/BUILD.gn @@ -30,11 +30,11 @@ if (MAST == 1) { } include_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/optimize/include", - "${MPLFE_ROOT}/bytecode_input/class/include", - "${MPLFE_ROOT}/bytecode_input/common/include", - "${MPLFE_ROOT}/bytecode_input/dex/include", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/optimize/include", + "${HIR2MPL_ROOT}/bytecode_input/class/include", + "${HIR2MPL_ROOT}/bytecode_input/common/include", + "${HIR2MPL_ROOT}/bytecode_input/dex/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_ipa/include", "${MAPLEALL_ROOT}/maple_util/include", @@ -44,11 +44,11 @@ include_directories = [ "${MAPLEALL_ROOT}/maple_me/include", "${MAPLEALL_ROOT}/mempool/include", "${THIRD_PARTY_ROOT}/bounds_checking_function/include", - "${MPLFE_ROOT}/ast_input/clang/include", - "${MPLFE_ROOT}/ast_input/clang/lib", - "${MPLFE_ROOT}/ast_input/common/include", - "${MPLFE_ROOT}/ast_input/maple/include", - "${MPLFE_ROOT}/ast_input/maple/lib", + "${HIR2MPL_ROOT}/ast_input/clang/include", + "${HIR2MPL_ROOT}/ast_input/clang/lib", + "${HIR2MPL_ROOT}/ast_input/common/include", + "${HIR2MPL_ROOT}/ast_input/maple/include", + "${HIR2MPL_ROOT}/ast_input/maple/lib", "${LLVMINC}", "${THIRD_PARTY_ROOT}/llvm_modified/clang/tools", ] @@ -63,46 +63,46 @@ if (MAST == 1) { static_library("lib_mplfe_common") { sources = [ - "${MPLFE_ROOT}/common/src/base64.cpp", - "${MPLFE_ROOT}/common/src/basic_io.cpp", - "${MPLFE_ROOT}/common/src/fe_config_parallel.cpp", - "${MPLFE_ROOT}/common/src/fe_file_ops.cpp", - "${MPLFE_ROOT}/common/src/fe_file_type.cpp", - "${MPLFE_ROOT}/common/src/fe_function.cpp", - "${MPLFE_ROOT}/common/src/fe_function_phase_result.cpp", - "${MPLFE_ROOT}/common/src/fe_input_helper.cpp", - "${MPLFE_ROOT}/common/src/fe_java_string_manager.cpp", - "${MPLFE_ROOT}/common/src/fe_manager.cpp", - "${MPLFE_ROOT}/common/src/fe_options.cpp", - "${MPLFE_ROOT}/common/src/fe_struct_elem_info.cpp", - "${MPLFE_ROOT}/common/src/fe_timer_ns.cpp", - "${MPLFE_ROOT}/common/src/fe_type_hierarchy.cpp", - "${MPLFE_ROOT}/common/src/fe_type_manager.cpp", - "${MPLFE_ROOT}/common/src/fe_utils.cpp", - "${MPLFE_ROOT}/common/src/fe_utils_ast.cpp", - "${MPLFE_ROOT}/common/src/fe_utils_java.cpp", - "${MPLFE_ROOT}/common/src/fe_diag_manager.cpp", - "${MPLFE_ROOT}/common/src/feir_builder.cpp", - "${MPLFE_ROOT}/common/src/feir_dfg.cpp", - "${MPLFE_ROOT}/common/src/feir_stmt.cpp", - "${MPLFE_ROOT}/common/src/feir_type.cpp", - "${MPLFE_ROOT}/common/src/feir_type_helper.cpp", - "${MPLFE_ROOT}/common/src/feir_type_infer.cpp", - "${MPLFE_ROOT}/common/src/feir_var.cpp", - "${MPLFE_ROOT}/common/src/feir_var_name.cpp", - "${MPLFE_ROOT}/common/src/feir_var_reg.cpp", - "${MPLFE_ROOT}/common/src/feir_var_type_scatter.cpp", - "${MPLFE_ROOT}/common/src/general_bb.cpp", - "${MPLFE_ROOT}/common/src/general_cfg.cpp", - "${MPLFE_ROOT}/common/src/general_stmt.cpp", - "${MPLFE_ROOT}/common/src/mplfe_compiler.cpp", - "${MPLFE_ROOT}/common/src/mplfe_compiler_component.cpp", - "${MPLFE_ROOT}/common/src/mplfe_env.cpp", - "${MPLFE_ROOT}/common/src/mplfe_options.cpp", - "${MPLFE_ROOT}/common/src/simple_xml.cpp", - "${MPLFE_ROOT}/common/src/simple_zip.cpp", - "${MPLFE_ROOT}/common/src/generic_attrs.cpp", - "${MPLFE_ROOT}/common/src/enhance_c_checker.cpp", + "${HIR2MPL_ROOT}/common/src/base64.cpp", + "${HIR2MPL_ROOT}/common/src/basic_io.cpp", + "${HIR2MPL_ROOT}/common/src/fe_config_parallel.cpp", + "${HIR2MPL_ROOT}/common/src/fe_file_ops.cpp", + "${HIR2MPL_ROOT}/common/src/fe_file_type.cpp", + "${HIR2MPL_ROOT}/common/src/fe_function.cpp", + "${HIR2MPL_ROOT}/common/src/fe_function_phase_result.cpp", + "${HIR2MPL_ROOT}/common/src/fe_input_helper.cpp", + "${HIR2MPL_ROOT}/common/src/fe_java_string_manager.cpp", + "${HIR2MPL_ROOT}/common/src/fe_manager.cpp", + "${HIR2MPL_ROOT}/common/src/fe_options.cpp", + "${HIR2MPL_ROOT}/common/src/fe_struct_elem_info.cpp", + "${HIR2MPL_ROOT}/common/src/fe_timer_ns.cpp", + "${HIR2MPL_ROOT}/common/src/fe_type_hierarchy.cpp", + "${HIR2MPL_ROOT}/common/src/fe_type_manager.cpp", + "${HIR2MPL_ROOT}/common/src/fe_utils.cpp", + "${HIR2MPL_ROOT}/common/src/fe_utils_ast.cpp", + "${HIR2MPL_ROOT}/common/src/fe_utils_java.cpp", + "${HIR2MPL_ROOT}/common/src/fe_diag_manager.cpp", + "${HIR2MPL_ROOT}/common/src/feir_builder.cpp", + "${HIR2MPL_ROOT}/common/src/feir_dfg.cpp", + "${HIR2MPL_ROOT}/common/src/feir_stmt.cpp", + "${HIR2MPL_ROOT}/common/src/feir_type.cpp", + "${HIR2MPL_ROOT}/common/src/feir_type_helper.cpp", + "${HIR2MPL_ROOT}/common/src/feir_type_infer.cpp", + "${HIR2MPL_ROOT}/common/src/feir_var.cpp", + "${HIR2MPL_ROOT}/common/src/feir_var_name.cpp", + "${HIR2MPL_ROOT}/common/src/feir_var_reg.cpp", + "${HIR2MPL_ROOT}/common/src/feir_var_type_scatter.cpp", + "${HIR2MPL_ROOT}/common/src/general_bb.cpp", + "${HIR2MPL_ROOT}/common/src/general_cfg.cpp", + "${HIR2MPL_ROOT}/common/src/general_stmt.cpp", + "${HIR2MPL_ROOT}/common/src/mplfe_compiler.cpp", + "${HIR2MPL_ROOT}/common/src/mplfe_compiler_component.cpp", + "${HIR2MPL_ROOT}/common/src/mplfe_env.cpp", + "${HIR2MPL_ROOT}/common/src/mplfe_options.cpp", + "${HIR2MPL_ROOT}/common/src/simple_xml.cpp", + "${HIR2MPL_ROOT}/common/src/simple_zip.cpp", + "${HIR2MPL_ROOT}/common/src/generic_attrs.cpp", + "${HIR2MPL_ROOT}/common/src/enhance_c_checker.cpp", ] include_dirs = include_directories output_dir = "${root_out_dir}/ar" @@ -130,21 +130,21 @@ static_library("lib_mplfe_common") { static_library("lib_mplfe_optimize") { sources = [ - "${MPLFE_ROOT}/optimize/src/ror.cpp", - "${MPLFE_ROOT}/optimize/src/conditional_operator.cpp", + "${HIR2MPL_ROOT}/optimize/src/ror.cpp", + "${HIR2MPL_ROOT}/optimize/src/conditional_operator.cpp", ] include_dirs = include_directories output_dir = "${root_out_dir}/ar" } static_library("lib_mplfe_input_helper") { - sources = [ "${MPLFE_ROOT}/common/src/fe_input_helper.cpp" ] + sources = [ "${HIR2MPL_ROOT}/common/src/fe_input_helper.cpp" ] include_dirs = include_directories output_dir = "${root_out_dir}/ar" } -executable("mplfe") { - sources = [ "${MPLFE_ROOT}/common/src/mplfe.cpp" ] +executable("hir2mpl") { + sources = [ "${HIR2MPL_ROOT}/common/src/mplfe.cpp" ] include_dirs = include_directories deps = [ ":lib_mplfe_ast_input_clang", @@ -182,8 +182,8 @@ executable("mplfe") { } include_bytecode_input_jbc_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/bytecode_input/class/include", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/bytecode_input/class/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", "${MAPLEALL_ROOT}/maple_driver/include", @@ -193,32 +193,32 @@ include_bytecode_input_jbc_directories = [ static_library("lib_mplfe_bytecode_input_class") { sources = [ - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_attr.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_attr_item.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_bb.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_class.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_class2fe_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_class_const.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_class_const_pool.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_compiler_component.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_function.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_function_context.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_input.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_opcode.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_opcode_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_stack2fe_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_stack_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_stmt.cpp", - "${MPLFE_ROOT}/bytecode_input/class/src/jbc_util.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_attr.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_attr_item.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_bb.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_class.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_class2fe_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_class_const.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_class_const_pool.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_compiler_component.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_function.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_function_context.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_input.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_opcode.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_opcode_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_stack2fe_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_stack_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_stmt.cpp", + "${HIR2MPL_ROOT}/bytecode_input/class/src/jbc_util.cpp", ] include_dirs = include_bytecode_input_jbc_directories output_dir = "${root_out_dir}/ar" } include_bytecode_input_common_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/bytecode_input/common/include", - "${MPLFE_ROOT}/bytecode_input/dex/include", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/bytecode_input/common/include", + "${HIR2MPL_ROOT}/bytecode_input/dex/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", "${MAPLEALL_ROOT}/maple_driver/include", @@ -228,26 +228,26 @@ include_bytecode_input_common_directories = [ static_library("lib_mplfe_bytecode_input_common") { sources = [ - "${MPLFE_ROOT}/bytecode_input/common/src/ark_annotation_map.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/ark_annotation_processor.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_class.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_class2fe_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_function.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_instruction.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_io.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_parser_base.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_pragma.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/bc_util.cpp", - "${MPLFE_ROOT}/bytecode_input/common/src/rc_setter.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/ark_annotation_map.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/ark_annotation_processor.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_class.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_class2fe_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_function.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_instruction.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_io.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_parser_base.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_pragma.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/bc_util.cpp", + "${HIR2MPL_ROOT}/bytecode_input/common/src/rc_setter.cpp", ] include_dirs = include_bytecode_input_common_directories output_dir = "${root_out_dir}/ar" } include_bytecode_input_dex_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/bytecode_input/common/include", - "${MPLFE_ROOT}/bytecode_input/dex/include", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/bytecode_input/common/include", + "${HIR2MPL_ROOT}/bytecode_input/dex/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", "${MAPLEALL_ROOT}/maple_driver/include", @@ -257,15 +257,15 @@ include_bytecode_input_dex_directories = [ static_library("lib_mplfe_bytecode_input_dex") { sources = [ - "${MPLFE_ROOT}/bytecode_input/dex/src/class_linker.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/class_loader_context.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_class.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_class2fe_helper.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_encode_value.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_file_util.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_op.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_pragma.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_strfac.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/class_linker.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/class_loader_context.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_class.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_class2fe_helper.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_encode_value.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_file_util.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_op.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_pragma.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_strfac.cpp", ] # for libdexfile @@ -286,11 +286,11 @@ static_library("lib_mplfe_bytecode_input_dex") { ] sources += [ - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_parser.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dex_reader.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dexfile_factory.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dexfile_interface.cpp", - "${MPLFE_ROOT}/bytecode_input/dex/src/dexfile_libdexfile.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_parser.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dex_reader.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dexfile_factory.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dexfile_interface.cpp", + "${HIR2MPL_ROOT}/bytecode_input/dex/src/dexfile_libdexfile.cpp", ] deps_libdexfile = [ "${THIRD_PARTY_ROOT}/aosp_modified/art/libdexfile:libdexfile", @@ -306,7 +306,7 @@ static_library("lib_mplfe_bytecode_input_dex") { } static_library("lib_mplfe_ast_input_clang_lib") { - sources = [ "${MPLFE_ROOT}/ast_input/clang/lib/ast_interface.cpp" ] + sources = [ "${HIR2MPL_ROOT}/ast_input/clang/lib/ast_interface.cpp" ] include_dirs = include_directories defines = [ "CLANG_ENABLE_ARCMT", @@ -348,7 +348,7 @@ static_library("lib_mplfe_ast_input_clang_lib") { static_library("lib_mplfe_ast_input_common") { sources = [ - "${MPLFE_ROOT}/ast_input/common/src/ast_decl.cpp", + "${HIR2MPL_ROOT}/ast_input/common/src/ast_decl.cpp", ] include_dirs = include_directories output_dir = "${root_out_dir}/ar" @@ -356,14 +356,14 @@ static_library("lib_mplfe_ast_input_common") { static_library("lib_mplfe_ast_input_clang") { sources = [ - "${MPLFE_ROOT}/ast_input/clang/lib/ast_type.cpp", - "${MPLFE_ROOT}/ast_input/clang/lib/ast_util.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_expr.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_function.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_parser.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_parser_builting_func.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_stmt.cpp", - "${MPLFE_ROOT}/ast_input/clang/src/ast_struct2fe_helper.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/lib/ast_type.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/lib/ast_util.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_expr.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_function.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_parser.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_parser_builting_func.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_stmt.cpp", + "${HIR2MPL_ROOT}/ast_input/clang/src/ast_struct2fe_helper.cpp", ] include_dirs = include_directories deps = [ ":lib_mplfe_ast_input_clang_lib" ] @@ -372,7 +372,7 @@ static_library("lib_mplfe_ast_input_clang") { if (MAST == 1) { static_library("lib_mplfe_ast_input_maple_lib") { - sources = [ "${MPLFE_ROOT}/ast_input/maple/lib/maple_ast_interface.cpp" ] + sources = [ "${HIR2MPL_ROOT}/ast_input/maple/lib/maple_ast_interface.cpp" ] include_dirs = include_directories defines = [ "DEBUG", @@ -388,7 +388,7 @@ if (MAST == 1) { static_library("lib_mplfe_ast_input_maple") { sources = [ - "${MPLFE_ROOT}/ast_input/maple/src/maple_ast_parser.cpp", + "${HIR2MPL_ROOT}/ast_input/maple/src/maple_ast_parser.cpp", ] include_dirs = include_directories deps = [ ":lib_mplfe_ast_input_maple_lib" ] diff --git a/src/mplfe/test/BUILD.gn b/src/mplfe/test/BUILD.gn index 16a3fe4e40..07ed1b7776 100644 --- a/src/mplfe/test/BUILD.gn +++ b/src/mplfe/test/BUILD.gn @@ -45,7 +45,7 @@ include_dirs_libdexfile = [ include_directories = include_dirs_libdexfile + include_dirs_dex -executable("mplfeUT") { +executable("hir2mplUT") { sources = [] include_dirs = include_directories @@ -60,13 +60,13 @@ executable("mplfeUT") { "${MAPLEALL_ROOT}/maple_util:libmplutil", "${MAPLEALL_ROOT}/mempool:libmempool", "${MAPLEALL_ROOT}/mpl2mpl:libmpl2mpl", - "${MPLFE_ROOT}:lib_mplfe_ast_input_clang", - "${MPLFE_ROOT}:lib_mplfe_ast_input_common", - "${MPLFE_ROOT}:lib_mplfe_bytecode_input_common", - "${MPLFE_ROOT}:lib_mplfe_common", - "${MPLFE_ROOT}:lib_mplfe_optimize", - "${MPLFE_ROOT}:lib_mplfe_bytecode_input_dex", - "${MPLFE_ROOT}:lib_mplfe_bytecode_input_class", + "${HIR2MPL_ROOT}:lib_mplfe_ast_input_clang", + "${HIR2MPL_ROOT}:lib_mplfe_ast_input_common", + "${HIR2MPL_ROOT}:lib_mplfe_bytecode_input_common", + "${HIR2MPL_ROOT}:lib_mplfe_common", + "${HIR2MPL_ROOT}:lib_mplfe_optimize", + "${HIR2MPL_ROOT}:lib_mplfe_bytecode_input_dex", + "${HIR2MPL_ROOT}:lib_mplfe_bytecode_input_class", ] ldflags = [ @@ -87,10 +87,10 @@ executable("mplfeUT") { } include_ast_input_clang_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/ast_input/clang/include", - "${MPLFE_ROOT}/ast_input/common/include", - "${MPLFE_ROOT}/test/common", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/ast_input/clang/include", + "${HIR2MPL_ROOT}/ast_input/common/include", + "${HIR2MPL_ROOT}/test/common", "${THIRD_PARTY_ROOT}/bounds_checking_function/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", @@ -101,17 +101,17 @@ include_ast_input_clang_directories = [ source_set("lib_mplfe_test_ast_input_clang") { sources = [ - "${MPLFE_ROOT}/test/ast_input/clang/ast_expr_test.cpp", - "${MPLFE_ROOT}/test/ast_input/clang/ast_var_test.cpp", + "${HIR2MPL_ROOT}/test/ast_input/clang/ast_expr_test.cpp", + "${HIR2MPL_ROOT}/test/ast_input/clang/ast_var_test.cpp", ] include_dirs = include_ast_input_clang_directories output_dir = "${root_out_dir}/ar" } include_bytecode_input_class_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/bytecode_input/class/include", - "${MPLFE_ROOT}/test/common", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/bytecode_input/class/include", + "${HIR2MPL_ROOT}/test/common", "${THIRD_PARTY_ROOT}/bounds_checking_function/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", @@ -122,26 +122,26 @@ include_bytecode_input_class_directories = [ source_set("lib_mplfe_test_bytecode_input_class") { sources = [ - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_class2fe_helper_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_class_const_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_class_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_function_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_opcode_helper_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_stack2fe_helper_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_stack_helper_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_stmt_bb_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_stmt_loc_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/class/jbc_util_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_class2fe_helper_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_class_const_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_class_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_function_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_opcode_helper_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_stack2fe_helper_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_stack_helper_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_stmt_bb_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_stmt_loc_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/class/jbc_util_test.cpp", ] include_dirs = include_bytecode_input_class_directories output_dir = "${root_out_dir}/ar" } include_common_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/optimize/include", - "${MPLFE_ROOT}/bytecode_input/class/include", # mplfeUT.cpp exists - "${MPLFE_ROOT}/test/common", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/optimize/include", + "${HIR2MPL_ROOT}/bytecode_input/class/include", # mplfeUT.cpp exists + "${HIR2MPL_ROOT}/test/common", "${THIRD_PARTY_ROOT}/bounds_checking_function/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", @@ -152,40 +152,40 @@ include_common_directories = [ source_set("lib_mplfe_test_common") { sources = [ - "${MPLFE_ROOT}/test/common/base64_test.cpp", - "${MPLFE_ROOT}/test/common/basic_io_test.cpp", - - # "${MPLFE_ROOT}/test/common/fe_function_process_schedular_test.cpp", - "${MPLFE_ROOT}/test/common/fe_algorithm_test.cpp", - "${MPLFE_ROOT}/test/common/fe_file_ops_test.cpp", - "${MPLFE_ROOT}/test/common/fe_file_type_test.cpp", - "${MPLFE_ROOT}/test/common/fe_function_test.cpp", - "${MPLFE_ROOT}/test/common/fe_struct_elem_info_test.cpp", - "${MPLFE_ROOT}/test/common/fe_type_hierarchy_test.cpp", - "${MPLFE_ROOT}/test/common/fe_type_manager_test.cpp", - "${MPLFE_ROOT}/test/common/fe_utils_test.cpp", - "${MPLFE_ROOT}/test/common/feir_builder_test.cpp", - "${MPLFE_ROOT}/test/common/feir_stmt_dfg_test.cpp", - "${MPLFE_ROOT}/test/common/feir_stmt_test.cpp", - "${MPLFE_ROOT}/test/common/feir_test_base.cpp", - "${MPLFE_ROOT}/test/common/feir_type_helper_test.cpp", - "${MPLFE_ROOT}/test/common/feir_type_infer_test.cpp", - "${MPLFE_ROOT}/test/common/feir_type_test.cpp", - "${MPLFE_ROOT}/test/common/feir_var_test.cpp", - "${MPLFE_ROOT}/test/common/mplfeUT.cpp", - "${MPLFE_ROOT}/test/common/mplfe_ut_options.cpp", - "${MPLFE_ROOT}/test/common/mplfe_ut_regx.cpp", - "${MPLFE_ROOT}/test/common/mplfe_ut_regx_test.cpp", + "${HIR2MPL_ROOT}/test/common/base64_test.cpp", + "${HIR2MPL_ROOT}/test/common/basic_io_test.cpp", + + # "${HIR2MPL_ROOT}/test/common/fe_function_process_schedular_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_algorithm_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_file_ops_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_file_type_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_function_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_struct_elem_info_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_type_hierarchy_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_type_manager_test.cpp", + "${HIR2MPL_ROOT}/test/common/fe_utils_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_builder_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_stmt_dfg_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_stmt_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_test_base.cpp", + "${HIR2MPL_ROOT}/test/common/feir_type_helper_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_type_infer_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_type_test.cpp", + "${HIR2MPL_ROOT}/test/common/feir_var_test.cpp", + "${HIR2MPL_ROOT}/test/common/mplfeUT.cpp", + "${HIR2MPL_ROOT}/test/common/mplfe_ut_options.cpp", + "${HIR2MPL_ROOT}/test/common/mplfe_ut_regx.cpp", + "${HIR2MPL_ROOT}/test/common/mplfe_ut_regx_test.cpp", ] include_dirs = include_common_directories output_dir = "${root_out_dir}/ar" } include_bytecode_input_dex_directories = [ - "${MPLFE_ROOT}/common/include", - "${MPLFE_ROOT}/bytecode_input/common/include", - "${MPLFE_ROOT}/bytecode_input/dex/include", - "${MPLFE_ROOT}/test/common", + "${HIR2MPL_ROOT}/common/include", + "${HIR2MPL_ROOT}/bytecode_input/common/include", + "${HIR2MPL_ROOT}/bytecode_input/dex/include", + "${HIR2MPL_ROOT}/test/common", "${THIRD_PARTY_ROOT}/bounds_checking_function/include", "${MAPLEALL_ROOT}/maple_ir/include", "${MAPLEALL_ROOT}/maple_util/include", @@ -196,13 +196,13 @@ include_bytecode_input_dex_directories = [ source_set("lib_mplfe_test_bytecode_input_dex") { sources = [ - "${MPLFE_ROOT}/test/bytecode_input/dex/bc_load_on_demand_type_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/bc_parser_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/bc_util_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/dex_class_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/dex_file_util_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/dex_op_test.cpp", - "${MPLFE_ROOT}/test/bytecode_input/dex/dex_reader_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/bc_load_on_demand_type_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/bc_parser_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/bc_util_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/dex_class_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/dex_file_util_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/dex_op_test.cpp", + "${HIR2MPL_ROOT}/test/bytecode_input/dex/dex_reader_test.cpp", ] include_dirs = include_bytecode_input_dex_directories output_dir = "${root_out_dir}/ar" -- Gitee From 6b79be1c745280c5bf94d05e7869978412baeab2 Mon Sep 17 00:00:00 2001 From: Alex Antonov Date: Mon, 6 Dec 2021 15:08:07 +0300 Subject: [PATCH 2/5] [mapleall][driver] Replace mplfe with hir2mpl --- src/mapleall/maple_driver/include/compiler.h | 2 +- src/mapleall/maple_driver/src/compiler_factory.cpp | 2 +- src/mapleall/maple_driver/src/driver_option_common.cpp | 4 ++-- src/mapleall/maple_driver/src/mpl_options.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mapleall/maple_driver/include/compiler.h b/src/mapleall/maple_driver/include/compiler.h index 089ba8ea0d..5523f90800 100644 --- a/src/mapleall/maple_driver/include/compiler.h +++ b/src/mapleall/maple_driver/include/compiler.h @@ -32,7 +32,7 @@ namespace maple { const std::string kBinNameNone = ""; const std::string kBinNameJbc2mpl = "jbc2mpl"; -const std::string kBinNameCpp2mpl = "mplfe"; +const std::string kBinNameCpp2mpl = "hir2mpl"; const std::string kBinNameClang = "clang"; const std::string kBinNameDex2mpl = "dex2mpl"; const std::string kBinNameMplipa = "mplipa"; diff --git a/src/mapleall/maple_driver/src/compiler_factory.cpp b/src/mapleall/maple_driver/src/compiler_factory.cpp index fecbce0c69..4aad43864a 100644 --- a/src/mapleall/maple_driver/src/compiler_factory.cpp +++ b/src/mapleall/maple_driver/src/compiler_factory.cpp @@ -34,7 +34,7 @@ CompilerFactory::CompilerFactory() { // Supported compilers ADD_COMPILER("jbc2mpl", Jbc2MplCompiler) ADD_COMPILER("dex2mpl", Dex2MplCompiler) - ADD_COMPILER("mplfe", Cpp2MplCompiler) + ADD_COMPILER("hir2mpl", Cpp2MplCompiler) ADD_COMPILER("clang", ClangCompiler) ADD_COMPILER("mplipa", IpaCompiler) ADD_COMPILER("me", MapleCombCompiler) diff --git a/src/mapleall/maple_driver/src/driver_option_common.cpp b/src/mapleall/maple_driver/src/driver_option_common.cpp index 59ba0e46aa..c9d100d8fd 100644 --- a/src/mapleall/maple_driver/src/driver_option_common.cpp +++ b/src/mapleall/maple_driver/src/driver_option_common.cpp @@ -100,7 +100,7 @@ const mapleOption::Descriptor kUsages[] = { kArgCheckPolicyNone, " -O2 \tDo more optimization. (Default)\n", "all", - {"mplfe"} }, + {"hir2mpl"} }, { kPartO2, 0, "", @@ -325,7 +325,7 @@ const mapleOption::Descriptor kUsages[] = { kArgCheckPolicyBool, " -verbose \t: print informations\n", "all", - { "jbc2mpl", "mplfe", "me", "mpl2mpl", "mplcg" } }, + { "jbc2mpl", "hir2mpl", "me", "mpl2mpl", "mplcg" } }, { kAllDebug, 0, "", diff --git a/src/mapleall/maple_driver/src/mpl_options.cpp b/src/mapleall/maple_driver/src/mpl_options.cpp index efa8efba48..688ca51c28 100644 --- a/src/mapleall/maple_driver/src/mpl_options.cpp +++ b/src/mapleall/maple_driver/src/mpl_options.cpp @@ -50,7 +50,7 @@ const std::string kMapleDriverVersion = "MapleDriver " + std::to_string(Version: const std::string kMapleDriverVersion = "Maple Version : " + Version::GetVersionStr(); #endif -const std::vector kMapleCompilers = { "jbc2mpl", "mplfe", +const std::vector kMapleCompilers = { "jbc2mpl", "hir2mpl", "dex2mpl", "mplipa", "as", "ld", "me", "mpl2mpl", "mplcg", "clang"}; -- Gitee From 4e65c2085589b4a177999634a78e578422f173e9 Mon Sep 17 00:00:00 2001 From: Alex Antonov Date: Mon, 6 Dec 2021 19:27:00 +0300 Subject: [PATCH 3/5] [build] Fix path to mplfe --- build/third_party/patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/third_party/patch.sh b/build/third_party/patch.sh index 647ba0f348..1520fabca8 100644 --- a/build/third_party/patch.sh +++ b/build/third_party/patch.sh @@ -40,7 +40,7 @@ function install_patch { patch -p0 < $TOOLS_PATH/system_001.patch patch -p0 < $TOOLS_PATH/art_001.patch mkdir -p include/ - cp -r ${MAPLE_ROOT}/src/hir2mpl/bytecode_input/dex/include/string_view_format.h include/ + cp -r ${MAPLE_ROOT}/src/mplfe/bytecode_input/dex/include/string_view_format.h include/ cd $MODIFIED_LLVM_PATH patch -p0 < $TOOLS_PATH/llvm_001.patch -- Gitee From ffe75fdbedc6dbf840af6a70618bddd4ffd0d9bf Mon Sep 17 00:00:00 2001 From: Alex Antonov Date: Mon, 6 Dec 2021 19:37:30 +0300 Subject: [PATCH 4/5] [CI] Use Hir2Mpl instead of Mplfe --- testsuite/driver/src/api/hir2mpl.py | 2 +- testsuite/driver/src/mode/ASTO0.py | 2 +- testsuite/driver/src/mode/ASTO2.py | 2 +- testsuite/driver/src/mode/CO0.py | 2 +- testsuite/driver/src/mode/CO2.py | 2 +- testsuite/driver/src/mode/SCO0_TEST.py | 2 +- testsuite/driver/src/mode/SCO0_TRAIN.py | 2 +- testsuite/driver/src/mode/SCO2_TEST.py | 2 +- testsuite/driver/src/mode/SCO2_TRAIN.py | 2 +- testsuite/driver/src/mode/SUPO0.py | 2 +- testsuite/driver/src/mode/SUPO2.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testsuite/driver/src/api/hir2mpl.py b/testsuite/driver/src/api/hir2mpl.py index 4ed7e359b3..951b93fa10 100755 --- a/testsuite/driver/src/api/hir2mpl.py +++ b/testsuite/driver/src/api/hir2mpl.py @@ -15,7 +15,7 @@ from api.shell_operator import ShellOperator -class Mplfe(ShellOperator): +class Hir2mpl(ShellOperator): def __init__(self, hir2mpl, infile, outfile, option="-enable-variable-array", return_value_list=None, redirection=None): super().__init__(return_value_list, redirection) diff --git a/testsuite/driver/src/mode/ASTO0.py b/testsuite/driver/src/mode/ASTO0.py index 130b4641e2..994cb90b7e 100644 --- a/testsuite/driver/src/mode/ASTO0.py +++ b/testsuite/driver/src/mode/ASTO0.py @@ -25,7 +25,7 @@ ASTO0 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/ASTO2.py b/testsuite/driver/src/mode/ASTO2.py index 445694104f..094e8b4871 100644 --- a/testsuite/driver/src/mode/ASTO2.py +++ b/testsuite/driver/src/mode/ASTO2.py @@ -25,7 +25,7 @@ ASTO2 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", option="-O2 -func-inline-size 10", infile="${APP}.ast", diff --git a/testsuite/driver/src/mode/CO0.py b/testsuite/driver/src/mode/CO0.py index 9695203ee4..faa45a1f5a 100644 --- a/testsuite/driver/src/mode/CO0.py +++ b/testsuite/driver/src/mode/CO0.py @@ -28,7 +28,7 @@ CO0 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/CO2.py b/testsuite/driver/src/mode/CO2.py index b2d57985e4..d90abd9ad8 100644 --- a/testsuite/driver/src/mode/CO2.py +++ b/testsuite/driver/src/mode/CO2.py @@ -28,7 +28,7 @@ CO2 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SCO0_TEST.py b/testsuite/driver/src/mode/SCO0_TEST.py index 67a89c0cf3..65cd3a4d5c 100644 --- a/testsuite/driver/src/mode/SCO0_TEST.py +++ b/testsuite/driver/src/mode/SCO0_TEST.py @@ -29,7 +29,7 @@ SCO0_TEST = { outfile="${APP}.ast", extra_opt="${SPEC_PARAM}" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SCO0_TRAIN.py b/testsuite/driver/src/mode/SCO0_TRAIN.py index 334a3161ba..d1fb051bc8 100644 --- a/testsuite/driver/src/mode/SCO0_TRAIN.py +++ b/testsuite/driver/src/mode/SCO0_TRAIN.py @@ -29,7 +29,7 @@ SCO0_TRAIN = { outfile="${APP}.ast", extra_opt="${SPEC_PARAM}" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SCO2_TEST.py b/testsuite/driver/src/mode/SCO2_TEST.py index 1a5b6f4be6..eabf287dbb 100644 --- a/testsuite/driver/src/mode/SCO2_TEST.py +++ b/testsuite/driver/src/mode/SCO2_TEST.py @@ -29,7 +29,7 @@ SCO2_TEST = { outfile="${APP}.ast", extra_opt="${SPEC_PARAM}" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SCO2_TRAIN.py b/testsuite/driver/src/mode/SCO2_TRAIN.py index f57c2de62e..5bc1519f34 100644 --- a/testsuite/driver/src/mode/SCO2_TRAIN.py +++ b/testsuite/driver/src/mode/SCO2_TRAIN.py @@ -29,7 +29,7 @@ SCO2_TRAIN = { outfile="${APP}.ast", extra_opt="${SPEC_PARAM}" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/aarch64-clang-release/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SUPO0.py b/testsuite/driver/src/mode/SUPO0.py index 1a52667bf6..33ab6537a2 100644 --- a/testsuite/driver/src/mode/SUPO0.py +++ b/testsuite/driver/src/mode/SUPO0.py @@ -28,7 +28,7 @@ SUPO0 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" diff --git a/testsuite/driver/src/mode/SUPO2.py b/testsuite/driver/src/mode/SUPO2.py index 8841b74e10..dec19c7918 100644 --- a/testsuite/driver/src/mode/SUPO2.py +++ b/testsuite/driver/src/mode/SUPO2.py @@ -28,7 +28,7 @@ SUPO2 = { infile="${APP}.c", outfile="${APP}.ast" ), - Mplfe( + Hir2mpl( hir2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/hir2mpl", infile="${APP}.ast", outfile="${APP}.mpl" -- Gitee From 5a086be371ee5b76aa64213cb7c2004624dab8c9 Mon Sep 17 00:00:00 2001 From: Alex Antonov Date: Mon, 6 Dec 2021 19:45:11 +0300 Subject: [PATCH 5/5] [Build] Fix path to mplfe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 250f27b5c0..79bad0628b 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ install: maple dex2mpl_install irbuild hir2mpl rsync -a -L $(MAPLE_ROOT)/build/java2d8 $(INSTALL_DIR)/bin; \ rsync -a -L $(MAPLE_BIN_DIR)/java2jar $(INSTALL_DIR)/bin/; \ cp -rf $(MAPLE_ROOT)/tools $(INSTALL_DIR)/../; \ - rsync -a -L $(MAPLE_ROOT)/src/hir2mpl/ast_input/clang/lib/sys/ $(INSTALL_DIR)/lib/include/;) + rsync -a -L $(MAPLE_ROOT)/src/mplfe/ast_input/clang/lib/sys/ $(INSTALL_DIR)/lib/include/;) .PHONY: all all: install libcore -- Gitee