From: yeom <yeom>
Date: Wed, 27 Jul 2011 01:07:21 +0000 (+0000)
Subject: changes.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=IRC.git;a=commitdiff_plain;h=bd047bd68decd098b44ab8e7ed1cf9813f099789

changes.
---

diff --git a/Robust/src/Analysis/SSJava/FlowDownCheck.java b/Robust/src/Analysis/SSJava/FlowDownCheck.java
index f24d0fe0..d1a70727 100644
--- a/Robust/src/Analysis/SSJava/FlowDownCheck.java
+++ b/Robust/src/Analysis/SSJava/FlowDownCheck.java
@@ -300,35 +300,45 @@ public class FlowDownCheck {
       assignLocationOfVarDescriptor(vd, md, md.getParameterTable(), bn);
       paramList.add(d2loc.get(vd));
     }
+    Vector<AnnotationDescriptor> methodAnnotations = md.getModifiers().getAnnotations();
 
     // second, check return location annotation
     if (!md.getReturnType().isVoid()) {
       CompositeLocation returnLocComp = null;
-      Vector<AnnotationDescriptor> methodAnnotations = md.getModifiers().getAnnotations();
-      if (methodAnnotations != null) {
-        for (int i = 0; i < methodAnnotations.size(); i++) {
-          AnnotationDescriptor an = methodAnnotations.elementAt(i);
-          if (an.getMarker().equals(ssjava.RETURNLOC)) {
-            // developer explicitly defines method lattice
-            String returnLocDeclaration = an.getValue();
-            returnLocComp = parseLocationDeclaration(md, null, returnLocDeclaration);
-            md2ReturnLoc.put(md, returnLocComp);
+
+      String rtrStr = ssjava.getMethodLattice(md).getReturnLoc();
+      if (rtrStr != null) {
+        returnLocComp = new CompositeLocation(new Location(md, rtrStr));
+      } else {
+        if (methodAnnotations != null) {
+          for (int i = 0; i < methodAnnotations.size(); i++) {
+            AnnotationDescriptor an = methodAnnotations.elementAt(i);
+            if (an.getMarker().equals(ssjava.RETURNLOC)) {
+              // this case, developer explicitly defines method lattice
+              String returnLocDeclaration = an.getValue();
+              returnLocComp = parseLocationDeclaration(md, null, returnLocDeclaration);
+            }
+          }
+        } else {
+          // if developer does not define method lattice
+          // search return location in the method default lattice
+          if (returnLocComp == null) {
+            MethodLattice<String> methodDefaultLattice = ssjava.getMethodDefaultLattice(cd);
+            if (methodDefaultLattice.getReturnLoc() != null) {
+              returnLocComp =
+                  parseLocationDeclaration(md, null, methodDefaultLattice.getReturnLoc());
+            }
           }
-        }
-      }
-      if (returnLocComp == null) {
-        MethodLattice<String> methodDefaultLattice = ssjava.getMethodDefaultLattice(cd);
-        if (methodDefaultLattice.getReturnLoc() != null) {
-          returnLocComp = parseLocationDeclaration(md, null, methodDefaultLattice.getReturnLoc());
-          md2ReturnLoc.put(md, returnLocComp);
         }
       }
 
-      if (!md2ReturnLoc.containsKey(md)) {
+      if (returnLocComp == null) {
         throw new Error("Return location is not specified for the method " + md + " at "
             + cd.getSourceFileName());
       }
 
+      md2ReturnLoc.put(md, returnLocComp);
+
       // check this location
       MethodLattice<String> methodLattice = ssjava.getMethodLattice(md);
       String thisLocId = methodLattice.getThisLoc();
@@ -339,11 +349,13 @@ public class FlowDownCheck {
       CompositeLocation thisLoc = new CompositeLocation(new Location(md, thisLocId));
       paramList.add(0, thisLoc);
 
-      md2ReturnLocGen.put(md, new ReturnLocGenerator(md2ReturnLoc.get(md), paramList,
-          generateErrorMessage(cd, null)));
+      System.out.println("### ReturnLocGenerator="+md);
+      System.out.println("### md2ReturnLoc.get(md)="+md2ReturnLoc.get(md));
+      md2ReturnLocGen.put(md, new ReturnLocGenerator(md2ReturnLoc.get(md), paramList, md + " of "
+          + cd.getSourceFileName()));
     }
 
-    // third, check declarations inside of method
+    // fourth, check declarations inside of method
 
     checkDeclarationInBlockNode(md, md.getParameterTable(), bn);
 
@@ -953,8 +965,8 @@ public class FlowDownCheck {
 
               throw new Error(
                   "Caller doesn't respect an ordering relation among method arguments: callee expects that "
-                      + paramName1 + " should be higher than " + paramName2 + " at "
-                      + md.getClassDesc().getSourceFileName() + ":" + min.getNumLine());
+                      + paramName1 + " should be higher than " + paramName2 + " in " + calleemd
+                      + " at " + md.getClassDesc().getSourceFileName() + ":" + min.getNumLine());
             }
           }
 
@@ -1104,6 +1116,7 @@ public class FlowDownCheck {
         Location locElement = new Location(md, thisLocId);
         loc.addLocation(locElement);
         return loc;
+
       }
 
       Descriptor d = (Descriptor) nametable.get(varname);
diff --git a/Robust/src/Analysis/SSJava/MethodLattice.java b/Robust/src/Analysis/SSJava/MethodLattice.java
index 88eb7b70..b5514b65 100644
--- a/Robust/src/Analysis/SSJava/MethodLattice.java
+++ b/Robust/src/Analysis/SSJava/MethodLattice.java
@@ -1,5 +1,7 @@
 package Analysis.SSJava;
 
+import IR.MethodDescriptor;
+
 public class MethodLattice<T> extends SSJavaLattice<T> {
 
   private T thisLoc;
diff --git a/Robust/src/Tests/ssJava/mp3decoder/Bitstream.java b/Robust/src/Tests/ssJava/mp3decoder/Bitstream.java
index a9750458..82c595cd 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/Bitstream.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Bitstream.java
@@ -33,625 +33,584 @@
  *----------------------------------------------------------------------
  */
 
-
 /**
- * The <code>Bistream</code> class is responsible for parsing
- * an MPEG audio bitstream.
- *
- * <b>REVIEW:</b> much of the parsing currently occurs in the
- * various decoders. This should be moved into this class and associated
- * inner classes.
+ * The <code>Bistream</code> class is responsible for parsing an MPEG audio
+ * bitstream.
+ * 
+ * <b>REVIEW:</b> much of the parsing currently occurs in the various decoders.
+ * This should be moved into this class and associated inner classes.
  */
 @LATTICE("FB<F,FF<F,WP<BI,FF*,WP*,BI*")
 @METHODDEFAULT("OUT<THIS,THIS<VAR,VAR<IN,VAR*,THISLOC=THIS,GLOBALLOC=IN")
-public final class Bitstream implements BitstreamErrors
-{
-	/**
-	 * Synchronization control constant for the initial
-	 * synchronization to the start of a frame.
-	 */
-        @LOC("F") static byte		INITIAL_SYNC = 0;
+public final class Bitstream implements BitstreamErrors {
+  /**
+   * Synchronization control constant for the initial synchronization to the
+   * start of a frame.
+   */
+  @LOC("F")
+  static byte INITIAL_SYNC = 0;
 
-	/**
-	 * Synchronization control constant for non-initial frame
-	 * synchronizations.
-	 */
+  /**
+   * Synchronization control constant for non-initial frame synchronizations.
+   */
 
-        @LOC("F") static byte		STRICT_SYNC = 1;
+  @LOC("F")
+  static byte STRICT_SYNC = 1;
 
-	// max. 1730 bytes per frame: 144 * 384kbit/s / 32000 Hz + 2 Bytes CRC
-	/**
-	 * Maximum size of the frame buffer.
-	 */
-        @LOC("F") private static final int	BUFFER_INT_SIZE = 433;
+  // max. 1730 bytes per frame: 144 * 384kbit/s / 32000 Hz + 2 Bytes CRC
+  /**
+   * Maximum size of the frame buffer.
+   */
+  @LOC("F")
+  private static final int BUFFER_INT_SIZE = 433;
 
-	/**
-	 * The frame buffer that holds the data for the current frame.
-	 */
-        @LOC("FB") private final int[]		framebuffer = new int[BUFFER_INT_SIZE];
+  /**
+   * The frame buffer that holds the data for the current frame.
+   */
+  @LOC("FB")
+  private final int[] framebuffer = new int[BUFFER_INT_SIZE];
 
-	/**
-	 * Number of valid bytes in the frame buffer.
-	 */
-        @LOC("F") private int				framesize;
+  /**
+   * Number of valid bytes in the frame buffer.
+   */
+  @LOC("F")
+  private int framesize;
 
-	/**
-	 * The bytes read from the stream.
-	 */
-        @LOC("FB") private byte[]			frame_bytes = new byte[BUFFER_INT_SIZE*4];
+  /**
+   * The bytes read from the stream.
+   */
+  @LOC("FB")
+  private byte[] frame_bytes = new byte[BUFFER_INT_SIZE * 4];
 
-	/**
-	 * Index into <code>framebuffer</code> where the next bits are
-	 * retrieved.
-	 */
-        @LOC("WP") private int				wordpointer;
+  /**
+   * Index into <code>framebuffer</code> where the next bits are retrieved.
+   */
+  @LOC("WP")
+  private int wordpointer;
 
-	/**
-	 * Number (0-31, from MSB to LSB) of next bit for get_bits()
-	 */
-        @LOC("BI") private int				bitindex;
+  /**
+   * Number (0-31, from MSB to LSB) of next bit for get_bits()
+   */
+  @LOC("BI")
+  private int bitindex;
 
-	/**
-	 * The current specified syncword
-	 */
-        @LOC("F") private int				syncword;
-	
-	/**
-	 * Audio header position in stream.
-	 */
-        @LOC("F")private int				header_pos = 0;
+  /**
+   * The current specified syncword
+   */
+  @LOC("F")
+  private int syncword;
 
-	/**
+  /**
+   * Audio header position in stream.
+   */
+  @LOC("F")
+  private int header_pos = 0;
+
+  /**
 	 *
 	 */
-        @LOC("F") private boolean			single_ch_mode;
-  //private int 			current_frame_number;
-  //private int				last_frame_number;
+  @LOC("F")
+  private boolean single_ch_mode;
+  // private int current_frame_number;
+  // private int last_frame_number;
 
-        @LOC("F") private final int		bitmask[] = {0,	// dummy
-	 0x00000001, 0x00000003, 0x00000007, 0x0000000F,
-	 0x0000001F, 0x0000003F, 0x0000007F, 0x000000FF,
-	 0x000001FF, 0x000003FF, 0x000007FF, 0x00000FFF,
-	 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF,
-     0x0001FFFF };
+  @LOC("F")
+  private final int bitmask[] = {
+      0, // dummy
+      0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F,
+      0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF, 0x00000FFF, 0x00001FFF, 0x00003FFF,
+      0x00007FFF, 0x0000FFFF, 0x0001FFFF };
 
-        @LOC("F") private final PushbackInputStream	source;
+  @LOC("F")
+  private final PushbackInputStream source;
 
-        @LOC("F") private final Header			header = new Header();
+  @LOC("F")
+  private final Header header = new Header();
 
-        @LOC("F") private final byte				syncbuf[] = new byte[4];
+  @LOC("F")
+  private final byte syncbuf[] = new byte[4];
 
-        @LOC("F") private Crc16[]					crc = new Crc16[1];
+  @LOC("F")
+  private Crc16[] crc = new Crc16[1];
 
-        @LOC("F") private byte[]					rawid3v2 = null;
+  @LOC("F")
+  private byte[] rawid3v2 = null;
 
-        @LOC("FF") private boolean					firstframe = true;
+  @LOC("FF")
+  private boolean firstframe = true;
 
+  /**
+   * Construct a IBitstream that reads data from a given InputStream.
+   * 
+   * @param in
+   *          The InputStream to read from.
+   */
+  public Bitstream(InputStream in) {
+    if (in == null)
+      throw new NullPointerException("in");
+    in = new BufferedInputStream(in);
+    loadID3v2(in);
+    firstframe = true;
+    // source = new PushbackInputStream(in, 1024);
+    source = new PushbackInputStream(in, BUFFER_INT_SIZE * 4);
+
+    closeFrame();
+    // current_frame_number = -1;
+    // last_frame_number = -1;
+  }
 
-	/**
-	 * Construct a IBitstream that reads data from a
-	 * given InputStream.
-	 *
-	 * @param in	The InputStream to read from.
-	 */
-	public Bitstream(InputStream in)
-	{
-		if (in==null) throw new NullPointerException("in");
-		in = new BufferedInputStream(in);		
-		loadID3v2(in);
-		firstframe = true;
-		//source = new PushbackInputStream(in, 1024);
-		source = new PushbackInputStream(in, BUFFER_INT_SIZE*4);
-		
-		closeFrame();
-		//current_frame_number = -1;
-		//last_frame_number = -1;
-	}
-
-	/**
-	 * Return position of the first audio header.
-	 * @return size of ID3v2 tag frames.
-	 */
-	public int header_pos()
-	{
-		return header_pos;
-	}
-	
-	/**
-	 * Load ID3v2 frames.
-	 * @param in MP3 InputStream.
-	 * @author JavaZOOM
-	 */
-	private void loadID3v2(InputStream in)
-	{		
-		int size = -1;
-		try
-		{
-			// Read ID3v2 header (10 bytes).
-			in.mark(10);			
-			size = readID3v2Header(in);
-			header_pos = size;			
-		}
-		catch (IOException e)
-		{}
-		finally
-		{
-			try
-			{
-				// Unread ID3v2 header (10 bytes).
-				in.reset();
-			}
-			catch (IOException e)
-			{}
-		}
-		// Load ID3v2 tags.
-		try
-		{
-			if (size > 0)
-			{
-				rawid3v2 = new byte[size];
-				in.read(rawid3v2,0,rawid3v2.length);
-			}			
-		}
-		catch (IOException e)
-		{}
-	}
-	
-	/**
-	 * Parse ID3v2 tag header to find out size of ID3v2 frames. 
-	 * @param in MP3 InputStream
-	 * @return size of ID3v2 frames + header
-	 * @throws IOException
-	 * @author JavaZOOM
-	 */
-	private int readID3v2Header(InputStream in) throws IOException
-	{		
-		byte[] id3header = new byte[4];
-		int size = -10;
-		in.read(id3header,0,3);
-		// Look for ID3v2
-		if ( (id3header[0]=='I') && (id3header[1]=='D') && (id3header[2]=='3'))
-		{
-			in.read(id3header,0,3);
-			int majorVersion = id3header[0];
-			int revision = id3header[1];
-			in.read(id3header,0,4);
-			size = (int) (id3header[0] << 21) + (id3header[1] << 14) + (id3header[2] << 7) + (id3header[3]);
-		}
-		return (size+10);
-	}
-	
-	/**
-	 * Return raw ID3v2 frames + header.
-	 * @return ID3v2 InputStream or null if ID3v2 frames are not available.
-	 */
-	public InputStream getRawID3v2()
-	{
-		if (rawid3v2 == null) return null;
-		else
-		{
-			ByteArrayInputStream bain = new ByteArrayInputStream(rawid3v2);		
-			return bain;
-		}
-	}
-
-	/**
-	 * Close the Bitstream.
-	 * @throws BitstreamException
-	 */
-	public void close() throws BitstreamException
-	{
-		try
-		{
-			source.close();
-		}
-		catch (IOException ex)
-		{
-			throw newBitstreamException(STREAM_ERROR, ex);
-		}
-	}
-
-	/**
-	 * Reads and parses the next frame from the input source.
-	 * @return the Header describing details of the frame read,
-	 *	or null if the end of the stream has been reached.
-	 */
-	public Header readFrame() throws BitstreamException
-	{
-		Header result = null;
-		try
-		{
-			result = readNextFrame();
-			// E.B, Parse VBR (if any) first frame.
-			if (firstframe == true)
-			{
-				result.parseVBR(frame_bytes);
-				firstframe = false;
-			}			
-		}
-		catch (BitstreamException ex)
-		{
-			if ((ex.getErrorCode()==INVALIDFRAME))
-			{
-				// Try to skip this frame.
-				//System.out.println("INVALIDFRAME");
-				try
-				{
-					closeFrame();
-					result = readNextFrame();
-				}
-				catch (BitstreamException e)
-				{
-					if ((e.getErrorCode()!=STREAM_EOF))
-					{
-						// wrap original exception so stack trace is maintained.
-						throw newBitstreamException(e.getErrorCode(), e);
-					}
-				}
-			}
-			else if ((ex.getErrorCode()!=STREAM_EOF))
-			{
-				// wrap original exception so stack trace is maintained.
-				throw newBitstreamException(ex.getErrorCode(), ex);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Read next MP3 frame.
-	 * @return MP3 frame header.
-	 * @throws BitstreamException
-	 */
-	private Header readNextFrame() throws BitstreamException
-	{
-		if (framesize == -1)
-		{
-			nextFrame();
-		}
-		return header;
-	}
-
-
-	/**
-	 * Read next MP3 frame.
-	 * @throws BitstreamException
-	 */
-	private void nextFrame() throws BitstreamException
-	{
-		// entire frame is read by the header class.
-		header.read_header(this, crc);
-	}
-
-	/**
-	 * Unreads the bytes read from the frame.
-	 * @throws BitstreamException
-	 */
-	// REVIEW: add new error codes for this.
-	public void unreadFrame() throws BitstreamException
-	{
-		if (wordpointer==-1 && bitindex==-1 && (framesize>0))
-		{
-			try
-			{
-				source.unread(frame_bytes, 0, framesize);
-			}
-			catch (IOException ex)
-			{
-				throw newBitstreamException(STREAM_ERROR);
-			}
-		}
-	}
-
-	/**
-	 * Close MP3 frame.
-	 */
-	public void closeFrame()
-	{
-		framesize = -1;
-		wordpointer = -1;
-		bitindex = -1;
-	}
-
-	/**
-	 * Determines if the next 4 bytes of the stream represent a
-	 * frame header.
-	 */
-	public boolean isSyncCurrentPosition(int syncmode) throws BitstreamException
-	{
-		int read = readBytes(syncbuf, 0, 4);
-		int headerstring = ((syncbuf[0] << 24) & 0xFF000000) | ((syncbuf[1] << 16) & 0x00FF0000) | ((syncbuf[2] << 8) & 0x0000FF00) | ((syncbuf[3] << 0) & 0x000000FF);
-
-		try
-		{
-			source.unread(syncbuf, 0, read);
-		}
-		catch (IOException ex)
-		{
-		}
-
-		boolean sync = false;
-		switch (read)
-		{
-			case 0:
-				sync = true;
-				break;
-			case 4:
-				sync = isSyncMark(headerstring, syncmode, syncword);
-				break;
-		}
-
-		return sync;
-	}
-
-
-	// REVIEW: this class should provide inner classes to
-	// parse the frame contents. Eventually, readBits will
-	// be removed.
-	public int readBits(int n)
-	{
-		return get_bits(n);
-	}
-
-	public int readCheckedBits(int n)
-	{
-		// REVIEW: implement CRC check.
-		return get_bits(n);
-	}
-
-	protected BitstreamException newBitstreamException(int errorcode)
-	{
-		return new BitstreamException(errorcode, null);
-	}
-	protected BitstreamException newBitstreamException(int errorcode, Throwable throwable)
-	{
-		return new BitstreamException(errorcode, throwable);
-	}
+  /**
+   * Return position of the first audio header.
+   * 
+   * @return size of ID3v2 tag frames.
+   */
+  public int header_pos() {
+    return header_pos;
+  }
 
   /**
-   * Get next 32 bits from bitstream.
-   * They are stored in the headerstring.
-   * syncmod allows Synchro flag ID
-   * The returned value is False at the end of stream.
+   * Load ID3v2 frames.
+   * 
+   * @param in
+   *          MP3 InputStream.
+   * @author JavaZOOM
    */
+  private void loadID3v2(InputStream in) {
+    int size = -1;
+    try {
+      // Read ID3v2 header (10 bytes).
+      in.mark(10);
+      size = readID3v2Header(in);
+      header_pos = size;
+    } catch (IOException e) {
+    } finally {
+      try {
+        // Unread ID3v2 header (10 bytes).
+        in.reset();
+      } catch (IOException e) {
+      }
+    }
+    // Load ID3v2 tags.
+    try {
+      if (size > 0) {
+        rawid3v2 = new byte[size];
+        in.read(rawid3v2, 0, rawid3v2.length);
+      }
+    } catch (IOException e) {
+    }
+  }
 
-	int syncHeader(byte syncmode) throws BitstreamException
-	{
-		boolean sync;
-		int headerstring;
-		// read additional 2 bytes
-		int bytesRead = readBytes(syncbuf, 0, 3);
-
-		if (bytesRead!=3) throw newBitstreamException(STREAM_EOF, null);
-
-		headerstring = ((syncbuf[0] << 16) & 0x00FF0000) | ((syncbuf[1] << 8) & 0x0000FF00) | ((syncbuf[2] << 0) & 0x000000FF);
-
-		do
-		{
-			headerstring <<= 8;
-
-			if (readBytes(syncbuf, 3, 1)!=1)
-				throw newBitstreamException(STREAM_EOF, null);
-
-			headerstring |= (syncbuf[3] & 0x000000FF);
-
-			sync = isSyncMark(headerstring, syncmode, syncword);
-		}
-		while (!sync);
-
-		//current_frame_number++;
-		//if (last_frame_number < current_frame_number) last_frame_number = current_frame_number;
-
-		return headerstring;
-	}
-
-	public boolean isSyncMark(int headerstring, int syncmode, int word)
-	{
-		boolean sync = false;
-
-		if (syncmode == INITIAL_SYNC)
-		{
-			//sync =  ((headerstring & 0xFFF00000) == 0xFFF00000);
-			sync =  ((headerstring & 0xFFE00000) == 0xFFE00000);	// SZD: MPEG 2.5
-		}
-		else
-		{
-			sync =  ((headerstring & 0xFFF80C00) == word) &&
-			    (((headerstring & 0x000000C0) == 0x000000C0) == single_ch_mode);
-		}
-
-		// filter out invalid sample rate
-		if (sync)
-			sync = (((headerstring >>> 10) & 3)!=3);
-		// filter out invalid layer
-		if (sync)
-			sync = (((headerstring >>> 17) & 3)!=0);
-		// filter out invalid version
-		if (sync)
-			sync = (((headerstring >>> 19) & 3)!=1);
-
-		return sync;
-	}
-
-	/**
-	 * Reads the data for the next frame. The frame is not parsed
-	 * until parse frame is called.
-	 */
-	int read_frame_data(int bytesize) throws BitstreamException
-	{
- 		int	numread = 0;
-		numread = readFully(frame_bytes, 0, bytesize);
-		framesize = bytesize;
-		wordpointer = -1;
-	    bitindex = -1;
-	    return numread;
-	}
+  /**
+   * Parse ID3v2 tag header to find out size of ID3v2 frames.
+   * 
+   * @param in
+   *          MP3 InputStream
+   * @return size of ID3v2 frames + header
+   * @throws IOException
+   * @author JavaZOOM
+   */
+  private int readID3v2Header(InputStream in) throws IOException {
+    byte[] id3header = new byte[4];
+    int size = -10;
+    in.read(id3header, 0, 3);
+    // Look for ID3v2
+    if ((id3header[0] == 'I') && (id3header[1] == 'D') && (id3header[2] == '3')) {
+      in.read(id3header, 0, 3);
+      int majorVersion = id3header[0];
+      int revision = id3header[1];
+      in.read(id3header, 0, 4);
+      size =
+          (int) (id3header[0] << 21) + (id3header[1] << 14) + (id3header[2] << 7) + (id3header[3]);
+    }
+    return (size + 10);
+  }
+
+  /**
+   * Return raw ID3v2 frames + header.
+   * 
+   * @return ID3v2 InputStream or null if ID3v2 frames are not available.
+   */
+  public InputStream getRawID3v2() {
+    if (rawid3v2 == null)
+      return null;
+    else {
+      ByteArrayInputStream bain = new ByteArrayInputStream(rawid3v2);
+      return bain;
+    }
+  }
+
+  /**
+   * Close the Bitstream.
+   * 
+   * @throws BitstreamException
+   */
+  public void close() throws BitstreamException {
+    try {
+      source.close();
+    } catch (IOException ex) {
+      throw newBitstreamException(STREAM_ERROR, ex);
+    }
+  }
+
+  /**
+   * Reads and parses the next frame from the input source.
+   * 
+   * @return the Header describing details of the frame read, or null if the end
+   *         of the stream has been reached.
+   */
+  public Header readFrame() throws BitstreamException {
+    Header result = null;
+    try {
+      result = readNextFrame();
+      // E.B, Parse VBR (if any) first frame.
+      if (firstframe == true) {
+        result.parseVBR(frame_bytes);
+        firstframe = false;
+      }
+    } catch (BitstreamException ex) {
+      if ((ex.getErrorCode() == INVALIDFRAME)) {
+        // Try to skip this frame.
+        // System.out.println("INVALIDFRAME");
+        try {
+          closeFrame();
+          result = readNextFrame();
+        } catch (BitstreamException e) {
+          if ((e.getErrorCode() != STREAM_EOF)) {
+            // wrap original exception so stack trace is maintained.
+            throw newBitstreamException(e.getErrorCode(), e);
+          }
+        }
+      } else if ((ex.getErrorCode() != STREAM_EOF)) {
+        // wrap original exception so stack trace is maintained.
+        throw newBitstreamException(ex.getErrorCode(), ex);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Read next MP3 frame.
+   * 
+   * @return MP3 frame header.
+   * @throws BitstreamException
+   */
+  private Header readNextFrame() throws BitstreamException {
+    if (framesize == -1) {
+      nextFrame();
+    }
+    return header;
+  }
+
+  /**
+   * Read next MP3 frame.
+   * 
+   * @throws BitstreamException
+   */
+  private void nextFrame() throws BitstreamException {
+    // entire frame is read by the header class.
+    header.read_header(this, crc);
+  }
+
+  /**
+   * Unreads the bytes read from the frame.
+   * 
+   * @throws BitstreamException
+   */
+  // REVIEW: add new error codes for this.
+  public void unreadFrame() throws BitstreamException {
+    if (wordpointer == -1 && bitindex == -1 && (framesize > 0)) {
+      try {
+        source.unread(frame_bytes, 0, framesize);
+      } catch (IOException ex) {
+        throw newBitstreamException(STREAM_ERROR);
+      }
+    }
+  }
+
+  /**
+   * Close MP3 frame.
+   */
+  public void closeFrame() {
+    framesize = -1;
+    wordpointer = -1;
+    bitindex = -1;
+  }
+
+  /**
+   * Determines if the next 4 bytes of the stream represent a frame header.
+   */
+  public boolean isSyncCurrentPosition(int syncmode) throws BitstreamException {
+    int read = readBytes(syncbuf, 0, 4);
+    int headerstring =
+        ((syncbuf[0] << 24) & 0xFF000000) | ((syncbuf[1] << 16) & 0x00FF0000)
+            | ((syncbuf[2] << 8) & 0x0000FF00) | ((syncbuf[3] << 0) & 0x000000FF);
+
+    try {
+      source.unread(syncbuf, 0, read);
+    } catch (IOException ex) {
+    }
+
+    boolean sync = false;
+    switch (read) {
+    case 0:
+      sync = true;
+      break;
+    case 4:
+      sync = isSyncMark(headerstring, syncmode, syncword);
+      break;
+    }
+
+    return sync;
+  }
+
+  // REVIEW: this class should provide inner classes to
+  // parse the frame contents. Eventually, readBits will
+  // be removed.
+  public int readBits(int n) {
+    return get_bits(n);
+  }
+
+  public int readCheckedBits(int n) {
+    // REVIEW: implement CRC check.
+    return get_bits(n);
+  }
+
+  protected BitstreamException newBitstreamException(int errorcode) {
+    return new BitstreamException(errorcode, null);
+  }
+
+  protected BitstreamException newBitstreamException(int errorcode, Throwable throwable) {
+    return new BitstreamException(errorcode, throwable);
+  }
+
+  /**
+   * Get next 32 bits from bitstream. They are stored in the headerstring.
+   * syncmod allows Synchro flag ID The returned value is False at the end of
+   * stream.
+   */
+
+  int syncHeader(byte syncmode) throws BitstreamException {
+    boolean sync;
+    int headerstring;
+    // read additional 2 bytes
+    int bytesRead = readBytes(syncbuf, 0, 3);
+
+    if (bytesRead != 3)
+      throw newBitstreamException(STREAM_EOF, null);
+
+    headerstring =
+        ((syncbuf[0] << 16) & 0x00FF0000) | ((syncbuf[1] << 8) & 0x0000FF00)
+            | ((syncbuf[2] << 0) & 0x000000FF);
+
+    do {
+      headerstring <<= 8;
+
+      if (readBytes(syncbuf, 3, 1) != 1)
+        throw newBitstreamException(STREAM_EOF, null);
+
+      headerstring |= (syncbuf[3] & 0x000000FF);
+
+      sync = isSyncMark(headerstring, syncmode, syncword);
+    } while (!sync);
+
+    // current_frame_number++;
+    // if (last_frame_number < current_frame_number) last_frame_number =
+    // current_frame_number;
+
+    return headerstring;
+  }
+
+  public boolean isSyncMark(int headerstring, int syncmode, int word) {
+    boolean sync = false;
+
+    if (syncmode == INITIAL_SYNC) {
+      // sync = ((headerstring & 0xFFF00000) == 0xFFF00000);
+      sync = ((headerstring & 0xFFE00000) == 0xFFE00000); // SZD: MPEG 2.5
+    } else {
+      sync =
+          ((headerstring & 0xFFF80C00) == word)
+              && (((headerstring & 0x000000C0) == 0x000000C0) == single_ch_mode);
+    }
+
+    // filter out invalid sample rate
+    if (sync)
+      sync = (((headerstring >>> 10) & 3) != 3);
+    // filter out invalid layer
+    if (sync)
+      sync = (((headerstring >>> 17) & 3) != 0);
+    // filter out invalid version
+    if (sync)
+      sync = (((headerstring >>> 19) & 3) != 1);
+
+    return sync;
+  }
+
+  /**
+   * Reads the data for the next frame. The frame is not parsed until parse
+   * frame is called.
+   */
+  int read_frame_data(int bytesize) throws BitstreamException {
+    int numread = 0;
+    numread = readFully(frame_bytes, 0, bytesize);
+    framesize = bytesize;
+    wordpointer = -1;
+    bitindex = -1;
+    return numread;
+  }
 
   /**
    * Parses the data previously read with read_frame_data().
    */
   @LATTICE("GLOBAL<B,B<BNUM,BNUM<K,K<BYTE,BYTE<THIS,B*,K*,THISLOC=THIS,GLOBALLOC=GLOBAL")
-  void parse_frame() throws BitstreamException
-  {
-	// Convert Bytes read to int
-        @LOC("B") int	b=0;
-	@LOC("BYTE") byte[] byteread = frame_bytes;
-	@LOC("BYTE") int bytesize = framesize;
-
-	// Check ID3v1 TAG (True only if last frame).
-	//for (int t=0;t<(byteread.length)-2;t++)
-	//{
-	//	if ((byteread[t]=='T') && (byteread[t+1]=='A') && (byteread[t+2]=='G'))
-	//	{
-	//		System.out.println("ID3v1 detected at offset "+t);
-	//		throw newBitstreamException(INVALIDFRAME, null);
-	//	} 	
-	//}
-	
-	for (@LOC("K") int k=0;k<bytesize;k=k+4)
-	{
-	        @LOC("BYTE") int convert = 0;
-		@LOC("BNUM") byte b0 = 0;
-		@LOC("BNUM") byte b1 = 0;
-		@LOC("BNUM") byte b2 = 0;
-		@LOC("BNUM") byte b3 = 0;
-		b0 = byteread[k];
-		if (k+1<bytesize) b1 = byteread[k+1];
-		if (k+2<bytesize) b2 = byteread[k+2];
-		if (k+3<bytesize) b3 = byteread[k+3];
-		framebuffer[b++] = ((b0 << 24) &0xFF000000) | ((b1 << 16) & 0x00FF0000) | ((b2 << 8) & 0x0000FF00) | (b3 & 0x000000FF);
-	}
-	wordpointer = 0;
+  void parse_frame() throws BitstreamException {
+    // Convert Bytes read to int
+    @LOC("B") int b = 0;
+    @LOC("BYTE") byte[] byteread = frame_bytes;
+    @LOC("BYTE") int bytesize = framesize;
+
+    // Check ID3v1 TAG (True only if last frame).
+    // for (int t=0;t<(byteread.length)-2;t++)
+    // {
+    // if ((byteread[t]=='T') && (byteread[t+1]=='A') && (byteread[t+2]=='G'))
+    // {
+    // System.out.println("ID3v1 detected at offset "+t);
+    // throw newBitstreamException(INVALIDFRAME, null);
+    // }
+    // }
+
+    for (@LOC("K") int k = 0; k < bytesize; k = k + 4) {
+      @LOC("BYTE") int convert = 0;
+      @LOC("BNUM") byte b0 = 0;
+      @LOC("BNUM") byte b1 = 0;
+      @LOC("BNUM") byte b2 = 0;
+      @LOC("BNUM") byte b3 = 0;
+      b0 = byteread[k];
+      if (k + 1 < bytesize)
+        b1 = byteread[k + 1];
+      if (k + 2 < bytesize)
+        b2 = byteread[k + 2];
+      if (k + 3 < bytesize)
+        b3 = byteread[k + 3];
+      framebuffer[b++] =
+          ((b0 << 24) & 0xFF000000) | ((b1 << 16) & 0x00FF0000) | ((b2 << 8) & 0x0000FF00)
+              | (b3 & 0x000000FF);
+    }
+    wordpointer = 0;
     bitindex = 0;
   }
 
   /**
-   * Read bits from buffer into the lower bits of an unsigned int.
-   * The LSB contains the latest read bit of the stream.
-   * (1 <= number_of_bits <= 16)
+   * Read bits from buffer into the lower bits of an unsigned int. The LSB
+   * contains the latest read bit of the stream. (1 <= number_of_bits <= 16)
    */
-  @LATTICE("OUT<RL,RL<THIS,THIS<IN,OUT*,THISLOC=THIS")
-  @RETURNLOC("OUT") 
-  public int get_bits(@LOC("IN")int number_of_bits)
-  {
-        @LOC("OUT") int				returnvalue = 0;
-  	@LOC("THIS,Bitstream.BI") int 			sum = bitindex + number_of_bits;
-
-	// E.B
-	// There is a problem here, wordpointer could be -1 ?!
-    if (wordpointer < 0) wordpointer = 0;
+  @LATTICE("OUT<RL,RL<THIS,THIS<IN,OUT*,THISLOC=THIS,RETURNLOC=OUT")
+  public int get_bits(@LOC("IN") int number_of_bits) {
+    
+    @LOC("OUT") int returnvalue = 0;
+    @LOC("THIS,Bitstream.BI") int sum = bitindex + number_of_bits;
+
+    // E.B
+    // There is a problem here, wordpointer could be -1 ?!
+    if (wordpointer < 0)
+      wordpointer = 0;
     // E.B : End.
 
-  	if (sum <= 32)
-  	{
-	   // all bits contained in *wordpointer
-	   returnvalue = (framebuffer[wordpointer] >>> (32 - sum)) & bitmask[number_of_bits];
-	   // returnvalue = (wordpointer[0] >> (32 - sum)) & bitmask[number_of_bits];
-	   if ((bitindex += number_of_bits) == 32)
-	   {
-		 bitindex = 0;
-		 wordpointer++; // added by me!
-	   }
-	   return returnvalue;
+    if (sum <= 32) {
+      // all bits contained in *wordpointer
+      returnvalue = (framebuffer[wordpointer] >>> (32 - sum)) & bitmask[number_of_bits];
+      // returnvalue = (wordpointer[0] >> (32 - sum)) & bitmask[number_of_bits];
+      if ((bitindex += number_of_bits) == 32) {
+        bitindex = 0;
+        wordpointer++; // added by me!
+      }
+      return returnvalue;
     }
 
     // E.B : Check that ?
-    //((short[])&returnvalue)[0] = ((short[])wordpointer + 1)[0];
-    //wordpointer++; // Added by me!
-    //((short[])&returnvalue + 1)[0] = ((short[])wordpointer)[0];
-	@LOC("RL") int Right = (framebuffer[wordpointer] & 0x0000FFFF);
-	wordpointer++;
-	@LOC("RL") int Left = (framebuffer[wordpointer] & 0xFFFF0000);
-	returnvalue = ((Right << 16) & 0xFFFF0000) | ((Left >>> 16)& 0x0000FFFF);
-
-    returnvalue >>>= 48 - sum;	// returnvalue >>= 16 - (number_of_bits - (32 - bitindex))
+    // ((short[])&returnvalue)[0] = ((short[])wordpointer + 1)[0];
+    // wordpointer++; // Added by me!
+    // ((short[])&returnvalue + 1)[0] = ((short[])wordpointer)[0];
+    @LOC("RL") int Right = (framebuffer[wordpointer] & 0x0000FFFF);
+    wordpointer++;
+    @LOC("RL") int Left = (framebuffer[wordpointer] & 0xFFFF0000);
+    returnvalue = ((Right << 16) & 0xFFFF0000) | ((Left >>> 16) & 0x0000FFFF);
+
+    returnvalue >>>= 48 - sum; // returnvalue >>= 16 - (number_of_bits - (32 -
+                               // bitindex))
     returnvalue &= bitmask[number_of_bits];
     bitindex = sum - 32;
     return returnvalue;
-}
+  }
 
-	/**
-	 * Set the word we want to sync the header to.
-	 * In Big-Endian byte order
-	 */
-        void set_syncword(@LOC("IN") int syncword0)
-	{
-		syncword = syncword0 & 0xFFFFFF3F;
-		single_ch_mode = ((syncword0 & 0x000000C0) == 0x000000C0);
-	}
-	/**
-	 * Reads the exact number of bytes from the source
-	 * input stream into a byte array.
-	 *
-	 * @param b		The byte array to read the specified number
-	 *				of bytes into.
-	 * @param offs	The index in the array where the first byte
-	 *				read should be stored.
-	 * @param len	the number of bytes to read.
-	 *
-	 * @exception BitstreamException is thrown if the specified
-	 *		number of bytes could not be read from the stream.
-	 */
-        @LATTICE("OUT<VAR,VAR<THIS,THIS<IN,IN*,VAR*,THISLOC=THIS")
-        @RETURNLOC("OUT") 
-	private int readFully(@LOC("OUT") byte[] b, @LOC("IN") int offs, @LOC("IN") int len)
-		throws BitstreamException
-	{		
-	        @LOC("VAR") int nRead = 0;
-		try
-		{
-			while (len > 0)
-			{
-			        @LOC("IN") int bytesread = source.read(b, offs, len);
-				if (bytesread == -1)
-				{
-					while (len-->0)
-					{
-						b[offs++] = 0;
-					}
-					break;
-					//throw newBitstreamException(UNEXPECTED_EOF, new EOFException());
-				}
-				nRead = nRead + bytesread;
-				offs += bytesread;
-				len -= bytesread;
-			}
-		}
-		catch (IOException ex)
-		{
-			throw newBitstreamException(STREAM_ERROR, ex);
-		}
-		return nRead;
-	}
-
-	/**
-	 * Simlar to readFully, but doesn't throw exception when
-	 * EOF is reached.
-	 */
-        @LATTICE("OUT<VAR,VAR<THIS,THIS<IN,IN*,VAR*,THISLOC=THIS")
-        @RETURNLOC("OUT") 
-	private int readBytes(@LOC("OUT") byte[] b, @LOC("IN") int offs, @LOC("IN") int len)
-	     throws BitstreamException
-	{
-	    @LOC("VAR") int totalBytesRead = 0;
-		try
-		{
-			while (len > 0)
-			{
-			        @LOC("IN") int bytesread = source.read(b, offs, len);
-				if (bytesread == -1)
-				{
-					break;
-				}
-				totalBytesRead += bytesread;
-				offs += bytesread;
-				len -= bytesread;
-			}
-		}
-		catch (IOException ex)
-		{
-			throw newBitstreamException(STREAM_ERROR, ex);
-		}
-		return totalBytesRead;
-	}
+  /**
+   * Set the word we want to sync the header to. In Big-Endian byte order
+   */
+  void set_syncword(@LOC("IN") int syncword0) {
+    syncword = syncword0 & 0xFFFFFF3F;
+    single_ch_mode = ((syncword0 & 0x000000C0) == 0x000000C0);
+  }
+
+  /**
+   * Reads the exact number of bytes from the source input stream into a byte
+   * array.
+   * 
+   * @param b
+   *          The byte array to read the specified number of bytes into.
+   * @param offs
+   *          The index in the array where the first byte read should be stored.
+   * @param len
+   *          the number of bytes to read.
+   * 
+   * @exception BitstreamException
+   *              is thrown if the specified number of bytes could not be read
+   *              from the stream.
+   */
+  @LATTICE("OUT<VAR,VAR<THIS,THIS<IN,IN*,VAR*,THISLOC=THIS")
+  @RETURNLOC("OUT")
+  private int readFully(@LOC("OUT") byte[] b, @LOC("IN") int offs, @LOC("IN") int len)
+      throws BitstreamException {
+    @LOC("VAR") int nRead = 0;
+    try {
+      while (len > 0) {
+        @LOC("IN") int bytesread = source.read(b, offs, len);
+        if (bytesread == -1) {
+          while (len-- > 0) {
+            b[offs++] = 0;
+          }
+          break;
+          // throw newBitstreamException(UNEXPECTED_EOF, new EOFException());
+        }
+        nRead = nRead + bytesread;
+        offs += bytesread;
+        len -= bytesread;
+      }
+    } catch (IOException ex) {
+      throw newBitstreamException(STREAM_ERROR, ex);
+    }
+    return nRead;
+  }
+
+  /**
+   * Simlar to readFully, but doesn't throw exception when EOF is reached.
+   */
+  @LATTICE("OUT<VAR,VAR<THIS,THIS<IN,IN*,VAR*,THISLOC=THIS")
+  @RETURNLOC("OUT")
+  private int readBytes(@LOC("OUT") byte[] b, @LOC("IN") int offs, @LOC("IN") int len)
+      throws BitstreamException {
+    @LOC("VAR") int totalBytesRead = 0;
+    try {
+      while (len > 0) {
+        @LOC("IN") int bytesread = source.read(b, offs, len);
+        if (bytesread == -1) {
+          break;
+        }
+        totalBytesRead += bytesread;
+        offs += bytesread;
+        len -= bytesread;
+      }
+    } catch (IOException ex) {
+      throw newBitstreamException(STREAM_ERROR, ex);
+    }
+    return totalBytesRead;
+  }
 }
diff --git a/Robust/src/Tests/ssJava/mp3decoder/Crc16.java b/Robust/src/Tests/ssJava/mp3decoder/Crc16.java
index aea133ed..a3bc52b2 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/Crc16.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Crc16.java
@@ -44,6 +44,7 @@ public final class Crc16
   /**
    * Feed a bitstring to the crc calculation (0 < length <= 32).
    */
+ @LATTICE("OUT<V,V<SH,SH<IN,SH*,THISLOC=V,GLOBALLOC=V")
   public void add_bits (@LOC("IN") int bitstring, @LOC("IN") int length)
   {
     @LOC("SH") int bitmask = 1 << (length - 1);
diff --git a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
index 25cea213..ec4bf7d4 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<LA,O,EQ,PA,INIT,DE*")
+@LATTICE("ST,DE<OUT,DE<FIL,DE<LA,O,EQ,PA,INIT,DE*")
 public class Decoder implements DecoderErrors
 {
 	static private final Params DEFAULT_PARAMS = new Params();
diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
index ea708993..37839b07 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIDecoder.java
@@ -39,7 +39,7 @@ class LayerIDecoder implements FrameDecoder {
   protected SynthesisFilter filter1;
   @LOC("H")
   protected SynthesisFilter filter2;
-  @LOC("H")
+  @LOC("SB")
   protected Obuffer buffer;
   @LOC("H")
   protected int which_channels;
@@ -217,8 +217,12 @@ class LayerIDecoder implements FrameDecoder {
     /**
 	   *
 	   */
-    public void read_allocation(@LOC("IN") Bitstream stream, @LOC("IN") Header header,
-        @LOC("IN") Crc16 crc) throws DecoderException {
+    // @LATTICE("IN<THIS,THISLOC=THIS")
+    @LATTICE("THIS<IN,THISLOC=THIS")
+    public void read_allocation(@LOC("THIS,LayerIDecoder$SubbandLayer1.SH") Bitstream stream,
+        @LOC("IN") Header header, @LOC("THIS,LayerIDecoder$SubbandLayer1.L") Crc16 crc)
+        throws DecoderException {
+
       if ((allocation = stream.get_bits(4)) == 15) {
         // CGJ: catch this condition and throw appropriate exception
         throw new DecoderException(DecoderErrors.ILLEGAL_SUBBAND_ALLOCATION, null);
@@ -226,8 +230,10 @@ class LayerIDecoder implements FrameDecoder {
         // MPEG-stream is corrupted!
       }
 
-      if (crc != null)
-        crc.add_bits(allocation, 4);
+      if (crc != null) {
+        crc.add_bits(allocation, 4); // allocation has [THIS,H]
+        // crc has [IN]
+      }
       if (allocation != 0) {
         samplelength = allocation + 1;
         factor = table_factor[allocation];
@@ -243,7 +249,10 @@ class LayerIDecoder implements FrameDecoder {
         scalefactor = scalefactors[stream.get_bits(6)];
     }
 
-    public boolean read_sampledata(@LOC("IN") Bitstream stream) {
+    // ssjava
+    @LATTICE("THIS<IN,THISLOC=THIS,RETURNLOC=THIS")
+    // THIS,LayerIDecoder$SubbandLayer1.S
+    public boolean read_sampledata(@LOC("THIS,LayerIDecoder$SubbandLayer1.S") Bitstream stream) {
       if (allocation != 0) {
         sample = (float) (stream.get_bits(samplelength));
       }
@@ -411,7 +420,7 @@ class LayerIDecoder implements FrameDecoder {
       }
       return true;
     }
-    
+
   };
 
 }
diff --git a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
index 1a34e903..b4b09858 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/SynthesisFilter.java
@@ -1265,23 +1265,22 @@ private void compute_pcm_samples(@LOC("GLOBAL") Obuffer buffer)
    * Calculate 32 PCM samples and put the into the Obuffer-object.
    */
   
-  @LATTICE("V<THIS,THIS<SH,SH*,THISLOC=THIS")	
-  public void calculate_pcm_samples(@LOC("V") Obuffer buffer)
-  {
-	compute_new_v();	
-	compute_pcm_samples(buffer);
-    
-	actual_write_pos = (actual_write_pos + 1) & 0xf;
-//	actual_v = (actual_v == v1) ? v2 : v1;
-
-	// initialize samples[]:	
-    //for (register float *floatp = samples + 32; floatp > samples; )
-	// *--floatp = 0.0f;  
-	
-	// MDM: this may not be necessary. The Layer III decoder always
-	// outputs 32 subband samples, but I haven't checked layer I & II.
-	for (@LOC("SH") int p=0;p<32;p++) 
-		samples[p] = 0.0f;
+  @LATTICE("V<THIS,THIS<SH,SH*,THISLOC=THIS")
+  public void calculate_pcm_samples(@LOC("V") Obuffer buffer) {
+    compute_new_v();
+    compute_pcm_samples(buffer);
+
+    actual_write_pos = (actual_write_pos + 1) & 0xf;
+    // actual_v = (actual_v == v1) ? v2 : v1;
+
+    // initialize samples[]:
+    // for (register float *floatp = samples + 32; floatp > samples; )
+    // *--floatp = 0.0f;
+
+    // MDM: this may not be necessary. The Layer III decoder always
+    // outputs 32 subband samples, but I haven't checked layer I & II.
+    for (@LOC("SH") int p = 0; p < 32; p++)
+      samples[p] = 0.0f;
   }