Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/whitebox.cpp @ 11173:6b0fd0964b87
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 31 Jul 2013 11:00:54 +0200 |
parents | a837fa3d3f86 |
children | f99558245e5c |
comparison
equal
deleted
inserted
replaced
10912:4ea54634f03e | 11173:6b0fd0964b87 |
---|---|
157 return addr; | 157 return addr; |
158 WB_END | 158 WB_END |
159 | 159 |
160 | 160 |
161 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size)) | 161 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size)) |
162 os::commit_memory((char *)(uintptr_t)addr, size); | 162 os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem); |
163 MemTracker::record_virtual_memory_type((address)(uintptr_t)addr, mtTest); | 163 MemTracker::record_virtual_memory_type((address)(uintptr_t)addr, mtTest); |
164 WB_END | 164 WB_END |
165 | 165 |
166 WB_ENTRY(void, WB_NMTUncommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size)) | 166 WB_ENTRY(void, WB_NMTUncommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size)) |
167 os::uncommit_memory((char *)(uintptr_t)addr, size); | 167 os::uncommit_memory((char *)(uintptr_t)addr, size); |