Add simple disassembler

Author: mlund

Cargo.toml

@@ -38,6 +38,7 @@ cbm = "0.1"
 tempfile = "3.3"
 anyhow = "1.0.64"
 reedline-repl-rs = "1.0.2"
+disasm6502 = "0.2"
 
 [profile.release]
 strip = true     # Automatically strip symbols from the binary.

README.md

@@ -66,7 +66,7 @@ your involvement is very welcome.
 - [x] Poke into memory; single value or from file
 - [x] Logging with e.g. `export RUST_LOG=info`
 - [x] REPL command interface (experimental)
-- [ ] Disassembly
+- [x] Disassembly (currently only 6502 opcodes)
 - [ ] Transfer and mount disk images
 - [ ] Load at arbitrary address and optionally start with `SYS`
 - [ ] Memory dumps in YAML format

src/commands.rs

@@ -18,11 +18,19 @@ pub fn peek(
     address: String,
     length: usize,
     outfile: Option<String>,
+    disassemble: bool,
 ) -> Result<(), anyhow::Error> {
-    let bytes = serial::read_memory(port, parse::<u32>(&address)?, length)?;
+    let start_address = parse::<u32>(&address)?;
+    let bytes = serial::read_memory(port, start_address, length)?;
     match outfile {
         Some(name) => io::save_binary(&name, &bytes)?,
-        None => matrix65::io::hexdump(&bytes, 8),
+        None => {
+            if disassemble {
+                matrix65::io::disassemble(&bytes, start_address);
+            } else {
+                matrix65::io::hexdump(&bytes, 8);
+            }
+        },
     };
     Ok(())
 }

src/input.rs

@@ -59,6 +59,9 @@ pub enum Commands {
         /// Output to binary file instead of hexdump
         #[clap(long, short = 'o')]
         outfile: Option<String>,
+        /// Disassemble instead of hexdump (currently only 6502)
+        #[clap(long = "dasm", short = 'd', action, conflicts_with = "outfile")]
+        disassemble: bool,
     },
 
     /// Poke into memory with value or file

src/lib/io.rs

@@ -14,6 +14,7 @@
 
 //! Routines for file; url; and terminal I/O
 
+use disasm6502;
 use anyhow::Result;
 use cbm::disk;
 use cbm::disk::file::FileOps;
@@ -165,3 +166,10 @@ pub fn hexdump(bytes: &[u8], bytes_per_line: usize) {
         println!();
     });
 }
+/// Print disassembled bytes
+pub fn disassemble(bytes: &[u8], start_address: u32) {
+    let instructions = disasm6502::from_addr_array(bytes, start_address as u16).unwrap();
+    for i in instructions {
+        println!("{}", i);
+    }
+}

src/main.rs

@@ -53,7 +53,8 @@ fn do_main() -> Result<()> {
             address,
             length,
             outfile,
-        } => commands::peek(&mut port, address, length, outfile)?,
+            disassemble,
+        } => commands::peek(&mut port, address, length, outfile, disassemble)?,
 
         input::Commands::Poke {
             address,