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
---
 baseline/source/anagram/anagram.c        | 10 ++++------
 baseline/source/anagram/anagram_stdlib.c |  5 +++++
 baseline/source/anagram/anagram_stdlib.h |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'baseline/source/anagram')

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


From dd606a16e840880e7617b140f6083af8ea83b6b7 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Tue, 20 Oct 2020 17:10:14 -0400
Subject: Whitespace fixes for TACLeBench and copyright update in extra.h

Also move run_all_dis.sh up a directory in preperation for
further changes.
---
 baseline/source/anagram/anagram.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'baseline/source/anagram')

diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index 1061470..fc8b6a8 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/source/anagram/anagram.c
@@ -658,11 +658,11 @@ void _Pragma( "entrypoint" ) anagram_main( void )
 
 int main(int argc, char **argv)
 {
-	SET_UP
-	for_each_job {
-		anagram_init();
-  		anagram_main();
-	}
-	WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    anagram_init();
+    anagram_main();
+  }
+  WRITE_TO_FILE
   return anagram_return();
 }
-- 
cgit v1.2.2