OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e5a2d7
)
Revert "When aliasing a bitmap, use smallest available limit."
author
Carl Shapiro
<cshapiro@google.com>
Mon, 19 Jul 2010 22:55:01 +0000
(15:55 -0700)
committer
Carl Shapiro
<cshapiro@google.com>
Mon, 19 Jul 2010 22:55:01 +0000
(15:55 -0700)
This did not correctly compute the intended limit.
This reverts commit
740cd296284e682d9d92bd638d266efccf817bbe
.
vm/alloc/HeapSource.c
patch
|
blob
|
history
diff --git
a/vm/alloc/HeapSource.c
b/vm/alloc/HeapSource.c
index
8cf4b44
..
418945c
100644
(file)
--- a/
vm/alloc/HeapSource.c
+++ b/
vm/alloc/HeapSource.c
@@
-711,10
+711,9
@@
void dvmHeapSourceGetObjectBitmaps(HeapBitmap liveBits[], HeapBitmap markBits[],
HS_BOILERPLATE();
assert(numHeaps == hs->numHeaps);
- assert(hs->liveBits.max >= hs->markBits.max);
for (i = 0; i < hs->numHeaps; ++i) {
base = (uintptr_t)hs->heaps[i].base;
- max =
MIN((uintptr_t)hs->heaps[i].limit - 1, hs->liveBits.max)
;
+ max =
(uintptr_t)hs->heaps[i].limit - 1
;
aliasBitmap(&liveBits[i], &hs->liveBits, base, max);
aliasBitmap(&markBits[i], &hs->markBits, base, max);
}