27 files changed, 188 insertions, 210 deletions

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
-        }
+{
+  SET_UP
+  for_each_job {
+    audiobeam_init();
+    audiobeam_main();
+  }
+  WRITE_TO_FILE