Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2025-02-17 18:30:33 +00:00
Code Issues Projects Releases Wiki Activity

Added ability to set breakpoints on named devices

Browse Source
This commit is contained in:
transistor 2021-12-25 16:30:56 -08:00
parent 188717e228
commit b848e6261f
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/debugger.rs
View File

@ -70,18 +70,36 @@ impl Debugger {
if args.len() != 2 { if args.len() != 2 {
println!("Usage: breakpoint <addr>"); println!("Usage: breakpoint <addr>");
} else { } else {
let addr = u32::from_str_radix(args[1], 16).map_err(|_| Error::new("Unable to parse breakpoint address"))?; let (name, addr) = parse_address(args[1])?;
debug_obj.add_breakpoint(addr as Address); match name {
println!("Breakpoint set for {:08x}", addr); Some(name) => {
let target = system.get_device(name)?;
target.borrow_mut().as_debuggable().unwrap().add_breakpoint(addr);
println!("Breakpoint set for devices {:?} at {:08x}", name, addr);
},
None => {
debug_obj.add_breakpoint(addr);
println!("Breakpoint set for {:08x}", addr);
},
}
} }
}, },
"r" | "remove" => { "r" | "remove" => {
if args.len() != 2 { if args.len() != 2 {
println!("Usage: remove <addr>"); println!("Usage: remove <addr>");
} else { } else {
let addr = u32::from_str_radix(args[1], 16).map_err(|_| Error::new("Unable to parse breakpoint address"))?; let (name, addr) = parse_address(args[1])?;
debug_obj.remove_breakpoint(addr as Address); match name {
println!("Breakpoint removed for {:08x}", addr); Some(name) => {
let target = system.get_device(name)?;
target.borrow_mut().as_debuggable().unwrap().remove_breakpoint(addr);
println!("Breakpoint removed for devices {:?} at {:08x}", name, addr);
},
None => {
debug_obj.remove_breakpoint(addr);
println!("Breakpoint removed for {:08x}", addr);
},
}
} }
}, },
"d" | "dump" => { "d" | "dump" => {
@ -97,7 +115,7 @@ impl Debugger {
if args.len() < 2 { if args.len() < 2 {
println!("Usage: inspect <device_name> [<device specific arguments>]"); println!("Usage: inspect <device_name> [<device specific arguments>]");
} else { } else {
let device = system.devices.get(args[1]).ok_or_else(|| Error::new(&format!("No device named {}", args[1])))?; let device = system.get_device(args[1])?;
let subargs = if args.len() > 2 { &args[2..] } else { &[""] }; let subargs = if args.len() > 2 { &args[2..] } else { &[""] };
device.borrow_mut().as_inspectable() device.borrow_mut().as_inspectable()
.ok_or_else(|| Error::new("That device is not inspectable"))? .ok_or_else(|| Error::new("That device is not inspectable"))?
@ -174,3 +192,16 @@ impl Debugger {
} }
} }
fn parse_address(arg: &str) -> Result<(Option<&str>, Address), Error> {
let (name, addrstr) = match arg.find(':') {
Some(index) => {
let (name, addrstr) = arg.split_at(index);
(Some(name), &addrstr[1..])
},
None => (None, arg),
};
let addr = Address::from_str_radix(addrstr, 16).map_err(|_| Error::new("Unable to parse address"))?;
Ok((name, addr))
}