zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-21 12:24:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[0.1.x] update : create typeInfo by name for "complex" type ( mixed array and pointers )

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@72061 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2011-12-06 15:49:25 +00:00 committed by Mikhail I. Izmestev
parent 7889544689
commit 1609c0cac6
3 changed files with 97 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
pykd/typeinfo.cpp
View File

@ -30,7 +30,7 @@ TypeInfoPtr TypeInfo::getTypeInfo( pyDia::SymbolPtr &typeSym )
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
static const boost::regex arrayMatch("^(.*)\\[(\\d+)\\]$"); //static const boost::regex arrayMatch("^(.*)\\[(\\d+)\\]$");
TypeInfoPtr TypeInfo::getTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName ) TypeInfoPtr TypeInfo::getTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName )
{ {
@ -50,20 +50,22 @@ TypeInfoPtr TypeInfo::getTypeInfo( pyDia::SymbolPtr &symScope, const std::strin
return getTypeInfo( typeSym ); return getTypeInfo( typeSym );
} }
if ( symName[ symName.size() - 1 ] == '*' ) return getComplexType( symScope, symName );
return TypeInfoPtr( new PointerTypeInfo( symScope,symName.substr( 0, symName.size() - 1 ) ) );
boost::cmatch matchResult; //if ( symName[ symName.size() - 1 ] == '*' )
// return TypeInfoPtr( new PointerTypeInfo( symScope,symName.substr( 0, symName.size() - 1 ) ) );
if ( boost::regex_match( symName.c_str(), matchResult, arrayMatch ) ) //boost::cmatch matchResult;
{
std::string sym = std::string( matchResult[1].first, matchResult[1].second );
return TypeInfoPtr( new ArrayTypeInfo( symScope, sym, std::atoi( matchResult[2].first ) ) ); //if ( boost::regex_match( symName.c_str(), matchResult, arrayMatch ) )
} //{
// std::string sym = std::string( matchResult[1].first, matchResult[1].second );
// return TypeInfoPtr( new ArrayTypeInfo( symScope, sym, std::atoi( matchResult[2].first ) ) );
//}
throw DbgException( "type name invalid" ); //throw DbgException( "type name invalid" );
} }
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
@ -160,7 +162,6 @@ PointerTypeInfo::PointerTypeInfo( pyDia::SymbolPtr &symScope, const std::string
std::string PointerTypeInfo::getName() std::string PointerTypeInfo::getName()
{ {
//return m_derefType->getName() + '*';
return getComplexName(); return getComplexName();
} }
@ -191,11 +192,6 @@ ArrayTypeInfo::ArrayTypeInfo( pyDia::SymbolPtr &symScope, const std::string &sym
std::string ArrayTypeInfo::getName() std::string ArrayTypeInfo::getName()
{ {
//std::stringstream sstr;
//sstr << m_derefType->getName() << '[' << m_count << ']';
//return sstr.str();
return getComplexName(); return getComplexName();
} }
@ -260,4 +256,72 @@ std::string TypeInfo::getComplexName()
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
static const boost::regex bracketMatch("^([^\\(]*)\\((.*)\\)([^\\)]*)$");
static const boost::regex typeMatch("^([^\\(\\)\\*\\[\\]]*)([\\(\\)\\*\\[\\]\\d]*)$");
static const boost::regex ptrMatch("^\\*(.*)$");
static const boost::regex arrayMatch("^(.*)\\[(\\d+)\\]$");
TypeInfoPtr TypeInfo::getComplexType( pyDia::SymbolPtr &symScope, const std::string &symName )
{
ULONG ptrSize = (symScope->getMachineType() == IMAGE_FILE_MACHINE_AMD64) ? 8 : 4;
boost::cmatch matchResult;
if ( !boost::regex_match( symName.c_str(), matchResult, typeMatch ) )
DbgException( "type name invalid" );
TypeInfoPtr lowestTypeInfo = getTypeInfo( symScope, std::string( matchResult[1].first, matchResult[1].second ) );
return getRecurciveComplexType( lowestTypeInfo, std::string( matchResult[2].first, matchResult[2].second ), ptrSize );
}
/////////////////////////////////////////////////////////////////////////////////////
TypeInfoPtr TypeInfo::getRecurciveComplexType( TypeInfoPtr &lowestType, std::string &suffix, ULONG ptrSize )
{
boost::cmatch matchResult;
std::string bracketExpr;
if ( boost::regex_match( suffix.c_str(), matchResult, bracketMatch ) )
{
bracketExpr = std::string( matchResult[2].first, matchResult[2].second );
suffix = "";
if ( matchResult[1].matched )
suffix += std::string( matchResult[1].first, matchResult[1].second );
if ( matchResult[3].matched )
suffix += std::string( matchResult[3].first, matchResult[3].second );
}
while( !suffix.empty() )
{
if ( boost::regex_match( suffix.c_str(), matchResult, ptrMatch ) )
{
lowestType = TypeInfoPtr( new PointerTypeInfo( lowestType, ptrSize ) );
suffix = std::string(matchResult[1].first, matchResult[1].second );
continue;
}
if ( boost::regex_match( suffix.c_str(), matchResult, arrayMatch ) )
{
lowestType = TypeInfoPtr( new ArrayTypeInfo( lowestType, std::atoi( matchResult[2].first ) ) );
suffix = std::string(matchResult[1].first, matchResult[1].second );
continue;
}
}
if ( !bracketExpr.empty() )
return getRecurciveComplexType( lowestType, bracketExpr, ptrSize );
return lowestType;
}
/////////////////////////////////////////////////////////////////////////////////////
}; // end namespace pykd }; // end namespace pykd

19
pykd/typeinfo.h
View File

@ -73,6 +73,12 @@ protected:
std::string getComplexName(); std::string getComplexName();
static
TypeInfoPtr getComplexType( pyDia::SymbolPtr &symScope, const std::string &symName );
static
TypeInfoPtr getRecurciveComplexType( TypeInfoPtr &lowestType, std::string &suffix, ULONG ptrSize );
ULONG m_offset; ULONG m_offset;
}; };
@ -180,6 +186,11 @@ class PointerTypeInfo : public TypeInfo {
public: public:
PointerTypeInfo( const TypeInfoPtr ptr, ULONG ptrSize ) :
m_size( ptrSize ),
m_derefType( ptr )
{}
PointerTypeInfo( pyDia::SymbolPtr &symbol ); PointerTypeInfo( pyDia::SymbolPtr &symbol );
PointerTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName ); PointerTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName );
@ -200,7 +211,6 @@ public:
return m_derefType; return m_derefType;
} }
private: private:
TypeInfoPtr m_derefType; TypeInfoPtr m_derefType;
@ -214,6 +224,11 @@ class ArrayTypeInfo : public TypeInfo {
public: public:
ArrayTypeInfo( const TypeInfoPtr ptr, ULONG count ) :
m_derefType( ptr ),
m_count( count )
{}
ArrayTypeInfo( pyDia::SymbolPtr &symbol ); ArrayTypeInfo( pyDia::SymbolPtr &symbol );
ArrayTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName, ULONG count ); ArrayTypeInfo( pyDia::SymbolPtr &symScope, const std::string &symName, ULONG count );
@ -242,8 +257,6 @@ public:
return m_derefType; return m_derefType;
} }
private: private:
TypeInfoPtr m_derefType; TypeInfoPtr m_derefType;

2
test/scripts/typeinfo.py
View File

@ -18,7 +18,7 @@ class TypeInfoTest( unittest.TestCase ):
self.assertEqual( "structTest", target.module.type( "structTest" ).name() ) self.assertEqual( "structTest", target.module.type( "structTest" ).name() )
self.assertEqual( "structTest**", target.module.type( "structTest**" ).name() ) self.assertEqual( "structTest**", target.module.type( "structTest**" ).name() )
self.assertEqual( "Int4B[2][3]", target.module.type("Int4B[2][3]").name() ) self.assertEqual( "Int4B[2][3]", target.module.type("Int4B[2][3]").name() )
self.assertEqual( "Int4B(*[4])[2][3]", target.module.type("Int4B(*[4])[2][3]").name() )
def testCreateBySymbol(self): def testCreateBySymbol(self):
""" creating typeInfo by the symbol name """ """ creating typeInfo by the symbol name """