nitg: add GlobalCompiler::new_file
[nit.git] / src / separate_erasure_compiler.nit
index 6eae895..3430bfa 100644 (file)
@@ -39,8 +39,10 @@ redef class ModelBuilder
                self.toolcontext.info("*** COMPILING TO C ***", 1)
 
                var compiler = new SeparateErasureCompiler(mainmodule, runtime_type_analysis, self)
+               compiler.compile_header
 
                # compile class structures
+               compiler.new_file
                for m in mainmodule.in_importation.greaters do
                        for mclass in m.intro_mclasses do
                                compiler.compile_class_to_c(mclass)
@@ -48,13 +50,17 @@ redef class ModelBuilder
                end
 
                # The main function of the C
+               compiler.new_file
                compiler.compile_main_function
 
                # compile methods
                for m in mainmodule.in_importation.greaters do
+                       compiler.new_file
                        compiler.compile_module_to_c(m)
                end
 
+               compiler.display_stats
+
                write_and_make(compiler)
        end
 end
@@ -81,11 +87,7 @@ class SeparateErasureCompiler
                        self.class_colors = class_coloring.compute_masks(mclasses, class_ids)
                        self.class_tables = class_coloring.hash_type_tables(mclasses, class_ids, class_colors)
 
-                       self.header.add_decl("int HASH(int, int);")
-                       var v = new_visitor
-                       v.add_decl("int HASH(int mask, int id) \{")
-                       v.add_decl("return mask % id;")
-                       v.add_decl("\}")
+                       self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
                else if modelbuilder.toolcontext.opt_phand_typing.value then
                        # set type unique id
                        for mclass in mclasses do
@@ -96,11 +98,7 @@ class SeparateErasureCompiler
                        self.class_colors = class_coloring.compute_masks(mclasses, class_ids)
                        self.class_tables = class_coloring.hash_type_tables(mclasses, class_ids, class_colors)
 
-                       self.header.add_decl("int HASH(int, int);")
-                       var v = new_visitor
-                       v.add_decl("int HASH(int mask, int id) \{")
-                       v.add_decl("return mask & id;")
-                       v.add_decl("\}")
+                       self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
                else
                        var class_coloring
                        if modelbuilder.toolcontext.opt_bm_typing.value then
@@ -115,15 +113,12 @@ class SeparateErasureCompiler
                        self.class_colors = class_coloring.colorize(modelbuilder.model.mclasses)
                        self.class_tables = class_coloring.build_type_tables(modelbuilder.model.mclasses, class_colors)
                end
-
-               # for the class_name and output_class_name methods
-               self.compile_class_names
        end
 
        redef fun compile_header_structs do
                self.header.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
-               self.header.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
-               self.header.add_decl("struct class \{ int id; int box_kind; int color; struct vts_table *vts_table; struct type_table *type_table; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
+               self.compile_header_attribute_structs
+               self.header.add_decl("struct class \{ int id; const char *name; int box_kind; int color; struct vts_table *vts_table; struct type_table *type_table; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
                self.header.add_decl("struct type_table \{ int size; int table[1]; \}; /* colorized type table. */")
                self.header.add_decl("struct vts_entry \{ short int is_nullable; struct class *class; \}; /* link (nullable or not) between the vts and is bound. */")
 
@@ -133,32 +128,7 @@ class SeparateErasureCompiler
                        self.header.add_decl("struct vts_table \{ struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
                end
 
-               self.header.add_decl("typedef struct \{ struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
-               self.header.add_decl("extern const char const * class_names[];")
-       end
-
-       redef fun compile_class_names do
-               # Build type names table
-               var type_array = new Array[nullable MClass]
-               for t, id in class_ids do
-                       if id >= type_array.length then
-                               for i in [type_array.length..id[ do
-                                       type_array[i] = null
-                               end
-                       end
-                       type_array[id] = t
-               end
-
-               var v = self.new_visitor
-               v.add("const char const * class_names[] = \{")
-               for t in type_array do
-                       if t == null then
-                               v.add("NULL, /* empty */")
-                       else
-                               v.add("\"{t}\",")
-                       end
-               end
-               v.add("\};")
+               self.header.add_decl("typedef struct val \{ struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
        end
 
        redef fun compile_class_to_c(mclass: MClass)
@@ -180,6 +150,7 @@ class SeparateErasureCompiler
                self.header.add_decl("extern const struct class_{c_name} class_{c_name};")
                self.header.add_decl("struct class_{c_name} \{")
                self.header.add_decl("int id;")
+               self.header.add_decl("const char *name;")
                self.header.add_decl("int box_kind;")
                self.header.add_decl("int color;")
                self.header.add_decl("const struct vts_table *vts_table;")
@@ -190,6 +161,7 @@ class SeparateErasureCompiler
                # Build class vft
                v.add_decl("const struct class_{c_name} class_{c_name} = \{")
                v.add_decl("{self.class_ids[mclass]},")
+               v.add_decl("\"{mclass.name}\", /* class_name_string */")
                v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
                v.add_decl("{self.class_colors[mclass]},")
                if build_class_vts_table(mclass) then
@@ -357,7 +329,7 @@ class SeparateErasureCompilerVisitor
                        var mtype = callsite.msignature.return_mtype
                        assert mtype != null
                        self.add("/* Erasure cast for return {res} isa {mtype} */")
-                       var cond = self.type_test(res, mtype)
+                       var cond = self.type_test(res, mtype, "erasure")
                        self.add("if (!{cond}) \{")
                        #var x = self.class_name_string(res)
                        #var y = self.class_name_string(arguments.first)
@@ -373,7 +345,7 @@ class SeparateErasureCompilerVisitor
                return self.new_expr("NEW_{mtype.mclass.c_name}()", mtype)
        end
 
-       redef fun type_test(value, mtype)
+       redef fun type_test(value, mtype, tag)
        do
                self.add("/* type test for {value.inspect} isa {mtype} */")
 
@@ -414,6 +386,10 @@ class SeparateErasureCompilerVisitor
 
                if value.mcasttype.is_subtype(self.frame.mpropdef.mclassdef.mmodule, self.frame.mpropdef.mclassdef.bound_mtype, mtype) then
                        self.add("{res} = 1; /* easy {value.inspect} isa {mtype}*/")
+                       if compiler.modelbuilder.toolcontext.opt_typing_test_metrics.value then
+                               self.compiler.count_type_test_skipped[tag] += 1
+                               self.add("count_type_test_skipped_{tag}++;")
+                       end
                        return res
                end
 
@@ -434,6 +410,10 @@ class SeparateErasureCompilerVisitor
                        if maybe_null == 0 then
                                self.add("{is_nullable} = 0;")
                        end
+                       if compiler.modelbuilder.toolcontext.opt_typing_test_metrics.value then
+                               self.compiler.count_type_test_resolved[tag] += 1
+                               self.add("count_type_test_resolved_{tag}++;")
+                       end
                else if mtype isa MVirtualType then
                        var recv = self.frame.arguments.first
                        var recv_ptr
@@ -455,6 +435,10 @@ class SeparateErasureCompilerVisitor
                        if maybe_null == 0 then
                                self.add("{is_nullable} = {entry}.is_nullable;")
                        end
+                       if compiler.modelbuilder.toolcontext.opt_typing_test_metrics.value then
+                               self.compiler.count_type_test_unresolved[tag] += 1
+                               self.add("count_type_test_unresolved_{tag}++;")
+                       end
                else
                        self.debug("type_test({value.inspect}, {mtype})")
                        abort
@@ -480,8 +464,12 @@ class SeparateErasureCompilerVisitor
        redef fun class_name_string(value)
        do
                var res = self.get_name("var_class_name")
-               self.add_decl("const char *{res};")
-               self.add("{res} = class_names[{value}->class->id];")
+               self.add_decl("const char* {res};")
+               if value.mtype.ctype == "val*" then
+                       self.add "{res} = {value} == NULL ? \"null\" : {value}->class->name;"
+               else
+                       self.add "{res} = class_{value.mtype.c_name}.name;"
+               end
                return res
        end