Use the _log_object_assocs array for softcoded proxy attribute registration

Author: lwaern-intel

include/simics/dmllib.h

@@ -3137,15 +3137,15 @@ UNUSED static inline uint64 _identity_to_key(_identity_t id) {
 typedef struct {
     uint32 port_obj_offset;
     uint32 index_divisor;
-} _dml_log_object_assoc_t;
+} _dml_port_object_assoc_t;
 
 UNUSED static inline conf_object_t *
-_identity_to_logobj(const _dml_log_object_assoc_t *object_assocs,
-                    conf_object_t *dev, _identity_t id) {
-    _dml_log_object_assoc_t obj_assoc = object_assocs[id.id - 1];
-    if (!obj_assoc.index_divisor) return dev;
-    return ((conf_object_t **)((char *)dev + obj_assoc.port_obj_offset))[
-        id.encoded_index / obj_assoc.index_divisor];
+_identity_to_portobj(const _dml_port_object_assoc_t *port_object_assocs,
+                     conf_object_t *dev, _identity_t id) {
+    _dml_port_object_assoc_t portobj_assoc = port_object_assocs[id.id - 1];
+    if (!portobj_assoc.index_divisor) return dev;
+    return ((conf_object_t **)((char *)dev + portobj_assoc.port_obj_offset))[
+        id.encoded_index / portobj_assoc.index_divisor];
 }
 
 static attr_value_t
@@ -3311,7 +3311,6 @@ typedef struct {
     bool valid;
     bool is_bank;
     bool is_array;
-    ptrdiff_t port_obj_offset;
     const char *portname;
 } _dml_attr_parent_obj_proxy_info_t;
 
@@ -3338,6 +3337,7 @@ typedef struct {
 
 UNUSED static void _DML_register_attributes(
     conf_class_t *dev_class, const _id_info_t *id_info_array,
+    const _dml_port_object_assoc_t *port_object_assocs,
     const _vtable_list_t *attribute_vtables, _each_in_t sequence,
     _dml_attr_conf_info_t (*get_attribute_info)(_traitref_t),
     attr_value_t (*get_attr)(void *, conf_object_t *, attr_value_t *),
@@ -3395,18 +3395,21 @@ UNUSED static void _DML_register_attributes(
 
         _dml_attr_parent_obj_proxy_info_t proxy_info = attr_info.proxy_info;
         if (proxy_info.valid) {
+            uint32 port_obj_offset =
+                port_object_assocs[list.id - 1].port_obj_offset;
+            ASSERT(port_obj_offset);
             if (proxy_info.is_array) {
                 ASSERT(id_info.dimensions >= 1);
                 _register_port_array_legacy_proxy_attr(
-                    dev_class, parent_obj_class, proxy_info.port_obj_offset,
+                    dev_class, parent_obj_class, port_obj_offset,
                     id_info.dimsizes[0], proxy_info.is_bank,
                     proxy_info.portname, attr_info.name, get_portobj_attr,
                     set_portobj_attr, attr_info.flags, sb_str(&type),
                     attr_info.doc,
                     attr_get_info ? attr_get_info : attr_set_info);
             } else {
                 _register_port_legacy_proxy_attr(
-                    dev_class, parent_obj_class, proxy_info.port_obj_offset,
+                    dev_class, parent_obj_class, port_obj_offset,
                     proxy_info.is_bank, proxy_info.portname, attr_info.name,
                     get_portobj_attr, set_portobj_attr, attr_info.flags,
                     sb_str(&type), attr_info.doc,

lib/1.4/dml-builtins.dml

@@ -615,6 +615,8 @@ extern typedef struct { } _dml_detached_hook_queue_t;
 // Used by hooks
 session _dml_detached_hook_queue_t *_detached_hook_queue_stack;
 
+extern typedef struct {} _dml_attr_parent_obj_proxy_info_t;
+
 // Shared parameters for attributes, registers and connects, which all produce
 // attributes. Methods get_attribute and set_attribute are abstract.
 template _conf_attribute is object {
@@ -700,14 +702,6 @@ template _conf_attribute is object {
 
 extern typedef size_t ptrdiff_t;
 
-extern typedef struct {
-    bool valid;
-    bool is_bank;
-    bool is_array;
-    ptrdiff_t port_obj_offset;
-    const char *portname;
-} _dml_attr_parent_obj_proxy_info_t;
-
 /**
 ## Attribute objects
 
@@ -1023,10 +1017,12 @@ method _set_attribute_attr(const _dml_attr_getset_info_t *_conf_info,
 }
 
 extern typedef struct {} _vtable_list_t;
+extern typedef struct {} _dml_port_object_assoc_t;
 
 extern void *_DML_register_attributes(
-    conf_class_t *, const _id_info_t *, const _vtable_list_t *,
-    sequence(_conf_attribute), _dml_attr_conf_info_t (*)(_conf_attribute),
+    conf_class_t *, const _id_info_t *, const _dml_port_object_assoc_t *,
+    const _vtable_list_t *, sequence(_conf_attribute),
+    _dml_attr_conf_info_t (*)(_conf_attribute),
     attr_value_t (*get)(void *, conf_object_t *, attr_value_t *),
     set_error_t (*set)(void *, conf_object_t *, attr_value_t *,
                        attr_value_t *),
@@ -1035,10 +1031,12 @@ extern void *_DML_register_attributes(
                             attr_value_t *));
 
 extern const _vtable_list_t *_each___conf_attribute;
+extern const _dml_port_object_assoc_t *_port_object_assocs;
 
 independent startup method _register_all_attributes() {
     _DML_register_attributes(SIM_get_class(dev.classname),
                              _id_infos,
+                             _port_object_assocs,
                              _each___conf_attribute,
                              each _conf_attribute in (dev),
                              &_get_attribute_info,

py/dml/c_backend.py

@@ -2145,7 +2145,7 @@ def generate_object_vtables_array():
     add_variable_declaration(
         f'void * const _object_vtables[{len(dml.globals.objects)}]', init)
 
-def generate_log_object_assocs_array():
+def generate_port_object_assocs_array():
     items = []
     for node in dml.globals.objects:
         object_node = (node if node.objtype in {'device', 'bank',
@@ -2173,8 +2173,8 @@ def generate_log_object_assocs_array():
         items.append(f'{{{port_obj_offset}, {index_divisor}}}')
     init = f'{{{", ".join(items)}}}'
     add_variable_declaration(
-        'const _dml_log_object_assoc_t '
-        + f'_log_object_assocs[{len(dml.globals.objects)}]',
+        'const _dml_port_object_assoc_t '
+        + f'_port_object_assocs[{len(dml.globals.objects)}]',
         init)
 
 def generate_trait_method(m):
@@ -3328,8 +3328,9 @@ def generate_cfile_body(device, footers, full_module, filename_prefix):
     generate_events(device)
     generate_identity_data_decls()
     generate_object_vtables_array()
-    if compat.shared_logs_on_device not in dml.globals.enabled_compat:
-        generate_log_object_assocs_array()
+    if not (dml.globals.dml_version == (1, 2)
+            and compat.shared_logs_on_device in dml.globals.enabled_compat):
+        generate_port_object_assocs_array()
     generate_class_var_decl()
     generate_startup_calls_entry_function(device)
     generate_init_data_objs(device)

py/dml/codegen.py

@@ -2649,7 +2649,7 @@ def stmt_log(stmt, location, scope):
         identity = TraitObjIdentity(site, lookup_var(site, scope, "this"))
         logobj = (log_object(site, dml.globals.device, ())
                   if compat.shared_logs_on_device in dml.globals.enabled_compat
-                  else LogObjectFromObjIdentity(site, identity))
+                  else PortObjectFromObjIdentity(site, identity))
 
     if later_level is not None:
         adjusted_later_level = later_level = ctree.as_int(codegen_expression(

py/dml/ctree.py

@@ -140,7 +140,7 @@
     'ObjIdentity',
     'TraitObjIdentity',
     'ObjTraitRef',
-    'LogObjectFromObjIdentity',
+    'PortObjectFromObjIdentity',
     'NodeArrayRef',
     'SessionVariableRef',
     'mkNodeRef', 'NodeRef',
@@ -3536,7 +3536,7 @@ def ctype(self):
     def read(self):
         return "(%s).id" % (self.traitref.read(),)
 
-class LogObjectFromObjIdentity(Expression):
+class PortObjectFromObjIdentity(Expression):
     priority = dml.expr.Apply.priority
     @auto_init
     def __init__(self, site, identity):
@@ -3546,7 +3546,7 @@ def ctype(self):
         return TNamed('conf_object_t *')
 
     def read(self):
-        return ('_identity_to_logobj(_log_object_assocs, &_dev->obj, '
+        return ('_identity_to_portobj(_port_object_assocs, &_dev->obj, '
                 + f'{self.identity.read()})')
 
 class TraitUpcast(Expression):

py/dml/structure.py

@@ -2619,18 +2619,12 @@ def mkexpr(self, indices):
             and need_port_proxy_attrs(object_parent)):
             is_bank = 'true' if object_parent.objtype == 'bank' else 'false'
             is_array = 'true' if object_parent.dimensions == 1 else 'false'
-            indices = ((mkLit(self.site, '0', TInt(32, False)),)
-                       if object_parent.dimensions else ())
-            port_obj_offset = (
-                f'offsetof({crep.structtype(dml.globals.device)}, '
-                + f'{crep.cref_portobj(object_parent, indices)})')
 
             self.cached = ctree.mkLit(
                 self.site,
                 '(_dml_attr_parent_obj_proxy_info_t) { .valid = true,'
                 + f'.is_bank = {is_bank}, .is_array = {is_array}, '
-                + f'.port_obj_offset = {port_obj_offset}'
-                + f', .portname = "{object_parent.name}" }}',
+                + f'.portname = "{object_parent.name}" }}',
                 TNamed('_dml_attr_parent_obj_proxy_info_t'))
         else:
             self.cached = mkLit(