Changeset db4d6de in mainline for contrib/arch/hadlbppp.py

Timestamp:

2009-11-28T16:30:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c4702804

Parents:

ba8f8cb (diff), 67392fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• contrib/arch/hadlbppp.py (modified) (5 diffs)

contrib/arch/hadlbppp.py

@@ -409 +409 @@
         return result
 
-def dump_frame(frame, outdir, var, archf):
+def dump_frame(directed_binds, frame, outdir, var, archf):
         "Dump Behavior Protocol of a given frame"
         
@@ -443 +443 @@
                         iface = get_iface(provides['iface'])
                         if (not iface is None):
+                                binds = directed_binds['%s.%s' % (var, provides['iface'])]
+                                if (not binds is None):
+                                        cnt = len(binds)
+                                else:
+                                        cnt = 1
+                                
                                 if ('protocol' in iface):
-                                        protocols.append(extend_bp(outname, iface['protocol'], iface['name']))
+                                        proto = extend_bp(outname, iface['protocol'], iface['name'])
+                                        for _ in range(0, cnt):
+                                                protocols.append(proto)
+                                
                                 for protocol in inherited_protocols(iface):
-                                        protocols.append(extend_bp(outname, protocol, iface['name']))
+                                        proto = extend_bp(outname, protocol, iface['name'])
+                                        for _ in range(0, cnt):
+                                                protocols.append(proto)
                         else:
                                 print "%s: Provided interface '%s' is undefined" % (frame['name'], provides['iface'])
@@ -639 +650 @@
                         break
         
+        directed_binds = direct_binds(flatten_binds(binds, delegates, subsumes))
+        
         outname = os.path.join(outdir, "%s.archbp" % arch['name'])
         if ((opt_bp) or (opt_ebp)):
@@ -648 +661 @@
         
         for inst in insts:
-                dump_frame(inst['frame'], outdir, inst['var'], outf)
-        
-        directed_binds = direct_binds(flatten_binds(binds, delegates, subsumes))
+                dump_frame(directed_binds, inst['frame'], outdir, inst['var'], outf)
         
         for dst, src in directed_binds.items():
@@ -1727 +1738 @@
                 outf.write("\tlabel=\"%s\";\n" % arch['name'])
                 outf.write("\tcompound=true;\n")
+                outf.write("\tsplines=\"polyline\";\n")
                 outf.write("\tedge [fontsize=8];\n")
                 outf.write("\t\n")