Version abc60723

1 files changed, 16 insertions, 19 deletions

diff --git a/src/temp/ivy/ivyCanon.c b/src/temp/ivy/ivyCanon.c
index c6f43d15..5768b87e 100644
--- a/src/temp/ivy/ivyCanon.c
+++ b/src/temp/ivy/ivyCanon.c
@@ -24,7 +24,7 @@
 ///                        DECLARATIONS                              ///
 ////////////////////////////////////////////////////////////////////////
 
-static Ivy_Obj_t * Ivy_TableLookupPair_rec( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1, int fCompl0, int fCompl1, Ivy_Type_t Type );
+static Ivy_Obj_t * Ivy_TableLookupPair_rec( Ivy_Man_t * p, Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1, int fCompl0, int fCompl1, Ivy_Type_t Type );
 
 ////////////////////////////////////////////////////////////////////////
 ///                     FUNCTION DEFINITIONS                         ///
@@ -41,7 +41,7 @@ static Ivy_Obj_t * Ivy_TableLookupPair_rec( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1
   SeeAlso     []
 
 ***********************************************************************/
-Ivy_Obj_t * Ivy_CanonPair_rec( Ivy_Obj_t * pGhost )
+Ivy_Obj_t * Ivy_CanonPair_rec( Ivy_Man_t * p, Ivy_Obj_t * pGhost )
 {
     Ivy_Obj_t * pResult, * pLat0, * pLat1;
     Ivy_Init_t Init, Init0, Init1;
@@ -53,9 +53,9 @@ Ivy_Obj_t * Ivy_CanonPair_rec( Ivy_Obj_t * pGhost )
     // consider the case when the pair is canonical
     if ( !Ivy_ObjIsLatch(Ivy_ObjFanin0(pGhost)) || !Ivy_ObjIsLatch(Ivy_ObjFanin1(pGhost)) )
     {
-        if ( pResult = Ivy_TableLookup( pGhost ) )
+        if ( pResult = Ivy_TableLookup( p, pGhost ) )
             return pResult;
-        return Ivy_ObjCreate( pGhost );
+        return Ivy_ObjCreate( p, pGhost );
     }
     /// remember the latches
     pLat0 = Ivy_ObjFanin0(pGhost);
@@ -64,16 +64,13 @@ Ivy_Obj_t * Ivy_CanonPair_rec( Ivy_Obj_t * pGhost )
     Type = Ivy_ObjType(pGhost);
     fCompl0 = Ivy_ObjFaninC0(pGhost);
     fCompl1 = Ivy_ObjFaninC1(pGhost);
-    // modify the fanins to be latch fanins
-    pGhost->Fanin0 = Ivy_ObjFaninId0(pLat0);
-    pGhost->Fanin1 = Ivy_ObjFaninId0(pLat1);
     // call recursively
-    pResult = Ivy_CanonPair_rec( pGhost );
+    pResult = Ivy_Oper( p, Ivy_NotCond(Ivy_ObjFanin0(pLat0), fCompl0), Ivy_NotCond(Ivy_ObjFanin0(pLat1), fCompl1), Type );
     // build latch on top of this
     Init0 = Ivy_InitNotCond( Ivy_ObjInit(pLat0), fCompl0 );
     Init1 = Ivy_InitNotCond( Ivy_ObjInit(pLat1), fCompl1 );
     Init  = (Type == IVY_AND)? Ivy_InitAnd(Init0, Init1) : Ivy_InitExor(Init0, Init1);
-    return Ivy_CanonLatch( pResult, Init );
+    return Ivy_Latch( p, pResult, Init );
 }
 
 /**Function*************************************************************
@@ -87,11 +84,11 @@ Ivy_Obj_t * Ivy_CanonPair_rec( Ivy_Obj_t * pGhost )
   SeeAlso     []
 
 ***********************************************************************/
-Ivy_Obj_t * Ivy_CanonAnd( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
+Ivy_Obj_t * Ivy_CanonAnd( Ivy_Man_t * p, Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
 {
     Ivy_Obj_t * pGhost, * pResult;
-    pGhost = Ivy_ObjCreateGhost( pObj0, pObj1, IVY_AND, IVY_INIT_NONE );
-    pResult = Ivy_CanonPair_rec( pGhost );
+    pGhost = Ivy_ObjCreateGhost( p, pObj0, pObj1, IVY_AND, IVY_INIT_NONE );
+    pResult = Ivy_CanonPair_rec( p, pGhost );
     return pResult;
 }
 
@@ -106,14 +103,14 @@ Ivy_Obj_t * Ivy_CanonAnd( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
   SeeAlso     []
 
 ***********************************************************************/
-Ivy_Obj_t * Ivy_CanonExor( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
+Ivy_Obj_t * Ivy_CanonExor( Ivy_Man_t * p, Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
 {
     Ivy_Obj_t * pGhost, * pResult;
     int fCompl = Ivy_IsComplement(pObj0) ^ Ivy_IsComplement(pObj1);
     pObj0 = Ivy_Regular(pObj0);
     pObj1 = Ivy_Regular(pObj1);
-    pGhost = Ivy_ObjCreateGhost( pObj0, pObj1, IVY_EXOR, IVY_INIT_NONE );
-    pResult = Ivy_CanonPair_rec( pGhost );
+    pGhost = Ivy_ObjCreateGhost( p, pObj0, pObj1, IVY_EXOR, IVY_INIT_NONE );
+    pResult = Ivy_CanonPair_rec( p, pGhost );
     return Ivy_NotCond( pResult, fCompl );
 }
 
@@ -128,15 +125,15 @@ Ivy_Obj_t * Ivy_CanonExor( Ivy_Obj_t * pObj0, Ivy_Obj_t * pObj1 )
   SeeAlso     []
 
 ***********************************************************************/
-Ivy_Obj_t * Ivy_CanonLatch( Ivy_Obj_t * pObj, Ivy_Init_t Init )
+Ivy_Obj_t * Ivy_CanonLatch( Ivy_Man_t * p, Ivy_Obj_t * pObj, Ivy_Init_t Init )
 {
     Ivy_Obj_t * pGhost, * pResult;
     int fCompl = Ivy_IsComplement(pObj);
     pObj = Ivy_Regular(pObj);
-    pGhost = Ivy_ObjCreateGhost( pObj, Ivy_ObjConst1(pObj), IVY_LATCH, Ivy_InitNotCond(Init, fCompl) );
-    pResult = Ivy_TableLookup( pGhost );
+    pGhost = Ivy_ObjCreateGhost( p, pObj, NULL, IVY_LATCH, Ivy_InitNotCond(Init, fCompl) );
+    pResult = Ivy_TableLookup( p, pGhost );
     if ( pResult == NULL )
-        pResult = Ivy_ObjCreate( pGhost );
+        pResult = Ivy_ObjCreate( p, pGhost );
     return Ivy_NotCond( pResult, fCompl );
 }