Better control over the state encodings.

- State encodings are now generated as UCProgramBlock classes are created.
- This will make it easier to de-reference block names and get their
  encoding value.
 On branch master
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
	modified:   pyucode/UCProgram.py
	modified:   templates/ucore-template.v

Author: ben-marshall

pyucode/UCProgram.py

@@ -78,11 +78,15 @@ class UCProgramBlock(object):
     flow statement at the end.
     """
 
+    __count__ = 0
+
     def __init__(self, name, statements, flow_change):
         """
         Create a new program block with the supplied statments and control
         flow change at the end.
         """
+        self.id  = UCProgramBlock.__count__
+        UCProgramBlock.__count__ = UCProgramBlock.__count__ + 1
         self.log = logging.getLogger(__name__)
         self.name           = name
         self.statements     = statements
@@ -219,7 +223,7 @@ def synth_state_encodings(self):
 
         for block in self.blocks:
 
-            tr.append(self.get_block_state_name(block))
+            tr.append((self.get_block_state_name(block), block.id))
 
         return tr
 

templates/ucore-template.v

@@ -66,7 +66,7 @@ assign {{variable.name}} = {{variable.comb_expr}}; // Not implemented yet.
 //
 // State encodings.
 {%- for statename in program.synth_state_encodings() %}
-localparam {{statename}} = {{loop.index0}};
+localparam {{statename[0]}} = {{statename[1]}};
 {%- endfor %}
 
 //