From 91376842ba749f4f447d7e775e2bde5b5ee6eb59 Mon Sep 17 00:00:00 2001
From: Alex Groce <agroce@gmail.com>
Date: Sat, 1 Sep 2018 11:27:22 -0700
Subject: [PATCH] provide a mode where bytes read are made explicit

---
 src/include/deepstate/DeepState.h |  1 +
 src/lib/DeepState.c               | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/include/deepstate/DeepState.h b/src/include/deepstate/DeepState.h
index 17dd324..518411f 100644
--- a/src/include/deepstate/DeepState.h
+++ b/src/include/deepstate/DeepState.h
@@ -62,6 +62,7 @@ DECLARE_string(output_test_dir);
 
 DECLARE_bool(take_over);
 DECLARE_bool(abort_on_fail);
+DECLARE_bool(verbose_reads);
 
 enum {
   DeepState_InputSize = 8192
diff --git a/src/lib/DeepState.c b/src/lib/DeepState.c
index db3a0ed..7797616 100644
--- a/src/lib/DeepState.c
+++ b/src/lib/DeepState.c
@@ -36,6 +36,7 @@ DEFINE_string(output_test_dir, "", "Directory where tests will be saved.");
 
 DEFINE_bool(take_over, false, "Replay test cases in take-over mode.");
 DEFINE_bool(abort_on_fail, false, "Abort on file replay failure (useful in file fuzzing).");
+DEFINE_bool(verbose_reads, false, "Report on bytes being read during execution of test.");
 
 /* Pointer to the last registers DeepState_TestInfo data structure */
 struct DeepState_TestInfo *DeepState_LastTestInfo = NULL;
@@ -140,6 +141,9 @@ void DeepState_SymbolizeData(void *begin, void *end) {
       if (DeepState_InputIndex >= DeepState_InputSize) {
         DeepState_Abandon("Read too many symbols");
       }
+      if (FLAGS_verbose_reads) {
+	printf ("Reading byte at %u\n", DeepState_InputIndex);
+      }
       bytes[i] = DeepState_Input[DeepState_InputIndex++];
     }
   }
@@ -216,6 +220,9 @@ int DeepState_Bool(void) {
   if (DeepState_InputIndex >= DeepState_InputSize) {
     DeepState_Abandon("Read too many symbols");
   }
+  if (FLAGS_verbose_reads) {
+    printf ("Reading byte as boolean at %u\n", DeepState_InputIndex);
+  }  
   return DeepState_Input[DeepState_InputIndex++] & 1;
 }
 
@@ -227,6 +234,9 @@ int DeepState_Bool(void) {
       type val = 0; \
       _Pragma("unroll") \
       for (size_t i = 0; i < sizeof(type); ++i) { \
+          if (FLAGS_verbose_reads) { \
+	     printf ("Reading byte at %u\n", DeepState_InputIndex); \
+          } \
         val = (val << 8) | ((type) DeepState_Input[DeepState_InputIndex++]); \
       } \
       return val; \