Mercurial > hg > truffle

comparison src/share/vm/prims/whitebox.cpp @ 11198:1e6d5dec4a4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents a837fa3d3f86
children f99558245e5c
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
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);