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

Fixed {Data, Func}Table::get_*.

Browse Source 
`Directive` now implements `InstTargetFmt`.
This commit is contained in:
Filipe Rodrigues
2021-01-13 23:09:25 +00:00
parent 930696eaec
commit bbfe541a6d
7 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dcb-tools/src/decompiler/main.rs
View File

@@ -82,7 +82,7 @@ use std::fmt;
use anyhow::Context;
use dcb_exe::{
exe::{
inst::{basic, pseudo, Inst, InstFmt, InstTarget, InstTargetFmt},
inst::{basic, pseudo, Directive, Inst, InstFmt, InstTarget, InstTargetFmt},
iter::ExeItem,
Func,
},
@@ -179,6 +179,9 @@ pub fn inst_display<'a>(inst: &'a Inst, exe: &'a Exe, func: Option<&'a Func>, po
)) => write!(f, "{}", self::inst_target_fmt(inst, pos, self::inst_target(exe, func, Pos(*target)))),
Inst::Pseudo(pseudo::Inst::Load(inst)) => write!(f, "{}", self::inst_target_fmt(inst, pos, self::inst_target(exe, func, inst.target(pos)))),
Inst::Pseudo(pseudo::Inst::Store(inst)) => write!(f, "{}", self::inst_target_fmt(inst, pos, self::inst_target(exe, func, inst.target(pos)))),
Inst::Directive(directive @ Directive::Dw(target)) => {
write!(f, "{}", self::inst_target_fmt(directive, pos, self::inst_target(exe, func, Pos(*target))))
},
// TODO: Directive
inst => write!(f, "{}", self::inst_fmt(inst, pos)),
})