Merge branch 'jonathan' ; add unit tests.

Conflicts:
	cpu/alu.ml

1 files changed, 1 insertions, 1 deletions

diff --git a/cpu/cpu.ml b/cpu/cpu.ml
index 75d1c56..14b1f2a 100644
--- a/cpu/cpu.ml
+++ b/cpu/cpu.ml
@@ -313,5 +313,5 @@ let p =
             "ser_in_busy", 1, ser_in_busy;
         ]
 
-let () = Netlist_gen.print stdout p
+let () = Netlist_printer.print_program stdout p