fmt

Author: toolCHAINZ

jingle/src/error.rs

@@ -1,8 +1,8 @@
+use jingle_sleigh::{JingleSleighError, PcodeOperation};
 #[cfg(feature = "pyo3")]
 use pyo3::exceptions::PyRuntimeError;
 #[cfg(feature = "pyo3")]
 use pyo3::PyErr;
-use jingle_sleigh::{JingleSleighError, PcodeOperation};
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -23,11 +23,14 @@ pub enum JingleError {
     ZeroSizedVarnode,
     #[error("Cannot write values into constant space.")]
     ConstantWrite,
-    #[error("Attempt to read an indirect value from the constant space. While this can be modeled, it's almost definitely unintended.")]
+    #[error("Attempt to read an indirect value from the constant space. While this can be modeled, \
+    it's almost definitely unintended.")]
     IndirectConstantRead,
-    #[error("Attempted to perform a write of a bitvector to a VarNode with leftover space. This is a sleigh bug.")]
+    #[error("Attempted to perform a write of a bitvector to a VarNode with leftover space. This is \
+    a sleigh bug.")]
     MismatchedWordSize,
-    #[error("Attempted to perform a write to a space using the wrong size of address. This is a sleigh bug.")]
+    #[error("Attempted to perform a write to a space using the wrong size of address. This is a \
+    sleigh bug.")]
     MismatchedAddressSize,
     #[error("Jingle does not yet model this instruction")]
     UnmodeledInstruction(Box<PcodeOperation>),

jingle_python/script.py

@@ -4,4 +4,4 @@
 j = sleigh.make_jingle_context()
 state = State(j)
 
-print(state.register("RAX") == state.ram(0x8000_0000, 8))
+print(state.ram(0,30))

jingle_python/src/bitvec.rs

@@ -1,21 +1,20 @@
-use pyo3::{Bound, IntoPyObject, PyAny, PyObject, PyResult, Python, ToPyObject};
 use pyo3::prelude::PyAnyMethods;
 use pyo3::types::PyModule;
+use pyo3::{Bound, IntoPyObject, PyAny, PyObject, PyResult, Python, ToPyObject};
 use z3::ast::{Ast, BV};
 
-
 pub fn adapt_bv<'a>(bv: BV) -> PyResult<PyObject> {
     Python::with_gil(|py| {
         let z3_mod = PyModule::import(py, "z3")?;
         let ref_class = z3_mod.getattr("BitVecRef")?.into_pyobject(py)?;
         let ast_class = z3_mod.getattr("Ast")?.into_pyobject(py)?;
         let ctypes = PyModule::import(py, "ctypes")?;
         let ptr_type = ctypes.getattr("c_void_p")?;
-        let args = ( bv.get_z3_ast() as usize);
+        let args = (bv.get_z3_ast() as usize);
         let ptr = ptr_type.call1((args,))?;
 
         let ast_obj = ast_class.call1((args,))?.to_object(py);
-        let a = ref_class.call1( (ptr,))?.to_object(py);
+        let a = ref_class.call1((ptr,))?.to_object(py);
         Ok(a)
     })
-}
+}

jingle_python/src/lib.rs

@@ -1,11 +1,12 @@
+mod bitvec;
 mod instruction;
 mod jingle_context;
 mod sleigh_context;
 mod state;
-mod bitvec;
 
 use crate::instruction::PythonInstruction;
 use crate::sleigh_context::LoadedSleighContextWrapper;
+use crate::state::PythonState;
 use ::jingle::sleigh::{IndirectVarNode, PcodeOperation, VarNode};
 use pyo3::prelude::*;
 use sleigh_context::create_sleigh_context;
@@ -14,7 +15,6 @@ use std::ffi::CString;
 use std::mem;
 use z3::Context;
 use z3_sys::Z3_context;
-use crate::state::PythonState;
 
 thread_local! {
     pub static CONTEXT: RefCell<Z3_context> = RefCell::new(std::ptr::null_mut());

jingle_sleigh/src/context/python.rs

@@ -0,0 +1 @@
+

jingle_sleigh/src/error.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "pyo3")]
-use pyo3::exceptions::{PyRuntimeError};
+use pyo3::exceptions::PyRuntimeError;
 #[cfg(feature = "pyo3")]
 use pyo3::PyErr;
 use thiserror::Error;
@@ -46,7 +46,7 @@ impl From<JingleSleighError> for std::fmt::Error {
     }
 }
 
-#[cfg(feature="pyo3")]
+#[cfg(feature = "pyo3")]
 impl From<JingleSleighError> for PyErr {
     fn from(value: JingleSleighError) -> Self {
         PyRuntimeError::new_err(value.to_string())

jingle_sleigh/src/instruction.rs

@@ -8,7 +8,6 @@ use crate::{ArchInfoProvider, OpCode};
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 
-
 /// A rust representation of a SLEIGH assembly instruction
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Instruction {

jingle_sleigh/src/pcode/mod.rs

@@ -19,10 +19,10 @@ pub use crate::ffi::opcode::OpCode;
 use crate::pcode::display::PcodeOperationDisplay;
 use crate::varnode::{IndirectVarNode, VarNode};
 use crate::{ArchInfoProvider, GeneralizedVarNode};
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
 #[cfg(feature = "pyo3")]
 use pyo3::pyclass;
+use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 
 #[cfg_attr(feature = "pyo3", pyclass)]
 #[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)]