Added /g debug format to dump GUIDs.

This commit is contained in:
Alexandre Julliard 2002-06-13 21:37:41 +00:00
parent a3edecaa6f
commit 14dbbe0613
3 changed files with 21 additions and 2 deletions

View File

@ -40,7 +40,7 @@ static int syntax_error;
DIGIT [0-9]
HEXDIGIT [0-9a-fA-F]
FORMAT [ubcdiswx]
FORMAT [ubcdgiswx]
IDENTIFIER [_a-zA-Z~][_a-zA-Z0-9~@]*
PATHNAME [/_a-zA-Z\.~][/_a-zA-Z0-9\.~@]*
STRING \"[^\n"]+\"

View File

@ -288,6 +288,25 @@ void DEBUG_ExamineMemory( const DBG_VALUE *_value, int count, char format )
case 'i':
while (count-- && DEBUG_DisassembleInstruction( &value.addr ));
return;
case 'g':
while (count--)
{
GUID guid;
if (!DEBUG_READ_MEM_VERBOSE(pnt, &guid, sizeof(guid))) break;
DEBUG_Printf(DBG_CHN_MESG,"{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
guid.Data1, guid.Data2, guid.Data3,
guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] );
pnt += sizeof(guid);
value.addr.off += sizeof(guid);
if (count)
{
DEBUG_PrintAddress( &value.addr, DEBUG_CurrThread->dbg_mode, FALSE );
DEBUG_Printf(DBG_CHN_MESG,": ");
}
}
return;
#define DO_DUMP2(_t,_l,_f,_vv) { \
_t _v; \
for(i=0; i<count; i++) { \

View File

@ -835,7 +835,7 @@ DEBUG_Print( const DBG_VALUE *value, int count, char format, int level )
goto leave;
}
if( format == 'i' || format == 's' || format == 'w' || format == 'b' )
if( format == 'i' || format == 's' || format == 'w' || format == 'b' || format == 'g')
{
DEBUG_Printf( DBG_CHN_MESG, "Format specifier '%c' is meaningless in 'print' command\n", format );
format = '\0';