| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return; | 46 return; |
| 47 } | 47 } |
| 48 | 48 |
| 49 if (munmap(address, size) != 0) { | 49 if (munmap(address, size) != 0) { |
| 50 FATAL("munmap failed\n"); | 50 FATAL("munmap failed\n"); |
| 51 } | 51 } |
| 52 } | 52 } |
| 53 | 53 |
| 54 | 54 |
| 55 VirtualMemory::~VirtualMemory() { | 55 VirtualMemory::~VirtualMemory() { |
| 56 unmap(address(), reserved_size_); | 56 if (!embedder_allocated()) { |
| 57 unmap(address(), reserved_size_); |
| 58 } |
| 57 } | 59 } |
| 58 | 60 |
| 59 | 61 |
| 60 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { | 62 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { |
| 61 unmap(address, size); | 63 unmap(address, size); |
| 62 return true; | 64 return true; |
| 63 } | 65 } |
| 64 | 66 |
| 65 | 67 |
| 66 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 68 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 break; | 102 break; |
| 101 } | 103 } |
| 102 return (mprotect(reinterpret_cast<void*>(page_address), | 104 return (mprotect(reinterpret_cast<void*>(page_address), |
| 103 end_address - page_address, | 105 end_address - page_address, |
| 104 prot) == 0); | 106 prot) == 0); |
| 105 } | 107 } |
| 106 | 108 |
| 107 } // namespace dart | 109 } // namespace dart |
| 108 | 110 |
| 109 #endif // defined(TARGET_OS_ANDROID) | 111 #endif // defined(TARGET_OS_ANDROID) |
| OLD | NEW |