From: Matthijs Kooijman <m.kooijman@student.utwente.nl>
Date: Thu, 25 Jun 2009 13:19:09 +0000 (+0200)
Subject: Remove the function wrapper hack from HighOrdAlu.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=f428ef73d3c779bf00e9d493bad4eddf5bb9d0cb;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

Remove the function wrapper hack from HighOrdAlu.

Compile the alu now gives a nice design with a four bit inverter, four bit
and gate and a multiplexer!
---

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 6458f3c..f49d511 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -12,15 +12,12 @@ constant :: e -> Op D4 e
 constant e a b =
   e +> (e +> (e +> (singleton e )))
 
-inv = hwnot
-
 invop :: Op n Bit
-invop a b = map inv a
+invop a b = map hwnot a
 
-xand = hwand
 
 andop :: Op n Bit
-andop a b = zipWith xand a b
+andop a b = zipWith hwand a b
 
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
@@ -32,4 +29,5 @@ alu op1 op2 opc a b =
     High -> op2 a b
 
 actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
-actual_alu = alu (constant Low) andop
+--actual_alu = alu (constant Low) andop
+actual_alu = alu invop andop