diff --git a/decompiler/crates/kuna-analysis/src/loader/kuna_ppc64elfv2target.rs b/decompiler/crates/kuna-analysis/src/loader/kuna_ppc64elfv2target.rs new file mode 100644 index 0000000000..fb47a75aa9 --- /dev/null +++ b/decompiler/crates/kuna-analysis/src/loader/kuna_ppc64elfv2target.rs @@ -0,0 +1,40 @@ +//! A big-endian PowerPC64 ELF whose `e_flags` declare ABI version 2 (ELFv2, +//! e.g. musl or `-mabi=elfv2`) takes the `elfv2` compiler spec: its frame +//! header is 32 bytes, not ELFv1's 48, so stack parameters start at SP+96. +//! Little-endian PowerPC64 is ELFv2 throughout and its default spec says so. +use object::{Architecture, FileFlags, Object}; + +const ID: &str = "PowerPC:BE:64:default:elfv2"; + +pub(crate) fn language_ids() -> impl Iterator { + std::iter::once(ID.to_string()) +} + +pub(crate) fn language_id(file: &object::File<'_>) -> Option { + (file.format() == object::BinaryFormat::Elf + && file.architecture() == Architecture::PowerPc64 + && !file.is_little_endian() + && matches!(file.flags(), FileFlags::Elf { e_flags, .. } if e_flags & 3 == 2)) + .then(|| ID.to_string()) +} + +#[cfg(test)] +mod tests { + use object::write::Object; + use object::{Architecture, BinaryFormat, Endianness, FileFlags}; + + fn selected(endian: Endianness, e_flags: u32) -> Option { + let mut object = Object::new(BinaryFormat::Elf, Architecture::PowerPc64, endian); + object.flags = FileFlags::Elf { os_abi: 0, abi_version: 0, e_flags }; + let bytes = object.write().unwrap(); + super::language_id(&object::File::parse(&*bytes).unwrap()) + } + + #[test] + fn only_a_big_endian_abi_version_2_image_takes_the_elfv2_spec() { + assert_eq!(selected(Endianness::Big, 2).as_deref(), Some(super::ID)); + assert_eq!(selected(Endianness::Big, 1), None, "ELFv1"); + assert_eq!(selected(Endianness::Big, 0), None, "unspecified stays ELFv1"); + assert_eq!(selected(Endianness::Little, 2), None, "LE's default spec is ELFv2"); + } +} diff --git a/decompiler/crates/kuna-analysis/src/loader/mod.rs b/decompiler/crates/kuna-analysis/src/loader/mod.rs index b6794351df..13ff9c513f 100644 --- a/decompiler/crates/kuna-analysis/src/loader/mod.rs +++ b/decompiler/crates/kuna-analysis/src/loader/mod.rs @@ -32,6 +32,7 @@ pub mod arm_markers; pub(crate) mod kuna_ppcaputarget; +pub(crate) mod kuna_ppc64elfv2target; #[cfg(test)] mod powerpc_apu_tests; pub(crate) mod kuna_mipstarget; diff --git a/decompiler/crates/kuna-analysis/src/loadimage_object.rs b/decompiler/crates/kuna-analysis/src/loadimage_object.rs index f589443eb0..f32dba8d9d 100644 --- a/decompiler/crates/kuna-analysis/src/loadimage_object.rs +++ b/decompiler/crates/kuna-analysis/src/loadimage_object.rs @@ -1856,6 +1856,9 @@ fn language_id_for( if let Some(id) = crate::loader::kuna_ppcaputarget::language_id(file) { return Ok(id.into_bytes()); } + if let Some(id) = crate::loader::kuna_ppc64elfv2target::language_id(file) { + return Ok(id.into_bytes()); + } if let Some(id) = crate::loader::kuna_mipstarget::language_id(file)? { return Ok(id.into_bytes()); } @@ -2163,6 +2166,7 @@ pub fn elf_language_ids() -> Vec { } } out.extend(crate::loader::kuna_ppcaputarget::language_ids()); + out.extend(crate::loader::kuna_ppc64elfv2target::language_ids()); out.extend(crate::loader::kuna_mipstarget::language_ids()); out.extend(crate::loader::kuna_mipsocteon::language_ids()); out.sort(); diff --git a/decompiler/crates/kuna-base/src/xml.rs b/decompiler/crates/kuna-base/src/xml.rs index 5ef7f42d0f..5b467a662e 100644 --- a/decompiler/crates/kuna-base/src/xml.rs +++ b/decompiler/crates/kuna-base/src/xml.rs @@ -2205,7 +2205,8 @@ mod tests { // and kuna-repframecopy / a by-value argument copied with rep movs reaches its call // and kuna-libcnames-win32 / a local takes the name of the Win32 call it meets // and kuna-libcnames-addr / a stack object takes the name of the library parameter its address meets - assert_eq!(count, 756, "corpus file count drifted"); + // and kuna-ppc64le-elfv2-stack-args / an ELFv2 stack argument follows the 32-byte header + assert_eq!(count, 758, "corpus file count drifted"); } /// ~20 representative SLEIGH spec files across varied processors diff --git a/decompiler/crates/kuna-cli/tests/powerpc_isa_selection.rs b/decompiler/crates/kuna-cli/tests/powerpc_isa_selection.rs index 3512a38a85..6687d94886 100644 --- a/decompiler/crates/kuna-cli/tests/powerpc_isa_selection.rs +++ b/decompiler/crates/kuna-cli/tests/powerpc_isa_selection.rs @@ -131,9 +131,11 @@ fn generic_powerpc_failure_explains_the_explicit_isa_override() { &bytes, ) .unwrap(); + // A big-endian image that declares ELFv2 takes the ELFv2 compiler spec. + let compiler = if name == "BE" && abi == 2 { "elfv2" } else { "default" }; assert_eq!( loader.get_arch_type(), - format!("{generic}:default").as_bytes() + format!("{generic}:{compiler}").as_bytes() ); std::fs::write(&path, bytes).unwrap(); for options in [vec![], vec!["--target", generic.as_str()], vec!["--json"]] { diff --git a/docs/baseline-stages.json b/docs/baseline-stages.json index d2edbac94a..b08b89ecd9 100644 --- a/docs/baseline-stages.json +++ b/docs/baseline-stages.json @@ -1,7 +1,7 @@ { "data_footer": [ - 4340, - 4340 + 4344, + 4344 ], "passing": [ "data:64-bit logical shift retains unsigned destination", @@ -3701,6 +3701,10 @@ "data:pointer-arguments #2: no declaration leaks between standalone renders", "data:positive displacement stays symbolic", "data:post(y) runs once per pass", + "data:ppc64be-elfv2-stack-args #1: the callee reads its ninth argument", + "data:ppc64be-elfv2-stack-args #2: the caller passes n + 9 as the ninth", + "data:ppc64le-elfv2-stack-args #1: the callee reads its ninth argument", + "data:ppc64le-elfv2-stack-args #2: the caller passes n + 9 as the ninth", "data:preloaded SPARC stack read: capture stays before branch", "data:preloaded SPARC stack read: guarded consumer retains saved value", "data:preloaded SPARC stack read: volatile slot retained", diff --git a/specs/Ghidra/Processors/PowerPC/data/languages/ppc.ldefs b/specs/Ghidra/Processors/PowerPC/data/languages/ppc.ldefs index f38a21c0c8..c46136bfdb 100644 --- a/specs/Ghidra/Processors/PowerPC/data/languages/ppc.ldefs +++ b/specs/Ghidra/Processors/PowerPC/data/languages/ppc.ldefs @@ -47,6 +47,7 @@ PowerPC 64-bit big endian w/Altivec, G2 + diff --git a/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_be_elfv2.cspec b/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_be_elfv2.cspec new file mode 100644 index 0000000000..0cf9895682 --- /dev/null +++ b/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_be_elfv2.cspec @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # Inject pcode when returning from a function call to place the r2Save + # value into 0x18(r1) which should be restored by the "ld r2,0x18(r1)" + # which immediately follows calls which comply with the PPC64 ELFv2 ABI + # (ELFv1 saves the TOC at 0x28). + local saveR2ptr = r1 + 0x18; + *:8 saveR2ptr = r2Save; + + + + + diff --git a/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_le.cspec b/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_le.cspec index f6f8ecbf34..5823e65c28 100644 --- a/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_le.cspec +++ b/specs/Ghidra/Processors/PowerPC/data/languages/ppc_64_le.cspec @@ -94,8 +94,10 @@ + - + diff --git a/tests/stages/kuna-ppc64be-elfv2-stack-args.xml b/tests/stages/kuna-ppc64be-elfv2-stack-args.xml new file mode 100644 index 0000000000..18f68546bf --- /dev/null +++ b/tests/stages/kuna-ppc64be-elfv2-stack-args.xml @@ -0,0 +1,41 @@ + + + + +808100647c641a14786300204e800020000000000000000000000000000000003c4c0000384200007c0802a6f821ff91f80100803883000938a00003788b002038800002f961006038c0000438e000053900000639200007394000084bffffa56000000038210070e80100107c0803a64e800020000000000000000000000000 + + + + + +return i \+ a; +f9\(n,2,3,4,5,6,7,8,n \+ 9\) + diff --git a/tests/stages/kuna-ppc64le-elfv2-stack-args.xml b/tests/stages/kuna-ppc64le-elfv2-stack-args.xml new file mode 100644 index 0000000000..8ed8b4d9ba --- /dev/null +++ b/tests/stages/kuna-ppc64le-elfv2-stack-args.xml @@ -0,0 +1,43 @@ + + + + +60008180141a647c200063782000804e0000000000000000000000000800e07f02004c3c60804238a602087c91ff21f809008338800001f80300a0380400c0380500e03806000039070020390800403920008478600081f802008038a5ffff4b0000006070002138100001e8a603087c2000804e000000000000000000000000 + + + + + +return i \+ a; +f9\(n,2,3,4,5,6,7,8,n \+ 9\) +