xenia/fox32asm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print address table after assembling

Browse Source
This commit is contained in:
Ry 2022-06-21 18:27:16 -07:00
parent 522696054c
commit 983b619a70
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -298,8 +298,11 @@ enum AstNode {
OriginPadded(u32), OriginPadded(u32),
} }
fn format_address_table(m: &HashMap<String, u32>) -> String { fn format_address_table(m: &HashMap<String, (u32, bool)>) -> String {
let mut v: Vec<(&String, &u32)> = m.into_iter().collect(); let mut v: Vec<(&String, &u32)> = Vec::new();
for i in m.into_iter() {
v.push((i.0, &i.1.0));
}
v.sort_by(|(_, v1), (_, v2)| u32::cmp(v1, v2)); v.sort_by(|(_, v1), (_, v2)| u32::cmp(v1, v2));
v.iter().map(|(k, v)| format!("{:#010X?} :: {}", v, k)).collect::<Vec<String>>().join("\n") v.iter().map(|(k, v)| format!("{:#010X?} :: {}", v, k)).collect::<Vec<String>>().join("\n")
} }
@ -384,8 +387,8 @@ fn main() {
let table = LABEL_TARGETS.lock().unwrap(); let table = LABEL_TARGETS.lock().unwrap();
let address_table = LABEL_ADDRESSES.lock().unwrap(); let address_table = LABEL_ADDRESSES.lock().unwrap();
//let address_file = format_address_table(&address_table); let address_file = format_address_table(&address_table);
//println!("{}", address_file); println!("{}", address_file);
for (name, targets) in table.iter() { for (name, targets) in table.iter() {
perform_backpatching(targets, *address_table.get(name).expect(&format!("Label not found: {}", name))); perform_backpatching(targets, *address_table.get(name).expect(&format!("Label not found: {}", name)));