--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Wed May 01 12:41:26 2019 -0400
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Wed May 01 12:31:29 2019 -0700
@@ -22,28 +22,13 @@
*/
#include "precompiled.hpp"
-#include "asm/register.hpp"
-#include "classfile/vmSymbols.hpp"
#include "code/compiledIC.hpp"
-#include "code/vmreg.inline.hpp"
#include "compiler/compileBroker.hpp"
-#include "compiler/disassembler.hpp"
-#include "jvmci/jvmciEnv.hpp"
-#include "jvmci/jvmciCompiler.hpp"
#include "jvmci/jvmciCodeInstaller.hpp"
-#include "jvmci/jvmciJavaClasses.hpp"
#include "jvmci/jvmciCompilerToVM.hpp"
#include "jvmci/jvmciRuntime.hpp"
-#include "memory/allocation.inline.hpp"
-#include "oops/arrayOop.inline.hpp"
-#include "oops/oop.inline.hpp"
-#include "oops/objArrayOop.inline.hpp"
-#include "oops/typeArrayOop.inline.hpp"
-#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.inline.hpp"
-#include "runtime/safepointMechanism.inline.hpp"
#include "runtime/sharedRuntime.hpp"
#include "utilities/align.hpp"
@@ -51,30 +36,25 @@
// Allocate them with new so they are never destroyed (otherwise, a
// forced exit could destroy these objects while they are still in
// use).
-ConstantOopWriteValue* CodeInstaller::_oop_null_scope_value = new (ResourceObj::C_HEAP, mtCompiler) ConstantOopWriteValue(NULL);
-ConstantIntValue* CodeInstaller::_int_m1_scope_value = new (ResourceObj::C_HEAP, mtCompiler) ConstantIntValue(-1);
-ConstantIntValue* CodeInstaller::_int_0_scope_value = new (ResourceObj::C_HEAP, mtCompiler) ConstantIntValue((jint)0);
-ConstantIntValue* CodeInstaller::_int_1_scope_value = new (ResourceObj::C_HEAP, mtCompiler) ConstantIntValue(1);
-ConstantIntValue* CodeInstaller::_int_2_scope_value = new (ResourceObj::C_HEAP, mtCompiler) ConstantIntValue(2);
-LocationValue* CodeInstaller::_illegal_value = new (ResourceObj::C_HEAP, mtCompiler) LocationValue(Location());
+ConstantOopWriteValue* CodeInstaller::_oop_null_scope_value = new (ResourceObj::C_HEAP, mtJVMCI) ConstantOopWriteValue(NULL);
+ConstantIntValue* CodeInstaller::_int_m1_scope_value = new (ResourceObj::C_HEAP, mtJVMCI) ConstantIntValue(-1);
+ConstantIntValue* CodeInstaller::_int_0_scope_value = new (ResourceObj::C_HEAP, mtJVMCI) ConstantIntValue((jint)0);
+ConstantIntValue* CodeInstaller::_int_1_scope_value = new (ResourceObj::C_HEAP, mtJVMCI) ConstantIntValue(1);
+ConstantIntValue* CodeInstaller::_int_2_scope_value = new (ResourceObj::C_HEAP, mtJVMCI) ConstantIntValue(2);
+LocationValue* CodeInstaller::_illegal_value = new (ResourceObj::C_HEAP, mtJVMCI) LocationValue(Location());
-Method* getMethodFromHotSpotMethod(oop hotspot_method) {
- assert(hotspot_method != NULL && hotspot_method->is_a(HotSpotResolvedJavaMethodImpl::klass()), "sanity");
- return CompilerToVM::asMethod(hotspot_method);
-}
-
-VMReg getVMRegFromLocation(Handle location, int total_frame_size, TRAPS) {
+VMReg CodeInstaller::getVMRegFromLocation(JVMCIObject location, int total_frame_size, JVMCI_TRAPS) {
if (location.is_null()) {
- THROW_NULL(vmSymbols::java_lang_NullPointerException());
+ JVMCI_THROW_NULL(NullPointerException);
}
- Handle reg(THREAD, code_Location::reg(location));
- jint offset = code_Location::offset(location);
+ JVMCIObject reg = jvmci_env()->get_code_Location_reg(location);
+ jint offset = jvmci_env()->get_code_Location_offset(location);
- if (reg.not_null()) {
+ if (reg.is_non_null()) {
// register
- jint number = code_Register::number(reg);
- VMReg vmReg = CodeInstaller::get_hotspot_reg(number, CHECK_NULL);
+ jint number = jvmci_env()->get_code_Register_number(reg);
+ VMReg vmReg = CodeInstaller::get_hotspot_reg(number, JVMCI_CHECK_NULL);
if (offset % 4 == 0) {
return vmReg->next(offset / 4);
} else {
@@ -102,71 +82,45 @@
}
}
-objArrayOop CodeInstaller::sites() {
- return (objArrayOop) JNIHandles::resolve(_sites_handle);
-}
-
-arrayOop CodeInstaller::code() {
- return (arrayOop) JNIHandles::resolve(_code_handle);
-}
-
-arrayOop CodeInstaller::data_section() {
- return (arrayOop) JNIHandles::resolve(_data_section_handle);
-}
-
-objArrayOop CodeInstaller::data_section_patches() {
- return (objArrayOop) JNIHandles::resolve(_data_section_patches_handle);
-}
-
-#ifndef PRODUCT
-objArrayOop CodeInstaller::comments() {
- return (objArrayOop) JNIHandles::resolve(_comments_handle);
-}
-#endif
-
-oop CodeInstaller::word_kind() {
- return JNIHandles::resolve(_word_kind_handle);
-}
-
// creates a HotSpot oop map out of the byte arrays provided by DebugInfo
-OopMap* CodeInstaller::create_oop_map(Handle debug_info, TRAPS) {
- Handle reference_map(THREAD, DebugInfo::referenceMap(debug_info));
+OopMap* CodeInstaller::create_oop_map(JVMCIObject debug_info, JVMCI_TRAPS) {
+ JVMCIObject reference_map = jvmci_env()->get_DebugInfo_referenceMap(debug_info);
if (reference_map.is_null()) {
- THROW_NULL(vmSymbols::java_lang_NullPointerException());
+ JVMCI_THROW_NULL(NullPointerException);
}
- if (!reference_map->is_a(HotSpotReferenceMap::klass())) {
- JVMCI_ERROR_NULL("unknown reference map: %s", reference_map->klass()->signature_name());
+ if (!jvmci_env()->isa_HotSpotReferenceMap(reference_map)) {
+ JVMCI_ERROR_NULL("unknown reference map: %s", jvmci_env()->klass_name(reference_map));
}
- if (!_has_wide_vector && SharedRuntime::is_wide_vector(HotSpotReferenceMap::maxRegisterSize(reference_map))) {
+ if (!_has_wide_vector && SharedRuntime::is_wide_vector(jvmci_env()->get_HotSpotReferenceMap_maxRegisterSize(reference_map))) {
if (SharedRuntime::polling_page_vectors_safepoint_handler_blob() == NULL) {
JVMCI_ERROR_NULL("JVMCI is producing code using vectors larger than the runtime supports");
}
_has_wide_vector = true;
}
OopMap* map = new OopMap(_total_frame_size, _parameter_count);
- objArrayHandle objects(THREAD, HotSpotReferenceMap::objects(reference_map));
- objArrayHandle derivedBase(THREAD, HotSpotReferenceMap::derivedBase(reference_map));
- typeArrayHandle sizeInBytes(THREAD, HotSpotReferenceMap::sizeInBytes(reference_map));
+ JVMCIObjectArray objects = jvmci_env()->get_HotSpotReferenceMap_objects(reference_map);
+ JVMCIObjectArray derivedBase = jvmci_env()->get_HotSpotReferenceMap_derivedBase(reference_map);
+ JVMCIPrimitiveArray sizeInBytes = jvmci_env()->get_HotSpotReferenceMap_sizeInBytes(reference_map);
if (objects.is_null() || derivedBase.is_null() || sizeInBytes.is_null()) {
- THROW_NULL(vmSymbols::java_lang_NullPointerException());
+ JVMCI_THROW_NULL(NullPointerException);
}
- if (objects->length() != derivedBase->length() || objects->length() != sizeInBytes->length()) {
- JVMCI_ERROR_NULL("arrays in reference map have different sizes: %d %d %d", objects->length(), derivedBase->length(), sizeInBytes->length());
+ if (JVMCIENV->get_length(objects) != JVMCIENV->get_length(derivedBase) || JVMCIENV->get_length(objects) != JVMCIENV->get_length(sizeInBytes)) {
+ JVMCI_ERROR_NULL("arrays in reference map have different sizes: %d %d %d", JVMCIENV->get_length(objects), JVMCIENV->get_length(derivedBase), JVMCIENV->get_length(sizeInBytes));
}
- for (int i = 0; i < objects->length(); i++) {
- Handle location(THREAD, objects->obj_at(i));
- Handle baseLocation(THREAD, derivedBase->obj_at(i));
- int bytes = sizeInBytes->int_at(i);
+ for (int i = 0; i < JVMCIENV->get_length(objects); i++) {
+ JVMCIObject location = JVMCIENV->get_object_at(objects, i);
+ JVMCIObject baseLocation = JVMCIENV->get_object_at(derivedBase, i);
+ jint bytes = JVMCIENV->get_int_at(sizeInBytes, i);
- VMReg vmReg = getVMRegFromLocation(location, _total_frame_size, CHECK_NULL);
- if (baseLocation.not_null()) {
+ VMReg vmReg = getVMRegFromLocation(location, _total_frame_size, JVMCI_CHECK_NULL);
+ if (baseLocation.is_non_null()) {
// derived oop
#ifdef _LP64
if (bytes == 8) {
#else
if (bytes == 4) {
#endif
- VMReg baseReg = getVMRegFromLocation(baseLocation, _total_frame_size, CHECK_NULL);
+ VMReg baseReg = getVMRegFromLocation(baseLocation, _total_frame_size, JVMCI_CHECK_NULL);
map->set_derived_oop(vmReg, baseReg);
} else {
JVMCI_ERROR_NULL("invalid derived oop size in ReferenceMap: %d", bytes);
@@ -187,16 +141,16 @@
}
}
- Handle callee_save_info(THREAD, (oop) DebugInfo::calleeSaveInfo(debug_info));
- if (callee_save_info.not_null()) {
- objArrayHandle registers(THREAD, RegisterSaveLayout::registers(callee_save_info));
- typeArrayHandle slots(THREAD, RegisterSaveLayout::slots(callee_save_info));
- for (jint i = 0; i < slots->length(); i++) {
- Handle jvmci_reg (THREAD, registers->obj_at(i));
- jint jvmci_reg_number = code_Register::number(jvmci_reg);
- VMReg hotspot_reg = CodeInstaller::get_hotspot_reg(jvmci_reg_number, CHECK_NULL);
+ JVMCIObject callee_save_info = jvmci_env()->get_DebugInfo_calleeSaveInfo(debug_info);
+ if (callee_save_info.is_non_null()) {
+ JVMCIObjectArray registers = jvmci_env()->get_RegisterSaveLayout_registers(callee_save_info);
+ JVMCIPrimitiveArray slots = jvmci_env()->get_RegisterSaveLayout_slots(callee_save_info);
+ for (jint i = 0; i < JVMCIENV->get_length(slots); i++) {
+ JVMCIObject jvmci_reg = JVMCIENV->get_object_at(registers, i);
+ jint jvmci_reg_number = jvmci_env()->get_code_Register_number(jvmci_reg);
+ VMReg hotspot_reg = CodeInstaller::get_hotspot_reg(jvmci_reg_number, JVMCI_CHECK_NULL);
// HotSpot stack slots are 4 bytes
- jint jvmci_slot = slots->int_at(i);
+ jint jvmci_slot = JVMCIENV->get_int_at(slots, i);
jint hotspot_slot = jvmci_slot * VMRegImpl::slots_per_word;
VMReg hotspot_slot_as_reg = VMRegImpl::stack2reg(hotspot_slot);
map->set_callee_saved(hotspot_slot_as_reg, hotspot_reg);
@@ -211,7 +165,8 @@
}
#if INCLUDE_AOT
-AOTOopRecorder::AOTOopRecorder(Arena* arena, bool deduplicate) : OopRecorder(arena, deduplicate) {
+AOTOopRecorder::AOTOopRecorder(CodeInstaller* code_inst, Arena* arena, bool deduplicate) : OopRecorder(arena, deduplicate) {
+ _code_inst = code_inst;
_meta_refs = new GrowableArray<jobject>();
}
@@ -225,6 +180,7 @@
int AOTOopRecorder::find_index(Metadata* h) {
JavaThread* THREAD = JavaThread::current();
+ JVMCIEnv* JVMCIENV = _code_inst->jvmci_env();
int oldCount = metadata_count();
int index = this->OopRecorder::find_index(h);
int newCount = metadata_count();
@@ -237,18 +193,18 @@
vmassert(index + 1 == newCount, "must be last");
JVMCIKlassHandle klass(THREAD);
- oop result = NULL;
+ JVMCIObject result;
guarantee(h != NULL,
"If DebugInformationRecorder::describe_scope passes NULL oldCount == newCount must hold.");
if (h->is_klass()) {
klass = (Klass*) h;
- result = CompilerToVM::get_jvmci_type(klass, CATCH);
+ result = JVMCIENV->get_jvmci_type(klass, JVMCI_CATCH);
} else if (h->is_method()) {
Method* method = (Method*) h;
methodHandle mh(method);
- result = CompilerToVM::get_jvmci_method(method, CATCH);
+ result = JVMCIENV->get_jvmci_method(method, JVMCI_CATCH);
}
- jobject ref = JNIHandles::make_local(THREAD, result);
+ jobject ref = JVMCIENV->get_jobject(result);
record_meta_ref(ref, index);
return index;
@@ -272,43 +228,43 @@
}
#endif // INCLUDE_AOT
-void* CodeInstaller::record_metadata_reference(CodeSection* section, address dest, Handle constant, TRAPS) {
+void* CodeInstaller::record_metadata_reference(CodeSection* section, address dest, JVMCIObject constant, JVMCI_TRAPS) {
/*
* This method needs to return a raw (untyped) pointer, since the value of a pointer to the base
* class is in general not equal to the pointer of the subclass. When patching metaspace pointers,
* the compiler expects a direct pointer to the subclass (Klass* or Method*), not a pointer to the
* base class (Metadata* or MetaspaceObj*).
*/
- oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
- if (obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
- Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
- assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed klass pointer %s @ " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass));
+ JVMCIObject obj = jvmci_env()->get_HotSpotMetaspaceConstantImpl_metaspaceObject(constant);
+ if (jvmci_env()->isa_HotSpotResolvedObjectTypeImpl(obj)) {
+ Klass* klass = JVMCIENV->asKlass(obj);
+ assert(!jvmci_env()->get_HotSpotMetaspaceConstantImpl_compressed(constant), "unexpected compressed klass pointer %s @ " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass));
int index = _oop_recorder->find_index(klass);
section->relocate(dest, metadata_Relocation::spec(index));
TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
return klass;
- } else if (obj->is_a(HotSpotResolvedJavaMethodImpl::klass())) {
- Method* method = (Method*) (address) HotSpotResolvedJavaMethodImpl::metaspaceMethod(obj);
- assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed method pointer %s @ " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method));
+ } else if (jvmci_env()->isa_HotSpotResolvedJavaMethodImpl(obj)) {
+ Method* method = jvmci_env()->asMethod(obj);
+ assert(!jvmci_env()->get_HotSpotMetaspaceConstantImpl_compressed(constant), "unexpected compressed method pointer %s @ " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method));
int index = _oop_recorder->find_index(method);
section->relocate(dest, metadata_Relocation::spec(index));
TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), method->name()->as_C_string());
return method;
} else {
- JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", obj->klass()->signature_name());
+ JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", jvmci_env()->klass_name(obj));
}
}
#ifdef _LP64
-narrowKlass CodeInstaller::record_narrow_metadata_reference(CodeSection* section, address dest, Handle constant, TRAPS) {
- oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
- assert(HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected uncompressed pointer");
+narrowKlass CodeInstaller::record_narrow_metadata_reference(CodeSection* section, address dest, JVMCIObject constant, JVMCI_TRAPS) {
+ JVMCIObject obj = jvmci_env()->get_HotSpotMetaspaceConstantImpl_metaspaceObject(constant);
+ assert(jvmci_env()->get_HotSpotMetaspaceConstantImpl_compressed(constant), "unexpected uncompressed pointer");
- if (!obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
- JVMCI_ERROR_0("unexpected compressed pointer of type %s", obj->klass()->signature_name());
+ if (!jvmci_env()->isa_HotSpotResolvedObjectTypeImpl(obj)) {
+ JVMCI_ERROR_0("unexpected compressed pointer of type %s", jvmci_env()->klass_name(obj));
}
- Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
+ Klass* klass = JVMCIENV->asKlass(obj);
int index = _oop_recorder->find_index(klass);
section->relocate(dest, metadata_Relocation::spec(index));
TRACE_jvmci_3("narrowKlass[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
@@ -316,34 +272,34 @@
}
#endif
-Location::Type CodeInstaller::get_oop_type(Thread* thread, Handle value) {
- Handle valueKind(thread, Value::valueKind(value));
- Handle platformKind(thread, ValueKind::platformKind(valueKind));
+Location::Type CodeInstaller::get_oop_type(JVMCIObject value) {
+ JVMCIObject valueKind = jvmci_env()->get_Value_valueKind(value);
+ JVMCIObject platformKind = jvmci_env()->get_ValueKind_platformKind(valueKind);
- if (platformKind == word_kind()) {
+ if (jvmci_env()->equals(platformKind, word_kind())) {
return Location::oop;
} else {
return Location::narrowoop;
}
}
-ScopeValue* CodeInstaller::get_scope_value(Handle value, BasicType type, GrowableArray<ScopeValue*>* objects, ScopeValue* &second, TRAPS) {
+ScopeValue* CodeInstaller::get_scope_value(JVMCIObject value, BasicType type, GrowableArray<ScopeValue*>* objects, ScopeValue* &second, JVMCI_TRAPS) {
second = NULL;
if (value.is_null()) {
- THROW_NULL(vmSymbols::java_lang_NullPointerException());
- } else if (value == Value::ILLEGAL()) {
+ JVMCI_THROW_NULL(NullPointerException);
+ } else if (JVMCIENV->equals(value, jvmci_env()->get_Value_ILLEGAL())) {
if (type != T_ILLEGAL) {
JVMCI_ERROR_NULL("unexpected illegal value, expected %s", basictype_to_str(type));
}
return _illegal_value;
- } else if (value->is_a(RegisterValue::klass())) {
- Handle reg(THREAD, RegisterValue::reg(value));
- jint number = code_Register::number(reg);
- VMReg hotspotRegister = get_hotspot_reg(number, CHECK_NULL);
+ } else if (jvmci_env()->isa_RegisterValue(value)) {
+ JVMCIObject reg = jvmci_env()->get_RegisterValue_reg(value);
+ jint number = jvmci_env()->get_code_Register_number(reg);
+ VMReg hotspotRegister = get_hotspot_reg(number, JVMCI_CHECK_NULL);
if (is_general_purpose_reg(hotspotRegister)) {
Location::Type locationType;
if (type == T_OBJECT) {
- locationType = get_oop_type(THREAD, value);
+ locationType = get_oop_type(value);
} else if (type == T_LONG) {
locationType = Location::lng;
} else if (type == T_INT || type == T_FLOAT || type == T_SHORT || type == T_CHAR || type == T_BYTE || type == T_BOOLEAN) {
@@ -372,15 +328,15 @@
}
return value;
}
- } else if (value->is_a(StackSlot::klass())) {
- jint offset = StackSlot::offset(value);
- if (StackSlot::addFrameSize(value)) {
+ } else if (jvmci_env()->isa_StackSlot(value)) {
+ jint offset = jvmci_env()->get_StackSlot_offset(value);
+ if (jvmci_env()->get_StackSlot_addFrameSize(value)) {
offset += _total_frame_size;
}
Location::Type locationType;
if (type == T_OBJECT) {
- locationType = get_oop_type(THREAD, value);
+ locationType = get_oop_type(value);
} else if (type == T_LONG) {
locationType = Location::lng;
} else if (type == T_DOUBLE) {
@@ -395,19 +351,18 @@
second = value;
}
return value;
- } else if (value->is_a(JavaConstant::klass())) {
- if (value->is_a(PrimitiveConstant::klass())) {
- if (value->is_a(RawConstant::klass())) {
- jlong prim = PrimitiveConstant::primitive(value);
+ } else if (jvmci_env()->isa_JavaConstant(value)) {
+ if (jvmci_env()->isa_PrimitiveConstant(value)) {
+ if (jvmci_env()->isa_RawConstant(value)) {
+ jlong prim = jvmci_env()->get_PrimitiveConstant_primitive(value);
return new ConstantLongValue(prim);
} else {
- Handle primitive_constant_kind(THREAD, PrimitiveConstant::kind(value));
- BasicType constantType = JVMCIRuntime::kindToBasicType(primitive_constant_kind, CHECK_NULL);
+ BasicType constantType = jvmci_env()->kindToBasicType(jvmci_env()->get_PrimitiveConstant_kind(value), JVMCI_CHECK_NULL);
if (type != constantType) {
JVMCI_ERROR_NULL("primitive constant type doesn't match, expected %s but got %s", basictype_to_str(type), basictype_to_str(constantType));
}
if (type == T_INT || type == T_FLOAT) {
- jint prim = (jint)PrimitiveConstant::primitive(value);
+ jint prim = (jint)jvmci_env()->get_PrimitiveConstant_primitive(value);
switch (prim) {
case -1: return _int_m1_scope_value;
case 0: return _int_0_scope_value;
@@ -416,33 +371,33 @@
default: return new ConstantIntValue(prim);
}
} else if (type == T_LONG || type == T_DOUBLE) {
- jlong prim = PrimitiveConstant::primitive(value);
+ jlong prim = jvmci_env()->get_PrimitiveConstant_primitive(value);
second = _int_1_scope_value;
return new ConstantLongValue(prim);
} else {
JVMCI_ERROR_NULL("unexpected primitive constant type %s", basictype_to_str(type));
}
}
- } else if (value->is_a(NullConstant::klass()) || value->is_a(HotSpotCompressedNullConstant::klass())) {
+ } else if (jvmci_env()->isa_NullConstant(value) || jvmci_env()->isa_HotSpotCompressedNullConstant(value)) {
if (type == T_OBJECT) {
return _oop_null_scope_value;
} else {
JVMCI_ERROR_NULL("unexpected null constant, expected %s", basictype_to_str(type));
}
- } else if (value->is_a(HotSpotObjectConstantImpl::klass())) {
+ } else if (jvmci_env()->isa_HotSpotObjectConstantImpl(value)) {
if (type == T_OBJECT) {
- oop obj = HotSpotObjectConstantImpl::object(value);
+ Handle obj = jvmci_env()->asConstant(value, JVMCI_CHECK_NULL);
if (obj == NULL) {
JVMCI_ERROR_NULL("null value must be in NullConstant");
}
- return new ConstantOopWriteValue(JNIHandles::make_local(obj));
+ return new ConstantOopWriteValue(JNIHandles::make_local(obj()));
} else {
JVMCI_ERROR_NULL("unexpected object constant, expected %s", basictype_to_str(type));
}
}
- } else if (value->is_a(VirtualObject::klass())) {
+ } else if (jvmci_env()->isa_VirtualObject(value)) {
if (type == T_OBJECT) {
- int id = VirtualObject::id(value);
+ int id = jvmci_env()->get_VirtualObject_id(value);
if (0 <= id && id < objects->length()) {
ScopeValue* object = objects->at(id);
if (object != NULL) {
@@ -455,26 +410,22 @@
}
}
- JVMCI_ERROR_NULL("unexpected value in scope: %s", value->klass()->signature_name())
+ JVMCI_ERROR_NULL("unexpected value in scope: %s", jvmci_env()->klass_name(value))
}
-void CodeInstaller::record_object_value(ObjectValue* sv, Handle value, GrowableArray<ScopeValue*>* objects, TRAPS) {
- // Might want a HandleMark here.
- Handle type(THREAD, VirtualObject::type(value));
- int id = VirtualObject::id(value);
- oop javaMirror = HotSpotResolvedObjectTypeImpl::javaClass(type);
- Klass* klass = java_lang_Class::as_Klass(javaMirror);
+void CodeInstaller::record_object_value(ObjectValue* sv, JVMCIObject value, GrowableArray<ScopeValue*>* objects, JVMCI_TRAPS) {
+ JVMCIObject type = jvmci_env()->get_VirtualObject_type(value);
+ int id = jvmci_env()->get_VirtualObject_id(value);
+ Klass* klass = JVMCIENV->asKlass(type);
bool isLongArray = klass == Universe::longArrayKlassObj();
- objArrayHandle values(THREAD, VirtualObject::values(value));
- objArrayHandle slotKinds(THREAD, VirtualObject::slotKinds(value));
- for (jint i = 0; i < values->length(); i++) {
- HandleMark hm(THREAD);
+ JVMCIObjectArray values = jvmci_env()->get_VirtualObject_values(value);
+ JVMCIObjectArray slotKinds = jvmci_env()->get_VirtualObject_slotKinds(value);
+ for (jint i = 0; i < JVMCIENV->get_length(values); i++) {
ScopeValue* cur_second = NULL;
- Handle object(THREAD, values->obj_at(i));
- Handle slot_kind (THREAD, slotKinds->obj_at(i));
- BasicType type = JVMCIRuntime::kindToBasicType(slot_kind, CHECK);
- ScopeValue* value = get_scope_value(object, type, objects, cur_second, CHECK);
+ JVMCIObject object = JVMCIENV->get_object_at(values, i);
+ BasicType type = jvmci_env()->kindToBasicType(JVMCIENV->get_object_at(slotKinds, i), JVMCI_CHECK);
+ ScopeValue* value = get_scope_value(object, type, objects, cur_second, JVMCI_CHECK);
if (isLongArray && cur_second == NULL) {
// we're trying to put ints into a long array... this isn't really valid, but it's used for some optimizations.
@@ -490,68 +441,65 @@
}
}
-MonitorValue* CodeInstaller::get_monitor_value(Handle value, GrowableArray<ScopeValue*>* objects, TRAPS) {
+MonitorValue* CodeInstaller::get_monitor_value(JVMCIObject value, GrowableArray<ScopeValue*>* objects, JVMCI_TRAPS) {
if (value.is_null()) {
- THROW_NULL(vmSymbols::java_lang_NullPointerException());
+ JVMCI_THROW_NULL(NullPointerException);
}
- if (!value->is_a(StackLockValue::klass())) {
- JVMCI_ERROR_NULL("Monitors must be of type StackLockValue, got %s", value->klass()->signature_name());
+ if (!jvmci_env()->isa_StackLockValue(value)) {
+ JVMCI_ERROR_NULL("Monitors must be of type StackLockValue, got %s", jvmci_env()->klass_name(value));
}
ScopeValue* second = NULL;
- Handle stack_lock_owner(THREAD, StackLockValue::owner(value));
- ScopeValue* owner_value = get_scope_value(stack_lock_owner, T_OBJECT, objects, second, CHECK_NULL);
+ ScopeValue* owner_value = get_scope_value(jvmci_env()->get_StackLockValue_owner(value), T_OBJECT, objects, second, JVMCI_CHECK_NULL);
assert(second == NULL, "monitor cannot occupy two stack slots");
- Handle stack_lock_slot(THREAD, StackLockValue::slot(value));
- ScopeValue* lock_data_value = get_scope_value(stack_lock_slot, T_LONG, objects, second, CHECK_NULL);
+ ScopeValue* lock_data_value = get_scope_value(jvmci_env()->get_StackLockValue_slot(value), T_LONG, objects, second, JVMCI_CHECK_NULL);
assert(second == lock_data_value, "monitor is LONG value that occupies two stack slots");
assert(lock_data_value->is_location(), "invalid monitor location");
Location lock_data_loc = ((LocationValue*)lock_data_value)->location();
bool eliminated = false;
- if (StackLockValue::eliminated(value)) {
+ if (jvmci_env()->get_StackLockValue_eliminated(value)) {
eliminated = true;
}
return new MonitorValue(owner_value, lock_data_loc, eliminated);
}
-void CodeInstaller::initialize_dependencies(oop compiled_code, OopRecorder* recorder, TRAPS) {
+void CodeInstaller::initialize_dependencies(JVMCIObject compiled_code, OopRecorder* oop_recorder, JVMCI_TRAPS) {
JavaThread* thread = JavaThread::current();
- assert(THREAD == thread, "");
CompilerThread* compilerThread = thread->is_Compiler_thread() ? thread->as_CompilerThread() : NULL;
- _oop_recorder = recorder;
+ _oop_recorder = oop_recorder;
_dependencies = new Dependencies(&_arena, _oop_recorder, compilerThread != NULL ? compilerThread->log() : NULL);
- objArrayHandle assumptions(THREAD, HotSpotCompiledCode::assumptions(compiled_code));
- if (!assumptions.is_null()) {
- int length = assumptions->length();
+ JVMCIObjectArray assumptions = jvmci_env()->get_HotSpotCompiledCode_assumptions(compiled_code);
+ if (assumptions.is_non_null()) {
+ int length = JVMCIENV->get_length(assumptions);
for (int i = 0; i < length; ++i) {
- Handle assumption(THREAD, assumptions->obj_at(i));
- if (!assumption.is_null()) {
- if (assumption->klass() == Assumptions_NoFinalizableSubclass::klass()) {
- assumption_NoFinalizableSubclass(THREAD, assumption);
- } else if (assumption->klass() == Assumptions_ConcreteSubtype::klass()) {
- assumption_ConcreteSubtype(THREAD, assumption);
- } else if (assumption->klass() == Assumptions_LeafType::klass()) {
- assumption_LeafType(THREAD, assumption);
- } else if (assumption->klass() == Assumptions_ConcreteMethod::klass()) {
- assumption_ConcreteMethod(THREAD, assumption);
- } else if (assumption->klass() == Assumptions_CallSiteTargetValue::klass()) {
- assumption_CallSiteTargetValue(THREAD, assumption);
+ JVMCIObject assumption = JVMCIENV->get_object_at(assumptions, i);
+ if (assumption.is_non_null()) {
+ if (jvmci_env()->isa_Assumptions_NoFinalizableSubclass(assumption)) {
+ assumption_NoFinalizableSubclass(assumption);
+ } else if (jvmci_env()->isa_Assumptions_ConcreteSubtype(assumption)) {
+ assumption_ConcreteSubtype(assumption);
+ } else if (jvmci_env()->isa_Assumptions_LeafType(assumption)) {
+ assumption_LeafType(assumption);
+ } else if (jvmci_env()->isa_Assumptions_ConcreteMethod(assumption)) {
+ assumption_ConcreteMethod(assumption);
+ } else if (jvmci_env()->isa_Assumptions_CallSiteTargetValue(assumption)) {
+ assumption_CallSiteTargetValue(assumption, JVMCI_CHECK);
} else {
- JVMCI_ERROR("unexpected Assumption subclass %s", assumption->klass()->signature_name());
+ JVMCI_ERROR("unexpected Assumption subclass %s", jvmci_env()->klass_name(assumption));
}
}
}
}
if (JvmtiExport::can_hotswap_or_post_breakpoint()) {
- objArrayHandle methods(THREAD, HotSpotCompiledCode::methods(compiled_code));
- if (!methods.is_null()) {
- int length = methods->length();
+ JVMCIObjectArray methods = jvmci_env()->get_HotSpotCompiledCode_methods(compiled_code);
+ if (methods.is_non_null()) {
+ int length = JVMCIENV->get_length(methods);
for (int i = 0; i < length; ++i) {
- Handle method_handle(THREAD, methods->obj_at(i));
- methodHandle method = getMethodFromHotSpotMethod(method_handle());
+ JVMCIObject method_handle = JVMCIENV->get_object_at(methods, i);
+ methodHandle method = jvmci_env()->asMethod(method_handle);
_dependencies->assert_evol_method(method());
}
}
@@ -581,16 +529,16 @@
assert(_buffer == NULL, "can only be used once");
assert(_size == 0, "can only be used once");
if (bytes >= RelocBuffer::stack_size) {
- _buffer = NEW_C_HEAP_ARRAY(char, bytes, mtInternal);
+ _buffer = NEW_C_HEAP_ARRAY(char, bytes, mtJVMCI);
}
_size = bytes;
}
-JVMCIEnv::CodeInstallResult CodeInstaller::gather_metadata(Handle target, Handle compiled_code, CodeMetadata& metadata, TRAPS) {
+JVMCI::CodeInstallResult CodeInstaller::gather_metadata(JVMCIObject target, JVMCIObject compiled_code, CodeMetadata& metadata, JVMCI_TRAPS) {
+ assert(JVMCIENV->is_hotspot(), "AOT code is executed only in HotSpot mode");
CodeBuffer buffer("JVMCI Compiler CodeBuffer for Metadata");
- jobject compiled_code_obj = JNIHandles::make_local(compiled_code());
- AOTOopRecorder* recorder = new AOTOopRecorder(&_arena, true);
- initialize_dependencies(JNIHandles::resolve(compiled_code_obj), recorder, CHECK_OK);
+ AOTOopRecorder* recorder = new AOTOopRecorder(this, &_arena, true);
+ initialize_dependencies(compiled_code, recorder, JVMCI_CHECK_OK);
metadata.set_oop_recorder(recorder);
@@ -599,9 +547,9 @@
_constants = buffer.consts();
buffer.set_immutable_PIC(_immutable_pic_compilation);
- initialize_fields(target(), JNIHandles::resolve(compiled_code_obj), CHECK_OK);
- JVMCIEnv::CodeInstallResult result = initialize_buffer(buffer, false, CHECK_OK);
- if (result != JVMCIEnv::ok) {
+ initialize_fields(target, compiled_code, JVMCI_CHECK_OK);
+ JVMCI::CodeInstallResult result = initialize_buffer(buffer, false, JVMCI_CHECK_OK);
+ if (result != JVMCI::ok) {
return result;
}
@@ -618,16 +566,24 @@
reloc_buffer->ensure_size(buffer.total_relocation_size());
size_t size = (size_t) buffer.copy_relocations_to(reloc_buffer->begin(), (CodeBuffer::csize_t) reloc_buffer->size(), true);
reloc_buffer->set_size(size);
- return JVMCIEnv::ok;
+ return JVMCI::ok;
}
#endif // INCLUDE_AOT
// constructor used to create a method
-JVMCIEnv::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler, Handle target, Handle compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log, TRAPS) {
+JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
+ JVMCIObject target,
+ JVMCIObject compiled_code,
+ CodeBlob*& cb,
+ JVMCIObject installed_code,
+ FailedSpeculation** failed_speculations,
+ char* speculations,
+ int speculations_len,
+ JVMCI_TRAPS) {
+
CodeBuffer buffer("JVMCI Compiler CodeBuffer");
- jobject compiled_code_obj = JNIHandles::make_local(compiled_code());
OopRecorder* recorder = new OopRecorder(&_arena, true);
- initialize_dependencies(JNIHandles::resolve(compiled_code_obj), recorder, CHECK_OK);
+ initialize_dependencies(compiled_code, recorder, JVMCI_CHECK_OK);
// Get instructions and constants CodeSections early because we need it.
_instructions = buffer.insts();
@@ -636,44 +592,55 @@
buffer.set_immutable_PIC(_immutable_pic_compilation);
#endif
- initialize_fields(target(), JNIHandles::resolve(compiled_code_obj), CHECK_OK);
- JVMCIEnv::CodeInstallResult result = initialize_buffer(buffer, true, CHECK_OK);
- if (result != JVMCIEnv::ok) {
+ initialize_fields(target, compiled_code, JVMCI_CHECK_OK);
+ JVMCI::CodeInstallResult result = initialize_buffer(buffer, true, JVMCI_CHECK_OK);
+ if (result != JVMCI::ok) {
return result;
}
int stack_slots = _total_frame_size / HeapWordSize; // conversion to words
- if (!compiled_code->is_a(HotSpotCompiledNmethod::klass())) {
- oop stubName = HotSpotCompiledCode::name(compiled_code_obj);
- if (stubName == NULL) {
+ if (!jvmci_env()->isa_HotSpotCompiledNmethod(compiled_code)) {
+ JVMCIObject stubName = jvmci_env()->get_HotSpotCompiledCode_name(compiled_code);
+ if (stubName.is_null()) {
JVMCI_ERROR_OK("stub should have a name");
}
- char* name = strdup(java_lang_String::as_utf8_string(stubName));
+ char* name = strdup(jvmci_env()->as_utf8_string(stubName));
cb = RuntimeStub::new_runtime_stub(name,
&buffer,
CodeOffsets::frame_never_safe,
stack_slots,
_debug_recorder->_oopmaps,
false);
- result = JVMCIEnv::ok;
+ result = JVMCI::ok;
} else {
- nmethod* nm = NULL;
- methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code));
- jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code);
- jint id = HotSpotCompiledNmethod::id(compiled_code);
- bool has_unsafe_access = HotSpotCompiledNmethod::hasUnsafeAccess(compiled_code) == JNI_TRUE;
- JVMCIEnv* env = (JVMCIEnv*) (address) HotSpotCompiledNmethod::jvmciEnv(compiled_code);
+ JVMCICompileState* compile_state = (JVMCICompileState*) (address) jvmci_env()->get_HotSpotCompiledNmethod_compileState(compiled_code);
+ if (compile_state != NULL) {
+ jvmci_env()->set_compile_state(compile_state);
+ }
+
+ methodHandle method = jvmci_env()->asMethod(jvmci_env()->get_HotSpotCompiledNmethod_method(compiled_code));
+ jint entry_bci = jvmci_env()->get_HotSpotCompiledNmethod_entryBCI(compiled_code);
+ bool has_unsafe_access = jvmci_env()->get_HotSpotCompiledNmethod_hasUnsafeAccess(compiled_code) == JNI_TRUE;
+ jint id = jvmci_env()->get_HotSpotCompiledNmethod_id(compiled_code);
if (id == -1) {
// Make sure a valid compile_id is associated with every compile
id = CompileBroker::assign_compile_id_unlocked(Thread::current(), method, entry_bci);
+ jvmci_env()->set_HotSpotCompiledNmethod_id(compiled_code, id);
}
- result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _orig_pc_offset, &buffer,
- stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
- compiler, _debug_recorder, _dependencies, env, id,
- has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
+ if (!jvmci_env()->isa_HotSpotNmethod(installed_code)) {
+ JVMCI_THROW_MSG_(IllegalArgumentException, "InstalledCode object must be a HotSpotNmethod when installing a HotSpotCompiledNmethod", JVMCI::ok);
+ }
+
+ JVMCIObject mirror = installed_code;
+ nmethod* nm = NULL;
+ result = runtime()->register_method(jvmci_env(), method, nm, entry_bci, &_offsets, _orig_pc_offset, &buffer,
+ stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
+ compiler, _debug_recorder, _dependencies, id,
+ has_unsafe_access, _has_wide_vector, compiled_code, mirror,
+ failed_speculations, speculations, speculations_len);
cb = nm->as_codeblob_or_null();
- if (nm != NULL && env == NULL) {
+ if (nm != NULL && compile_state == NULL) {
DirectiveSet* directive = DirectivesStack::getMatchingDirective(method, compiler);
bool printnmethods = directive->PrintAssemblyOption || directive->PrintNMethodsOption;
if (!printnmethods && (PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers)) {
@@ -690,10 +657,10 @@
return result;
}
-void CodeInstaller::initialize_fields(oop target, oop compiled_code, TRAPS) {
- if (compiled_code->is_a(HotSpotCompiledNmethod::klass())) {
- Handle hotspotJavaMethod(THREAD, HotSpotCompiledNmethod::method(compiled_code));
- methodHandle method = getMethodFromHotSpotMethod(hotspotJavaMethod());
+void CodeInstaller::initialize_fields(JVMCIObject target, JVMCIObject compiled_code, JVMCI_TRAPS) {
+ if (jvmci_env()->isa_HotSpotCompiledNmethod(compiled_code)) {
+ JVMCIObject hotspotJavaMethod = jvmci_env()->get_HotSpotCompiledNmethod_method(compiled_code);
+ methodHandle method = jvmci_env()->asMethod(hotspotJavaMethod);
_parameter_count = method->size_of_parameters();
TRACE_jvmci_2("installing code for %s", method->name_and_sig_as_C_string());
} else {
@@ -701,18 +668,18 @@
// Only used in OopMap constructor for non-product builds
_parameter_count = 0;
}
- _sites_handle = JNIHandles::make_local(HotSpotCompiledCode::sites(compiled_code));
+ _sites_handle = jvmci_env()->get_HotSpotCompiledCode_sites(compiled_code);
- _code_handle = JNIHandles::make_local(HotSpotCompiledCode::targetCode(compiled_code));
- _code_size = HotSpotCompiledCode::targetCodeSize(compiled_code);
- _total_frame_size = HotSpotCompiledCode::totalFrameSize(compiled_code);
+ _code_handle = jvmci_env()->get_HotSpotCompiledCode_targetCode(compiled_code);
+ _code_size = jvmci_env()->get_HotSpotCompiledCode_targetCodeSize(compiled_code);
+ _total_frame_size = jvmci_env()->get_HotSpotCompiledCode_totalFrameSize(compiled_code);
- oop deoptRescueSlot = HotSpotCompiledCode::deoptRescueSlot(compiled_code);
- if (deoptRescueSlot == NULL) {
+ JVMCIObject deoptRescueSlot = jvmci_env()->get_HotSpotCompiledCode_deoptRescueSlot(compiled_code);
+ if (deoptRescueSlot.is_null()) {
_orig_pc_offset = -1;
} else {
- _orig_pc_offset = StackSlot::offset(deoptRescueSlot);
- if (StackSlot::addFrameSize(deoptRescueSlot)) {
+ _orig_pc_offset = jvmci_env()->get_StackSlot_offset(deoptRescueSlot);
+ if (jvmci_env()->get_StackSlot_addFrameSize(deoptRescueSlot)) {
_orig_pc_offset += _total_frame_size;
}
if (_orig_pc_offset < 0) {
@@ -721,62 +688,61 @@
}
// Pre-calculate the constants section size. This is required for PC-relative addressing.
- _data_section_handle = JNIHandles::make_local(HotSpotCompiledCode::dataSection(compiled_code));
- if ((_constants->alignment() % HotSpotCompiledCode::dataSectionAlignment(compiled_code)) != 0) {
- JVMCI_ERROR("invalid data section alignment: %d", HotSpotCompiledCode::dataSectionAlignment(compiled_code));
+ _data_section_handle = jvmci_env()->get_HotSpotCompiledCode_dataSection(compiled_code);
+ if ((_constants->alignment() % jvmci_env()->get_HotSpotCompiledCode_dataSectionAlignment(compiled_code)) != 0) {
+ JVMCI_ERROR("invalid data section alignment: %d", jvmci_env()->get_HotSpotCompiledCode_dataSectionAlignment(compiled_code));
}
- _constants_size = data_section()->length();
+ _constants_size = JVMCIENV->get_length(data_section());
- _data_section_patches_handle = JNIHandles::make_local(HotSpotCompiledCode::dataSectionPatches(compiled_code));
+ _data_section_patches_handle = jvmci_env()->get_HotSpotCompiledCode_dataSectionPatches(compiled_code);
#ifndef PRODUCT
- _comments_handle = JNIHandles::make_local(HotSpotCompiledCode::comments(compiled_code));
+ _comments_handle = jvmci_env()->get_HotSpotCompiledCode_comments(compiled_code);
#endif
_next_call_type = INVOKE_INVALID;
_has_wide_vector = false;
- oop arch = TargetDescription::arch(target);
- _word_kind_handle = JNIHandles::make_local(Architecture::wordKind(arch));
+ JVMCIObject arch = jvmci_env()->get_TargetDescription_arch(target);
+ _word_kind_handle = jvmci_env()->get_Architecture_wordKind(arch);
}
-int CodeInstaller::estimate_stubs_size(TRAPS) {
+int CodeInstaller::estimate_stubs_size(JVMCI_TRAPS) {
// Estimate the number of static and aot call stubs that might be emitted.
int static_call_stubs = 0;
int aot_call_stubs = 0;
int trampoline_stubs = 0;
- objArrayOop sites = this->sites();
- for (int i = 0; i < sites->length(); i++) {
- oop site = sites->obj_at(i);
- if (site != NULL) {
- if (site->is_a(site_Mark::klass())) {
- oop id_obj = site_Mark::id(site);
- if (id_obj != NULL) {
- if (!java_lang_boxing_object::is_instance(id_obj, T_INT)) {
- JVMCI_ERROR_0("expected Integer id, got %s", id_obj->klass()->signature_name());
+ JVMCIObjectArray sites = this->sites();
+ for (int i = 0; i < JVMCIENV->get_length(sites); i++) {
+ JVMCIObject site = JVMCIENV->get_object_at(sites, i);
+ if (!site.is_null()) {
+ if (jvmci_env()->isa_site_Mark(site)) {
+ JVMCIObject id_obj = jvmci_env()->get_site_Mark_id(site);
+ if (id_obj.is_non_null()) {
+ if (!jvmci_env()->is_boxing_object(T_INT, id_obj)) {
+ JVMCI_ERROR_0("expected Integer id, got %s", jvmci_env()->klass_name(id_obj));
}
- jint id = id_obj->int_field(java_lang_boxing_object::value_offset_in_bytes(T_INT));
+ jint id = jvmci_env()->get_boxed_value(T_INT, id_obj).i;
switch (id) {
- case INVOKEINTERFACE:
- case INVOKEVIRTUAL:
- trampoline_stubs++;
- break;
- case INVOKESTATIC:
- case INVOKESPECIAL:
- static_call_stubs++;
- trampoline_stubs++;
- break;
- default:
- break;
+ case INVOKEINTERFACE:
+ case INVOKEVIRTUAL:
+ trampoline_stubs++;
+ break;
+ case INVOKESTATIC:
+ case INVOKESPECIAL:
+ static_call_stubs++;
+ trampoline_stubs++;
+ break;
+ default:
+ break;
}
}
}
#if INCLUDE_AOT
- if (UseAOT && site->is_a(site_Call::klass())) {
- oop target = site_Call::target(site);
- InstanceKlass* target_klass = InstanceKlass::cast(target->klass());
- if (!target_klass->is_subclass_of(SystemDictionary::HotSpotForeignCallTarget_klass())) {
+ if (UseAOT && jvmci_env()->isa_site_Call(site)) {
+ JVMCIObject target = jvmci_env()-> get_site_Call_target(site);
+ if (!jvmci_env()->isa_HotSpotForeignCallTarget(target)) {
// Add far aot trampolines.
aot_call_stubs++;
}
@@ -793,25 +759,25 @@
}
// perform data and call relocation on the CodeBuffer
-JVMCIEnv::CodeInstallResult CodeInstaller::initialize_buffer(CodeBuffer& buffer, bool check_size, TRAPS) {
+JVMCI::CodeInstallResult CodeInstaller::initialize_buffer(CodeBuffer& buffer, bool check_size, JVMCI_TRAPS) {
HandleMark hm;
- objArrayHandle sites(THREAD, this->sites());
- int locs_buffer_size = sites->length() * (relocInfo::length_limit + sizeof(relocInfo));
+ JVMCIObjectArray sites = this->sites();
+ int locs_buffer_size = JVMCIENV->get_length(sites) * (relocInfo::length_limit + sizeof(relocInfo));
// Allocate enough space in the stub section for the static call
// stubs. Stubs have extra relocs but they are managed by the stub
// section itself so they don't need to be accounted for in the
// locs_buffer above.
- int stubs_size = estimate_stubs_size(CHECK_OK);
+ int stubs_size = estimate_stubs_size(JVMCI_CHECK_OK);
int total_size = align_up(_code_size, buffer.insts()->alignment()) + align_up(_constants_size, buffer.consts()->alignment()) + align_up(stubs_size, buffer.stubs()->alignment());
if (check_size && total_size > JVMCINMethodSizeLimit) {
- return JVMCIEnv::code_too_large;
+ return JVMCI::code_too_large;
}
buffer.initialize(total_size, locs_buffer_size);
if (buffer.blob() == NULL) {
- return JVMCIEnv::cache_full;
+ return JVMCI::cache_full;
}
buffer.initialize_stubs_size(stubs_size);
buffer.initialize_consts_size(_constants_size);
@@ -823,49 +789,49 @@
// copy the constant data into the newly created CodeBuffer
address end_data = _constants->start() + _constants_size;
- memcpy(_constants->start(), data_section()->base(T_BYTE), _constants_size);
+ JVMCIENV->copy_bytes_to(data_section(), (jbyte*) _constants->start(), 0, _constants_size);
_constants->set_end(end_data);
// copy the code into the newly created CodeBuffer
address end_pc = _instructions->start() + _code_size;
guarantee(_instructions->allocates2(end_pc), "initialize should have reserved enough space for all the code");
- memcpy(_instructions->start(), code()->base(T_BYTE), _code_size);
+ JVMCIENV->copy_bytes_to(code(), (jbyte*) _instructions->start(), 0, _code_size);
_instructions->set_end(end_pc);
- for (int i = 0; i < data_section_patches()->length(); i++) {
- HandleMark hm(THREAD);
- Handle patch(THREAD, data_section_patches()->obj_at(i));
+ for (int i = 0; i < JVMCIENV->get_length(data_section_patches()); i++) {
+ // HandleMark hm(THREAD);
+ JVMCIObject patch = JVMCIENV->get_object_at(data_section_patches(), i);
if (patch.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), JVMCIEnv::ok);
+ JVMCI_THROW_(NullPointerException, JVMCI::ok);
}
- Handle reference(THREAD, site_DataPatch::reference(patch));
+ JVMCIObject reference = jvmci_env()->get_site_DataPatch_reference(patch);
if (reference.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), JVMCIEnv::ok);
+ JVMCI_THROW_(NullPointerException, JVMCI::ok);
}
- if (!reference->is_a(site_ConstantReference::klass())) {
- JVMCI_ERROR_OK("invalid patch in data section: %s", reference->klass()->signature_name());
+ if (!jvmci_env()->isa_site_ConstantReference(reference)) {
+ JVMCI_ERROR_OK("invalid patch in data section: %s", jvmci_env()->klass_name(reference));
}
- Handle constant(THREAD, site_ConstantReference::constant(reference));
+ JVMCIObject constant = jvmci_env()->get_site_ConstantReference_constant(reference);
if (constant.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), JVMCIEnv::ok);
+ JVMCI_THROW_(NullPointerException, JVMCI::ok);
}
- address dest = _constants->start() + site_Site::pcOffset(patch);
- if (constant->is_a(HotSpotMetaspaceConstantImpl::klass())) {
- if (HotSpotMetaspaceConstantImpl::compressed(constant)) {
+ address dest = _constants->start() + jvmci_env()->get_site_Site_pcOffset(patch);
+ if (jvmci_env()->isa_HotSpotMetaspaceConstantImpl(constant)) {
+ if (jvmci_env()->get_HotSpotMetaspaceConstantImpl_compressed(constant)) {
#ifdef _LP64
- *((narrowKlass*) dest) = record_narrow_metadata_reference(_constants, dest, constant, CHECK_OK);
+ *((narrowKlass*) dest) = record_narrow_metadata_reference(_constants, dest, constant, JVMCI_CHECK_OK);
#else
JVMCI_ERROR_OK("unexpected compressed Klass* in 32-bit mode");
#endif
} else {
- *((void**) dest) = record_metadata_reference(_constants, dest, constant, CHECK_OK);
+ *((void**) dest) = record_metadata_reference(_constants, dest, constant, JVMCI_CHECK_OK);
}
- } else if (constant->is_a(HotSpotObjectConstantImpl::klass())) {
- Handle obj(THREAD, HotSpotObjectConstantImpl::object(constant));
+ } else if (jvmci_env()->isa_HotSpotObjectConstantImpl(constant)) {
+ Handle obj = jvmci_env()->asConstant(constant, JVMCI_CHECK_OK);
jobject value = JNIHandles::make_local(obj());
int oop_index = _oop_recorder->find_index(value);
- if (HotSpotObjectConstantImpl::compressed(constant)) {
+ if (jvmci_env()->get_HotSpotObjectConstantImpl_compressed(constant)) {
#ifdef _LP64
_constants->relocate(dest, oop_Relocation::spec(oop_index), relocInfo::narrow_oop_in_const);
#else
@@ -875,46 +841,48 @@
_constants->relocate(dest, oop_Relocation::spec(oop_index));
}
} else {
- JVMCI_ERROR_OK("invalid constant in data section: %s", constant->klass()->signature_name());
+ JVMCI_ERROR_OK("invalid constant in data section: %s", jvmci_env()->klass_name(constant));
}
}
jint last_pc_offset = -1;
- for (int i = 0; i < sites->length(); i++) {
- HandleMark hm(THREAD);
- Handle site(THREAD, sites->obj_at(i));
+ for (int i = 0; i < JVMCIENV->get_length(sites); i++) {
+ // HandleMark hm(THREAD);
+ JVMCIObject site = JVMCIENV->get_object_at(sites, i);
if (site.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), JVMCIEnv::ok);
+ JVMCI_THROW_(NullPointerException, JVMCI::ok);
}
- jint pc_offset = site_Site::pcOffset(site);
+ jint pc_offset = jvmci_env()->get_site_Site_pcOffset(site);
- if (site->is_a(site_Call::klass())) {
+ if (jvmci_env()->isa_site_Call(site)) {
TRACE_jvmci_4("call at %i", pc_offset);
- site_Call(buffer, pc_offset, site, CHECK_OK);
- } else if (site->is_a(site_Infopoint::klass())) {
+ site_Call(buffer, pc_offset, site, JVMCI_CHECK_OK);
+ } else if (jvmci_env()->isa_site_Infopoint(site)) {
// three reasons for infopoints denote actual safepoints
- oop reason = site_Infopoint::reason(site);
- if (site_InfopointReason::SAFEPOINT() == reason || site_InfopointReason::CALL() == reason || site_InfopointReason::IMPLICIT_EXCEPTION() == reason) {
+ JVMCIObject reason = jvmci_env()->get_site_Infopoint_reason(site);
+ if (JVMCIENV->equals(reason, jvmci_env()->get_site_InfopointReason_SAFEPOINT()) ||
+ JVMCIENV->equals(reason, jvmci_env()->get_site_InfopointReason_CALL()) ||
+ JVMCIENV->equals(reason, jvmci_env()->get_site_InfopointReason_IMPLICIT_EXCEPTION())) {
TRACE_jvmci_4("safepoint at %i", pc_offset);
- site_Safepoint(buffer, pc_offset, site, CHECK_OK);
+ site_Safepoint(buffer, pc_offset, site, JVMCI_CHECK_OK);
if (_orig_pc_offset < 0) {
JVMCI_ERROR_OK("method contains safepoint, but has no deopt rescue slot");
}
} else {
TRACE_jvmci_4("infopoint at %i", pc_offset);
- site_Infopoint(buffer, pc_offset, site, CHECK_OK);
+ site_Infopoint(buffer, pc_offset, site, JVMCI_CHECK_OK);
}
- } else if (site->is_a(site_DataPatch::klass())) {
+ } else if (jvmci_env()->isa_site_DataPatch(site)) {
TRACE_jvmci_4("datapatch at %i", pc_offset);
- site_DataPatch(buffer, pc_offset, site, CHECK_OK);
- } else if (site->is_a(site_Mark::klass())) {
+ site_DataPatch(buffer, pc_offset, site, JVMCI_CHECK_OK);
+ } else if (jvmci_env()->isa_site_Mark(site)) {
TRACE_jvmci_4("mark at %i", pc_offset);
- site_Mark(buffer, pc_offset, site, CHECK_OK);
- } else if (site->is_a(site_ExceptionHandler::klass())) {
+ site_Mark(buffer, pc_offset, site, JVMCI_CHECK_OK);
+ } else if (jvmci_env()->isa_site_ExceptionHandler(site)) {
TRACE_jvmci_4("exceptionhandler at %i", pc_offset);
site_ExceptionHandler(pc_offset, site);
} else {
- JVMCI_ERROR_OK("unexpected site subclass: %s", site->klass()->signature_name());
+ JVMCI_ERROR_OK("unexpected site subclass: %s", jvmci_env()->klass_name(site));
}
last_pc_offset = pc_offset;
@@ -926,61 +894,62 @@
}
#ifndef PRODUCT
- if (comments() != NULL) {
- for (int i = 0; i < comments()->length(); i++) {
- oop comment = comments()->obj_at(i);
- assert(comment->is_a(HotSpotCompiledCode_Comment::klass()), "cce");
- jint offset = HotSpotCompiledCode_Comment::pcOffset(comment);
- char* text = java_lang_String::as_utf8_string(HotSpotCompiledCode_Comment::text(comment));
+ if (comments().is_non_null()) {
+ for (int i = 0; i < JVMCIENV->get_length(comments()); i++) {
+ JVMCIObject comment = JVMCIENV->get_object_at(comments(), i);
+ assert(jvmci_env()->isa_HotSpotCompiledCode_Comment(comment), "cce");
+ jint offset = jvmci_env()->get_HotSpotCompiledCode_Comment_pcOffset(comment);
+ const char* text = jvmci_env()->as_utf8_string(jvmci_env()->get_HotSpotCompiledCode_Comment_text(comment));
buffer.block_comment(offset, text);
}
}
#endif
- return JVMCIEnv::ok;
+ return JVMCI::ok;
}
-void CodeInstaller::assumption_NoFinalizableSubclass(Thread* thread, Handle assumption) {
- Handle receiverType_handle (thread, Assumptions_NoFinalizableSubclass::receiverType(assumption()));
- Klass* receiverType = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(receiverType_handle));
+void CodeInstaller::assumption_NoFinalizableSubclass(JVMCIObject assumption) {
+ JVMCIObject receiverType_handle = jvmci_env()->get_Assumptions_NoFinalizableSubclass_receiverType(assumption);
+ Klass* receiverType = jvmci_env()->asKlass(receiverType_handle);
_dependencies->assert_has_no_finalizable_subclasses(receiverType);
}
-void CodeInstaller::assumption_ConcreteSubtype(Thread* thread, Handle assumption) {
- Handle context_handle (thread, Assumptions_ConcreteSubtype::context(assumption()));
- Handle subtype_handle (thread, Assumptions_ConcreteSubtype::subtype(assumption()));
- Klass* context = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(context_handle));
- Klass* subtype = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(subtype_handle));
+void CodeInstaller::assumption_ConcreteSubtype(JVMCIObject assumption) {
+ JVMCIObject context_handle = jvmci_env()->get_Assumptions_ConcreteSubtype_context(assumption);
+ JVMCIObject subtype_handle = jvmci_env()->get_Assumptions_ConcreteSubtype_subtype(assumption);
+ Klass* context = jvmci_env()->asKlass(context_handle);
+ Klass* subtype = jvmci_env()->asKlass(subtype_handle);
assert(context->is_abstract(), "");
_dependencies->assert_abstract_with_unique_concrete_subtype(context, subtype);
}
-void CodeInstaller::assumption_LeafType(Thread* thread, Handle assumption) {
- Handle context_handle (thread, Assumptions_LeafType::context(assumption()));
- Klass* context = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(context_handle));
+void CodeInstaller::assumption_LeafType(JVMCIObject assumption) {
+ JVMCIObject context_handle = jvmci_env()->get_Assumptions_LeafType_context(assumption);
+ Klass* context = jvmci_env()->asKlass(context_handle);
_dependencies->assert_leaf_type(context);
}
-void CodeInstaller::assumption_ConcreteMethod(Thread* thread, Handle assumption) {
- Handle impl_handle (thread, Assumptions_ConcreteMethod::impl(assumption()));
- Handle context_handle (thread, Assumptions_ConcreteMethod::context(assumption()));
+void CodeInstaller::assumption_ConcreteMethod(JVMCIObject assumption) {
+ JVMCIObject impl_handle = jvmci_env()->get_Assumptions_ConcreteMethod_impl(assumption);
+ JVMCIObject context_handle = jvmci_env()->get_Assumptions_ConcreteMethod_context(assumption);
- methodHandle impl = getMethodFromHotSpotMethod(impl_handle());
- Klass* context = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(context_handle));
+ methodHandle impl = jvmci_env()->asMethod(impl_handle);
+ Klass* context = jvmci_env()->asKlass(context_handle);
_dependencies->assert_unique_concrete_method(context, impl());
}
-void CodeInstaller::assumption_CallSiteTargetValue(Thread* thread, Handle assumption) {
- Handle callSite(thread, HotSpotObjectConstantImpl::object(Assumptions_CallSiteTargetValue::callSite(assumption())));
- Handle methodHandle(thread, HotSpotObjectConstantImpl::object(Assumptions_CallSiteTargetValue::methodHandle(assumption())));
-
+void CodeInstaller::assumption_CallSiteTargetValue(JVMCIObject assumption, JVMCI_TRAPS) {
+ JVMCIObject callSiteConstant = jvmci_env()->get_Assumptions_CallSiteTargetValue_callSite(assumption);
+ Handle callSite = jvmci_env()->asConstant(callSiteConstant, JVMCI_CHECK);
+ JVMCIObject methodConstant = jvmci_env()->get_Assumptions_CallSiteTargetValue_methodHandle(assumption);
+ Handle methodHandle = jvmci_env()->asConstant(methodConstant, JVMCI_CHECK);
_dependencies->assert_call_site_target_value(callSite(), methodHandle());
}
-void CodeInstaller::site_ExceptionHandler(jint pc_offset, Handle exc) {
- jint handler_offset = site_ExceptionHandler::handlerPos(exc);
+void CodeInstaller::site_ExceptionHandler(jint pc_offset, JVMCIObject exc) {
+ jint handler_offset = jvmci_env()->get_site_ExceptionHandler_handlerPos(exc);
// Subtable header
_exception_handler_table.add_entry(HandlerTableEntry(1, pc_offset, 0));
@@ -1005,19 +974,20 @@
return true;
}
-GrowableArray<ScopeValue*>* CodeInstaller::record_virtual_objects(Handle debug_info, TRAPS) {
- objArrayHandle virtualObjects(THREAD, DebugInfo::virtualObjectMapping(debug_info));
+GrowableArray<ScopeValue*>* CodeInstaller::record_virtual_objects(JVMCIObject debug_info, JVMCI_TRAPS) {
+ JVMCIObjectArray virtualObjects = jvmci_env()->get_DebugInfo_virtualObjectMapping(debug_info);
if (virtualObjects.is_null()) {
return NULL;
}
- GrowableArray<ScopeValue*>* objects = new GrowableArray<ScopeValue*>(virtualObjects->length(), virtualObjects->length(), NULL);
+ GrowableArray<ScopeValue*>* objects = new GrowableArray<ScopeValue*>(JVMCIENV->get_length(virtualObjects), JVMCIENV->get_length(virtualObjects), NULL);
// Create the unique ObjectValues
- for (int i = 0; i < virtualObjects->length(); i++) {
- HandleMark hm(THREAD);
- Handle value(THREAD, virtualObjects->obj_at(i));
- int id = VirtualObject::id(value);
- Handle type(THREAD, VirtualObject::type(value));
- oop javaMirror = HotSpotResolvedObjectTypeImpl::javaClass(type);
+ for (int i = 0; i < JVMCIENV->get_length(virtualObjects); i++) {
+ // HandleMark hm(THREAD);
+ JVMCIObject value = JVMCIENV->get_object_at(virtualObjects, i);
+ int id = jvmci_env()->get_VirtualObject_id(value);
+ JVMCIObject type = jvmci_env()->get_VirtualObject_type(value);
+ Klass* klass = jvmci_env()->asKlass(type);
+ oop javaMirror = klass->java_mirror();
ObjectValue* sv = new ObjectValue(id, new ConstantOopWriteValue(JNIHandles::make_local(Thread::current(), javaMirror)));
if (id < 0 || id >= objects->length()) {
JVMCI_ERROR_NULL("virtual object id %d out of bounds", id);
@@ -1029,18 +999,18 @@
}
// All the values which could be referenced by the VirtualObjects
// exist, so now describe all the VirtualObjects themselves.
- for (int i = 0; i < virtualObjects->length(); i++) {
- HandleMark hm(THREAD);
- Handle value(THREAD, virtualObjects->obj_at(i));
- int id = VirtualObject::id(value);
- record_object_value(objects->at(id)->as_ObjectValue(), value, objects, CHECK_NULL);
+ for (int i = 0; i < JVMCIENV->get_length(virtualObjects); i++) {
+ // HandleMark hm(THREAD);
+ JVMCIObject value = JVMCIENV->get_object_at(virtualObjects, i);
+ int id = jvmci_env()->get_VirtualObject_id(value);
+ record_object_value(objects->at(id)->as_ObjectValue(), value, objects, JVMCI_CHECK_NULL);
}
_debug_recorder->dump_object_pool(objects);
return objects;
}
-void CodeInstaller::record_scope(jint pc_offset, Handle debug_info, ScopeMode scope_mode, bool return_oop, TRAPS) {
- Handle position(THREAD, DebugInfo::bytecodePosition(debug_info));
+void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool return_oop, JVMCI_TRAPS) {
+ JVMCIObject position = jvmci_env()->get_DebugInfo_bytecodePosition(debug_info);
if (position.is_null()) {
// Stubs do not record scope info, just oop maps
return;
@@ -1048,26 +1018,26 @@
GrowableArray<ScopeValue*>* objectMapping;
if (scope_mode == CodeInstaller::FullFrame) {
- objectMapping = record_virtual_objects(debug_info, CHECK);
+ objectMapping = record_virtual_objects(debug_info, JVMCI_CHECK);
} else {
objectMapping = NULL;
}
- record_scope(pc_offset, position, scope_mode, objectMapping, return_oop, CHECK);
+ record_scope(pc_offset, position, scope_mode, objectMapping, return_oop, JVMCI_CHECK);
}
int CodeInstaller::map_jvmci_bci(int bci) {
if (bci < 0) {
- if (bci == BytecodeFrame::BEFORE_BCI()) {
+ if (bci == jvmci_env()->get_BytecodeFrame_BEFORE_BCI()) {
return BeforeBci;
- } else if (bci == BytecodeFrame::AFTER_BCI()) {
+ } else if (bci == jvmci_env()->get_BytecodeFrame_AFTER_BCI()) {
return AfterBci;
- } else if (bci == BytecodeFrame::UNWIND_BCI()) {
+ } else if (bci == jvmci_env()->get_BytecodeFrame_UNWIND_BCI()) {
return UnwindBci;
- } else if (bci == BytecodeFrame::AFTER_EXCEPTION_BCI()) {
+ } else if (bci == jvmci_env()->get_BytecodeFrame_AFTER_EXCEPTION_BCI()) {
return AfterExceptionBci;
- } else if (bci == BytecodeFrame::UNKNOWN_BCI()) {
+ } else if (bci == jvmci_env()->get_BytecodeFrame_UNKNOWN_BCI()) {
return UnknownBci;
- } else if (bci == BytecodeFrame::INVALID_FRAMESTATE_BCI()) {
+ } else if (bci == jvmci_env()->get_BytecodeFrame_INVALID_FRAMESTATE_BCI()) {
return InvalidFrameStateBci;
}
ShouldNotReachHere();
@@ -1075,34 +1045,37 @@
return bci;
}
-void CodeInstaller::record_scope(jint pc_offset, Handle position, ScopeMode scope_mode, GrowableArray<ScopeValue*>* objects, bool return_oop, TRAPS) {
- Handle frame;
+void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray<ScopeValue*>* objects, bool return_oop, JVMCI_TRAPS) {
+ JVMCIObject frame;
if (scope_mode == CodeInstaller::FullFrame) {
- if (!position->is_a(BytecodeFrame::klass())) {
+ if (!jvmci_env()->isa_BytecodeFrame(position)) {
JVMCI_ERROR("Full frame expected for debug info at %i", pc_offset);
}
frame = position;
}
- Handle caller_frame (THREAD, BytecodePosition::caller(position));
- if (caller_frame.not_null()) {
- record_scope(pc_offset, caller_frame, scope_mode, objects, return_oop, CHECK);
+ JVMCIObject caller_frame = jvmci_env()->get_BytecodePosition_caller(position);
+ if (caller_frame.is_non_null()) {
+ record_scope(pc_offset, caller_frame, scope_mode, objects, return_oop, JVMCI_CHECK);
}
- Handle hotspot_method (THREAD, BytecodePosition::method(position));
- Method* method = getMethodFromHotSpotMethod(hotspot_method());
- jint bci = map_jvmci_bci(BytecodePosition::bci(position));
+ JVMCIObject hotspot_method = jvmci_env()->get_BytecodePosition_method(position);
+ Method* method = jvmci_env()->asMethod(hotspot_method);
+ jint bci = map_jvmci_bci(jvmci_env()->get_BytecodePosition_bci(position));
+ if (bci == jvmci_env()->get_BytecodeFrame_BEFORE_BCI()) {
+ bci = SynchronizationEntryBCI;
+ }
TRACE_jvmci_2("Recording scope pc_offset=%d bci=%d method=%s", pc_offset, bci, method->name_and_sig_as_C_string());
bool reexecute = false;
- if (frame.not_null()) {
- if (bci < 0) {
+ if (frame.is_non_null()) {
+ if (bci < 0){
reexecute = false;
} else {
Bytecodes::Code code = Bytecodes::java_code_at(method, method->bcp_from(bci));
reexecute = bytecode_should_reexecute(code);
- if (frame.not_null()) {
- reexecute = (BytecodeFrame::duringCall(frame) == JNI_FALSE);
+ if (frame.is_non_null()) {
+ reexecute = (jvmci_env()->get_BytecodeFrame_duringCall(frame) == JNI_FALSE);
}
}
}
@@ -1112,55 +1085,55 @@
DebugToken* monitors_token = NULL;
bool throw_exception = false;
- if (frame.not_null()) {
- jint local_count = BytecodeFrame::numLocals(frame);
- jint expression_count = BytecodeFrame::numStack(frame);
- jint monitor_count = BytecodeFrame::numLocks(frame);
- objArrayHandle values(THREAD, BytecodeFrame::values(frame));
- objArrayHandle slotKinds(THREAD, BytecodeFrame::slotKinds(frame));
+ if (frame.is_non_null()) {
+ jint local_count = jvmci_env()->get_BytecodeFrame_numLocals(frame);
+ jint expression_count = jvmci_env()->get_BytecodeFrame_numStack(frame);
+ jint monitor_count = jvmci_env()->get_BytecodeFrame_numLocks(frame);
+ JVMCIObjectArray values = jvmci_env()->get_BytecodeFrame_values(frame);
+ JVMCIObjectArray slotKinds = jvmci_env()->get_BytecodeFrame_slotKinds(frame);
if (values.is_null() || slotKinds.is_null()) {
- THROW(vmSymbols::java_lang_NullPointerException());
+ JVMCI_THROW(NullPointerException);
}
- if (local_count + expression_count + monitor_count != values->length()) {
- JVMCI_ERROR("unexpected values length %d in scope (%d locals, %d expressions, %d monitors)", values->length(), local_count, expression_count, monitor_count);
+ if (local_count + expression_count + monitor_count != JVMCIENV->get_length(values)) {
+ JVMCI_ERROR("unexpected values length %d in scope (%d locals, %d expressions, %d monitors)", JVMCIENV->get_length(values), local_count, expression_count, monitor_count);
}
- if (local_count + expression_count != slotKinds->length()) {
- JVMCI_ERROR("unexpected slotKinds length %d in scope (%d locals, %d expressions)", slotKinds->length(), local_count, expression_count);
+ if (local_count + expression_count != JVMCIENV->get_length(slotKinds)) {
+ JVMCI_ERROR("unexpected slotKinds length %d in scope (%d locals, %d expressions)", JVMCIENV->get_length(slotKinds), local_count, expression_count);
}
GrowableArray<ScopeValue*>* locals = local_count > 0 ? new GrowableArray<ScopeValue*> (local_count) : NULL;
GrowableArray<ScopeValue*>* expressions = expression_count > 0 ? new GrowableArray<ScopeValue*> (expression_count) : NULL;
GrowableArray<MonitorValue*>* monitors = monitor_count > 0 ? new GrowableArray<MonitorValue*> (monitor_count) : NULL;
- TRACE_jvmci_2("Scope at bci %d with %d values", bci, values->length());
+ TRACE_jvmci_2("Scope at bci %d with %d values", bci, JVMCIENV->get_length(values));
TRACE_jvmci_2("%d locals %d expressions, %d monitors", local_count, expression_count, monitor_count);
- for (jint i = 0; i < values->length(); i++) {
- HandleMark hm(THREAD);
+ for (jint i = 0; i < JVMCIENV->get_length(values); i++) {
+ // HandleMark hm(THREAD);
ScopeValue* second = NULL;
- Handle value(THREAD, values->obj_at(i));
+ JVMCIObject value = JVMCIENV->get_object_at(values, i);
if (i < local_count) {
- BasicType type = JVMCIRuntime::kindToBasicType(Handle(THREAD, slotKinds->obj_at(i)), CHECK);
- ScopeValue* first = get_scope_value(value, type, objects, second, CHECK);
+ BasicType type = jvmci_env()->kindToBasicType(JVMCIENV->get_object_at(slotKinds, i), JVMCI_CHECK);
+ ScopeValue* first = get_scope_value(value, type, objects, second, JVMCI_CHECK);
if (second != NULL) {
locals->append(second);
}
locals->append(first);
} else if (i < local_count + expression_count) {
- BasicType type = JVMCIRuntime::kindToBasicType(Handle(THREAD, slotKinds->obj_at(i)), CHECK);
- ScopeValue* first = get_scope_value(value, type, objects, second, CHECK);
+ BasicType type = jvmci_env()->kindToBasicType(JVMCIENV->get_object_at(slotKinds, i), JVMCI_CHECK);
+ ScopeValue* first = get_scope_value(value, type, objects, second, JVMCI_CHECK);
if (second != NULL) {
expressions->append(second);
}
expressions->append(first);
} else {
- MonitorValue *monitor = get_monitor_value(value, objects, CHECK);
+ MonitorValue *monitor = get_monitor_value(value, objects, JVMCI_CHECK);
monitors->append(monitor);
}
if (second != NULL) {
i++;
- if (i >= values->length() || values->obj_at(i) != Value::ILLEGAL()) {
+ if (i >= JVMCIENV->get_length(values) || !JVMCIENV->equals(JVMCIENV->get_object_at(values, i), jvmci_env()->get_Value_ILLEGAL())) {
JVMCI_ERROR("double-slot value not followed by Value.ILLEGAL");
}
}
@@ -1170,29 +1143,29 @@
expressions_token = _debug_recorder->create_scope_values(expressions);
monitors_token = _debug_recorder->create_monitor_values(monitors);
- throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE;
+ throw_exception = jvmci_env()->get_BytecodeFrame_rethrowException(frame) == JNI_TRUE;
}
_debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, return_oop,
locals_token, expressions_token, monitors_token);
}
-void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, Handle site, TRAPS) {
- Handle debug_info (THREAD, site_Infopoint::debugInfo(site));
+void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
+ JVMCIObject debug_info = jvmci_env()->get_site_Infopoint_debugInfo(site);
if (debug_info.is_null()) {
JVMCI_ERROR("debug info expected at safepoint at %i", pc_offset);
}
// address instruction = _instructions->start() + pc_offset;
// jint next_pc_offset = Assembler::locate_next_instruction(instruction) - _instructions->start();
- OopMap *map = create_oop_map(debug_info, CHECK);
+ OopMap *map = create_oop_map(debug_info, JVMCI_CHECK);
_debug_recorder->add_safepoint(pc_offset, map);
- record_scope(pc_offset, debug_info, CodeInstaller::FullFrame, CHECK);
+ record_scope(pc_offset, debug_info, CodeInstaller::FullFrame, JVMCI_CHECK);
_debug_recorder->end_safepoint(pc_offset);
}
-void CodeInstaller::site_Infopoint(CodeBuffer& buffer, jint pc_offset, Handle site, TRAPS) {
- Handle debug_info (THREAD, site_Infopoint::debugInfo(site));
+void CodeInstaller::site_Infopoint(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
+ JVMCIObject debug_info = jvmci_env()->get_site_Infopoint_debugInfo(site);
if (debug_info.is_null()) {
JVMCI_ERROR("debug info expected at infopoint at %i", pc_offset);
}
@@ -1202,53 +1175,51 @@
// but DebugInformationRecorder doesn't have sufficient public API.
_debug_recorder->add_non_safepoint(pc_offset);
- record_scope(pc_offset, debug_info, CodeInstaller::BytecodePosition, CHECK);
+ record_scope(pc_offset, debug_info, CodeInstaller::BytecodePosition, JVMCI_CHECK);
_debug_recorder->end_non_safepoint(pc_offset);
}
-void CodeInstaller::site_Call(CodeBuffer& buffer, jint pc_offset, Handle site, TRAPS) {
- Handle target(THREAD, site_Call::target(site));
- InstanceKlass* target_klass = InstanceKlass::cast(target->klass());
+void CodeInstaller::site_Call(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
+ JVMCIObject target = jvmci_env()->get_site_Call_target(site);
+ JVMCIObject hotspot_method; // JavaMethod
+ JVMCIObject foreign_call;
- Handle hotspot_method; // JavaMethod
- Handle foreign_call;
-
- if (target_klass->is_subclass_of(SystemDictionary::HotSpotForeignCallTarget_klass())) {
+ if (jvmci_env()->isa_HotSpotForeignCallTarget(target)) {
foreign_call = target;
} else {
hotspot_method = target;
}
- Handle debug_info (THREAD, site_Call::debugInfo(site));
+ JVMCIObject debug_info = jvmci_env()->get_site_Infopoint_debugInfo(site);
- assert(hotspot_method.not_null() ^ foreign_call.not_null(), "Call site needs exactly one type");
+ assert(hotspot_method.is_non_null() ^ foreign_call.is_non_null(), "Call site needs exactly one type");
NativeInstruction* inst = nativeInstruction_at(_instructions->start() + pc_offset);
- jint next_pc_offset = CodeInstaller::pd_next_offset(inst, pc_offset, hotspot_method, CHECK);
+ jint next_pc_offset = CodeInstaller::pd_next_offset(inst, pc_offset, hotspot_method, JVMCI_CHECK);
- if (debug_info.not_null()) {
- OopMap *map = create_oop_map(debug_info, CHECK);
+ if (debug_info.is_non_null()) {
+ OopMap *map = create_oop_map(debug_info, JVMCI_CHECK);
_debug_recorder->add_safepoint(next_pc_offset, map);
- bool return_oop = hotspot_method.not_null() && getMethodFromHotSpotMethod(hotspot_method())->is_returning_oop();
+ bool return_oop = hotspot_method.is_non_null() && jvmci_env()->asMethod(hotspot_method)->is_returning_oop();
- record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, return_oop, CHECK);
+ record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, return_oop, JVMCI_CHECK);
}
- if (foreign_call.not_null()) {
- jlong foreign_call_destination = HotSpotForeignCallTarget::address(foreign_call);
+ if (foreign_call.is_non_null()) {
+ jlong foreign_call_destination = jvmci_env()->get_HotSpotForeignCallTarget_address(foreign_call);
if (_immutable_pic_compilation) {
// Use fake short distance during PIC compilation.
foreign_call_destination = (jlong)(_instructions->start() + pc_offset);
}
- CodeInstaller::pd_relocate_ForeignCall(inst, foreign_call_destination, CHECK);
+ CodeInstaller::pd_relocate_ForeignCall(inst, foreign_call_destination, JVMCI_CHECK);
} else { // method != NULL
if (debug_info.is_null()) {
JVMCI_ERROR("debug info expected at call at %i", pc_offset);
}
TRACE_jvmci_3("method call");
- CodeInstaller::pd_relocate_JavaMethod(buffer, hotspot_method, pc_offset, CHECK);
+ CodeInstaller::pd_relocate_JavaMethod(buffer, hotspot_method, pc_offset, JVMCI_CHECK);
if (_next_call_type == INVOKESTATIC || _next_call_type == INVOKESPECIAL) {
// Need a static call stub for transitions from compiled to interpreted.
CompiledStaticCall::emit_to_interp_stub(buffer, _instructions->start() + pc_offset);
@@ -1261,57 +1232,67 @@
_next_call_type = INVOKE_INVALID;
- if (debug_info.not_null()) {
+ if (debug_info.is_non_null()) {
_debug_recorder->end_safepoint(next_pc_offset);
}
}
-void CodeInstaller::site_DataPatch(CodeBuffer& buffer, jint pc_offset, Handle site, TRAPS) {
- Handle reference(THREAD, site_DataPatch::reference(site));
+void CodeInstaller::site_DataPatch(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
+ JVMCIObject reference = jvmci_env()->get_site_DataPatch_reference(site);
if (reference.is_null()) {
- THROW(vmSymbols::java_lang_NullPointerException());
- } else if (reference->is_a(site_ConstantReference::klass())) {
- Handle constant(THREAD, site_ConstantReference::constant(reference));
+ JVMCI_THROW(NullPointerException);
+ } else if (jvmci_env()->isa_site_ConstantReference(reference)) {
+ JVMCIObject constant = jvmci_env()->get_site_ConstantReference_constant(reference);
if (constant.is_null()) {
- THROW(vmSymbols::java_lang_NullPointerException());
- } else if (constant->is_a(HotSpotObjectConstantImpl::klass())) {
+ JVMCI_THROW(NullPointerException);
+ } else if (jvmci_env()->isa_DirectHotSpotObjectConstantImpl(constant)) {
+ if (!JVMCIENV->is_hotspot()) {
+ JVMCIObject string = JVMCIENV->call_HotSpotJVMCIRuntime_callToString(constant, JVMCI_CHECK);
+ const char* to_string = JVMCIENV->as_utf8_string(string);
+ JVMCI_THROW_MSG(IllegalArgumentException, err_msg("Direct object constant reached the backend: %s", to_string));
+ }
if (!_immutable_pic_compilation) {
// Do not patch during PIC compilation.
- pd_patch_OopConstant(pc_offset, constant, CHECK);
+ pd_patch_OopConstant(pc_offset, constant, JVMCI_CHECK);
}
- } else if (constant->is_a(HotSpotMetaspaceConstantImpl::klass())) {
+ } else if (jvmci_env()->isa_IndirectHotSpotObjectConstantImpl(constant)) {
if (!_immutable_pic_compilation) {
- pd_patch_MetaspaceConstant(pc_offset, constant, CHECK);
+ // Do not patch during PIC compilation.
+ pd_patch_OopConstant(pc_offset, constant, JVMCI_CHECK);
+ }
+ } else if (jvmci_env()->isa_HotSpotMetaspaceConstantImpl(constant)) {
+ if (!_immutable_pic_compilation) {
+ pd_patch_MetaspaceConstant(pc_offset, constant, JVMCI_CHECK);
}
#if INCLUDE_AOT
- } else if (constant->is_a(HotSpotSentinelConstant::klass())) {
+ } else if (jvmci_env()->isa_HotSpotSentinelConstant(constant)) {
if (!_immutable_pic_compilation) {
- JVMCI_ERROR("sentinel constant not supported for normal compiles: %s", constant->klass()->signature_name());
+ JVMCI_ERROR("sentinel constant not supported for normal compiles: %s", jvmci_env()->klass_name(constant));
}
#endif
} else {
- JVMCI_ERROR("unknown constant type in data patch: %s", constant->klass()->signature_name());
+ JVMCI_ERROR("unknown constant type in data patch: %s", jvmci_env()->klass_name(constant));
}
- } else if (reference->is_a(site_DataSectionReference::klass())) {
- int data_offset = site_DataSectionReference::offset(reference);
+ } else if (jvmci_env()->isa_site_DataSectionReference(reference)) {
+ int data_offset = jvmci_env()->get_site_DataSectionReference_offset(reference);
if (0 <= data_offset && data_offset < _constants_size) {
- pd_patch_DataSectionReference(pc_offset, data_offset, CHECK);
+ pd_patch_DataSectionReference(pc_offset, data_offset, JVMCI_CHECK);
} else {
JVMCI_ERROR("data offset 0x%X points outside data section (size 0x%X)", data_offset, _constants_size);
}
} else {
- JVMCI_ERROR("unknown data patch type: %s", reference->klass()->signature_name());
+ JVMCI_ERROR("unknown data patch type: %s", jvmci_env()->klass_name(reference));
}
}
-void CodeInstaller::site_Mark(CodeBuffer& buffer, jint pc_offset, Handle site, TRAPS) {
- Handle id_obj (THREAD, site_Mark::id(site));
+void CodeInstaller::site_Mark(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
+ JVMCIObject id_obj = jvmci_env()->get_site_Mark_id(site);
- if (id_obj.not_null()) {
- if (!java_lang_boxing_object::is_instance(id_obj(), T_INT)) {
- JVMCI_ERROR("expected Integer id, got %s", id_obj->klass()->signature_name());
+ if (id_obj.is_non_null()) {
+ if (!jvmci_env()->is_boxing_object(T_INT, id_obj)) {
+ JVMCI_ERROR("expected Integer id, got %s", jvmci_env()->klass_name(id_obj));
}
- jint id = id_obj->int_field(java_lang_boxing_object::value_offset_in_bytes(T_INT));
+ jint id = jvmci_env()->get_boxed_value(T_INT, id_obj).i;
address pc = _instructions->start() + pc_offset;
@@ -1343,7 +1324,7 @@
case POLL_FAR:
case POLL_RETURN_NEAR:
case POLL_RETURN_FAR:
- pd_relocate_poll(pc, id, CHECK);
+ pd_relocate_poll(pc, id, JVMCI_CHECK);
break;
case CARD_TABLE_SHIFT:
case CARD_TABLE_ADDRESS: