Fix some awkward APIs

toolCHAINZ · toolCHAINZ · commit e7860c4fc20b · 2025-03-27T22:15:00.000Z
diff --git a/jingle/src/context.rs b/jingle/src/context.rs
@@ -24,12 +24,12 @@ impl ArchInfoProvider for JingleContext<'_> {
         self.info.default_code_space
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.info
             .registers
             .iter()
             .find(|(_, reg_name)| reg_name.as_str() == name)
-            .map(|(vn, _)| vn.clone())
+            .map(|(vn, _)| vn)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
@@ -40,8 +40,8 @@ impl ArchInfoProvider for JingleContext<'_> {
             .map(|(_, name)| name.as_str())
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
-        self.info.registers.iter()
+    fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {
+        self.info.registers.iter().map(|(a,b)| (a,b.as_str()))
     }
 }
 
@@ -67,7 +67,7 @@ impl<'ctx> JingleContext<'ctx> {
             z3,
             info: CachedArchInfo {
                 spaces: r.get_all_space_info().cloned().collect(),
-                registers: r.get_registers().cloned().collect(),
+                registers: r.get_registers().map(|(a,b)|(a.clone(),b.to_string())).collect(),
                 default_code_space: r.get_code_space_idx(),
             },
         }))
diff --git a/jingle/src/modeling/block.rs b/jingle/src/modeling/block.rs
@@ -135,16 +135,16 @@ impl ArchInfoProvider for ModeledBlock<'_> {
         self.jingle.get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.jingle.get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self.jingle.get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
-        self.jingle.get_registers()
+    fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {
+        self.jingle.get_registers().map(|(a, b)| (a, b))
     }
 }
 
diff --git a/jingle/src/modeling/instruction.rs b/jingle/src/modeling/instruction.rs
@@ -64,16 +64,16 @@ impl ArchInfoProvider for ModeledInstruction<'_> {
         self.jingle.get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.jingle.get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self.jingle.get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
-        self.jingle.get_registers()
+    fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {
+        self.jingle.get_registers().map(|(a, b)| (a, b))
     }
 }
 
diff --git a/jingle/src/modeling/state/mod.rs b/jingle/src/modeling/state/mod.rs
@@ -36,16 +36,16 @@ impl ArchInfoProvider for State<'_> {
         self.jingle.get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.jingle.get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self.jingle.get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
-        self.jingle.get_registers()
+    fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {
+        self.jingle.get_registers().map(|(a, b)| (a, b))
     }
 }
 
diff --git a/jingle/src/translator.rs b/jingle/src/translator.rs
@@ -59,15 +59,15 @@ impl ArchInfoProvider for SleighTranslator<'_> {
         self.jingle.get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.jingle.get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self.jingle.get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
+    fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {
         self.jingle.get_registers()
     }
 }
diff --git a/jingle_sleigh/src/context/loaded.rs b/jingle_sleigh/src/context/loaded.rs
@@ -166,16 +166,16 @@ impl ArchInfoProvider for LoadedSleighContext<'_> {
         self.sleigh.get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.sleigh.get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self.sleigh.get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item=&(VarNode, String)> {
-        self.sleigh.get_registers()
+    fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)> {
+        self.sleigh.get_registers().map(|(a, b)| (a, b))
     }
 }
 
diff --git a/jingle_sleigh/src/context/mod.rs b/jingle_sleigh/src/context/mod.rs
@@ -50,11 +50,11 @@ impl ArchInfoProvider for SleighContext {
             .getIndex() as usize
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self.registers
             .iter()
             .find(|(_, reg_name)| reg_name.as_str() == name)
-            .map(|(vn, _)| vn.clone())
+            .map(|(vn, _)| vn)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
@@ -64,8 +64,8 @@ impl ArchInfoProvider for SleighContext {
             .map(|(_, name)| name.as_str())
     }
 
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {
-        self.registers.iter()
+    fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)> {
+        self.registers.iter().map(|(a,b)| (a,b.as_str()))
     }
 }
 
@@ -154,7 +154,7 @@ mod test {
         let sleigh = ctx_builder.build(SLEIGH_ARCH).unwrap();
         for (vn, name) in sleigh.get_registers() {
             let addr = sleigh.get_register(&name);
-            assert_eq!(addr.as_ref(), Some(vn));
+            assert_eq!(addr, Some(vn));
         }
     }
 
diff --git a/jingle_sleigh/src/space.rs b/jingle_sleigh/src/space.rs
@@ -100,15 +100,15 @@ impl<T: ArchInfoProvider> ArchInfoProvider for &[T] {
         self[0].get_code_space_idx()
     }
 
-    fn get_register(&self, name: &str) -> Option<VarNode> {
+    fn get_register(&self, name: &str) -> Option<&VarNode> {
         self[0].get_register(name)
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
         self[0].get_register_name(location)
     }
 
-    fn get_registers(&self) -> impl Iterator<Item=&(VarNode, String)> {
+    fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)> {
         self[0].get_registers()
     }
 }
@@ -118,19 +118,19 @@ pub trait ArchInfoProvider {
     fn get_space_info(&self, idx: usize) -> Option<&SpaceInfo>;
 
     /// Retrieve a listing of all [`SpaceInfo`] associated with this `SLEIGH` context
-    fn get_all_space_info(&self) -> impl Iterator<Item = &SpaceInfo>;
+    fn get_all_space_info(&self) -> impl Iterator<Item=&SpaceInfo>;
 
     /// Returns the index that `SLEIGH` claims is the "main" space in which instructions reside
     fn get_code_space_idx(&self) -> usize;
 
     /// Given a register name, get a corresponding [`VarNode`], if one exists
-    fn get_register(&self, name: &str) -> Option<VarNode>;
+    fn get_register(&self, name: &str) -> Option<&VarNode>;
 
     /// Given a [`VarNode`], get the name of the corresponding architectural register, if one exists
     fn get_register_name(&self, location: &VarNode) -> Option<&str>;
 
     /// Get a listing of all register name/[`VarNode`] pairs
-    fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)>;
+    fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)>;
 
     fn varnode(&self, name: &str, offset: u64, size: usize) -> Result<VarNode, JingleSleighError> {
         for (space_index, space) in self.get_all_space_info().enumerate() {

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ impl ArchInfoProvider for JingleContext<'_> {`
`24`	`24`	`self.info.default_code_space`
`25`	`25`	`}`
`26`	`26`
`27`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`27`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`28`	`28`	`self.info`
`29`	`29`	`.registers`
`30`	`30`	`.iter()`
`31`	`31`	`.find(\|(_, reg_name)\| reg_name.as_str() == name)`
`32`		`- .map(\|(vn, _)\| vn.clone())`
	`32`	`+ .map(\|(vn, _)\| vn)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`@@ -40,8 +40,8 @@ impl ArchInfoProvider for JingleContext<'_> {`
`40`	`40`	`.map(\|(_, name)\| name.as_str())`
`41`	`41`	`}`
`42`	`42`
`43`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
`44`		`- self.info.registers.iter()`
	`43`	`+ fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {`
	`44`	`+ self.info.registers.iter().map(\|(a,b)\| (a,b.as_str()))`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`@@ -67,7 +67,7 @@ impl<'ctx> JingleContext<'ctx> {`
`67`	`67`	`z3,`
`68`	`68`	`info: CachedArchInfo {`
`69`	`69`	`spaces: r.get_all_space_info().cloned().collect(),`
`70`		`- registers: r.get_registers().cloned().collect(),`
	`70`	`+ registers: r.get_registers().map(\|(a,b)\|(a.clone(),b.to_string())).collect(),`
`71`	`71`	`default_code_space: r.get_code_space_idx(),`
`72`	`72`	`},`
`73`	`73`	`}))`
Original file line number	Diff line number	Diff line change
`@@ -135,16 +135,16 @@ impl ArchInfoProvider for ModeledBlock<'_> {`
`135`	`135`	`self.jingle.get_code_space_idx()`
`136`	`136`	`}`
`137`	`137`
`138`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`138`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`139`	`139`	`self.jingle.get_register(name)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`143`	`143`	`self.jingle.get_register_name(location)`
`144`	`144`	`}`
`145`	`145`
`146`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
`147`		`- self.jingle.get_registers()`
	`146`	`+ fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {`
	`147`	`+ self.jingle.get_registers().map(\|(a, b)\| (a, b))`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -64,16 +64,16 @@ impl ArchInfoProvider for ModeledInstruction<'_> {`
`64`	`64`	`self.jingle.get_code_space_idx()`
`65`	`65`	`}`
`66`	`66`
`67`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`67`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`68`	`68`	`self.jingle.get_register(name)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`72`	`72`	`self.jingle.get_register_name(location)`
`73`	`73`	`}`
`74`	`74`
`75`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
`76`		`- self.jingle.get_registers()`
	`75`	`+ fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {`
	`76`	`+ self.jingle.get_registers().map(\|(a, b)\| (a, b))`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,16 @@ impl ArchInfoProvider for State<'_> {`
`36`	`36`	`self.jingle.get_code_space_idx()`
`37`	`37`	`}`
`38`	`38`
`39`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`39`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`40`	`40`	`self.jingle.get_register(name)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`44`	`44`	`self.jingle.get_register_name(location)`
`45`	`45`	`}`
`46`	`46`
`47`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
`48`		`- self.jingle.get_registers()`
	`47`	`+ fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {`
	`48`	`+ self.jingle.get_registers().map(\|(a, b)\| (a, b))`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ impl ArchInfoProvider for SleighTranslator<'_> {`
`59`	`59`	`self.jingle.get_code_space_idx()`
`60`	`60`	`}`
`61`	`61`
`62`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`62`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`63`	`63`	`self.jingle.get_register(name)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`67`	`67`	`self.jingle.get_register_name(location)`
`68`	`68`	`}`
`69`	`69`
`70`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
	`70`	`+ fn get_registers(&self) -> impl Iterator<Item = (&VarNode, &str)> {`
`71`	`71`	`self.jingle.get_registers()`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,16 +166,16 @@ impl ArchInfoProvider for LoadedSleighContext<'_> {`
`166`	`166`	`self.sleigh.get_code_space_idx()`
`167`	`167`	`}`
`168`	`168`
`169`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`169`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`170`	`170`	`self.sleigh.get_register(name)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`174`	`174`	`self.sleigh.get_register_name(location)`
`175`	`175`	`}`
`176`	`176`
`177`		`- fn get_registers(&self) -> impl Iterator<Item=&(VarNode, String)> {`
`178`		`- self.sleigh.get_registers()`
	`177`	`+ fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)> {`
	`178`	`+ self.sleigh.get_registers().map(\|(a, b)\| (a, b))`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ impl ArchInfoProvider for SleighContext {`
`50`	`50`	`.getIndex() as usize`
`51`	`51`	`}`
`52`	`52`
`53`		`- fn get_register(&self, name: &str) -> Option<VarNode> {`
	`53`	`+ fn get_register(&self, name: &str) -> Option<&VarNode> {`
`54`	`54`	`self.registers`
`55`	`55`	`.iter()`
`56`	`56`	`.find(\|(_, reg_name)\| reg_name.as_str() == name)`
`57`		`- .map(\|(vn, _)\| vn.clone())`
	`57`	`+ .map(\|(vn, _)\| vn)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`fn get_register_name(&self, location: &VarNode) -> Option<&str> {`
`@@ -64,8 +64,8 @@ impl ArchInfoProvider for SleighContext {`
`64`	`64`	`.map(\|(_, name)\| name.as_str())`
`65`	`65`	`}`
`66`	`66`
`67`		`- fn get_registers(&self) -> impl Iterator<Item = &(VarNode, String)> {`
`68`		`- self.registers.iter()`
	`67`	`+ fn get_registers(&self) -> impl Iterator<Item=(&VarNode, &str)> {`
	`68`	`+ self.registers.iter().map(\|(a,b)\| (a,b.as_str()))`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`@@ -154,7 +154,7 @@ mod test {`
`154`	`154`	`let sleigh = ctx_builder.build(SLEIGH_ARCH).unwrap();`
`155`	`155`	`for (vn, name) in sleigh.get_registers() {`
`156`	`156`	`let addr = sleigh.get_register(&name);`
`157`		`- assert_eq!(addr.as_ref(), Some(vn));`
	`157`	`+ assert_eq!(addr, Some(vn));`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`