cleanup of TIMES macro
MODIFY
src/afl-analyze.c
src/afl-analyze.c
@@ -96,31 +96,20 @@ static afl_forkserver_t fsrv = {0}; /* The forkserver */
/* Classify tuple counts. This is a slow & naive version, but good enough here.
*/
-#define TIMES4(x) x, x, x, x
-#define TIMES8(x) TIMES4(x), TIMES4(x)
-#define TIMES16(x) TIMES8(x), TIMES8(x)
-#define TIMES32(x) TIMES16(x), TIMES16(x)
-#define TIMES64(x) TIMES32(x), TIMES32(x)
static u8 count_class_lookup[256] = {
[0] = 0,
[1] = 1,
[2] = 2,
[3] = 4,
- [4] = TIMES4(8),
- [8] = TIMES8(16),
- [16] = TIMES16(32),
- [32] = TIMES32(64),
- [128] = TIMES64(128)
+ [4 ... 7] = 8,
+ [8 ... 15] = 16,
+ [16 ... 31] = 32,
+ [32 ... 127] = 64,
+ [128 ... 255] = 128
};
-#undef TIMES64
-#undef TIMES32
-#undef TIMES16
-#undef TIMES8
-#undef TIMES4
-
static void kill_child() {
if (fsrv.child_pid > 0) {

MODIFY
src/afl-fuzz-bitmap.c
src/afl-fuzz-bitmap.c
@@ -167,13 +167,6 @@ const u8 count_class_lookup8[256] = {
};
-#undef TIMES255
-#undef TIMES64
-#undef TIMES32
-#undef TIMES16
-#undef TIMES8
-#undef TIMES4
-
u16 count_class_lookup16[65536];
void init_count_class16(void) {

MODIFY
src/afl-showmap.c
src/afl-showmap.c
@@ -103,24 +103,17 @@ static sharedmem_t * shm_fuzz;
/* Classify tuple counts. Instead of mapping to individual bits, as in
afl-fuzz.c, we map to more user-friendly numbers between 1 and 8. */
-#define TIMES4(x) x, x, x, x
-#define TIMES8(x) TIMES4(x), TIMES4(x)
-#define TIMES16(x) TIMES8(x), TIMES8(x)
-#define TIMES32(x) TIMES16(x), TIMES16(x)
-#define TIMES64(x) TIMES32(x), TIMES32(x)
-#define TIMES96(x) TIMES64(x), TIMES32(x)
-#define TIMES128(x) TIMES64(x), TIMES64(x)
static const u8 count_class_human[256] = {
[0] = 0,
[1] = 1,
[2] = 2,
[3] = 3,
- [4] = TIMES4(4),
- [8] = TIMES8(5),
- [16] = TIMES16(6),
- [32] = TIMES96(7),
- [128] = TIMES128(8)
+ [4] = 4,
+ [8] = 5,
+ [16] = 6,
+ [32] = 7,
+ [128] = 8
};
@@ -130,22 +123,14 @@ static const u8 count_class_binary[256] = {
[1] = 1,
[2] = 2,
[3] = 4,
- [4] = TIMES4(8),
- [8] = TIMES8(16),
- [16] = TIMES16(32),
- [32] = TIMES32(64),
- [128] = TIMES64(128)
+ [4 ... 7] = 8,
+ [8 ... 15] = 16,
+ [16 ... 31] = 32,
+ [32 ... 127] = 64,
+ [128 ... 255] = 128
};
-#undef TIMES128
-#undef TIMES96
-#undef TIMES64
-#undef TIMES32
-#undef TIMES16
-#undef TIMES8
-#undef TIMES4
-
static void kill_child() {
timed_out = 1;

MODIFY
src/afl-tmin.c
src/afl-tmin.c
@@ -95,31 +95,20 @@ static sharedmem_t * shm_fuzz;
/* Classify tuple counts. This is a slow & naive version, but good enough here.
*/
-#define TIMES4(x) x, x, x, x
-#define TIMES8(x) TIMES4(x), TIMES4(x)
-#define TIMES16(x) TIMES8(x), TIMES8(x)
-#define TIMES32(x) TIMES16(x), TIMES16(x)
-#define TIMES64(x) TIMES32(x), TIMES32(x)
static const u8 count_class_lookup[256] = {
[0] = 0,
[1] = 1,
[2] = 2,
[3] = 4,
- [4] = TIMES4(8),
- [8] = TIMES8(16),
- [16] = TIMES16(32),
- [32] = TIMES32(64),
- [128] = TIMES64(128)
+ [4 ... 7] = 8,
+ [8 ... 15] = 16,
+ [16 ... 31] = 32,
+ [32 ... 127] = 64,
+ [128 ... 255] = 128
};
-#undef TIMES64
-#undef TIMES32
-#undef TIMES16
-#undef TIMES8
-#undef TIMES4
-
static void kill_child() {
if (fsrv->child_pid > 0) {

cleanup of TIMES macro