Issue 160 - Reviewer Chris Rogers

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@156 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek 2007-05-04 19:37:00 +00:00
parent 9be806efde
commit 9a3263a670
2 changed files with 9 additions and 4 deletions

View file

@ -153,7 +153,8 @@ class DynamicImage {
path = "(unknown)"; path = "(unknown)";
} }
printf("%p: %s\n", GetLoadAddress(), path); printf("%p: %s\n", GetLoadAddress(), path);
MachHeader(*GetMachHeader()).Print(); mach_header *header = GetMachHeader();
MachHeader(*header).Print();
printf("vmaddr\t\t: %p\n", reinterpret_cast<void*>(GetVMAddr())); printf("vmaddr\t\t: %p\n", reinterpret_cast<void*>(GetVMAddr()));
printf("vmsize\t\t: %d\n", GetVMSize()); printf("vmsize\t\t: %d\n", GetVMSize());
printf("slide\t\t: %d\n", GetVMAddrSlide()); printf("slide\t\t: %d\n", GetVMAddrSlide());
@ -278,7 +279,8 @@ class DynamicImages {
for (int i = 0; i < (int)image_list_.size(); ++i) { for (int i = 0; i < (int)image_list_.size(); ++i) {
printf("dyld: %p: name = %s\n", _dyld_get_image_header(i), printf("dyld: %p: name = %s\n", _dyld_get_image_header(i),
_dyld_get_image_name(i) ); _dyld_get_image_name(i) );
MachHeader(*_dyld_get_image_header(i)).Print(); const mach_header *header = _dyld_get_image_header(i);
MachHeader(*header).Print();
} }
} }

View file

@ -255,7 +255,8 @@ static void PrintModules(const CodeModules *modules) {
// PrintModulesMachineReadable outputs a list of loaded modules, // PrintModulesMachineReadable outputs a list of loaded modules,
// one per line, in the following machine-readable pipe-delimited // one per line, in the following machine-readable pipe-delimited
// text format: // text format:
// Module|{Module Filename}|{Version}|{Base Address}|{Max Address}|{Main} // Module|{Module Filename}|{Version}|{Debug Filename}|{Identifier}|
// {Base Address}|{Max Address}|{Main}
static void PrintModulesMachineReadable(const CodeModules *modules) { static void PrintModulesMachineReadable(const CodeModules *modules) {
if (!modules) if (!modules)
return; return;
@ -272,10 +273,12 @@ static void PrintModulesMachineReadable(const CodeModules *modules) {
++module_sequence) { ++module_sequence) {
const CodeModule *module = modules->GetModuleAtSequence(module_sequence); const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
u_int64_t base_address = module->base_address(); u_int64_t base_address = module->base_address();
printf("Module%c%s%c%s%c0x%08llx%c0x%08llx%c%d\n", printf("Module%c%s%c%s%c%s%c%s%c0x%08llx%c0x%08llx%c%d\n",
kOutputSeparator, kOutputSeparator,
StripSeparator(PathnameStripper::File(module->code_file())).c_str(), StripSeparator(PathnameStripper::File(module->code_file())).c_str(),
kOutputSeparator, StripSeparator(module->version()).c_str(), kOutputSeparator, StripSeparator(module->version()).c_str(),
kOutputSeparator, StripSeparator(module->debug_file()).c_str(),
kOutputSeparator, StripSeparator(module->code_identifier()).c_str(),
kOutputSeparator, base_address, kOutputSeparator, base_address,
kOutputSeparator, base_address + module->size() - 1, kOutputSeparator, base_address + module->size() - 1,
kOutputSeparator, base_address == main_address ? 1 : 0); kOutputSeparator, base_address == main_address ? 1 : 0);