changes

diff --git a/Robust/src/Analysis/SSJava/FlowDownCheck.java b/Robust/src/Analysis/SSJava/FlowDownCheck.java
index 0b705e51c1327db7459f8572bbe2aa2d09ade495..85a70c4d7e2dff6b77bfa94b26d50c2fcfb45b16 100644 (file)
--- a/Robust/src/Analysis/SSJava/FlowDownCheck.java
+++ b/Robust/src/Analysis/SSJava/FlowDownCheck.java
@@ -409,9 +409,9 @@ public class FlowDownCheck {
       // check if return value is equal or higher than RETRUNLOC of method
       // declaration annotation
       CompositeLocation returnLocAt = md2ReturnLoc.get(md);
-      
-      if (CompositeLattice.isGreaterThan(returnLocAt, expLoc,
-          generateErrorMessage(md.getClassDesc(), rn))) {
+
+      if (CompositeLattice.compare(returnLocAt, expLoc,
+          generateErrorMessage(md.getClassDesc(), rn))!=ComparisonResult.LESS) {
         throw new Error(
             "Return value location is not equal or higher than the declaraed return location at "
                 + md.getClassDesc().getSourceFileName() + "::" + rn.getNumLine());
@@ -563,7 +563,8 @@ public class FlowDownCheck {
   private CompositeLocation checkLocationFromDeclarationNode(MethodDescriptor md,
       SymbolTable nametable, DeclarationNode dn) {
 
-    System.out.println("DeclarationNode=" + dn.printNode(0));
+    System.out.println("DeclarationNode=" + dn.printNode(0) + " "
+        + generateErrorMessage(md.getClassDesc(), dn));
 
     VarDescriptor vd = dn.getVarDescriptor();
 
@@ -701,17 +702,21 @@ public class FlowDownCheck {
         checkLocationFromExpressionNode(md, nametable, tn.getFalseExpr(), new CompositeLocation());
     addLocationType(tn.getFalseExpr().getType(), falseLoc);
 
-    // locations from true/false branches can be TOP when there are only literal values
+    // locations from true/false branches can be TOP when there are only literal
+    // values
     // in this case, we don't need to check flow down rule!
-    
+
     // check if condLoc is higher than trueLoc & falseLoc
-    if (!trueLoc.get(0).isTop() && !CompositeLattice.isGreaterThan(condLoc, trueLoc, generateErrorMessage(cd, tn))) {
+    if (!trueLoc.get(0).isTop()
+        && !CompositeLattice.isGreaterThan(condLoc, trueLoc, generateErrorMessage(cd, tn))) {
       throw new Error(
           "The location of the condition expression is lower than the true expression at "
               + cd.getSourceFileName() + ":" + tn.getCond().getNumLine());
     }
 
-    if (!falseLoc.get(0).isTop() && !CompositeLattice.isGreaterThan(condLoc, falseLoc, generateErrorMessage(cd, tn.getCond()))) {
+    if (!falseLoc.get(0).isTop()
+        && !CompositeLattice.isGreaterThan(condLoc, falseLoc,
+            generateErrorMessage(cd, tn.getCond()))) {
       throw new Error(
           "The location of the condition expression is lower than the true expression at "
               + cd.getSourceFileName() + ":" + tn.getCond().getNumLine());
@@ -896,12 +901,13 @@ public class FlowDownCheck {
       // addTypeLocation(on.getRight().getType(), rightLoc);
     }
 
-    // System.out.println("checking op node=" + on.printNode(0));
-    // System.out.println("left loc=" + leftLoc + " from " +
-    // on.getLeft().getClass());
-    // System.out.println("right loc=" + rightLoc + " from " +
-    // on.getRight().getClass());
-
+    System.out.println("checking op node=" + on.printNode(0)
+        + generateErrorMessage(md.getClassDesc(), on));
+    System.out.println("left loc=" + leftLoc + " from " + on.getLeft().getClass());
+    if (on.getRight() != null) {
+      System.out.println("right loc=" + rightLoc + " from " + on.getRight().kind());
+    }
+    
     Operation op = on.getOp();
 
     switch (op.getOp()) {
@@ -960,14 +966,13 @@ public class FlowDownCheck {
   private CompositeLocation checkLocationFromNameNode(MethodDescriptor md, SymbolTable nametable,
       NameNode nn, CompositeLocation loc) {
 
+
     NameDescriptor nd = nn.getName();
     if (nd.getBase() != null) {
-
       loc = checkLocationFromExpressionNode(md, nametable, nn.getExpression(), loc);
       // addTypeLocation(nn.getExpression().getType(), loc);
     } else {
       String varname = nd.toString();
-
       if (varname.equals("this")) {
         // 'this' itself!
         MethodLattice<String> methodLattice = ssjava.getMethodLattice(md);
@@ -991,7 +996,6 @@ public class FlowDownCheck {
       } else if (d instanceof FieldDescriptor) {
         // the type of field descriptor has a location!
         FieldDescriptor fd = (FieldDescriptor) d;
-
         if (fd.isStatic()) {
           if (fd.isFinal()) {
             // if it is 'static final', the location has TOP since no one can
@@ -1061,7 +1065,6 @@ public class FlowDownCheck {
         return destLocation;
       }
       srcLocation = new CompositeLocation();
-      System.out.println("checkLocationFromExpressionNode=" + an.getSrc().printNode(0));
       srcLocation = checkLocationFromExpressionNode(md, nametable, an.getSrc(), srcLocation);
       // System.out.println(" an= " + an.printNode(0) + " an.getSrc()=" +
       // an.getSrc().getClass()
@@ -1156,14 +1159,13 @@ public class FlowDownCheck {
     int idx = decl.indexOf(".");
     String className = decl.substring(0, idx);
     String fieldName = decl.substring(idx + 1);
-    
+
     className.replaceAll(" ", "");
     fieldName.replaceAll(" ", "");
 
     Descriptor d = state.getClassSymbolTable().get(className);
 
     if (d == null) {
-      System.out.println("className="+className+" to d="+d);
       throw new Error("The class in the location declaration '" + decl + "' does not exist at "
           + msg);
     }
@@ -1172,7 +1174,7 @@ public class FlowDownCheck {
     SSJavaLattice<String> lattice = ssjava.getClassLattice((ClassDescriptor) d);
     if (!lattice.containsKey(fieldName)) {
       throw new Error("The location " + fieldName + " is not defined in the field lattice of '"
-          + className + "' at "+msg);
+          + className + "' at " + msg);
     }
 
     return new Location(d, fieldName);
@@ -1247,6 +1249,10 @@ public class FlowDownCheck {
 
       if (!(fd.isFinal() && fd.isStatic())) {
         checkFieldDeclaration(cd, fd);
+      } else {
+        // for static final, assign top location by default
+        Location loc = Location.createTopLocation(cd);
+        addLocationType(fd.getType(), loc);
       }
     }
   }
@@ -1313,7 +1319,7 @@ public class FlowDownCheck {
 
     public static boolean isGreaterThan(CompositeLocation loc1, CompositeLocation loc2, String msg) {
 
-      System.out.println("isGreaterThan="+loc1+" "+loc2+" msg="+msg);
+      System.out.println("isGreaterThan=" + loc1 + " " + loc2 + " msg=" + msg);
       int baseCompareResult = compareBaseLocationSet(loc1, loc2, true, msg);
       if (baseCompareResult == ComparisonResult.EQUAL) {
         if (compareDelta(loc1, loc2) == ComparisonResult.GREATER) {
@@ -1381,7 +1387,7 @@ public class FlowDownCheck {
 
         if (!loc1.getDescriptor().equals(loc2.getDescriptor())) {
           throw new Error("Failed to compare two locations of " + compLoc1 + " and " + compLoc2
-              + " because they are not comparable at "+msg);
+              + " because they are not comparable at " + msg);
         }
 
         Descriptor d1 = loc1.getDescriptor();
@@ -1433,7 +1439,7 @@ public class FlowDownCheck {
 
         if (numOfTie != compLoc2.getSize()) {
           throw new Error("Failed to compare two locations of " + compLoc1 + " and " + compLoc2
-              + " because they are not comparable at "+msg);
+              + " because they are not comparable at " + msg);
         }
 
         return ComparisonResult.EQUAL;
@@ -1445,7 +1451,6 @@ public class FlowDownCheck {
 
     public static CompositeLocation calculateGLB(Set<CompositeLocation> inputSet) {
 
-      System.out.println("calculateGLB="+inputSet);
       // System.out.println("Calculating GLB=" + inputSet);
       CompositeLocation glbCompLoc = new CompositeLocation();
 
@@ -1494,19 +1499,6 @@ public class FlowDownCheck {
       glbCompLoc.addLocation(new Location(priorityDescriptor, glbOfPriorityLoc));
       Set<CompositeLocation> compSet = locId2CompLocSet.get(glbOfPriorityLoc);
 
-      // here find out composite location that has a maximum length tuple
-      // if we have three input set: [A], [A,B], [A,B,C]
-      // maximum length tuple will be [A,B,C]
-      int max = 0;
-      CompositeLocation maxFromCompSet = null;
-      for (Iterator iterator = compSet.iterator(); iterator.hasNext();) {
-        CompositeLocation c = (CompositeLocation) iterator.next();
-        if (c.getSize() > max) {
-          max = c.getSize();
-          maxFromCompSet = c;
-        }
-      }
-
       if (compSet == null) {
         // when GLB(x1,x2)!=x1 and !=x2 : GLB case 4
         // mean that the result is already lower than <x1,y1> and <x2,y2>
@@ -1514,11 +1506,24 @@ public class FlowDownCheck {
 
         // in this case, do not take care about delta
         // CompositeLocation inputComp = inputSet.iterator().next();
-        CompositeLocation inputComp = maxCompLoc;
-        for (int i = 1; i < inputComp.getSize(); i++) {
-          glbCompLoc.addLocation(Location.createTopLocation(inputComp.get(i).getDescriptor()));
+        for (int i = 1; i < maxTupleSize; i++) {
+          glbCompLoc.addLocation(Location.createTopLocation(maxCompLoc.get(i).getDescriptor()));
         }
       } else {
+
+        // here find out composite location that has a maximum length tuple
+        // if we have three input set: [A], [A,B], [A,B,C]
+        // maximum length tuple will be [A,B,C]
+        int max = 0;
+        CompositeLocation maxFromCompSet = null;
+        for (Iterator iterator = compSet.iterator(); iterator.hasNext();) {
+          CompositeLocation c = (CompositeLocation) iterator.next();
+          if (c.getSize() > max) {
+            max = c.getSize();
+            maxFromCompSet = c;
+          }
+        }
+
         if (compSet.size() == 1) {
 
           // if GLB(x1,x2)==x1 or x2 : GLB case 2,3

diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
index bfc5392a119529e2529053bbabcec11ddc559c28..0f51113e4c630b851f51c8734012db96ddefa1b3 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
@@ -64,6 +64,7 @@ class LayerIIDecoder extends LayerIDecoder implements FrameDecoder
        
        protected void readScaleFactorSelection()
        {
+         // eom note: num_subbands is defined in LayerIDecoder so it has (THIS, LayerIDecoder) Loc
              for (@LOC("V,LayerIIDecoder.SH") int i = 0; i < num_subbands; ++i)
                  ((SubbandLayer2)subbands[i]).read_scalefactor_selection(stream, crc);         
        }

diff --git a/Robust/src/Tests/ssJava/mp3decoder/Obuffer.java b/Robust/src/Tests/ssJava/mp3decoder/Obuffer.java
index 4f444c941e0755efed009fd9d9e8e34f7d87c9ef..836ff889891d01e9e1b223e4c8be4bdc277bdd5d 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/Obuffer.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Obuffer.java
@@ -53,7 +53,7 @@ public abstract class Obuffer
    */
   public void appendSamples(@LOC("IN") int channel, @LOC("IN") float[] f)
   {
-    @LOC("D") short s;
+    @LOC("DELTA(DELTA(D))") short s;
     for (@LOC("C") int i=0; i<32;)
     {
       s = clip(f[i++]); // flow from "IN" to "D"
@@ -64,12 +64,23 @@ public abstract class Obuffer
   /**
    * Clip Sample to 16 Bits
    */
-  @RETURNLOC("IN")
+  @RETURNLOC("D")
   private final short clip(@LOC("IN") float sample)
   {
-    return ((sample > 32767.0f) ?   (short) 32767 :
-      ((sample < -32768.0f) ?  (short)  -32768 :
-        (short) sample));
+    
+    @LOC("D") short s=(short)sample;
+    
+    if(sample > 32767.0f){
+      s=(short)32767;
+    }else if(sample < -32768.0f){
+      s=(short)-32768;
+    }
+    
+    return s;
+
+//    return ((sample > 32767.0f) ?   (short) 32767 :
+//      ((sample < -32768.0f) ?  (short)  -32768 :
+//        (short) sample));
   }
 
   /**

diff --git a/Robust/src/Tests/ssJava/mp3decoder/SampleBuffer.java b/Robust/src/Tests/ssJava/mp3decoder/SampleBuffer.java
index 8254a8a8c33ffe180710a58208813d2799e96eaf..0ff8bc285f5dec23677e5d9fbf7272941a9c4929 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/SampleBuffer.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/SampleBuffer.java
@@ -91,7 +91,7 @@ public class SampleBuffer extends Obuffer
     
   }
 
-  @LATTICE("D<IN,D<C,THISLOC=D")
+  @LATTICE("D<IN,D<C,THISLOC=D,C*")
   public void appendSamples(@LOC("IN") int channel, @LOC("IN") float[] f)
   {
     @LOC("D,SampleBuffer.BUFP") int pos = bufferp[channel]; 

diff --git a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
index 562aac0bbf8bae9009022d4ba4214871d520e1de..99818608cc24cb83fba53fc931a44b79e1b9eebc 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
@@ -187,43 +187,43 @@ final class SynthesisFilter
         }\r
      */\r
 \r
-    @LOC("IN,SynthesisFilter.L4") float new_v0;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v1;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v2;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v3;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v4;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v5;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v6;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v7;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v8;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v9;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v10;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v11;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v12;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v13;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v14;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v15;\r
-    @LOC("IN,SynthesisFilter.L1") float new_v16;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v17;\r
-    @LOC("IN,SynthesisFilter.L1") float new_v18;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v19;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v20;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v21;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v22;\r
-    @LOC("IN,SynthesisFilter.L3") float new_v23;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v24;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v25;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v26;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v27;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v28;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v29;\r
-    @LOC("IN,SynthesisFilter.L2") float new_v30;\r
-    @LOC("IN,SynthesisFilter.L4") float new_v31;\r
-\r
-    new_v0 = new_v1 = new_v2 = new_v3 = new_v4 = new_v5 = new_v6 = new_v7 = new_v8 = new_v9 = \r
-      new_v10 = new_v11 = new_v12 = new_v13 = new_v14 = new_v15 = new_v16 = new_v17 = new_v18 = new_v19 = \r
-        new_v20 = new_v21 = new_v22 = new_v23 = new_v24 = new_v25 = new_v26 = new_v27 = new_v28 = new_v29 = \r
-          new_v30 = new_v31 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v0 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v1 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v2 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v3 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v4 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v5 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v6 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v7 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v8 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v9 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v10 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v11 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v12 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v13 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v14 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v15 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L1") float new_v16 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v17 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L1") float new_v18 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v19 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v20 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v21 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v22 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L3") float new_v23 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v24 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v25 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v26 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v27 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v28 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v29 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L2") float new_v30 = 0.0f;\r
+    @LOC("IN,SynthesisFilter.L4") float new_v31 = 0.0f;\r
+\r
+//    new_v0 = new_v1 = new_v2 = new_v3 = new_v4 = new_v5 = new_v6 = new_v7 = new_v8 = new_v9 = \r
+//      new_v10 = new_v11 = new_v12 = new_v13 = new_v14 = new_v15 = new_v16 = new_v17 = new_v18 = new_v19 = \r
+//        new_v20 = new_v21 = new_v22 = new_v23 = new_v24 = new_v25 = new_v26 = new_v27 = new_v28 = new_v29 = \r
+//          new_v30 = new_v31 = 0.0f;\r
 \r
 \r
     // float[] new_v = new float[32]; // new V[0-15] and V[33-48] of Figure 3-A.2 in ISO DIS 11172-3\r