about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/afl-fuzz.h1
-rw-r--r--include/coverage-32.h27
-rw-r--r--include/coverage-64.h40
-rw-r--r--include/forkserver.h8
4 files changed, 20 insertions, 56 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 1340d9ef..e225211f 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -1046,7 +1046,6 @@ 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 *);
-void classify_counts_off(afl_forkserver_t *, u32);
 #ifdef WORD_SIZE_64
 void discover_word(u8 *ret, u64 *current, u64 *virgin);
 #else
diff --git a/include/coverage-32.h b/include/coverage-32.h
index d213db12..89c08cdf 100644
--- a/include/coverage-32.h
+++ b/include/coverage-32.h
@@ -62,23 +62,6 @@ inline void classify_counts(afl_forkserver_t *fsrv) {
 
 }
 
-inline void classify_counts_off(afl_forkserver_t *fsrv, u32 off) {
-
-  u32 *mem = (u32 *)(fsrv->trace_bits + off);
-  u32  i = ((fsrv->map_size - off) >> 2);
-
-  while (i--) {
-
-    /* Optimize for sparse bitmaps. */
-
-    if (unlikely(*mem)) { *mem = classify_word(*mem); }
-
-    mem++;
-
-  }
-
-}
-
 /* Updates the virgin bits, then reflects whether a new count or a new tuple is
  * seen in ret. */
 inline void discover_word(u8 *ret, u32 *current, u32 *virgin) {
@@ -114,14 +97,12 @@ inline void discover_word(u8 *ret, u32 *current, u32 *virgin) {
 #define PACK_SIZE 16
 inline u32 skim(const u32 *virgin, const u32 *current, const u32 *current_end) {
 
-  u32 *save = (u32*) current;
-
   for (; current < current_end; virgin += 4, current += 4) {
 
-    if (unlikely(current[0] && classify_word(current[0]) & virgin[0])) return (u32)(&current[1] - save);
-    if (unlikely(current[1] && classify_word(current[1]) & virgin[1])) return (u32)(&current[2] - save);
-    if (unlikely(current[2] && classify_word(current[2]) & virgin[2])) return (u32)(&current[3] - save);
-    if (unlikely(current[3] && classify_word(current[3]) & virgin[3])) return (u32)(&current[4] - save);
+    if (unlikely(current[0] && classify_word(current[0]) & virgin[0])) return 1;
+    if (unlikely(current[1] && classify_word(current[1]) & virgin[1])) return 1;
+    if (unlikely(current[2] && classify_word(current[2]) & virgin[2])) return 1;
+    if (unlikely(current[3] && classify_word(current[3]) & virgin[3])) return 1;
 
   }
 
diff --git a/include/coverage-64.h b/include/coverage-64.h
index ab29506c..aab79d79 100644
--- a/include/coverage-64.h
+++ b/include/coverage-64.h
@@ -72,23 +72,6 @@ inline void classify_counts(afl_forkserver_t *fsrv) {
 
 }
 
-inline void classify_counts_off(afl_forkserver_t *fsrv, u32 off) {
-
-  u64 *mem = (u64 *)(fsrv->trace_bits + off);
-  u32  i = ((fsrv->map_size - off) >> 3);
-
-  while (i--) {
-
-    /* Optimize for sparse bitmaps. */
-
-    if (unlikely(*mem)) { *mem = classify_word(*mem); }
-
-    mem++;
-
-  }
-
-}
-
 /* Updates the virgin bits, then reflects whether a new count or a new tuple is
  * seen in ret. */
 inline void discover_word(u8 *ret, u64 *current, u64 *virgin) {
@@ -127,8 +110,6 @@ inline void discover_word(u8 *ret, u64 *current, u64 *virgin) {
   #define PACK_SIZE 64
 inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
 
-  u64 *save = (u64*) current;
-
   for (; current != current_end; virgin += 8, current += 8) {
 
     __m512i  value = *(__m512i *)current;
@@ -140,7 +121,7 @@ inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
       /* Look for nonzero bytes and check for new bits. */
   #define UNROLL(x)                                                            \
     if (unlikely(!(mask & (1 << x)) && classify_word(current[x]) & virgin[x])) \
-    return (u32)(&current[x + 1] - save)
+    return 1
     UNROLL(0);
     UNROLL(1);
     UNROLL(2);
@@ -163,7 +144,6 @@ inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
   #define PACK_SIZE 32
 inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
 
-  u64 *save = (u64*) current;
   __m256i zeroes = _mm256_setzero_si256();
 
   for (; current < current_end; virgin += 4, current += 4) {
@@ -177,13 +157,13 @@ inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
 
     /* Look for nonzero bytes and check for new bits. */
     if (unlikely(!(mask & 0xff) && classify_word(current[0]) & virgin[0]))
-      return (u32)(&current[1] - save);
+      return 1;
     if (unlikely(!(mask & 0xff00) && classify_word(current[1]) & virgin[1]))
-      return (u32)(&current[2] - save);
+      return 1;
     if (unlikely(!(mask & 0xff0000) && classify_word(current[2]) & virgin[2]))
-      return (u32)(&current[3] - save);
+      return 1;
     if (unlikely(!(mask & 0xff000000) && classify_word(current[3]) & virgin[3]))
-      return (u32)(&current[4] - save);
+      return 1;
 
   }
 
@@ -197,14 +177,12 @@ inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
   #define PACK_SIZE 32
 inline u32 skim(const u64 *virgin, const u64 *current, const u64 *current_end) {
 
-  u64 *save = (u64*) current;
-
   for (; current < current_end; virgin += 4, current += 4) {
 
-    if (unlikely(current[0] && classify_word(current[0]) & virgin[0])) return (u32)(&current[1] - save);
-    if (unlikely(current[1] && classify_word(current[1]) & virgin[1])) return (u32)(&current[2] - save);
-    if (unlikely(current[2] && classify_word(current[2]) & virgin[2])) return (u32)(&current[3] - save);
-    if (unlikely(current[3] && classify_word(current[3]) & virgin[3])) return (u32)(&current[4] - save);
+    if (unlikely(current[0] && classify_word(current[0]) & virgin[0])) return 1;
+    if (unlikely(current[1] && classify_word(current[1]) & virgin[1])) return 1;
+    if (unlikely(current[2] && classify_word(current[2]) & virgin[2])) return 1;
+    if (unlikely(current[3] && classify_word(current[3]) & virgin[3])) return 1;
 
   }
 
diff --git a/include/forkserver.h b/include/forkserver.h
index 48db2e26..4a05b17e 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -54,7 +54,13 @@ typedef enum NyxReturnValue {
 typedef struct {
 
   void *(*nyx_new)(const char *sharedir, const char *workdir,
-                   uint32_t worker_id, uint32_t cpu_id, bool create_snapshot);
+                   uint32_t cpu_id, uint32_t input_buffer_size, 
+                   bool input_buffer_write_protection);
+  void *(*nyx_new_parent)(const char *sharedir, const char *workdir,
+                   uint32_t cpu_id, uint32_t input_buffer_size,
+                   bool input_buffer_write_protection);
+  void *(*nyx_new_child)(const char *sharedir, const char *workdir,
+                   uint32_t cpu_id, uint32_t worker_id);
   void (*nyx_shutdown)(void *qemu_process);
   void (*nyx_option_set_reload_mode)(void *qemu_process, bool enable);
   void (*nyx_option_set_timeout)(void *qemu_process, uint8_t timeout_sec,
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-05-22 11:56:03 +0000