Mercurial > hg > truffle
diff src/os/solaris/vm/os_solaris.cpp @ 237:1fdb98a17101
6716785: implicit null checks not triggering with CompressedOops
Summary: allocate alignment-sized page(s) below java heap so that memory accesses at heap_base+1page give signal and cause an implicit null check
Reviewed-by: kvn, jmasa, phh, jcoomes
| author | coleenp |
|---|---|
| date | Sat, 19 Jul 2008 17:38:22 -0400 |
| parents | d1605aabd0a1 |
| children | d95b224e9f17 850fdf70db2b |
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp Fri Jul 11 01:14:44 2008 -0700 +++ b/src/os/solaris/vm/os_solaris.cpp Sat Jul 19 17:38:22 2008 -0400 @@ -2965,10 +2965,21 @@ return retVal == 0; } -// Protect memory (make it read-only. (Used to pass readonly pages through +// Protect memory (Used to pass readonly pages through // JNI GetArray<type>Elements with empty arrays.) -bool os::protect_memory(char* addr, size_t bytes) { - return solaris_mprotect(addr, bytes, PROT_READ); +bool os::protect_memory(char* addr, size_t bytes, ProtType prot, + bool is_committed) { + unsigned int p = 0; + switch (prot) { + case MEM_PROT_NONE: p = PROT_NONE; break; + case MEM_PROT_READ: p = PROT_READ; break; + case MEM_PROT_RW: p = PROT_READ|PROT_WRITE; break; + case MEM_PROT_RWX: p = PROT_READ|PROT_WRITE|PROT_EXEC; break; + default: + ShouldNotReachHere(); + } + // is_committed is unused. + return solaris_mprotect(addr, bytes, p); } // guard_memory and unguard_memory only happens within stack guard pages.