Index: tools/grokdump.py |
diff --git a/tools/grokdump.py b/tools/grokdump.py |
index 468e7cc6b799ff5ffa69e125f01529155b19128e..6bc49c68a83dc4fc7fc4d56f4218bf608e224a05 100755 |
--- a/tools/grokdump.py |
+++ b/tools/grokdump.py |
@@ -345,7 +345,7 @@ class MinidumpReader(object): |
for r in self.memory_list64.ranges: |
if r.start <= address < r.start + r.size: |
return self.memory_list64.base_rva + offset + address - r.start |
- offset += r.size |
+ offset += r.size |
if self.memory_list is not None: |
for r in self.memory_list.ranges: |
if r.start <= address < r.start + r.memory.data_size: |
@@ -379,64 +379,65 @@ class MinidumpReader(object): |
# }; |
# static P p; |
INSTANCE_TYPES = { |
-64: "SYMBOL_TYPE", |
-68: "ASCII_SYMBOL_TYPE", |
-65: "CONS_SYMBOL_TYPE", |
-69: "CONS_ASCII_SYMBOL_TYPE", |
-66: "EXTERNAL_SYMBOL_TYPE", |
-74: "EXTERNAL_SYMBOL_WITH_ASCII_DATA_TYPE", |
-70: "EXTERNAL_ASCII_SYMBOL_TYPE", |
-0: "STRING_TYPE", |
-4: "ASCII_STRING_TYPE", |
-1: "CONS_STRING_TYPE", |
-5: "CONS_ASCII_STRING_TYPE", |
-2: "EXTERNAL_STRING_TYPE", |
-10: "EXTERNAL_STRING_WITH_ASCII_DATA_TYPE", |
-6: "EXTERNAL_ASCII_STRING_TYPE", |
-6: "PRIVATE_EXTERNAL_ASCII_STRING_TYPE", |
-128: "MAP_TYPE", |
-129: "CODE_TYPE", |
-130: "ODDBALL_TYPE", |
-131: "JS_GLOBAL_PROPERTY_CELL_TYPE", |
-132: "HEAP_NUMBER_TYPE", |
-133: "FOREIGN_TYPE", |
-134: "BYTE_ARRAY_TYPE", |
-135: "EXTERNAL_BYTE_ARRAY_TYPE", |
-136: "EXTERNAL_UNSIGNED_BYTE_ARRAY_TYPE", |
-137: "EXTERNAL_SHORT_ARRAY_TYPE", |
-138: "EXTERNAL_UNSIGNED_SHORT_ARRAY_TYPE", |
-139: "EXTERNAL_INT_ARRAY_TYPE", |
-140: "EXTERNAL_UNSIGNED_INT_ARRAY_TYPE", |
-141: "EXTERNAL_FLOAT_ARRAY_TYPE", |
-143: "EXTERNAL_PIXEL_ARRAY_TYPE", |
-145: "FILLER_TYPE", |
-146: "ACCESSOR_INFO_TYPE", |
-147: "ACCESS_CHECK_INFO_TYPE", |
-148: "INTERCEPTOR_INFO_TYPE", |
-149: "CALL_HANDLER_INFO_TYPE", |
-150: "FUNCTION_TEMPLATE_INFO_TYPE", |
-151: "OBJECT_TEMPLATE_INFO_TYPE", |
-152: "SIGNATURE_INFO_TYPE", |
-153: "TYPE_SWITCH_INFO_TYPE", |
-154: "SCRIPT_TYPE", |
-155: "CODE_CACHE_TYPE", |
-156: "POLYMORPHIC_CODE_CACHE_TYPE", |
-159: "FIXED_ARRAY_TYPE", |
-160: "SHARED_FUNCTION_INFO_TYPE", |
-161: "JS_MESSAGE_OBJECT_TYPE", |
-162: "JS_VALUE_TYPE", |
-163: "JS_OBJECT_TYPE", |
-164: "JS_CONTEXT_EXTENSION_OBJECT_TYPE", |
-165: "JS_GLOBAL_OBJECT_TYPE", |
-166: "JS_BUILTINS_OBJECT_TYPE", |
-167: "JS_GLOBAL_PROXY_TYPE", |
-168: "JS_ARRAY_TYPE", |
-169: "JS_PROXY_TYPE", |
-170: "JS_REGEXP_TYPE", |
-171: "JS_FUNCTION_TYPE", |
-172: "JS_FUNCTION_PROXY_TYPE", |
-157: "DEBUG_INFO_TYPE", |
-158: "BREAK_POINT_INFO_TYPE", |
+ 64: "SYMBOL_TYPE", |
+ 68: "ASCII_SYMBOL_TYPE", |
+ 65: "CONS_SYMBOL_TYPE", |
+ 69: "CONS_ASCII_SYMBOL_TYPE", |
+ 66: "EXTERNAL_SYMBOL_TYPE", |
+ 74: "EXTERNAL_SYMBOL_WITH_ASCII_DATA_TYPE", |
+ 70: "EXTERNAL_ASCII_SYMBOL_TYPE", |
+ 0: "STRING_TYPE", |
+ 4: "ASCII_STRING_TYPE", |
+ 1: "CONS_STRING_TYPE", |
+ 5: "CONS_ASCII_STRING_TYPE", |
+ 2: "EXTERNAL_STRING_TYPE", |
+ 10: "EXTERNAL_STRING_WITH_ASCII_DATA_TYPE", |
+ 6: "EXTERNAL_ASCII_STRING_TYPE", |
+ 6: "PRIVATE_EXTERNAL_ASCII_STRING_TYPE", |
+ 128: "MAP_TYPE", |
+ 129: "CODE_TYPE", |
+ 130: "ODDBALL_TYPE", |
+ 131: "JS_GLOBAL_PROPERTY_CELL_TYPE", |
+ 132: "HEAP_NUMBER_TYPE", |
+ 133: "FOREIGN_TYPE", |
+ 134: "BYTE_ARRAY_TYPE", |
+ 135: "EXTERNAL_BYTE_ARRAY_TYPE", |
+ 136: "EXTERNAL_UNSIGNED_BYTE_ARRAY_TYPE", |
+ 137: "EXTERNAL_SHORT_ARRAY_TYPE", |
+ 138: "EXTERNAL_UNSIGNED_SHORT_ARRAY_TYPE", |
+ 139: "EXTERNAL_INT_ARRAY_TYPE", |
+ 140: "EXTERNAL_UNSIGNED_INT_ARRAY_TYPE", |
+ 141: "EXTERNAL_FLOAT_ARRAY_TYPE", |
+ 143: "EXTERNAL_PIXEL_ARRAY_TYPE", |
+ 145: "FILLER_TYPE", |
+ 146: "ACCESSOR_INFO_TYPE", |
+ 147: "ACCESS_CHECK_INFO_TYPE", |
+ 148: "INTERCEPTOR_INFO_TYPE", |
+ 149: "CALL_HANDLER_INFO_TYPE", |
+ 150: "FUNCTION_TEMPLATE_INFO_TYPE", |
+ 151: "OBJECT_TEMPLATE_INFO_TYPE", |
+ 152: "SIGNATURE_INFO_TYPE", |
+ 153: "TYPE_SWITCH_INFO_TYPE", |
+ 154: "SCRIPT_TYPE", |
+ 155: "CODE_CACHE_TYPE", |
+ 156: "POLYMORPHIC_CODE_CACHE_TYPE", |
+ 159: "FIXED_ARRAY_TYPE", |
+ 160: "SHARED_FUNCTION_INFO_TYPE", |
+ 161: "JS_MESSAGE_OBJECT_TYPE", |
+ 162: "JS_VALUE_TYPE", |
+ 163: "JS_OBJECT_TYPE", |
+ 164: "JS_CONTEXT_EXTENSION_OBJECT_TYPE", |
+ 165: "JS_GLOBAL_OBJECT_TYPE", |
+ 166: "JS_BUILTINS_OBJECT_TYPE", |
+ 167: "JS_GLOBAL_PROXY_TYPE", |
+ 168: "JS_ARRAY_TYPE", |
+ 169: "JS_PROXY_TYPE", |
+ 170: "JS_WEAK_MAP_TYPE", |
+ 171: "JS_REGEXP_TYPE", |
+ 172: "JS_FUNCTION_TYPE", |
+ 173: "JS_FUNCTION_PROXY_TYPE", |
+ 157: "DEBUG_INFO_TYPE", |
+ 158: "BREAK_POINT_INFO_TYPE", |
} |