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

Side by Side Diff: runtime/vm/virtual_memory_android.cc

Issue 640313002: Fix return types on macos+android. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | runtime/vm/virtual_memory_macos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 unmap(address(), reserved_size_);
57 } 57 }
58 58
59 59
60 void VirtualMemory::FreeSubSegment(void* address, intptr_t size) { 60 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
61 unmap(address, size); 61 unmap(address, size);
62 return true; 62 return true;
63 } 63 }
64 64
65 65
66 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { 66 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) {
67 ASSERT(Contains(addr)); 67 ASSERT(Contains(addr));
68 ASSERT(Contains(addr + size) || (addr + size == end())); 68 ASSERT(Contains(addr + size) || (addr + size == end()));
69 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); 69 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0);
70 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, 70 void* address = mmap(reinterpret_cast<void*>(addr), size, prot,
(...skipping 29 matching lines...) Expand all
100 break; 100 break;
101 } 101 }
102 return (mprotect(reinterpret_cast<void*>(page_address), 102 return (mprotect(reinterpret_cast<void*>(page_address),
103 end_address - page_address, 103 end_address - page_address,
104 prot) == 0); 104 prot) == 0);
105 } 105 }
106 106
107 } // namespace dart 107 } // namespace dart
108 108
109 #endif // defined(TARGET_OS_ANDROID) 109 #endif // defined(TARGET_OS_ANDROID)
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/virtual_memory_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698