diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2019-12-02 14:34:21 +0100 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2019-12-02 14:34:21 +0100 |
| commit | 124ec8d297269b6b3066123782a7e92c802d2248 (patch) | |
| tree | f18a4a42111ea2faa08ef2183d995aa254146e7b /gcc_plugin | |
| parent | e9ed056913b4ce711ae47699c1937779036259e7 (diff) | |
| download | afl++-124ec8d297269b6b3066123782a7e92c802d2248.tar.gz | |
code format (contributors, do it!)
Diffstat (limited to 'gcc_plugin')
| -rw-r--r-- | gcc_plugin/afl-gcc-pass.so.cc | 23 | ||||
| -rw-r--r-- | gcc_plugin/afl-gcc-rt.o.c | 12 |
2 files changed, 19 insertions, 16 deletions
diff --git a/gcc_plugin/afl-gcc-pass.so.cc b/gcc_plugin/afl-gcc-pass.so.cc index 19e4dfba..ab7daebb 100644 --- a/gcc_plugin/afl-gcc-pass.so.cc +++ b/gcc_plugin/afl-gcc-pass.so.cc @@ -166,7 +166,7 @@ static unsigned int ext_call_instrument(function *fun) { fcall = gimple_build_call( fndecl, 1, cur_loc); /* generate the function _call_ to above built reference, with - *1* parameter -> the random const for the location */ + *1* parameter -> the random const for the location */ gimple_seq_add_stmt(&seq, fcall); /* and insert into a sequence */ /* Done - grab the entry to the block and insert sequence */ @@ -202,10 +202,9 @@ static unsigned int inline_instrument(function *fun) { basic_block bb; unsigned finst_blocks = 0; unsigned fcnt_blocks = 0; - tree one = build_int_cst(unsigned_char_type_node, 1); + tree one = build_int_cst(unsigned_char_type_node, 1); // tree zero = build_int_cst(unsigned_char_type_node, 0); - /* Set up global type declarations */ tree map_type = build_pointer_type(unsigned_char_type_node); tree map_ptr_g = @@ -417,8 +416,8 @@ class afl_pass : public gimple_opt_pass { if (!myWhitelist.empty()) { - bool instrumentBlock = false; - std::string instFilename; + bool instrumentBlock = false; + std::string instFilename; unsigned int instLine = 0; /* EXPR_FILENAME @@ -467,13 +466,17 @@ class afl_pass : public gimple_opt_pass { if (!instrumentBlock) { if (!be_quiet) { - if (!instFilename.empty()) - SAYF(cYEL "[!] " cBRI "Not in whitelist, skipping %s line %u...\n", - instFilename.c_str(), instLine); - else - SAYF(cYEL "[!] " cBRI "No filename information found, skipping it"); + + if (!instFilename.empty()) + SAYF(cYEL "[!] " cBRI "Not in whitelist, skipping %s line %u...\n", + instFilename.c_str(), instLine); + else + SAYF(cYEL "[!] " cBRI "No filename information found, skipping it"); + } + return 0; + } } diff --git a/gcc_plugin/afl-gcc-rt.o.c b/gcc_plugin/afl-gcc-rt.o.c index 1fb9e099..37cdbeb3 100644 --- a/gcc_plugin/afl-gcc-rt.o.c +++ b/gcc_plugin/afl-gcc-rt.o.c @@ -55,9 +55,9 @@ __thread u32 __afl_prev_loc; /* Trace a basic block with some ID */ void __afl_trace(const u32 x) { -#if 1 /* enable for neverZero feature. */ - __afl_area_ptr[__afl_prev_loc ^ x] += 1 - + ((u8)(1 + __afl_area_ptr[__afl_prev_loc ^ x]) == 0); +#if 1 /* enable for neverZero feature. */ + __afl_area_ptr[__afl_prev_loc ^ x] += + 1 + ((u8)(1 + __afl_area_ptr[__afl_prev_loc ^ x]) == 0); #else ++__afl_area_ptr[__afl_prev_loc ^ x]; #endif @@ -84,9 +84,9 @@ static void __afl_map_shm(void) { if (id_str) { #ifdef USEMMAP - const char* shm_file_path = id_str; + const char * shm_file_path = id_str; int shm_fd = -1; - unsigned char* shm_base = NULL; + unsigned char *shm_base = NULL; /* create the shared memory segment as if it was a file */ shm_fd = shm_open(shm_file_path, O_RDWR, 0600); @@ -265,7 +265,7 @@ int __afl_persistent_loop(unsigned int max_cnt) { } - return 0; + return 0; } |