fix typos and format
MODIFY
instrumentation/afl-llvm-pass.so.cc
instrumentation/afl-llvm-pass.so.cc
@@ -217,19 +217,25 @@ bool AFLCoverage::runOnModule(Module &M) {
VectorType *PrevCallerTy = NULL;
if (ctx_k_str)
- if (sscanf(ctx_k_str, "%u", &ctx_k) != 1 || ctx_k < 2 ||
- ctx_k > CTX_MAX_K)
- FATAL("Bad value of AFL_CTX_K (must be between 2 and CTX_MAX_K (%u))", CTX_MAX_K);
+ if (sscanf(ctx_k_str, "%u", &ctx_k) != 1 || ctx_k < 2 || ctx_k > CTX_MAX_K)
+ FATAL("Bad value of AFL_CTX_K (must be between 2 and CTX_MAX_K (%u))",
+ CTX_MAX_K);
if (ctx_k == 1) {
+
ctx_k = 0;
instrument_ctx = true;
caller_str = ctx_k_str; // Enable CALLER instead
+
}
+
if (ctx_k) {
+
PrevCallerSize = ctx_k;
instrument_ctx = true;
+
}
+
#else
if (ngram_size_str)
#ifndef LLVM_VERSION_PATCH
@@ -340,12 +346,13 @@ bool AFLCoverage::runOnModule(Module &M) {
else
#endif
#if defined(__ANDROID__) || defined(__HAIKU__)
- AFLPrevCaller = new GlobalVariable(
- M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_caller");
+ AFLPrevCaller =
+ new GlobalVariable(M, Int32Ty, false, GlobalValue::ExternalLinkage, 0,
+ "__afl_prev_caller");
#else
AFLPrevCaller = new GlobalVariable(
- M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_caller", 0,
- GlobalVariable::GeneralDynamicTLSModel, 0, false);
+ M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_caller",
+ 0, GlobalVariable::GeneralDynamicTLSModel, 0, false);
#endif
#ifdef AFL_HAVE_VECTOR_INTRINSICS
@@ -367,6 +374,7 @@ bool AFLCoverage::runOnModule(Module &M) {
SmallVector<Constant *, 32> PrevCallerShuffle = {UndefValue::get(Int32Ty)};
if (ctx_k) {
+
for (unsigned I = 0; I < PrevCallerSize - 1; ++I)
PrevCallerShuffle.push_back(ConstantInt::get(Int32Ty, I));
@@ -374,7 +382,9 @@ bool AFLCoverage::runOnModule(Module &M) {
PrevCallerShuffle.push_back(ConstantInt::get(Int32Ty, PrevCallerSize));
PrevCallerShuffleMask = ConstantVector::get(PrevCallerShuffle);
+
}
+
#endif
// other constants we need
@@ -410,16 +420,25 @@ bool AFLCoverage::runOnModule(Module &M) {
#ifdef AFL_HAVE_VECTOR_INTRINSICS
if (ctx_k) {
+
PrevCaller = IRB.CreateLoad(AFLPrevCaller);
- PrevCaller->setMetadata(M.getMDKindID("nosanitize"), MDNode::get(C, None));
- PrevCtx = IRB.CreateZExt(IRB.CreateXorReduce(PrevCaller), IRB.getInt32Ty());
+ PrevCaller->setMetadata(M.getMDKindID("nosanitize"),
+ MDNode::get(C, None));
+ PrevCtx =
+ IRB.CreateZExt(IRB.CreateXorReduce(PrevCaller), IRB.getInt32Ty());
+
} else
+
#endif
{
- // load the context ID of the previous function and write to to a local variable on the stack
+
+ // load the context ID of the previous function and write to to a
+ // local variable on the stack
LoadInst *PrevCtxLoad = IRB.CreateLoad(AFLContext);
- PrevCtxLoad->setMetadata(M.getMDKindID("nosanitize"), MDNode::get(C, None));
+ PrevCtxLoad->setMetadata(M.getMDKindID("nosanitize"),
+ MDNode::get(C, None));
PrevCtx = PrevCtxLoad;
+
}
// does the function have calls? and is any of the calls larger than one
@@ -454,19 +473,28 @@ bool AFLCoverage::runOnModule(Module &M) {
Value *NewCtx = ConstantInt::get(Int32Ty, AFL_R(map_size));
#ifdef AFL_HAVE_VECTOR_INTRINSICS
if (ctx_k) {
+
Value *ShuffledPrevCaller = IRB.CreateShuffleVector(
- PrevCaller, UndefValue::get(PrevCallerTy), PrevCallerShuffleMask);
- Value *UpdatedPrevCaller = IRB.CreateInsertElement(ShuffledPrevCaller, NewCtx, (uint64_t)0);
+ PrevCaller, UndefValue::get(PrevCallerTy),
+ PrevCallerShuffleMask);
+ Value *UpdatedPrevCaller = IRB.CreateInsertElement(
+ ShuffledPrevCaller, NewCtx, (uint64_t)0);
+
+ StoreInst *Store =
+ IRB.CreateStore(UpdatedPrevCaller, AFLPrevCaller);
+ Store->setMetadata(M.getMDKindID("nosanitize"),
+ MDNode::get(C, None));
- StoreInst * Store = IRB.CreateStore(UpdatedPrevCaller, AFLPrevCaller);
- Store->setMetadata(M.getMDKindID("nosanitize"), MDNode::get(C, None));
} else
+
#endif
{
+
if (ctx_str) NewCtx = IRB.CreateXor(PrevCtx, NewCtx);
StoreInst *StoreCtx = IRB.CreateStore(NewCtx, AFLContext);
StoreCtx->setMetadata(M.getMDKindID("nosanitize"),
MDNode::get(C, None));
+
}
}
@@ -537,6 +565,7 @@ bool AFLCoverage::runOnModule(Module &M) {
RestoreCtx = Post_IRB.CreateStore(PrevCtx, AFLContext);
RestoreCtx->setMetadata(M.getMDKindID("nosanitize"),
MDNode::get(C, None));
+
}
}

MODIFY
src/afl-cc.c
src/afl-cc.c
@@ -1283,7 +1283,7 @@ int main(int argc, char **argv, char **envp) {
ngram_size = atoi(getenv("AFL_LLVM_NGRAM_SIZE"));
if (ngram_size < 2 || ngram_size > NGRAM_SIZE_MAX)
FATAL(
- "K-CTX instrumentation mode must be between 2 and NGRAM_SIZE_MAX "
+ "NGRAM instrumentation mode must be between 2 and NGRAM_SIZE_MAX "
"(%u)",
NGRAM_SIZE_MAX);
@@ -1294,8 +1294,8 @@ int main(int argc, char **argv, char **envp) {
instrument_opt_mode |= INSTRUMENT_OPT_CTX_K;
ctx_k = atoi(getenv("AFL_LLVM_CTX_K"));
if (ctx_k < 1 || ctx_k > CTX_MAX_K)
- FATAL(
- "NGRAM instrumentation mode must be between 1 and CTX_MAX_K (%u)", CTX_MAX_K);
+ FATAL("K-CTX instrumentation mode must be between 1 and CTX_MAX_K (%u)",
+ CTX_MAX_K);
}
@@ -1412,7 +1412,8 @@ int main(int argc, char **argv, char **envp) {
ctx_k = atoi(ptr3);
if (ctx_k < 1 || ctx_k > CTX_MAX_K)
FATAL(
- "K-CTX instrumentation option must be between 1 and CTX_MAX_K (%u)",
+ "K-CTX instrumentation option must be between 1 and CTX_MAX_K "
+ "(%u)",
CTX_MAX_K);
instrument_opt_mode |= (INSTRUMENT_OPT_CTX_K);
u8 *ptr4 = alloc_printf("%u", ctx_k);
@@ -1855,8 +1856,7 @@ int main(int argc, char **argv, char **envp) {
(instrument_opt_mode & INSTRUMENT_OPT_CTX) ? " + CTX" : "",
(instrument_opt_mode & INSTRUMENT_OPT_CALLER) ? " + CALLER" : "",
(instrument_opt_mode & INSTRUMENT_OPT_NGRAM) ? ptr2 : "",
- (instrument_opt_mode & INSTRUMENT_OPT_CTX_K) ? ptr3 : ""
- );
+ (instrument_opt_mode & INSTRUMENT_OPT_CTX_K) ? ptr3 : "");
ck_free(ptr2);
ck_free(ptr3);

fix typos and format