summaryrefslogtreecommitdiffstats
path: root/tools/memory_inspector
diff options
context:
space:
mode:
authorprimiano <primiano@chromium.org>2014-10-06 09:30:48 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 16:31:05 +0000
commitd0334794c2223b7cf53322de86ee046d2e523c3b (patch)
tree08ceada1034dddf2fb723145b48f3f4ef0cd80e3 /tools/memory_inspector
parente4f1c4e088cca7af5caeb41b3312831ae39e7abd (diff)
downloadchromium_src-d0334794c2223b7cf53322de86ee046d2e523c3b.zip
chromium_src-d0334794c2223b7cf53322de86ee046d2e523c3b.tar.gz
chromium_src-d0334794c2223b7cf53322de86ee046d2e523c3b.tar.bz2
[Android] memory_inspector: Fix an integer parsing bug on 64-bit.
Fix the memory_map module to deal properly with 64-bit address spaces. BUG=340294 NOTRY=true TBR=primiano@chromium.org Review URL: https://codereview.chromium.org/628253002 Cr-Commit-Position: refs/heads/master@{#298246}
Diffstat (limited to 'tools/memory_inspector')
-rw-r--r--tools/memory_inspector/memory_inspector/core/memory_map.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/memory_inspector/memory_inspector/core/memory_map.py b/tools/memory_inspector/memory_inspector/core/memory_map.py
index fe71608..1c27fbb 100644
--- a/tools/memory_inspector/memory_inspector/core/memory_map.py
+++ b/tools/memory_inspector/memory_inspector/core/memory_map.py
@@ -94,9 +94,9 @@ class MapEntry(object):
def __cmp__(self, other):
"""Comparison operator required for bisect."""
if isinstance(other, MapEntry):
- return self.start - other.start
+ return self.start.__cmp__(other.start)
elif isinstance(other, (long, int)):
- return self.start - other
+ return self.start.__cmp__(other)
else:
raise Exception('Cannot compare with %s' % other.__class__)