mirror of
https://github.com/encounter/decomp-toolkit.git
synced 2025-12-12 06:45:09 +00:00
Update CI workflow & all dependencies
This commit is contained in:
@@ -308,7 +308,7 @@ fn fixup(args: FixupArgs) -> Result<()> {
|
||||
let mut addr_to_sym: BTreeMap<SectionId, BTreeMap<u32, SymbolId>> = BTreeMap::new();
|
||||
for symbol in in_file.symbols() {
|
||||
// Skip section and file symbols, we wrote them above
|
||||
if matches!(symbol.kind(), SymbolKind::Section | SymbolKind::File | SymbolKind::Null) {
|
||||
if matches!(symbol.kind(), SymbolKind::Section | SymbolKind::File) {
|
||||
symbol_ids.push(None);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ pub fn process_code(
|
||||
section: &ObjSection,
|
||||
config: &DiffObjConfig,
|
||||
) -> Result<ProcessCodeResult> {
|
||||
let arch = objdiff_core::arch::ppc::ObjArchPpc {};
|
||||
let arch = objdiff_core::arch::ppc::ObjArchPpc { extab: None };
|
||||
let orig_relocs = section
|
||||
.relocations
|
||||
.range(symbol.address as u32..symbol.address as u32 + symbol.size as u32)
|
||||
@@ -224,8 +224,11 @@ fn print_line(ins_diff: &ObjInsDiff, base_addr: u64) -> Vec<Span> {
|
||||
base_color = COLOR_ROTATION[diff.idx % COLOR_ROTATION.len()]
|
||||
}
|
||||
}
|
||||
DiffText::BranchDest(addr) => {
|
||||
DiffText::BranchDest(addr, diff) => {
|
||||
label_text = format!("{addr:x}");
|
||||
if let Some(diff) = diff {
|
||||
base_color = COLOR_ROTATION[diff.idx % COLOR_ROTATION.len()]
|
||||
}
|
||||
}
|
||||
DiffText::Symbol(sym) => {
|
||||
let name = sym.demangled_name.as_ref().unwrap_or(&sym.name);
|
||||
@@ -297,6 +300,7 @@ fn to_objdiff_symbol(
|
||||
flags,
|
||||
addend,
|
||||
virtual_address: None,
|
||||
original_index: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -299,7 +299,7 @@ where P: AsRef<Path> {
|
||||
}
|
||||
|
||||
// Generate symbols
|
||||
if matches!(symbol.kind(), SymbolKind::Null | SymbolKind::File)
|
||||
if matches!(symbol.kind(), SymbolKind::File)
|
||||
|| matches!(symbol.section_index(), Some(idx) if section_indexes[idx.0].is_none())
|
||||
{
|
||||
symbol_indexes.push(None);
|
||||
|
||||
Reference in New Issue
Block a user