16 files changed, 96 insertions, 82 deletions

diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c
index 5c1f29a..1061470 100644
--- a/all_pairs/source/anagram/anagram.c
+++ b/all_pairs/source/anagram/anagram.c
@@ -337,6 +337,8 @@ void anagram_ReadDict( void )
 
 void anagram_init( void )
 {
+  // Reset heap
+  anagram_free_all();
   anagram_ReadDict();
 }
 
@@ -657,14 +659,10 @@ void _Pragma( "entrypoint" ) anagram_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        //int jobsComplete;
-        //int maxJobs=100;
-        //for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 anagram_init();
                 anagram_main();
-                STOP_LOOP
-        //}
+        }
         WRITE_TO_FILE
   return anagram_return();
 }
diff --git a/all_pairs/source/anagram/anagram_stdlib.c b/all_pairs/source/anagram/anagram_stdlib.c
index 994350b..c766a5e 100644
--- a/all_pairs/source/anagram/anagram_stdlib.c
+++ b/all_pairs/source/anagram/anagram_stdlib.c
@@ -142,6 +142,11 @@ void *anagram_malloc( unsigned int numberOfBytes )
   return currentPos;
 }
 
+void anagram_free_all( void )
+{
+  anagram_freeHeapPos = 0;
+}
+
 void anagram_bzero( char *p, unsigned long len )
 {
   unsigned long i;
diff --git a/all_pairs/source/anagram/anagram_stdlib.h b/all_pairs/source/anagram/anagram_stdlib.h
index 0e745d5..536fcc3 100644
--- a/all_pairs/source/anagram/anagram_stdlib.h
+++ b/all_pairs/source/anagram/anagram_stdlib.h
@@ -24,6 +24,8 @@
 
 void *anagram_malloc( unsigned int numberOfBytes );
 
+void anagram_free_all( void );
+
 void anagram_qsort( void *va, unsigned long n, unsigned long es );
 
 #endif
diff --git a/all_pairs/source/audiobeam/audiobeam.c b/all_pairs/source/audiobeam/audiobeam.c
index 50ebfff..7d89f06 100644
--- a/all_pairs/source/audiobeam/audiobeam.c
+++ b/all_pairs/source/audiobeam/audiobeam.c
@@ -104,6 +104,8 @@ void audiobeam_init()
   unsigned int i;
   unsigned char *p;
   volatile char bitmask = 0;
+  // Reset heap
+  audiobeam_free_all();
 
   /*
     Apply volatile XOR-bitmask to entire input array.
@@ -578,16 +580,12 @@ void _Pragma( "entrypoint" ) audiobeam_main( void )
 
 int main( int argc, char **argv )
 {       
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=100;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 audiobeam_init();
                 audiobeam_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
 
   return ( audiobeam_return() );
 }
diff --git a/all_pairs/source/audiobeam/audiobeamlibmalloc.c b/all_pairs/source/audiobeam/audiobeamlibmalloc.c
index 50c3073..a81b634 100644
--- a/all_pairs/source/audiobeam/audiobeamlibmalloc.c
+++ b/all_pairs/source/audiobeam/audiobeamlibmalloc.c
@@ -11,4 +11,9 @@ void *audiobeam_malloc( unsigned int numberOfBytes )
   /* Get a 4-byte address for alignment purposes */
   audiobeam_freeHeapPos += ( ( numberOfBytes + 4 ) & ( unsigned int )0xfffffffc );
   return currentPos;
-}
\ No newline at end of file
+}
+
+void audiobeam_free_all( void )
+{
+  audiobeam_freeHeapPos = 0;
+}
diff --git a/all_pairs/source/audiobeam/audiobeamlibmalloc.h b/all_pairs/source/audiobeam/audiobeamlibmalloc.h
index eccbdb9..354bf0e 100644
--- a/all_pairs/source/audiobeam/audiobeamlibmalloc.h
+++ b/all_pairs/source/audiobeam/audiobeamlibmalloc.h
@@ -24,4 +24,6 @@
 
 void *audiobeam_malloc( unsigned int numberOfBytes );
 
+void audiobeam_free_all( void );
+
 #endif
diff --git a/all_pairs/source/g723_enc/g723_enc.c b/all_pairs/source/g723_enc/g723_enc.c
index 209e3ce..646adcd 100644
--- a/all_pairs/source/g723_enc/g723_enc.c
+++ b/all_pairs/source/g723_enc/g723_enc.c
@@ -172,6 +172,9 @@ short g723_enc_fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
                             0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0
                            };
 
+static unsigned int g723_enc_out_buffer = 0;
+static int    g723_enc_out_bits = 0;
+static int              g723_enc_i = 0;
 
 /*
   Declaration of macros
@@ -753,24 +756,21 @@ g723_enc_pack_output(
   unsigned  char  code,
   int     bits )
 {
-  static unsigned int out_buffer = 0;
-  static int    out_bits = 0;
   unsigned char   out_byte;
-  static int              i = 0;
-
-  out_buffer |= ( code << out_bits );
-  out_bits += bits;
-  if ( out_bits >= 8 ) {
-    out_byte = out_buffer & 0xff;
-    out_bits -= 8;
-    out_buffer >>= 8;
+
+  g723_enc_out_buffer |= ( code << g723_enc_out_bits );
+  g723_enc_out_bits += bits;
+  if ( g723_enc_out_bits >= 8 ) {
+    out_byte = g723_enc_out_buffer & 0xff;
+    g723_enc_out_bits -= 8;
+    g723_enc_out_buffer >>= 8;
     //fwrite(&out_byte, sizeof (char), 1, fp_out);
     //fwrite(&out_byte, 1, 1, fp_out);
-    g723_enc_OUTPUT[i] = out_byte;
-    i =  i + 1;
+    g723_enc_OUTPUT[g723_enc_i] = out_byte;
+    g723_enc_i =  g723_enc_i + 1;
   }
 
-  return ( out_bits > 0 );
+  return ( g723_enc_out_bits > 0 );
 }
 
 /*
@@ -815,6 +815,9 @@ void g723_enc_init()
 {
   int i;
   volatile int x = 0;
+  g723_enc_out_buffer = 0;
+  g723_enc_out_bits = 0;
+  g723_enc_i = 0;
   g723_enc_init_state( &g723_enc_state );
 
    _Pragma( "loopbound min 256 max 256" )
@@ -872,16 +875,12 @@ void _Pragma( "entrypoint" ) g723_enc_main()
 
 int main( int argc, char **argv )
 {
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=9;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 g723_enc_init();
                 g723_enc_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
   return ( g723_enc_return() );
 }
 
diff --git a/all_pairs/source/huff_dec/huff_dec.c b/all_pairs/source/huff_dec/huff_dec.c
index 58b40d3..e0ebc19 100644
--- a/all_pairs/source/huff_dec/huff_dec.c
+++ b/all_pairs/source/huff_dec/huff_dec.c
@@ -144,6 +144,8 @@ void huff_dec_init( void )
 {
   huff_dec_input_pos = 0;
   huff_dec_output_pos = 0;
+  huff_dec_byte_nb_to_read = 0;
+  huff_dec_val_to_read = 0;
 }
 
 
@@ -379,15 +381,11 @@ void _Pragma( "entrypoint" ) huff_dec_main( void )
 
 int main( int argc, char **argv )
 {
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=5;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 huff_dec_init();
                 huff_dec_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
   return ( huff_dec_return() );
 }
diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index 5c1f29a..1061470 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/source/anagram/anagram.c
@@ -337,6 +337,8 @@ void anagram_ReadDict( void )
 
 void anagram_init( void )
 {
+  // Reset heap
+  anagram_free_all();
   anagram_ReadDict();
 }
 
@@ -657,14 +659,10 @@ void _Pragma( "entrypoint" ) anagram_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        //int jobsComplete;
-        //int maxJobs=100;
-        //for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 anagram_init();
                 anagram_main();
-                STOP_LOOP
-        //}
+        }
         WRITE_TO_FILE
   return anagram_return();
 }
diff --git a/baseline/source/anagram/anagram_stdlib.c b/baseline/source/anagram/anagram_stdlib.c
index 994350b..c766a5e 100644
--- a/baseline/source/anagram/anagram_stdlib.c
+++ b/baseline/source/anagram/anagram_stdlib.c
@@ -142,6 +142,11 @@ void *anagram_malloc( unsigned int numberOfBytes )
   return currentPos;
 }
 
+void anagram_free_all( void )
+{
+  anagram_freeHeapPos = 0;
+}
+
 void anagram_bzero( char *p, unsigned long len )
 {
   unsigned long i;
diff --git a/baseline/source/anagram/anagram_stdlib.h b/baseline/source/anagram/anagram_stdlib.h
index 0e745d5..536fcc3 100644
--- a/baseline/source/anagram/anagram_stdlib.h
+++ b/baseline/source/anagram/anagram_stdlib.h
@@ -24,6 +24,8 @@
 
 void *anagram_malloc( unsigned int numberOfBytes );
 
+void anagram_free_all( void );
+
 void anagram_qsort( void *va, unsigned long n, unsigned long es );
 
 #endif
diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index 50ebfff..7d89f06 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/source/audiobeam/audiobeam.c
@@ -104,6 +104,8 @@ void audiobeam_init()
   unsigned int i;
   unsigned char *p;
   volatile char bitmask = 0;
+  // Reset heap
+  audiobeam_free_all();
 
   /*
     Apply volatile XOR-bitmask to entire input array.
@@ -578,16 +580,12 @@ void _Pragma( "entrypoint" ) audiobeam_main( void )
 
 int main( int argc, char **argv )
 {       
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=100;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 audiobeam_init();
                 audiobeam_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
 
   return ( audiobeam_return() );
 }
diff --git a/baseline/source/audiobeam/audiobeamlibmalloc.c b/baseline/source/audiobeam/audiobeamlibmalloc.c
index 50c3073..a81b634 100644
--- a/baseline/source/audiobeam/audiobeamlibmalloc.c
+++ b/baseline/source/audiobeam/audiobeamlibmalloc.c
@@ -11,4 +11,9 @@ void *audiobeam_malloc( unsigned int numberOfBytes )
   /* Get a 4-byte address for alignment purposes */
   audiobeam_freeHeapPos += ( ( numberOfBytes + 4 ) & ( unsigned int )0xfffffffc );
   return currentPos;
-}
\ No newline at end of file
+}
+
+void audiobeam_free_all( void )
+{
+  audiobeam_freeHeapPos = 0;
+}
diff --git a/baseline/source/audiobeam/audiobeamlibmalloc.h b/baseline/source/audiobeam/audiobeamlibmalloc.h
index eccbdb9..354bf0e 100644
--- a/baseline/source/audiobeam/audiobeamlibmalloc.h
+++ b/baseline/source/audiobeam/audiobeamlibmalloc.h
@@ -24,4 +24,6 @@
 
 void *audiobeam_malloc( unsigned int numberOfBytes );
 
+void audiobeam_free_all( void );
+
 #endif
diff --git a/baseline/source/g723_enc/g723_enc.c b/baseline/source/g723_enc/g723_enc.c
index 209e3ce..646adcd 100644
--- a/baseline/source/g723_enc/g723_enc.c
+++ b/baseline/source/g723_enc/g723_enc.c
@@ -172,6 +172,9 @@ short g723_enc_fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
                             0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0
                            };
 
+static unsigned int g723_enc_out_buffer = 0;
+static int    g723_enc_out_bits = 0;
+static int              g723_enc_i = 0;
 
 /*
   Declaration of macros
@@ -753,24 +756,21 @@ g723_enc_pack_output(
   unsigned  char  code,
   int     bits )
 {
-  static unsigned int out_buffer = 0;
-  static int    out_bits = 0;
   unsigned char   out_byte;
-  static int              i = 0;
-
-  out_buffer |= ( code << out_bits );
-  out_bits += bits;
-  if ( out_bits >= 8 ) {
-    out_byte = out_buffer & 0xff;
-    out_bits -= 8;
-    out_buffer >>= 8;
+
+  g723_enc_out_buffer |= ( code << g723_enc_out_bits );
+  g723_enc_out_bits += bits;
+  if ( g723_enc_out_bits >= 8 ) {
+    out_byte = g723_enc_out_buffer & 0xff;
+    g723_enc_out_bits -= 8;
+    g723_enc_out_buffer >>= 8;
     //fwrite(&out_byte, sizeof (char), 1, fp_out);
     //fwrite(&out_byte, 1, 1, fp_out);
-    g723_enc_OUTPUT[i] = out_byte;
-    i =  i + 1;
+    g723_enc_OUTPUT[g723_enc_i] = out_byte;
+    g723_enc_i =  g723_enc_i + 1;
   }
 
-  return ( out_bits > 0 );
+  return ( g723_enc_out_bits > 0 );
 }
 
 /*
@@ -815,6 +815,9 @@ void g723_enc_init()
 {
   int i;
   volatile int x = 0;
+  g723_enc_out_buffer = 0;
+  g723_enc_out_bits = 0;
+  g723_enc_i = 0;
   g723_enc_init_state( &g723_enc_state );
 
    _Pragma( "loopbound min 256 max 256" )
@@ -872,16 +875,12 @@ void _Pragma( "entrypoint" ) g723_enc_main()
 
 int main( int argc, char **argv )
 {
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=9;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 g723_enc_init();
                 g723_enc_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
   return ( g723_enc_return() );
 }
 
diff --git a/baseline/source/huff_dec/huff_dec.c b/baseline/source/huff_dec/huff_dec.c
index 58b40d3..e0ebc19 100644
--- a/baseline/source/huff_dec/huff_dec.c
+++ b/baseline/source/huff_dec/huff_dec.c
@@ -144,6 +144,8 @@ void huff_dec_init( void )
 {
   huff_dec_input_pos = 0;
   huff_dec_output_pos = 0;
+  huff_dec_byte_nb_to_read = 0;
+  huff_dec_val_to_read = 0;
 }
 
 
@@ -379,15 +381,11 @@ void _Pragma( "entrypoint" ) huff_dec_main( void )
 
 int main( int argc, char **argv )
 {
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=5;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
+        SET_UP
+        for_each_job {
                 huff_dec_init();
                 huff_dec_main();
-        //      STOP_LOOP
         }
-        //WRITE_TO_FILE
+        WRITE_TO_FILE
   return ( huff_dec_return() );
 }