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

Add support for loading symbol tables on startup

Browse Source
This commit is contained in:
pjht 2022-10-17 10:46:52 -05:00
parent 9b3ee444de
commit d3123e97a5
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -1,7 +1,9 @@
---
cards:
- type: rom
image: rom.bin
image: rom/rom.bin
- type: ram
size: 4096
- type: storage
symbol_tables:
- rom/rom.elf

67
src/main.rs
View File

@ -245,9 +245,20 @@ fn main() -> Result<(), ReplError> {
Err(e) => panic!("{}", e),
};
}
let mut symbol_tables = HashMap::new();
if let Some(initial_tables) = config.get("symbol_tables").map(|initial_tables| {
initial_tables
.as_sequence()
.expect("Symbol table config is not list")
}) {
for path in initial_tables {
let path = path.as_str().expect("Symbol table path is not string");
load_symbol_table(path, true, &mut symbol_tables).unwrap();
}
}
Repl::<_, Error>::new(EmuState {
cpu: M68K::new(backplane),
symbol_tables: HashMap::new(),
symbol_tables,
})
.with_name("68KEmu")
.with_version("0.1.0")
@ -496,29 +507,7 @@ fn main() -> Result<(), ReplError> {
.about("Load symbols from an ELF file, or list symbols if no file provided"),
|args, state| {
if let Some(file_path) = args.get_one::<String>("file") {
let file =
elf::File::open_path(file_path).map_err(<Box<dyn error::Error>>::from)?;
let symtab = file
.get_section(".symtab")
.ok_or(Error::Misc("Could not find symbol table section"))?;
let symbols = file
.get_symbols(&symtab)
.map_err(<Box<dyn error::Error>>::from)?
.into_iter()
.skip(1) // The first symbol is a useless null symbol
.filter(|sym| sym.symtype.0 != STT_FILE && sym.symtype.0 != STT_SECTION)
.map(|sym| (sym.name.clone(), sym))
.collect::<HashMap<_, _>>();
let basename = Path::new(&file_path).file_name().unwrap().to_str().unwrap();
if args.get_flag("append") {
if let Some(_entry) = state.symbol_tables.get_mut(basename) {
} else {
state.symbol_tables.insert(basename.to_string(), symbols);
}
} else {
state.symbol_tables.clear();
state.symbol_tables.insert(basename.to_string(), symbols);
}
load_symbol_table(file_path, args.get_flag("append"), &mut state.symbol_tables)?;
Ok(None)
} else {
let mut out = String::new();
@ -563,6 +552,36 @@ fn main() -> Result<(), ReplError> {
.run()
}
fn load_symbol_table(
path: &str,
append: bool,
symbol_tables: &mut HashMap<String, HashMap<String, Symbol>>,
) -> Result<(), Error> {
let file = elf::File::open_path(path).map_err(<Box<dyn error::Error>>::from)?;
let symtab = file
.get_section(".symtab")
.ok_or(Error::Misc("Could not find symbol table section"))?;
let symbols = file
.get_symbols(&symtab)
.map_err(<Box<dyn error::Error>>::from)?
.into_iter()
.skip(1) // The first symbol is a useless null symbol
.filter(|sym| sym.symtype.0 != STT_FILE && sym.symtype.0 != STT_SECTION)
.map(|sym| (sym.name.clone(), sym))
.collect::<HashMap<_, _>>();
let basename = Path::new(&path).file_name().unwrap().to_str().unwrap();
if append {
if let Some(_entry) = symbol_tables.get_mut(basename) {
} else {
symbol_tables.insert(basename.to_string(), symbols);
}
} else {
symbol_tables.clear();
symbol_tables.insert(basename.to_string(), symbols);
}
Ok(())
}
fn disas_fmt(cpu: &mut M68K, addr: u32) -> (String, Result<u32, DisassemblyError<BusError>>) {
match cpu.disassemble(addr) {
Ok((ins, new_addr)) => (format!("0x{:x}: {}\n", addr, ins), Ok(new_addr)),