zenithsiz/dcb
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dcb.git synced 2026-02-03 08:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed delay slot instructions' inline comments not being formatted properly.

Browse Source
This commit is contained in:
Filipe Rodrigues 2021-08-19 22:03:28 +01:00
parent bb734a5fea
commit 4397b0dfd9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dcb-tools/asm/dcb-disasm/src/main.rs
View File

@ -156,7 +156,12 @@ fn display_item<'a>(
let inst = inst_display_cache.entry(pos).or_insert_with(|| {
self::inst_display(inst, exe, Some(func), Some(inst_arg_overrides), pos).to_string()
});
let inst_len = inst.len();
let mut inst_len = inst.len();
// If we had a branch / jump instruction before this one, add the "+ " length
if insts.get(&(pos - 4)).map_or(false, |inst| inst.expects_branch_delay()) {
inst_len += 2;
}
Some(inst_len)
})
@ -175,7 +180,8 @@ fn display_item<'a>(
print!("\t");
// If we had a branch / jump instruction before this one, add a "+ "
if insts.get(&(pos - 4)).map_or(false, |inst| inst.expects_branch_delay()) {
let is_branch_delay = insts.get(&(pos - 4)).map_or(false, |inst| inst.expects_branch_delay());
if is_branch_delay {
print!("+ ");
}
@ -205,7 +211,7 @@ fn display_item<'a>(
let inst = inst_display_cache
.get(pos)
.expect("Instruction wasn't in buffer during inline comment alignment");
let padding = max_inst_len - inst.len();
let padding = max_inst_len - inst.len() - if is_branch_delay { 2 } else { 0 };
for _ in 0..padding {
print!(" ");
}