x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 4 Activity

cleaned type size logic

This commit is contained in:
snow 2025-04-01 17:42:20 -04:00 committed by Pidgey
parent 58cf1f8f5a
commit 93ae8b1560
No known key found for this signature in database
GPG Key ID: 1C7AB1C86292593A
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dbg/types.cpp
View File

@ -129,6 +129,7 @@ bool TypeManager::AddStructMember(const std::string & parent, const std::string
return false; return false;
// cannot be pointer and bitfield // cannot be pointer and bitfield
int typeSize;
if(type.back() == '*') if(type.back() == '*')
{ {
// this is a pointer type // this is a pointer type
@ -138,6 +139,15 @@ bool TypeManager::AddStructMember(const std::string & parent, const std::string
if(bitSize != expectedSize) if(bitSize != expectedSize)
return false; return false;
typeSize = expectedSize;
}
else
{
if(arrsize != 0)
typeSize = Sizeof(type) * arrsize;
else
typeSize = Sizeof(type);
} }
auto & s = found->second; auto & s = found->second;
@ -145,15 +155,17 @@ bool TypeManager::AddStructMember(const std::string & parent, const std::string
if(member.name == name) if(member.name == name)
return false; return false;
int typeSize;
if(arrsize != 0)
typeSize = Sizeof(type) * arrsize;
else
typeSize = Sizeof(type);
// cannot have a bitfield greater than typeSize // cannot have a bitfield greater than typeSize
if(isBitfield && bitSize > typeSize) if(isBitfield)
return false; {
if(bitSize > typeSize)
return false;
typeSize = bitSize;
}
if(typeSize == -1)
__debugbreak();
Member m; Member m;
m.name = name; m.name = name;
@ -161,7 +173,7 @@ bool TypeManager::AddStructMember(const std::string & parent, const std::string
m.type = type; m.type = type;
m.assignedType = type; m.assignedType = type;
m.offsetFUCK = bitOffset; m.offsetFUCK = bitOffset;
m.bitSize = isBitfield ? bitSize : typeSize; m.bitSize = typeSize;
m.bitfield = isBitfield; m.bitfield = isBitfield;
if(bitOffset >= 0 && !s.isUnion) //user-defined offset if(bitOffset >= 0 && !s.isUnion) //user-defined offset
@ -617,6 +629,10 @@ bool TypeManager::visitMember(const Member & root, Visitor & visitor) const
return visitor.visitEnum(root, e); return visitor.visitEnum(root, e);
} }
auto foundF = functions.find(root.type);
if(foundF != functions.end())
return true;
return false; return false;
} }
@ -775,11 +791,10 @@ static void loadStructUnions(const JSON suroot, std::vector<StructUnion> & struc
curMember.bitfield = json_boolean_value(json_object_get(valj, "bitfield")); curMember.bitfield = json_boolean_value(json_object_get(valj, "bitfield"));
curMember.offsetFUCK = json_default_int(valj, "offset", -1); curMember.offsetFUCK = json_default_int(valj, "offset", -1);
if(curMember.offsetFUCK != -1) if(curMember.offsetFUCK == -1)
{ curMember.offsetFUCK = json_default_int(valj, "bitOffset", -1);
else
curMember.offsetFUCK *= 8; curMember.offsetFUCK *= 8;
curMember.offsetFUCK += json_default_int(valj, "bitOffset", 0);
}
curSu.members.push_back(curMember); curSu.members.push_back(curMember);
} }