From: jjenista <jjenista>
Date: Wed, 26 Oct 2011 15:48:44 +0000 (+0000)
Subject: the static inner classes are not being used, but Subu's work is seeing them and compl... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d367783741bc962274ab7c75b82b4a0bd32825bd;p=IRC.git

the static inner classes are not being used, but Subu's work is seeing them and complaining, so I moved them out.  Also twiddled the Player code to generate a normal and error output sampling for experiments, WITHOUT SSJAVA notation, so the analysis won't run on this benchmark at the moment
---

diff --git a/Robust/src/Benchmarks/SSJava/MP3Decoder/Decoder.java b/Robust/src/Benchmarks/SSJava/MP3Decoder/Decoder.java
index 12287b1c..ae6e87a6 100644
--- a/Robust/src/Benchmarks/SSJava/MP3Decoder/Decoder.java
+++ b/Robust/src/Benchmarks/SSJava/MP3Decoder/Decoder.java
@@ -232,6 +232,11 @@ public class Decoder implements DecoderErrors {
   protected DecoderException newDecoderException(int errorcode, Throwable throwable) {
     return new DecoderException(errorcode, throwable);
   }
+}
+
+
+
+
 
   /**
    * The <code>Params</code> class presents the customizable aspects of the
@@ -239,7 +244,7 @@ public class Decoder implements DecoderErrors {
    * <p>
    * Instances of this class are not thread safe.
    */
-  public static class Params implements Cloneable {
+  public class Params implements Cloneable {
 
     // private OutputChannels outputChannels = OutputChannels.BOTH;
     private OutputChannels outputChannels = new OutputChannels(0);
@@ -292,5 +297,4 @@ public class Decoder implements DecoderErrors {
       return equalizer;
     }
 
-  };
-}
+  }
\ No newline at end of file
diff --git a/Robust/src/Benchmarks/SSJava/MP3Decoder/LayerIIIDecoder.java b/Robust/src/Benchmarks/SSJava/MP3Decoder/LayerIIIDecoder.java
index af6ac25c..031113ff 100644
--- a/Robust/src/Benchmarks/SSJava/MP3Decoder/LayerIIIDecoder.java
+++ b/Robust/src/Benchmarks/SSJava/MP3Decoder/LayerIIIDecoder.java
@@ -32,6 +32,8 @@
  *----------------------------------------------------------------------
  */
 
+
+
 /**
  * Class Implementing Layer 3 Decoder.
  * 
@@ -2388,134 +2390,6 @@ final class LayerIIIDecoder implements FrameDecoder {
   // This may be adjusted for performance without any problems.
   // public static final int POW_TABLE_LIMIT=512;
 
-  /************************************************************/
-  /* L3TABLE */
-  /************************************************************/
-
-  @LATTICE("N<VAR")
-  static class SBI {
-    @LOC("VAR")
-    public int[] l;
-    @LOC("VAR")
-    public int[] s;
-
-    public SBI() {
-      l = new int[23];
-      s = new int[14];
-    }
-
-    @LATTICE("THIS<IN,THISLOC=THIS")
-    public SBI(@DELEGATE @LOC("IN") int[] thel, @DELEGATE @LOC("IN") int[] thes) {
-      l = thel;
-      s = thes;
-    }
-  }
-
-  @LATTICE("V,V*")
-  static class gr_info_s {
-    @LOC("V")
-    public int part2_3_length = 0;
-    @LOC("V")
-    public int big_values = 0;
-    @LOC("V")
-    public int global_gain = 0;
-    @LOC("V")
-    public int scalefac_compress = 0;
-    @LOC("V")
-    public int window_switching_flag = 0;
-    @LOC("V")
-    public int block_type = 0;
-    @LOC("V")
-    public int mixed_block_flag = 0;
-    @LOC("V")
-    public int[] table_select;
-    @LOC("V")
-    public int[] subblock_gain;
-    @LOC("V")
-    public int region0_count = 0;
-    @LOC("V")
-    public int region1_count = 0;
-    @LOC("V")
-    public int preflag = 0;
-    @LOC("V")
-    public int scalefac_scale = 0;
-    @LOC("V")
-    public int count1table_select = 0;
-
-    /**
-     * Dummy Constructor
-     */
-    public gr_info_s() {
-      table_select = new int[3];
-      subblock_gain = new int[3];
-    }
-  }
-
-  @LATTICE("GR2<GR1,GR1<GR,GR2*")
-  static class temporaire {
-    @LOC("GR")
-    public int[] scfsi;
-    @LOC("GR")
-    public gr_info_s[] gr;
-
-    /**
-     * Dummy Constructor
-     */
-    public temporaire() {
-      scfsi = new int[4];
-      gr = new gr_info_s[2];
-      gr[0] = new gr_info_s();
-      gr[1] = new gr_info_s();
-    }
-  }
-
-  @LATTICE("CH<TEMP,TEMP*")
-  static class III_side_info_t {
-
-    @LOC("CH")
-    public int main_data_begin = 0;
-    @LOC("CH")
-    public int private_bits = 0;
-    @LOC("CH")
-    public temporaire[] ch;
-
-    /**
-     * Dummy Constructor
-     */
-    public III_side_info_t() {
-      ch = new temporaire[2];
-      ch[0] = new temporaire();
-      ch[1] = new temporaire();
-    }
-  }
-
-  @LATTICE("N<VAR")
-  static class temporaire2 {
-    @LOC("VAR")
-    public int[] l; /* [cb] */
-    @LOC("VAR")
-    public int[][] s; /* [window][cb] */
-
-    /**
-     * Dummy Constructor
-     */
-    public temporaire2() {
-      l = new int[23];
-      s = new int[3][13];
-    }
-  }
-
-  // class III_scalefac_t
-  // {
-  // public temporaire2[] tab;
-  // /**
-  // * Dummy Constructor
-  // */
-  // public III_scalefac_t()
-  // {
-  // tab = new temporaire2[2];
-  // }
-  // }
 
   private static final int slen[][] = { { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 },
       { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 } };
@@ -2966,3 +2840,135 @@ final class LayerIIIDecoder implements FrameDecoder {
       { { 8, 8, 5, 0 }, { 15, 12, 9, 0 }, { 6, 18, 9, 0 } } };
 
 }
+
+
+
+
+  /************************************************************/
+  /* L3TABLE */
+  /************************************************************/
+
+  @LATTICE("N<VAR")
+   class SBI {
+    @LOC("VAR")
+    public int[] l;
+    @LOC("VAR")
+    public int[] s;
+
+    public SBI() {
+      l = new int[23];
+      s = new int[14];
+    }
+
+    @LATTICE("THIS<IN,THISLOC=THIS")
+    public SBI(@DELEGATE @LOC("IN") int[] thel, @DELEGATE @LOC("IN") int[] thes) {
+      l = thel;
+      s = thes;
+    }
+  }
+
+  @LATTICE("V,V*")
+   class gr_info_s {
+    @LOC("V")
+    public int part2_3_length = 0;
+    @LOC("V")
+    public int big_values = 0;
+    @LOC("V")
+    public int global_gain = 0;
+    @LOC("V")
+    public int scalefac_compress = 0;
+    @LOC("V")
+    public int window_switching_flag = 0;
+    @LOC("V")
+    public int block_type = 0;
+    @LOC("V")
+    public int mixed_block_flag = 0;
+    @LOC("V")
+    public int[] table_select;
+    @LOC("V")
+    public int[] subblock_gain;
+    @LOC("V")
+    public int region0_count = 0;
+    @LOC("V")
+    public int region1_count = 0;
+    @LOC("V")
+    public int preflag = 0;
+    @LOC("V")
+    public int scalefac_scale = 0;
+    @LOC("V")
+    public int count1table_select = 0;
+
+    /**
+     * Dummy Constructor
+     */
+    public gr_info_s() {
+      table_select = new int[3];
+      subblock_gain = new int[3];
+    }
+  }
+
+  @LATTICE("GR2<GR1,GR1<GR,GR2*")
+   class temporaire {
+    @LOC("GR")
+    public int[] scfsi;
+    @LOC("GR")
+    public gr_info_s[] gr;
+
+    /**
+     * Dummy Constructor
+     */
+    public temporaire() {
+      scfsi = new int[4];
+      gr = new gr_info_s[2];
+      gr[0] = new gr_info_s();
+      gr[1] = new gr_info_s();
+    }
+  }
+
+  @LATTICE("CH<TEMP,TEMP*")
+   class III_side_info_t {
+
+    @LOC("CH")
+    public int main_data_begin = 0;
+    @LOC("CH")
+    public int private_bits = 0;
+    @LOC("CH")
+    public temporaire[] ch;
+
+    /**
+     * Dummy Constructor
+     */
+    public III_side_info_t() {
+      ch = new temporaire[2];
+      ch[0] = new temporaire();
+      ch[1] = new temporaire();
+    }
+  }
+
+  @LATTICE("N<VAR")
+   class temporaire2 {
+    @LOC("VAR")
+    public int[] l; /* [cb] */
+    @LOC("VAR")
+    public int[][] s; /* [window][cb] */
+
+    /**
+     * Dummy Constructor
+     */
+    public temporaire2() {
+      l = new int[23];
+      s = new int[3][13];
+    }
+  }
+
+  // class III_scalefac_t
+  // {
+  // public temporaire2[] tab;
+  // /**
+  // * Dummy Constructor
+  // */
+  // public III_scalefac_t()
+  // {
+  // tab = new temporaire2[2];
+  // }
+  // }
diff --git a/Robust/src/Benchmarks/SSJava/MP3Decoder/Player.java b/Robust/src/Benchmarks/SSJava/MP3Decoder/Player.java
index 7b2f8beb..b713ca1d 100644
--- a/Robust/src/Benchmarks/SSJava/MP3Decoder/Player.java
+++ b/Robust/src/Benchmarks/SSJava/MP3Decoder/Player.java
@@ -219,11 +219,13 @@ public class Player {
       //System.out.println(sum);
       //
 
-      int stride = outbuf.length / 100;
-      for( int i = 0; i < 100; ++i ) {
-        System.out.println( sampleNumber+" "+outbuf[i*stride] );
-        sampleNumber++;
-      }
+      //int stride = outbuf.length / 100;
+      //for( int i = 0; i < 100; ++i ) {
+      //  System.out.println( sampleNumber+" "+outbuf[i*stride] );
+      //  sampleNumber++;
+      //}
+      System.out.println( sampleNumber+" "+sum );
+      sampleNumber++;