arch. specific property provider

fugue-core/src/icfg/mod.rs

@@ -2,13 +2,15 @@ use std::collections::VecDeque;
 
 use fugue_ir::Address;
 
+use crate::lifter::{InsnLifter, Lifter};
 use crate::project::{Project, ProjectRawView};
 
 pub struct ICFGBuilder<'a, R>
 where
     R: ProjectRawView,
 {
     project: &'a mut Project<R>,
+    fast_lifter: Box<dyn InsnLifter>,
     candidates: VecDeque<Address>,
 }
 
@@ -18,8 +20,9 @@ where
 {
     pub fn new(project: &'a mut Project<R>) -> Self {
         Self {
-            project,
+            fast_lifter: project.language().lifter_for_arch(),
             candidates: VecDeque::new(),
+            project,
         }
     }
 

fugue-core/src/language.rs

@@ -9,7 +9,10 @@ use rustc_hash::FxHashMap;
 use static_init::dynamic;
 use thiserror::Error;
 
-use crate::lifter::Lifter;
+use crate::arch::aarch64::AArch64InsnLifter;
+use crate::arch::arm::ARMInsnLifter;
+use crate::arch::x86::X86InsnLifter;
+use crate::lifter::{DefaultInsnLifter, InsnLifter, Lifter};
 
 #[derive(Debug, Error)]
 pub enum LanguageBuilderError {
@@ -115,6 +118,18 @@ impl Language {
         Lifter::new(&self.translator)
     }
 
+    pub fn lifter_for_arch(&self) -> Box<dyn InsnLifter> {
+        let arch = self.translator().architecture();
+
+        match (arch.processor(), arch.bits()) {
+            ("AARCH64", 64) => AArch64InsnLifter::new().boxed(),
+            ("ARM", 32) => ARMInsnLifter::new().boxed(),
+            ("x86", 64) => X86InsnLifter::new_64().boxed(),
+            ("x86", 32) => X86InsnLifter::new_32().boxed(),
+            _ => DefaultInsnLifter::new().boxed(),
+        }
+    }
+
     pub fn convention(&self) -> &Convention {
         &self.convention
     }

fugue-core/src/lifter.rs

@@ -9,9 +9,6 @@ use fugue_ir::{Address, Translator};
 
 use thiserror::Error;
 
-use crate::arch::aarch64::AArch64InsnLifter;
-use crate::arch::arm::ARMInsnLifter;
-use crate::arch::x86::X86InsnLifter;
 use crate::ir::{Insn, PCode};
 
 #[derive(Debug, Error)]
@@ -119,18 +116,6 @@ impl<'a> Lifter<'a> {
         })
     }
 
-    pub fn lifter_for_arch(&self) -> Box<dyn InsnLifter> {
-        let arch = self.translator().architecture();
-
-        match (arch.processor(), arch.bits()) {
-            ("AARCH64", 64) => AArch64InsnLifter::new().boxed(),
-            ("ARM", 32) => ARMInsnLifter::new().boxed(),
-            ("x86", 64) => X86InsnLifter::new_64().boxed(),
-            ("x86", 32) => X86InsnLifter::new_32().boxed(),
-            _ => DefaultInsnLifter::new().boxed(),
-        }
-    }
-
     pub fn translator(&self) -> &Translator {
         self.0.translator()
     }