Print data offset additionally to prefix while dumping data.
This commit is contained in:
parent
d5e1804c1b
commit
8eb1a29a74
|
@ -57,7 +57,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix
|
||||||
{
|
{
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
|
|
||||||
printf( "%s", prefix );
|
printf( "%s%08x: ", prefix, 0 );
|
||||||
if (!ptr)
|
if (!ptr)
|
||||||
{
|
{
|
||||||
printf("NULL\n");
|
printf("NULL\n");
|
||||||
|
@ -71,7 +71,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix
|
||||||
printf( " " );
|
printf( " " );
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
printf( "%c", isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.' );
|
printf( "%c", isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.' );
|
||||||
if (i < size-1) printf( "\n%s", prefix );
|
if (i < size-1) printf( "\n%s%08x: ", prefix, i + 1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (i % 16)
|
if (i % 16)
|
||||||
|
|
|
@ -106,9 +106,9 @@ void mdmp_dump(void)
|
||||||
printf(" Stack: 0x%llx-0x%llx\n",
|
printf(" Stack: 0x%llx-0x%llx\n",
|
||||||
mt->Stack.StartOfMemoryRange,
|
mt->Stack.StartOfMemoryRange,
|
||||||
mt->Stack.StartOfMemoryRange + mt->Stack.Memory.DataSize);
|
mt->Stack.StartOfMemoryRange + mt->Stack.Memory.DataSize);
|
||||||
dump_mdmp_data(&mt->Stack.Memory, " ");
|
dump_mdmp_data(&mt->Stack.Memory, " ");
|
||||||
printf(" ThreadContext:\n");
|
printf(" ThreadContext:\n");
|
||||||
dump_mdmp_data(&mt->ThreadContext, " ");
|
dump_mdmp_data(&mt->ThreadContext, " ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -197,9 +197,9 @@ void mdmp_dump(void)
|
||||||
printf(" dwFileDate: %lx%08lx\n",
|
printf(" dwFileDate: %lx%08lx\n",
|
||||||
mm->VersionInfo.dwFileDateMS, mm->VersionInfo.dwFileDateLS);
|
mm->VersionInfo.dwFileDateMS, mm->VersionInfo.dwFileDateLS);
|
||||||
printf(" CvRecord: <%lu>\n", mm->CvRecord.DataSize);
|
printf(" CvRecord: <%lu>\n", mm->CvRecord.DataSize);
|
||||||
dump_mdmp_data(&mm->CvRecord, " ");
|
dump_mdmp_data(&mm->CvRecord, " ");
|
||||||
printf(" MiscRecord: <%lu>\n", mm->MiscRecord.DataSize);
|
printf(" MiscRecord: <%lu>\n", mm->MiscRecord.DataSize);
|
||||||
dump_mdmp_data(&mm->MiscRecord, " ");
|
dump_mdmp_data(&mm->MiscRecord, " ");
|
||||||
printf(" Reserved0: %llu\n", mm->Reserved0);
|
printf(" Reserved0: %llu\n", mm->Reserved0);
|
||||||
printf(" Reserved1: %llu\n", mm->Reserved1);
|
printf(" Reserved1: %llu\n", mm->Reserved1);
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,7 @@ void mdmp_dump(void)
|
||||||
printf(" Range: 0x%llx-0x%llx\n",
|
printf(" Range: 0x%llx-0x%llx\n",
|
||||||
mmd->StartOfMemoryRange,
|
mmd->StartOfMemoryRange,
|
||||||
mmd->StartOfMemoryRange + mmd->Memory.DataSize);
|
mmd->StartOfMemoryRange + mmd->Memory.DataSize);
|
||||||
dump_mdmp_data(&mmd->Memory, " ");
|
dump_mdmp_data(&mmd->Memory, " ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -365,7 +365,7 @@ void mdmp_dump(void)
|
||||||
printf("NIY %ld\n", dir->StreamType);
|
printf("NIY %ld\n", dir->StreamType);
|
||||||
printf(" RVA: %lu\n", dir->Location.Rva);
|
printf(" RVA: %lu\n", dir->Location.Rva);
|
||||||
printf(" Size: %lu\n", dir->Location.DataSize);
|
printf(" Size: %lu\n", dir->Location.DataSize);
|
||||||
dump_mdmp_data(&dir->Location, " ");
|
dump_mdmp_data(&dir->Location, " ");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -829,7 +829,7 @@ static void dump_dir_resource(void)
|
||||||
data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->u2.OffsetToData);
|
data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->u2.OffsetToData);
|
||||||
if (e1->u1.s1.NameIsString)
|
if (e1->u1.s1.NameIsString)
|
||||||
{
|
{
|
||||||
dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );
|
dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );
|
||||||
}
|
}
|
||||||
else switch(e1->u1.s2.Id)
|
else switch(e1->u1.s2.Id)
|
||||||
{
|
{
|
||||||
|
@ -842,7 +842,7 @@ static void dump_dir_resource(void)
|
||||||
e2->u1.s2.Id, " " );
|
e2->u1.s2.Id, " " );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );
|
dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue