Commit 8bd990fc authored by ussrhero's avatar ussrhero
Browse files

Merge branch '0.3.4.14' into '0.3.2'

0.3.4.14

See merge request !11
parents fe85b1e6 6e966b96
kdlibcpp @ 4154e469
Subproject commit d6c85ac71663a98e885aed81ced4ca1aadd0be8e Subproject commit 4154e469221fb023121657d3acf4d51d6caa5ef4
...@@ -147,6 +147,20 @@ void setOutputMask(const kdlib::OutputFlagsSet& outputMask) ...@@ -147,6 +147,20 @@ void setOutputMask(const kdlib::OutputFlagsSet& outputMask)
kdlib::setOutputFlags(outputMask); kdlib::setOutputFlags(outputMask);
} }
inline
kdlib::DumpType getDumpType()
{
AutoRestorePyState pystate;
return kdlib::getDumpType();
}
inline
kdlib::DumpFormatFlagsSet getDumpFormat()
{
AutoRestorePyState pystate;
return kdlib::getDumpFormat();
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// processes end threads // processes end threads
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define PYKD_VERSION_MAJOR 0 #define PYKD_VERSION_MAJOR 0
#define PYKD_VERSION_MINOR 3 #define PYKD_VERSION_MINOR 3
#define PYKD_VERSION_SUBVERSION 4 #define PYKD_VERSION_SUBVERSION 4
#define PYKD_VERSION_BUILDNO 13 #define PYKD_VERSION_BUILDNO 14
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)
......
...@@ -202,6 +202,10 @@ void pykd_init() ...@@ -202,6 +202,10 @@ void pykd_init()
"Get output mask"); "Get output mask");
python::def("setOutputMask", pykd::setOutputMask, python::def("setOutputMask", pykd::setOutputMask,
"Set output mask"); "Set output mask");
python::def("getDumpType", pykd::getDumpType,
"Return type of the dump");
python::def("getDumpFormat", pykd::getDumpFormat,
"Return format the dump");
python::def( "breakin", pykd::targetBreak, python::def( "breakin", pykd::targetBreak,
"Break into debugger" ); "Break into debugger" );
...@@ -1532,6 +1536,39 @@ void pykd_init() ...@@ -1532,6 +1536,39 @@ void pykd_init()
.value("All", kdlib::All) .value("All", kdlib::All)
; ;
python::enum_<kdlib::DumpType>("dumpType", "Dump type")
.value("Small", kdlib::Small)
.value("Default", kdlib::Default)
.value("Full", kdlib::Full)
.value("Image", kdlib::Image)
.value("KernelSmall", kdlib::KernelSmall)
.value("Kernel", kdlib::Kernel)
.value("KernelFull", kdlib::KernelFull)
;
python::enum_<kdlib::DumpFormat>("dumpFormat", "Dump format")
.value("UserSmallFullMemory", kdlib::UserSmallFullMemory)
.value("UserSmallHandleData", kdlib::UserSmallHandleData)
.value("UserSmallUnloadedModules", kdlib::UserSmallUnloadedModules)
.value("UserSmallIndirectMemory", kdlib::UserSmallIndirectMemory)
.value("UserSmallDataSegments", kdlib::UserSmallDataSegments)
.value("UserSmallFilterMemory", kdlib::UserSmallFilterMemory)
.value("UserSmallFilterPaths", kdlib::UserSmallFilterPaths)
.value("UserSmallProcessThreadData", kdlib::UserSmallProcessThreadData)
.value("UserSmallPrivateReadWriteMemory", kdlib::UserSmallPrivateReadWriteMemory)
.value("UserSmallNoOptionalData", kdlib::UserSmallNoOptionalData)
.value("UserSmallFullMemoryInfo", kdlib::UserSmallFullMemoryInfo)
.value("UserSmallThreadInfo", kdlib::UserSmallThreadInfo)
.value("UserSmallCodeSegments", kdlib::UserSmallCodeSegments)
.value("UserSmallNoAuxiliaryState", kdlib::UserSmallNoAuxiliaryState)
.value("UserSmallFullAuxiliaryState", kdlib::UserSmallFullAuxiliaryState)
.value("UserSmallModuleHeaders", kdlib::UserSmallModuleHeaders)
.value("UserSmallFilterTriage", kdlib::UserSmallFilterTriage)
.value("UserSmallAddAvxXStateContext", kdlib::UserSmallAddAvxXStateContext)
.value("UserSmallIptTrace", kdlib::UserSmallIptTrace)
.value("UserSmallIgnoreInaccessibleMem", kdlib::UserSmallIgnoreInaccessibleMem)
;
// C++ exception translation to python // C++ exception translation to python
pykd::registerExceptions(); pykd::registerExceptions();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment