Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8269095: Fix Valhalla Zero build failures #458

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -48,7 +48,7 @@ ifeq ($(call check-jvm-feature, zero), true)
JVM_EXCLUDES += opto libadt
JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/
JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \
bcEscapeAnalyzer.cpp ciTypeFlow.cpp
bcEscapeAnalyzer.cpp ciTypeFlow.cpp macroAssembler_common.cpp
JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
@@ -54,17 +54,37 @@ int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
return 0;
}

AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(
MacroAssembler *masm,
int total_args_passed,
int comp_args_on_stack,
const BasicType *sig_bt,
const VMRegPair *regs,
AdapterFingerPrint *fingerprint) {
int SharedRuntime::java_return_convention(const BasicType *sig_bt,
VMRegPair *regs,
int total_args_passed) {
Unimplemented();
return 0;
}

BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(const InlineKlass* vk) {
Unimplemented();
return NULL;
}

AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
int comp_args_on_stack,
const GrowableArray <SigEntry> *sig,
const VMRegPair *regs,
const GrowableArray <SigEntry> *sig_cc,
const VMRegPair *regs_cc,
const GrowableArray <SigEntry> *sig_cc_ro,
const VMRegPair *regs_cc_ro,
AdapterFingerPrint *fingerprint,
AdapterBlob *&new_adapter) {
new_adapter = AdapterBlob::create(masm->code(), 0, 0, NULL);
return AdapterHandlerLibrary::new_entry(
fingerprint,
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub),
CAST_FROM_FN_PTR(address,zero_null_code_stub));
}

@@ -27,12 +27,12 @@
#include "code/vtableStubs.hpp"
#include "utilities/debug.hpp"

VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
VtableStub* VtableStubs::create_vtable_stub(int vtable_index, bool caller_is_c1) {
ShouldNotCallThis();
return NULL;
}

VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
VtableStub* VtableStubs::create_itable_stub(int vtable_index, bool caller_is_c1) {
ShouldNotCallThis();
return NULL;
}