63 files changed, 420 insertions, 454 deletions

diff --git a/all_pairs/source/adpcm_dec/adpcm_dec.c b/all_pairs/source/adpcm_dec/adpcm_dec.c
index 368e98d..0627c9c 100644
--- a/all_pairs/source/adpcm_dec/adpcm_dec.c
+++ b/all_pairs/source/adpcm_dec/adpcm_dec.c
@@ -708,12 +708,10 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        START_LOOP
-        adpcm_dec_init();
-        adpcm_dec_main();
-        STOP_LOOP
-}
-WRITE_TO_FILE
+  for_each_job {
+    adpcm_dec_init();
+    adpcm_dec_main();
+  }
+  WRITE_TO_FILE
   return ( adpcm_dec_return() );
 }
diff --git a/all_pairs/source/adpcm_enc/adpcm_enc.c b/all_pairs/source/adpcm_enc/adpcm_enc.c
index 777aaf5..118382f 100644
--- a/all_pairs/source/adpcm_enc/adpcm_enc.c
+++ b/all_pairs/source/adpcm_enc/adpcm_enc.c
@@ -746,13 +746,11 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                adpcm_enc_init();
-                adpcm_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    adpcm_enc_init();
+    adpcm_enc_main();
+  }
+  WRITE_TO_FILE
   return adpcm_enc_return();
 }
diff --git a/all_pairs/source/ammunition/ammunition.c b/all_pairs/source/ammunition/ammunition.c
index 052520e..4ae488b 100644
--- a/all_pairs/source/ammunition/ammunition.c
+++ b/all_pairs/source/ammunition/ammunition.c
@@ -1173,13 +1173,11 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                ammunition_init();
-                ammunition_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    ammunition_init();
+    ammunition_main();
+  }
+  WRITE_TO_FILE
   return ( ammunition_return() );
 }
diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c
index 5c1f29a..fc8b6a8 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();
 }
 
@@ -656,15 +658,11 @@ 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
-                anagram_init();
-                anagram_main();
-                STOP_LOOP
-        //}
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    anagram_init();
+    anagram_main();
+  }
+  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..5f23daf 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.
@@ -577,17 +579,13 @@ 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
-                audiobeam_init();
-                audiobeam_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+{
+  SET_UP
+  for_each_job {
+    audiobeam_init();
+    audiobeam_main();
+  }
+  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/cjpeg_transupp/cjpeg_transupp.c b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
index 5ec7e5e..112fba1 100644
--- a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
@@ -706,13 +706,11 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                cjpeg_transupp_init();
-                cjpeg_transupp_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    cjpeg_transupp_init();
+    cjpeg_transupp_main();
+  }
+  WRITE_TO_FILE
   return ( cjpeg_transupp_return() - 660 != 0 );
 }
diff --git a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 3c8d7ec..a7aa477 100644
--- a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -210,15 +210,13 @@ int cjpeg_wrbmp_return()
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                cjpeg_wrbmp_init();
-                cjpeg_wrbmp_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-    return ( cjpeg_wrbmp_return() );
+  SET_UP
+  for_each_job {
+    cjpeg_wrbmp_init();
+    cjpeg_wrbmp_main();
+  }
+  WRITE_TO_FILE
+  return ( cjpeg_wrbmp_return() );
 }
 
 #endif /* BMP_SUPPORTED */
diff --git a/all_pairs/source/dijkstra/dijkstra.c b/all_pairs/source/dijkstra/dijkstra.c
index 333fd43..6602918 100644
--- a/all_pairs/source/dijkstra/dijkstra.c
+++ b/all_pairs/source/dijkstra/dijkstra.c
@@ -192,13 +192,11 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 
 int main(int argc, char** argv )
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                dijkstra_init();
-                dijkstra_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    dijkstra_init();
+    dijkstra_main();
+  }
+  WRITE_TO_FILE
   return ( dijkstra_return() );
 }
diff --git a/all_pairs/source/epic/epic.c b/all_pairs/source/epic/epic.c
index a1e344c..e31e54e 100644
--- a/all_pairs/source/epic/epic.c
+++ b/all_pairs/source/epic/epic.c
@@ -598,7 +598,7 @@ void epic_main( void );
   Declaration of global variables
 */
 
-float epic_filtertemp[FILTER_SIZE];
+float epic_filtertemp[FILTER_SIZE*2]; // *2 to work around memory corruption issue
 float epic_hi_imagetemp[X_SIZE * Y_SIZE / 2];
 float epic_lo_imagetemp[X_SIZE * Y_SIZE / 2];
 
@@ -1129,13 +1129,16 @@ int epic_return(){
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                epic_init();
-                epic_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-  return epic_return();
+  int exit_code = -1;
+  SET_UP
+  for_each_job {
+    epic_init();
+    epic_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (image state persists between jobs).
+    exit_code &= epic_return();
+  }
+  WRITE_TO_FILE
+  return exit_code;
 }
diff --git a/all_pairs/source/fmref/fmref.c b/all_pairs/source/fmref/fmref.c
index e4c9aaa..b086f5a 100644
--- a/all_pairs/source/fmref/fmref.c
+++ b/all_pairs/source/fmref/fmref.c
@@ -77,14 +77,12 @@ int fmref_return(void)
 
 int main(int argc, char **argv){
 
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                fmref_init();
-                fmref_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    fmref_init();
+    fmref_main();
+  }
+  WRITE_TO_FILE
   return fmref_return();
 }
 
diff --git a/all_pairs/source/g723_enc/g723_enc.c b/all_pairs/source/g723_enc/g723_enc.c
index 209e3ce..bf2df51 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
-                g723_enc_init();
-                g723_enc_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    g723_enc_init();
+    g723_enc_main();
+  }
+  WRITE_TO_FILE
   return ( g723_enc_return() );
 }
 
diff --git a/all_pairs/source/gsm_dec/gsm_dec.c b/all_pairs/source/gsm_dec/gsm_dec.c
index ba9a9e9..abde144 100644
--- a/all_pairs/source/gsm_dec/gsm_dec.c
+++ b/all_pairs/source/gsm_dec/gsm_dec.c
@@ -752,13 +752,11 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 
 int main( int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                gsm_dec_init();
-                gsm_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    gsm_dec_init();
+    gsm_dec_main();
+  }
+  WRITE_TO_FILE
   return ( gsm_dec_return() );
 }
diff --git a/all_pairs/source/gsm_enc/gsm_enc.c b/all_pairs/source/gsm_enc/gsm_enc.c
index e8154bb..75e2e7f 100644
--- a/all_pairs/source/gsm_enc/gsm_enc.c
+++ b/all_pairs/source/gsm_enc/gsm_enc.c
@@ -2060,13 +2060,11 @@ void gsm_enc_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                gsm_enc_init();
-                gsm_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    gsm_enc_init();
+    gsm_enc_main();
+  }
+  WRITE_TO_FILE
   return ( gsm_enc_return() );
 }
diff --git a/all_pairs/source/h264_dec/h264_dec.c b/all_pairs/source/h264_dec/h264_dec.c
index e74bec9..1abd883 100644
--- a/all_pairs/source/h264_dec/h264_dec.c
+++ b/all_pairs/source/h264_dec/h264_dec.c
@@ -597,14 +597,12 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                h264_dec_init();
-                h264_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    h264_dec_init();
+    h264_dec_main();
+  }
+  WRITE_TO_FILE
 
   return ( h264_dec_return() );
 }
diff --git a/all_pairs/source/huff_dec/huff_dec.c b/all_pairs/source/huff_dec/huff_dec.c
index 58b40d3..8ebf2f7 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
-                huff_dec_init();
-                huff_dec_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    huff_dec_init();
+    huff_dec_main();
+  }
+  WRITE_TO_FILE
   return ( huff_dec_return() );
 }
diff --git a/all_pairs/source/huff_enc/huff_enc.c b/all_pairs/source/huff_enc/huff_enc.c
index 0d74916..f2db552 100644
--- a/all_pairs/source/huff_enc/huff_enc.c
+++ b/all_pairs/source/huff_enc/huff_enc.c
@@ -577,13 +577,11 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                huff_enc_init();
-                huff_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    huff_enc_init();
+    huff_enc_main();
+  }
+  WRITE_TO_FILE
   return ( huff_enc_return() );
 }
diff --git a/all_pairs/source/mpeg2/mpeg2.c b/all_pairs/source/mpeg2/mpeg2.c
index 0567225..cceeb30 100644
--- a/all_pairs/source/mpeg2/mpeg2.c
+++ b/all_pairs/source/mpeg2/mpeg2.c
@@ -13205,14 +13205,12 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                mpeg2_init();
-                mpeg2_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    mpeg2_init();
+    mpeg2_main();
+  }
+  WRITE_TO_FILE
 
   return( mpeg2_return() - (-116) != 0 );
 }
diff --git a/all_pairs/source/ndes/ndes.c b/all_pairs/source/ndes/ndes.c
index f169c62..5d00d94 100644
--- a/all_pairs/source/ndes/ndes.c
+++ b/all_pairs/source/ndes/ndes.c
@@ -365,14 +365,12 @@ void _Pragma( "entrypoint" ) ndes_main()
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                ndes_init();
-                ndes_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    ndes_init();
+    ndes_main();
+  }
+  WRITE_TO_FILE
 
   return ( ndes_return() );
 }
diff --git a/all_pairs/source/petrinet/petrinet.c b/all_pairs/source/petrinet/petrinet.c
index 6ef3392..a54a999 100644
--- a/all_pairs/source/petrinet/petrinet.c
+++ b/all_pairs/source/petrinet/petrinet.c
@@ -976,14 +976,10 @@ int petrinet_return( void )
 int main( int argc, char **argv )
 {
   SET_UP
-
-   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){  
-        
-        START_LOOP
-        petrinet_main();
-        STOP_LOOP
-        }       
-        WRITE_TO_FILE
+  for_each_job {
+    petrinet_main();
+  }
+  WRITE_TO_FILE
 
   return ( petrinet_return() );
 }
diff --git a/all_pairs/source/rijndael_dec/rijndael_dec.c b/all_pairs/source/rijndael_dec/rijndael_dec.c
index 61db767..c8f606b 100644
--- a/all_pairs/source/rijndael_dec/rijndael_dec.c
+++ b/all_pairs/source/rijndael_dec/rijndael_dec.c
@@ -182,14 +182,12 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 
 int main(int argc, char** argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                rijndael_dec_init();
-                rijndael_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    rijndael_dec_init();
+    rijndael_dec_main();
+  }
+  WRITE_TO_FILE
   return ( rijndael_dec_return() );
 }
 
diff --git a/all_pairs/source/rijndael_enc/rijndael_enc.c b/all_pairs/source/rijndael_enc/rijndael_enc.c
index 6c85eee..f0582c9 100644
--- a/all_pairs/source/rijndael_enc/rijndael_enc.c
+++ b/all_pairs/source/rijndael_enc/rijndael_enc.c
@@ -68,6 +68,7 @@ void rijndael_enc_init( void )
   rijndael_enc_fin.data = rijndael_enc_data;
   rijndael_enc_fin.size = 31369;
   rijndael_enc_fin.cur_pos = 0;
+  rijndael_enc_checksum = 0;
 
   unsigned i;
   volatile int x = 0;
@@ -225,14 +226,17 @@ void _Pragma( "entrypoint" ) rijndael_enc_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                rijndael_enc_init();
-                rijndael_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-  return ( rijndael_enc_return() );
+  int exit_code = -1;
+  SET_UP
+  for_each_job {
+    rijndael_enc_init();
+    rijndael_enc_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (PRNG state persists between jobs).
+    exit_code &= rijndael_enc_return();
+  }
+  WRITE_TO_FILE
+  return ( exit_code );
 }
 
diff --git a/all_pairs/source/statemate/statemate.c b/all_pairs/source/statemate/statemate.c
index 888d0fa..8239ed6 100644
--- a/all_pairs/source/statemate/statemate.c
+++ b/all_pairs/source/statemate/statemate.c
@@ -1273,14 +1273,12 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 
 int main ( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                statemate_init();
-                statemate_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    statemate_init();
+    statemate_main();
+  }
+  WRITE_TO_FILE
 
   return statemate_return();
 }
diff --git a/all_pairs/source/susan/susan.c b/all_pairs/source/susan/susan.c
index dc27fb1..14a2f28 100644
--- a/all_pairs/source/susan/susan.c
+++ b/all_pairs/source/susan/susan.c
@@ -2001,14 +2001,12 @@ int susan_return( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                susan_init();
-                susan_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    susan_init();
+    susan_main();
+  }
+  WRITE_TO_FILE
 
   return susan_return();
 }
diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 368e98d..0627c9c 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -708,12 +708,10 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        START_LOOP
-        adpcm_dec_init();
-        adpcm_dec_main();
-        STOP_LOOP
-}
-WRITE_TO_FILE
+  for_each_job {
+    adpcm_dec_init();
+    adpcm_dec_main();
+  }
+  WRITE_TO_FILE
   return ( adpcm_dec_return() );
 }
diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index 777aaf5..118382f 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/source/adpcm_enc/adpcm_enc.c
@@ -746,13 +746,11 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                adpcm_enc_init();
-                adpcm_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    adpcm_enc_init();
+    adpcm_enc_main();
+  }
+  WRITE_TO_FILE
   return adpcm_enc_return();
 }
diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 052520e..4ae488b 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/source/ammunition/ammunition.c
@@ -1173,13 +1173,11 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                ammunition_init();
-                ammunition_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    ammunition_init();
+    ammunition_main();
+  }
+  WRITE_TO_FILE
   return ( ammunition_return() );
 }
diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index 5c1f29a..fc8b6a8 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();
 }
 
@@ -656,15 +658,11 @@ 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
-                anagram_init();
-                anagram_main();
-                STOP_LOOP
-        //}
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    anagram_init();
+    anagram_main();
+  }
+  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..5f23daf 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.
@@ -577,17 +579,13 @@ 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
-                audiobeam_init();
-                audiobeam_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+{
+  SET_UP
+  for_each_job {
+    audiobeam_init();
+    audiobeam_main();
+  }
+  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/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index 5ec7e5e..112fba1 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
@@ -706,13 +706,11 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                cjpeg_transupp_init();
-                cjpeg_transupp_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    cjpeg_transupp_init();
+    cjpeg_transupp_main();
+  }
+  WRITE_TO_FILE
   return ( cjpeg_transupp_return() - 660 != 0 );
 }
diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 3c8d7ec..a7aa477 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -210,15 +210,13 @@ int cjpeg_wrbmp_return()
 
 int main(int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                cjpeg_wrbmp_init();
-                cjpeg_wrbmp_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-    return ( cjpeg_wrbmp_return() );
+  SET_UP
+  for_each_job {
+    cjpeg_wrbmp_init();
+    cjpeg_wrbmp_main();
+  }
+  WRITE_TO_FILE
+  return ( cjpeg_wrbmp_return() );
 }
 
 #endif /* BMP_SUPPORTED */
diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index 333fd43..6602918 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/source/dijkstra/dijkstra.c
@@ -192,13 +192,11 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 
 int main(int argc, char** argv )
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                dijkstra_init();
-                dijkstra_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    dijkstra_init();
+    dijkstra_main();
+  }
+  WRITE_TO_FILE
   return ( dijkstra_return() );
 }
diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index a1e344c..e31e54e 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -598,7 +598,7 @@ void epic_main( void );
   Declaration of global variables
 */
 
-float epic_filtertemp[FILTER_SIZE];
+float epic_filtertemp[FILTER_SIZE*2]; // *2 to work around memory corruption issue
 float epic_hi_imagetemp[X_SIZE * Y_SIZE / 2];
 float epic_lo_imagetemp[X_SIZE * Y_SIZE / 2];
 
@@ -1129,13 +1129,16 @@ int epic_return(){
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                epic_init();
-                epic_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-  return epic_return();
+  int exit_code = -1;
+  SET_UP
+  for_each_job {
+    epic_init();
+    epic_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (image state persists between jobs).
+    exit_code &= epic_return();
+  }
+  WRITE_TO_FILE
+  return exit_code;
 }
diff --git a/baseline/source/fmref/fmref.c b/baseline/source/fmref/fmref.c
index e4c9aaa..b086f5a 100644
--- a/baseline/source/fmref/fmref.c
+++ b/baseline/source/fmref/fmref.c
@@ -77,14 +77,12 @@ int fmref_return(void)
 
 int main(int argc, char **argv){
 
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                fmref_init();
-                fmref_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    fmref_init();
+    fmref_main();
+  }
+  WRITE_TO_FILE
   return fmref_return();
 }
 
diff --git a/baseline/source/g723_enc/g723_enc.c b/baseline/source/g723_enc/g723_enc.c
index 209e3ce..bf2df51 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
-                g723_enc_init();
-                g723_enc_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    g723_enc_init();
+    g723_enc_main();
+  }
+  WRITE_TO_FILE
   return ( g723_enc_return() );
 }
 
diff --git a/baseline/source/gsm_dec/gsm_dec.c b/baseline/source/gsm_dec/gsm_dec.c
index ba9a9e9..abde144 100644
--- a/baseline/source/gsm_dec/gsm_dec.c
+++ b/baseline/source/gsm_dec/gsm_dec.c
@@ -752,13 +752,11 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 
 int main( int argc, char **argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                gsm_dec_init();
-                gsm_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    gsm_dec_init();
+    gsm_dec_main();
+  }
+  WRITE_TO_FILE
   return ( gsm_dec_return() );
 }
diff --git a/baseline/source/gsm_enc/gsm_enc.c b/baseline/source/gsm_enc/gsm_enc.c
index e8154bb..75e2e7f 100644
--- a/baseline/source/gsm_enc/gsm_enc.c
+++ b/baseline/source/gsm_enc/gsm_enc.c
@@ -2060,13 +2060,11 @@ void gsm_enc_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                gsm_enc_init();
-                gsm_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    gsm_enc_init();
+    gsm_enc_main();
+  }
+  WRITE_TO_FILE
   return ( gsm_enc_return() );
 }
diff --git a/baseline/source/h264_dec/h264_dec.c b/baseline/source/h264_dec/h264_dec.c
index e74bec9..1abd883 100644
--- a/baseline/source/h264_dec/h264_dec.c
+++ b/baseline/source/h264_dec/h264_dec.c
@@ -597,14 +597,12 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                h264_dec_init();
-                h264_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    h264_dec_init();
+    h264_dec_main();
+  }
+  WRITE_TO_FILE
 
   return ( h264_dec_return() );
 }
diff --git a/baseline/source/huff_dec/huff_dec.c b/baseline/source/huff_dec/huff_dec.c
index 58b40d3..8ebf2f7 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
-                huff_dec_init();
-                huff_dec_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    huff_dec_init();
+    huff_dec_main();
+  }
+  WRITE_TO_FILE
   return ( huff_dec_return() );
 }
diff --git a/baseline/source/huff_enc/huff_enc.c b/baseline/source/huff_enc/huff_enc.c
index 0d74916..f2db552 100644
--- a/baseline/source/huff_enc/huff_enc.c
+++ b/baseline/source/huff_enc/huff_enc.c
@@ -577,13 +577,11 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                huff_enc_init();
-                huff_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    huff_enc_init();
+    huff_enc_main();
+  }
+  WRITE_TO_FILE
   return ( huff_enc_return() );
 }
diff --git a/baseline/source/mpeg2/mpeg2.c b/baseline/source/mpeg2/mpeg2.c
index 0567225..cceeb30 100644
--- a/baseline/source/mpeg2/mpeg2.c
+++ b/baseline/source/mpeg2/mpeg2.c
@@ -13205,14 +13205,12 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                mpeg2_init();
-                mpeg2_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    mpeg2_init();
+    mpeg2_main();
+  }
+  WRITE_TO_FILE
 
   return( mpeg2_return() - (-116) != 0 );
 }
diff --git a/baseline/source/ndes/ndes.c b/baseline/source/ndes/ndes.c
index f169c62..5d00d94 100644
--- a/baseline/source/ndes/ndes.c
+++ b/baseline/source/ndes/ndes.c
@@ -365,14 +365,12 @@ void _Pragma( "entrypoint" ) ndes_main()
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                ndes_init();
-                ndes_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    ndes_init();
+    ndes_main();
+  }
+  WRITE_TO_FILE
 
   return ( ndes_return() );
 }
diff --git a/baseline/source/petrinet/petrinet.c b/baseline/source/petrinet/petrinet.c
index 6ef3392..a54a999 100644
--- a/baseline/source/petrinet/petrinet.c
+++ b/baseline/source/petrinet/petrinet.c
@@ -976,14 +976,10 @@ int petrinet_return( void )
 int main( int argc, char **argv )
 {
   SET_UP
-
-   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){  
-        
-        START_LOOP
-        petrinet_main();
-        STOP_LOOP
-        }       
-        WRITE_TO_FILE
+  for_each_job {
+    petrinet_main();
+  }
+  WRITE_TO_FILE
 
   return ( petrinet_return() );
 }
diff --git a/baseline/source/rijndael_dec/rijndael_dec.c b/baseline/source/rijndael_dec/rijndael_dec.c
index 61db767..c8f606b 100644
--- a/baseline/source/rijndael_dec/rijndael_dec.c
+++ b/baseline/source/rijndael_dec/rijndael_dec.c
@@ -182,14 +182,12 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 
 int main(int argc, char** argv)
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                rijndael_dec_init();
-                rijndael_dec_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    rijndael_dec_init();
+    rijndael_dec_main();
+  }
+  WRITE_TO_FILE
   return ( rijndael_dec_return() );
 }
 
diff --git a/baseline/source/rijndael_enc/rijndael_enc.c b/baseline/source/rijndael_enc/rijndael_enc.c
index 6c85eee..f0582c9 100644
--- a/baseline/source/rijndael_enc/rijndael_enc.c
+++ b/baseline/source/rijndael_enc/rijndael_enc.c
@@ -68,6 +68,7 @@ void rijndael_enc_init( void )
   rijndael_enc_fin.data = rijndael_enc_data;
   rijndael_enc_fin.size = 31369;
   rijndael_enc_fin.cur_pos = 0;
+  rijndael_enc_checksum = 0;
 
   unsigned i;
   volatile int x = 0;
@@ -225,14 +226,17 @@ void _Pragma( "entrypoint" ) rijndael_enc_main( void )
 
 int main( int argc, char** argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                rijndael_enc_init();
-                rijndael_enc_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
-  return ( rijndael_enc_return() );
+  int exit_code = -1;
+  SET_UP
+  for_each_job {
+    rijndael_enc_init();
+    rijndael_enc_main();
+    // This checks the checksum is as expected.
+    // This is `&` as only the first job will match
+    // (PRNG state persists between jobs).
+    exit_code &= rijndael_enc_return();
+  }
+  WRITE_TO_FILE
+  return ( exit_code );
 }
 
diff --git a/baseline/source/statemate/statemate.c b/baseline/source/statemate/statemate.c
index 888d0fa..8239ed6 100644
--- a/baseline/source/statemate/statemate.c
+++ b/baseline/source/statemate/statemate.c
@@ -1273,14 +1273,12 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 
 int main ( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                statemate_init();
-                statemate_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    statemate_init();
+    statemate_main();
+  }
+  WRITE_TO_FILE
 
   return statemate_return();
 }
diff --git a/baseline/source/susan/susan.c b/baseline/source/susan/susan.c
index dc27fb1..14a2f28 100644
--- a/baseline/source/susan/susan.c
+++ b/baseline/source/susan/susan.c
@@ -2001,14 +2001,12 @@ int susan_return( void )
 
 int main( int argc, char **argv )
 {
-        SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
-                susan_init();
-                susan_main();
-                STOP_LOOP
-        }
-        WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    susan_init();
+    susan_main();
+  }
+  WRITE_TO_FILE
 
   return susan_return();
 }
diff --git a/dis/Field/field.c b/dis/Field/field.c
index 900d47b..d028ee7 100644
--- a/dis/Field/field.c
+++ b/dis/Field/field.c
@@ -137,17 +137,17 @@ int main(int argc, char **argv) {
   }
   endTime = time(NULL);
 
-  volatile int sumAll = 0;
+  volatile int _stop_optimizer = 0;
   for (l = 0; l < n; l++) {
     unsigned int ll;
-    // fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
-    sumAll += token[l].subfields + l;
+    //fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
+    _stop_optimizer += token[l].subfields + l;
     for (ll = 0; ll < token[l].subfields; ll++) {
-      sumAll += ll + token[l].stat[ll].count + token[l].stat[ll].min +
+      _stop_optimizer += ll + token[l].stat[ll].count + token[l].stat[ll].min +
                 token[l].stat[ll].sum;
-      /*fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
-          ll, token[l].stat[ll].count,
-          token[l].stat[ll].min, token[l].stat[ll].sum);*/
+      //fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
+      //    ll, token[l].stat[ll].count,
+      //    token[l].stat[ll].min, token[l].stat[ll].sum);*/
     }
   }
   fprintf(stderr, "time for field stressmark = %f seconds.\n",
diff --git a/dis/Matrix/ver2/matrix.c b/dis/Matrix/ver2/matrix.c
index 5162579..9d9ac7e 100755
--- a/dis/Matrix/ver2/matrix.c
+++ b/dis/Matrix/ver2/matrix.c
@@ -551,8 +551,10 @@ int main(int argc, char **argv) {
     sum += sum + *(vectorX + k);
   }
 
-  fprintf(stdout, "sum = %f, actualError = %e, actualIteration = %d\n", sum,
-          actualError, actualIteration);
+  //fprintf(stdout, "sum = %f, actualError = %e, actualIteration = %d\n", sum,
+  //        actualError, actualIteration);
+  volatile double _stop_optimizer = sum + actualError + actualIteration;
+
   fprintf(stderr, "time for matrix stressmark = %f seconds.\n",
           difftime(endTime, beginTime));
 
diff --git a/dis/Neighborhood/neighborhood.c b/dis/Neighborhood/neighborhood.c
index 2d401d3..ea1c658 100644
--- a/dis/Neighborhood/neighborhood.c
+++ b/dis/Neighborhood/neighborhood.c
@@ -74,23 +74,30 @@ int main(int argc, char **argv) {
   endTime = time(NULL);
   WRITE_TO_FILE
 
-  //  printf(" end time is %d\n", endTime);
+  volatile double _stop_optimizer = values.distShort.deg0.entropy
+          + values.distShort.deg0.energy + values.distShort.deg45.entropy
+          + values.distShort.deg45.energy + values.distShort.deg90.entropy
+          + values.distShort.deg90.energy + values.distShort.deg135.entropy
+          + values.distShort.deg135.energy + values.distLong.deg0.entropy
+          + values.distLong.deg0.energy + values.distShort.deg45.entropy
+          + values.distLong.deg45.energy + values.distLong.deg90.entropy
+          + values.distLong.deg90.energy + values.distLong.deg135.entropy
+          + values.distLong.deg135.energy;
+  //fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+  //        values.distShort.deg0.entropy, values.distShort.deg0.energy,
+  //        values.distShort.deg45.entropy, values.distShort.deg45.energy,
+  //        values.distShort.deg90.entropy, values.distShort.deg90.energy,
+  //        values.distShort.deg135.entropy, values.distShort.deg135.energy);
 
-  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
-          values.distShort.deg0.entropy, values.distShort.deg0.energy,
-          values.distShort.deg45.entropy, values.distShort.deg45.energy,
-          values.distShort.deg90.entropy, values.distShort.deg90.energy,
-          values.distShort.deg135.entropy, values.distShort.deg135.energy);
-
-  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
-          values.distLong.deg0.entropy, values.distLong.deg0.energy,
-          values.distShort.deg45.entropy, values.distLong.deg45.energy,
-          values.distLong.deg90.entropy, values.distLong.deg90.energy,
-          values.distLong.deg135.entropy, values.distLong.deg135.energy);
+  //fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+  //        values.distLong.deg0.entropy, values.distLong.deg0.energy,
+  //        values.distShort.deg45.entropy, values.distLong.deg45.energy,
+  //        values.distLong.deg90.entropy, values.distLong.deg90.energy,
+  //        values.distLong.deg135.entropy, values.distLong.deg135.energy);
 
   fprintf(stderr, "time for neghborhood stressmark = %f seconds.\n",
           difftime(endTime, beginTime));
 
   free((Pixel *)image);
-  return (SUCCESS);
+  return (0);
 }
diff --git a/dis/Pointer/pointer.c b/dis/Pointer/pointer.c
index d97f276..0325c64 100644
--- a/dis/Pointer/pointer.c
+++ b/dis/Pointer/pointer.c
@@ -146,10 +146,11 @@ int main(int argc, char **argv) {
 
   endTime = time(NULL);
 
-  volatile int _stop_optimizer = thread[l].hops + l;
-  /*for (l=0; l<n; l++){
-   fprintf(stdout, "%lu hops on thread %d\n", thread[l].hops, l);
-  }*/
+  volatile int _stop_optimizer = 0;
+  for (l=0; l<n; l++){
+      _stop_optimizer += thread[l].hops + l;
+  //  fprintf(stdout, "%lu hops on thread %d\n", thread[l].hops, l);
+  }
 
   fprintf(stderr, "time for pointer stressmark = %f seconds.\n",
           difftime(endTime, startTime));
diff --git a/dis/Transitive/transitive.c b/dis/Transitive/transitive.c
index 9337aad..0679f7e 100644
--- a/dis/Transitive/transitive.c
+++ b/dis/Transitive/transitive.c
@@ -47,7 +47,6 @@ int main(int argc, char **argv) {
 
   time_t startTime, stopTime;
   unsigned int sum;
-  volatile int realRes = 0;
 
   assert(fscanf(stdin, "%d %d %d", &n, &m, &seed) == 3);
 
@@ -100,14 +99,15 @@ int main(int argc, char **argv) {
 
   stopTime = time(NULL);
 
+  volatile int _stop_optimizer = 0;
   for (j = 0; j < n; j++) {
     sum = 0;
     for (i = 0; i < n; i++) {
       if (*(din + j * n + i) != NO_PATH)
         sum += *(din + j * n + i);
     }
-    realRes += sum;
-    // fprintf(stdout, "%u ", sum);
+    _stop_optimizer += sum;
+    //fprintf(stdout, "%u ", sum);
   }
   for (i = 0; i < n; i++) {
     sum = 0;
@@ -115,8 +115,8 @@ int main(int argc, char **argv) {
       if (*(din + j * n + i) != NO_PATH)
         sum += *(din + j * n + i);
     }
-    realRes += sum;
-    // fprintf(stdout, "%u ", sum);
+    _stop_optimizer += sum;
+    //fprintf(stdout, "%u ", sum);
   }
   fprintf(stderr, "time for transitive stressmark = %f seconds.\n",
           difftime(stopTime, startTime));
diff --git a/dis/Update/update.c b/dis/Update/update.c
index b7bf2b5..a41f3e1 100644
--- a/dis/Update/update.c
+++ b/dis/Update/update.c
@@ -134,10 +134,10 @@ int main(int argc, char **argv) {
   endTime = time(NULL);
 
   volatile int _stop_optimizer = hops;
-  // fprintf(stdout, "%u hops\n", hops);
+  //fprintf(stdout, "%u hops\n", hops);
   fprintf(stderr, "time for update stressmark = %f seconds.\n",
           difftime(endTime, startTime));
   free(field);
   WRITE_TO_FILE
-  return (1);
+  return (0);
 }
diff --git a/extra.h b/extra.h
index 3215951..a15313a 100644
--- a/extra.h
+++ b/extra.h
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 Sims Hill Osborne and Joshua Bakita
+ * Copyright 2019 Sims Hill Osborne and 2020 Joshua Bakita
  *
  * This header provides facilities by which to separably run and time TACLeBench
  * To use this for paired task timing, define PAIRED (pass CFLAGS=-DPAIRED to make)
diff --git a/dis/run_all_dis.sh b/run_all_dis.sh
index 5a6b6e1..5a6b6e1 100755
--- a/dis/run_all_dis.sh
+++ b/run_all_dis.sh
diff --git a/baseline/run_baseline.sh b/run_bench.sh
index c5b67b6..c5b67b6 100755
--- a/baseline/run_baseline.sh
+++ b/run_bench.sh