yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-4133 Adjustment for forced indirect return

Browse source
This commit is contained in:
caheckman 2023-12-11 22:38:21 +00:00
parent 2259379a67
commit 99d8762b9c
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
View file

@ -1512,13 +1512,12 @@ void ParamListStandardOut::assignMap(const PrototypePieces &proto,TypeFactory &t
Datatype *pointertp = typefactory.getTypePointer(pointersize, proto.outtype, wordsize); Datatype *pointertp = typefactory.getTypePointer(pointersize, proto.outtype, wordsize);
if (responseCode == AssignAction::hiddenret_specialreg_void) { if (responseCode == AssignAction::hiddenret_specialreg_void) {
res.back().type = typefactory.getTypeVoid(); res.back().type = typefactory.getTypeVoid();
res.back().flags = 0;
} }
else { else {
if (assignAddressFallback(TYPECLASS_PTR,pointertp,false,status,res.back()) == AssignAction::fail) if (assignAddressFallback(TYPECLASS_PTR,pointertp,false,status,res.back()) == AssignAction::fail)
throw ParamUnassignedError("Cannot assign return value as a pointer"); throw ParamUnassignedError("Cannot assign return value as a pointer");
res.back().flags = ParameterPieces::indirectstorage;
} }
res.back().flags = ParameterPieces::indirectstorage;
res.emplace_back(); // Add extra storage location in the input params res.emplace_back(); // Add extra storage location in the input params
res.back().type = pointertp; // that holds a pointer to where the return value should be stored res.back().type = pointertp; // that holds a pointer to where the return value should be stored

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParameterPieces.java
View file

@ -92,18 +92,15 @@ public class ParameterPieces {
VariableStorage store; VariableStorage store;
try { try {
if (joinPieces != null) { if (joinPieces != null) {
store = new DynamicVariableStorage(program, false, joinPieces); store = new DynamicVariableStorage(program, isIndirect, joinPieces);
} }
else { else {
if (hiddenReturnPtr) { if (hiddenReturnPtr) {
store = new DynamicVariableStorage(program, store = new DynamicVariableStorage(program,
AutoParameterType.RETURN_STORAGE_PTR, address, sz); AutoParameterType.RETURN_STORAGE_PTR, address, sz);
} }
else if (isIndirect) {
store = new DynamicVariableStorage(program, true, address, sz);
}
else { else {
store = new DynamicVariableStorage(program, false, address, sz); store = new DynamicVariableStorage(program, isIndirect, address, sz);
} }
} }
} }