loci: remove dead gen_fn_ptrs/gen_unified_fns options
Only support unified accessors.
diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
index 993bc1c..d1e4348 100644
--- a/c_gen/c_code_gen.py
+++ b/c_gen/c_code_gen.py
@@ -431,8 +431,6 @@
# gen_base_types(out)
gen_flow_add_setup_function_declarations(out)
- if config_check("gen_fn_ptrs"): # Otherwise, all classes are from generic cls
- gen_struct_definitions(out)
out.write("""
/****************************************************************
*
@@ -1123,11 +1121,8 @@
for cls in of_g.standard_class_order:
if cls in type_maps.inheritance_map:
continue
- if config_check("gen_fn_ptrs"):
- out.write("typedef struct %(cls)s_s %(cls)s_t;\n" % dict(cls=cls))
- else:
- template = "typedef of_object_t %(cls)s_t;\n"
- out.write(template % dict(cls=cls))
+ template = "typedef of_object_t %(cls)s_t;\n"
+ out.write(template % dict(cls=cls))
out.write("""
/****************************************************************
@@ -1249,51 +1244,6 @@
of_object_t *effects);
""")
-def gen_struct_definitions(out):
- """
- Generate the declaration of all of_ C structures
-
- @param out The file to which to write the decs
- """
-
- # This should only get called if gen_fn_ptr is true in code_gen_config
- if not config_check("gen_fn_ptrs"):
- debug("Error: gen_struct_defs called, but no fn ptrs set")
- return
-
- for cls in of_g.standard_class_order:
- if cls in type_maps.inheritance_map:
- continue # These are generated elsewhere
- note = ""
- if loxi_utils.class_is_message(cls):
- note = " /* Class is message */"
- out.write("struct %s_s {%s\n" % (cls, note))
- out.write(""" /* Common members */
-%s
- /* Class specific members */
-""" % of_g.base_object_members)
- if loxi_utils.class_is_list(cls):
- out.write("""
- %(cls)s_first_f first;
- %(cls)s_next_f next;
- %(cls)s_append_bind_f append_bind;
- %(cls)s_append_f append;
-};
-
-""" % {"cls": cls})
- continue # All done with list object
-
- # Else, not a list instance; add accessors for all data members
- for m_name in of_g.ordered_members[cls]:
- if m_name in of_g.skip_members:
- # These members (length, etc) are handled internally
- continue
- f_name = acc_name(cls, m_name)
- out.write(" %s_get_f %s;\n" % (f_name, m_name + "_get"))
- out.write(" %s_set_f %s;\n" % (f_name, m_name + "_set"))
- out.write("};\n\n")
-
-
################################################################
#
# List accessor code generation
@@ -2031,21 +1981,6 @@
return fn
-def instantiate_fn_ptrs(cls, ilvl, out):
- """
- Generate the C code to instantiate function pointers for a class
- @param cls The class name
- @param ilvl The base indentation level
- @param out The file to which to write the functions
- """
- for m_name in of_g.ordered_members[cls]:
- if m_name in of_g.skip_members:
- continue
- out.write(" " * ilvl + "obj->%s_get = %s_%s_get;\n" %
- (m_name, cls, m_name))
- out.write(" " * ilvl + "obj->%s_set = %s_%s_set;\n" %
- (m_name, cls, m_name))
-
################################################################
# Routines to generate the body of new/delete functions
################################################################
@@ -2542,17 +2477,6 @@
obj->wire_length_set = of_meter_stats_wire_length_set;
""")
- if config_check("gen_fn_ptrs"):
- if loxi_utils.class_is_list(cls):
- out.write("""
- obj->first = %(cls)s_first;
- obj->next = %(cls)s_next;
- obj->append = %(cls)s_append;
- obj->append_bind = %(cls)s_append_bind;
-""" % dict(cls=cls))
- else:
- instantiate_fn_ptrs(cls, 4, out)
-
def gen_new_function_definitions(out, cls):
"""
Generate the new operator for all classes
diff --git a/c_gen/of_g_legacy.py b/c_gen/of_g_legacy.py
index fde46fb..482eb28 100644
--- a/c_gen/of_g_legacy.py
+++ b/c_gen/of_g_legacy.py
@@ -53,15 +53,6 @@
##
# The dictionary of config variables related to code
#
-# @param gen_unified_fns Boolean; Generate top level function definitions for
-# accessors which are independent of the version; the alternative is to only
-# use the function pointers in the class definitions. These functions support
-# better inlining optimizations.
-#
-# @param gen_fn_ptrs Boolean; Generate the functions pointed to by pointer
-# in the class (struct) definitions; the alternative is to only use the
-# unified (use_) functions
-#
# @param use_obj_id Use object IDs in struct defns CURRENTLY NOT SUPPORTED
#
# @param return_base_types For 'get' accessors, return values when possible.
@@ -86,9 +77,6 @@
# @fixme These are still very C specific and should probably either
# go into lang_c.py or be swallowed by command line option parsing
code_gen_config = dict(
- gen_unified_fns=True,
-# gen_fn_ptrs=True, # WARNING: Haven't tested with this in a while
- gen_fn_ptrs=False,
use_obj_id=False,
use_static_inlines=False,
copy_semantics="read", # Only read implemented: read, write, grow
diff --git a/lang_c.py b/lang_c.py
index 0a31fac..b8dcc36 100644
--- a/lang_c.py
+++ b/lang_c.py
@@ -149,18 +149,10 @@
if config_check("get_returns") != "error":
debug("Only 'error' is supported for get-accessor return types\m");
rv = False
- if not config_check("use_fn_ptrs") and not config_check("gen_unified_fns"):
- debug("Must have gen_fn_ptrs and/or gen_unified_fns set in config")
- rv = False
if config_check("use_obj_id"):
debug("use_obj_id is set but not yet supported (change \
config_sanity_check if it is)")
rv = False
- if config_check("gen_unified_macros") and config_check("gen_unified_fns") \
- and config_check("gen_unified_macro_lower"):
- debug("Conflict: Cannot generate unified functions and lower case \
-unified macros")
- rv = False
return rv