Add basic pulley disassembly support to clif-util (#9721)

* Add basic pulley disassembly support to `clif-util`

Helpful when running `clif-util compile -D --target pulley64` over the
input.

* Fix non-pulley build

Author: alexcrichton

Cargo.lock

@@ -52,6 +52,7 @@ rustc-hash = { workspace = true }
 # Note that this just enables `trace-log` for `clif-util` and doesn't turn it on
 # for all of Cranelift, which would be bad.
 regalloc2 = { workspace = true, features = ["trace-log"] }
+pulley-interpreter = { workspace = true, optional = true }
 
 [features]
 default = [
@@ -64,3 +65,4 @@ disas = ["capstone"]
 souper-harvest = ["cranelift-codegen/souper-harvest", "rayon"]
 all-arch = ["cranelift-codegen/all-arch"]
 all-native-arch = ["cranelift-codegen/all-native-arch"]
+pulley = ['cranelift-codegen/pulley', 'dep:pulley-interpreter']

cranelift/Cargo.toml

@@ -39,9 +39,22 @@ pub fn print_traps(traps: &[MachTrap]) -> String {
 cfg_if! {
     if #[cfg(feature = "disas")] {
         pub fn print_disassembly(func: &Function, isa: &dyn TargetIsa, mem: &[u8]) -> Result<()> {
+            #[cfg(feature = "pulley")]
+            let is_pulley = match isa.triple().architecture {
+                target_lexicon::Architecture::Pulley32 | target_lexicon::Architecture::Pulley64 => true,
+                _ => false,
+            };
+            println!("\nDisassembly of {} bytes <{}>:", mem.len(), func.name);
+
+            #[cfg(feature = "pulley")]
+            if is_pulley {
+                let mut disas = pulley_interpreter::disas::Disassembler::new(mem);
+                pulley_interpreter::decode::Decoder::decode_all(&mut disas)?;
+                println!("{}", disas.disas());
+                return Ok(());
+            }
             let cs = isa.to_capstone().map_err(|e| anyhow::format_err!("{}", e))?;
 
-            println!("\nDisassembly of {} bytes <{}>:", mem.len(), func.name);
             let insns = cs.disasm_all(&mem, 0x0).unwrap();
             for i in insns.iter() {
                 let mut line = String::new();

cranelift/src/disasm.rs

@@ -274,7 +274,7 @@ impl<'a> OpVisitor for Disassembler<'a> {
                 write!(&mut self.disas, "{space}{byte:02x}").unwrap();
                 need_space = true;
             }
-            for _ in 0..11_usize.saturating_sub(size) {
+            for _ in 0..12_usize.saturating_sub(size) {
                 write!(&mut self.disas, "   ").unwrap();
             }
         }