From a807864e4251c1b35cf6b27f739f45b1c6696d74 Mon Sep 17 00:00:00 2001
From: yeom <yeom>
Date: Thu, 21 Jul 2011 20:37:22 +0000
Subject: [PATCH] try to fix annotation errors

---
 Robust/src/Analysis/SSJava/FlowDownCheck.java | 30 ++-------
 .../src/Tests/ssJava/mp3decoder/Decoder.java  | 65 +++++++++++++------
 .../ssJava/mp3decoder/LayerIDecoder.java      | 38 +++++------
 .../ssJava/mp3decoder/LayerIIDecoder.java     |  2 +-
 .../ssJava/mp3decoder/LayerIIIDecoder.java    |  8 +--
 .../ssJava/mp3decoder/SynthesisFilter.java    |  2 +-
 6 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/Robust/src/Analysis/SSJava/FlowDownCheck.java b/Robust/src/Analysis/SSJava/FlowDownCheck.java
index 74e1c252..d095bc39 100644
--- a/Robust/src/Analysis/SSJava/FlowDownCheck.java
+++ b/Robust/src/Analysis/SSJava/FlowDownCheck.java
@@ -920,26 +920,6 @@ public class FlowDownCheck {
 
     ClassDescriptor cd = md.getClassDesc();
 
-    // check arguments
-    Set<CompositeLocation> glbInputSet = new HashSet<CompositeLocation>();
-    for (int i = 0; i < con.numArgs(); i++) {
-      ExpressionNode en = con.getArg(i);
-      CompositeLocation argLoc =
-          checkLocationFromExpressionNode(md, nametable, en, new CompositeLocation());
-      glbInputSet.add(argLoc);
-      addLocationType(en.getType(), argLoc);
-    }
-
-    // check array initializers
-    // if ((con.getArrayInitializer() != null)) {
-    // checkLocationFromArrayInitializerNode(md, nametable,
-    // con.getArrayInitializer());
-    // }
-
-    if (glbInputSet.size() > 0) {
-      return CompositeLattice.calculateGLB(glbInputSet);
-    }
-
     CompositeLocation compLoc = new CompositeLocation();
     compLoc.addLocation(Location.createTopLocation(md));
     return compLoc;
@@ -1175,11 +1155,11 @@ public class FlowDownCheck {
       srcLocation = new CompositeLocation();
       srcLocation = checkLocationFromExpressionNode(md, nametable, an.getSrc(), srcLocation);
 
-      // System.out.println(" an= " + an.printNode(0) + " an.getSrc()=" +
-      // an.getSrc().getClass()
-      // + " at " + cd.getSourceFileName() + "::" + an.getNumLine());
-      // System.out.println("srcLocation=" + srcLocation);
-      // System.out.println("dstLocation=" + destLocation);
+       System.out.println("\n an= " + an.printNode(0) + " an.getSrc()=" +
+       an.getSrc().getClass()
+       + " at " + cd.getSourceFileName() + "::" + an.getNumLine());
+       System.out.println("srcLocation=" + srcLocation);
+       System.out.println("dstLocation=" + destLocation);
 
       if (!CompositeLattice.isGreaterThan(srcLocation, destLocation, generateErrorMessage(cd, an))) {
         throw new Error("The value flow from " + srcLocation + " to " + destLocation
diff --git a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
index 6b8a588c..25cea213 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
@@ -27,7 +27,7 @@
  * @version 0.0.7 12/12/99
  * @since	0.0.5
  */
-@LATTICE("ST,OUT,FIL,DE,O,EQ,PA,INIT,DE*")
+@LATTICE("ST,OUT,FIL,DE<LA,O,EQ,PA,INIT,DE*")
 public class Decoder implements DecoderErrors
 {
 	static private final Params DEFAULT_PARAMS = new Params();
@@ -141,21 +141,41 @@ public class Decoder implements DecoderErrors
 	  //		    initialize(header,stream);
 	  //		}
 
-	  @LOC("DELTA(TH)") int layer = header.layer();
+	  @LOC("TH") int layer = header.layer();
 
 	  output.clear_buffer();
 
-	  @LOC("TH,Decoder.DE") FrameDecoder decoder = retrieveDecoder(header, stream, layer);
-	  decoder.decodeFrame();
+//	  @LOC("DE,Decoder.DE") FrameDecoder decoder = retrieveDecoder(header, stream, layer); // return ceil=DELTA(TH)
+//	  decoder.decodeFrame();
 
 	  if(layer==3){
-	    l3decoder=(LayerIIIDecoder)decoder;
+	    if (l3decoder==null)
+	    {
+	      l3decoder = new LayerIIIDecoder(stream, 
+	          header, filter1, filter2, 
+	          output, OutputChannels.BOTH_CHANNELS);
+	    }                             
+	    l3decoder.decodeFrame();
 	  }else if(layer==2){
-	    l2decoder=(LayerIIDecoder)decoder;
+	    if (l2decoder==null)
+	    {
+	      l2decoder = new LayerIIDecoder();
+	      l2decoder.create(stream, 
+	          header, filter1, filter2, 
+	          output, OutputChannels.BOTH_CHANNELS);                 
+	    }
+	    l2decoder.decodeFrame();
 	  }else{
-	    l1decoder=(LayerIDecoder)decoder;
+	    if (l1decoder==null)
+	    {
+	      l1decoder = new LayerIDecoder();
+	      l1decoder.create(stream, 
+	          header, filter1, filter2, 
+	          output, OutputChannels.BOTH_CHANNELS);                 
+	    }
+	    l1decoder.decodeFrame();
 	  }
-	  
+
 	  output.write_buffer(1);
 
 	  return output;	
@@ -224,12 +244,12 @@ public class Decoder implements DecoderErrors
 		return new DecoderException(errorcode, throwable);
 	}
 	
-	@LATTICE("DE<IN,THISLOC=IN")
-	@RETURNLOC("DE")
+	@LATTICE("IN,TH,THISLOC=TH")
+	@RETURNLOC("TH")
 	protected FrameDecoder retrieveDecoder(@LOC("IN") Header header, @LOC("IN") Bitstream stream, @LOC("IN") int layer)
 		throws DecoderException
 	{
-		@LOC("DE") FrameDecoder decoder = null;
+//		@LOC("DE") FrameDecoder decoder = null;
 		
 		// REVIEW: allow channel output selection type
 		// (LEFT, RIGHT, BOTH, DOWNMIX)
@@ -243,7 +263,8 @@ public class Decoder implements DecoderErrors
 					output, OutputChannels.BOTH_CHANNELS);
 			}						
 			
-			decoder = l3decoder;
+			return l3decoder;
+//			decoder = l3decoder;
 			break;
 		case 2:
 			if (l2decoder==null)
@@ -253,7 +274,8 @@ public class Decoder implements DecoderErrors
 					header, filter1, filter2, 
 					output, OutputChannels.BOTH_CHANNELS);				
 			}
-			decoder = l2decoder;
+              return l2decoder;
+//			decoder = l2decoder;
 			break;
 		case 1:
 			if (l1decoder==null)
@@ -263,16 +285,17 @@ public class Decoder implements DecoderErrors
 					header, filter1, filter2, 
 					output, OutputChannels.BOTH_CHANNELS);				
 			}
-			decoder = l1decoder;
+              return l1decoder;
+//			decoder = l1decoder;
 			break;
 		}
-						
-		if (decoder==null)
-		{
-			throw newDecoderException(UNSUPPORTED_LAYER, null);
-		}
-		
-		return decoder;
+//						
+//		if (decoder==null)
+//		{
+//			throw newDecoderException(UNSUPPORTED_LAYER, null);
+//		}
+//		
+//		return decoder;
 	}
 	
         public void initialize(Header header, Bitstream stream)
diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
index 3b2285b0..89913a84 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
@@ -38,7 +38,7 @@
     @LOC("H") protected SynthesisFilter                         filter2;
     @LOC("H") protected Obuffer 				buffer;
     @LOC("H") protected int 					which_channels;
-    @LOC("H") protected int					mode;
+    @LOC("SH") protected int					mode;
 	
     @LOC("SH") protected int					num_subbands;
     @LOC("L") protected Subband[]				subbands;
@@ -124,25 +124,25 @@
 	
 	protected void readSampleData()
 	{
-	        @LOC("SH") boolean read_ready = false;
-		@LOC("SH") boolean write_ready = false;
-		@LOC("OUT") int mode = header.mode();
-		@LOC("SH") int i;
-		do
-  		{
-  		  for (i = 0; i < num_subbands; ++i)
-  		  	read_ready = subbands[i].read_sampledata(stream);
-  		  do
-  		  {
-  		  	for (i = 0; i < num_subbands; ++i)
-  		  		write_ready = subbands[i].put_next_sample(which_channels,filter1, filter2);
+       @LOC("SH") boolean read_ready = false;
+	  @LOC("SH") boolean write_ready = false;
+	  @LOC("OUT") int mode = header.mode();
+	  @LOC("SH") int i;
+	  do
+	  {
+	    for (i = 0; i < num_subbands; ++i)
+	      read_ready = subbands[i].read_sampledata(stream); // DELTA[Loc[readSampleData.V],Loc[LayerIDecoder.L]]
+	    do
+	    {
+	      for (i = 0; i < num_subbands; ++i)
+	        write_ready = subbands[i].put_next_sample(which_channels,filter1, filter2);
+
+	      filter1.calculate_pcm_samples(buffer);
+	      if ((which_channels == OutputChannels.BOTH_CHANNELS) && (mode != Header.SINGLE_CHANNEL))
+	        filter2.calculate_pcm_samples(buffer);
+	    } while (!write_ready);
+	  } while (!read_ready);
 
-  		  	filter1.calculate_pcm_samples(buffer);
-  		  	if ((which_channels == OutputChannels.BOTH_CHANNELS) && (mode != Header.SINGLE_CHANNEL))
-           		filter2.calculate_pcm_samples(buffer);
-  		  } while (!write_ready);
-  		} while (!read_ready);
-		
 	}
 
 //	/**
diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
index 28142504..320a8310 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIIDecoder.java
@@ -1018,7 +1018,7 @@ class LayerIIDecoder extends LayerIDecoder implements FrameDecoder
 	  /**
 	   *
 	   */
-          @LATTICE("OUT<V,V<SH,SH<TEMP,TEMP<TMP,TMP<THIS,THIS<IN,SH*,TEMP*,TMP*,THISLOC=THIS,GLOBALLOC=IN")
+          @LATTICE("OUT<V,V<TEMP,TEMP<SH,TEMP<TMP,TMP<THIS,THIS<IN,SH*,TEMP*,TMP*,THISLOC=THIS,GLOBALLOC=IN")
 	  @RETURNLOC("V")
 	  public boolean read_sampledata (@LOC("IN") Bitstream stream)
 	  {
diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
index 8d9bb67d..ff6d4a16 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
@@ -282,11 +282,9 @@ final class LayerIIIDecoder implements FrameDecoder {
     get_side_info();
 
     for (i = 0; i < nSlots; i++)
-      br.hputbuf(stream.get_bits(8)); // br < stream
-
-    // br < main_data_end
-    main_data_end = br.hsstell() >>> 3; // of previous frame  
-     
+      br.hputbuf(stream.get_bits(8)); 
+    
+    main_data_end = br.hsstell() >>> 3;      
 
     if ((flush_main = (br.hsstell() & 7)) != 0) { // flush_main < br
       br.hgetbits(8 - flush_main); // br < flush_main
diff --git a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
index 8b152fd9..1a34e903 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
@@ -463,7 +463,7 @@ final class SynthesisFilter
     new_v15 = p15;
     new_v13 = p15 + p7;
     new_v11 = p15 + p7 + p11;
-    new_v5 = new_v11 + p5 + p13;
+    new_v5 = p15 + p7 + p11 + p5 + p13;
     
 //    new_v7 = (new_v9 = p15 + p11 + p3) + p13;
     new_v9 = p15 + p11 + p3;
-- 
2.34.1