diff --git a/pykd/dbgext.cpp b/pykd/dbgext.cpp index 12be766..5f378e8 100644 --- a/pykd/dbgext.cpp +++ b/pykd/dbgext.cpp @@ -168,14 +168,14 @@ BOOST_PYTHON_MODULE( pykd ) .def("registerId", &pyDia::Symbol::getRegisterId, "Retrieves the register designator of the location:\n" "CV_REG_XXX (for IMAGE_FILE_MACHINE_I386) or CV_AMD64_XXX (for IMAGE_FILE_MACHINE_AMD64)") + .def("machineType", &pyDia::Symbol::getMachineType, + "Retrieves the type of the target CPU: IMAGE_FILE_MACHINE_XXX") .def( "__str__", &pyDia::Symbol::print) .def("__getitem__", &pyDia::Symbol::getChildByName) .def("__len__", &pyDia::Symbol::getChildCount ) .def("__getitem__", &pyDia::Symbol::getChildByIndex); python::class_ >("DiaScope", "class wrapper for MS DIA Symbol" ) - .def("machineType", &pyDia::GlobalScope::getMachineType, - "Retrieves the type of the target CPU: IMAGE_FILE_MACHINE_XXX") .def("findByRva", &pyDia::GlobalScope::findByRva, "Find symbol by RVA. Return tuple: (DiaSymbol, offset)") .def("symbolById", &pyDia::GlobalScope::getSymbolById, diff --git a/pykd/diawrapper.h b/pykd/diawrapper.h index f288ca2..6a3d414 100644 --- a/pykd/diawrapper.h +++ b/pykd/diawrapper.h @@ -114,12 +114,15 @@ public: ULONG getRegisterId(); + ULONG getMachineType() const { + return m_machineType; + } + Symbol getChildByName(const std::string &_name); ULONG getChildCount(); Symbol getChildByIndex(ULONG _index); std::string print(); - public: typedef std::pair ValueNameEntry; @@ -219,10 +222,6 @@ public: // GlobalScope factory static GlobalScope loadPdb(const std::string &filePath); - ULONG getMachineType() const { - return m_machineType; - } - // RVA -> Symbol python::tuple findByRva( ULONG rva,