Changeset 36 for vis_dev/vis-2.3/src/debug/debug.c

Timestamp:

Jan 4, 2012, 12:03:00 PM (13 years ago)

Author:

cecile

Message:

Add Abnormal predicate structures

File:

• vis_dev/vis-2.3/src/debug/debug.c (modified) (2 diffs)

vis_dev/vis-2.3/src/debug/debug.c

@@ -127 +127 @@
 
 
-static int CommandCreateAbnormal(Hrc_Manager_t ** hmgr,int  argc, char ** argv)
+static int CommandCreateAbnormal(Hrc_Manager_t ** hmgr, int  argc, char ** argv)
 {
   Ntk_Network_t * ntk;
+  int c,verbose;
+  Dbg_Abnormal_t * abnormal;
   ntk = Ntk_HrcManagerReadCurrentNetwork(*hmgr);
   if (ntk == NIL(Ntk_Network_t)) {
@@ -135 +137 @@
         return 1;
   }
-  lsGen gen;
-  Ntk_Node_t* node;
-
-  (void) fprintf(vis_stdout, "** NODE **\n");
-  Ntk_NetworkForEachNode(ntk,gen,node){
-          if(Ntk_NodeTestIsCombinational(node)){
-                if(Ntk_NodeReadNumFanins(node) > 1 && Ntk_NodeReadNumFanouts(node)> 0)
-                {
-                  if(strcmp(Ntk_NodeReadName(node),"_n2")==0)
-                  {
-                        char * nodeName = util_strsav(Ntk_NodeReadName(node));
-                printf("%s \n",  nodeName); 
-                        (void) fprintf(vis_stdout, "** read table\n");
-                        Tbl_Table_t    *table =  Ntk_NodeReadTable(node);
-
-                        Tbl_TableWriteBlifMvToFile(table,2,vis_stdout);
-                        // Build new variables abnormal  and  input
-                        //abn
-                        char * abnName = (char *) malloc(strlen(nodeName) + 5);
-                        sprintf(abnName,"abn_%s",Ntk_NodeReadName(node));
-                        Var_Variable_t * abn = Var_VariableAlloc(NIL(Hrc_Node_t),abnName);
-                        Ntk_Node_t * newNode = Ntk_NodeCreateInNetwork(ntk, abnName,abn);
-                        Ntk_NodeDeclareAsPrimaryInput(newNode);
-                        //new free inputs
-                        char * iName = (char *) malloc(strlen(nodeName) + 3);
-                        sprintf(iName,"i_%s",Ntk_NodeReadName(node));
-                        Var_Variable_t * i = Var_VariableAlloc(NIL(Hrc_Node_t),iName);
-                        Ntk_Node_t * newNode2 = Ntk_NodeCreateInNetwork(ntk, iName, i);
-                        Ntk_NodeDeclareAsPrimaryInput(newNode2);
-                        //Add in the table
-                        Tbl_TableAddColumn(table,abn,0);
-                        int abnIndex = Tbl_TableReadVarIndex(table, abn, 0);
-                        Tbl_TableAddColumn(table,i,0);
-                        int iIndex = Tbl_TableReadVarIndex(table, i, 0);
-
-                        //For each row already there in the table
-                        int rowNum;
-                        for(rowNum = 0; rowNum <  Tbl_TableReadNumRows(table);rowNum++){
-                                Tbl_Entry_t *abnEntry = Tbl_EntryAlloc(Tbl_EntryNormal_c);
-                                Tbl_EntrySetValue(abnEntry,0,0);
-                                Tbl_TableSetEntry(table, abnEntry, rowNum, abnIndex, 0);
-                                Tbl_Entry_t *iEntry = Tbl_EntryAlloc(Tbl_EntryNormal_c);
-                                Tbl_EntrySetValue(iEntry,0,1);
-                                Tbl_TableSetEntry(table, iEntry, rowNum, iIndex, 0);
-                        }
-                        //the new row
-                        int r = Tbl_TableAddRow(table);
-
-                        int colNum;
-                    for (colNum = 0; colNum < Tbl_TableReadNumInputs(table); colNum++) {
-                                Tbl_Entry_t * entry = Tbl_EntryAlloc(Tbl_EntryNormal_c);
-                                printf("entry : colNum %d \n",colNum);
-                                if(colNum == abnIndex || colNum == iIndex)
-                                        Tbl_EntrySetValue(entry,1,1);
-                                else
-                                        Tbl_EntrySetValue(entry,0,1);
-                            Tbl_TableSetEntry(table, entry, r, colNum, 0);
-                        }
-                        for (colNum = 0; colNum < Tbl_TableReadNumOutputs(table); colNum++){
-                                Tbl_Entry_t * entry = Tbl_EntryAlloc(Tbl_EntryNormal_c);
-                                Tbl_EntrySetValue(entry,1,1);
-                            Tbl_TableSetEntry(table, entry, r, colNum, 1);
-                        }
-                         printf("---------------\n");
-                         Tbl_TablePrintStats(table, vis_stdout);
-                         Tbl_TableWriteBlifMvToFile(table,0,vis_stdout);
-                         free(abnName);
-                         free(iName);
-                  }
+  while ((c = util_getopt(argc, argv, "vh:m:k:o:")) != EOF) {
+        switch(c) {
+                case 'v':
+                        verbose = 1;
+                        break;
                 }
-         }
-  }
-  // TODO
-  //Remplacer l'ancien network par le nouveau 
+ }
+  abnormal = Dbg_DebugAbnormalAlloc(ntk);
+  abnormal->verbose = verbose;
+  Dbg_AddAbnormalPredicatetoNetwork(abnormal);
 }
 /**Function********************************************************************