Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/os.hpp @ 14314:2c95095271e9
Merge
author | ehelin |
---|---|
date | Thu, 30 Jan 2014 14:01:45 +0100 |
parents | 5944dba4badc 63a4eb8bcd23 |
children | ad3f8397fe37 |
comparison
equal
deleted
inserted
replaced
14302:1fb56cbac3a1 | 14314:2c95095271e9 |
---|---|
393 // Previously this function calculated the exact address of this | 393 // Previously this function calculated the exact address of this |
394 // thread's serialize page, and checked if the faulting address | 394 // thread's serialize page, and checked if the faulting address |
395 // was equal. However, some platforms mask off faulting addresses | 395 // was equal. However, some platforms mask off faulting addresses |
396 // to the page size, so now we just check that the address is | 396 // to the page size, so now we just check that the address is |
397 // within the page. This makes the thread argument unnecessary, | 397 // within the page. This makes the thread argument unnecessary, |
398 // but we retain the NULL check to preserve existing behaviour. | 398 // but we retain the NULL check to preserve existing behavior. |
399 if (thread == NULL) return false; | 399 if (thread == NULL) return false; |
400 address page = (address) _mem_serialize_page; | 400 address page = (address) _mem_serialize_page; |
401 return addr >= page && addr < (page + os::vm_page_size()); | 401 return addr >= page && addr < (page + os::vm_page_size()); |
402 } | 402 } |
403 | 403 |
541 // Find out whether the pc is in the static code for jvm.dll/libjvm.so. | 541 // Find out whether the pc is in the static code for jvm.dll/libjvm.so. |
542 static bool address_is_in_vm(address addr); | 542 static bool address_is_in_vm(address addr); |
543 | 543 |
544 // Loads .dll/.so and | 544 // Loads .dll/.so and |
545 // in case of error it checks if .dll/.so was built for the | 545 // in case of error it checks if .dll/.so was built for the |
546 // same architecture as Hotspot is running on | 546 // same architecture as HotSpot is running on |
547 static void* dll_load(const char *name, char *ebuf, int ebuflen); | 547 static void* dll_load(const char *name, char *ebuf, int ebuflen); |
548 | 548 |
549 // lookup symbol in a shared library | 549 // lookup symbol in a shared library |
550 static void* dll_lookup(void* handle, const char* name); | 550 static void* dll_lookup(void* handle, const char* name); |
551 | 551 |