diff --git a/include/coverage-32.h b/include/coverage-32.h index 9932f240..0951531b 100644 --- a/include/coverage-32.h +++ b/include/coverage-32.h @@ -9,7 +9,6 @@ u32 skim(const u32 *virgin, const u32 *current, const u32 *current_end); u32 classify_word(u32 word); -void classify_counts_mem(u32 *mem, u32 size); inline u32 classify_word(u32 word) { @@ -24,22 +23,6 @@ inline u32 classify_word(u32 word) { } -inline void classify_counts_mem(u32 *mem, u32 size) { - - u32 i = (size >> 2); - - while (i--) { - - /* Optimize for sparse bitmaps. */ - - if (unlikely(*mem)) { *mem = classify_word(*mem); } - - mem++; - - } - -} - void simplify_trace(afl_state_t *afl, u8 *bytes) { u32 *mem = (u32 *)bytes; @@ -69,7 +52,18 @@ void simplify_trace(afl_state_t *afl, u8 *bytes) { } inline void classify_counts(afl_forkserver_t *fsrv) { - classify_counts_mem((u32 *)fsrv->trace_bits, fsrv->map_size); + u32 *mem = (u32 *)fsrv->trace_bits; + u32 i = (fsrv->map_size >> 2); + + while (i--) { + + /* Optimize for sparse bitmaps. */ + + if (unlikely(*mem)) { *mem = classify_word(*mem); } + + mem++; + + } } /* Updates the virgin bits, then reflects whether a new count or a new tuple is diff --git a/include/coverage-64.h b/include/coverage-64.h index 34d64303..8594c29d 100644 --- a/include/coverage-64.h +++ b/include/coverage-64.h @@ -13,7 +13,6 @@ u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end); u64 classify_word(u64 word); -void classify_counts_mem(u64 *mem, u32 size); inline u64 classify_word(u64 word) { @@ -63,12 +62,8 @@ void simplify_trace(afl_state_t *afl, u8 *bytes) { } inline void classify_counts(afl_forkserver_t *fsrv) { - classify_counts_mem((u64 *)fsrv->trace_bits, fsrv->map_size); -} - -inline void classify_counts_mem(u64 *mem, u32 size) { - - u32 i = (size >> 3); + u64 *mem = (u64 *)fsrv->trace_bits; + u32 i = (fsrv->map_size >> 3); while (i--) { @@ -79,7 +74,6 @@ inline void classify_counts_mem(u64 *mem, u32 size) { mem++; } - } /* Updates the virgin bits, then reflects whether a new count or a new tuple is