jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Sort map

This commit is contained in:
Jaby 2023-07-24 20:41:38 +02:00
parent 8d1dda56ef
commit aa365c328e
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Tools/readmap/src/lib.rs
View File

@ -26,12 +26,28 @@ pub fn scan<F: FnMut() -> Option<String>>(mut next_line: F) -> Result<MemoryMap,
} }
} }
// Print them off for now! sort_memory_map(&mut memory_map);
println!("Name: <Global> ({})", memory_map.global.len()); Ok(memory_map)
for section in memory_map.sections { }
println!("Name: {} ({})", section.name, section.symbols.len());
fn sort_memory_map(memory_map: &mut MemoryMap) {
fn sort_symbol_vec(symbol_vec: &mut Vec<Symbol>) {
symbol_vec.sort_by(|a, b| {
a.adr.cmp(&b.adr)
});
}
fn sort_section_vec(section_vec: &mut Vec<Section>) {
section_vec.sort_by(|a, b| {
a.adr.cmp(&b.adr)
});
}
sort_section_vec(&mut memory_map.sections);
sort_symbol_vec(&mut memory_map.global);
for section in &mut memory_map.sections {
sort_symbol_vec(&mut section.symbols);
} }
Err(Error::from_str("Symbols should be sorted by address now - not implemented yet"))
} }
fn scan_symbols<F: FnMut() -> Option<String>>(next_line: &mut F, memory_map: &mut MemoryMap) -> Result<String, Error> { fn scan_symbols<F: FnMut() -> Option<String>>(next_line: &mut F, memory_map: &mut MemoryMap) -> Result<String, Error> {