comparison src/share/vm/classfile/verifier.cpp @ 1980:828eafbd85cc

6348631: remove the use of the HPI library from Hotspot Summary: move functions from hpi library to hotspot, communicate with licensees and open source community, check jdk for dependency, file CCC request Reviewed-by: coleenp, acorn, dsamersoff
author ikrylov
date Wed, 01 Dec 2010 18:26:32 -0500
parents f95d63e2154a
children 3582bf76420e
comparison
equal deleted inserted replaced
1972:f95d63e2154a 1980:828eafbd85cc
36 #include "oops/oop.inline.hpp" 36 #include "oops/oop.inline.hpp"
37 #include "oops/typeArrayOop.hpp" 37 #include "oops/typeArrayOop.hpp"
38 #include "prims/jvm.h" 38 #include "prims/jvm.h"
39 #include "runtime/fieldDescriptor.hpp" 39 #include "runtime/fieldDescriptor.hpp"
40 #include "runtime/handles.inline.hpp" 40 #include "runtime/handles.inline.hpp"
41 #include "runtime/hpi.hpp"
42 #include "runtime/interfaceSupport.hpp" 41 #include "runtime/interfaceSupport.hpp"
43 #include "runtime/javaCalls.hpp" 42 #include "runtime/javaCalls.hpp"
44 #include "runtime/orderAccess.hpp" 43 #include "runtime/orderAccess.hpp"
45 #include "runtime/os.hpp" 44 #include "runtime/os.hpp"
46 #ifdef TARGET_ARCH_x86 45 #ifdef TARGET_ARCH_x86
67 static volatile jint _is_new_verify_byte_codes_fn = (jint) true; 66 static volatile jint _is_new_verify_byte_codes_fn = (jint) true;
68 67
69 static void* verify_byte_codes_fn() { 68 static void* verify_byte_codes_fn() {
70 if (_verify_byte_codes_fn == NULL) { 69 if (_verify_byte_codes_fn == NULL) {
71 void *lib_handle = os::native_java_library(); 70 void *lib_handle = os::native_java_library();
72 void *func = hpi::dll_lookup(lib_handle, "VerifyClassCodesForMajorVersion"); 71 void *func = os::dll_lookup(lib_handle, "VerifyClassCodesForMajorVersion");
73 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func); 72 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func);
74 if (func == NULL) { 73 if (func == NULL) {
75 OrderAccess::release_store(&_is_new_verify_byte_codes_fn, false); 74 OrderAccess::release_store(&_is_new_verify_byte_codes_fn, false);
76 func = hpi::dll_lookup(lib_handle, "VerifyClassCodes"); 75 func = os::dll_lookup(lib_handle, "VerifyClassCodes");
77 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func); 76 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func);
78 } 77 }
79 } 78 }
80 return (void*)_verify_byte_codes_fn; 79 return (void*)_verify_byte_codes_fn;
81 } 80 }