encounter/decomp-toolkit
1
0
Fork 0
mirror of https://github.com/encounter/decomp-toolkit.git synced 2025-12-10 14:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix .ctors splitting for RELs (#126)

Browse Source 
The ProDG hack in split_ctors_dtors caused the
automated splitting of .ctors to be incorrect
for RELs, by stripping relocatable function pointers
out of the object. This patch checks for relocations,
resolving both of the build failures observed in #125.
This commit is contained in:
Max
2025-12-01 12:18:25 -05:00
committed by GitHub
parent a9f34cbca6
commit 329936be00
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/split.rs
View File

@@ -10,11 +10,11 @@ use sanitise_file_name::sanitize_with_options;
use tracing_attributes::instrument;
use crate::{
analysis::{cfa::SectionAddress, read_address, read_u32},
analysis::{cfa::SectionAddress, read_address, read_u32, relocation_target_for},
obj::{
ObjArchitecture, ObjInfo, ObjKind, ObjReloc, ObjRelocations, ObjSection, ObjSectionKind,
ObjSplit, ObjSymbol, ObjSymbolFlagSet, ObjSymbolFlags, ObjSymbolKind, ObjSymbolScope,
ObjUnit, SectionIndex, SymbolIndex,
ObjArchitecture, ObjInfo, ObjKind, ObjReloc, ObjRelocKind, ObjRelocations, ObjSection,
ObjSectionKind, ObjSplit, ObjSymbol, ObjSymbolFlagSet, ObjSymbolFlags, ObjSymbolKind,
ObjSymbolScope, ObjUnit, SectionIndex, SymbolIndex,
},
util::{align_up, comment::MWComment, toposort::toposort},
};
@@ -33,7 +33,9 @@ fn split_ctors_dtors(obj: &mut ObjInfo, start: SectionAddress, end: SectionAddre
while current_address < end {
// ProDG hack when the end address is not known
if matches!(read_u32(ctors_section, current_address.address), Some(0)) {
if matches!(read_u32(ctors_section, current_address.address), Some(0))
&& relocation_target_for(obj, current_address, Some(ObjRelocKind::Absolute))?.is_none()
{
while current_address < end {
ensure!(
matches!(read_u32(ctors_section, current_address.address), Some(0)),