Reviewers: William Hesse, Message: Quick review.
Description: Changed size of pointers stored as numbers to intptr_t in spaces.h. Please review this at http://codereview.chromium.org/115073 Affected files: M src/spaces.h M src/spaces.cc Index: src/spaces.cc diff --git a/src/spaces.cc b/src/spaces.cc index ea40d52116fe1e301c307f2bf33df3970ddc6318..c124af1deb5f80ead4fedcefddd76d032150a891 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<uint32_t>(start) | kHeapObjectTag; + object_expected_ = reinterpret_cast<uintptr_t>(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<uint32_t>(start) | kHeapObjectTag; + object_expected_ = reinterpret_cast<uintptr_t>(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<uint32_t>(start) / kIntSize) % 2 == 1) { + if ((reinterpret_cast<uintptr_t>(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<uint32_t>(rset_address) / kIntSize) % 2 == 1) { + if ((reinterpret_cast<uintptr_t>(rset_address) / kIntSize) % 2 == 1) { PrintF("\n"); } else { PrintF(" "); Index: src/spaces.h diff --git a/src/spaces.h b/src/spaces.h index 843981bf125b8a7beb245552a6eea1ee84691f74..cdb7d2933b0166e4a56653a3ceaa526a1321d168 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. --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
