comparison src/share/vm/utilities/exceptions.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents e522a00b91aa f34d701e952e
children 3cce976666d9
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
28 #include "compiler/compileBroker.hpp" 28 #include "compiler/compileBroker.hpp"
29 #include "oops/oop.inline.hpp" 29 #include "oops/oop.inline.hpp"
30 #include "runtime/init.hpp" 30 #include "runtime/init.hpp"
31 #include "runtime/java.hpp" 31 #include "runtime/java.hpp"
32 #include "runtime/javaCalls.hpp" 32 #include "runtime/javaCalls.hpp"
33 #include "runtime/thread.inline.hpp"
33 #include "runtime/threadCritical.hpp" 34 #include "runtime/threadCritical.hpp"
34 #include "utilities/events.hpp" 35 #include "utilities/events.hpp"
35 #include "utilities/exceptions.hpp" 36 #include "utilities/exceptions.hpp"
36 #ifdef TARGET_OS_FAMILY_linux
37 # include "thread_linux.inline.hpp"
38 #endif
39 #ifdef TARGET_OS_FAMILY_solaris
40 # include "thread_solaris.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_windows
43 # include "thread_windows.inline.hpp"
44 #endif
45 #ifdef TARGET_OS_FAMILY_bsd
46 # include "thread_bsd.inline.hpp"
47 #endif
48 37
49 38
50 // Implementation of ThreadShadow 39 // Implementation of ThreadShadow
51 void check_ThreadShadow() { 40 void check_ThreadShadow() {
52 const ByteSize offset1 = byte_offset_of(ThreadShadow, _pending_exception); 41 const ByteSize offset1 = byte_offset_of(ThreadShadow, _pending_exception);