From e9560dbece41136ffedd786723717efaa2a3a9fd Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Tue, 20 Oct 2020 16:30:44 -0400
Subject: Fix the 4 TACLeBench members that would not loop before

- anagram, audiobeam: Reset heap in _init() function
- g723_enc: Don't use static local variables
- huff_dec: Reset all global state in _init() function
---
 all_pairs/source/audiobeam/audiobeam.c          | 12 +++++-------
 all_pairs/source/audiobeam/audiobeamlibmalloc.c |  7 ++++++-
 all_pairs/source/audiobeam/audiobeamlibmalloc.h |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'all_pairs/source/audiobeam')

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
-- 
cgit v1.2.2