commit 0872891a11bd1d74dbff1a85316fc4fb1029ecb3
author Carl Shapiro <cshapiro@google.com> Tue Mar 08 14:44:47 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 14:44:47 2011 -0800
tree 4cf74bb6bbcfa4bb8a6bc8924f0537ec1bad7571
parent e0af989d8b6439e21eb9fbc18a87e50e9fa76245
parent 20d4d0423325f593302f1bdc50cfc66721a18cb6

Merge "Compute a length based on heap size instead of card table size." into dalvik-dev

vm/alloc/CardTable.c

diff --git a/vm/alloc/CardTable.c b/vm/alloc/CardTable.c
index bbbb4ad..2de586e 100644
--- a/vm/alloc/CardTable.c
+++ b/vm/alloc/CardTable.c
@@ -179,8 +179,8 @@
             moveCardsToModUnion((u1*)base[i], (u1*)limit[i]);
         } else {
             u1 *baseCard = dvmCardFromAddr((u1*)base[i]);
-            u1 *limitCard = dvmCardFromAddr((u1*)limit[i]);
-            memset(baseCard, GC_CARD_CLEAN, limitCard - baseCard);
+            size_t length = (limit[i] - base[i]) >> GC_CARD_SHIFT;
+            memset(baseCard, GC_CARD_CLEAN, length);
         }
     }
 }