Merge pull request #6 from br0kej/dev

Version 2.6: De-dup Fixing, More Datasets Support and Better CLI

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bin2ml"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 
 [dependencies]
@@ -26,6 +26,7 @@ log = "0.4.19"
 env_logger = "0.10.0"
 thiserror = "1.0.47"
 enum-as-inner = "0.6.0"
+ordered-float = { version = "4.2.0", features = ["serde"] }
 [dependencies.petgraph]
 version = "0.6.2"
 features = ["serde-1"]

src/afij.rs

@@ -7,7 +7,7 @@ use serde_json::Value;
 pub struct AFIJFunctionInfo {
     pub offset: i64,
     pub name: String,
-    pub size: i64,
+    pub size: i128,
     #[serde(rename = "is-pure")]
     pub is_pure: String,
     pub realsz: i64,
@@ -26,8 +26,8 @@ pub struct AFIJFunctionInfo {
     pub edges: i64,
     pub ebbs: i64,
     pub signature: String,
-    pub minbound: i64,
-    pub maxbound: i64,
+    pub minbound: u64,
+    pub maxbound: i128,
     pub callrefs: Option<Vec<Callref>>,
     // TODO: Need to fix this and change to string instead of i64 to get round large random numbers
     pub datarefs: Option<Vec<Dataref>>,