Update grokdump to reflect current heap layout.

R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/12303009

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13687 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/tools/grokdump.py b/tools/grokdump.py
index d54a04b..603453a 100755 (executable)
--- a/tools/grokdump.py
+++ b/tools/grokdump.py
@@ -931,86 +931,86 @@ INSTANCE_TYPES = {
 # }
 # printf("}\n");
 KNOWN_MAPS = {
-  0x08081: (128, "MetaMap"),
-  0x080a9: (166, "FixedArrayMap"),
+  0x08081: (134, "ByteArrayMap"),
+  0x080a9: (128, "MetaMap"),
   0x080d1: (130, "OddballMap"),
-  0x080f9: (166, "FixedCOWArrayMap"),
-  0x08121: (166, "ScopeInfoMap"),
+  0x080f9: (68, "AsciiSymbolMap"),
+  0x08121: (166, "FixedArrayMap"),
   0x08149: (132, "HeapNumberMap"),
-  0x08171: (133, "ForeignMap"),
-  0x08199: (64, "SymbolMap"),
-  0x081c1: (68, "AsciiSymbolMap"),
-  0x081e9: (65, "ConsSymbolMap"),
-  0x08211: (69, "ConsAsciiSymbolMap"),
-  0x08239: (66, "ExternalSymbolMap"),
-  0x08261: (74, "ExternalSymbolWithAsciiDataMap"),
-  0x08289: (70, "ExternalAsciiSymbolMap"),
-  0x082b1: (82, "ShortExternalSymbolMap"),
-  0x082d9: (90, "ShortExternalSymbolWithAsciiDataMap"),
-  0x08301: (86, "ShortExternalAsciiSymbolMap"),
-  0x08329: (0, "StringMap"),
-  0x08351: (4, "AsciiStringMap"),
-  0x08379: (1, "ConsStringMap"),
-  0x083a1: (5, "ConsAsciiStringMap"),
-  0x083c9: (3, "SlicedStringMap"),
-  0x083f1: (7, "SlicedAsciiStringMap"),
-  0x08419: (2, "ExternalStringMap"),
-  0x08441: (10, "ExternalStringWithAsciiDataMap"),
-  0x08469: (6, "ExternalAsciiStringMap"),
-  0x08491: (18, "ShortExternalStringMap"),
-  0x084b9: (26, "ShortExternalStringWithAsciiDataMap"),
-  0x084e1: (22, "ShortExternalAsciiStringMap"),
-  0x08509: (0, "UndetectableStringMap"),
-  0x08531: (4, "UndetectableAsciiStringMap"),
-  0x08559: (145, "FixedDoubleArrayMap"),
-  0x08581: (134, "ByteArrayMap"),
-  0x085a9: (135, "FreeSpaceMap"),
-  0x085d1: (144, "ExternalPixelArrayMap"),
-  0x085f9: (136, "ExternalByteArrayMap"),
-  0x08621: (137, "ExternalUnsignedByteArrayMap"),
-  0x08649: (138, "ExternalShortArrayMap"),
-  0x08671: (139, "ExternalUnsignedShortArrayMap"),
-  0x08699: (140, "ExternalIntArrayMap"),
-  0x086c1: (141, "ExternalUnsignedIntArrayMap"),
-  0x086e9: (142, "ExternalFloatArrayMap"),
-  0x08711: (166, "NonStrictArgumentsElementsMap"),
-  0x08739: (143, "ExternalDoubleArrayMap"),
-  0x08761: (129, "CodeMap"),
-  0x08789: (131, "GlobalPropertyCellMap"),
-  0x087b1: (146, "OnePointerFillerMap"),
-  0x087d9: (146, "TwoPointerFillerMap"),
-  0x08801: (147, "DeclaredAccessorDescriptorMap"),
-  0x08829: (148, "DeclaredAccessorInfoMap"),
-  0x08851: (149, "ExecutableAccessorInfoMap"),
-  0x08879: (150, "AccessorPairMap"),
-  0x088a1: (151, "AccessCheckInfoMap"),
-  0x088c9: (152, "InterceptorInfoMap"),
-  0x088f1: (153, "CallHandlerInfoMap"),
-  0x08919: (154, "FunctionTemplateInfoMap"),
-  0x08941: (155, "ObjectTemplateInfoMap"),
-  0x08969: (156, "SignatureInfoMap"),
-  0x08991: (157, "TypeSwitchInfoMap"),
-  0x089b9: (159, "ScriptMap"),
-  0x089e1: (158, "AllocationSiteInfoMap"),
-  0x08a09: (160, "CodeCacheMap"),
-  0x08a31: (161, "PolymorphicCodeCacheMap"),
-  0x08a59: (162, "TypeFeedbackInfoMap"),
-  0x08a81: (163, "AliasedArgumentsEntryMap"),
-  0x08aa9: (164, "DebugInfoMap"),
-  0x08ad1: (165, "BreakPointInfoMap"),
-  0x08af9: (166, "HashTableMap"),
-  0x08b21: (166, "FunctionContextMap"),
-  0x08b49: (166, "CatchContextMap"),
-  0x08b71: (166, "WithContextMap"),
-  0x08b99: (166, "BlockContextMap"),
-  0x08bc1: (166, "ModuleContextMap"),
-  0x08be9: (166, "GlobalContextMap"),
-  0x08c11: (166, "NativeContextMap"),
-  0x08c39: (167, "SharedFunctionInfoMap"),
-  0x08c61: (168, "JSMessageObjectMap"),
-  0x08c89: (173, "ExternalMap"),
-  0x08cb1: (173, "NeanderMap"),
-  0x08cd9: (173, ""),
+  0x08171: (135, "FreeSpaceMap"),
+  0x08199: (146, "OnePointerFillerMap"),
+  0x081c1: (146, "TwoPointerFillerMap"),
+  0x081e9: (131, "GlobalPropertyCellMap"),
+  0x08211: (167, "SharedFunctionInfoMap"),
+  0x08239: (4, "AsciiStringMap"),
+  0x08261: (166, "NativeContextMap"),
+  0x08289: (129, "CodeMap"),
+  0x082b1: (166, "ScopeInfoMap"),
+  0x082d9: (166, "FixedCOWArrayMap"),
+  0x08301: (145, "FixedDoubleArrayMap"),
+  0x08329: (166, "HashTableMap"),
+  0x08351: (0, "StringMap"),
+  0x08379: (64, "SymbolMap"),
+  0x083a1: (1, "ConsStringMap"),
+  0x083c9: (5, "ConsAsciiStringMap"),
+  0x083f1: (3, "SlicedStringMap"),
+  0x08419: (7, "SlicedAsciiStringMap"),
+  0x08441: (65, "ConsSymbolMap"),
+  0x08469: (69, "ConsAsciiSymbolMap"),
+  0x08491: (66, "ExternalSymbolMap"),
+  0x084b9: (74, "ExternalSymbolWithAsciiDataMap"),
+  0x084e1: (70, "ExternalAsciiSymbolMap"),
+  0x08509: (2, "ExternalStringMap"),
+  0x08531: (10, "ExternalStringWithAsciiDataMap"),
+  0x08559: (6, "ExternalAsciiStringMap"),
+  0x08581: (82, "ShortExternalSymbolMap"),
+  0x085a9: (90, "ShortExternalSymbolWithAsciiDataMap"),
+  0x085d1: (86, "ShortExternalAsciiSymbolMap"),
+  0x085f9: (18, "ShortExternalStringMap"),
+  0x08621: (26, "ShortExternalStringWithAsciiDataMap"),
+  0x08649: (22, "ShortExternalAsciiStringMap"),
+  0x08671: (0, "UndetectableStringMap"),
+  0x08699: (4, "UndetectableAsciiStringMap"),
+  0x086c1: (144, "ExternalPixelArrayMap"),
+  0x086e9: (136, "ExternalByteArrayMap"),
+  0x08711: (137, "ExternalUnsignedByteArrayMap"),
+  0x08739: (138, "ExternalShortArrayMap"),
+  0x08761: (139, "ExternalUnsignedShortArrayMap"),
+  0x08789: (140, "ExternalIntArrayMap"),
+  0x087b1: (141, "ExternalUnsignedIntArrayMap"),
+  0x087d9: (142, "ExternalFloatArrayMap"),
+  0x08801: (143, "ExternalDoubleArrayMap"),
+  0x08829: (166, "NonStrictArgumentsElementsMap"),
+  0x08851: (166, "FunctionContextMap"),
+  0x08879: (166, "CatchContextMap"),
+  0x088a1: (166, "WithContextMap"),
+  0x088c9: (166, "BlockContextMap"),
+  0x088f1: (166, "ModuleContextMap"),
+  0x08919: (166, "GlobalContextMap"),
+  0x08941: (168, "JSMessageObjectMap"),
+  0x08969: (133, "ForeignMap"),
+  0x08991: (173, "NeanderMap"),
+  0x089b9: (158, "AllocationSiteInfoMap"),
+  0x089e1: (161, "PolymorphicCodeCacheMap"),
+  0x08a09: (159, "ScriptMap"),
+  0x08a31: (173, ""),
+  0x08a59: (173, "ExternalMap"),
+  0x08a81: (147, "DeclaredAccessorDescriptorMap"),
+  0x08aa9: (148, "DeclaredAccessorInfoMap"),
+  0x08ad1: (149, "ExecutableAccessorInfoMap"),
+  0x08af9: (150, "AccessorPairMap"),
+  0x08b21: (151, "AccessCheckInfoMap"),
+  0x08b49: (152, "InterceptorInfoMap"),
+  0x08b71: (153, "CallHandlerInfoMap"),
+  0x08b99: (154, "FunctionTemplateInfoMap"),
+  0x08bc1: (155, "ObjectTemplateInfoMap"),
+  0x08be9: (156, "SignatureInfoMap"),
+  0x08c11: (157, "TypeSwitchInfoMap"),
+  0x08c39: (160, "CodeCacheMap"),
+  0x08c61: (162, "TypeFeedbackInfoMap"),
+  0x08c89: (163, "AliasedArgumentsEntryMap"),
+  0x08cb1: (164, "DebugInfoMap"),
+  0x08cd9: (165, "BreakPointInfoMap"),
 }
 
 
@@ -1021,7 +1021,7 @@ KNOWN_MAPS = {
 #
 # #define ROOT_LIST_CASE(type, name, camel_name) \
 #   if (o == heap_.name()) n = #camel_name;
-# OldSpaces spit;
+# OldSpaces spit(heap());
 # printf("KNOWN_OBJECTS = {\n");
 # for (PagedSpace* s = spit.next(); s != NULL; s = spit.next()) {
 #   HeapObjectIterator it(s);
@@ -1038,27 +1038,36 @@ KNOWN_MAPS = {
 # printf("}\n");
 KNOWN_OBJECTS = {
   ("OLD_POINTER_SPACE", 0x08081): "NullValue",
-  ("OLD_POINTER_SPACE", 0x08091): "LastScriptId",
-  ("OLD_POINTER_SPACE", 0x080a1): "TrueValue",
-  ("OLD_POINTER_SPACE", 0x080b1): "FalseValue",
-  ("OLD_POINTER_SPACE", 0x080c1): "TheHoleValue",
-  ("OLD_POINTER_SPACE", 0x080d1): "ArgumentsMarker",
-  ("OLD_POINTER_SPACE", 0x080e1): "NoInterceptorResultSentinel",
-  ("OLD_POINTER_SPACE", 0x080f1): "TerminationException",
-  ("OLD_POINTER_SPACE", 0x08101): "PolymorphicCodeCache",
-  ("OLD_POINTER_SPACE", 0x08121): "NumberStringCache",
-  ("OLD_POINTER_SPACE", 0x08929): "SingleCharacterStringCache",
-  ("OLD_POINTER_SPACE", 0x08b31): "StringSplitCache",
-  ("OLD_POINTER_SPACE", 0x08f39): "RegExpMultipleCache",
-  ("OLD_DATA_SPACE", 0x08081): "EmptyFixedArray",
-  ("OLD_DATA_SPACE", 0x08089): "EmptyDescriptorArray",
-  ("OLD_DATA_SPACE", 0x08091): "EmptyByteArray",
-  ("OLD_DATA_SPACE", 0x08099): "MinusZeroValue",
-  ("OLD_DATA_SPACE", 0x080a5): "NanValue",
-  ("OLD_DATA_SPACE", 0x080b1): "InfinityValue",
-  ("OLD_DATA_SPACE", 0x08185): "EmptyString",
-  ("CODE_SPACE", 0x0a001): "JsEntryCode",
-  ("CODE_SPACE", 0x0a0e1): "JsConstructEntryCode",
+  ("OLD_POINTER_SPACE", 0x08091): "UndefinedValue",
+  ("OLD_POINTER_SPACE", 0x080a1): "InstanceofCacheMap",
+  ("OLD_POINTER_SPACE", 0x080b1): "TrueValue",
+  ("OLD_POINTER_SPACE", 0x080c1): "FalseValue",
+  ("OLD_POINTER_SPACE", 0x080d1): "NoInterceptorResultSentinel",
+  ("OLD_POINTER_SPACE", 0x080e1): "ArgumentsMarker",
+  ("OLD_POINTER_SPACE", 0x080f1): "NumberStringCache",
+  ("OLD_POINTER_SPACE", 0x088f9): "SingleCharacterStringCache",
+  ("OLD_POINTER_SPACE", 0x08b01): "StringSplitCache",
+  ("OLD_POINTER_SPACE", 0x08f09): "RegExpMultipleCache",
+  ("OLD_POINTER_SPACE", 0x09311): "TerminationException",
+  ("OLD_POINTER_SPACE", 0x09321): "MessageListeners",
+  ("OLD_POINTER_SPACE", 0x0933d): "CodeStubs",
+  ("OLD_POINTER_SPACE", 0x09fa5): "NonMonomorphicCache",
+  ("OLD_POINTER_SPACE", 0x0a5b9): "PolymorphicCodeCache",
+  ("OLD_POINTER_SPACE", 0x0a5c1): "NativesSourceCache",
+  ("OLD_POINTER_SPACE", 0x0a601): "EmptyScript",
+  ("OLD_POINTER_SPACE", 0x0a63d): "IntrinsicFunctionNames",
+  ("OLD_POINTER_SPACE", 0x0d659): "ObservationState",
+  ("OLD_POINTER_SPACE", 0x27415): "SymbolTable",
+  ("OLD_DATA_SPACE", 0x08099): "EmptyDescriptorArray",
+  ("OLD_DATA_SPACE", 0x080a1): "EmptyFixedArray",
+  ("OLD_DATA_SPACE", 0x080a9): "NanValue",
+  ("OLD_DATA_SPACE", 0x08125): "EmptyByteArray",
+  ("OLD_DATA_SPACE", 0x0812d): "EmptyString",
+  ("OLD_DATA_SPACE", 0x08259): "InfinityValue",
+  ("OLD_DATA_SPACE", 0x08265): "MinusZeroValue",
+  ("OLD_DATA_SPACE", 0x08271): "PrototypeAccessors",
+  ("CODE_SPACE", 0x0aea1): "JsEntryCode",
+  ("CODE_SPACE", 0x0b5c1): "JsConstructEntryCode",
 }