Revision: 2810 Author: [email protected] Date: Wed Sep 2 01:18:27 2009 Log: Fix issue 434: make OS::LogSharedLibraryAddresses work on x64 Mac.
Also, enable tick processor to process 64-bit profiler logs on Mac. BUG=http://code.google.com/p/v8/issues/detail?id=434 Review URL: http://codereview.chromium.org/180063 http://code.google.com/p/v8/source/detail?r=2810 Modified: /branches/bleeding_edge/src/platform-macos.cc /branches/bleeding_edge/tools/tickprocessor.js ======================================= --- /branches/bleeding_edge/src/platform-macos.cc Thu Aug 6 13:35:33 2009 +++ /branches/bleeding_edge/src/platform-macos.cc Wed Sep 2 01:18:27 2009 @@ -211,8 +211,14 @@ for (unsigned int i = 0; i < images_count; ++i) { const mach_header* header = _dyld_get_image_header(i); if (header == NULL) continue; +#if V8_HOST_ARCH_X64 + uint64_t size; + char* code_ptr = getsectdatafromheader_64( + (mach_header_64*)header, SEG_TEXT, SECT_TEXT, &size); +#else unsigned int size; char* code_ptr = getsectdatafromheader(header, SEG_TEXT, SECT_TEXT, &size); +#endif if (code_ptr == NULL) continue; const uintptr_t slide = _dyld_get_image_vmaddr_slide(i); const uintptr_t start = reinterpret_cast<uintptr_t>(code_ptr) + slide; ======================================= --- /branches/bleeding_edge/tools/tickprocessor.js Mon Aug 17 06:45:03 2009 +++ /branches/bleeding_edge/tools/tickprocessor.js Wed Sep 2 01:18:27 2009 @@ -476,7 +476,7 @@ function MacCppEntriesProvider(nmExec) { UnixCppEntriesProvider.call(this, nmExec); // Note an empty group. It is required, as UnixCppEntriesProvider expects 3 groups. - this.FUNC_RE = /^([0-9a-fA-F]{8}) ()[iItT] (.*)$/; + this.FUNC_RE = /^([0-9a-fA-F]{8,16}) ()[iItT] (.*)$/; }; inherits(MacCppEntriesProvider, UnixCppEntriesProvider); --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
