end
redef class ModelBuilder
- fun run_separate_erasure_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
+ fun run_separate_erasure_compiler(mainmodule: MModule, runtime_type_analysis: nullable RapidTypeAnalysis)
do
var time0 = get_time
- self.toolcontext.info("*** COMPILING TO C ***", 1)
+ self.toolcontext.info("*** GENERATING C ***", 1)
var compiler = new SeparateErasureCompiler(mainmodule, self, runtime_type_analysis)
compiler.compile_header
# compile class structures
+ self.toolcontext.info("Property coloring", 2)
compiler.new_file("{mainmodule.name}.tables")
compiler.do_property_coloring
for m in mainmodule.in_importation.greaters do
# compile methods
for m in mainmodule.in_importation.greaters do
+ self.toolcontext.info("Generate C for module {m}", 2)
compiler.new_file("{m.name}.sep")
compiler.compile_module_to_c(m)
end
compiler.display_stats
+ var time1 = get_time
+ self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
write_and_make(compiler)
end
end
private var class_layout: nullable Layout[MClass]
protected var vt_layout: nullable Layout[MVirtualTypeProp]
- init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
+ init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: nullable RapidTypeAnalysis) do
super
var mclasses = new HashSet[MClass].from(mmbuilder.model.mclasses)
var layout_builder: TypingLayoutBuilder[MClass]
+ var class_colorer = new MClassColorer(mainmodule)
if modelbuilder.toolcontext.opt_phmod_typing.value then
layout_builder = new MClassHasher(new PHModOperator, mainmodule)
+ class_colorer.build_layout(mclasses)
else if modelbuilder.toolcontext.opt_phand_typing.value then
layout_builder = new MClassHasher(new PHAndOperator, mainmodule)
+ class_colorer.build_layout(mclasses)
else if modelbuilder.toolcontext.opt_bm_typing.value then
layout_builder = new MClassBMizer(mainmodule)
+ class_colorer.build_layout(mclasses)
else
- layout_builder = new MClassColorer(mainmodule)
+ layout_builder = class_colorer
end
self.class_layout = layout_builder.build_layout(mclasses)
self.class_tables = self.build_class_typing_tables(mclasses)
+ # lookup vt to build layout with
+ var vts = new HashMap[MClass, Set[MVirtualTypeProp]]
+ for mclass in mclasses do
+ vts[mclass] = new HashSet[MVirtualTypeProp]
+ for mprop in self.mainmodule.properties(mclass) do
+ if mprop isa MVirtualTypeProp then
+ vts[mclass].add(mprop)
+ end
+ end
+ end
+
# vt coloration
- var vt_coloring = new MVirtualTypePropColorer(mainmodule)
- var vt_layout = vt_coloring.build_layout(mclasses)
+ var vt_coloring = new MPropertyColorer[MVirtualTypeProp](mainmodule, class_colorer)
+ var vt_layout = vt_coloring.build_layout(vts)
self.vt_tables = build_vt_tables(mclasses, vt_layout)
self.vt_layout = vt_layout
end
for mclass in mclasses do
var table = new Array[nullable MPropDef]
# first, fill table from parents by reverse linearization order
- var parents = self.mainmodule.super_mclasses(mclass)
- var lin = self.mainmodule.reverse_linearize_mclasses(parents)
- for parent in lin do
+ var parents = new Array[MClass]
+ if mainmodule.flatten_mclass_hierarchy.has(mclass) then
+ parents = mclass.in_hierarchy(mainmodule).greaters.to_a
+ self.mainmodule.linearize_mclasses(parents)
+ end
+ for parent in parents do
+ if parent == mclass then continue
for mproperty in self.mainmodule.properties(parent) do
if not mproperty isa MVirtualTypeProp then continue
var color = layout.pos[mproperty]
var layout = self.class_layout
for mclass in mclasses do
var table = new Array[nullable MClass]
- var supers = new HashSet[MClass]
- supers.add_all(self.mainmodule.super_mclasses(mclass))
- supers.add(mclass)
+ var supers = new Array[MClass]
+ if mainmodule.flatten_mclass_hierarchy.has(mclass) then
+ supers = mclass.in_hierarchy(mainmodule).greaters.to_a
+ end
for sup in supers do
var color: Int
if layout isa PHLayout[MClass, MClass] then
do
var mtype = mclass.intro.bound_mtype
var c_name = mclass.c_name
+ var c_instance_name = mclass.c_instance_name
var vft = self.method_tables[mclass]
var attrs = self.attr_tables[mclass]
v.add_decl("/* runtime class {c_name} */")
- self.header.add_decl("extern const struct class class_{c_name};")
+ self.provide_declaration("class_{c_name}", "extern const struct class class_{c_name};")
+ v.add_decl("extern const struct type_table type_table_{c_name};")
# Build class vft
v.add_decl("const struct class class_{c_name} = \{")
v.add_decl("{layout.pos[mclass]},")
end
if build_class_vts_table(mclass) then
+ v.require_declaration("vts_table_{c_name}")
v.add_decl("&vts_table_{c_name},")
else
v.add_decl("NULL,")
v.add_decl("NULL, /* empty */")
else
if true or mpropdef.mclassdef.bound_mtype.ctype != "val*" then
+ v.require_declaration("VIRTUAL_{mpropdef.c_name}")
v.add_decl("(nitmethod_t)VIRTUAL_{mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
else
+ v.require_declaration("{mpropdef.c_name}")
v.add_decl("(nitmethod_t){mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
end
end
v.add_decl("\};")
# Build class type table
- self.header.add_decl("extern const struct type_table type_table_{c_name};")
v.add_decl("const struct type_table type_table_{c_name} = \{")
v.add_decl("{class_table.length},")
v.add_decl("\};")
if mtype.ctype != "val*" then
- #Build instance struct
- self.header.add_decl("struct instance_{c_name} \{")
- self.header.add_decl("const struct class *class;")
- self.header.add_decl("{mtype.ctype} value;")
- self.header.add_decl("\};")
+ if mtype.mclass.name == "Pointer" or mtype.mclass.kind != extern_kind then
+ #Build instance struct
+ self.header.add_decl("struct instance_{c_instance_name} \{")
+ self.header.add_decl("const struct class *class;")
+ self.header.add_decl("{mtype.ctype} value;")
+ self.header.add_decl("\};")
+ end
#Build BOX
- self.header.add_decl("val* BOX_{c_name}({mtype.ctype});")
+ self.provide_declaration("BOX_{c_name}", "val* BOX_{c_name}({mtype.ctype});")
v.add_decl("/* allocate {mtype} */")
v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype} value) \{")
- v.add("struct instance_{c_name}*res = GC_MALLOC(sizeof(struct instance_{c_name}));")
- v.add("res->class = (struct class*) &class_{c_name};")
+ v.add("struct instance_{c_instance_name}*res = nit_alloc(sizeof(struct instance_{c_instance_name}));")
+ v.require_declaration("class_{c_name}")
+ v.add("res->class = &class_{c_name};")
v.add("res->value = value;")
v.add("return (val*)res;")
v.add("\}")
self.header.add_decl("\};")
#Build NEW
- self.header.add_decl("{mtype.ctype} NEW_{c_name}(int length);")
+ self.provide_declaration("NEW_{c_name}", "{mtype.ctype} NEW_{c_name}(int length);")
v.add_decl("/* allocate {mtype} */")
v.add_decl("{mtype.ctype} NEW_{c_name}(int length) \{")
var res = v.new_named_var(mtype, "self")
res.is_exact = true
var mtype_elt = mtype.arguments.first
- v.add("{res} = GC_MALLOC(sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype}));")
+ v.add("{res} = nit_alloc(sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype}));")
+ v.require_declaration("class_{c_name}")
v.add("{res}->class = &class_{c_name};")
v.add("return {res};")
v.add("\}")
end
#Build NEW
- self.header.add_decl("{mtype.ctype} NEW_{c_name}(void);")
+ self.provide_declaration("NEW_{c_name}", "{mtype.ctype} NEW_{c_name}(void);")
v.add_decl("/* allocate {mtype} */")
v.add_decl("{mtype.ctype} NEW_{c_name}(void) \{")
var res = v.new_named_var(mtype, "self")
res.is_exact = true
- v.add("{res} = GC_MALLOC(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+ v.add("{res} = nit_alloc(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+ v.require_declaration("class_{c_name}")
v.add("{res}->class = &class_{c_name};")
self.generate_init_attr(v, res, mtype)
v.add("return {res};")
v.add("\}")
-
- generate_check_init_instance(mtype)
end
private fun build_class_vts_table(mclass: MClass): Bool do
if self.vt_tables[mclass].is_empty then return false
- self.header.add_decl("extern const struct vts_table vts_table_{mclass.c_name};")
+ self.provide_declaration("vts_table_{mclass.c_name}", "extern const struct vts_table vts_table_{mclass.c_name};")
var v = new_visitor
v.add_decl("const struct vts_table vts_table_{mclass.c_name} = \{")
bound = retrieve_vt_bound(mclass.intro.bound_mtype, bound.mtype)
is_null = 1
end
- v.add_decl("\{{is_null}, &class_{bound.as(MClassType).mclass.c_name}\}, /* {vt} */")
+ var vtclass = bound.as(MClassType).mclass
+ v.require_declaration("class_{vtclass.c_name}")
+ v.add_decl("\{{is_null}, &class_{vtclass.c_name}\}, /* {vt} */")
end
end
v.add_decl("\},")
return res
end
- redef fun init_instance(mtype) do return self.new_expr("NEW_{mtype.mclass.c_name}()", mtype)
+ redef fun init_instance(mtype)
+ do
+ self.require_declaration("NEW_{mtype.mclass.c_name}")
+ return self.new_expr("NEW_{mtype.mclass.c_name}()", mtype)
+ end
redef fun type_test(value, mtype, tag)
do
class_ptr = "{value}->class->"
else
var mclass = value.mtype.as(MClassType).mclass
+ self.require_declaration("class_{mclass.c_name}")
class_ptr = "class_{mclass.c_name}."
end
if mtype isa MClassType then
+ self.require_declaration("class_{mtype.mclass.c_name}")
self.add("{cltype} = class_{mtype.mclass.c_name}.color;")
self.add("{idtype} = class_{mtype.mclass.c_name}.id;")
if compiler.modelbuilder.toolcontext.opt_typing_test_metrics.value then
recv_ptr = "{recv}->class->"
else
var mclass = recv.mtype.as(MClassType).mclass
+ self.require_declaration("class_{mclass.c_name}")
recv_ptr = "class_{mclass.c_name}."
end
var entry = self.get_name("entry")
self.add("struct vts_entry {entry};")
+ self.require_declaration(mtype.mproperty.const_color)
if self.compiler.as(SeparateErasureCompiler).vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
self.add("{entry} = {recv_ptr}vts_table->vts[HASH({recv_ptr}vts_table->mask, {mtype.mproperty.const_color})];")
else
if value.mtype.ctype == "val*" then
self.add "{res} = {value} == NULL ? \"null\" : {value}->class->name;"
else
+ self.require_declaration("class_{value.mtype.c_name}")
self.add "{res} = class_{value.mtype.c_name}.name;"
end
return res
self.add("\{ /* {res} = array_instance Array[{elttype}] */")
var nat = self.new_var(self.get_class("NativeArray").get_mtype([elttype]))
nat.is_exact = true
+ self.require_declaration("NEW_{nclass.c_name}")
self.add("{nat} = NEW_{nclass.c_name}({array.length});")
for i in [0..array.length[ do
var r = self.autobox(array[i], self.object_type)
- self.add("((struct instance_{nclass.c_name}*){nat})->values[{i}] = (val*) {r};")
+ self.add("((struct instance_{nclass.c_instance_name}*){nat})->values[{i}] = (val*) {r};")
end
var length = self.int_instance(array.length)
self.send(self.get_property("with_native", arraytype), [res, nat, length])
- self.check_init_instance(res, arraytype)
self.add("\}")
return res
end
redef fun calloc_array(ret_type, arguments)
do
var ret = ret_type.as(MClassType)
+ self.require_declaration("NEW_{ret.mclass.c_name}")
self.ret(self.new_expr("NEW_{ret.mclass.c_name}({arguments[1]})", ret_type))
end
end
nitlanguage / nit.git / blobdiff