Make parser parse to json

fuzzer/src/bin/parse_track_file.rs

@@ -1,31 +1,42 @@
 extern crate angora;
 extern crate angora_common;
-use angora::track::*;
+use angora::{track::*, cond_stmt::CondStmt};
 use angora_common::defs;
 use std::{env, path::PathBuf};
 
 fn main() {
+    // Usage: path_to_file output_format [pin_mode]
     let args: Vec<String> = env::args().collect();
     if args.len() <= 2 {
         println!("Wrong command!");
         return;
     }
 
+    let mut output_format = "json";
+    if args.len() > 2 {
+        output_format = match args[2].as_str() {
+            "line" => "line",
+            "json_real" => "json_real",
+            _ => "json"
+        };
+    }
+
+    let mut pin_mode = false;
+    if args.len() > 3 {
+        pin_mode = match args[3].as_str() {
+            "pin" => true,
+            _ => false
+        };
+    }
+
     let path = PathBuf::from(&args[1]);
 
     // let t = load_track_data(path.as_path(), 0, 0, 0, 0);
-    let t = match read_and_parse(path.as_path(), true, false) {
+    let t = match read_and_parse(path.as_path(), pin_mode, false) {
         Result::Ok(val) => val,
         Result::Err(err) => panic!("parse track file error!! {:?}", err),
     };
 
-    let mut output_format = "json";
-    if args.len() > 2 {
-        if args[2] == "line" {
-            output_format = "line";
-        }
-    }
-
     if output_format == "line" {
         for cond in t {
             // println!("{:?}", cond.base);
@@ -44,7 +55,18 @@ fn main() {
                 );
             }
         }
+    } else if output_format == "json_real" {
+        let json = get_json(&t);
+        println!("{}", json);
     } else {
         print!("{:#?}", t);
     }
 }
+
+pub fn get_json(t: &Vec<CondStmt>) -> String {
+    match serde_json::to_string(&t) {
+        Result::Ok(val) => return val,
+        Result::Err(err) => panic!("Failed to serialize to json!! {:?}", err),
+    };
+}
+

fuzzer/src/cond_stmt/cond_state.rs

@@ -1,8 +1,9 @@
 use crate::{cond_stmt::CondStmt, mut_input::offsets::*};
 use angora_common::{config, defs};
 use std;
+use serde_derive::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum CondState {
     Offset,
     OffsetOpt,

fuzzer/src/cond_stmt/cond_stmt.rs

@@ -2,8 +2,9 @@ use super::CondState;
 use crate::fuzz_type::FuzzType;
 use angora_common::{cond_stmt_base::CondStmtBase, defs, tag::TagSeg};
 use std::hash::{Hash, Hasher};
+use serde_derive::{Deserialize, Serialize};
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, Deserialize, Serialize)]
 pub struct CondStmt {
     pub base: CondStmtBase,
     pub offsets: Vec<TagSeg>,

fuzzer/src/cond_stmt/mod.rs

@@ -1,5 +1,5 @@
 mod cond_state;
-mod cond_stmt;
+pub mod cond_stmt;
 mod output;
 mod shm_conds;
 

fuzzer/src/lib.rs

@@ -6,7 +6,7 @@ extern crate log;
 extern crate derive_more;
 
 mod branches;
-mod cond_stmt;
+pub mod cond_stmt;
 mod depot;
 pub mod executor;
 mod mut_input;