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

getTypePointerStripArray strips only 1 level

Browse source
This commit is contained in:
caheckman 2020-04-30 12:29:27 -04:00
parent 6df091eeee
commit 40bb05d8ed
8 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -553,7 +553,7 @@ void ParamListStandard::assignMap(const vector<Datatype *> &proto,bool isinput,T
spc = typefactory.getArch()->getDefaultDataSpace(); spc = typefactory.getArch()->getDefaultDataSpace();
int4 pointersize = spc->getAddrSize(); int4 pointersize = spc->getAddrSize();
int4 wordsize = spc->getWordSize(); int4 wordsize = spc->getWordSize();
Datatype *pointertp = typefactory.getTypePointerAbsolute(pointersize,proto[i],wordsize); Datatype *pointertp = typefactory.getTypePointer(pointersize,proto[i],wordsize);
res.back().addr = assignAddress(pointertp,status); res.back().addr = assignAddress(pointertp,status);
res.back().type = pointertp; res.back().type = pointertp;
res.back().flags = Varnode::indirectstorage; res.back().flags = Varnode::indirectstorage;
@ -1102,7 +1102,7 @@ void ParamListStandardOut::assignMap(const vector<Datatype *> &proto,bool isinpu
spc = typefactory.getArch()->getDefaultDataSpace(); spc = typefactory.getArch()->getDefaultDataSpace();
int4 pointersize = spc->getAddrSize(); int4 pointersize = spc->getAddrSize();
int4 wordsize = spc->getWordSize(); int4 wordsize = spc->getWordSize();
Datatype *pointertp = typefactory.getTypePointerAbsolute(pointersize, proto[0], wordsize); Datatype *pointertp = typefactory.getTypePointer(pointersize, proto[0], wordsize);
res.back().addr = assignAddress(pointertp,status); res.back().addr = assignAddress(pointertp,status);
if (res.back().addr.isInvalid()) if (res.back().addr.isInvalid())
throw ParamUnassignedError("Cannot assign return value as a pointer"); throw ParamUnassignedError("Cannot assign return value as a pointer");

2
Ghidra/Features/Decompiler/src/decompile/cpp/funcdata.cc
View file

@ -345,7 +345,7 @@ void Funcdata::spacebaseConstant(PcodeOp *op,int4 slot,SymbolEntry *entry,const
Symbol *sym = entry->getSymbol(); Symbol *sym = entry->getSymbol();
Datatype *entrytype = sym->getType(); Datatype *entrytype = sym->getType();
Datatype *ptrentrytype = glb->types->getTypePointer(sz,entrytype,spaceid->getWordSize()); Datatype *ptrentrytype = glb->types->getTypePointerStripArray(sz,entrytype,spaceid->getWordSize());
bool typelock = sym->isTypeLocked(); bool typelock = sym->isTypeLocked();
if (typelock && (entrytype->getMetatype() == TYPE_UNKNOWN)) if (typelock && (entrytype->getMetatype() == TYPE_UNKNOWN))
typelock = false; typelock = false;

2
Ghidra/Features/Decompiler/src/decompile/cpp/grammar.y
View file

@ -654,7 +654,7 @@ Datatype *PointerModifier::modType(Datatype *base,const TypeDeclarator *decl,Arc
{ {
int4 addrsize = glb->getDefaultDataSpace()->getAddrSize(); int4 addrsize = glb->getDefaultDataSpace()->getAddrSize();
Datatype *restype; Datatype *restype;
restype = glb->types->getTypePointerAbsolute(addrsize,base,glb->getDefaultDataSpace()->getWordSize()); restype = glb->types->getTypePointer(addrsize,base,glb->getDefaultDataSpace()->getWordSize());
return restype; return restype;
} }

7
Ghidra/Features/Decompiler/src/decompile/cpp/printc.cc
View file

@ -645,6 +645,13 @@ void PrintC::opPtradd(const PcodeOp *op)
{ {
bool printval = isSet(print_load_value|print_store_value); bool printval = isSet(print_load_value|print_store_value);
uint4 m = mods & ~(print_load_value|print_store_value); uint4 m = mods & ~(print_load_value|print_store_value);
if (!printval) {
TypePointer *tp = (TypePointer *)op->getIn(0)->getHigh()->getType();
if (tp->getMetatype() == TYPE_PTR) {
if (tp->getPtrTo()->getMetatype() == TYPE_ARRAY)
printval = true;
}
}
if (printval) // Use array notation if we need value if (printval) // Use array notation if we need value
pushOp(&subscript,op); pushOp(&subscript,op);
else // just a '+' else // just a '+'

27
Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
View file

@ -5652,7 +5652,7 @@ bool AddTreeState::checkMultTerm(Varnode *vn,PcodeOp *op,uintb treeCoeff)
{ {
Varnode *vnconst = op->getIn(1); Varnode *vnconst = op->getIn(1);
Varnode *vnterm = op->getIn(0); Varnode *vnterm = op->getIn(0);
uintb val,rem; uintb val;
if (vnterm->isFree()) { if (vnterm->isFree()) {
valid = false; valid = false;
@ -5660,13 +5660,9 @@ bool AddTreeState::checkMultTerm(Varnode *vn,PcodeOp *op,uintb treeCoeff)
} }
if (vnconst->isConstant()) { if (vnconst->isConstant()) {
val = (vnconst->getOffset() * treeCoeff) & ptrmask; val = (vnconst->getOffset() * treeCoeff) & ptrmask;
if (size == 0) intb sval = (intb) val;
rem = val; sign_extend(sval, vn->getSize() * 8 - 1);
else { intb rem = (size == 0) ? sval : sval % size;
intb sval = (intb) val;
sign_extend(sval, vn->getSize() * 8 - 1);
rem = sval % size;
}
if (rem != 0) { if (rem != 0) {
if ((val > size) && (size != 0)) { if ((val > size) && (size != 0)) {
valid = false; // Size is too big: pointer type must be wrong valid = false; // Size is too big: pointer type must be wrong
@ -5685,7 +5681,7 @@ bool AddTreeState::checkMultTerm(Varnode *vn,PcodeOp *op,uintb treeCoeff)
if (treeCoeff != 1) if (treeCoeff != 1)
isDistributeUsed = true; isDistributeUsed = true;
multiple.push_back(vnterm); multiple.push_back(vnterm);
coeff.push_back(val); coeff.push_back(sval);
return false; return false;
} }
} }
@ -5701,7 +5697,6 @@ bool AddTreeState::checkTerm(Varnode *vn,uintb treeCoeff)
{ {
uintb val; uintb val;
intb rem;
PcodeOp *def; PcodeOp *def;
if (vn == ptr) return false; if (vn == ptr) return false;
@ -5709,13 +5704,9 @@ bool AddTreeState::checkTerm(Varnode *vn,uintb treeCoeff)
if (treeCoeff != 1) if (treeCoeff != 1)
isDistributeUsed = true; isDistributeUsed = true;
val = vn->getOffset() * treeCoeff; val = vn->getOffset() * treeCoeff;
if (size == 0) intb sval = (intb)val;
rem = val; sign_extend(sval,vn->getSize()*8-1);
else { intb rem = (size == 0) ? sval : (sval % size);
intb sval = (intb)val;
sign_extend(sval,vn->getSize()*8-1);
rem = sval % size;
}
if (rem!=0) { // constant is not multiple of size if (rem!=0) { // constant is not multiple of size
nonmultsum += val; nonmultsum += val;
return true; return true;
@ -5851,7 +5842,7 @@ Varnode *AddTreeState::buildMultiples(void)
else else
resNode= data.newConstant(ptrsize,constCoeff); resNode= data.newConstant(ptrsize,constCoeff);
for(int4 i=0;i<multiple.size();++i) { for(int4 i=0;i<multiple.size();++i) {
uintb finalCoeff = (size==0) ? (uintb)0 : coeff[i] / size; uintb finalCoeff = (size==0) ? (uintb)0 : (coeff[i] / size) & ptrmask;
Varnode *vn = multiple[i]; Varnode *vn = multiple[i];
if (finalCoeff != 1) { if (finalCoeff != 1) {
PcodeOp *op = data.newOpBefore(baseOp,CPUI_INT_MULT,vn,data.newConstant(ptrsize,finalCoeff)); PcodeOp *op = data.newOpBefore(baseOp,CPUI_INT_MULT,vn,data.newConstant(ptrsize,finalCoeff));

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

@ -50,7 +50,7 @@ class AddTreeState {
uintb offset; ///< Number of bytes we dig into the base data-type uintb offset; ///< Number of bytes we dig into the base data-type
uintb correct; ///< Number of bytes being double counted uintb correct; ///< Number of bytes being double counted
vector<Varnode *> multiple; ///< Varnodes which are multiples of size vector<Varnode *> multiple; ///< Varnodes which are multiples of size
vector<uintb> coeff; ///< Associated constant multiple vector<intb> coeff; ///< Associated constant multiple
vector<Varnode *> nonmult; ///< Varnodes which are not multiples vector<Varnode *> nonmult; ///< Varnodes which are not multiples
PcodeOp *distributeOp; ///< A CPUI_INT_MULT op that needs to be distributed PcodeOp *distributeOp; ///< A CPUI_INT_MULT op that needs to be distributed
uintb multsum; ///< Sum of multiple constants uintb multsum; ///< Sum of multiple constants

22
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View file

@ -1799,22 +1799,18 @@ TypeCode *TypeFactory::getTypeCode(const string &nm)
return (TypeCode *) findAdd(tmp); return (TypeCode *) findAdd(tmp);
} }
/// This creates a pointer to a given data-type. It doesn't allow /// This creates a pointer to a given data-type. If the given data-type is
/// a "pointer to array" to be created however and will drill-down to /// an array, the TYPE_ARRAY property is stripped off, and a pointer to
/// the first non-array data-type /// the array element data-type is returned.
/// \param s is the size of the pointer /// \param s is the size of the pointer
/// \param pt is the pointed-to data-type /// \param pt is the pointed-to data-type
/// \param ws is the wordsize associated with the pointer /// \param ws is the wordsize associated with the pointer
/// \return the TypePointer object /// \return the TypePointer object
TypePointer *TypeFactory::getTypePointer(int4 s,Datatype *pt,uint4 ws) TypePointer *TypeFactory::getTypePointerStripArray(int4 s,Datatype *pt,uint4 ws)
{ // Create pointer to type -pt- {
if (pt->getMetatype() == TYPE_ARRAY) { if (pt->getMetatype() == TYPE_ARRAY)
// Do no allow pointers to array pt = ((TypeArray *)pt)->getBase(); // Strip the first ARRAY type
do {
pt = ((TypeArray *)pt)->getBase();
} while(pt->getMetatype() == TYPE_ARRAY);
}
TypePointer tmp(s,pt,ws); TypePointer tmp(s,pt,ws);
return (TypePointer *) findAdd(tmp); return (TypePointer *) findAdd(tmp);
} }
@ -1824,7 +1820,7 @@ TypePointer *TypeFactory::getTypePointer(int4 s,Datatype *pt,uint4 ws)
/// \param pt is the pointed-to data-type /// \param pt is the pointed-to data-type
/// \param ws is the wordsize associated with the pointer /// \param ws is the wordsize associated with the pointer
/// \return the TypePointer object /// \return the TypePointer object
TypePointer *TypeFactory::getTypePointerAbsolute(int4 s,Datatype *pt,uint4 ws) TypePointer *TypeFactory::getTypePointer(int4 s,Datatype *pt,uint4 ws)
{ {
TypePointer tmp(s,pt,ws); TypePointer tmp(s,pt,ws);
@ -1946,7 +1942,7 @@ Datatype *TypeFactory::downChain(Datatype *ptrtype,uintb &off)
pt = pt->getSubType(off,&off); pt = pt->getSubType(off,&off);
if (pt == (Datatype *)0) if (pt == (Datatype *)0)
return (Datatype *)0; return (Datatype *)0;
return getTypePointer(ptype->size,pt,ptype->getWordSize()); return getTypePointerStripArray(ptype->size,pt,ptype->getWordSize());
} }
/// The data-type propagation system can push around data-types that are \e partial or are /// The data-type propagation system can push around data-types that are \e partial or are

4
Ghidra/Features/Decompiler/src/decompile/cpp/type.hh
View file

@ -430,8 +430,8 @@ public:
Datatype *getBase(int4 s,type_metatype m); ///< Get atomic type Datatype *getBase(int4 s,type_metatype m); ///< Get atomic type
Datatype *getBase(int4 s,type_metatype m,const string &n); ///< Get named atomic type Datatype *getBase(int4 s,type_metatype m,const string &n); ///< Get named atomic type
TypeCode *getTypeCode(void); ///< Get an "anonymous" function data-type TypeCode *getTypeCode(void); ///< Get an "anonymous" function data-type
TypePointer *getTypePointer(int4 s,Datatype *pt,uint4 ws); ///< Construct a pointer data-type TypePointer *getTypePointerStripArray(int4 s,Datatype *pt,uint4 ws); ///< Construct a pointer data-type, stripping an ARRAY level
TypePointer *getTypePointerAbsolute(int4 s,Datatype *pt,uint4 ws); ///< Construct an absolute pointer data-type TypePointer *getTypePointer(int4 s,Datatype *pt,uint4 ws); ///< Construct an absolute pointer data-type
TypePointer *getTypePointerNoDepth(int4 s,Datatype *pt,uint4 ws); ///< Construct a depth limited pointer data-type TypePointer *getTypePointerNoDepth(int4 s,Datatype *pt,uint4 ws); ///< Construct a depth limited pointer data-type
TypeArray *getTypeArray(int4 as,Datatype *ao); ///< Construct an array data-type TypeArray *getTypeArray(int4 as,Datatype *ao); ///< Construct an array data-type
TypeStruct *getTypeStruct(const string &n); ///< Create an (empty) structure TypeStruct *getTypeStruct(const string &n); ///< Create an (empty) structure