Mercurial > hg > truffle

comparison src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp @ 17707:7d28f4e15b61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8029775: Solaris code cleanup Summary: cleaned up warnings in solaris specific os code. Reviewed-by: coleenp, fparain, dcubed Contributed-by: gerald.thornbrugh@oracle.com
author dcubed
date Wed, 05 Mar 2014 11:28:33 -0800
parents af21010d1062
children 4ca6dc0799b6 98af1e198e73
comparison
equal deleted inserted replaced
17706:0e6af9b390af 17707:7d28f4e15b61
1 /* 1 /*
2 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
473 else if (sig == SIGBUS && info->si_code == BUS_OBJERR) { 473 else if (sig == SIGBUS && info->si_code == BUS_OBJERR) {
474 // BugId 4454115: A read from a MappedByteBuffer can fault 474 // BugId 4454115: A read from a MappedByteBuffer can fault
475 // here if the underlying file has been truncated. 475 // here if the underlying file has been truncated.
476 // Do not crash the VM in such a case. 476 // Do not crash the VM in such a case.
477 CodeBlob* cb = CodeCache::find_blob_unsafe(pc); 477 CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
478 nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL; 478 if (cb != NULL) {
479 if (nm != NULL && nm->has_unsafe_access()) { 479 nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
480 stub = StubRoutines::handler_for_unsafe_access(); 480 if (nm != NULL && nm->has_unsafe_access()) {
481 stub = StubRoutines::handler_for_unsafe_access();
482 }
481 } 483 }
482 } 484 }
483 else 485 else
484 if (sig == SIGFPE && info->si_code == FPE_INTDIV) { 486 if (sig == SIGFPE && info->si_code == FPE_INTDIV) {
485 // integer divide by zero 487 // integer divide by zero
722 724
723 VMError err(t, sig, pc, info, ucVoid); 725 VMError err(t, sig, pc, info, ucVoid);
724 err.report_and_die(); 726 err.report_and_die();
725 727
726 ShouldNotReachHere(); 728 ShouldNotReachHere();
729 return false;
727 } 730 }
728 731
729 void os::print_context(outputStream *st, void *context) { 732 void os::print_context(outputStream *st, void *context) {
730 if (context == NULL) return; 733 if (context == NULL) return;
731 734