Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/tools/dumpcpp.js b/tools/dumpcpp.js
index 28885e0..ca5ff67 100644
--- a/tools/dumpcpp.js
+++ b/tools/dumpcpp.js
@@ -2,45 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Dump C++ symbols of shared library if possible
-
-function processArguments(args) {
- var processor = new ArgumentsProcessor(args);
- if (processor.parse()) {
- return processor.result();
- } else {
- processor.printUsageAndExit();
- }
-}
-
-function initSourceMapSupport() {
- // Pull dev tools source maps into our name space.
- SourceMap = WebInspector.SourceMap;
-
- // Overwrite the load function to load scripts synchronously.
- SourceMap.load = function(sourceMapURL) {
- var content = readFile(sourceMapURL);
- var sourceMapObject = (JSON.parse(content));
- return new SourceMap(sourceMapURL, sourceMapObject);
- };
-}
-
-var entriesProviders = {
- 'unix': UnixCppEntriesProvider,
- 'windows': WindowsCppEntriesProvider,
- 'mac': MacCppEntriesProvider
-};
-
-var params = processArguments(arguments);
-var sourceMap = null;
-if (params.sourceMap) {
- initSourceMapSupport();
- sourceMap = SourceMap.load(params.sourceMap);
-}
-
function CppProcessor(cppEntriesProvider, timedRange, pairwiseTimedRange) {
LogReader.call(this, {
- 'shared-library': { parsers: [null, parseInt, parseInt],
+ 'shared-library': { parsers: [null, parseInt, parseInt, parseInt],
processor: this.processSharedLibrary }
}, timedRange, pairwiseTimedRange);
@@ -73,10 +37,10 @@
};
CppProcessor.prototype.processSharedLibrary = function(
- name, startAddr, endAddr) {
+ name, startAddr, endAddr, aslrSlide) {
var self = this;
var libFuncs = this.cppEntriesProvider_.parseVmSymbols(
- name, startAddr, endAddr, function(fName, fStart, fEnd) {
+ name, startAddr, endAddr, aslrSlide, function(fName, fStart, fEnd) {
var entry = new CodeMap.CodeEntry(fEnd - fStart, fName, 'CPP');
self.codeMap_.addStaticCode(fStart, entry);
});
@@ -92,9 +56,3 @@
print(printValues.join(','));
}
};
-
-var cppProcessor = new CppProcessor(
- new (entriesProviders[params.platform])(params.nm, params.targetRootFS),
- params.timedRange, params.pairwiseTimedRange);
-cppProcessor.processLogFile(params.logFileName);
-cppProcessor.dumpCppSymbols();