fun run_separate_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis)
do
var time0 = get_time
- self.toolcontext.info("*** COMPILING TO C ***", 1)
+ self.toolcontext.info("*** GENERATING C ***", 1)
var compiler = new SeparateCompiler(mainmodule, self, runtime_type_analysis)
compiler.compile_header
# compile class structures
+ self.toolcontext.info("Property coloring", 2)
+ compiler.new_file("{mainmodule.name}.classes")
+ compiler.do_property_coloring
for m in mainmodule.in_importation.greaters do
for mclass in m.intro_mclasses do
compiler.compile_class_to_c(mclass)
# 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
# compile live & cast type structures
- compiler.new_file("{mainmodule.name}.tables")
+ self.toolcontext.info("Type coloring", 2)
+ compiler.new_file("{mainmodule.name}.types")
var mtypes = compiler.do_type_coloring
for t in mtypes do
compiler.compile_type_to_c(t)
compiler.display_stats
+ var time1 = get_time
+ self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2)
write_and_make(compiler)
end
end
init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
super(mainmodule, mmbuilder)
+ var file = new_file("nit.common")
+ self.header = new CodeWriter(file)
self.runtime_type_analysis = runtime_type_analysis
- self.do_property_coloring
self.compile_box_kinds
end
end
fun compile_color_consts(colors: Map[Object, Int]) do
+ var v = new_visitor
for m, c in colors do
if color_consts_done.has(m) then continue
if m isa MProperty then
if modelbuilder.toolcontext.opt_inline_coloring_numbers.value then
- self.header.add_decl("#define {m.const_color} {c}")
+ self.provide_declaration(m.const_color, "#define {m.const_color} {c}")
else
- self.header.add_decl("extern const int {m.const_color};")
- self.header.add("const int {m.const_color} = {c};")
+ self.provide_declaration(m.const_color, "extern const int {m.const_color};")
+ v.add("const int {m.const_color} = {c};")
end
else if m isa MType then
if modelbuilder.toolcontext.opt_inline_coloring_numbers.value then
- self.header.add_decl("#define {m.const_color} {c}")
+ self.provide_declaration(m.const_color, "#define {m.const_color} {c}")
else
- self.header.add_decl("extern const int {m.const_color};")
- self.header.add("const int {m.const_color} = {c};")
+ self.provide_declaration(m.const_color, "extern const int {m.const_color};")
+ v.add("const int {m.const_color} = {c};")
end
end
color_consts_done.add(m)
# Layouts
var method_layout_builder: PropertyLayoutBuilder[MMethod]
var attribute_layout_builder: PropertyLayoutBuilder[MAttribute]
- if modelbuilder.toolcontext.opt_bm_typing.value then
- method_layout_builder = new MMethodBMizer(self.mainmodule)
- attribute_layout_builder = new MAttributeBMizer(self.mainmodule)
- else
- method_layout_builder = new MMethodColorer(self.mainmodule)
- attribute_layout_builder = new MAttributeColorer(self.mainmodule)
- end
+ #FIXME PH and BM layouts too slow for large programs
+ #if modelbuilder.toolcontext.opt_bm_typing.value then
+ # method_layout_builder = new MMethodBMizer(self.mainmodule)
+ # attribute_layout_builder = new MAttributeBMizer(self.mainmodule)
+ #else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ # method_layout_builder = new MMethodHasher(new PHModOperator, self.mainmodule)
+ # attribute_layout_builder = new MAttributeHasher(new PHModOperator, self.mainmodule)
+ #else if modelbuilder.toolcontext.opt_phand_typing.value then
+ # method_layout_builder = new MMethodHasher(new PHAndOperator, self.mainmodule)
+ # attribute_layout_builder = new MAttributeHasher(new PHAndOperator, self.mainmodule)
+ #else
+ method_layout_builder = new MMethodColorer(self.mainmodule)
+ attribute_layout_builder = new MAttributeColorer(self.mainmodule)
+ #end
# methods coloration
var method_layout = method_layout_builder.build_layout(mclasses)
end
for mtype in mtypes do
- retieve_live_partial_types(mtype)
+ retrieve_partial_types(mtype)
end
mtypes.add_all(self.partial_types)
return tables
end
- fun retieve_live_partial_types(mtype: MType) do
+ fun retrieve_partial_types(mtype: MType) do
# add formal types arguments to mtypes
if mtype isa MGenericType then
for ft in mtype.arguments do
abort
end
self.partial_types.add(ft)
- retieve_live_partial_types(ft)
+ retrieve_partial_types(ft)
end
end
var mclass_type: MClassType
for pd in cd.mpropdefs do
if not pd isa MMethodDef then continue
#print "compile {pd} @ {cd} @ {mmodule}"
- var r = new SeparateRuntimeFunction(pd)
+ var r = pd.separate_runtime_function
r.compile_to_c(self)
- if true or cd.bound_mtype.ctype != "val*" then
- var r2 = new VirtualRuntimeFunction(pd)
- r2.compile_to_c(self)
- end
+ var r2 = pd.virtual_runtime_function
+ r2.compile_to_c(self)
end
end
self.mainmodule = old_module
v.add_decl("/* runtime type {mtype} */")
# extern const struct type_X
- self.header.add_decl("extern const struct type type_{c_name};")
+ self.provide_declaration("type_{c_name}", "extern const struct type type_{c_name};")
# const struct type_X
v.add_decl("const struct type type_{c_name} = \{")
v.add_decl("0,")
end
if compile_type_resolution_table(mtype) then
+ v.require_declaration("resolution_table_{c_name}")
v.add_decl("&resolution_table_{c_name},")
else
v.add_decl("NULL,")
var layout = self.resolution_layout
# extern const struct resolution_table_X resolution_table_X
- self.header.add_decl("extern const struct types resolution_table_{mtype.c_name};")
+ self.provide_declaration("resolution_table_{mtype.c_name}", "extern const struct types resolution_table_{mtype.c_name};")
# const struct fts_table_X fts_table_X
var v = new_visitor
var tv = t.resolve_for(mclass_type, mclass_type, self.mainmodule, true)
# FIXME: What typeids means here? How can a tv not be live?
if self.type_layout.ids.has_key(tv) then
+ v.require_declaration("type_{tv.c_name}")
v.add_decl("&type_{tv.c_name}, /* {t}: {tv} */")
else
v.add_decl("NULL, /* empty ({t}: {tv} not a live type) */")
v.add_decl("/* runtime class {c_name} */")
# Build class vft
- 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("const struct class class_{c_name} = \{")
v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
v.add_decl("\{")
if mpropdef == null then
v.add_decl("NULL, /* empty */")
else
- if true or mpropdef.mclassdef.bound_mtype.ctype != "val*" then
- v.add_decl("(nitmethod_t)VIRTUAL_{mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
- else
- v.add_decl("(nitmethod_t){mpropdef.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
- end
+ assert mpropdef isa MMethodDef
+ var rf = mpropdef.virtual_runtime_function
+ v.require_declaration(rf.c_name)
+ v.add_decl("(nitmethod_t){rf.c_name}, /* pointer to {mclass.intro_mmodule}:{mclass}:{mpropdef} */")
end
end
v.add_decl("\}")
self.header.add_decl("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("struct instance_{c_name}*res = nit_alloc(sizeof(struct instance_{c_name}));")
+ v.require_declaration("type_{c_name}")
v.add("res->type = &type_{c_name};")
+ v.require_declaration("class_{c_name}")
v.add("res->class = &class_{c_name};")
v.add("res->value = value;")
v.add("return (val*)res;")
self.header.add_decl("\};")
#Build NEW
- self.header.add_decl("{mtype.ctype} NEW_{c_name}(int length, const struct type* type);")
+ self.provide_declaration("NEW_{c_name}", "{mtype.ctype} NEW_{c_name}(int length, const struct type* type);")
v.add_decl("/* allocate {mtype} */")
v.add_decl("{mtype.ctype} NEW_{c_name}(int length, const struct type* type) \{")
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.add("{res}->type = type;")
hardening_live_type(v, "type")
+ 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}(const struct type* type);")
+ self.provide_declaration("NEW_{c_name}", "{mtype.ctype} NEW_{c_name}(const struct type* type);")
v.add_decl("/* allocate {mtype} */")
v.add_decl("{mtype.ctype} NEW_{c_name}(const struct type* type) \{")
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.add("{res}->type = type;")
hardening_live_type(v, "type")
+ v.require_declaration("class_{c_name}")
v.add("{res}->class = &class_{c_name};")
self.generate_init_attr(v, res, mtype)
v.add("return {res};")
var v = self.new_visitor
var c_name = mtype.mclass.c_name
var res = new RuntimeVariable("self", mtype, mtype)
- self.header.add_decl("void CHECK_NEW_{c_name}({mtype.ctype});")
+ self.provide_declaration("CHECK_NEW_{c_name}", "void CHECK_NEW_{c_name}({mtype.ctype});")
v.add_decl("/* allocate {mtype} */")
v.add_decl("void CHECK_NEW_{c_name}({mtype.ctype} {res}) \{")
self.generate_check_attr(v, res, mtype)
if value.mtype.ctype == "val*" then
return "{value}->type"
else
+ self.require_declaration("type_{value.mtype.c_name}")
return "(&type_{value.mtype.c_name})"
end
end
redef fun send(mmethod, arguments)
do
if arguments.first.mcasttype.ctype != "val*" then
- return self.monomorphic_send(mmethod, arguments.first.mcasttype, arguments)
+ # In order to shortcut the primitive, we need to find the most specific method
+ # Howverr, because of performance (no flattening), we always work on the realmainmodule
+ var m = self.compiler.mainmodule
+ self.compiler.mainmodule = self.compiler.realmainmodule
+ var res = self.monomorphic_send(mmethod, arguments.first.mcasttype, arguments)
+ self.compiler.mainmodule = m
+ return res
end
var res: nullable RuntimeVariable
var r
if ret == null then r = "void" else r = ret.ctype
+ self.require_declaration(mmethod.const_color)
var call = "(({r} (*)({s}))({arguments.first}->class->vft[{mmethod.const_color}]))({ss}) /* {mmethod} on {arguments.first.inspect}*/"
if res != null then
# Autobox arguments
self.adapt_signature(mmethoddef, arguments)
+ self.require_declaration(mmethoddef.c_name)
if res == null then
self.add("{mmethoddef.c_name}({arguments.join(", ")});")
return null
return res
end
+ self.require_declaration(a.const_color)
if self.compiler.modelbuilder.toolcontext.opt_no_union_attribute.value then
self.add("{res} = {recv}->attrs[{a.const_color}] != NULL; /* {a} on {recv.inspect}*/")
else
var intromclassdef = a.intro.mclassdef
ret = ret.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
+ self.require_declaration(a.const_color)
if self.compiler.modelbuilder.toolcontext.opt_no_union_attribute.value then
# Get the attribute or a box (ie. always a val*)
var cret = self.object_type.as_nullable
# Adapt the value to the declared type
value = self.autobox(value, mtype)
+ self.require_declaration(a.const_color)
if self.compiler.modelbuilder.toolcontext.opt_no_union_attribute.value then
var attr = "{recv}->attrs[{a.const_color}]"
if mtype.ctype != "val*" then
redef fun init_instance(mtype)
do
+ self.require_declaration("NEW_{mtype.mclass.c_name}")
var compiler = self.compiler
if mtype isa MGenericType and mtype.need_anchor then
link_unresolved_type(self.frame.mpropdef.mclassdef, mtype)
var recv = self.frame.arguments.first
var recv_type_info = self.type_info(recv)
+ self.require_declaration(mtype.const_color)
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
return self.new_expr("NEW_{mtype.mclass.c_name}({recv_type_info}->resolution_table->types[HASH({recv_type_info}->resolution_table->mask, {mtype.const_color})])", mtype)
else
end
end
compiler.undead_types.add(mtype)
+ self.require_declaration("type_{mtype.c_name}")
return self.new_expr("NEW_{mtype.mclass.c_name}(&type_{mtype.c_name})", mtype)
end
redef fun check_init_instance(value, mtype)
do
if self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then return
+ self.require_declaration("CHECK_NEW_{mtype.mclass.c_name}")
self.add("CHECK_NEW_{mtype.mclass.c_name}({value});")
end
# Either with resolution_table with a direct resolution
link_unresolved_type(self.frame.mpropdef.mclassdef, ntype)
+ self.require_declaration(ntype.const_color)
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
self.add("{type_struct} = {recv_type_info}->resolution_table->types[HASH({recv_type_info}->resolution_table->mask, {ntype.const_color})];")
else
end
else if ntype isa MClassType then
compiler.undead_types.add(mtype)
+ self.require_declaration("type_{mtype.c_name}")
self.add("{cltype} = type_{mtype.c_name}.color;")
self.add("{idtype} = type_{mtype.c_name}.id;")
if compiler.modelbuilder.toolcontext.opt_typing_test_metrics.value then
self.add("{res} = 0; /* is_same_type_test: incompatible types {value1.mtype} vs. {value2.mtype}*/")
else
var mtype1 = value1.mtype.as(MClassType)
+ self.require_declaration("class_{mtype1.c_name}")
self.add("{res} = ({value2} != NULL) && ({value2}->class == &class_{mtype1.c_name}); /* is_same_type_test */")
end
else
if value.mtype.ctype == "val*" then
self.add "{res} = {value} == NULL ? \"null\" : {value}->type->name;"
else
+ self.require_declaration("type_{value.mtype.c_name}")
self.add "{res} = type_{value.mtype.c_name}.name;"
end
return res
self.add("{res} = 0; /* incompatible types {value1.mtype} vs. {value2.mtype}*/")
else
var mtype1 = value1.mtype.as(MClassType)
+ self.require_declaration("class_{mtype1.c_name}")
self.add("{res} = ({value2} != NULL) && ({value2}->class == &class_{mtype1.c_name});")
self.add("if ({res}) \{")
self.add("{res} = ({self.autobox(value2, value1.mtype)} == {value1});")
fun native_array_instance(elttype: MType, length: RuntimeVariable): RuntimeVariable
do
var mtype = self.get_class("NativeArray").get_mtype([elttype])
+ self.require_declaration("NEW_{mtype.mclass.c_name}")
assert mtype isa MGenericType
var compiler = self.compiler
if mtype.need_anchor then
link_unresolved_type(self.frame.mpropdef.mclassdef, mtype)
var recv = self.frame.arguments.first
var recv_type_info = self.type_info(recv)
+ self.require_declaration(mtype.const_color)
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
return self.new_expr("NEW_{mtype.mclass.c_name}({length}, {recv_type_info}->resolution_table->types[HASH({recv_type_info}->resolution_table->mask, {mtype.const_color})])", mtype)
else
end
end
compiler.undead_types.add(mtype)
+ self.require_declaration("type_{mtype.c_name}")
return self.new_expr("NEW_{mtype.mclass.c_name}({length}, &type_{mtype.c_name})", mtype)
end
end
end
+redef class MMethodDef
+ fun separate_runtime_function: AbstractRuntimeFunction
+ do
+ var res = self.separate_runtime_function_cache
+ if res == null then
+ res = new SeparateRuntimeFunction(self)
+ self.separate_runtime_function_cache = res
+ end
+ return res
+ end
+ private var separate_runtime_function_cache: nullable SeparateRuntimeFunction
+
+ fun virtual_runtime_function: AbstractRuntimeFunction
+ do
+ var res = self.virtual_runtime_function_cache
+ if res == null then
+ res = new VirtualRuntimeFunction(self)
+ self.virtual_runtime_function_cache = res
+ end
+ return res
+ end
+ private var virtual_runtime_function_cache: nullable VirtualRuntimeFunction
+end
+
# The C function associated to a methoddef separately compiled
class SeparateRuntimeFunction
super AbstractRuntimeFunction
end
sig.append(self.c_name)
sig.append("({selfvar.mtype.ctype} {selfvar}")
- comment.append("(self: {selfvar}")
+ comment.append("({selfvar}: {selfvar.mtype}")
arguments.add(selfvar)
for i in [0..msignature.arity[ do
var mtype = msignature.mparameters[i].mtype
if ret != null then
comment.append(": {ret}")
end
- compiler.header.add_decl("{sig};")
+ compiler.provide_declaration(self.c_name, "{sig};")
v.add_decl("/* method {self} for {comment} */")
v.add_decl("{sig} \{")
end
sig.append(self.c_name)
sig.append("({selfvar.mtype.ctype} {selfvar}")
- comment.append("(self: {selfvar}")
+ comment.append("({selfvar}: {selfvar.mtype}")
arguments.add(selfvar)
for i in [0..msignature.arity[ do
var mtype = msignature.mparameters[i].mtype
if ret != null then
comment.append(": {ret}")
end
- compiler.header.add_decl("{sig};")
+ compiler.provide_declaration(self.c_name, "{sig};")
v.add_decl("/* method {self} for {comment} */")
v.add_decl("{sig} \{")
end
frame.returnlabel = v.get_name("RET_LABEL")
- if recv != arguments.first.mtype then
- #print "{self} {recv} {arguments.first}"
+ var subret = v.call(mmethoddef, recv, arguments)
+ if ret != null then
+ assert subret != null
+ v.assign(frame.returnvar.as(not null), subret)
end
- mmethoddef.compile_inside_to_c(v, arguments)
v.add("{frame.returnlabel.as(not null)}:;")
if ret != null then
nitlanguage / nit.git / blobdiff