[Joeq-checkins] CVS: joeq/Compil3r/Analysis/IPA CSPAResults.java,1.34,1.35

[John W. <joe...@us...>]

Update of /cvsroot/joeq/joeq/Compil3r/Analysis/IPA
In directory sc8-pr-cvs1:/tmp/cvs-serv27560/Compil3r/Analysis/IPA

Modified Files:
	CSPAResults.java 
Log Message:
Fix usages of satOne().

Change to use BDDDomain.getName().

Index: CSPAResults.java
===================================================================
RCS file: /cvsroot/joeq/joeq/Compil3r/Analysis/IPA/CSPAResults.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** CSPAResults.java	13 Oct 2003 22:16:11 -0000	1.34
--- CSPAResults.java	17 Oct 2003 10:07:26 -0000	1.35
***************
*** 745,748 ****
--- 745,749 ----
          H3toH1.set(new BDDDomain[] { H3c, H3o }, new BDDDomain[] { H1c, H1o } );
          BDD H1set = H1c.set().and(H1o.set());
+         BDD H1H2set = H1set.and(H2c.set().and(H2o.set()));
          BDD H1andFDset = H1set.and(FD.set());
          
***************
*** 764,768 ****
          while (!iter.isZero()) {
              ++num;
!             BDD sol = iter.satOne();
              BDD sol_h2 = sol.exist(H1set);
              sol.free();
--- 765,769 ----
          while (!iter.isZero()) {
              ++num;
!             BDD sol = iter.satOneSet(H1H2set, bdd.zero());
              BDD sol_h2 = sol.exist(H1set);
              sol.free();
***************
*** 889,893 ****
          iter = reachable.id();
          while (!iter.isZero()) {
!             BDD s = iter.satOne();
              int[] val = s.scanAllVar();
              int target_i = val[H1o.getIndex()];
--- 890,894 ----
          iter = reachable.id();
          while (!iter.isZero()) {
!             BDD s = iter.satOneSet(H1o.set(), bdd.zero());
              int[] val = s.scanAllVar();
              int target_i = val[H1o.getIndex()];
***************
*** 913,917 ****
          iter = reachable.id();
          while (!iter.isZero()) {
!             BDD s = iter.satOne();
              int[] val = s.scanAllVar();
              int target_i = val[H1o.getIndex()];
--- 914,918 ----
          iter = reachable.id();
          while (!iter.isZero()) {
!             BDD s = iter.satOneSet(H1o.set(), bdd.zero());
              int[] val = s.scanAllVar();
              int target_i = val[H1o.getIndex()];
***************
*** 928,932 ****
              BDD pt = ci_fieldPt.restrict(H1o.ithVar(target_i));
              while (!pt.isZero()) {
!                 BDD s2 = pt.satOne();
                  int[] val2 = s2.scanAllVar();
                  int target2_i = val2[H2o.getIndex()];
--- 929,933 ----
              BDD pt = ci_fieldPt.restrict(H1o.ithVar(target_i));
              while (!pt.isZero()) {
!                 BDD s2 = pt.satOneSet(H2o.set().and(FD.set()), bdd.zero());
                  int[] val2 = s2.scanAllVar();
                  int target2_i = val2[H2o.getIndex()];
***************
*** 980,984 ****
              BDD pt = ci_fieldPt.restrict(H1o.ithVar(j));
              while (!pt.isZero()) {
!                 BDD s = pt.satOne();
                  int[] val = s.scanAllVar();
                  int target_i = val[H2o.getIndex()];
--- 981,985 ----
              BDD pt = ci_fieldPt.restrict(H1o.ithVar(j));
              while (!pt.isZero()) {
!                 BDD s = pt.satOneSet(H2o.set().and(FD.set()), bdd.zero());
                  int[] val = s.scanAllVar();
                  int target_i = val[H2o.getIndex()];
***************
*** 1271,1283 ****
              Assert._assert(bdd_domains[i].varNum() == domainBits[i], "Domain "+i+" bits "+bdd_domains[i].varNum());
          }
!         V1o = bdd_domains[0];
!         V1c = bdd_domains[1];
!         V2o = bdd_domains[2];
!         V2c = bdd_domains[3];
!         FD = bdd_domains[4];
!         H1o = bdd_domains[5];
!         H1c = bdd_domains[6];
!         H2o = bdd_domains[7];
!         H2c = bdd_domains[8];
          
          boolean reverseLocal = System.getProperty("bddreverse", "true").equals("true");
--- 1272,1284 ----
              Assert._assert(bdd_domains[i].varNum() == domainBits[i], "Domain "+i+" bits "+bdd_domains[i].varNum());
          }
!         V1o = bdd_domains[0]; V1o.setName("V1o");
!         V1c = bdd_domains[1]; V1c.setName("V1c");
!         V2o = bdd_domains[2]; V2o.setName("V2o");
!         V2c = bdd_domains[3]; V2c.setName("V2c");
!         FD = bdd_domains[4];  FD.setName("FD");
!         H1o = bdd_domains[5]; H1o.setName("H1o");
!         H1c = bdd_domains[6]; H1c.setName("H1c");
!         H2o = bdd_domains[7]; H2o.setName("H2o");
!         H2c = bdd_domains[8]; H2c.setName("H2c");
          
          boolean reverseLocal = System.getProperty("bddreverse", "true").equals("true");
***************
*** 1425,1442 ****
  
      public static String domainName(BDDDomain d) {
!         switch (d.getIndex()) {
!             case 0: return "V1o";
!             case 1: return "V1c";
!             case 2: return "V2o";
!             case 3: return "V2c";
!             case 4: return "FD";
!             case 5: return "H1o";
!             case 6: return "H1c";
!             case 7: return "H2o";
!             case 8: return "H2c";
!             case 9: return "H3o";
!             case 10: return "H3c";
!             default: return "???";
!         }
      }
  
--- 1426,1430 ----
  
      public static String domainName(BDDDomain d) {
!         return d.getName();
      }