# Separate compilation of a Nit program
module separate_compiler
+import abstract_compiler
+intrude import coloring
+import rapid_type_analysis
-import global_compiler # TODO better separation of concerns
-import coloring
-
+# Add separate compiler specific options
redef class ToolContext
# --separate
var opt_separate: OptionBool = new OptionBool("Use separate compilation", "--separate")
-
# --no-inline-intern
var opt_no_inline_intern: OptionBool = new OptionBool("Do not inline call to intern methods", "--no-inline-intern")
-
# --no-union-attribute
var opt_no_union_attribute: OptionBool = new OptionBool("Put primitive attibutes in a box instead of an union", "--no-union-attribute")
-
+ # --no-shortcut-equate
+ var opt_no_shortcut_equate: OptionBool = new OptionBool("Always call == in a polymorphic way", "--no-shortcut-equal")
# --inline-coloring-numbers
var opt_inline_coloring_numbers: OptionBool = new OptionBool("Inline colors and ids", "--inline-coloring-numbers")
-
# --use-naive-coloring
var opt_bm_typing: OptionBool = new OptionBool("Colorize items incrementaly, used to simulate binary matrix typing", "--bm-typing")
-
# --use-mod-perfect-hashing
var opt_phmod_typing: OptionBool = new OptionBool("Replace coloration by perfect hashing (with mod operator)", "--phmod-typing")
-
# --use-and-perfect-hashing
var opt_phand_typing: OptionBool = new OptionBool("Replace coloration by perfect hashing (with and operator)", "--phand-typing")
-
# --generic-resolution-tree
- var opt_generic_tree: OptionBool = new OptionBool("Use tree representation for live generic types instead of flattened representation", "--generic-resolution-tree")
+ var opt_typing_table_metrics: OptionBool = new OptionBool("Enable static size measuring of tables used for typing and resolution", "--typing-table-metrics")
redef init
do
self.option_context.add_option(self.opt_separate)
self.option_context.add_option(self.opt_no_inline_intern)
self.option_context.add_option(self.opt_no_union_attribute)
+ self.option_context.add_option(self.opt_no_shortcut_equate)
self.option_context.add_option(self.opt_inline_coloring_numbers)
self.option_context.add_option(self.opt_bm_typing)
self.option_context.add_option(self.opt_phmod_typing)
self.option_context.add_option(self.opt_phand_typing)
- self.option_context.add_option(self.opt_generic_tree)
+ self.option_context.add_option(self.opt_typing_table_metrics)
end
end
var time0 = get_time
self.toolcontext.info("*** COMPILING TO C ***", 1)
- var compiler = new SeparateCompiler(mainmodule, runtime_type_analysis, self)
+ var compiler = new SeparateCompiler(mainmodule, self, runtime_type_analysis)
compiler.compile_header
# compile class structures
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
# compile live & cast type structures
+ compiler.new_file
var mtypes = compiler.do_type_coloring
for t in mtypes do
compiler.compile_type_to_c(t)
end
- if self.toolcontext.opt_generic_tree.value then
- # compile live generic types selection structures
- for mclass in model.mclasses do
- compiler.compile_live_gentype_to_c(mclass)
- end
- end
+ compiler.display_stats
write_and_make(compiler)
end
# Singleton that store the knowledge about the separate compilation process
class SeparateCompiler
- super GlobalCompiler # TODO better separation of concerns
+ super AbstractCompiler
+
+ # Cache for classid
+ protected var classids: HashMap[MClassType, String] = new HashMap[MClassType, String]
+
+ # The result of the RTA (used to know live types and methods)
+ var runtime_type_analysis: RapidTypeAnalysis
private var undead_types: Set[MType] = new HashSet[MType]
private var partial_types: Set[MType] = new HashSet[MType]
- protected var typeids: HashMap[MType, Int] protected writable = new HashMap[MType, Int]
- private var type_colors: Map[MType, Int] = typeids
+ private var type_layout_builder: TypeLayoutBuilder
+ private var type_layout: nullable TypeLayout
private var type_tables: nullable Map[MType, Array[nullable MType]] = null
- private var livetypes_colors: nullable Map[MType, Int]
- private var livetypes_tables: nullable Map[MClass, Array[nullable Object]]
- private var livetypes_tables_sizes: nullable Map[MClass, Array[Int]]
private var live_unanchored_types: Map[MClassDef, Set[MType]] = new HashMap[MClassDef, HashSet[MType]]
private var unanchored_types_colors: nullable Map[MType, Int]
private var unanchored_types_tables: nullable Map[MClassType, Array[nullable MType]]
private var unanchored_types_masks: nullable Map[MClassType, Int]
- protected var class_coloring: ClassColoring
-
protected var method_colors: Map[MMethod, Int]
protected var method_tables: Map[MClass, Array[nullable MMethodDef]]
private var ft_tables: nullable Map[MClass, Array[nullable MParameterType]]
private var ft_masks: nullable Map[MClass, Int]
- init(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis, mmbuilder: ModelBuilder) do
+ init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
+ super
+ self.header = new_visitor
+ self.init_layout_builders
+ self.runtime_type_analysis = runtime_type_analysis
self.do_property_coloring
self.compile_box_kinds
end
+ protected fun init_layout_builders do
+ # Typing Layout
+ if modelbuilder.toolcontext.opt_bm_typing.value then
+ self.type_layout_builder = new BMTypeLayoutBuilder(self.mainmodule)
+ else if modelbuilder.toolcontext.opt_phmod_typing.value then
+ self.type_layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHModOperator)
+ self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
+ else if modelbuilder.toolcontext.opt_phand_typing.value then
+ self.type_layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHAndOperator)
+ self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
+ else
+ self.type_layout_builder = new CLTypeLayoutBuilder(self.mainmodule)
+ end
+ end
+
redef fun compile_header_structs do
self.header.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
self.compile_header_attribute_structs
self.header.add_decl("struct class \{ int box_kind; nitmethod_t vft[1]; \}; /* general C type representing a Nit class. */")
- if modelbuilder.toolcontext.opt_generic_tree.value then
- # With generic_tree, only ft and vt resolution is stored in the type
- self.header.add_decl("struct type \{ int id; const char *name; int color; short int is_nullable; int livecolor; struct types *vts_table; struct types *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
- else
- # With unanchored_table, all live type resolution are stored in a big table: unanchored_table
- self.header.add_decl("struct type \{ int id; const char *name; int color; short int is_nullable; struct types *unanchored_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
- end
+ # With unanchored_table, all live type resolution are stored in a big table: unanchored_table
+ self.header.add_decl("struct type \{ int id; const char *name; int color; short int is_nullable; struct types *unanchored_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
self.header.add_decl("struct types \{ int mask; struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
self.header.add_decl("struct types \{ struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
end
-
self.header.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
end
end
end
- redef fun compile_class_names do
- abort # There is no class name compilation since the name is stored in the type structure
- end
-
fun compile_box_kinds
do
# Collect all bas box class
fun do_property_coloring do
# classes coloration
- self.class_coloring = new ClassColoring(mainmodule)
- class_coloring.colorize(modelbuilder.model.mclasses)
+ var mclasses = new HashSet[MClass].from(modelbuilder.model.mclasses)
+ var class_coloring = new ClassColoring(mainmodule)
+ class_coloring.colorize(mclasses)
# methods coloration
- var method_coloring = new MethodColoring(self.class_coloring)
+ var method_coloring = new MethodColoring(class_coloring)
self.method_colors = method_coloring.colorize
self.method_tables = method_coloring.build_property_tables
self.compile_color_consts(self.method_colors)
# attributes coloration
- var attribute_coloring = new AttributeColoring(self.class_coloring)
+ var attribute_coloring = new AttributeColoring(class_coloring)
self.attr_colors = attribute_coloring.colorize
self.attr_tables = attribute_coloring.build_property_tables
self.compile_color_consts(self.attr_colors)
- if modelbuilder.toolcontext.opt_bm_typing.value then
- self.class_coloring = new NaiveClassColoring(mainmodule)
- self.class_coloring.colorize(modelbuilder.model.mclasses)
- end
-
# vt coloration
if modelbuilder.toolcontext.opt_bm_typing.value then
- var vt_coloring = new NaiveVTColoring(self.class_coloring)
+ var vt_coloring = new NaiveVTColoring(class_coloring)
self.vt_colors = vt_coloring.colorize
self.vt_tables = vt_coloring.build_property_tables
else if modelbuilder.toolcontext.opt_phmod_typing.value then
- var vt_coloring = new VTModPerfectHashing(self.class_coloring)
+ var vt_coloring = new VTModPerfectHashing(class_coloring)
self.vt_colors = vt_coloring.colorize
self.vt_masks = vt_coloring.compute_masks
self.vt_tables = vt_coloring.build_property_tables
else if modelbuilder.toolcontext.opt_phand_typing.value then
- var vt_coloring = new VTAndPerfectHashing(self.class_coloring)
+ var vt_coloring = new VTAndPerfectHashing(class_coloring)
self.vt_colors = vt_coloring.colorize
self.vt_masks = vt_coloring.compute_masks
self.vt_tables = vt_coloring.build_property_tables
else
- var vt_coloring = new VTColoring(self.class_coloring)
+ var vt_coloring = new VTColoring(class_coloring)
self.vt_colors = vt_coloring.colorize
self.vt_tables = vt_coloring.build_property_tables
end
end
mtypes.add_all(self.partial_types)
- # set type unique id
- if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
- var sorted_mtypes = new OrderedSet[MType].from(mtypes)
- sorted_mtypes.linearize(new ReverseTypeSorter(self.mainmodule))
- for mtype in sorted_mtypes do
- self.typeids[mtype] = self.typeids.length + 1
- end
- else
- for mtype in mtypes do
- self.typeids[mtype] = self.typeids.length
- end
- end
+ # VT and FT are stored with other unresolved types in the big unanchored_tables
+ self.compile_unanchored_tables(mtypes)
- if modelbuilder.toolcontext.opt_generic_tree.value then
- # fts coloration for non-erased compilation
- if modelbuilder.toolcontext.opt_bm_typing.value then
- var ft_coloring = new NaiveFTColoring(self.class_coloring)
- self.ft_colors = ft_coloring.colorize
- self.ft_tables = ft_coloring.build_ft_tables
- else if modelbuilder.toolcontext.opt_phmod_typing.value then
- var ft_coloring = new FTModPerfectHashing(self.class_coloring)
- self.ft_colors = ft_coloring.colorize
- self.ft_masks = ft_coloring.compute_masks
- self.ft_tables = ft_coloring.build_ft_tables
- else if modelbuilder.toolcontext.opt_phand_typing.value then
- var ft_coloring = new FTAndPerfectHashing(self.class_coloring)
- self.ft_colors = ft_coloring.colorize
- self.ft_masks = ft_coloring.compute_masks
- self.ft_tables = ft_coloring.build_ft_tables
- else
- var ft_coloring = new FTColoring(self.class_coloring)
- self.ft_colors = ft_coloring.colorize
- self.ft_tables = ft_coloring.build_ft_tables
- end
- self.compile_color_consts(self.ft_colors.as(not null))
+ # colorize types
+ self.type_layout = self.type_layout_builder.build_layout(mtypes)
+ self.type_tables = self.build_type_tables(mtypes)
+ return mtypes
+ end
- # colorize live entries
- var entries_coloring
- if modelbuilder.toolcontext.opt_bm_typing.value then
- entries_coloring = new NaiveLiveEntryColoring
- else
- entries_coloring = new LiveEntryColoring
+ # Build type tables
+ fun build_type_tables(mtypes: Set[MType]): Map[MType, Array[nullable MType]] do
+ var tables = new HashMap[MType, Array[nullable MType]]
+ var layout = self.type_layout
+ for mtype in mtypes do
+ var table = new Array[nullable MType]
+ var supers = new HashSet[MType]
+ supers.add_all(self.mainmodule.super_mtypes(mtype, mtypes))
+ supers.add(mtype)
+ for sup in supers do
+ var color: Int
+ if layout isa PHTypeLayout then
+ color = layout.hashes[mtype][sup]
+ else
+ color = layout.pos[sup]
+ end
+ if table.length <= color then
+ for i in [table.length .. color[ do
+ table[i] = null
+ end
+ end
+ table[color] = sup
end
- self.livetypes_colors = entries_coloring.colorize(mtypes)
- self.livetypes_tables = entries_coloring.build_livetype_tables(mtypes)
- self.livetypes_tables_sizes = entries_coloring.livetypes_tables_sizes
- else
- # VT and FT are stored with other unresolved types in the big unanchored_tables
- self.compile_unanchored_tables(mtypes)
- end
-
- # colorize types
- if modelbuilder.toolcontext.opt_bm_typing.value then
- var type_coloring = new NaiveTypeColoring(self.mainmodule, mtypes)
- self.type_colors = type_coloring.colorize(mtypes)
- self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
- else if modelbuilder.toolcontext.opt_phmod_typing.value then
- var type_coloring = new TypeModPerfectHashing(self.mainmodule, mtypes)
- self.type_colors = type_coloring.compute_masks(mtypes, typeids)
- self.type_tables = type_coloring.hash_type_tables(mtypes, typeids, type_colors)
- self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
- else if modelbuilder.toolcontext.opt_phand_typing.value then
- var type_coloring = new TypeAndPerfectHashing(self.mainmodule, mtypes)
- self.type_colors = type_coloring.compute_masks(mtypes, typeids)
- self.type_tables = type_coloring.hash_type_tables(mtypes, typeids, type_colors)
- self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
- else
- var type_coloring = new TypeColoring(self.mainmodule, mtypes)
- self.type_colors = type_coloring.colorize(mtypes)
- self.type_tables = type_coloring.build_type_tables(mtypes, type_colors)
+ tables[mtype] = table
end
-
-
- return mtypes
+ return tables
end
protected fun compile_unanchored_tables(mtypes: Set[MType]) do
end
end
- # declare live generic types tables selection
- private fun compile_live_gentype_to_c(mclass: MClass) do
- if mclass.arity > 0 then
- if self.livetypes_tables.has_key(mclass) then
- var table = self.livetypes_tables[mclass]
- var sign = self.livetypes_tables_sizes[mclass]
- var table_buffer = new Buffer.from("const struct type *livetypes_{mclass.c_name}[{sign.join("][")}] = \{\n")
- compile_livetype_table(table, table_buffer, 1, mclass.arity)
- table_buffer.append("\};")
-
- var v = new SeparateCompilerVisitor(self)
- self.header.add_decl("extern const struct type *livetypes_{mclass.c_name}[{sign.join("][")}];")
- v.add_decl(table_buffer.to_s)
- else
- var sign = new Array[Int].filled_with(0, mclass.arity)
- var v = new SeparateCompilerVisitor(self)
- self.header.add_decl("extern const struct type *livetypes_{mclass.c_name}[{sign.join("][")}];")
- v.add_decl("const struct type *livetypes_{mclass.c_name}[{sign.join("][")}];")
- end
- end
- end
-
- private fun compile_livetype_table(table: Array[nullable Object], buffer: Buffer, depth: Int, max: Int) do
- for obj in table do
- if obj == null then
- if depth == max then
- buffer.append("NULL,\n")
- else
- buffer.append("\{\},\n")
- end
- else if obj isa MClassType then
- buffer.append("(struct type*) &type_{obj.c_name}, /* {obj} */\n")
- else if obj isa Array[nullable Object] then
- buffer.append("\{\n")
- compile_livetype_table(obj, buffer, depth + 1, max)
- buffer.append("\},\n")
- end
- end
- end
-
# Separately compile all the method definitions of the module
fun compile_module_to_c(mmodule: MModule)
do
self.header.add_decl("const char *name;")
self.header.add_decl("int color;")
self.header.add_decl("short int is_nullable;")
- if modelbuilder.toolcontext.opt_generic_tree.value then
- self.header.add_decl("int livecolor;")
- self.header.add_decl("const struct vts_table_{c_name} *vts_table;")
- self.header.add_decl("const struct fts_table_{c_name} *fts_table;")
- else
- self.header.add_decl("const struct types *unanchored_table;")
- end
+ self.header.add_decl("const struct types *unanchored_table;")
self.header.add_decl("int table_size;")
self.header.add_decl("int type_table[{self.type_tables[mtype].length}];")
self.header.add_decl("\};")
# const struct type_X
v.add_decl("const struct type_{c_name} type_{c_name} = \{")
- v.add_decl("{self.typeids[mtype]},")
+ v.add_decl("{self.type_layout.ids[mtype]},")
v.add_decl("\"{mtype}\", /* class_name_string */")
- v.add_decl("{self.type_colors[mtype]},")
+ var layout = self.type_layout
+ if layout isa PHTypeLayout then
+ v.add_decl("{layout.masks[mtype]},")
+ else
+ v.add_decl("{layout.pos[mtype]},")
+ end
if mtype isa MNullableType then
v.add_decl("1,")
else
v.add_decl("0,")
end
- if modelbuilder.toolcontext.opt_generic_tree.value then
- v.add_decl("{self.livetypes_colors[mtype]},")
- if compile_type_vts_table(mtype) then
- v.add_decl("&vts_table_{c_name},")
- else
- v.add_decl("NULL,")
- end
- if compile_type_fts_table(mtype) then
- v.add_decl("&fts_table_{c_name},")
- else
- v.add_decl("NULL,")
- end
+ if compile_type_unanchored_table(mtype) then
+ v.add_decl("(struct types*) &unanchored_table_{c_name},")
else
- if compile_type_unanchored_table(mtype) then
- v.add_decl("(struct types*) &unanchored_table_{c_name},")
- else
- v.add_decl("NULL,")
- end
+ v.add_decl("NULL,")
end
v.add_decl("{self.type_tables[mtype].length},")
v.add_decl("\{")
if stype == null then
v.add_decl("-1, /* empty */")
else
- v.add_decl("{self.typeids[stype]}, /* {stype} */")
+ v.add_decl("{self.type_layout.ids[stype]}, /* {stype} */")
end
end
v.add_decl("\},")
else
ntype = ft.anchor_to(self.mainmodule, mclass_type)
end
- if self.typeids.has_key(ntype) then
+ if self.type_layout.ids.has_key(ntype) then
v.add_decl("(struct type*)&type_{ntype.c_name}, /* {ft} ({ntype}) */")
else
v.add_decl("NULL, /* empty ({ft} not a live type) */")
abort
end
- if self.typeids.has_key(bound) then
+ if self.type_layout.ids.has_key(bound) then
v.add_decl("(struct type*)&type_{is_nullable}{bound.c_name}, /* {bound} */")
else
v.add_decl("NULL, /* dead type {bound} */")
# the value stored is tv.
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.typeids.has_key(tv) then
+ if self.type_layout.ids.has_key(tv) then
v.add_decl("(struct type*)&type_{tv.c_name}, /* {t}: {tv} */")
else
v.add_decl("NULL, /* empty ({t}: {tv} not a live type) */")
end
redef fun new_visitor do return new SeparateCompilerVisitor(self)
-end
-# The C function associated to a methoddef separately compiled
-class SeparateRuntimeFunction
- super AbstractRuntimeFunction
+ # Stats
- redef fun build_c_name: String
- do
- return "{mmethoddef.c_name}"
- end
-
- redef fun to_s do return self.mmethoddef.to_s
-
- redef fun compile_to_c(compiler)
+ redef fun display_stats
do
- var mmethoddef = self.mmethoddef
-
- var recv = self.mmethoddef.mclassdef.bound_mtype
- var v = compiler.new_visitor
- var selfvar = new RuntimeVariable("self", recv, recv)
- var arguments = new Array[RuntimeVariable]
- var frame = new Frame(v, mmethoddef, recv, arguments)
- v.frame = frame
-
- var msignature = mmethoddef.msignature.resolve_for(mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.mmodule, true)
-
- var sig = new Buffer
- var comment = new Buffer
- var ret = msignature.return_mtype
- if ret != null then
- sig.append("{ret.ctype} ")
- else if mmethoddef.mproperty.is_new then
- ret = recv
- sig.append("{ret.ctype} ")
- else
- sig.append("void ")
- end
- sig.append(self.c_name)
- sig.append("({selfvar.mtype.ctype} {selfvar}")
- comment.append("(self: {selfvar}")
- arguments.add(selfvar)
- for i in [0..msignature.arity[ do
- var mtype = msignature.mparameters[i].mtype
- if i == msignature.vararg_rank then
- mtype = v.get_class("Array").get_mtype([mtype])
- end
- comment.append(", {mtype}")
- sig.append(", {mtype.ctype} p{i}")
- var argvar = new RuntimeVariable("p{i}", mtype, mtype)
- arguments.add(argvar)
- end
- sig.append(")")
- comment.append(")")
- if ret != null then
- comment.append(": {ret}")
- end
- compiler.header.add_decl("{sig};")
-
- v.add_decl("/* method {self} for {comment} */")
- v.add_decl("{sig} \{")
- if ret != null then
- frame.returnvar = v.new_var(ret)
- end
- frame.returnlabel = v.get_name("RET_LABEL")
-
- if recv != arguments.first.mtype then
- #print "{self} {recv} {arguments.first}"
- end
- mmethoddef.compile_inside_to_c(v, arguments)
-
- v.add("{frame.returnlabel.as(not null)}:;")
- if ret != null then
- v.add("return {frame.returnvar.as(not null)};")
+ super
+ if self.modelbuilder.toolcontext.opt_typing_table_metrics.value then
+ display_sizes
end
- v.add("\}")
- end
-end
-
-# The C function associated to a methoddef on a primitive type, stored into a VFT of a class
-# The first parameter (the reciever) is always typed by val* in order to accept an object value
-class VirtualRuntimeFunction
- super AbstractRuntimeFunction
-
- redef fun build_c_name: String
- do
- return "VIRTUAL_{mmethoddef.c_name}"
end
- redef fun to_s do return self.mmethoddef.to_s
-
- redef fun compile_to_c(compiler)
+ fun display_sizes
do
- var mmethoddef = self.mmethoddef
-
- var recv = self.mmethoddef.mclassdef.bound_mtype
- var v = compiler.new_visitor
- var selfvar = new RuntimeVariable("self", v.object_type, recv)
- var arguments = new Array[RuntimeVariable]
- var frame = new Frame(v, mmethoddef, recv, arguments)
- v.frame = frame
-
- var sig = new Buffer
- var comment = new Buffer
-
- # Because the function is virtual, the signature must match the one of the original class
- var intromclassdef = self.mmethoddef.mproperty.intro.mclassdef
- var msignature = mmethoddef.mproperty.intro.msignature.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
- var ret = msignature.return_mtype
- if ret != null then
- sig.append("{ret.ctype} ")
- else if mmethoddef.mproperty.is_new then
- ret = recv
- sig.append("{ret.ctype} ")
- else
- sig.append("void ")
- end
- sig.append(self.c_name)
- sig.append("({selfvar.mtype.ctype} {selfvar}")
- comment.append("(self: {selfvar}")
- arguments.add(selfvar)
- for i in [0..msignature.arity[ do
- var mtype = msignature.mparameters[i].mtype
- if i == msignature.vararg_rank then
- mtype = v.get_class("Array").get_mtype([mtype])
+ print "# size of tables"
+ print "\trs size\trs hole\tst size\tst hole"
+ var rt_table = 0
+ var rt_holes = 0
+ var st_table = 0
+ var st_holes = 0
+ var rtables = unanchored_types_tables
+ if rtables != null then
+ for unanch, table in rtables do
+ rt_table += table.length
+ for e in table do if e == null then rt_holes += 1
end
- comment.append(", {mtype}")
- sig.append(", {mtype.ctype} p{i}")
- var argvar = new RuntimeVariable("p{i}", mtype, mtype)
- arguments.add(argvar)
end
- sig.append(")")
- comment.append(")")
- if ret != null then
- comment.append(": {ret}")
- end
- compiler.header.add_decl("{sig};")
- v.add_decl("/* method {self} for {comment} */")
- v.add_decl("{sig} \{")
- if ret != null then
- frame.returnvar = v.new_var(ret)
- end
- frame.returnlabel = v.get_name("RET_LABEL")
-
- if recv != arguments.first.mtype then
- #print "{self} {recv} {arguments.first}"
- end
- mmethoddef.compile_inside_to_c(v, arguments)
-
- v.add("{frame.returnlabel.as(not null)}:;")
- if ret != null then
- v.add("return {frame.returnvar.as(not null)};")
+ var ttables = type_tables
+ if ttables != null then
+ for t, table in ttables do
+ st_table += table.length
+ for e in table do if e == null then st_holes += 1
+ end
end
- v.add("\}")
- end
-
- redef fun call(v, arguments)
- do
- abort
- # TODO ?
+ print "\t{rt_table}\t{rt_holes}\t{st_table}\t{st_holes}"
end
end
# A visitor on the AST of property definition that generate the C code of a separate compilation process.
class SeparateCompilerVisitor
- super GlobalCompilerVisitor # TODO better separation of concerns
+ super AbstractCompilerVisitor
- redef fun adapt_signature(m: MMethodDef, args: Array[RuntimeVariable])
+ redef type COMPILER: SeparateCompiler
+
+ redef fun adapt_signature(m, args)
do
var msignature = m.msignature.resolve_for(m.mclassdef.bound_mtype, m.mclassdef.bound_mtype, m.mclassdef.mmodule, true)
var recv = args.first
end
end
- # Box or unbox a value to another type iff a C type conversion is needed
- # ENSURE: result.mtype.ctype == mtype.ctype
- redef fun autobox(value: RuntimeVariable, mtype: MType): RuntimeVariable
+ redef fun autobox(value, mtype)
do
if value.mtype == mtype then
return value
end
self.add("\} else \{")
end
+ if not self.compiler.modelbuilder.toolcontext.opt_no_shortcut_equate.value and (mmethod.name == "==" or mmethod.name == "!=") then
+ assert res != null
+ # Recv is not null, thus is arg is, it is easy to conclude (and respect the invariants)
+ var arg = arguments[1]
+ if arg.mcasttype isa MNullType then
+ if mmethod.name == "==" then
+ self.add("{res} = 0; /* arg is null but recv is not */")
+ else
+ self.add("{res} = 1; /* arg is null and recv is not */")
+ end
+ if maybenull then
+ self.add("\}")
+ end
+ return res
+ end
+ end
var r
if ret == null then r = "void" else r = ret.ctype
end
# Build livetype structure retrieving
- #ENSURE: mtype.need_anchor
+ # ENSURE: mtype.need_anchor
fun retrieve_anchored_livetype(mtype: MGenericType, buffer: Buffer) do
assert mtype.need_anchor
- var compiler = self.compiler.as(SeparateCompiler)
+ var compiler = self.compiler
for ft in mtype.arguments do
var ntype = ft
redef fun init_instance(mtype)
do
- var compiler = self.compiler.as(SeparateCompiler)
+ var compiler = self.compiler
if mtype isa MGenericType and mtype.need_anchor then
- if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
- var buff = new Buffer
- retrieve_anchored_livetype(mtype, buff)
- mtype = self.anchor(mtype).as(MClassType)
- return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+ link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
+ var recv = self.frame.arguments.first
+ var recv_type_info = self.type_info(recv)
+ 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}((struct type *) {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {mtype.const_color})])", mtype)
else
- link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
- var recv = self.frame.arguments.first
- var recv_type_info = self.type_info(recv)
- 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}((struct type *) {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {mtype.const_color})])", mtype)
- else
- return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
- end
+ return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
end
end
compiler.undead_types.add(mtype)
self.add("CHECK_NEW_{mtype.mclass.c_name}({value});")
end
-
- redef fun type_test(value, mtype)
+ redef fun type_test(value, mtype, tag)
do
self.add("/* {value.inspect} isa {mtype} */")
- var compiler = self.compiler.as(SeparateCompiler)
+ var compiler = self.compiler
var recv = self.frame.arguments.first
var recv_type_info = self.type_info(recv)
self.add_decl("int {cltype};")
var idtype = self.get_name("idtype")
self.add_decl("int {idtype};")
- var is_nullable = self.get_name("is_nullable")
- self.add_decl("short int {is_nullable};")
+ var maybe_null = self.maybe_null(value)
+ var accept_null = "0"
var ntype = mtype
if ntype isa MNullableType then
ntype = ntype.mtype
+ accept_null = "1"
+ end
+
+ 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
if ntype.need_anchor then
var type_struct = self.get_name("type_struct")
self.add_decl("struct type* {type_struct};")
- # For unresolved types, there is two implementations
- if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
- # Either with the generic_tree and the construction of a type
- if ntype isa MParameterType then
- if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- self.add("{type_struct} = {recv_type_info}->fts_table->types[HASH({recv_type_info}->fts_table->mask, {ntype.const_color})];")
- else
- self.add("{type_struct} = {recv_type_info}->fts_table->types[{ntype.const_color}];")
- end
- else if ntype isa MVirtualType then
- var vtcolor = ntype.mproperty.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}->vts_table->types[HASH({recv_type_info}->vts_table->mask, {vtcolor})];")
- else
- self.add("{type_struct} = {recv_type_info}->vts_table->types[{vtcolor}];")
- end
- else if ntype isa MGenericType then
- var buff = new Buffer
- retrieve_anchored_livetype(ntype, buff)
- self.add("{type_struct} = (struct type*)livetypes_{ntype.mclass.c_name}{buff.to_s};")
- end
+ # Either with unanchored_table with a direct resolution
+ link_unanchored_type(self.frame.mpropdef.mclassdef, ntype)
+ if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
+ self.add("{type_struct} = {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {ntype.const_color})];")
else
- # Either with unanchored_table with a direct resolution
- link_unanchored_type(self.frame.mpropdef.mclassdef, ntype)
- if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- self.add("{type_struct} = {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {ntype.const_color})];")
- else
- self.add("{type_struct} = {recv_type_info}->unanchored_table->types[{ntype.const_color}];")
- end
+ self.add("{type_struct} = {recv_type_info}->unanchored_table->types[{ntype.const_color}];")
+ 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
self.add("{cltype} = {type_struct}->color;")
self.add("{idtype} = {type_struct}->id;")
- self.add("{is_nullable} = {type_struct}->is_nullable;")
+ if maybe_null and accept_null == "0" then
+ var is_nullable = self.get_name("is_nullable")
+ self.add_decl("short int {is_nullable};")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
+ accept_null = is_nullable.to_s
+ end
else if ntype isa MClassType then
compiler.undead_types.add(mtype)
self.add("{cltype} = type_{mtype.c_name}.color;")
self.add("{idtype} = type_{mtype.c_name}.id;")
- self.add("{is_nullable} = type_{mtype.c_name}.is_nullable;")
+ 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
self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{value.inspect}\"); exit(1);")
end
- if mtype isa MNullableType then
- self.add("{is_nullable} = 1;")
- end
-
# check color is in table
- if self.maybe_null(value) then
+ if maybe_null then
self.add("if({value} == NULL) \{")
- self.add("{res} = {is_nullable};")
+ self.add("{res} = {accept_null};")
self.add("\} else \{")
end
var value_type_info = self.type_info(value)
self.add("\} else \{")
self.add("{res} = {value_type_info}->type_table[{cltype}] == {idtype};")
self.add("\}")
- if self.maybe_null(value) then
+ if maybe_null then
self.add("\}")
end
else if can_be_primitive(value1) and can_be_primitive(value2) then
test.add("{value1}->class == {value2}->class")
var s = new Array[String]
- for t, v in self.compiler.as(SeparateCompiler).box_kinds do
+ for t, v in self.compiler.box_kinds do
s.add "({value1}->class->box_kind == {v} && ((struct instance_{t.c_name}*){value1})->value == ((struct instance_{t.c_name}*){value2})->value)"
end
test.add("({s.join(" || ")})")
do
var mtype = self.get_class("NativeArray").get_mtype([elttype])
assert mtype isa MGenericType
- var compiler = self.compiler.as(SeparateCompiler)
+ var compiler = self.compiler
if mtype.need_anchor then
- if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
- var buff = new Buffer
- retrieve_anchored_livetype(mtype, buff)
- mtype = self.anchor(mtype).as(MClassType)
- return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) livetypes_{mtype.mclass.c_name}{buff.to_s})", mtype)
+ link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
+ var recv = self.frame.arguments.first
+ var recv_type_info = self.type_info(recv)
+ 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}, (struct type *) {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {mtype.const_color})])", mtype)
else
- link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
- var recv = self.frame.arguments.first
- var recv_type_info = self.type_info(recv)
- 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}, (struct type *) {recv_type_info}->unanchored_table->types[HASH({recv_type_info}->unanchored_table->mask, {mtype.const_color})])", mtype)
- else
- return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
- end
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
end
end
compiler.undead_types.add(mtype)
fun link_unanchored_type(mclassdef: MClassDef, mtype: MType) do
assert mtype.need_anchor
- var compiler = self.compiler.as(SeparateCompiler)
+ var compiler = self.compiler
if not compiler.live_unanchored_types.has_key(self.frame.mpropdef.mclassdef) then
compiler.live_unanchored_types[self.frame.mpropdef.mclassdef] = new HashSet[MType]
end
end
end
-redef class MClass
- # Return the name of the C structure associated to a Nit class
- fun c_name: String do
- var res = self.c_name_cache
- if res != null then return res
- res = "{intro_mmodule.name.to_cmangle}__{name.to_cmangle}"
- self.c_name_cache = res
- return res
- end
- private var c_name_cache: nullable String
-end
+# The C function associated to a methoddef separately compiled
+class SeparateRuntimeFunction
+ super AbstractRuntimeFunction
-redef class MType
- fun const_color: String do return "COLOR_{c_name}"
-end
+ redef fun build_c_name: String do return "{mmethoddef.c_name}"
-redef class MParameterType
- redef fun c_name
+ redef fun to_s do return self.mmethoddef.to_s
+
+ redef fun compile_to_c(compiler)
do
- var res = self.c_name_cache
- if res != null then return res
- res = "{self.mclass.c_name}_FT{self.rank}"
- self.c_name_cache = res
- return res
+ var mmethoddef = self.mmethoddef
+
+ var recv = self.mmethoddef.mclassdef.bound_mtype
+ var v = compiler.new_visitor
+ var selfvar = new RuntimeVariable("self", recv, recv)
+ var arguments = new Array[RuntimeVariable]
+ var frame = new Frame(v, mmethoddef, recv, arguments)
+ v.frame = frame
+
+ var msignature = mmethoddef.msignature.resolve_for(mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.bound_mtype, mmethoddef.mclassdef.mmodule, true)
+
+ var sig = new Buffer
+ var comment = new Buffer
+ var ret = msignature.return_mtype
+ if ret != null then
+ sig.append("{ret.ctype} ")
+ else if mmethoddef.mproperty.is_new then
+ ret = recv
+ sig.append("{ret.ctype} ")
+ else
+ sig.append("void ")
+ end
+ sig.append(self.c_name)
+ sig.append("({selfvar.mtype.ctype} {selfvar}")
+ comment.append("(self: {selfvar}")
+ arguments.add(selfvar)
+ for i in [0..msignature.arity[ do
+ var mtype = msignature.mparameters[i].mtype
+ if i == msignature.vararg_rank then
+ mtype = v.get_class("Array").get_mtype([mtype])
+ end
+ comment.append(", {mtype}")
+ sig.append(", {mtype.ctype} p{i}")
+ var argvar = new RuntimeVariable("p{i}", mtype, mtype)
+ arguments.add(argvar)
+ end
+ sig.append(")")
+ comment.append(")")
+ if ret != null then
+ comment.append(": {ret}")
+ end
+ compiler.header.add_decl("{sig};")
+
+ v.add_decl("/* method {self} for {comment} */")
+ v.add_decl("{sig} \{")
+ if ret != null then
+ frame.returnvar = v.new_var(ret)
+ end
+ frame.returnlabel = v.get_name("RET_LABEL")
+
+ if recv != arguments.first.mtype then
+ #print "{self} {recv} {arguments.first}"
+ end
+ mmethoddef.compile_inside_to_c(v, arguments)
+
+ v.add("{frame.returnlabel.as(not null)}:;")
+ if ret != null then
+ v.add("return {frame.returnvar.as(not null)};")
+ end
+ v.add("\}")
end
end
-redef class MVirtualType
- redef fun c_name
+# The C function associated to a methoddef on a primitive type, stored into a VFT of a class
+# The first parameter (the reciever) is always typed by val* in order to accept an object value
+class VirtualRuntimeFunction
+ super AbstractRuntimeFunction
+
+ redef fun build_c_name: String do return "VIRTUAL_{mmethoddef.c_name}"
+
+ redef fun to_s do return self.mmethoddef.to_s
+
+ redef fun compile_to_c(compiler)
do
- var res = self.c_name_cache
- if res != null then return res
- res = "{self.mproperty.intro.mclassdef.mclass.c_name}_VT{self.mproperty.name}"
- self.c_name_cache = res
- return res
+ var mmethoddef = self.mmethoddef
+
+ var recv = self.mmethoddef.mclassdef.bound_mtype
+ var v = compiler.new_visitor
+ var selfvar = new RuntimeVariable("self", v.object_type, recv)
+ var arguments = new Array[RuntimeVariable]
+ var frame = new Frame(v, mmethoddef, recv, arguments)
+ v.frame = frame
+
+ var sig = new Buffer
+ var comment = new Buffer
+
+ # Because the function is virtual, the signature must match the one of the original class
+ var intromclassdef = self.mmethoddef.mproperty.intro.mclassdef
+ var msignature = mmethoddef.mproperty.intro.msignature.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
+ var ret = msignature.return_mtype
+ if ret != null then
+ sig.append("{ret.ctype} ")
+ else if mmethoddef.mproperty.is_new then
+ ret = recv
+ sig.append("{ret.ctype} ")
+ else
+ sig.append("void ")
+ end
+ sig.append(self.c_name)
+ sig.append("({selfvar.mtype.ctype} {selfvar}")
+ comment.append("(self: {selfvar}")
+ arguments.add(selfvar)
+ for i in [0..msignature.arity[ do
+ var mtype = msignature.mparameters[i].mtype
+ if i == msignature.vararg_rank then
+ mtype = v.get_class("Array").get_mtype([mtype])
+ end
+ comment.append(", {mtype}")
+ sig.append(", {mtype.ctype} p{i}")
+ var argvar = new RuntimeVariable("p{i}", mtype, mtype)
+ arguments.add(argvar)
+ end
+ sig.append(")")
+ comment.append(")")
+ if ret != null then
+ comment.append(": {ret}")
+ end
+ compiler.header.add_decl("{sig};")
+
+ v.add_decl("/* method {self} for {comment} */")
+ v.add_decl("{sig} \{")
+ if ret != null then
+ frame.returnvar = v.new_var(ret)
+ end
+ frame.returnlabel = v.get_name("RET_LABEL")
+
+ if recv != arguments.first.mtype then
+ #print "{self} {recv} {arguments.first}"
+ end
+ mmethoddef.compile_inside_to_c(v, arguments)
+
+ v.add("{frame.returnlabel.as(not null)}:;")
+ if ret != null then
+ v.add("return {frame.returnvar.as(not null)};")
+ end
+ v.add("\}")
end
+
+ # TODO ?
+ redef fun call(v, arguments) do abort
end
-redef class MNullableType
- redef fun c_name
- do
- var res = self.c_name_cache
- if res != null then return res
- res = "nullable_{self.mtype.c_name}"
- self.c_name_cache = res
- return res
- end
+redef class MType
+ fun const_color: String do return "COLOR_{c_name}"
end
redef class MProperty
- fun c_name: String do
- var res = self.c_name_cache
- if res != null then return res
- res = "{self.intro.c_name}"
- self.c_name_cache = res
- return res
- end
- private var c_name_cache: nullable String
-
fun const_color: String do return "COLOR_{c_name}"
end
nitlanguage / nit.git / blobdiff