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

Renamed SimpleInstruction to BasicInstruction.

Browse Source 
Added `BasicInst` type to replace `BasicInstruction` eventually.
Replaced `Formatter<'_>` with just `Formatter` where possible.
Added a `Display` impl for `Header`.
`dw` instructions now have their argument replaced instead of just having a comment.
This commit is contained in:
Filipe Rodrigues
2020-11-03 12:05:54 +00:00
parent e62561f228
commit 0e58b3df15
28 changed files with 1730 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,9 +82,9 @@ use dcb::{
data::DataTable,
func::FuncTable,
instruction::{
Directive,
BasicInstruction, Directive,
PseudoInstruction::{self, Nop},
Raw, SimpleInstruction,
Raw,
},
Func, Instruction, Pos,
},
@@ -107,6 +107,8 @@ fn main() -> Result<(), anyhow::Error> {
log::debug!("Deserializing executable");
let exe = dcb::game::Exe::deserialize(&mut game_file).context("Unable to parse game executable")?;
log::info!("Header:\n{}\n", exe.header);
// Get all instructions
log::debug!("Retrieving all instructions");
let instructions: Vec<(Pos, Instruction)> = Instruction::new_iter(
@@ -182,8 +184,9 @@ fn main() -> Result<(), anyhow::Error> {
}
// Space out data if it had a name
if let Some(data) = data_pos.get(cur_pos) {
if let Some(data) = data_pos.get(cur_pos - 1) {
if data.end_pos() == cur_pos && !data.name.is_empty() {
println!("####################");
println!();
}
}
@@ -207,6 +210,8 @@ fn main() -> Result<(), anyhow::Error> {
}
if let Some(data) = data_pos.get(cur_pos) {
if data.pos == cur_pos {
println!();
println!("####################");
println!("{}:", data.name);
for description in data.desc.lines() {
println!("# {}", description);
@@ -215,19 +220,22 @@ fn main() -> Result<(), anyhow::Error> {
}
// Print the instruction and it's location.
print!("{cur_pos:#010x}:\t");
match cur_func {
Some(cur_func) => print!("{:#05x}:\t", cur_pos - cur_func.start_pos),
None => print!("{cur_pos:#010x}:\t"),
}
match instruction {
Instruction::Simple(
SimpleInstruction::J { target } |
SimpleInstruction::Jal { target } |
SimpleInstruction::Beq { target, .. } |
SimpleInstruction::Bne { target, .. } |
SimpleInstruction::Bltz { target, .. } |
SimpleInstruction::Bgez { target, .. } |
SimpleInstruction::Bgtz { target, .. } |
SimpleInstruction::Blez { target, .. } |
SimpleInstruction::Bltzal { target, .. } |
SimpleInstruction::Bgezal { target, .. },
Instruction::Basic(
BasicInstruction::J { target } |
BasicInstruction::Jal { target } |
BasicInstruction::Beq { target, .. } |
BasicInstruction::Bne { target, .. } |
BasicInstruction::Bltz { target, .. } |
BasicInstruction::Bgez { target, .. } |
BasicInstruction::Bgtz { target, .. } |
BasicInstruction::Blez { target, .. } |
BasicInstruction::Bltzal { target, .. } |
BasicInstruction::Bgezal { target, .. },
) |
Instruction::Pseudo(
PseudoInstruction::B { target } | PseudoInstruction::Beqz { target, .. } | PseudoInstruction::Bnez { target, .. },
@@ -256,7 +264,8 @@ fn main() -> Result<(), anyhow::Error> {
PseudoInstruction::SwlImm { offset: target, .. } |
PseudoInstruction::SwImm { offset: target, .. } |
PseudoInstruction::SwrImm { offset: target, .. },
) => match functions
) |
Instruction::Directive(Directive::Dw(target)) => match functions
.get(Pos(*target))
.map(|func| (func.start_pos, &func.name))
.or_else(|| data_pos.get(Pos(*target)).map(|data| (data.pos, &data.name)))
@@ -277,22 +286,6 @@ fn main() -> Result<(), anyhow::Error> {
_ => print!("{instruction}"),
}
// Comment any `dw` instructions that are function, data or string pointers
if let Instruction::Directive(Directive::Dw(target)) = instruction {
if let Some(func) = functions.get(Pos(*target)) {
print!(" # {}", func.name);
} else if let Some(data) = data_pos.get(Pos(*target)) {
if data.pos == Pos(*target) {
print!(" # {}", data.name);
} else {
let offset = Pos(*target) - data.pos;
if offset > 0 {
print!(" # {} + {offset:#x}", data.name);
}
}
}
}
// Append any comments in this line
if let Some(cur_func) = cur_func {
if let Some(comment) = cur_func.comments.get(&cur_pos) {