m68k-backplane-computer/emu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for listing symbols

Browse Source
This commit is contained in:
pjht 2022-10-12 16:18:45 -05:00
parent 4a0ad44276
commit 2ee7f27b32
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main.rs
View File

@ -14,7 +14,10 @@ use crate::{
m68k::{BusError, M68K}, m68k::{BusError, M68K},
}; };
use disas::DisassemblyError; use disas::DisassemblyError;
use elf::symbol::Symbol; use elf::{
gabi::{STT_FILE, STT_SECTION},
symbol::Symbol,
};
use itertools::Itertools; use itertools::Itertools;
use parse_int::parse; use parse_int::parse;
use reedline_repl_rs::{ use reedline_repl_rs::{
@ -425,11 +428,7 @@ fn main() -> Result<(), ReplError> {
) )
.with_command( .with_command(
Command::new("sym") Command::new("sym")
.arg( .arg(Arg::new("file").help("The ELF file to load symbols from"))
Arg::new("file")
.required(true)
.help("The ELF file to load symbols from"),
)
.arg( .arg(
Arg::new("append") Arg::new("append")
.long("append") .long("append")
@ -437,22 +436,33 @@ fn main() -> Result<(), ReplError> {
.action(ArgAction::SetTrue) .action(ArgAction::SetTrue)
.help("Append the file's symbols to the loaded list of symbols"), .help("Append the file's symbols to the loaded list of symbols"),
) )
.about("Load symbols from an ELF file"), .about("Load symbols from an ELF file, or list symbols if no file provided"),
|args, state| { |args, state| {
let file = args.get_one::<String>("file").unwrap(); if let Some(file) = args.get_one::<String>("file") {
let file = elf::File::open_path(file).map_err(<Box<dyn error::Error>>::from)?; let file = elf::File::open_path(file).map_err(<Box<dyn error::Error>>::from)?;
let symtab = file let symtab = file
.get_section(".symtab") .get_section(".symtab")
.ok_or(Error::Misc("Could not find symbol table section"))?; .ok_or(Error::Misc("Could not find symbol table section"))?;
let symbols = file let symbols = file
.get_symbols(&symtab) .get_symbols(&symtab)
.map_err(<Box<dyn error::Error>>::from)?; .map_err(<Box<dyn error::Error>>::from)?;
if args.get_flag("append") { if args.get_flag("append") {
state.symbols.extend_from_slice(&symbols[..]); state.symbols.extend_from_slice(&symbols[..]);
} else {
state.symbols = symbols;
}
Ok(None)
} else { } else {
state.symbols = symbols; #[allow(unstable_name_collisions)]
Ok(Some(
state
.symbols
.iter()
.map(ToString::to_string)
.intersperse("\n".to_string())
.collect::<String>(),
))
} }
Ok(None)
}, },
) )
.with_command( .with_command(