Index: tools/ll_prof.py |
diff --git a/tools/ll_prof.py b/tools/ll_prof.py |
index 8390d4afe36da73d45140a19e55afcb3e73938f7..2e5c96bc0440a42c3d2a69d18e1fa2bbe54da976 100755 |
--- a/tools/ll_prof.py |
+++ b/tools/ll_prof.py |
@@ -353,7 +353,7 @@ class CodeLogReader(object): |
r"code-info,([^,]+),(\d+)") |
_CODE_CREATE_RE = re.compile( |
- r"code-creation,([^,]+),(0x[a-f0-9]+),(\d+),\"(.*)\"(?:,(\d+))?") |
+ r"code-creation,([^,]+),(0x[a-f0-9]+),(\d+),\"(.*)\"(?:,(0x[a-f0-9]+),([~*])?)?(?:,(\d+))?") |
_CODE_MOVE_RE = re.compile( |
r"code-move,(0x[a-f0-9]+),(0x[a-f0-9]+)") |
@@ -400,12 +400,15 @@ class CodeLogReader(object): |
name = self.address_to_snapshot_name[start_address] |
origin = JS_SNAPSHOT_ORIGIN |
else: |
- name = "%s:%s" % (match.group(1), match.group(4)) |
+ if match.group(6): |
Vitaly Repeshko
2011/02/22 15:11:19
Could you please assign these groups (1, 4, 6) to
mnaganov (inactive)
2011/02/22 16:18:22
Done.
|
+ name = "%s:%s%s" % (match.group(1), match.group(6), match.group(4)) |
+ else: |
+ name = "%s:%s" % (match.group(1), match.group(4)) |
origin = JS_ORIGIN |
if self.is_snapshot: |
origin_offset = 0 |
else: |
- origin_offset = int(match.group(5)) |
+ origin_offset = int(match.group(7)) |
code = Code(name, start_address, end_address, origin, origin_offset) |
conficting_code = self.code_map.Find(start_address) |
if conficting_code: |