1.1 --- a/src/share/vm/prims/jvm.h Wed Oct 14 16:43:13 2020 +0800
1.2 +++ b/src/share/vm/prims/jvm.h Wed Oct 14 17:44:48 2020 +0800
1.3 @@ -159,6 +159,9 @@
1.4 JVM_Exit(jint code);
1.5
1.6 JNIEXPORT void JNICALL
1.7 +JVM_BeforeHalt();
1.8 +
1.9 +JNIEXPORT void JNICALL
1.10 JVM_Halt(jint code);
1.11
1.12 JNIEXPORT void JNICALL
1.13 @@ -1625,9 +1628,9 @@
1.14 } jvm_version_info;
1.15
1.16 #define JVM_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24)
1.17 -#define JVM_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16)
1.18 +#define JVM_VERSION_MINOR(version) ((version & 0x00FFFF00) >> 8)
1.19 // Micro version is 0 in HotSpot Express VM (set in jvm.cpp).
1.20 -#define JVM_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8)
1.21 +#define JVM_VERSION_MICRO(version) 0
1.22 /* Build number is available in all HotSpot Express VM builds.
1.23 * It is defined in make/hotspot_version file.
1.24 */
1.25 @@ -1640,9 +1643,9 @@
1.26 // Naming convention of RE build version string: n.n.n[_uu[c]][-<identifier>]-bxx
1.27 unsigned int jdk_version; /* Consists of major, minor, micro (n.n.n) */
1.28 /* and build number (xx) */
1.29 - unsigned int update_version : 8; /* Update release version (uu) */
1.30 + unsigned int update_version : 16; /* Update release version (uu) */
1.31 unsigned int special_update_version : 8; /* Special update release version (c)*/
1.32 - unsigned int reserved1 : 16;
1.33 + unsigned int reserved1 : 8;
1.34 unsigned int reserved2;
1.35
1.36 /* The following bits represents new JDK supports that VM has dependency on.
