OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/globals.h" | 5 #include "vm/globals.h" |
6 #if defined(TARGET_OS_ANDROID) | 6 #if defined(TARGET_OS_ANDROID) |
7 | 7 |
8 #include "vm/virtual_memory.h" | 8 #include "vm/virtual_memory.h" |
9 | 9 |
10 #include <sys/mman.h> // NOLINT | 10 #include <sys/mman.h> // NOLINT |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 } | 53 } |
54 | 54 |
55 | 55 |
56 VirtualMemory::~VirtualMemory() { | 56 VirtualMemory::~VirtualMemory() { |
57 if (!embedder_allocated()) { | 57 if (!embedder_allocated()) { |
58 unmap(address(), reserved_size_); | 58 unmap(address(), reserved_size_); |
59 } | 59 } |
60 } | 60 } |
61 | 61 |
62 | 62 |
63 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { | 63 bool VirtualMemory::FreeSubSegment(int32_t handle, |
| 64 void* address, |
| 65 intptr_t size) { |
64 unmap(address, size); | 66 unmap(address, size); |
65 return true; | 67 return true; |
66 } | 68 } |
67 | 69 |
68 | 70 |
69 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 71 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { |
70 ASSERT(Contains(addr)); | 72 ASSERT(Contains(addr)); |
71 ASSERT(Contains(addr + size) || (addr + size == end())); | 73 ASSERT(Contains(addr + size) || (addr + size == end())); |
72 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); | 74 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); |
73 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, | 75 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, |
(...skipping 29 matching lines...) Expand all Loading... |
103 prot = PROT_READ | PROT_WRITE | PROT_EXEC; | 105 prot = PROT_READ | PROT_WRITE | PROT_EXEC; |
104 break; | 106 break; |
105 } | 107 } |
106 return (mprotect(reinterpret_cast<void*>(page_address), | 108 return (mprotect(reinterpret_cast<void*>(page_address), |
107 end_address - page_address, prot) == 0); | 109 end_address - page_address, prot) == 0); |
108 } | 110 } |
109 | 111 |
110 } // namespace dart | 112 } // namespace dart |
111 | 113 |
112 #endif // defined(TARGET_OS_ANDROID) | 114 #endif // defined(TARGET_OS_ANDROID) |
OLD | NEW |