Include field information when using --probe for register writes

isla-lib/src/executor.rs

@@ -582,11 +582,7 @@ fn assign<'ir, B: BV>(
 ) -> Result<(), ExecError> {
     let id = loc.id();
     if shared_state.probes.contains(&id) {
-        let mut symbol = String::from(shared_state.symtab.to_str(id));
-        if symbol.starts_with('z') {
-            symbol = zencode::decode(&symbol);
-        }
-        log_from!(tid, log::PROBE, &format!("Assigning {}[{:?}] <- {:?}", symbol, id, v))
+        log_from!(tid, log::PROBE, &format!("Assigning {}[{:?}] <- {:?}", loc_string(loc, &shared_state.symtab), id, v))
     }
 
     assign_with_accessor(loc, v, local_state, shared_state, solver, &mut Vec::new(), info)

isla-lib/src/ir.rs

@@ -905,6 +905,14 @@ impl<'ir> Symtab<'ir> {
     }
 }
 
+pub fn loc_string(loc: &Loc<Name>, symtab: &Symtab) -> String {
+    match loc {
+        Loc::Id(a) => zencode::decode(symtab.to_str(*a)),
+        Loc::Field(loc, a) => format!("{}.{}", loc_string(loc, symtab), zencode::decode(symtab.to_str(*a))),
+        Loc::Addr(a) => format!("{}*", loc_string(a, symtab)),
+    }
+}
+
 /// A function declaration is a tripe of name * type pairs of
 /// parameters, the return type, and a list of instructions for the
 /// function body.