From 2c4882eb5bb49314d697c83cfe3a5b5f68e9a29f Mon Sep 17 00:00:00 2001
From: yeom <yeom>
Date: Fri, 19 Aug 2011 00:00:48 +0000
Subject: [PATCH] mp3decoder finally passes the flow-down rule checking.

---
 .../Tests/ssJava/mp3decoder/BitReserve.java   |   9 +-
 .../ssJava/mp3decoder/LayerIIIDecoder.java    |  56 ++-----
 .../Tests/ssJava/mp3decoder/huffcodetab.java  | 138 +-----------------
 3 files changed, 28 insertions(+), 175 deletions(-)

diff --git a/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java b/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
index aa47a961..e4167f00 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
@@ -52,7 +52,7 @@ final class BitReserve {
    */
   private static final int BUFSIZE_MASK = BUFSIZE - 1;
 
-  @LOC("OFF")
+  @LOC("BIT")
   private int offset;
 
   @LOC("BIT")
@@ -61,7 +61,7 @@ final class BitReserve {
   @LOC("BIT")
   private int buf_byte_idx;
 
-  @LOC("BUF")
+  @LOC("BIT")
   private final int[] buf;
 
   BitReserve() {
@@ -76,7 +76,7 @@ final class BitReserve {
    */
   @RETURNLOC("THIS,BitReserve.BIT")
   public int hsstell() {
-    return (totbit); 
+    return (totbit);
   }
 
   /**
@@ -116,9 +116,10 @@ final class BitReserve {
    * 
    * @returns 0 if next bit is reset, or 1 if next bit is set.
    */
+  @RETURNLOC("THIS,BitReserve.BIT")
   public int hget1bit() {
     totbit++;
-    @LOC("OUT") int val = buf[buf_byte_idx];
+    @LOC("THIS,BitReserve.BIT") int val = buf[buf_byte_idx];
     buf_byte_idx = (buf_byte_idx + 1) & BUFSIZE_MASK;
     return val;
   }
diff --git a/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java b/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
index 5ebedb1b..cd0d38e6 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/LayerIIIDecoder.java
@@ -47,7 +47,7 @@
 // 10th added for get_scale_factors
 // llth added for decode
 // @LATTICE("IS1D*,RO<IS1D,IS1D<SI2,SI2<SI1,SI<P2S,SF1<CH0,SF0*,SFB_SH<NS,NS<SI,SFB_SH*,SFB<SFB_SH,C,C*,SI1<SF2,SF2<SFB,SF1<BR,LR*,OUT<LR,LR<RO,NZ*,SI<SF1,SI1<NZ,NZ<SI,SI1<SBI,SBI<SI,BUF<FT,SF1<SF0,SF0<HD1,BR<ST,ST,FT<SP,SP<OUT,OUT<SI1,SI1<SI,P2S<CH0,CH0<MAX0,MAX0<BR1,FS<BR1,BR1<BR,BR<HD1,HD1<HD,OUT*,BR1*,SI1*,MAX0*,CH0*,RAW,TS,F,C,K,LY,VAR,IR,IP,CSH,GLSFD3,GLSFD4,GLSFD5,GLSFF4,GLSFF2,GLSFF3,GLSFF1,GSF4,GSF5,GSF1,GSF2,GSF3,HD2,HD3,BT,GR,RO6,RO5,RO9,RO8,RO7,RO4,RO1,RO3,RO2,SH,ME,TMP2,S,LSF,J")
-@LATTICE("SI0*,INIT*,ISR*,ISP*,HD<CH0,LR<ISR,ISR<ISP,SI1<SF2,NS*,CH0<ST,ST<INIT,IS1D*,RO1<RO,RO1*,RO<IS1D,IS1D<SI2,SI2<SI1,BR<NS,NS<SI,SFB_SH*,SFB<SFB_SH,C,C*,SF2<SFB,LR*,OUT<LR,ISP<RO1,NZ*,SI<SI0,SI0<SF15,SF15<SF1,BR1<NZ,NZ<BR,SI1<RT,RT<SBI,SBI<SI,BUF<FT,SF1<HD1,SF1<HD1,FT<SP,SP<OUT,OUT<SI1,SI1<SI,SFB_SH<BR1,BR1<BR,HD1<HD,OUT*,BR1*,SI1*,CH0*,RAW,TS,F,C,K,LY,VAR,IR,IP,CSH,GLSFD3,GLSFD4,GLSFD5,GLSFF4,GLSFF2,GLSFF3,GLSFF1,GSF4,GSF5,GSF1,GSF2,GSF3,HD2,HD3,BT,GR,RO6,RO5,RO9,RO8,RO7,RO4,RO1,RO3,RO2,SH,ME,TMP2,S,LSF,J")
+@LATTICE("SI0*,INIT*,ISR*,ISP*,HD<CH0,LR<ISR,ISR<ISP,SI1<SF2,NS*,CH0<ST,ST<INIT,IS1D*,RO1<RO,RO1*,RO<IS1D,IS1D<SI2,SI2<SI1,BR<NS,NS<SI,SFB_SH*,SFB<SFB_SH,C,C*,SF2<SFB,LR*,OUT<LR,ISP<RO1,NZ*,SI<SI0,SI0<SF15,SF15<SF1,BR1<NZ,NZ<BR,SI1<RT,RT<SBI,SBI<SI,BUF<FT,SF1<HD1,SF1<HD1,FT<SP,SP<OUT,OUT<SI1,SI1<SI,SFB_SH<BR1,BR1<BR,HD1<HD,OUT*,BR1*,SI1*,CH0*")
 @METHODDEFAULT("OUT<V,V<THIS,THIS<SH,SH<IN,SH*,THISLOC=THIS,GLOBALLOC=IN,RETURNLOC=OUT")
 final class LayerIIIDecoder implements FrameDecoder {
   static final double d43 = (4.0 / 3.0);
@@ -198,12 +198,6 @@ final class LayerIIIDecoder implements FrameDecoder {
         reorder_table[i] = reorder(sfBandIndex[i].s);
     }
 
-    // Sftable
-    @LOC("VAR") int[] ll0 = { 0, 6, 11, 16, 21 };
-    @LOC("VAR") int[] ss0 = { 0, 6, 12 };
-    sftable = new Sftable(ll0, ss0);
-    // END OF Sftable
-
     // scalefac_buffer
     scalefac_buffer = new int[54];
     // END OF scalefac_buffer
@@ -1025,22 +1019,23 @@ final class LayerIIIDecoder implements FrameDecoder {
   // int[] v = { 0 };
   // @LOC("SI1")
   // int[] w = { 0 };
-  @LOC("SI1")
-  int x[] = { 0 };
-  @LOC("SI1")
-  int y[] = { 0 };
-  @LOC("SI1")
-  int v[] = { 0 };
-  @LOC("SI1")
-  int w[] = { 0 };
+  // @LOC("SI1")
+  // int x[] = { 0 };
+  // @LOC("SI1")
+  // int y[] = { 0 };
+  // @LOC("SI1")
+  // int v[] = { 0 };
+  // @LOC("SI1")
+  // int w[] = { 0 };
 
-  @LATTICE("OUT<GLOBAL,GLOBAL<THIS,THISLOC=THIS,GLOBALLOC=GLOBAL,RETURNLOC=OUT")
+  @LATTICE("VAR<OUT,OUT<THIS,THIS<RE,THISLOC=THIS,GLOBALLOC=OUT,RETURNLOC=OUT")
   private void huffman_decode(@LOC("THIS,LayerIIIDecoder.BR,BitReserve.BIT") int part2_start_local,
       @LOC("THIS,LayerIIIDecoder.CH0") int ch, @LOC("THIS,LayerIIIDecoder.CH0") int gr) {
-    x[0] = 0;
-    y[0] = 0;
-    v[0] = 0;
-    w[0] = 0;
+
+    @LOC("RE") int x[] = new int[1];
+    @LOC("RE") int y[] = new int[1];
+    @LOC("RE") int v[] = new int[1];
+    @LOC("RE") int w[] = new int[1];
 
     @LOC("THIS,LayerIIIDecoder.BR,BitReserve.BIT") int part2_3_end =
         part2_start_local + si.ch[ch].gr[gr].part2_3_length;
@@ -2860,27 +2855,6 @@ final class LayerIIIDecoder implements FrameDecoder {
   /***************************************************************/
   /* END OF INV_MDCT */
   /***************************************************************/
-  @LATTICE("N<VAR")
-  class Sftable {
-    @LOC("VAR")
-    public int[] l;
-    @LOC("VAR")
-    public int[] s;
-
-    public Sftable() {
-      l = new int[5];
-      s = new int[3];
-    }
-
-    @LATTICE("THIS<IN,THISLOC=THIS")
-    public Sftable(@DELEGATE @LOC("IN") int[] thel, @DELEGATE @LOC("IN") int[] thes) {
-      l = thel;
-      s = thes;
-    }
-  }
-
-  @LOC("F")
-  public Sftable sftable;
 
   public static final int nr_of_sfb_block[][][] = {
       { { 6, 5, 5, 5 }, { 9, 9, 9, 9 }, { 6, 9, 9, 9 } },
diff --git a/Robust/src/Tests/ssJava/mp3decoder/huffcodetab.java b/Robust/src/Tests/ssJava/mp3decoder/huffcodetab.java
index 77be768e..2f52c134 100644
--- a/Robust/src/Tests/ssJava/mp3decoder/huffcodetab.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/huffcodetab.java
@@ -506,20 +506,21 @@ final class huffcodetab {
    * Do the huffman-decoding. note! for counta,countb -the 4 bit value is
    * returned in y, discard x.
    */
-  @LATTICE("OUT<THIS,THIS<V,V<IN,IN<C,C*,THISLOC=THIS,RETURNLOC=OUT,GLOBALLOC=IN")
+  @LATTICE("OUT<V1,THIS<V1,V1<V,V<IN,IN<C,C*,V*,THISLOC=THIS,GLOBALLOC=IN")
+  @RETURNLOC("OUT,BitReserve.BIT")
   public static int huffman_decoder(@LOC("THIS,LayerIIIDecoder.SI2") int htIdx,
-      @LOC("THIS,LayerIIIDecoder.SI1") int[] x, @LOC("THIS,LayerIIIDecoder.SI1") int[] y,
-      @LOC("THIS,LayerIIIDecoder.SI1") int[] v, @LOC("THIS,LayerIIIDecoder.SI1") int[] w,
-      @LOC("THIS,LayerIIIDecoder.BR") BitReserve br) {
+      @LOC("OUT,BitReserve.BIT") int[] x, @LOC("OUT,BitReserve.BIT") int[] y,
+      @LOC("OUT,BitReserve.BIT") int[] v, @LOC("OUT,BitReserve.BIT") int[] w,
+      @LOC("OUT") BitReserve br) {
     // array of all huffcodtable headers
     // 0..31 Huffman code table 0..31
     // 32,33 count1-tables
 
     @LOC("C") int dmask = 1 << ((4 * 8) - 1);
     @LOC("THIS,LayerIIIDecoder.SI1") int hs = 4 * 8;
-    @LOC("THIS,LayerIIIDecoder.BR,BitReserve.BIT") int level;
-    @LOC("THIS,LayerIIIDecoder.BR,BitReserve.BIT") int point = 0;
-    @LOC("OUT") int error = 1;
+    @LOC("OUT,BitReserve.BIT") int level;
+    @LOC("OUT,BitReserve.BIT") int point = 0;
+    @LOC("OUT,BitReserve.BIT") int error = 1;
     level = dmask;
 
     if (ht[htIdx].val == null)
@@ -618,129 +619,6 @@ final class huffcodetab {
     return error;
   }
 
-  /**
-   * Do the huffman-decoding. note! for counta,countb -the 4 bit value is
-   * returned in y, discard x.
-   */
-  @LATTICE("X<Y,V<Y,W<Y,Y<VAR,VAR<IN,OUT<IN,VAR*,Y*,X*,V*,W*,THISLOC=IN,GLOBALLOC=IN")
-  @RETURNLOC("IN")
-  // public static int huffman_decoder(/* @LOC("IN") huffcodetab h, */@LOC("IN")
-  // int idx,
-  // @LOC("X") int[] x, @LOC("Y") int[] y, @LOC("V") int[] v, @LOC("W") int[] w,
-  // @LOC("IN") BitReserve br) {
-  public static HuffData huffman_decoder(@LOC("IN") int idx, @LOC("IN") HuffData data) {
-    // array of all huffcodtable headers
-    // 0..31 Huffman code table 0..31
-    // 32,33 count1-tables
-
-    @LOC("IN") int dmask = 1 << ((4 * 8) - 1);
-    @LOC("IN") int hs = 4 * 8;
-    @LOC("VAR") int level;
-    @LOC("VAR") int point = 0;
-    @LOC("OUT") int error = 1;
-    level = dmask;
-
-    if (ht[idx].val == null) {
-      // return 2;
-      return data;
-    }
-
-    /* table 0 needs no bits */
-    if (ht[idx].treelen == 0) {
-      data.y = 0;
-      data.x = 0;
-      // return 0;
-      return data;
-    }
-
-    /* Lookup in Huffman table. */
-
-    /*
-     * int bitsAvailable = 0; int bitIndex = 0;
-     * 
-     * int bits[] = bitbuf;
-     */
-    do {
-      if (ht[idx].val[point][0] == 0) { /* end of tree */
-        data.x = ht[idx].val[point][1] >>> 4;
-        data.y = ht[idx].val[point][1] & 0xf;
-        error = 0;
-        break;
-      }
-
-      // hget1bit() is called thousands of times, and so needs to be
-      // ultra fast.
-      /*
-       * if (bitIndex==bitsAvailable) { bitsAvailable = br.readBits(bits, 32);
-       * bitIndex = 0; }
-       */
-      // if (bits[bitIndex++]!=0)
-      if (data.br.hget1bit() != 0) {
-        while (ht[idx].val[point][1] >= MXOFF)
-          point += ht[idx].val[point][1];
-        point += ht[idx].val[point][1];
-      } else {
-        while (ht[idx].val[point][0] >= MXOFF)
-          point += ht[idx].val[point][0];
-        point += ht[idx].val[point][0];
-      }
-      level >>>= 1;
-      // MDM: ht[0] is always 0;
-    } while ((level != 0) || (point < 0 /* ht[0].treelen */));
-
-    // put back any bits not consumed
-    /*
-     * int unread = (bitsAvailable-bitIndex); if (unread>0)
-     * br.rewindNbits(unread);
-     */
-    /* Process sign encodings for quadruples tables. */
-    // System.out.println(h.tablename);
-    if (ht[idx].tablename0 == '3' && (ht[idx].tablename1 == '2' || ht[idx].tablename1 == '3')) {
-      data.v = (data.y >> 3) & 1;
-      data.w = (data.y >> 2) & 1;
-      data.x = (data.y >> 1) & 1;
-      data.y = data.y & 1;
-
-      /*
-       * v, w, x and y are reversed in the bitstream. switch them around to make
-       * test bistream work.
-       */
-
-      if (data.v != 0)
-        if (data.br.hget1bit() != 0)
-          data.v = -data.v;
-      if (data.w != 0)
-        if (data.br.hget1bit() != 0)
-          data.w = -data.w;
-      if (data.x != 0)
-        if (data.br.hget1bit() != 0)
-          data.x = -data.x;
-      if (data.y != 0)
-        if (data.br.hget1bit() != 0)
-          data.y = -data.y;
-    } else {
-      // Process sign and escape encodings for dual tables.
-      // x and y are reversed in the test bitstream.
-      // Reverse x and y here to make test bitstream work.
-
-      if (ht[idx].linbits != 0)
-        if ((ht[idx].xlen - 1) == data.x)
-          data.x += data.br.hgetbits(ht[idx].linbits);
-      if (data.x != 0)
-        if (data.br.hget1bit() != 0)
-          data.x = -data.x;
-      if (ht[idx].linbits != 0)
-        if ((ht[idx].ylen - 1) == data.y)
-          data.y += data.br.hgetbits(ht[idx].linbits);
-      if (data.y != 0)
-        if (data.br.hget1bit() != 0)
-          data.y = -data.y;
-    }
-
-    return data;
-    // return error;
-  }
-
   public static void inithuff() {
 
     if (ht != null)
-- 
2.34.1