From 9c182c47d10316bde40d055fbff98810ccce0f72 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Thu, 8 Nov 2012 21:49:20 +0100
Subject: [PATCH] pytholith: add register muxes

---
 migen/pytholite/compiler.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/migen/pytholite/compiler.py b/migen/pytholite/compiler.py
index e3f5a7609..b25524db5 100644
--- a/migen/pytholite/compiler.py
+++ b/migen/pytholite/compiler.py
@@ -33,7 +33,8 @@ class _Register:
 		if not self.finalized:
 			raise FinalizeError
 		# do nothing when sel == 0
-		cases = [(v, self.storage.eq(k)) for k, v in self.source_encoding.items()]
+		cases = [(Constant(v, self.sel.bv),
+			self.storage.eq(k)) for k, v in self.source_encoding.items()]
 		sync = [Case(self.sel, *cases)]
 		return Fragment(sync=sync)
 
@@ -53,13 +54,15 @@ class _Compiler:
 	
 	# blocks and statements
 	def visit_block(self, statements):
-		r = []
+		states = []
 		for statement in statements:
 			if isinstance(statement, ast.Assign):
-				r += self.visit_assign(statement)
+				op = self.visit_assign(statement)
+				if op:
+					states.append(op)
 			else:
 				raise NotImplementedError
-		return r
+		return states
 	
 	def visit_assign(self, node):
 		if isinstance(node.targets[0], ast.Name):
@@ -155,9 +158,10 @@ def make_pytholite(func):
 	symdict = func.__globals__.copy()
 	registers = []
 	
-	c = _Compiler(symdict, registers)
+	states = _Compiler(symdict, registers).visit_top(tree)
+	
 	print("compilation result:")
-	print(c.visit_top(tree))
+	print(states)
 	
 	print("registers:")
 	print(registers)
@@ -166,3 +170,9 @@ def make_pytholite(func):
 
 	print("ast:")
 	print(ast.dump(tree))
+
+	regf = Fragment()
+	for register in registers:
+		register.finalize()
+		regf += register.get_fragment()
+	return regf