Changeset f1fb1d1 in mainline

Timestamp:

2009-09-17T00:01:46Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0e8ad0b

Parents:

51d4040

Message:

flattening of bindings has to be done interatively until there is anything left

File:

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

contrib/arch/hadlbppp.py

@@ -422 +422 @@
         outf.close()
 
+def flatten_binds(binds, delegates, subsumes):
+        "Remove bindings which are replaced by delegation or subsumption"
+        
+        result = []
+        stable = True
+        
+        for bind in binds:
+                keep = True
+                
+                for delegate in delegates:
+                        if (bind['to'] == delegate['to']):
+                                keep = False
+                                result.append({'from': bind['from'], 'to': delegate['rep']})
+                
+                for subsume in subsumes:
+                        if (bind['from'] == subsume['from']):
+                                keep = False
+                                result.append({'from': subsume['rep'], 'to': bind['to']})
+                
+                if (keep):
+                        result.append(bind)
+                else:
+                        stable = False
+        
+        if (stable):
+                return result
+        else:
+                return flatten_binds(result, delegates, subsumes)
+
 def merge_subarch(prefix, arch, outdir):
         "Merge subarchitecture into architexture"
@@ -512 +541 @@
                 dump_frame(inst['frame'], outdir, inst['var'], outf)
         
-        for bind in binds:
-                for delegate in delegates:
-                        if (bind['to'] == delegate['to']):
-                                bind['to'] = delegate['rep']
-                                break
-                
-                for subsume in subsumes:
-                        if (bind['from'] == subsume['from']):
-                                bind['from'] = subsume['rep']
-                                break
-                
+        for bind in flatten_binds(binds, delegates, subsumes):
                 outf.write("bind %s to %s\n" % (bind['from'], bind['to']))