X-Git-Url: http://nitlanguage.org diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index dc227ea..e5cba5c 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -20,7 +20,6 @@ module abstract_compiler import literal import typing import auto_super_init -import frontend import platform import c_tools @@ -42,8 +41,8 @@ redef class ToolContext var opt_no_shortcut_range: OptionBool = new OptionBool("Always insantiate a range and its iterator on 'for' loops", "--no-shortcut-range") # --no-check-covariance var opt_no_check_covariance: OptionBool = new OptionBool("Disable type tests of covariant parameters (dangerous)", "--no-check-covariance") - # --no-check-initialization - var opt_no_check_initialization: OptionBool = new OptionBool("Disable isset tests at the end of constructors (dangerous)", "--no-check-initialization") + # --no-check-attr-isset + var opt_no_check_attr_isset: OptionBool = new OptionBool("Disable isset tests before each attribute access (dangerous)", "--no-check-attr-isset") # --no-check-assert var opt_no_check_assert: OptionBool = new OptionBool("Disable the evaluation of explicit 'assert' and 'as' (dangerous)", "--no-check-assert") # --no-check-autocast @@ -54,6 +53,8 @@ redef class ToolContext var opt_typing_test_metrics: OptionBool = new OptionBool("Enable static and dynamic count of all type tests", "--typing-test-metrics") # --invocation-metrics var opt_invocation_metrics: OptionBool = new OptionBool("Enable static and dynamic count of all method invocations", "--invocation-metrics") + # --isset-checks-metrics + var opt_isset_checks_metrics: OptionBool = new OptionBool("Enable static and dynamic count of isset checks before attributes access", "--isset-checks-metrics") # --stacktrace var opt_stacktrace: OptionString = new OptionString("Control the generation of stack traces", "--stacktrace") # --no-gcc-directives @@ -63,8 +64,8 @@ redef class ToolContext do super self.option_context.add_option(self.opt_output, self.opt_no_cc, self.opt_make_flags, self.opt_compile_dir, self.opt_hardening, self.opt_no_shortcut_range) - self.option_context.add_option(self.opt_no_check_covariance, self.opt_no_check_initialization, self.opt_no_check_assert, self.opt_no_check_autocast, self.opt_no_check_other) - self.option_context.add_option(self.opt_typing_test_metrics, self.opt_invocation_metrics) + self.option_context.add_option(self.opt_no_check_covariance, self.opt_no_check_attr_isset, self.opt_no_check_assert, self.opt_no_check_autocast, self.opt_no_check_other) + self.option_context.add_option(self.opt_typing_test_metrics, self.opt_invocation_metrics, self.opt_isset_checks_metrics) self.option_context.add_option(self.opt_stacktrace) self.option_context.add_option(self.opt_no_gcc_directive) end @@ -74,13 +75,13 @@ redef class ToolContext super var st = opt_stacktrace.value - if st == null or st == "none" or st == "libunwind" or st == "gperf" then + if st == null or st == "none" or st == "libunwind" or st == "nitstack" then # Fine, do nothing else if st == "auto" then # Default just unset opt_stacktrace.value = null else - print "Error: unknown value `{st}` for --stacktrace. Use `none`, `libunwind`, `gperf` or `auto`." + print "Error: unknown value `{st}` for --stacktrace. Use `none`, `libunwind`, `nitstack` or `auto`." exit(1) end end @@ -128,22 +129,19 @@ class MakefileToolchain # The list is initially set with : # * the toolcontext --cc-path option # * the NIT_CC_PATH environment variable - # * some heuristics including the NIT_DIR environment variable and the progname of the process + # * `toolcontext.nit_dir` # Path can be added (or removed) by the client var cc_paths = new Array[String] protected fun gather_cc_paths do # Look for the the Nit clib path - var path_env = "NIT_DIR".environ - if not path_env.is_empty then + var path_env = toolcontext.nit_dir + if path_env != null then var libname = "{path_env}/clib" if libname.file_exists then cc_paths.add(libname) end - var libname = "{sys.program_name.dirname}/../clib" - if libname.file_exists then cc_paths.add(libname.simplify_path) - if cc_paths.is_empty then toolcontext.error(null, "Cannot determine the nit clib path. define envvar NIT_DIR.") end @@ -197,7 +195,7 @@ class MakefileToolchain fun write_files(compiler: AbstractCompiler, compile_dir: String, cfiles: Array[String]) do - if self.toolcontext.opt_stacktrace.value == "gperf" then compiler.build_c_to_nit_bindings + if self.toolcontext.opt_stacktrace.value == "nitstack" then compiler.build_c_to_nit_bindings # Add gc_choser.h to aditionnal bodies var gc_chooser = new ExternCFile("gc_chooser.c", "-DWITH_LIBGC") @@ -313,7 +311,7 @@ class MakefileToolchain end var ost = toolcontext.opt_stacktrace.value - if ost == "libunwind" or ost == "gperf" then linker_options.add("-lunwind") + if ost == "libunwind" or ost == "nitstack" then linker_options.add("-lunwind") makefile.write("CC = ccache cc\nCFLAGS = -g -O2\nCINCL = {cc_includes}\nLDFLAGS ?= \nLDLIBS ?= -lm -lgc {linker_options.join(" ")}\n\n") makefile.write("all: {outpath}\n\n") @@ -328,6 +326,8 @@ class MakefileToolchain dep_rules.add(o) end + var java_files = new Array[ExternFile] + # Compile each required extern body into a specific .o for f in compiler.extern_bodies do var o = f.makefile_rule_name @@ -335,7 +335,21 @@ class MakefileToolchain makefile.write("{o}: {ff}\n") makefile.write("\t{f.makefile_rule_content}\n\n") dep_rules.add(f.makefile_rule_name) - ofiles.add(o) + + if f.compiles_to_o_file then ofiles.add(o) + if f.add_to_jar then java_files.add(f) + end + + if not java_files.is_empty then + var jar_file = "{outpath}.jar" + + var class_files_array = new Array[String] + for f in java_files do class_files_array.add(f.makefile_rule_name) + var class_files = class_files_array.join(" ") + + makefile.write("{jar_file}: {class_files}\n") + makefile.write("\tjar cf {jar_file} {class_files}\n\n") + dep_rules.add jar_file end # Link edition @@ -431,33 +445,40 @@ abstract class AbstractCompiler do var compile_dir = modelbuilder.compile_dir - var stream = new OFStream.open("{compile_dir}/C_fun_names") - stream.write("%\{\n#include \"c_functions_hash.h\"\n%\}\n") - stream.write("%define lookup-function-name get_nit_name\n") - stream.write("struct C_Nit_Names;\n") - stream.write("%%\n") - stream.write("####\n") + var stream = new OFStream.open("{compile_dir}/c_functions_hash.c") + stream.write("#include \n") + stream.write("#include \n") + stream.write("#include \"c_functions_hash.h\"\n") + stream.write("typedef struct C_Nit_Names\{char* name; char* nit_name;\}C_Nit_Names;\n") + stream.write("const char* get_nit_name(register const char* procproc, register unsigned int len)\{\n") + stream.write("char* procname = malloc(len+1);") + stream.write("memcpy(procname, procproc, len);") + stream.write("procname[len] = '\\0';") + stream.write("static const C_Nit_Names map[{names.length}] = \{\n") for i in names.keys do + stream.write("\{\"") stream.write(i) - stream.write(",\t\"") + stream.write("\",\"") stream.write(names[i]) - stream.write("\"\n") - end - if names.is_empty then - stream.write("DEAD,\t\"DEAD\"\n") # Force at least one entry - end - stream.write("####\n") - stream.write("%%\n") + stream.write("\"\},\n") + end + stream.write("\};\n") + stream.write("int i;") + stream.write("for(i = 0; i < {names.length}; i++)\{") + stream.write("if(strcmp(procname,map[i].name) == 0)\{") + stream.write("free(procname);") + stream.write("return map[i].nit_name;") + stream.write("\}") + stream.write("\}") + stream.write("free(procname);") + stream.write("return NULL;") + stream.write("\}\n") stream.close stream = new OFStream.open("{compile_dir}/c_functions_hash.h") - stream.write("typedef struct C_Nit_Names\{char* name; char* nit_name;\}C_Nit_Names;\n") - stream.write("const struct C_Nit_Names* get_nit_name(register const char *str, register unsigned int len);\n") + stream.write("const char* get_nit_name(register const char* procname, register unsigned int len);\n") stream.close - var x = new Process("gperf","{compile_dir}/C_fun_names","-t","-7","--output-file={compile_dir}/c_functions_hash.c","-C") - x.wait - extern_bodies.add(new ExternCFile("{compile_dir}/c_functions_hash.c", "")) end @@ -519,14 +540,14 @@ abstract class AbstractCompiler var ost = modelbuilder.toolcontext.opt_stacktrace.value if ost == null then - ost = "gperf" + ost = "nitstack" modelbuilder.toolcontext.opt_stacktrace.value = ost end - if ost == "gperf" or ost == "libunwind" then + if ost == "nitstack" or ost == "libunwind" then v.add_decl("#define UNW_LOCAL_ONLY") v.add_decl("#include ") - if ost == "gperf" then + if ost == "nitstack" then v.add_decl("#include \"c_functions_hash.h\"") end end @@ -554,13 +575,20 @@ abstract class AbstractCompiler v.compiler.header.add_decl("extern long count_invoke_by_inline;") end + if self.modelbuilder.toolcontext.opt_isset_checks_metrics.value then + v.add_decl("long count_attr_reads = 0;") + v.add_decl("long count_isset_checks = 0;") + v.compiler.header.add_decl("extern long count_attr_reads;") + v.compiler.header.add_decl("extern long count_isset_checks;") + end + v.add_decl("void sig_handler(int signo)\{") v.add_decl("printf(\"Caught signal : %s\\n\", strsignal(signo));") v.add_decl("show_backtrace(signo);") v.add_decl("\}") v.add_decl("void show_backtrace (int signo) \{") - if ost == "gperf" or ost == "libunwind" then + if ost == "nitstack" or ost == "libunwind" then v.add_decl("char* opt = getenv(\"NIT_NO_STACK\");") v.add_decl("unw_cursor_t cursor;") v.add_decl("if(opt==NULL)\{") @@ -574,10 +602,10 @@ abstract class AbstractCompiler v.add_decl("printf(\"-------------------------------------------------\\n\");") v.add_decl("while (unw_step(&cursor) > 0) \{") v.add_decl(" unw_get_proc_name(&cursor, procname, 100, &ip);") - if ost == "gperf" then - v.add_decl(" const C_Nit_Names* recv = get_nit_name(procname, strlen(procname));") - v.add_decl(" if (recv != 0)\{") - v.add_decl(" printf(\"` %s\\n\", recv->nit_name);") + if ost == "nitstack" then + v.add_decl(" const char* recv = get_nit_name(procname, strlen(procname));") + v.add_decl(" if (recv != NULL)\{") + v.add_decl(" printf(\"` %s\\n\", recv);") v.add_decl(" \}else\{") v.add_decl(" printf(\"` %s\\n\", procname);") v.add_decl(" \}") @@ -653,6 +681,12 @@ abstract class AbstractCompiler v.add("printf(\"direct: %ld (%.2f%%)\\n\", count_invoke_by_direct, 100.0*count_invoke_by_direct/count_invoke_total);") v.add("printf(\"inlined: %ld (%.2f%%)\\n\", count_invoke_by_inline, 100.0*count_invoke_by_inline/count_invoke_total);") end + + if self.modelbuilder.toolcontext.opt_isset_checks_metrics.value then + v.add("printf(\"# dynamic attribute reads: %ld\\n\", count_attr_reads);") + v.add("printf(\"# dynamic isset checks: %ld\\n\", count_isset_checks);") + end + v.add("return 0;") v.add("\}") end @@ -1511,6 +1545,7 @@ redef class MMethodDef # Can the body be inlined? fun can_inline(v: VISITOR): Bool do + if is_abstract then return true var modelbuilder = v.compiler.modelbuilder if modelbuilder.mpropdef2npropdef.has_key(self) then var npropdef = modelbuilder.mpropdef2npropdef[self] @@ -1583,13 +1618,16 @@ redef class APropdef fun can_inline: Bool do return true end -redef class AConcreteMethPropdef +redef class AMethPropdef redef fun compile_to_c(v, mpropdef, arguments) do - for i in [0..mpropdef.msignature.arity[ do - var variable = self.n_signature.n_params[i].variable.as(not null) - v.assign(v.variable(variable), arguments[i+1]) + if mpropdef.is_abstract then + var cn = v.class_name_string(arguments.first) + v.add("fprintf(stderr, \"Runtime error: Abstract method `%s` called on `%s`\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});") + v.add_raw_abort + return end + # Call the implicit super-init var auto_super_inits = self.auto_super_inits if auto_super_inits != null then @@ -1602,7 +1640,23 @@ redef class AConcreteMethPropdef v.compile_callsite(auto_super_init, args) end end - v.stmt(self.n_block) + + var n_block = n_block + if n_block != null then + for i in [0..mpropdef.msignature.arity[ do + var variable = self.n_signature.n_params[i].variable.as(not null) + v.assign(v.variable(variable), arguments[i+1]) + end + v.stmt(n_block) + else if mpropdef.is_intern then + compile_intern_to_c(v, mpropdef, arguments) + else if mpropdef.is_extern then + if mpropdef.mproperty.is_init then + compile_externinit_to_c(v, mpropdef, arguments) + else + compile_externmeth_to_c(v, mpropdef, arguments) + end + end end redef fun can_inline @@ -1614,10 +1668,8 @@ redef class AConcreteMethPropdef if nblock isa ABlockExpr and nblock.n_expr.length == 0 then return true return false end -end -redef class AInternMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_intern_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var pname = mpropdef.mproperty.name var cname = mpropdef.mclassdef.mclass.name @@ -1644,12 +1696,6 @@ redef class AInternMethPropdef else if pname == "unary -" then v.ret(v.new_expr("-{arguments[0]}", ret.as(not null))) return - else if pname == "succ" then - v.ret(v.new_expr("{arguments[0]}+1", ret.as(not null))) - return - else if pname == "prec" then - v.ret(v.new_expr("{arguments[0]}-1", ret.as(not null))) - return else if pname == "*" then v.ret(v.new_expr("{arguments[0]} * {arguments[1]}", ret.as(not null))) return @@ -1698,10 +1744,10 @@ redef class AInternMethPropdef else if pname == "object_id" then v.ret(v.new_expr("(long){arguments.first}", ret.as(not null))) return - else if pname == "+" then + else if pname == "successor" then v.ret(v.new_expr("{arguments[0]} + {arguments[1]}", ret.as(not null))) return - else if pname == "-" then + else if pname == "predecessor" then v.ret(v.new_expr("{arguments[0]} - {arguments[1]}", ret.as(not null))) return else if pname == "==" then @@ -1711,12 +1757,6 @@ redef class AInternMethPropdef var res = v.equal_test(arguments[0], arguments[1]) v.ret(v.new_expr("!{res}", ret.as(not null))) return - else if pname == "succ" then - v.ret(v.new_expr("{arguments[0]}+1", ret.as(not null))) - return - else if pname == "prec" then - v.ret(v.new_expr("{arguments[0]}-1", ret.as(not null))) - return else if pname == "<" then v.ret(v.new_expr("{arguments[0]} < {arguments[1]}", ret.as(not null))) return @@ -1862,10 +1902,8 @@ redef class AInternMethPropdef v.add("printf(\"NOT YET IMPLEMENTED {class_name}:{mpropdef} at {location.to_s}\\n\");") debug("Not implemented {mpropdef}") end -end -redef class AExternMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_externmeth_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var externname var nextern = self.n_extern @@ -1894,10 +1932,8 @@ redef class AExternMethPropdef v.ret(res) end end -end -redef class AExternInitPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_externinit_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var externname var nextern = self.n_extern @@ -1993,15 +2029,6 @@ redef class AClassdef end end -redef class ADeferredMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) do - var cn = v.class_name_string(arguments.first) - v.add("fprintf(stderr, \"Runtime error: Abstract method `%s` called on `%s`\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});") - v.add_raw_abort - end - redef fun can_inline do return true -end - redef class AExpr # Try to compile self as an expression # Do not call this method directly, use `v.expr` instead