sort imports for Gen2, define flags as bitfield

src/dir/gen2.rs

@@ -1,10 +1,13 @@
-use crate::dir::man::{self, Manifest};
 use core::fmt::{self, Display};
+use core::str::from_utf8;
+
+use bitfield_struct::bitfield;
 use serde::{Deserialize, Serialize};
-use std::str::from_utf8;
 use zerocopy::{FromBytes, Ref};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes};
 
+use crate::dir::man::{self, Manifest};
+
 const ENTRY_MAGIC: &[u8] = b"$MME";
 const SIG_LUT: u32 = u32::from_le_bytes(*b"LLUT");
 const SIG_LZMA: u32 = u32::from_le_bytes([0x36, 0x00, 0x40, 0x00]);
@@ -23,46 +26,72 @@ pub struct Entry {
     pub memory_size: u32,  // e.g. 0x0004_b425
     pub pre_uma_size: u32, // e.g. 0x0004_b425 (often same as memory_size)
     pub entry_point: u32,  // e.g. 0x2009_1000
-    pub flags: u32,        // e.g. 0x0010_d42a
+    pub flags: Flags,      // e.g. 0x0010_d42a
     pub _54: u32,          // e.g. 0x0000_0008
     pub _58: u32,          // so far all 0
     pub _5c: u32,          // so far all 0
 }
 
-#[derive(Clone, Copy, Debug)]
+#[bitfield(u32)]
+#[derive(Immutable, FromBytes, IntoBytes, Serialize, Deserialize)]
+pub struct Flags {
+    #[bits(4)]
+    _r: u8,
+    #[bits(3)]
+    pub compression: Compression,
+    _r: bool,
+
+    _r: u8,
+
+    _r: bool,
+    #[bits(3)]
+    rapi: usize,
+    #[bits(2)]
+    kapi: usize,
+    #[bits(2)]
+    _r: u8,
+
+    _r: u8,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Compression {
     Uncompressed,
     Huffman,
     Lzma,
     Unknown,
 }
 
+impl Compression {
+    const fn from_bits(val: u8) -> Self {
+        match val {
+            0 => Self::Uncompressed,
+            1 => Self::Huffman,
+            2 => Self::Lzma,
+            _ => Self::Unknown,
+        }
+    }
+
+    const fn into_bits(self) -> u8 {
+        self as u8
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct BinaryMap {
-    pub rapi: u32, // 3 bits, really
-    pub kapi: u32, // 2 bits, really
+    pub rapi: usize, // 3 bits, really
+    pub kapi: usize, // 2 bits, really
     pub code_start: usize,
     pub code_end: usize,
     pub data_end: usize,
 }
 
 impl Entry {
-    pub fn compression_type(&self) -> Compression {
-        let comp_flag = (self.flags >> 4) & 0b111;
-        match comp_flag {
-            0 => Compression::Uncompressed,
-            1 => Compression::Huffman,
-            2 => Compression::Lzma,
-            _ => Compression::Unknown,
-        }
-    }
-
     pub fn bin_map(&self) -> BinaryMap {
         let b = self.mod_base;
-        let f = self.flags;
-        let rapi = (f >> 17) & 0b111;
-        let kapi = (f >> 20) & 0b11;
-        let code_start = (b + (rapi + kapi) * 0x1000) as usize;
+        let rapi = self.flags.rapi();
+        let kapi = self.flags.kapi();
+        let code_start = (b as usize + (rapi + kapi) * 0x1000) as usize;
         let code_end = (b + self.code_size) as usize;
         let data_end = (b + self.memory_size) as usize;
         BinaryMap {
@@ -98,7 +127,8 @@ impl Display for Entry {
         let o = self.offset;
         let s = self.size;
         let e = self.entry_point;
-        write!(f, "{n:16} {s:08x} @ {o:08x}, entry point {e:08x}")
+        let c = self.flags.compression();
+        write!(f, "{n:16} {s:08x} @ {o:08x}, entry point {e:08x}, {c:10?}")
     }
 }
 

src/show.rs

@@ -14,22 +14,8 @@ fn print_gen2_dirs(dirs: &Vec<Gen2Dir>) {
         println!("{dir}");
         for e in &dir.entries {
             let pos = dir.offset + e.offset as usize;
-            /*
-            let sig =
-                u32::read_from_prefix(&data[pos..pos + 4]).unwrap();
-            let kind = match sig {
-                SIG_LUT => "LLUT",
-                SIG_LZMA => "LZMA",
-                _ => {
-                    dump48(&data[pos..]);
-                    "unknown"
-                }
-            };
-            */
-            let kind = "...";
-            let t = e.compression_type();
             let b = e.bin_map();
-            println!(" - {e}    {pos:08x} {t:?} ({kind})\n     {b}");
+            println!(" - {e} @ {pos:08x}\n     {b}");
         }
         println!();
     }