Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Unified Diff: src/heap/marking.h

Issue 2186863005: [heap] Reland "Remove black pages and use black areas instead." (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: filter out live fillers Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/heap/mark-compact-inl.h ('k') | src/heap/scavenger.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/marking.h
diff --git a/src/heap/marking.h b/src/heap/marking.h
index 6acea526555682b98a2012ecac798c418170424e..1248e59fe2cc142abbce46e010348287e644b5d5 100644
--- a/src/heap/marking.h
+++ b/src/heap/marking.h
@@ -106,8 +106,98 @@ class Bitmap {
for (int i = 0; i < CellsCount(); i++) cells()[i] = 0;
}
- void SetAllBits() {
- for (int i = 0; i < CellsCount(); i++) cells()[i] = 0xffffffff;
+ // Sets all bits in the range [start_index, end_index).
+ void SetRange(uint32_t start_index, uint32_t end_index) {
+ unsigned int start_cell_index = start_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType start_index_mask = 1u << Bitmap::IndexInCell(start_index);
+
+ unsigned int end_cell_index = end_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType end_index_mask = 1u << Bitmap::IndexInCell(end_index);
+
+ if (start_cell_index != end_cell_index) {
+ // Firstly, fill all bits from the start address to the end of the first
+ // cell with 1s.
+ cells()[start_cell_index] |= ~(start_index_mask - 1);
+ // Then fill all in between cells with 1s.
+ for (unsigned int i = start_cell_index + 1; i < end_cell_index; i++) {
+ cells()[i] = ~0u;
+ }
+ // Finally, fill all bits until the end address in the last cell with 1s.
+ cells()[end_cell_index] |= (end_index_mask - 1);
+ } else {
+ cells()[start_cell_index] |= end_index_mask - start_index_mask;
+ }
+ }
+
+ // Clears all bits in the range [start_index, end_index).
+ void ClearRange(uint32_t start_index, uint32_t end_index) {
+ unsigned int start_cell_index = start_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType start_index_mask = 1u << Bitmap::IndexInCell(start_index);
+
+ unsigned int end_cell_index = end_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType end_index_mask = 1u << Bitmap::IndexInCell(end_index);
+
+ if (start_cell_index != end_cell_index) {
+ // Firstly, fill all bits from the start address to the end of the first
+ // cell with 0s.
+ cells()[start_cell_index] &= (start_index_mask - 1);
+ // Then fill all in between cells with 0s.
+ for (unsigned int i = start_cell_index + 1; i < end_cell_index; i++) {
+ cells()[i] = 0;
+ }
+ // Finally, set all bits until the end address in the last cell with 0s.
+ cells()[end_cell_index] &= ~(end_index_mask - 1);
+ } else {
+ cells()[start_cell_index] &= ~(end_index_mask - start_index_mask);
+ }
+ }
+
+ // Returns true if all bits in the range [start_index, end_index) are set.
+ bool AllBitsSetInRange(uint32_t start_index, uint32_t end_index) {
+ unsigned int start_cell_index = start_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType start_index_mask = 1u << Bitmap::IndexInCell(start_index);
+
+ unsigned int end_cell_index = end_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType end_index_mask = 1u << Bitmap::IndexInCell(end_index);
+
+ MarkBit::CellType matching_mask;
+ if (start_cell_index != end_cell_index) {
+ matching_mask = ~(start_index_mask - 1);
+ if ((cells()[start_cell_index] & matching_mask) != matching_mask) {
+ return false;
+ }
+ for (unsigned int i = start_cell_index + 1; i < end_cell_index; i++) {
+ if (cells()[i] != ~0u) return false;
+ }
+ matching_mask = (end_index_mask - 1);
+ return ((cells()[end_cell_index] & matching_mask) == matching_mask);
+ } else {
+ matching_mask = end_index_mask - start_index_mask;
+ return (cells()[end_cell_index] & matching_mask) == matching_mask;
+ }
+ }
+
+ // Returns true if all bits in the range [start_index, end_index) are cleared.
+ bool AllBitsClearInRange(uint32_t start_index, uint32_t end_index) {
+ unsigned int start_cell_index = start_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType start_index_mask = 1u << Bitmap::IndexInCell(start_index);
+
+ unsigned int end_cell_index = end_index >> Bitmap::kBitsPerCellLog2;
+ MarkBit::CellType end_index_mask = 1u << Bitmap::IndexInCell(end_index);
+
+ MarkBit::CellType matching_mask;
+ if (start_cell_index != end_cell_index) {
+ matching_mask = ~(start_index_mask - 1);
+ if ((cells()[start_cell_index] & matching_mask)) return false;
+ for (unsigned int i = start_cell_index + 1; i < end_cell_index; i++) {
+ if (cells()[i]) return false;
+ }
+ matching_mask = (end_index_mask - 1);
+ return !(cells()[end_cell_index] & matching_mask);
+ } else {
+ matching_mask = end_index_mask - start_index_mask;
+ return !(cells()[end_cell_index] & matching_mask);
+ }
}
static void PrintWord(uint32_t word, uint32_t himask = 0) {
@@ -175,23 +265,6 @@ class Bitmap {
}
return true;
}
-
- // Clears all bits starting from {cell_base_index} up to and excluding
- // {index}. Note that {cell_base_index} is required to be cell aligned.
- void ClearRange(uint32_t cell_base_index, uint32_t index) {
- DCHECK_EQ(IndexInCell(cell_base_index), 0u);
- DCHECK_GE(index, cell_base_index);
- uint32_t start_cell_index = IndexToCell(cell_base_index);
- uint32_t end_cell_index = IndexToCell(index);
- DCHECK_GE(end_cell_index, start_cell_index);
- // Clear all cells till the cell containing the last index.
- for (uint32_t i = start_cell_index; i < end_cell_index; i++) {
- cells()[i] = 0;
- }
- // Clear all bits in the last cell till the last bit before index.
- uint32_t clear_mask = ~((1u << IndexInCell(index)) - 1);
- cells()[end_cell_index] &= clear_mask;
- }
};
class Marking : public AllStatic {
« no previous file with comments | « src/heap/mark-compact-inl.h ('k') | src/heap/scavenger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698