diff options
| author | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-22 00:37:06 -0400 |
|---|---|---|
| committer | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-22 00:37:06 -0400 |
| commit | 1849016a4c0fd3d62b0acb66e7fd0f8c92b4c6fb (patch) | |
| tree | 932b2074ccc51d279ea04495b4d840a813e28ee2 /all_pairs | |
| parent | 83f8b415563703d9efdf258a60f10fcca264565d (diff) | |
Fix 4 more bugs in TACLeBench
- anagram: Fix two off-by-ones, the heap size, and the result
- rijndael_dec: Reset result checksum at job start
- huff_enc: Reset mutable global variables at job start
Diffstat (limited to 'all_pairs')
| -rw-r--r-- | all_pairs/source/anagram/anagram.c | 6 | ||||
| -rw-r--r-- | all_pairs/source/anagram/anagram_stdlib.c | 2 | ||||
| -rw-r--r-- | all_pairs/source/huff_enc/huff_enc.c | 2 | ||||
| -rw-r--r-- | all_pairs/source/rijndael_dec/rijndael_dec.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c index fc8b6a8..feb9784 100644 --- a/all_pairs/source/anagram/anagram.c +++ b/all_pairs/source/anagram/anagram.c | |||
| @@ -305,10 +305,10 @@ void anagram_ReadDict( void ) | |||
| 305 | _Pragma( "loopbound min 1 max 5" ) | 305 | _Pragma( "loopbound min 1 max 5" ) |
| 306 | while ( anagram_dictionary[ i ][ strlen ] != 0 ) | 306 | while ( anagram_dictionary[ i ][ strlen ] != 0 ) |
| 307 | strlen ++; | 307 | strlen ++; |
| 308 | len += strlen + 2; | 308 | len += strlen + 3; |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | pchBase = anagram_pchDictionary = ( char * )anagram_malloc( len ); | 311 | pchBase = anagram_pchDictionary = ( char * )anagram_malloc( len + 1 ); |
| 312 | 312 | ||
| 313 | _Pragma( "loopbound min 2279 max 2279" ) | 313 | _Pragma( "loopbound min 2279 max 2279" ) |
| 314 | for ( i = 0; i < anagram_DICTWORDS; i ++ ) { | 314 | for ( i = 0; i < anagram_DICTWORDS; i ++ ) { |
| @@ -346,7 +346,7 @@ void anagram_init( void ) | |||
| 346 | int anagram_return( void ) | 346 | int anagram_return( void ) |
| 347 | { | 347 | { |
| 348 | int i; | 348 | int i; |
| 349 | char const *answer = "duke rip amy"; | 349 | char const *answer = "duke yip arm"; |
| 350 | 350 | ||
| 351 | for ( i = 0; i < 12; i++ ) | 351 | for ( i = 0; i < 12; i++ ) |
| 352 | if ( answer[ i ] != anagram_buffer[ i ] ) | 352 | if ( answer[ i ] != anagram_buffer[ i ] ) |
diff --git a/all_pairs/source/anagram/anagram_stdlib.c b/all_pairs/source/anagram/anagram_stdlib.c index c766a5e..5c9f3fc 100644 --- a/all_pairs/source/anagram/anagram_stdlib.c +++ b/all_pairs/source/anagram/anagram_stdlib.c | |||
| @@ -126,7 +126,7 @@ void anagram_qsort( void *va, unsigned long n, unsigned long es ) | |||
| 126 | 126 | ||
| 127 | 127 | ||
| 128 | /* This must be redefined for each new benchmark */ | 128 | /* This must be redefined for each new benchmark */ |
| 129 | #define ANAGRAM_HEAP_SIZE 18000 | 129 | #define ANAGRAM_HEAP_SIZE 20388 |
| 130 | 130 | ||
| 131 | static char anagram_simulated_heap[ANAGRAM_HEAP_SIZE]; | 131 | static char anagram_simulated_heap[ANAGRAM_HEAP_SIZE]; |
| 132 | static unsigned int anagram_freeHeapPos; | 132 | static unsigned int anagram_freeHeapPos; |
diff --git a/all_pairs/source/huff_enc/huff_enc.c b/all_pairs/source/huff_enc/huff_enc.c index f2db552..6a0b901 100644 --- a/all_pairs/source/huff_enc/huff_enc.c +++ b/all_pairs/source/huff_enc/huff_enc.c | |||
| @@ -153,6 +153,8 @@ void huff_enc_init( void ) | |||
| 153 | { | 153 | { |
| 154 | huff_enc_input_pos = 0; | 154 | huff_enc_input_pos = 0; |
| 155 | huff_enc_output_pos = 0; | 155 | huff_enc_output_pos = 0; |
| 156 | huff_enc_byte_nb_to_write = 0; | ||
| 157 | huff_enc_val_to_write = 0; | ||
| 156 | } | 158 | } |
| 157 | 159 | ||
| 158 | 160 | ||
diff --git a/all_pairs/source/rijndael_dec/rijndael_dec.c b/all_pairs/source/rijndael_dec/rijndael_dec.c index c8f606b..5c0bea8 100644 --- a/all_pairs/source/rijndael_dec/rijndael_dec.c +++ b/all_pairs/source/rijndael_dec/rijndael_dec.c | |||
| @@ -68,6 +68,7 @@ void rijndael_dec_init( void ) | |||
| 68 | rijndael_dec_fin.data = rijndael_dec_data; | 68 | rijndael_dec_fin.data = rijndael_dec_data; |
| 69 | rijndael_dec_fin.size = 32768; | 69 | rijndael_dec_fin.size = 32768; |
| 70 | rijndael_dec_fin.cur_pos = 0; | 70 | rijndael_dec_fin.cur_pos = 0; |
| 71 | rijndael_dec_checksum = 0; | ||
| 71 | 72 | ||
| 72 | unsigned i; | 73 | unsigned i; |
| 73 | volatile int x = 0; | 74 | volatile int x = 0; |
