| Index: src/spaces.h
|
| diff --git a/src/spaces.h b/src/spaces.h
|
| index 9df1d9e96b0cd111a2b3d62061e17ce06c6748aa..bb7adf7133866eefe6e38b1631da5f0693ce860c 100644
|
| --- a/src/spaces.h
|
| +++ b/src/spaces.h
|
| @@ -645,7 +645,6 @@ class MemoryChunk {
|
| int area_size() {
|
| return static_cast<int>(area_end() - area_start());
|
| }
|
| - bool CommitArea(size_t requested);
|
|
|
| // Approximate amount of physical memory committed for this chunk.
|
| size_t CommittedPhysicalMemory() {
|
| @@ -888,11 +887,8 @@ class CodeRange {
|
| // Allocates a chunk of memory from the large-object portion of
|
| // the code range. On platforms with no separate code range, should
|
| // not be called.
|
| - MUST_USE_RESULT Address AllocateRawMemory(const size_t requested_size,
|
| - const size_t commit_size,
|
| + MUST_USE_RESULT Address AllocateRawMemory(const size_t requested,
|
| size_t* allocated);
|
| - bool CommitRawMemory(Address start, size_t length);
|
| - bool UncommitRawMemory(Address start, size_t length);
|
| void FreeRawMemory(Address buf, size_t length);
|
|
|
| private:
|
| @@ -1040,19 +1036,14 @@ class MemoryAllocator {
|
| void ReportStatistics();
|
| #endif
|
|
|
| - // Returns a MemoryChunk in which the memory region from commit_area_size to
|
| - // reserve_area_size of the chunk area is reserved but not committed, it
|
| - // could be committed later by calling MemoryChunk::CommitArea.
|
| - MemoryChunk* AllocateChunk(intptr_t reserve_area_size,
|
| - intptr_t commit_area_size,
|
| + MemoryChunk* AllocateChunk(intptr_t body_size,
|
| Executability executable,
|
| Space* space);
|
|
|
| Address ReserveAlignedMemory(size_t requested,
|
| size_t alignment,
|
| VirtualMemory* controller);
|
| - Address AllocateAlignedMemory(size_t reserve_size,
|
| - size_t commit_size,
|
| + Address AllocateAlignedMemory(size_t requested,
|
| size_t alignment,
|
| Executability executable,
|
| VirtualMemory* controller);
|
| @@ -1102,10 +1093,9 @@ class MemoryAllocator {
|
| return CodePageAreaEndOffset() - CodePageAreaStartOffset();
|
| }
|
|
|
| - MUST_USE_RESULT static bool CommitExecutableMemory(VirtualMemory* vm,
|
| - Address start,
|
| - size_t commit_size,
|
| - size_t reserved_size);
|
| + MUST_USE_RESULT static bool CommitCodePage(VirtualMemory* vm,
|
| + Address start,
|
| + size_t size);
|
|
|
| private:
|
| Isolate* isolate_;
|
|
|