From 82c76aa6eca6e0818a859a71a2312da0e694c470 Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Fri, 18 Feb 2022 09:19:51 +0100 Subject: [PATCH] Export _sha3_implCompress, _md5_implCompress and aarch64::_has_negatives stubs to JVMCI compiler. --- src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp | 5 +++-- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp index 0820ce4544f..96e75ed8d06 100644 --- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp @@ -58,8 +58,6 @@ class aarch64 { static address _zero_blocks; - static address _has_negatives; - static address _has_negatives_long; static address _large_array_equals; static address _compare_long_string_LL; static address _compare_long_string_LU; @@ -76,6 +74,9 @@ class aarch64 { public: + static address _has_negatives; + static address _has_negatives_long; + static address get_previous_sp_entry() { return _get_previous_sp_entry; diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index 3f57d487bae..f85e4676311 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -312,12 +312,16 @@ static_field(StubRoutines, _base64_encodeBlock, address) \ static_field(StubRoutines, _base64_decodeBlock, address) \ static_field(StubRoutines, _ghash_processBlocks, address) \ + static_field(StubRoutines, _md5_implCompress, address) \ + static_field(StubRoutines, _md5_implCompressMB, address) \ static_field(StubRoutines, _sha1_implCompress, address) \ static_field(StubRoutines, _sha1_implCompressMB, address) \ static_field(StubRoutines, _sha256_implCompress, address) \ static_field(StubRoutines, _sha256_implCompressMB, address) \ static_field(StubRoutines, _sha512_implCompress, address) \ static_field(StubRoutines, _sha512_implCompressMB, address) \ + static_field(StubRoutines, _sha3_implCompress, address) \ + static_field(StubRoutines, _sha3_implCompressMB, address) \ static_field(StubRoutines, _updateBytesCRC32, address) \ static_field(StubRoutines, _crc_table_adr, address) \ static_field(StubRoutines, _crc32c_table_addr, address) \ @@ -748,6 +752,8 @@ #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \ static_field(VM_Version, _zva_length, int) \ + static_field(StubRoutines::aarch64, _has_negatives, address) \ + static_field(StubRoutines::aarch64, _has_negatives_long, address) \ volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) #define DECLARE_INT_CPU_FEATURE_CONSTANT(id, name, bit) GENERATE_VM_INT_CONSTANT_ENTRY(VM_Version::CPU_##id)