+8 -1

Cargo.toml

··· 9 10 [dependencies] 11 smallvec = { version = "1.13.2" } 12 - logos = { version = "0.14.2" } 13 14 [features] 15 default = [] 0 16 17 [profile.release] 18 lto = "fat" 19 codegen-units = 1 0 0 0 0 0 0

··· 9 10 [dependencies] 11 smallvec = { version = "1.13.2" } 12 + logos = { version = "0.14.2", optional = true } 13 14 [features] 15 default = [] 16 + asm = ["dep:logos"] 17 18 [profile.release] 19 lto = "fat" 20 codegen-units = 1 21 + 22 + 23 + [[bin]] 24 + name = "uasm" 25 + path = "src/bin/uasm.rs" 26 + required-features = ["asm"]

+1 -1

deny.toml

··· 1 [graph] 2 - all-features = false 3 no-default-features = false 4 5 [output]

··· 1 [graph] 2 + all-features = true 3 no-default-features = false 4 5 [output]

+11

src/bin/um.rs

··· 46 } 47 } 48 0 49 fn load_program(path: &Path) -> std::io::Result<Vec<u32>> { 50 match path.extension().map(|ext| ext.as_encoded_bytes()) { 0 0 0 0 51 Some(b"uasm") | Some(b"asm") => { 52 let source = std::fs::read_to_string(path)?; 53 Ok(um::asm::assemble(&source)) ··· 58 } 59 } 60 } 0 0 0 0 0 0

··· 46 } 47 } 48 49 + #[cfg(feature = "asm")] 50 fn load_program(path: &Path) -> std::io::Result<Vec<u32>> { 51 match path.extension().map(|ext| ext.as_encoded_bytes()) { 52 + // In an ideal world we would just add `#[cfg(feature = "asm")]` here. 53 + // Unfortunately this leads some wierd code generation fuckery which 54 + // makes the version without the 'asm' feature ~1-2 seconds slower 55 + // when running the sandmark program. 56 Some(b"uasm") | Some(b"asm") => { 57 let source = std::fs::read_to_string(path)?; 58 Ok(um::asm::assemble(&source)) ··· 63 } 64 } 65 } 66 + 67 + #[cfg(not(feature = "asm"))] 68 + fn load_program(path: &Path) -> std::io::Result<Vec<u32>> { 69 + let program = std::fs::read(path)?; 70 + Ok(um::conv::bytes_to_program(&program).unwrap()) 71 + }

+3

src/lib.rs

··· 15 use smallvec::SmallVec; 16 use std::io::{Read, Write}; 17 0 18 pub mod asm; 19 pub mod conv; 20 pub mod ops; ··· 324 } 325 326 #[test] 0 327 fn hello_world() { 328 let program = asm::assemble(include_str!("../files/hello-world.asm")); 329 let mut buffer = Vec::new(); ··· 332 } 333 334 #[test] 0 335 fn cat() { 336 let program = asm::assemble(include_str!("../files/cat.asm")); 337 let input = include_bytes!("lib.rs");

··· 15 use smallvec::SmallVec; 16 use std::io::{Read, Write}; 17 18 + #[cfg(feature = "asm")] 19 pub mod asm; 20 pub mod conv; 21 pub mod ops; ··· 325 } 326 327 #[test] 328 + #[cfg(feature = "asm")] 329 fn hello_world() { 330 let program = asm::assemble(include_str!("../files/hello-world.asm")); 331 let mut buffer = Vec::new(); ··· 334 } 335 336 #[test] 337 + #[cfg(feature = "asm")] 338 fn cat() { 339 let program = asm::assemble(include_str!("../files/cat.asm")); 340 let input = include_bytes!("lib.rs");