more fixes and code-format
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index 5f80872..49e0076 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -335,7 +335,7 @@
if [ -f ../split-switches-pass.so ]; then set -e; install -m 755 ../split-switches-pass.so $${DESTDIR}$(HELPER_PATH); fi
if [ -f ../cmplog-instructions-pass.so ]; then set -e; install -m 755 ../cmplog-*-pass.so $${DESTDIR}$(HELPER_PATH); fi
set -e; if [ -f ../afl-clang-fast ] ; then ln -sf ../afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang ; ln -sf ../afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang++ ; else ln -sf ../afl-gcc $${DESTDIR}$(BIN_PATH)/afl-clang ; ln -sf ../afl-gcc $${DESTDIR}$(BIN_PATH)/afl-clang++; fi
- install -m 644 -T README.*.md $${DESTDIR}$(DOC_PATH)/
+ install -m 644 README.*.md $${DESTDIR}$(DOC_PATH)/
install -m 644 -T README.md $${DESTDIR}$(DOC_PATH)/README.llvm_mode.md
vpath % ..
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c
index 55f1f8c..edd4d95 100644
--- a/llvm_mode/afl-clang-fast.c
+++ b/llvm_mode/afl-clang-fast.c
@@ -556,7 +556,7 @@
else {
printf("afl-clang-lto" VERSION
- " by Marc \"vanHauser\" Heuse <mh@mh-sec.de>\n");
+ " by Marc \"vanHauser\" Heuse <mh@mh-sec.de>\n");
}
@@ -608,21 +608,31 @@
"AFL_LLVM_LAF_SPLIT_FLOATS: transform floating point comp. to "
"cascaded "
"comp.\n"
- "AFL_LLVM_LAF_SPLIT_COMPARES_BITW: size limit (default 8)\n"
- "AFL_LLVM_INSTRIM: use light weight instrumentation InsTrim\n"
- "AFL_LLVM_INSTRIM_LOOPHEAD: optimize loop tracing for speed\n"
- "AFL_LLVM_NGRAM_SIZE: use ngram prev_loc coverage\n"
- "AFL_LLVM_CMPLOG: log operands of comparisons (RedQueen mutator)\n"
- "\nafl-clang-fast was built for llvm %s with the llvm binary path "
- "of "
- "\"%s\".\n",
- callname, BIN_PATH, BIN_PATH, LLVM_VERSION, LLVM_BINDIR);
+ "AFL_LLVM_LAF_SPLIT_COMPARES_BITW: size limit (default 8)\n",
+ callname, BIN_PATH, BIN_PATH);
if (strcmp(callname, "afl-clang-lto") == 0)
SAYF(
- "Compiled with linker target \"%s\" and LTO flags \"%s\"\n\n"
+ "AFL_LLVM_LTO_STARTID: from which ID to start counting from for a "
+ "bb\n"
+ "AFL_LLVM_LTO_DONTWRITEID: don't write the highest ID used to a "
+ "global var\n"
+ "AFL_REAL_LD: use this linker instead of the compiled in path\n"
+ "AFL_LD_PASSTHROUGH: do not perform instrumentation (for configure "
+ "scripts)\n"
+ "\nafl-clang-lto was built for llvm %s with the llvm binary path "
+ "of \"%s\"; linker target \"%s\" and LTO flags \"%s\"\n"
"If anything fails - be sure to read README.lto.md!\n\n",
- AFL_REAL_LD, AFL_CLANG_FLTO);
+ LLVM_VERSION, LLVM_BINDIR, AFL_REAL_LD, AFL_CLANG_FLTO);
+ else
+ SAYF(
+ "AFL_LLVM_INSTRIM: use light weight instrumentation InsTrim\n"
+ "AFL_LLVM_INSTRIM_LOOPHEAD: optimize loop tracing for speed\n"
+ "AFL_LLVM_NGRAM_SIZE: use ngram prev_loc coverage\n"
+ "AFL_LLVM_CMPLOG: log operands of comparisons (RedQueen mutator)\n"
+ "\nafl-clang-fast was built for llvm %s with the llvm binary path "
+ "of \"%s\".\n",
+ LLVM_VERSION, LLVM_BINDIR);
SAYF("\n");
diff --git a/src/afl-fuzz-stats.c b/src/afl-fuzz-stats.c
index 5b5c93b..ab2b83c 100644
--- a/src/afl-fuzz-stats.c
+++ b/src/afl-fuzz-stats.c
@@ -361,9 +361,9 @@
/* Lord, forgive me this. */
- SAYF(SET_G1 bSTG bLT bH bSTOP cCYA
+ SAYF(SET_G1 bSTG bLT bH bSTOP cCYA
" process timing " bSTG bH30 bH5 bH bHB bH bSTOP cCYA
- " overall results " bSTG bH2 bH2 bRT "\n");
+ " overall results " bSTG bH2 bH2 bRT "\n");
if (afl->dumb_mode) {
@@ -446,9 +446,9 @@
" uniq hangs : " cRST "%-6s" bSTG bV "\n",
time_tmp, tmp);
- SAYF(bVR bH bSTOP cCYA
+ SAYF(bVR bH bSTOP cCYA
" cycle progress " bSTG bH10 bH5 bH2 bH2 bHB bH bSTOP cCYA
- " map coverage " bSTG bH bHT bH20 bH2 bVL "\n");
+ " map coverage " bSTG bH bHT bH20 bH2 bVL "\n");
/* This gets funny because we want to print several variable-length variables
together, but then cram them into a fixed-width field - so we need to
@@ -477,9 +477,9 @@
SAYF(bSTOP " count coverage : " cRST "%-21s" bSTG bV "\n", tmp);
- SAYF(bVR bH bSTOP cCYA
+ SAYF(bVR bH bSTOP cCYA
" stage progress " bSTG bH10 bH5 bH2 bH2 bX bH bSTOP cCYA
- " findings in depth " bSTG bH10 bH5 bH2 bH2 bVL "\n");
+ " findings in depth " bSTG bH10 bH5 bH2 bH2 bVL "\n");
sprintf(tmp, "%s (%0.02f%%)", stringify_int(IB(0), afl->queued_favored),
((double)afl->queued_favored) * 100 / afl->queued_paths);
@@ -556,7 +556,7 @@
/* Aaaalmost there... hold on! */
- SAYF(bVR bH cCYA bSTOP
+ SAYF(bVR bH cCYA bSTOP
" fuzzing strategy yields " bSTG bH10 bHT bH10 bH5 bHB bH bSTOP cCYA
" path geometry " bSTG bH5 bH2 bVL "\n");
