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

[0.1.x] added : syntax error output for !py command

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@71848 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2011-11-28 08:26:30 +00:00 committed by Mikhail I. Izmestev
parent 5ee21bec08
commit 2e618b08d8
2 changed files with 136 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pykd/dbgext.cpp
View File

@ -806,11 +806,43 @@ py( PDEBUG_CLIENT4 client, PCSTR args )
PyErr_Fetch( &errtype, &errvalue, &traceback ); PyErr_Fetch( &errtype, &errvalue, &traceback );
PyErr_NormalizeException( &errtype, &errvalue, &traceback );
if(errvalue != NULL) if(errvalue != NULL)
{
if ( PyErr_GivenExceptionMatches(errtype, PyExc_SyntaxError))
{
PyObject *filenamePtr = PyObject_GetAttrString(errvalue ,"filename" );
PyObject *filenameStr = PyUnicode_FromObject(filenamePtr);
PyObject *linenoPtr = PyObject_GetAttrString(errvalue ,"lineno");
PyObject *offsetPtr = PyObject_GetAttrString(errvalue ,"offset");
PyObject *msg = PyObject_GetAttrString(errvalue, "msg");
PyObject *msgStr = PyUnicode_FromObject(msg);
std::wstringstream sstr;
sstr << std::endl << L"Syntax error" << std::endl;
sstr << std::endl << PyUnicode_AS_UNICODE( msgStr ) << std::endl << std::endl;
sstr << "Filename: " << PyUnicode_AS_UNICODE( filenameStr );
sstr << " Line: " << PyInt_AsLong( linenoPtr );
sstr << " Pos: " << PyInt_AsLong( offsetPtr );
sstr << std::endl;
dbgClient->eprintln( sstr.str() );
Py_XDECREF( linenoPtr );
Py_XDECREF( offsetPtr );
Py_XDECREF( msgStr );
Py_XDECREF( msg );
}
else
{ {
PyObject *errvalueStr= PyUnicode_FromObject(errvalue); PyObject *errvalueStr= PyUnicode_FromObject(errvalue);
if ( errvalueStr )
{
dbgClient->eprintln( PyUnicode_AS_UNICODE( errvalueStr ) ); dbgClient->eprintln( PyUnicode_AS_UNICODE( errvalueStr ) );
Py_DECREF(errvalueStr);
}
if ( traceback ) if ( traceback )
{ {
@ -824,8 +856,7 @@ py( PDEBUG_CLIENT4 client, PCSTR args )
for ( long i = 0; i < python::len(traceList); ++i ) for ( long i = 0; i < python::len(traceList); ++i )
dbgClient->eprintln( python::extract<std::wstring>(traceList[i]) ); dbgClient->eprintln( python::extract<std::wstring>(traceList[i]) );
} }
}
Py_DECREF(errvalueStr);
} }
Py_XDECREF(errvalue); Py_XDECREF(errvalue);

14
snippets/accessmask.py
View File

@ -86,12 +86,16 @@ def parseMask(mask, maskSets) :
cnt += 1 cnt += 1
return mask return mask
def main():
argc = len(sys.argv) argc = len(sys.argv)
0/0
if argc == 1 : if argc == 1 :
dprintln("Syntax: [object type] <;hex mask>;") dprintln("Syntax: [object type] <;hex mask>;")
dprintln("Supported object types: process, thread, file, generic") dprintln("Supported object types: process, thread, file, generic")
quit( 0 ) return
type = (argc > 2 and sys.argv[1]) or "generic" type = (argc > 2 and sys.argv[1]) or "generic"
if argc > 2 : if argc > 2 :
@ -101,9 +105,9 @@ else :
if type == "file" : if type == "file" :
mask = parseMask(mask, FileMaskSets) mask = parseMask(mask, FileMaskSets)
elif type == "process" : if type == "process" :
mask = parseMask(mask, ProcessMaskSets) mask = parseMask(mask, ProcessMaskSets)
elif type == "thread" : if type == "thread" :
mask = parseMask(mask, ThreadMaskSets) mask = parseMask(mask, ThreadMaskSets)
elif type == "generic" : elif type == "generic" :
mask = parseMask(mask, GenericMaskSets) mask = parseMask(mask, GenericMaskSets)
@ -112,3 +116,7 @@ dprintln("")
if mask != 0 : if mask != 0 :
dprintln("Unknown bits: 0x%x" % mask) dprintln("Unknown bits: 0x%x" % mask)
if __name__ == "__main__":
main()