Roll src/third_party/afl/src/ 2.14b..2.30b (16 versions).

third_party/afl/src/afl-as.h

 /*
    american fuzzy lop - injectable parts
    -------------------------------------
 
    Written and maintained by Michal Zalewski <lcamtuf@google.com>
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
    Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
 
@@ skipping 80 matching lines @@
    work; simple relocations between .bss and .text won't work on most 64-bit
    platforms in such a case.
 
    (Fun fact: on Apple systems, .lcomm can segfault the linker.)
 
    The side effect is that state transitions are measured in a somewhat
    different way, with previous tuple being recorded separately within the scope
    of every .c file. This should have no impact in any practical sense.
 
    Another side effect of this design is that getenv() will be called once per
-   every .o file when running in non-instrumented mode; an since getenv() tends
+   every .o file when running in non-instrumented mode; and since getenv() tends
    to be optimized in funny ways, we need to be very careful to save every
    oddball register it may touch.
 
  */
 
 static const u8* trampoline_fmt_32 =
 
   "\n"
   "/* --- AFL TRAMPOLINE (32-BIT) --- */\n"
   "\n"
@@ skipping 62 matching lines @@
   "\n"
   "  /* Calculate and store hit for the code location specified in ecx. There\n"
   "     is a double-XOR way of doing this without tainting another register,\n"
   "     and we use it on 64-bit systems; but it's slower for 32-bit ones. */\n"
   "\n"
 #ifndef COVERAGE_ONLY
   "  movl __afl_prev_loc, %edi\n"
   "  xorl %ecx, %edi\n"
   "  shrl $1, %ecx\n"
   "  movl %ecx, __afl_prev_loc\n"
-#endif /* !COVERAGE_ONLY */
+#else
+  "  movl %ecx, %edi\n"
+#endif /* ^!COVERAGE_ONLY */
   "\n"
 #ifdef SKIP_COUNTS
   "  orb  $1, (%edx, %edi, 1)\n"
 #else
   "  incb (%edx, %edi, 1)\n"
 #endif /* ^SKIP_COUNTS */
   "\n"
   "__afl_return:\n"
   "\n"
   "  addb $127, %al\n"
@@ skipping 513 matching lines @@
 
   "  .comm    __afl_global_area_ptr, 8, 8\n"
   "\n"
   ".AFL_SHM_ENV:\n"
   "  .asciz \"" SHM_ENV_VAR "\"\n"
   "\n"
   "/* --- END --- */\n"
   "\n";
 
 #endif /* !_HAVE_AFL_AS_H */