archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6896043: first round of zero fixes

Browse source 
Reviewed-by: kvn
This commit is contained in:
Gary Benson 2009-11-27 07:56:58 -08:00 • committed by Christian Thalinger
parent 4a2266601a
commit 63cc2211ed
10 changed files with 59 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hotspot/src/share/vm/runtime/os.hpp
View file

@ -294,19 +294,16 @@ class os: AllStatic {
}
static bool is_memory_serialize_page(JavaThread *thread, address addr) {
address thr_addr;
if (UseMembar) return false;
// Calculate thread specific address
// Previously this function calculated the exact address of this
// thread's serialize page, and checked if the faulting address
// was equal. However, some platforms mask off faulting addresses
// to the page size, so now we just check that the address is
// within the page. This makes the thread argument unnecessary,
// but we retain the NULL check to preserve existing behaviour.
if (thread == NULL) return false;
// TODO-FIXME: some platforms mask off faulting addresses to the base pagesize.
// Instead of using a test for equality we should probably use something
// of the form:
// return ((_mem_serialize_page ^ addr) & -pagesize) == 0
//
thr_addr = (address)(((uintptr_t)thread >>
get_serialize_page_shift_count()) &
get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page;
return (thr_addr == addr);
address page = (address) _mem_serialize_page;
return addr >= page && addr < (page + os::vm_page_size());
}
static void block_on_serialize_page_trap();