aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-12-21 12:19:22 +0100
committervan Hauser <vh@thc.org>2020-12-21 12:19:22 +0100
commit7e27448dac2191060320831904f32fe9d572bc3d (patch)
treebd330e82bbd1e92d5fff1da89a04ec794e8c57f9
parent2a0d066121266e55bfe538b1931c6b032be2dc90 (diff)
downloadafl++-7e27448dac2191060320831904f32fe9d572bc3d.tar.gz
another 32 bit fix
-rw-r--r--include/afl-fuzz.h4
-rw-r--r--include/coverage-32.h2
-rw-r--r--src/afl-cc.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 99647c5b..e2fb0344 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -1022,7 +1022,11 @@ u32 count_bytes(afl_state_t *, u8 *);
u32 count_non_255_bytes(afl_state_t *, u8 *);
void simplify_trace(afl_state_t *, u8 *);
void classify_counts(afl_forkserver_t *);
+#ifdef WORD_SIZE_64
void discover_word(u8 *ret, u64 *current, u64 *virgin);
+#else
+void discover_word(u8 *ret, u32 *current, u32 *virgin);
+#endif
void init_count_class16(void);
void minimize_bits(afl_state_t *, u8 *, u8 *);
#ifndef SIMPLE_FILES
diff --git a/include/coverage-32.h b/include/coverage-32.h
index 124d6ee5..a5cc498c 100644
--- a/include/coverage-32.h
+++ b/include/coverage-32.h
@@ -47,7 +47,7 @@ void simplify_trace(afl_state_t *afl, u8 *bytes) {
inline void classify_counts(afl_forkserver_t *fsrv) {
- u64 *mem = (u32 *)fsrv->trace_bits;
+ u32 *mem = (u32 *)fsrv->trace_bits;
u32 i = (fsrv->map_size >> 2);
while (i--) {
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 6f4801de..3b8092a9 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -1347,7 +1347,8 @@ int main(int argc, char **argv, char **envp) {
"available)\n"
" PCGUARD: Dominator tree instrumentation (best!) (README.llvm.md)\n"
#if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0)
- " NATIVE: use llvm's native PCGUARD instrumentation (less performant)\n"
+ " NATIVE: use llvm's native PCGUARD instrumentation (less "
+ "performant)\n"
#endif
" CLASSIC: decision target instrumentation (README.llvm.md)\n"
" CTX: CLASSIC + callee context (instrumentation/README.ctx.md)\n"