OpenJDK / amber / amber
changeset 56844:aa800530fb49
8226222: [JVMCI] Export AArch64 field VM_Version::_psr_info.dczid_el0
Reviewed-by: kvn
| author | pli |
|---|---|
| date | Mon, 17 Jun 2019 09:40:07 +0000 |
| parents | 970adfac768d |
| children | 7cf925f385fe |
| files | src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp src/hotspot/share/jvmci/vmStructs_jvmci.cpp |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Tue Jun 18 17:58:07 2019 -0400 +++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Mon Jun 17 09:40:07 2019 +0000 @@ -308,7 +308,8 @@ BOXED_BOOLEAN(box, *(jbyte*) vmField.address); assert(box.is_non_null(), "must have a box"); } else if (strcmp(vmField.typeString, "int") == 0 || - strcmp(vmField.typeString, "jint") == 0) { + strcmp(vmField.typeString, "jint") == 0 || + strcmp(vmField.typeString, "uint32_t") == 0) { BOXED_LONG(box, *(jint*) vmField.address); assert(box.is_non_null(), "must have a box"); } else if (strcmp(vmField.typeString, "uint64_t") == 0) {
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Tue Jun 18 17:58:07 2019 -0400 +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Mon Jun 17 09:40:07 2019 +0000 @@ -691,10 +691,10 @@ #endif -// AARCH64 is defined in closed port, too. TARGET_ARCH_aarch64 is not. -#ifdef TARGET_ARCH_aarch64 +#ifdef AARCH64 #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, _psr_info.dczid_el0, uint32_t) \ volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \