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

Side by Side Diff: src/spaces-inl.h

Issue 9452002: Ensure that executable pages are properly guarded. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // -------------------------------------------------------------------------- 160 // --------------------------------------------------------------------------
161 // PagedSpace 161 // PagedSpace
162 Page* Page::Initialize(Heap* heap, 162 Page* Page::Initialize(Heap* heap,
163 MemoryChunk* chunk, 163 MemoryChunk* chunk,
164 Executability executable, 164 Executability executable,
165 PagedSpace* owner) { 165 PagedSpace* owner) {
166 Page* page = reinterpret_cast<Page*>(chunk); 166 Page* page = reinterpret_cast<Page*>(chunk);
167 ASSERT(chunk->size() == static_cast<size_t>(kPageSize)); 167 ASSERT(chunk->size() == static_cast<size_t>(kPageSize));
168 ASSERT(chunk->owner() == owner); 168 ASSERT(chunk->owner() == owner);
169 owner->IncreaseCapacity(Page::kObjectAreaSize); 169 owner->IncreaseCapacity(page->area_size());
170 owner->Free(page->ObjectAreaStart(), 170 owner->Free(page->area_start(), page->area_size());
171 static_cast<int>(page->ObjectAreaEnd() -
172 page->ObjectAreaStart()));
173 171
174 heap->incremental_marking()->SetOldSpacePageFlags(chunk); 172 heap->incremental_marking()->SetOldSpacePageFlags(chunk);
175 173
176 return page; 174 return page;
177 } 175 }
178 176
179 177
180 bool PagedSpace::Contains(Address addr) { 178 bool PagedSpace::Contains(Address addr) {
181 Page* p = Page::FromAddress(addr); 179 Page* p = Page::FromAddress(addr);
182 if (!p->is_valid()) return false; 180 if (!p->is_valid()) return false;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 Map* map = object->map(); 339 Map* map = object->map();
342 Heap* heap = object->GetHeap(); 340 Heap* heap = object->GetHeap();
343 return map == heap->raw_unchecked_free_space_map() 341 return map == heap->raw_unchecked_free_space_map()
344 || map == heap->raw_unchecked_one_pointer_filler_map() 342 || map == heap->raw_unchecked_one_pointer_filler_map()
345 || map == heap->raw_unchecked_two_pointer_filler_map(); 343 || map == heap->raw_unchecked_two_pointer_filler_map();
346 } 344 }
347 345
348 } } // namespace v8::internal 346 } } // namespace v8::internal
349 347
350 #endif // V8_SPACES_INL_H_ 348 #endif // V8_SPACES_INL_H_
OLDNEW
« src/platform-freebsd.cc ('K') | « src/spaces.cc ('k') | src/store-buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698