Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/javaCalls.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | f34d701e952e |
children | 291ffc492eb6 190899198332 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
37 #include "runtime/interfaceSupport.hpp" | 37 #include "runtime/interfaceSupport.hpp" |
38 #include "runtime/javaCalls.hpp" | 38 #include "runtime/javaCalls.hpp" |
39 #include "runtime/mutexLocker.hpp" | 39 #include "runtime/mutexLocker.hpp" |
40 #include "runtime/signature.hpp" | 40 #include "runtime/signature.hpp" |
41 #include "runtime/stubRoutines.hpp" | 41 #include "runtime/stubRoutines.hpp" |
42 #ifdef TARGET_OS_FAMILY_linux | 42 #include "runtime/thread.inline.hpp" |
43 # include "thread_linux.inline.hpp" | |
44 #endif | |
45 #ifdef TARGET_OS_FAMILY_solaris | |
46 # include "thread_solaris.inline.hpp" | |
47 #endif | |
48 #ifdef TARGET_OS_FAMILY_windows | |
49 # include "thread_windows.inline.hpp" | |
50 #endif | |
51 #ifdef TARGET_OS_FAMILY_bsd | |
52 # include "thread_bsd.inline.hpp" | |
53 #endif | |
54 | 43 |
55 // ----------------------------------------------------- | 44 // ----------------------------------------------------- |
56 // Implementation of JavaCallWrapper | 45 // Implementation of JavaCallWrapper |
57 | 46 |
58 JavaCallWrapper::JavaCallWrapper(methodHandle callee_method, Handle receiver, JavaValue* result, TRAPS) { | 47 JavaCallWrapper::JavaCallWrapper(methodHandle callee_method, Handle receiver, JavaValue* result, TRAPS) { |