From cba7c023f09c1848e12e27cd214f79e379ee1915 Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Thu, 7 May 2009 08:50:22 +0000 Subject: [PATCH] Changed size of pointers stored as numbers to intptr_t in spaces.h. Review URL: http://codereview.chromium.org/115073 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1891 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/spaces.cc | 8 ++++---- src/spaces.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/spaces.cc b/src/spaces.cc index ea40d52..c124af1 100644 --- a/src/spaces.cc +++ b/src/spaces.cc @@ -811,7 +811,7 @@ bool NewSpace::Setup(Address start, int size) { start_ = start; address_mask_ = ~(size - 1); object_mask_ = address_mask_ | kHeapObjectTag; - object_expected_ = reinterpret_cast(start) | kHeapObjectTag; + object_expected_ = reinterpret_cast(start) | kHeapObjectTag; allocation_info_.top = to_space_.low(); allocation_info_.limit = to_space_.high(); @@ -970,7 +970,7 @@ bool SemiSpace::Setup(Address start, start_ = start; address_mask_ = ~(maximum_capacity - 1); object_mask_ = address_mask_ | kHeapObjectTag; - object_expected_ = reinterpret_cast(start) | kHeapObjectTag; + object_expected_ = reinterpret_cast(start) | kHeapObjectTag; age_mark_ = start_; return true; @@ -1890,7 +1890,7 @@ static void PrintRSetRange(Address start, Address end, Object** object_p, // If the range starts on on odd numbered word (eg, for large object extra // remembered set ranges), print some spaces. - if ((reinterpret_cast(start) / kIntSize) % 2 == 1) { + if ((reinterpret_cast(start) / kIntSize) % 2 == 1) { PrintF(" "); } @@ -1929,7 +1929,7 @@ static void PrintRSetRange(Address start, Address end, Object** object_p, } // Print a newline after every odd numbered word, otherwise a space. - if ((reinterpret_cast(rset_address) / kIntSize) % 2 == 1) { + if ((reinterpret_cast(rset_address) / kIntSize) % 2 == 1) { PrintF("\n"); } else { PrintF(" "); diff --git a/src/spaces.h b/src/spaces.h index 843981b..cdb7d29 100644 --- a/src/spaces.h +++ b/src/spaces.h @@ -1183,9 +1183,9 @@ class NewSpace : public Space { // Start address and bit mask for containment testing. Address start_; - uint32_t address_mask_; - uint32_t object_mask_; - uint32_t object_expected_; + uintptr_t address_mask_; + uintptr_t object_mask_; + uintptr_t object_expected_; // Allocation pointer and limit for normal allocation and allocation during // mark-compact collection. -- 2.7.4