ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-15 11:28:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup of TIMES macro

Browse Source
This commit is contained in:
vanhauser-thc
2021-12-15 20:43:18 +01:00
parent 88814be474
commit 9f911bf0bd
4 changed files with 20 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/afl-analyze.c
View File

@ -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. /* 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] = { static u8 count_class_lookup[256] = {
[0] = 0, [0] = 0,
[1] = 1, [1] = 1,
[2] = 2, [2] = 2,
[3] = 4, [3] = 4,
[4] = TIMES4(8), [4 ... 7] = 8,
[8] = TIMES8(16), [8 ... 15] = 16,
[16] = TIMES16(32), [16 ... 31] = 32,
[32] = TIMES32(64), [32 ... 127] = 64,
[128] = TIMES64(128) [128 ... 255] = 128
}; };
#undef TIMES64
#undef TIMES32
#undef TIMES16
#undef TIMES8
#undef TIMES4
static void kill_child() { static void kill_child() {
if (fsrv.child_pid > 0) { if (fsrv.child_pid > 0) {

7
src/afl-fuzz-bitmap.c
View File

@ -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]; u16 count_class_lookup16[65536];
void init_count_class16(void) { void init_count_class16(void) {

35
src/afl-showmap.c
View File

@ -103,24 +103,17 @@ static sharedmem_t * shm_fuzz;
/* Classify tuple counts. Instead of mapping to individual bits, as in /* 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. */ 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] = { static const u8 count_class_human[256] = {
[0] = 0, [0] = 0,
[1] = 1, [1] = 1,
[2] = 2, [2] = 2,
[3] = 3, [3] = 3,
[4] = TIMES4(4), [4] = 4,
[8] = TIMES8(5), [8] = 5,
[16] = TIMES16(6), [16] = 6,
[32] = TIMES96(7), [32] = 7,
[128] = TIMES128(8) [128] = 8
}; };
@ -130,22 +123,14 @@ static const u8 count_class_binary[256] = {
[1] = 1, [1] = 1,
[2] = 2, [2] = 2,
[3] = 4, [3] = 4,
[4] = TIMES4(8), [4 ... 7] = 8,
[8] = TIMES8(16), [8 ... 15] = 16,
[16] = TIMES16(32), [16 ... 31] = 32,
[32] = TIMES32(64), [32 ... 127] = 64,
[128] = TIMES64(128) [128 ... 255] = 128
}; };
#undef TIMES128
#undef TIMES96
#undef TIMES64
#undef TIMES32
#undef TIMES16
#undef TIMES8
#undef TIMES4
static void kill_child() { static void kill_child() {
timed_out = 1; timed_out = 1;

21
src/afl-tmin.c
View File

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