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

[0.1.x] added : "subscription" for UDT typeInfo

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@76521 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2012-05-22 11:46:58 +00:00 committed by Mikhail I. Izmestev
parent b3e8165aa1
commit bc6c66cc13
6 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pykd/pymod.cpp
View File

@ -532,7 +532,9 @@ BOOST_PYTHON_MODULE( pykd )
.def( "asMap", &TypeInfo::asMap )
.def( "deref", &TypeInfo::deref )
.def( "__str__", &TypeInfo::print )
.def( "__getattr__", &TypeInfo::getField );
.def( "__getattr__", &TypeInfo::getField )
.def("__len__", &TypeInfo::getElementCount )
.def("__getitem__", &TypeInfo::getElementByIndex );
python::class_<TypedVar, TypedVarPtr, python::bases<intBase>, boost::noncopyable >("typedVar",
"Class of non-primitive type object, child class of typeClass. Data from target is copied into object instance", python::no_init )

14
pykd/typedvar.cpp
View File

@ -213,14 +213,14 @@ std::string ArrayTypedVar::printValue()
///////////////////////////////////////////////////////////////////////////////////
TypedVarPtr ArrayTypedVar::getElementByIndex( ULONG index )
python::object ArrayTypedVar::getElementByIndex( ULONG index )
{
if ( index >= m_typeInfo->getCount() )
throw PyException( PyExc_IndexError, "Index out of range" );
TypeInfoPtr elementType = m_typeInfo->getElementType();
return TypedVar::getTypedVar( m_client, elementType, m_varData->fork(elementType->getSize()*index) );
return python::object( TypedVar::getTypedVar( m_client, elementType, m_varData->fork(elementType->getSize()*index) ) );
}
///////////////////////////////////////////////////////////////////////////////////
@ -252,7 +252,7 @@ UdtTypedVar::getField( const std::string &fieldName )
///////////////////////////////////////////////////////////////////////////////////
TypedVarPtr
python::object
UdtTypedVar::getElementByIndex( ULONG index )
{
TypeInfoPtr fieldType = m_typeInfo->getFieldByIndex(index);
@ -262,7 +262,9 @@ UdtTypedVar::getElementByIndex( ULONG index )
if ( fieldType->getStaticOffset() == 0 )
throw ImplementException( __FILE__, __LINE__, "Fix ME");
return TypedVar::getTypedVar( m_client, fieldType, VarDataMemory::factory(m_dataSpaces, fieldType->getStaticOffset() ) );
return python::make_tuple(
m_typeInfo->getFieldNameByIndex(index),
TypedVar::getTypedVar( m_client, fieldType, VarDataMemory::factory(m_dataSpaces, fieldType->getStaticOffset() ) ) );
}
ULONG fieldOffset = fieldType->getOffset();
@ -272,7 +274,9 @@ UdtTypedVar::getElementByIndex( ULONG index )
fieldOffset += getVirtualBaseDisplacement( fieldType );
}
return TypedVar::getTypedVar( m_client, fieldType, m_varData->fork(fieldOffset) );
return python::make_tuple(
m_typeInfo->getFieldNameByIndex(index),
TypedVar::getTypedVar( m_client, fieldType, m_varData->fork(fieldOffset) ) );
}
///////////////////////////////////////////////////////////////////////////////////

8
pykd/typedvar.h
View File

@ -64,11 +64,11 @@ public:
throw PyException( PyExc_TypeError, "object has no len()" );
}
virtual TypedVarPtr getElementByIndex( ULONG index ) {
virtual python::object getElementByIndex( ULONG index ) {
throw PyException( PyExc_TypeError, "object is unsubscriptable");
}
TypedVarPtr getElementByIndexPtr( const TypedVarPtr& tv ) {
python::object getElementByIndexPtr( const TypedVarPtr& tv ) {
return getElementByIndex( boost::apply_visitor( VariantToULong(), tv->getValue() ) );
}
@ -158,7 +158,7 @@ public:
virtual std::string printValue();
virtual TypedVarPtr getElementByIndex( ULONG index );
virtual python::object getElementByIndex( ULONG index );
};
///////////////////////////////////////////////////////////////////////////////////
@ -184,7 +184,7 @@ protected:
return m_typeInfo->getFieldCount();
}
virtual TypedVarPtr getElementByIndex( ULONG index );
virtual python::object getElementByIndex( ULONG index );
LONG getVirtualBaseDisplacement( TypeInfoPtr& typeInfo );
};

16
pykd/typeinfo.h
View File

@ -128,6 +128,14 @@ public:
throw TypeException( getName(), "type is not a pointer" );
}
virtual ULONG getElementCount() {
throw PyException( PyExc_TypeError, "object has no len()" );
}
virtual python::tuple getElementByIndex( ULONG index ) {
throw PyException( PyExc_TypeError, "object is unsubscriptable");
}
void setOffset( ULONG offset ) {
m_offset = offset;
}
@ -309,6 +317,14 @@ protected:
return true;
}
virtual ULONG getElementCount() {
return getFieldCount();
}
virtual python::tuple getElementByIndex( ULONG index ) {
return python::make_tuple( getFieldNameByIndex(index), getFieldByIndex(index) );
}
virtual std::string print();
pyDia::SymbolPtr m_dia;

4
test/scripts/typedvar.py
View File

@ -258,6 +258,8 @@ class TypedVarTest( unittest.TestCase ):
def testUdtSubscribe(self):
tv = pykd.typedVar( "g_virtChild" )
self.assertEqual( 5, len(tv) )
self.assertEqual( tv[4], tv.m_baseField )
fieldName, fieldVal = tv[4]
self.assertEqual( fieldName, "m_baseField" )
self.assertEqual( fieldVal, tv.m_baseField )
for field in tv:
str( field )

6
test/scripts/typeinfo.py
View File

@ -185,3 +185,9 @@ class TypeInfoTest( unittest.TestCase ):
self.assertNotEqual( 0, ti.m_staticConst.offset() )
self.assertNotEqual( 0, ti.m_stdstr.offset() )
def testUdtSubscribe(self):
tv = pykd.typeInfo( "g_virtChild" )
self.assertEqual( 5, len(tv) )
for field in tv:
str( field )