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

GP-3609 Split based on endianess of output AddrSpace

Browse source
This commit is contained in:
caheckman 2023-07-05 17:15:46 +00:00
parent b796fe5233
commit 0b13fc7109
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc
View file

@ -2085,11 +2085,11 @@ bool SplitDatatype::generateConstants(Varnode *vn,vector<Varnode *> &inVarnodes)
/// based on the input offsets in \b dataTypePieces. /// based on the input offsets in \b dataTypePieces.
/// \param rootVn is the given root constant /// \param rootVn is the given root constant
/// \param inVarnodes is the container for the new Varnodes /// \param inVarnodes is the container for the new Varnodes
void SplitDatatype::buildInConstants(Varnode *rootVn,vector<Varnode *> &inVarnodes) /// \param bigEndian is \b true if the output address space is big endian
void SplitDatatype::buildInConstants(Varnode *rootVn,vector<Varnode *> &inVarnodes,bool bigEndian)
{ {
uintb baseVal = rootVn->getOffset(); uintb baseVal = rootVn->getOffset();
bool bigEndian = rootVn->getSpace()->isBigEndian();
for(int4 i=0;i<dataTypePieces.size();++i) { for(int4 i=0;i<dataTypePieces.size();++i) {
Datatype *dt = dataTypePieces[i].inType; Datatype *dt = dataTypePieces[i].inType;
int4 off = dataTypePieces[i].offset; int4 off = dataTypePieces[i].offset;
@ -2346,7 +2346,7 @@ bool SplitDatatype::splitCopy(PcodeOp *copyOp,Datatype *inType,Datatype *outType
vector<Varnode *> inVarnodes; vector<Varnode *> inVarnodes;
vector<Varnode *> outVarnodes; vector<Varnode *> outVarnodes;
if (inVn->isConstant()) if (inVn->isConstant())
buildInConstants(inVn,inVarnodes); buildInConstants(inVn,inVarnodes,outVn->getSpace()->isBigEndian());
else else
buildInSubpieces(inVn,copyOp,inVarnodes); buildInSubpieces(inVn,copyOp,inVarnodes);
buildOutVarnodes(outVn,outVarnodes); buildOutVarnodes(outVn,outVarnodes);
@ -2461,9 +2461,10 @@ bool SplitDatatype::splitStore(PcodeOp *storeOp,Datatype *outType)
return false; return false;
} }
AddrSpace *storeSpace = storeOp->getIn(0)->getSpaceFromConst();
vector<Varnode *> inVarnodes; vector<Varnode *> inVarnodes;
if (inVn->isConstant()) if (inVn->isConstant())
buildInConstants(inVn,inVarnodes); buildInConstants(inVn,inVarnodes,storeSpace->isBigEndian());
else if (loadOp != (PcodeOp *)0) { else if (loadOp != (PcodeOp *)0) {
vector<Varnode *> loadPtrs; vector<Varnode *> loadPtrs;
buildPointers(loadRoot.pointer, loadRoot.ptrType, loadRoot.baseOffset, loadOp, loadPtrs, true); buildPointers(loadRoot.pointer, loadRoot.ptrType, loadRoot.baseOffset, loadOp, loadPtrs, true);
@ -2485,7 +2486,6 @@ bool SplitDatatype::splitStore(PcodeOp *storeOp,Datatype *outType)
vector<Varnode *> storePtrs; vector<Varnode *> storePtrs;
buildPointers(storeRoot.pointer, storeRoot.ptrType, storeRoot.baseOffset, storeOp, storePtrs, false); buildPointers(storeRoot.pointer, storeRoot.ptrType, storeRoot.baseOffset, storeOp, storePtrs, false);
AddrSpace *storeSpace = storeOp->getIn(0)->getSpaceFromConst();
// Preserve original STORE object, so that INDIRECT references are still valid // Preserve original STORE object, so that INDIRECT references are still valid
// but convert it into the first of the smaller STOREs // but convert it into the first of the smaller STOREs
data.opSetInput(storeOp,storePtrs[0],1); data.opSetInput(storeOp,storePtrs[0],1);

2
Ghidra/Features/Decompiler/src/decompile/cpp/subflow.hh
View file

@ -188,7 +188,7 @@ class SplitDatatype {
bool testDatatypeCompatibility(Datatype *inBase,Datatype *outBase,bool inConstant); bool testDatatypeCompatibility(Datatype *inBase,Datatype *outBase,bool inConstant);
bool testCopyConstraints(PcodeOp *copyOp); bool testCopyConstraints(PcodeOp *copyOp);
bool generateConstants(Varnode *vn,vector<Varnode *> &inVarnodes); bool generateConstants(Varnode *vn,vector<Varnode *> &inVarnodes);
void buildInConstants(Varnode *rootVn,vector<Varnode *> &inVarnodes); void buildInConstants(Varnode *rootVn,vector<Varnode *> &inVarnodes,bool bigEndian);
void buildInSubpieces(Varnode *rootVn,PcodeOp *followOp,vector<Varnode *> &inVarnodes); void buildInSubpieces(Varnode *rootVn,PcodeOp *followOp,vector<Varnode *> &inVarnodes);
void buildOutVarnodes(Varnode *rootVn,vector<Varnode *> &outVarnodes); void buildOutVarnodes(Varnode *rootVn,vector<Varnode *> &outVarnodes);
void buildOutConcats(Varnode *rootVn,PcodeOp *previousOp,vector<Varnode *> &outVarnodes); void buildOutConcats(Varnode *rootVn,PcodeOp *previousOp,vector<Varnode *> &outVarnodes);