Simplified lifter code generation

Cargo.toml

@@ -2,15 +2,21 @@
 members = [
   "fugue",
   "fugue-arch",
+  "fugue-base",
   "fugue-bytes",
   "fugue-bv",
-  "fugue-core",
-  "fugue-db",
   "fugue-fp",
-  "fugue-ir",
+  "fugue-ghidra-marshal",
   "fugue-lifter",
-  "fugue-state",
-  "fugue-state-derive",
+  "fugue-lifter-aarch64",
+  "fugue-lifter-arm",
+  "fugue-lifter-codegen",
+  "fugue-lifter-runtime",
+  "fugue-lifter-x86",
+  "fugue-specs",
+  "fugue-sleigh",
+  "fugue-sleigh-language",
+  "fugue-sleigh-semantics",
 ]
 resolver = "2"
 

MAINTAINERS.md

@@ -1,4 +1,4 @@
-| Github ID                              | Name          | Email            |
-|----------------------------------------|---------------|------------------|
-| [@xorpse](https://github.com/xorpse)   | Sam L. Thomas | <sam@fugue.re>   |
-| [@zt-chen](https://github.com/zt-chen) | Zitai Chen    | <zitai@fugue.re> |
+| Github ID                            | Name            | Email            |
+|--------------------------------------|-----------------|------------------|
+| [@xorpse](https://github.com/xorpse) | Sam L. Thomas   | <sam@fugue.re>   |
+| [@yeggor](https://github.com/yeggor) | Yegor Vasilenko | <yegor@fugue.re> |

fugue-arch/Cargo.toml

@@ -10,5 +10,5 @@ homepage = "https://fugue.re"
 [dependencies]
 fugue-bytes = { path = "../fugue-bytes", version = "0.3" }
 serde = { version = "1", features = ["derive"] }
-thiserror = "1"
-unicase = "2.6"
+thiserror = "2"
+unicase = "2.8"

fugue-arch/src/lib.rs

@@ -5,8 +5,9 @@ use std::str::FromStr;
 
 use thiserror::Error;
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[derive(serde::Deserialize, serde::Serialize)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Deserialize, serde::Serialize,
+)]
 pub struct ArchitectureDef {
     processor: String,
     endian: Endian,
@@ -33,8 +34,8 @@ impl FromStr for ArchitectureDef {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let parts = s.splitn(4, ':').collect::<Vec<_>>();
-        if parts.len() != 4 {
-            return Err(ArchDefParseError::ParseFormat)
+        if !matches!(parts.len(), 3 | 4) {
+            return Err(ArchDefParseError::ParseFormat);
         }
 
         let processor = parts[0];
@@ -43,21 +44,26 @@ impl FromStr for ArchitectureDef {
             "be" | "BE" => Endian::Big,
             _ => return Err(ArchDefParseError::ParseEndian),
         };
-        let bits = parts[2].parse::<usize>()
+        let bits = parts[2]
+            .parse::<usize>()
             .map_err(|_| ArchDefParseError::ParseBits)?;
-        let variant = parts[3];
 
-        Ok(ArchitectureDef::new(processor, endian, bits, variant))
+        Ok(ArchitectureDef::new(
+            processor,
+            endian,
+            bits,
+            *parts.get(3).unwrap_or(&"default"),
+        ))
     }
 }
 
 impl fmt::Display for ArchitectureDef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "processor: {}, endian: {}, bits: {}, variant: {}",
+            "{}:{}:{}:{}",
             self.processor,
-            if self.endian.is_big() { "big" } else { "little" },
+            if self.endian.is_big() { "BE" } else { "LE" },
             self.bits,
             self.variant,
         )
@@ -66,8 +72,10 @@ impl fmt::Display for ArchitectureDef {
 
 impl ArchitectureDef {
     pub fn new<P, V>(processor: P, endian: Endian, bits: usize, variant: V) -> Self
-    where P: Into<String>,
-          V: Into<String> {
+    where
+        P: Into<String>,
+        V: Into<String>,
+    {
         Self {
             processor: processor.into(),
             endian,

fugue-base/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "fugue-base"
+version = "0.3.0"
+authors = ["Sam Thomas <st@xv.ax>"]
+edition = "2021"
+
+[dependencies]
+anyhow = "1"
+arrayvec = "0.7"
+bitflags = "2"
+clone_dyn = "0.30"
+fallible-iterator = "0.3"
+fugue-arch = { version = "0.3", path = "../fugue-arch" }
+fugue-bv = { version = "0.3", path = "../fugue-bv" }
+fugue-bytes = { version = "0.3", path = "../fugue-bytes" }
+fugue-lifter = { version = "0.3", path = "../fugue-lifter" }
+fugue-specs = { version = "0.3", path = "../fugue-specs" }
+gazebo = "0.8"
+iset = "0.3"
+itertools = "0.14"
+libmdbx = "0.5"
+memmap2 = "0.9"
+object = "0.35"
+ouroboros = "0.18"
+range-set-blaze = "0.1"
+rustc-hash = "1.1"
+sealed = "0.5"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+smallvec = "1.13"
+static_init = "1"
+thiserror = "2"
+tracing = "0.1"
+uuid = { version = "1", features = ["serde", "v7"] }
+ustr = { version = "1.1", features = ["serde"] }
+
+[dev-dependencies]
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }