# --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")
super
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.toolcontext.info("*** COMPILING TO C ***", 1)
var compiler = new SeparateCompiler(mainmodule, runtime_type_analysis, self)
+ compiler.compile_header
# compile class structures
for m in mainmodule.in_importation.greaters do
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
end
+ compiler.display_stats
+
write_and_make(compiler)
end
end
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[MClassType, Int]
- private var unanchored_types_tables: nullable Map[MClassType, Array[nullable MClassType]]
+ 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
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.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
- self.header.add_decl("struct type \{ int id; int color; short int is_nullable; int livecolor; struct vts_table *vts_table; struct fts_table *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
+ # 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
- self.header.add_decl("struct type \{ int id; int color; short int is_nullable; struct unanchored_table *unanchored_table; struct vts_table *vts_table; struct fts_table *fts_table; int table_size; int type_table[1]; \}; /* general C type representing a Nit type. */")
+ # 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
if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
- self.header.add_decl("struct fts_table \{ int mask; struct type *fts[1]; \}; /* fts list of a C type representation. */")
- self.header.add_decl("struct vts_table \{ int mask; struct type *vts[1]; \}; /* vts list of a C type representation. */")
- self.header.add_decl("struct unanchored_table \{ int mask; struct type *types[1]; \}; /* unanchored type list of a C type representation. */")
+ self.header.add_decl("struct types \{ int mask; struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
else
- self.header.add_decl("struct fts_table \{ struct type *fts[1]; \}; /* fts list of a C type representation. */")
- self.header.add_decl("struct vts_table \{ struct type *vts[1]; \}; /* vts list of a C type representation. */")
- self.header.add_decl("struct unanchored_table \{ struct type *types[1]; \}; /* unanchored type list of a C type representation. */")
+ 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
- redef fun compile_class_names do
- # Build type names table
- var type_array = new Array[nullable MType]
- for t, id in typeids do
- if id >= type_array.length then
- for i in [type_array.length..id[ do
- type_array[i] = null
- end
+ fun compile_header_attribute_structs
+ do
+ if modelbuilder.toolcontext.opt_no_union_attribute.value then
+ self.header.add_decl("typedef void* nitattribute_t; /* general C type representing a Nit attribute. */")
+ else
+ self.header.add_decl("typedef union \{")
+ self.header.add_decl("void* val;")
+ for c, v in self.box_kinds do
+ var t = c.mclass_type
+ self.header.add_decl("{t.ctype} {t.ctypename};")
end
- type_array[id] = t
+ self.header.add_decl("\} nitattribute_t; /* general C type representing a Nit attribute. */")
end
+ end
- var v = self.new_visitor
- self.header.add_decl("extern const char const * class_names[];")
- v.add("const char const * class_names[] = \{")
- for t in type_array do
- if t == null then
- v.add("NULL,")
- else
- v.add("\"{t}\",")
- end
- end
- v.add("\};")
+ 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
mtypes.add_all(self.runtime_type_analysis.live_types)
mtypes.add_all(self.runtime_type_analysis.live_cast_types)
mtypes.add_all(self.undead_types)
+ for c in self.box_kinds.keys do
+ mtypes.add(c.mclass_type)
+ end
for mtype in mtypes do
retieve_live_partial_types(mtype)
end
end
- # 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))
-
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 live entries
var entries_coloring
if modelbuilder.toolcontext.opt_bm_typing.value then
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
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("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
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("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 type_coloring = new TypeColoring(self.mainmodule, mtypes)
self.type_colors = type_coloring.colorize(mtypes)
end
- # for the class_name and output_class_name methods
- self.compile_class_names
-
return mtypes
end
protected fun compile_unanchored_tables(mtypes: Set[MType]) do
- var mtype2anchored = new HashMap[MClassType, Set[MClassType]]
+ # Unanchored_tables is used to perform a type resolution at runtime in O(1)
+ # During the visit of the body of classes, live_unanchored_types are collected
+ # and associated to
+ # Collect all live_unanchored_types (visited in the body of classes)
+
+ # Determinate fo each livetype what are its possible requested anchored types
+ var mtype2unanchored = new HashMap[MClassType, Set[MType]]
for mtype in self.runtime_type_analysis.live_types do
+ var set = new HashSet[MType]
for cd in mtype.collect_mclassdefs(self.mainmodule) do
if self.live_unanchored_types.has_key(cd) then
- if not mtype2anchored.has_key(mtype) then
- mtype2anchored[mtype] = new HashSet[MClassType]
- end
- for unanchored in self.live_unanchored_types[cd] do
- var anchored = unanchored.anchor_to(self.mainmodule, mtype)
- if anchored isa MClassType then
- mtype2anchored[mtype].add(anchored)
- else if anchored isa MNullableType then
- mtype2anchored[mtype].add(anchored.mtype.as(MClassType))
- else
- print "NOT YET IMPLEMENTED: try compile_unanchored_tables with {unanchored}"
- end
- end
+ set.add_all(self.live_unanchored_types[cd])
end
end
+ mtype2unanchored[mtype] = set
end
+ # Compute the table layout with the prefered method
if modelbuilder.toolcontext.opt_bm_typing.value then
var unanchored_type_coloring = new NaiveUnanchoredTypeColoring
- self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
- self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2unanchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2unanchored)
else if modelbuilder.toolcontext.opt_phmod_typing.value then
var unanchored_type_coloring = new UnanchoredTypeModPerfectHashing
- self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
- self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2anchored)
- self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2unanchored)
+ self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2unanchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2unanchored)
else if modelbuilder.toolcontext.opt_phand_typing.value then
var unanchored_type_coloring = new UnanchoredTypeAndPerfectHashing
- self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
- self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2anchored)
- self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2unanchored)
+ self.unanchored_types_masks = unanchored_type_coloring.compute_masks(mtype2unanchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2unanchored)
else
var unanchored_type_coloring = new UnanchoredTypeColoring
- self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2anchored)
- self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2anchored)
+ self.unanchored_types_colors = unanchored_type_coloring.colorize(mtype2unanchored)
+ self.unanchored_types_tables = unanchored_type_coloring.build_tables(mtype2unanchored)
end
- var unanchored_mtypes = new HashMap[MType, Int]
- for mclass in modelbuilder.model.mclasses do
- var mtype = mclass.mclass_type
- if unanchored_types_colors.has_key(mtype) then
- unanchored_mtypes[mtype] = unanchored_types_colors[mtype]
+ # Compile a C constant for each collected unanchored type.
+ # Either to a color, or to -1 if the unanchored type is dead (no live receiver can require it)
+ var all_unanchored = new HashSet[MType]
+ for t in self.live_unanchored_types.values do
+ all_unanchored.add_all(t)
+ end
+ var all_unanchored_types_colors = new HashMap[MType, Int]
+ for t in all_unanchored do
+ if unanchored_types_colors.has_key(t) then
+ all_unanchored_types_colors[t] = unanchored_types_colors[t]
else
- unanchored_mtypes[mtype] = -1
+ all_unanchored_types_colors[t] = -1
end
end
- for mtype, color in unanchored_types_colors.as(not null) do
- unanchored_mtypes[mtype] = color
- end
- self.compile_color_consts(unanchored_mtypes)
+ self.compile_color_consts(all_unanchored_types_colors)
#print "tables"
#for k, v in unanchored_types_tables.as(not null) do
# Separately compile all the method definitions of the module
fun compile_module_to_c(mmodule: MModule)
do
+ var old_module = self.mainmodule
+ self.mainmodule = mmodule
for cd in mmodule.mclassdefs do
for pd in cd.mpropdefs do
if not pd isa MMethodDef then continue
end
end
end
+ self.mainmodule = old_module
end
# Globaly compile the type structure of a live type
self.header.add_decl("extern const struct type_{c_name} type_{c_name};")
self.header.add_decl("struct type_{c_name} \{")
self.header.add_decl("int id;")
+ 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 unanchored_table_{c_name} *types;")
+ self.header.add_decl("const struct types *unanchored_table;")
end
- self.header.add_decl("const struct vts_table_{c_name} *vts_table;")
- self.header.add_decl("const struct fts_table_{c_name} *fts_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("\"{mtype}\", /* class_name_string */")
v.add_decl("{self.type_colors[mtype]},")
if mtype isa MNullableType then
v.add_decl("1,")
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
else
- if (not mtype isa MNullableType and self.unanchored_types_tables.has_key(mtype.as(MClassType))) or (mtype isa MNullableType and self.unanchored_types_tables.has_key(mtype.mtype.as(MClassType))) then
- v.add_decl("&unanchored_table_{c_name},")
+ if compile_type_unanchored_table(mtype) then
+ v.add_decl("(struct types*) &unanchored_table_{c_name},")
else
v.add_decl("NULL,")
end
end
- v.add_decl("&vts_table_{c_name},")
- v.add_decl("&fts_table_{c_name},")
v.add_decl("{self.type_tables[mtype].length},")
v.add_decl("\{")
for stype in self.type_tables[mtype] do
end
v.add_decl("\},")
v.add_decl("\};")
-
- compile_type_fts_table(mtype)
- compile_type_vts_table(mtype)
- compile_type_unanchored_table(mtype)
end
- protected fun compile_type_fts_table(mtype: MType) do
+ protected fun compile_type_fts_table(mtype: MType): Bool do
var mclass_type: MClassType
if mtype isa MNullableType then
else
mclass_type = mtype.as(MClassType)
end
+ if self.ft_tables[mclass_type.mclass].is_empty then return false
# extern const struct fst_table_X fst_table_X
self.header.add_decl("extern const struct fts_table_{mtype.c_name} fts_table_{mtype.c_name};")
if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
self.header.add_decl("int mask;")
end
- self.header.add_decl("struct type *fts[{self.ft_tables[mclass_type.mclass].length}];")
+ self.header.add_decl("struct type *types[{self.ft_tables[mclass_type.mclass].length}];")
self.header.add_decl("\};")
# const struct fts_table_X fts_table_X
end
v.add_decl("\},")
v.add_decl("\};")
+ return true
end
- protected fun compile_type_vts_table(mtype: MType) do
+ protected fun compile_type_vts_table(mtype: MType): Bool do
var mclass_type: MClassType
if mtype isa MNullableType then
else
mclass_type = mtype.as(MClassType)
end
+ if self.vt_tables[mclass_type.mclass].is_empty then return false
# extern const struct vts_table_X vts_table_X
self.header.add_decl("extern const struct vts_table_{mtype.c_name} vts_table_{mtype.c_name};")
if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
self.header.add_decl("int mask;")
end
- self.header.add_decl("struct type *vts[{self.vt_tables[mclass_type.mclass].length}];")
+ self.header.add_decl("struct type *types[{self.vt_tables[mclass_type.mclass].length}];")
self.header.add_decl("\};")
# const struct vts_table_X vts_table_X
end
v.add_decl("\},")
v.add_decl("\};")
+ return true
end
- fun compile_type_unanchored_table(mtype: MType) do
+ fun compile_type_unanchored_table(mtype: MType): Bool do
var mclass_type: MClassType
if mtype isa MNullableType then
else
mclass_type = mtype.as(MClassType)
end
+ if not self.unanchored_types_tables.has_key(mclass_type) then return false
# extern const struct unanchored_table_X unanchored_table_X
self.header.add_decl("extern const struct unanchored_table_{mtype.c_name} unanchored_table_{mtype.c_name};")
if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
self.header.add_decl("int mask;")
end
- if not self.unanchored_types_tables.has_key(mclass_type) then
- self.header.add_decl("struct type *types[0];")
- else
- self.header.add_decl("struct type *types[{self.unanchored_types_tables[mclass_type].length}];")
- end
+ self.header.add_decl("struct type *types[{self.unanchored_types_tables[mclass_type].length}];")
self.header.add_decl("\};")
- if self.unanchored_types_tables.has_key(mclass_type) then
- # const struct fts_table_X fts_table_X
- var v = new_visitor
- v.add_decl("const struct unanchored_table_{mtype.c_name} unanchored_table_{mtype.c_name} = \{")
- if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
- v.add_decl("{self.unanchored_types_masks[mclass_type]},")
- end
- v.add_decl("\{")
- for t in self.unanchored_types_tables[mclass_type] do
- if t == null then
- v.add_decl("NULL, /* empty */")
+ # const struct fts_table_X fts_table_X
+ var v = new_visitor
+ v.add_decl("const struct unanchored_table_{mtype.c_name} unanchored_table_{mtype.c_name} = \{")
+ if modelbuilder.toolcontext.opt_phmod_typing.value or modelbuilder.toolcontext.opt_phand_typing.value then
+ v.add_decl("{self.unanchored_types_masks[mclass_type]},")
+ end
+ v.add_decl("\{")
+ for t in self.unanchored_types_tables[mclass_type] do
+ if t == null then
+ v.add_decl("NULL, /* empty */")
+ else
+ # The table stores the result of the type resolution
+ # Therefore, for a receiver `mclass_type`, and a unresolved type `t`
+ # 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
+ v.add_decl("(struct type*)&type_{tv.c_name}, /* {t}: {tv} */")
else
- if self.typeids.has_key(t) then
- v.add_decl("(struct type*)&type_{t.c_name}, /* {t} */")
- else
- v.add_decl("NULL, /* empty ({t} not a live type) */")
- end
+ v.add_decl("NULL, /* empty ({t}: {tv} not a live type) */")
end
end
- v.add_decl("\},")
- v.add_decl("\};")
end
+ v.add_decl("\},")
+ v.add_decl("\};")
+ return true
end
# Globally compile the table of the class mclass
else
v.add("{res} = GC_MALLOC(sizeof(struct instance_{c_name}));")
end
- #v.add("{res} = calloc(sizeof(struct instance_{c_name}), 1);")
v.add("{res}->type = type;")
+ if v.compiler.modelbuilder.toolcontext.opt_hardening.value then
+ v.add("if(type == NULL) \{")
+ v.add_abort("type null")
+ v.add("\}")
+ if not v.compiler.modelbuilder.toolcontext.opt_generic_tree.value then
+ v.add("if(type->unanchored_table == NULL) \{")
+ v.add("fprintf(stderr, \"Insantiation of a dead type: %s\\n\", type->name);")
+ v.add_abort("type dead")
+ v.add("\}")
+ end
+ end
v.add("{res}->class = (struct class*) &class_{c_name};")
self.generate_init_attr(v, res, mtype)
end
end
+ # Return a C expression returning the runtime type structure of the value
+ # The point of the method is to works also with primitives types.
+ fun type_info(value: RuntimeVariable): String
+ do
+ if value.mtype.ctype == "val*" then
+ return "{value}->type"
+ else
+ return "(&type_{value.mtype.c_name})"
+ end
+ end
+
redef fun send(mmethod, arguments)
do
if arguments.first.mcasttype.ctype != "val*" then
var recv = arguments.first
s.append("val*")
ss.append("{recv}")
- self.varargize(msignature, arguments)
+ self.varargize(mmethod.intro, mmethod.intro.msignature.as(not null), arguments)
for i in [0..msignature.arity[ do
var a = arguments[i+1]
var t = msignature.mparameters[i].mtype
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
return res
end
+ redef fun vararg_instance(mpropdef, recv, varargs, elttype)
+ do
+ # A vararg must be stored into an new array
+ # The trick is that the dymaic type of the array may depends on the receiver
+ # of the method (ie recv) if the static type is unresolved
+ # This is more complex than usual because the unanchored type must not be resolved
+ # with the current receiver (ie self).
+ # Therefore to isolate the resolution from self, a local Frame is created.
+ # One can see this implementation as an inlined method of the receiver whose only
+ # job is to allocate the array
+ var old_frame = self.frame
+ var frame = new Frame(self, mpropdef, mpropdef.mclassdef.bound_mtype, [recv])
+ self.frame = frame
+ #print "required Array[{elttype}] for recv {recv.inspect}. bound=Array[{self.resolve_for(elttype, recv)}]. selfvar={frame.arguments.first.inspect}"
+ var res = self.array_instance(varargs, elttype)
+ self.frame = old_frame
+ return res
+ end
+
redef fun isset_attribute(a, recv)
do
self.check_recv_notnull(recv)
var res = self.new_var(bool_type)
- self.add("{res} = {recv}->attrs[{a.const_color}] != NULL; /* {a} on {recv.inspect}*/")
+
+ # What is the declared type of the attribute?
+ var mtype = a.intro.static_mtype.as(not null)
+ var intromclassdef = a.intro.mclassdef
+ mtype = mtype.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
+
+ if mtype isa MNullableType then
+ self.add("{res} = 1; /* easy isset: {a} on {recv.inspect} */")
+ return res
+ end
+
+ 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
+
+ if mtype.ctype == "val*" then
+ self.add("{res} = {recv}->attrs[{a.const_color}].val != NULL; /* {a} on {recv.inspect} */")
+ else
+ self.add("{res} = 1; /* NOT YET IMPLEMENTED: isset of primitives: {a} on {recv.inspect} */")
+ end
+ end
return res
end
var intromclassdef = a.intro.mclassdef
ret = ret.resolve_for(intromclassdef.bound_mtype, intromclassdef.bound_mtype, intromclassdef.mmodule, true)
- # Get the attribute or a box (ie. always a val*)
- var cret = self.object_type.as_nullable
- var res = self.new_var(cret)
- res.mcasttype = ret
- self.add("{res} = {recv}->attrs[{a.const_color}]; /* {a} on {recv.inspect} */")
+ 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
+ var res = self.new_var(cret)
+ res.mcasttype = ret
- # Check for Uninitialized attribute
- if not ret isa MNullableType and not self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then
- self.add("if ({res} == NULL) \{")
- self.add_abort("Uninitialized attribute {a.name}")
- self.add("\}")
- end
+ self.add("{res} = {recv}->attrs[{a.const_color}]; /* {a} on {recv.inspect} */")
+
+ # Check for Uninitialized attribute
+ if not ret isa MNullableType and not self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then
+ self.add("if ({res} == NULL) \{")
+ self.add_abort("Uninitialized attribute {a.name}")
+ self.add("\}")
+ end
+
+ # Return the attribute or its unboxed version
+ # Note: it is mandatory since we reuse the box on write, we do not whant that the box escapes
+ return self.autobox(res, ret)
+ else
+ var res = self.new_var(ret)
+ self.add("{res} = {recv}->attrs[{a.const_color}].{ret.ctypename}; /* {a} on {recv.inspect} */")
- # Return the attribute or its unboxed version
- # Note: it is mandatory since we reuse the box on write, we do not whant that the box escapes
- return self.autobox(res, ret)
+ # Check for Uninitialized attribute
+ if ret.ctype == "val*" and not ret isa MNullableType and not self.compiler.modelbuilder.toolcontext.opt_no_check_initialization.value then
+ self.add("if ({res} == NULL) \{")
+ self.add_abort("Uninitialized attribute {a.name}")
+ self.add("\}")
+ end
+
+ return res
+ end
end
redef fun write_attribute(a, recv, value)
# Adapt the value to the declared type
value = self.autobox(value, mtype)
- var attr = "{recv}->attrs[{a.const_color}]"
- if mtype.ctype != "val*" then
- assert mtype isa MClassType
- # The attribute is primitive, thus we store it in a box
- # The trick is to create the box the first time then resuse the box
- self.add("if ({attr} != NULL) \{")
- self.add("((struct instance_{mtype.c_name}*){attr})->value = {value}; /* {a} on {recv.inspect} */")
- self.add("\} else \{")
- value = self.autobox(value, self.object_type.as_nullable)
- self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
- self.add("\}")
+
+ if self.compiler.modelbuilder.toolcontext.opt_no_union_attribute.value then
+ var attr = "{recv}->attrs[{a.const_color}]"
+ if mtype.ctype != "val*" then
+ assert mtype isa MClassType
+ # The attribute is primitive, thus we store it in a box
+ # The trick is to create the box the first time then resuse the box
+ self.add("if ({attr} != NULL) \{")
+ self.add("((struct instance_{mtype.c_name}*){attr})->value = {value}; /* {a} on {recv.inspect} */")
+ self.add("\} else \{")
+ value = self.autobox(value, self.object_type.as_nullable)
+ self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
+ self.add("\}")
+ else
+ # The attribute is not primitive, thus store it direclty
+ self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
+ end
else
- # The attribute is not primitive, thus store it direclty
- self.add("{attr} = {value}; /* {a} on {recv.inspect} */")
+ self.add("{recv}->attrs[{a.const_color}].{mtype.ctypename} = {value}; /* {a} on {recv.inspect} */")
end
end
ntype = ntype.mtype
end
+ var recv = self.frame.arguments.first
+ var recv_type_info = self.type_info(recv)
if ntype isa MParameterType then
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- buffer.append("[self->type->fts_table->fts[HASH(self->type->fts_table->mask, {ntype.const_color})]->livecolor]")
+ buffer.append("[{recv_type_info}->fts_table->types[HASH({recv_type_info}->fts_table->mask, {ntype.const_color})]->livecolor]")
else
- buffer.append("[self->type->fts_table->fts[{ntype.const_color}]->livecolor]")
+ buffer.append("[{recv_type_info}->fts_table->types[{ntype.const_color}]->livecolor]")
end
else if ntype isa MVirtualType then
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- buffer.append("[self->type->vts_table->vts[HASH(self->type->vts_table->mask, {ntype.mproperty.const_color})]->livecolor]")
+ buffer.append("[{recv_type_info}->vts_table->types[HASH({recv_type_info}->vts_table->mask, {ntype.mproperty.const_color})]->livecolor]")
else
- buffer.append("[self->type->vts_table->vts[{ntype.mproperty.const_color}]->livecolor]")
+ buffer.append("[{recv_type_info}->vts_table->types[{ntype.mproperty.const_color}]->livecolor]")
end
else if ntype isa MGenericType and ntype.need_anchor then
var bbuff = new Buffer
else
link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
var recv = self.frame.arguments.first
- var recv_boxed = self.autobox(recv, self.object_type)
+ 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_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {mtype.mclass.mclass_type.const_color})])", mtype)
+ 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_boxed}->type->unanchored_table->types[{mtype.mclass.mclass_type.const_color}])", mtype)
+ return self.new_expr("NEW_{mtype.mclass.c_name}((struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
end
end
end
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 recv = self.frame.arguments.first
- var recv_boxed = self.autobox(recv, self.object_type)
+ var recv_type_info = self.type_info(recv)
var res = self.new_var(bool_type)
- var type_struct = self.get_name("type_struct")
- self.add_decl("struct type* {type_struct};")
var cltype = self.get_name("cltype")
self.add_decl("int {cltype};")
var idtype = self.get_name("idtype")
var is_nullable = self.get_name("is_nullable")
self.add_decl("short int {is_nullable};")
- var boxed = self.autobox(value, self.object_type)
-
- if not compiler.modelbuilder.toolcontext.opt_generic_tree.value and mtype.need_anchor then
- link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
- end
-
var ntype = mtype
if ntype isa MNullableType then
ntype = ntype.mtype
end
- 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_boxed}->type->fts_table->fts[HASH({recv_boxed}->type->fts_table->mask, {ntype.const_color})];")
- else
- self.add("{type_struct} = {recv_boxed}->type->fts_table->fts[{ntype.const_color}];")
+ 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
- self.add("{cltype} = {type_struct}->color;")
- self.add("{idtype} = {type_struct}->id;")
- self.add("{is_nullable} = {type_struct}->is_nullable;")
- else if ntype isa MGenericType and ntype.need_anchor then
+ 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
- var buff = new Buffer
- retrieve_anchored_livetype(ntype, buff)
- self.add("{type_struct} = (struct type*)livetypes_{ntype.mclass.c_name}{buff.to_s};")
- self.add("{cltype} = {type_struct}->color;")
- self.add("{idtype} = {type_struct}->id;")
- self.add("{is_nullable} = {type_struct}->is_nullable;")
+ # 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
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_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {ntype.mclass.mclass_type.const_color})];")
+ 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_boxed}->type->unanchored_table->types[{ntype.mclass.mclass_type.const_color}];")
+ 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;")
end
+ self.add("{cltype} = {type_struct}->color;")
+ self.add("{idtype} = {type_struct}->id;")
+ self.add("{is_nullable} = {type_struct}->is_nullable;")
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;")
- 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_boxed}->type->vts_table->vts[HASH({recv_boxed}->type->vts_table->mask, {vtcolor})];")
- else
- self.add("{type_struct} = {recv_boxed}->type->vts_table->vts[{vtcolor}];")
+ 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
- self.add("{cltype} = {type_struct}->color;")
- self.add("{idtype} = {type_struct}->id;")
- self.add("{is_nullable} = {type_struct}->is_nullable;")
else
- self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{boxed.inspect}\"); exit(1);")
+ self.add("printf(\"NOT YET IMPLEMENTED: type_test(%s, {mtype}).\\n\", \"{value.inspect}\"); exit(1);")
end
if mtype isa MNullableType then
end
# check color is in table
- self.add("if({boxed} == NULL) \{")
- self.add("{res} = {is_nullable};")
- self.add("\} else \{")
+ if self.maybe_null(value) then
+ self.add("if({value} == NULL) \{")
+ self.add("{res} = {is_nullable};")
+ self.add("\} else \{")
+ end
+ var value_type_info = self.type_info(value)
if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- self.add("{cltype} = HASH({boxed}->type->color, {idtype});")
+ self.add("{cltype} = HASH({value_type_info}->color, {idtype});")
end
- self.add("if({cltype} >= {boxed}->type->table_size) \{")
+ self.add("if({cltype} >= {value_type_info}->table_size) \{")
self.add("{res} = 0;")
self.add("\} else \{")
- self.add("{res} = {boxed}->type->type_table[{cltype}] == {idtype};")
- self.add("\}")
+ self.add("{res} = {value_type_info}->type_table[{cltype}] == {idtype};")
self.add("\}")
+ if self.maybe_null(value) then
+ self.add("\}")
+ end
return res
end
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}->type->id];")
+ self.add_decl("const char* {res};")
+ if value.mtype.ctype == "val*" then
+ self.add "{res} = {value} == NULL ? \"null\" : {value}->type->name;"
+ else
+ self.add "{res} = type_{value.mtype.c_name}.name;"
+ end
return res
end
else
link_unanchored_type(self.frame.mpropdef.mclassdef, mtype)
var recv = self.frame.arguments.first
- var recv_boxed = self.autobox(recv, self.object_type)
+ 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_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {mtype.mclass.mclass_type.const_color})])", mtype)
+ 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_boxed}->type->unanchored_table->types[{mtype.mclass.mclass_type.const_color}])", mtype)
+ return self.new_expr("NEW_{mtype.mclass.c_name}({length}, (struct type *) {recv_type_info}->unanchored_table->types[{mtype.const_color}])", mtype)
end
end
end
redef fun calloc_array(ret_type, arguments)
do
- var ret = ret_type.as(MGenericType)
- var compiler = self.compiler.as(SeparateCompiler)
- compiler.undead_types.add(ret)
var mclass = self.get_class("ArrayCapable")
- var nclass = self.get_class("NativeArray")
-
- if compiler.modelbuilder.toolcontext.opt_generic_tree.value then
- var ft = mclass.mclass_type.arguments.first.as(MParameterType)
- self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type*) livetypes_array__NativeArray[self->type->fts_table->fts[{ft.const_color}]->livecolor])", ret_type))
- else
- var res = nclass.get_mtype(mclass.mclass_type.arguments)
- link_unanchored_type(self.frame.mpropdef.mclassdef, res)
- var recv = self.frame.arguments.first
- var recv_boxed = self.autobox(recv, self.object_type)
- if compiler.modelbuilder.toolcontext.opt_phmod_typing.value or compiler.modelbuilder.toolcontext.opt_phand_typing.value then
- self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type *) {recv_boxed}->type->unanchored_table->types[HASH({recv_boxed}->type->unanchored_table->mask, {nclass.mclass_type.const_color})])", ret_type))
- else
- self.ret(self.new_expr("NEW_{nclass.c_name}({arguments[1]}, (struct type *) {recv_boxed}->type->unanchored_table->types[{nclass.mclass_type.const_color}])", ret_type))
- end
- end
+ var ft = mclass.mclass_type.arguments.first.as(MParameterType)
+ var res = self.native_array_instance(ft, arguments[1])
+ self.ret(res)
end
fun link_unanchored_type(mclassdef: MClassDef, mtype: MType) do
end
end
+redef class MVirtualType
+ redef fun c_name
+ 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
+ end
+end
+
redef class MNullableType
redef fun c_name
do
nitlanguage / nit.git / blobdiff