Revert "Merge old data and pointer space."

tools/v8heapconst.py

Index: tools/v8heapconst.py
diff --git a/tools/v8heapconst.py b/tools/v8heapconst.py
index 0527cc8e5801bdbe108e24ecfc8bd06c2e56e5d8..7a693937055dc2cc2d209079d2ddd391895eacd5 100644
--- a/tools/v8heapconst.py
+++ b/tools/v8heapconst.py
@@ -135,160 +135,159 @@ INSTANCE_TYPES = {
 # List of known V8 maps.
 KNOWN_MAPS = {
   0x08081: (137, "ByteArrayMap"),
-  0x080ad: (129, "MetaMap"),
-  0x080d9: (131, "NullMap"),
-  0x08105: (180, "FixedArrayMap"),
-  0x08131: (4, "OneByteInternalizedStringMap"),
-  0x0815d: (183, "WeakCellMap"),
-  0x08189: (131, "UndefinedMap"),
-  0x081b5: (134, "HeapNumberMap"),
-  0x081e1: (138, "FreeSpaceMap"),
-  0x0820d: (158, "OnePointerFillerMap"),
-  0x08239: (158, "TwoPointerFillerMap"),
-  0x08265: (131, "TheHoleMap"),
-  0x08291: (131, "BooleanMap"),
-  0x082bd: (131, "UninitializedMap"),
-  0x082e9: (131, "ExceptionMap"),
-  0x08315: (132, "CellMap"),
-  0x08341: (133, "GlobalPropertyCellMap"),
-  0x0836d: (182, "SharedFunctionInfoMap"),
-  0x08399: (135, "MutableHeapNumberMap"),
-  0x083c5: (180, "NativeContextMap"),
-  0x083f1: (130, "CodeMap"),
-  0x0841d: (180, "ScopeInfoMap"),
-  0x08449: (180, "FixedCOWArrayMap"),
-  0x08475: (157, "FixedDoubleArrayMap"),
-  0x084a1: (181, "ConstantPoolArrayMap"),
-  0x084cd: (131, "NoInterceptorResultSentinelMap"),
-  0x084f9: (180, "HashTableMap"),
-  0x08525: (180, "OrderedHashTableMap"),
-  0x08551: (131, "ArgumentsMarkerMap"),
-  0x0857d: (131, "TerminationExceptionMap"),
-  0x085a9: (128, "SymbolMap"),
-  0x085d5: (64, "StringMap"),
-  0x08601: (68, "OneByteStringMap"),
-  0x0862d: (65, "ConsStringMap"),
-  0x08659: (69, "ConsOneByteStringMap"),
-  0x08685: (67, "SlicedStringMap"),
-  0x086b1: (71, "SlicedOneByteStringMap"),
-  0x086dd: (66, "ExternalStringMap"),
-  0x08709: (74, "ExternalStringWithOneByteDataMap"),
-  0x08735: (70, "ExternalOneByteStringMap"),
-  0x08761: (70, "NativeSourceStringMap"),
-  0x0878d: (82, "ShortExternalStringMap"),
-  0x087b9: (90, "ShortExternalStringWithOneByteDataMap"),
-  0x087e5: (0, "InternalizedStringMap"),
-  0x08811: (2, "ExternalInternalizedStringMap"),
-  0x0883d: (10, "ExternalInternalizedStringWithOneByteDataMap"),
-  0x08869: (6, "ExternalOneByteInternalizedStringMap"),
-  0x08895: (18, "ShortExternalInternalizedStringMap"),
-  0x088c1: (26, "ShortExternalInternalizedStringWithOneByteDataMap"),
-  0x088ed: (22, "ShortExternalOneByteInternalizedStringMap"),
-  0x08919: (86, "ShortExternalOneByteStringMap"),
-  0x08945: (139, "ExternalInt8ArrayMap"),
-  0x08971: (140, "ExternalUint8ArrayMap"),
-  0x0899d: (141, "ExternalInt16ArrayMap"),
-  0x089c9: (142, "ExternalUint16ArrayMap"),
-  0x089f5: (143, "ExternalInt32ArrayMap"),
-  0x08a21: (144, "ExternalUint32ArrayMap"),
-  0x08a4d: (145, "ExternalFloat32ArrayMap"),
-  0x08a79: (146, "ExternalFloat64ArrayMap"),
-  0x08aa5: (147, "ExternalUint8ClampedArrayMap"),
-  0x08ad1: (149, "FixedUint8ArrayMap"),
-  0x08afd: (148, "FixedInt8ArrayMap"),
-  0x08b29: (151, "FixedUint16ArrayMap"),
-  0x08b55: (150, "FixedInt16ArrayMap"),
-  0x08b81: (153, "FixedUint32ArrayMap"),
-  0x08bad: (152, "FixedInt32ArrayMap"),
-  0x08bd9: (154, "FixedFloat32ArrayMap"),
-  0x08c05: (155, "FixedFloat64ArrayMap"),
-  0x08c31: (156, "FixedUint8ClampedArrayMap"),
-  0x08c5d: (180, "SloppyArgumentsElementsMap"),
-  0x08c89: (180, "FunctionContextMap"),
-  0x08cb5: (180, "CatchContextMap"),
-  0x08ce1: (180, "WithContextMap"),
-  0x08d0d: (180, "BlockContextMap"),
-  0x08d39: (180, "ModuleContextMap"),
-  0x08d65: (180, "ScriptContextMap"),
-  0x08d91: (180, "ScriptContextTableMap"),
-  0x08dbd: (187, "JSMessageObjectMap"),
-  0x08de9: (136, "ForeignMap"),
-  0x08e15: (189, "NeanderMap"),
-  0x08e41: (189, "ExternalMap"),
-  0x08e6d: (170, "AllocationSiteMap"),
-  0x08e99: (171, "AllocationMementoMap"),
-  0x08ec5: (174, "PolymorphicCodeCacheMap"),
-  0x08ef1: (172, "ScriptMap"),
-  0x0907d: (177, "BoxMap"),
-  0x090a9: (161, "ExecutableAccessorInfoMap"),
-  0x090d5: (162, "AccessorPairMap"),
-  0x09101: (163, "AccessCheckInfoMap"),
-  0x0912d: (164, "InterceptorInfoMap"),
-  0x09159: (165, "CallHandlerInfoMap"),
-  0x09185: (166, "FunctionTemplateInfoMap"),
-  0x091b1: (167, "ObjectTemplateInfoMap"),
-  0x091dd: (169, "TypeSwitchInfoMap"),
-  0x09209: (173, "CodeCacheMap"),
-  0x09235: (175, "TypeFeedbackInfoMap"),
-  0x09261: (176, "AliasedArgumentsEntryMap"),
-  0x0928d: (178, "DebugInfoMap"),
-  0x092b9: (179, "BreakPointInfoMap"),
+  0x080a9: (129, "MetaMap"),
+  0x080d1: (131, "NullMap"),
+  0x080f9: (131, "UndefinedMap"),
+  0x08121: (180, "FixedArrayMap"),
+  0x08149: (4, "OneByteInternalizedStringMap"),
+  0x08171: (134, "HeapNumberMap"),
+  0x08199: (138, "FreeSpaceMap"),
+  0x081c1: (158, "OnePointerFillerMap"),
+  0x081e9: (158, "TwoPointerFillerMap"),
+  0x08211: (131, "TheHoleMap"),
+  0x08239: (131, "BooleanMap"),
+  0x08261: (131, "UninitializedMap"),
+  0x08289: (131, "ExceptionMap"),
+  0x082b1: (132, "CellMap"),
+  0x082d9: (133, "GlobalPropertyCellMap"),
+  0x08301: (182, "SharedFunctionInfoMap"),
+  0x08329: (135, "MutableHeapNumberMap"),
+  0x08351: (180, "NativeContextMap"),
+  0x08379: (130, "CodeMap"),
+  0x083a1: (180, "ScopeInfoMap"),
+  0x083c9: (180, "FixedCOWArrayMap"),
+  0x083f1: (157, "FixedDoubleArrayMap"),
+  0x08419: (181, "ConstantPoolArrayMap"),
+  0x08441: (183, "WeakCellMap"),
+  0x08469: (131, "NoInterceptorResultSentinelMap"),
+  0x08491: (180, "HashTableMap"),
+  0x084b9: (180, "OrderedHashTableMap"),
+  0x084e1: (131, "ArgumentsMarkerMap"),
+  0x08509: (131, "TerminationExceptionMap"),
+  0x08531: (128, "SymbolMap"),
+  0x08559: (64, "StringMap"),
+  0x08581: (68, "OneByteStringMap"),
+  0x085a9: (65, "ConsStringMap"),
+  0x085d1: (69, "ConsOneByteStringMap"),
+  0x085f9: (67, "SlicedStringMap"),
+  0x08621: (71, "SlicedOneByteStringMap"),
+  0x08649: (66, "ExternalStringMap"),
+  0x08671: (74, "ExternalStringWithOneByteDataMap"),
+  0x08699: (70, "ExternalOneByteStringMap"),
+  0x086c1: (70, "NativeSourceStringMap"),
+  0x086e9: (82, "ShortExternalStringMap"),
+  0x08711: (90, "ShortExternalStringWithOneByteDataMap"),
+  0x08739: (0, "InternalizedStringMap"),
+  0x08761: (2, "ExternalInternalizedStringMap"),
+  0x08789: (10, "ExternalInternalizedStringWithOneByteDataMap"),
+  0x087b1: (6, "ExternalOneByteInternalizedStringMap"),
+  0x087d9: (18, "ShortExternalInternalizedStringMap"),
+  0x08801: (26, "ShortExternalInternalizedStringWithOneByteDataMap"),
+  0x08829: (22, "ShortExternalOneByteInternalizedStringMap"),
+  0x08851: (86, "ShortExternalOneByteStringMap"),
+  0x08879: (139, "ExternalInt8ArrayMap"),
+  0x088a1: (140, "ExternalUint8ArrayMap"),
+  0x088c9: (141, "ExternalInt16ArrayMap"),
+  0x088f1: (142, "ExternalUint16ArrayMap"),
+  0x08919: (143, "ExternalInt32ArrayMap"),
+  0x08941: (144, "ExternalUint32ArrayMap"),
+  0x08969: (145, "ExternalFloat32ArrayMap"),
+  0x08991: (146, "ExternalFloat64ArrayMap"),
+  0x089b9: (147, "ExternalUint8ClampedArrayMap"),
+  0x089e1: (149, "FixedUint8ArrayMap"),
+  0x08a09: (148, "FixedInt8ArrayMap"),
+  0x08a31: (151, "FixedUint16ArrayMap"),
+  0x08a59: (150, "FixedInt16ArrayMap"),
+  0x08a81: (153, "FixedUint32ArrayMap"),
+  0x08aa9: (152, "FixedInt32ArrayMap"),
+  0x08ad1: (154, "FixedFloat32ArrayMap"),
+  0x08af9: (155, "FixedFloat64ArrayMap"),
+  0x08b21: (156, "FixedUint8ClampedArrayMap"),
+  0x08b49: (180, "SloppyArgumentsElementsMap"),
+  0x08b71: (180, "FunctionContextMap"),
+  0x08b99: (180, "CatchContextMap"),
+  0x08bc1: (180, "WithContextMap"),
+  0x08be9: (180, "BlockContextMap"),
+  0x08c11: (180, "ModuleContextMap"),
+  0x08c39: (180, "ScriptContextMap"),
+  0x08c61: (180, "ScriptContextTableMap"),
+  0x08c89: (187, "JSMessageObjectMap"),
+  0x08cb1: (136, "ForeignMap"),
+  0x08cd9: (189, "NeanderMap"),
+  0x08d01: (170, "AllocationSiteMap"),
+  0x08d29: (171, "AllocationMementoMap"),
+  0x08d51: (174, "PolymorphicCodeCacheMap"),
+  0x08d79: (172, "ScriptMap"),
+  0x08dc9: (189, "ExternalMap"),
+  0x08f09: (177, "BoxMap"),
+  0x08f31: (161, "ExecutableAccessorInfoMap"),
+  0x08f59: (162, "AccessorPairMap"),
+  0x08f81: (163, "AccessCheckInfoMap"),
+  0x08fa9: (164, "InterceptorInfoMap"),
+  0x08fd1: (165, "CallHandlerInfoMap"),
+  0x08ff9: (166, "FunctionTemplateInfoMap"),
+  0x09021: (167, "ObjectTemplateInfoMap"),
+  0x09049: (169, "TypeSwitchInfoMap"),
+  0x09071: (173, "CodeCacheMap"),
+  0x09099: (175, "TypeFeedbackInfoMap"),
+  0x090c1: (176, "AliasedArgumentsEntryMap"),
+  0x090e9: (178, "DebugInfoMap"),
+  0x09111: (179, "BreakPointInfoMap"),
 }
 
 # List of known V8 objects.
 KNOWN_OBJECTS = {
-  ("OLD_SPACE", 0x08081): "NullValue",
-  ("OLD_SPACE", 0x08091): "EmptyDescriptorArray",
-  ("OLD_SPACE", 0x08099): "EmptyFixedArray",
-  ("OLD_SPACE", 0x080bd): "UndefinedValue",
-  ("OLD_SPACE", 0x080e5): "NanValue",
-  ("OLD_SPACE", 0x080f1): "TheHoleValue",
-  ("OLD_SPACE", 0x08111): "TrueValue",
-  ("OLD_SPACE", 0x08131): "FalseValue",
-  ("OLD_SPACE", 0x08155): "UninitializedValue",
-  ("OLD_SPACE", 0x08181): "Exception",
-  ("OLD_SPACE", 0x081a9): "NoInterceptorResultSentinel",
-  ("OLD_SPACE", 0x081e5): "EmptyByteArray",
-  ("OLD_SPACE", 0x081ed): "EmptyConstantPoolArray",
-  ("OLD_SPACE", 0x081fd): "ArgumentsMarker",
-  ("OLD_SPACE", 0x08229): "NumberStringCache",
-  ("OLD_SPACE", 0x08a31): "SingleCharacterStringCache",
-  ("OLD_SPACE", 0x08ec9): "StringSplitCache",
-  ("OLD_SPACE", 0x092d1): "RegExpMultipleCache",
-  ("OLD_SPACE", 0x096d9): "TerminationException",
-  ("OLD_SPACE", 0x0970d): "EmptyExternalInt8Array",
-  ("OLD_SPACE", 0x09719): "EmptyExternalUint8Array",
-  ("OLD_SPACE", 0x09725): "EmptyExternalInt16Array",
-  ("OLD_SPACE", 0x09731): "EmptyExternalUint16Array",
-  ("OLD_SPACE", 0x0973d): "EmptyExternalInt32Array",
-  ("OLD_SPACE", 0x09749): "EmptyExternalUint32Array",
-  ("OLD_SPACE", 0x09755): "EmptyExternalFloat32Array",
-  ("OLD_SPACE", 0x09761): "EmptyExternalFloat64Array",
-  ("OLD_SPACE", 0x0976d): "EmptyExternalUint8ClampedArray",
-  ("OLD_SPACE", 0x09779): "EmptyFixedUint8Array",
-  ("OLD_SPACE", 0x09781): "EmptyFixedInt8Array",
-  ("OLD_SPACE", 0x09789): "EmptyFixedUint16Array",
-  ("OLD_SPACE", 0x09791): "EmptyFixedInt16Array",
-  ("OLD_SPACE", 0x09799): "EmptyFixedUint32Array",
-  ("OLD_SPACE", 0x097a1): "EmptyFixedInt32Array",
-  ("OLD_SPACE", 0x097a9): "EmptyFixedFloat32Array",
-  ("OLD_SPACE", 0x097b1): "EmptyFixedFloat64Array",
-  ("OLD_SPACE", 0x097b9): "EmptyFixedUint8ClampedArray",
-  ("OLD_SPACE", 0x097c1): "InfinityValue",
-  ("OLD_SPACE", 0x097cd): "MinusZeroValue",
-  ("OLD_SPACE", 0x097d9): "MessageListeners",
-  ("OLD_SPACE", 0x097f5): "CodeStubs",
-  ("OLD_SPACE", 0x12c49): "NonMonomorphicCache",
-  ("OLD_SPACE", 0x132bd): "PolymorphicCodeCache",
-  ("OLD_SPACE", 0x132c5): "NativesSourceCache",
-  ("OLD_SPACE", 0x1353d): "EmptyScript",
-  ("OLD_SPACE", 0x13585): "IntrinsicFunctionNames",
-  ("OLD_SPACE", 0x27ae5): "ObservationState",
-  ("OLD_SPACE", 0x27af1): "SymbolRegistry",
-  ("OLD_SPACE", 0x2863d): "EmptySlowElementDictionary",
-  ("OLD_SPACE", 0x287d9): "AllocationSitesScratchpad",
-  ("OLD_SPACE", 0x28be1): "WeakObjectToCodeTable",
-  ("OLD_SPACE", 0x4e9dd): "StringTable",
-  ("CODE_SPACE", 0x15f61): "JsEntryCode",
-  ("CODE_SPACE", 0x24781): "JsConstructEntryCode",
+  ("OLD_POINTER_SPACE", 0x08081): "NullValue",
+  ("OLD_POINTER_SPACE", 0x08091): "UndefinedValue",
+  ("OLD_POINTER_SPACE", 0x080a1): "TheHoleValue",
+  ("OLD_POINTER_SPACE", 0x080b1): "TrueValue",
+  ("OLD_POINTER_SPACE", 0x080c1): "FalseValue",
+  ("OLD_POINTER_SPACE", 0x080d1): "UninitializedValue",
+  ("OLD_POINTER_SPACE", 0x080e1): "Exception",
+  ("OLD_POINTER_SPACE", 0x080f1): "NoInterceptorResultSentinel",
+  ("OLD_POINTER_SPACE", 0x08101): "ArgumentsMarker",
+  ("OLD_POINTER_SPACE", 0x08111): "NumberStringCache",
+  ("OLD_POINTER_SPACE", 0x08919): "SingleCharacterStringCache",
+  ("OLD_POINTER_SPACE", 0x08d21): "StringSplitCache",
+  ("OLD_POINTER_SPACE", 0x09129): "RegExpMultipleCache",
+  ("OLD_POINTER_SPACE", 0x09531): "TerminationException",
+  ("OLD_POINTER_SPACE", 0x09541): "MessageListeners",
+  ("OLD_POINTER_SPACE", 0x0955d): "CodeStubs",
+  ("OLD_POINTER_SPACE", 0x0f555): "NonMonomorphicCache",
+  ("OLD_POINTER_SPACE", 0x0fb69): "PolymorphicCodeCache",
+  ("OLD_POINTER_SPACE", 0x0fb71): "NativesSourceCache",
+  ("OLD_POINTER_SPACE", 0x0fbe1): "EmptyScript",
+  ("OLD_POINTER_SPACE", 0x0fc1d): "IntrinsicFunctionNames",
+  ("OLD_POINTER_SPACE", 0x15c39): "ObservationState",
+  ("OLD_POINTER_SPACE", 0x15c45): "SymbolRegistry",
+  ("OLD_POINTER_SPACE", 0x16601): "EmptySlowElementDictionary",
+  ("OLD_POINTER_SPACE", 0x1679d): "AllocationSitesScratchpad",
+  ("OLD_POINTER_SPACE", 0x43e61): "StringTable",
+  ("OLD_DATA_SPACE", 0x08081): "EmptyDescriptorArray",
+  ("OLD_DATA_SPACE", 0x08089): "EmptyFixedArray",
+  ("OLD_DATA_SPACE", 0x080a9): "NanValue",
+  ("OLD_DATA_SPACE", 0x08159): "EmptyByteArray",
+  ("OLD_DATA_SPACE", 0x08161): "EmptyConstantPoolArray",
+  ("OLD_DATA_SPACE", 0x08241): "EmptyExternalInt8Array",
+  ("OLD_DATA_SPACE", 0x0824d): "EmptyExternalUint8Array",
+  ("OLD_DATA_SPACE", 0x08259): "EmptyExternalInt16Array",
+  ("OLD_DATA_SPACE", 0x08265): "EmptyExternalUint16Array",
+  ("OLD_DATA_SPACE", 0x08271): "EmptyExternalInt32Array",
+  ("OLD_DATA_SPACE", 0x0827d): "EmptyExternalUint32Array",
+  ("OLD_DATA_SPACE", 0x08289): "EmptyExternalFloat32Array",
+  ("OLD_DATA_SPACE", 0x08295): "EmptyExternalFloat64Array",
+  ("OLD_DATA_SPACE", 0x082a1): "EmptyExternalUint8ClampedArray",
+  ("OLD_DATA_SPACE", 0x082ad): "EmptyFixedUint8Array",
+  ("OLD_DATA_SPACE", 0x082b5): "EmptyFixedInt8Array",
+  ("OLD_DATA_SPACE", 0x082bd): "EmptyFixedUint16Array",
+  ("OLD_DATA_SPACE", 0x082c5): "EmptyFixedInt16Array",
+  ("OLD_DATA_SPACE", 0x082cd): "EmptyFixedUint32Array",
+  ("OLD_DATA_SPACE", 0x082d5): "EmptyFixedInt32Array",
+  ("OLD_DATA_SPACE", 0x082dd): "EmptyFixedFloat32Array",
+  ("OLD_DATA_SPACE", 0x082e5): "EmptyFixedFloat64Array",
+  ("OLD_DATA_SPACE", 0x082ed): "EmptyFixedUint8ClampedArray",
+  ("OLD_DATA_SPACE", 0x082f5): "InfinityValue",
+  ("OLD_DATA_SPACE", 0x08301): "MinusZeroValue",
+  ("CODE_SPACE", 0x15fa1): "JsEntryCode",
+  ("CODE_SPACE", 0x243c1): "JsConstructEntryCode",
 }