snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity
void-packages/srcpkgs/openjdk8/patches/005_8158260-pr2991-rh134125...

463 lines
18 KiB
Diff
Raw Blame History

# HG changeset patch
# User simonis
# Date 1466155884 -7200
# Fri Jun 17 11:31:24 2016 +0200
# Node ID 4b40867e627dd9043bc67a4795caa9834ef69478
# Parent 3fc29347b27fdd2075e6ec6d80bb26ab2bf667c1
8158260, PR2991, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
Summary: Adjust instruction generation. Includes portions of 8026049 for test case.
Reviewed-by: goetz
Contributed-by: gromero@linux.vnet.ibm.com, horii@jp.ibm.com
diff -Nru openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2019-01-25 13:46:51.799453897 +0000
@@ -201,6 +201,11 @@
FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
}
+ // This machine allows unaligned memory accesses
+ if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
+ FLAG_SET_DEFAULT(UseUnalignedAccesses, true);
+ }
+
if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
UseMontgomeryMultiplyIntrinsic = true;
}
diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
--- openjdk.orig/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp 2019-01-25 13:46:51.799453897 +0000
@@ -375,6 +375,13 @@
(cache_line_size > ContendedPaddingWidth))
ContendedPaddingWidth = cache_line_size;
+ // This machine does not allow unaligned memory accesses
+ if (UseUnalignedAccesses) {
+ if (!FLAG_IS_DEFAULT(UseUnalignedAccesses))
+ warning("Unaligned memory access is not available on this CPU");
+ FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
+ }
+
#ifndef PRODUCT
if (PrintMiscellaneous && Verbose) {
tty->print_cr("L1 data cache line size: %u", L1_data_cache_line_size());
diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
--- openjdk.orig/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2019-01-25 13:46:51.799453897 +0000
@@ -1033,6 +1033,11 @@
(cache_line_size > ContendedPaddingWidth))
ContendedPaddingWidth = cache_line_size;
+ // This machine allows unaligned memory accesses
+ if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
+ FLAG_SET_DEFAULT(UseUnalignedAccesses, true);
+ }
+
#ifndef PRODUCT
if (PrintMiscellaneous && Verbose) {
tty->print_cr("Logical CPUs per core: %u",
diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/vm_version_zero.cpp openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp
--- openjdk.orig/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2019-01-25 13:46:51.799453897 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -36,4 +36,11 @@
# include "os_bsd.inline.hpp"
#endif
-// This file is intentionally empty
+
+void VM_Version::initialize() {
+ // This machine does not allow unaligned memory accesses
+ if (! FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
+ warning("Unaligned memory access is not available on this CPU");
+ FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
+ }
+}
diff -Nru openjdk.orig/hotspot/src/share/vm/prims/unsafe.cpp openjdk/hotspot/src/share/vm/prims/unsafe.cpp
--- openjdk.orig/hotspot/src/share/vm/prims/unsafe.cpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2019-01-25 13:50:10.160334728 +0000
@@ -385,6 +385,24 @@
#endif // not SUPPORTS_NATIVE_CX8
+UNSAFE_ENTRY(jboolean, Unsafe_isBigEndian0(JNIEnv *env, jobject unsafe))
+ UnsafeWrapper("Unsafe_IsBigEndian0");
+ {
+#ifdef VM_LITTLE_ENDIAN
+ return false;
+#else
+ return true;
+#endif
+ }
+UNSAFE_END
+
+UNSAFE_ENTRY(jint, Unsafe_unalignedAccess0(JNIEnv *env, jobject unsafe))
+ UnsafeWrapper("Unsafe_UnalignedAccess0");
+ {
+ return UseUnalignedAccesses;
+ }
+UNSAFE_END
+
#define DEFINE_GETSETOOP(jboolean, Boolean) \
\
UNSAFE_ENTRY(jboolean, Unsafe_Get##Boolean##140(JNIEnv *env, jobject unsafe, jobject obj, jint offset)) \
@@ -1716,6 +1734,11 @@
{CC "fullFence", CC "()V", FN_PTR(Unsafe_FullFence)},
};
+JNINativeMethod cpu_methods[] = {
+ {CC"isBigEndian0", CC"()Z", FN_PTR(Unsafe_isBigEndian0)},
+ {CC"unalignedAccess0", CC"()Z", FN_PTR(Unsafe_unalignedAccess0)}
+};
+
#undef CC
#undef FN_PTR
@@ -1815,5 +1838,8 @@
// Fence methods
register_natives("1.8 fence methods", env, unsafecls, fence_methods, sizeof(fence_methods)/sizeof(JNINativeMethod));
+
+ // CPU methods
+ register_natives("1.9 CPU methods", env, unsafecls, cpu_methods, sizeof(cpu_methods)/sizeof(JNINativeMethod));
}
JVM_END
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp
--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2019-01-16 07:13:59.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2019-01-25 13:46:51.803453833 +0000
@@ -4003,6 +4003,9 @@
product(bool, UseLockedTracing, false, \
"Use locked-tracing when doing event-based tracing") \
\
+ diagnostic(bool, UseUnalignedAccesses, false, \
+ "Use unaligned memory accesses in sun.misc.Unsafe") \
+ \
product_pd(bool, PreserveFramePointer, \
"Use the FP register for holding the frame pointer " \
"and not as a general purpose register.")
diff -Nru openjdk.orig/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java openjdk/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java
--- openjdk.orig/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java 1970-01-01 01:00:00.000000000 +0100
+++ openjdk/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java 2019-01-25 13:46:51.803453833 +0000
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2016 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8158260
+ * @summary Test unaligned Unsafe accesses
+ * @modules java.base/jdk.internal.misc
+ * @run main/othervm -Diters=20000 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation JdkInternalMiscUnsafeUnalignedAccess
+ * @author volker.simonis@gmail.com
+ */
+
+import java.lang.reflect.Field;
+import java.nio.ByteOrder;
+import sun.misc.Unsafe;
+
+public class JdkInternalMiscUnsafeUnalignedAccess {
+ static final int ITERS = Integer.getInteger("iters", 20_000);
+ private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
+ private static final Unsafe UNSAFE;
+ private static final int SIZE = 1024;
+ private static long memory;
+
+ static {
+ try {
+ Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+ unsafeField.setAccessible(true);
+ UNSAFE = (Unsafe) unsafeField.get(null);
+ }
+ catch (Exception e) {
+ throw new RuntimeException("Unable to get Unsafe instance.", e);
+ }
+ }
+
+ static int getInt_0() {
+ return UNSAFE.getInt(memory + 0);
+ }
+ static int getInt_1() {
+ return UNSAFE.getInt(memory + 1);
+ }
+ static int getInt_4() {
+ return UNSAFE.getInt(memory + 4);
+ }
+ static int getInt_17() {
+ return UNSAFE.getInt(memory + 17);
+ }
+
+ static long getIntAsLong_0() {
+ return UNSAFE.getInt(memory + 0);
+ }
+ static long getIntAsLong_1() {
+ return UNSAFE.getInt(memory + 1);
+ }
+ static long getIntAsLong_4() {
+ return UNSAFE.getInt(memory + 4);
+ }
+ static long getIntAsLong_17() {
+ return UNSAFE.getInt(memory + 17);
+ }
+
+ static long getLong_0() {
+ return UNSAFE.getLong(memory + 0);
+ }
+ static long getLong_1() {
+ return UNSAFE.getLong(memory + 1);
+ }
+ static long getLong_4() {
+ return UNSAFE.getLong(memory + 4);
+ }
+ static long getLong_8() {
+ return UNSAFE.getLong(memory + 8);
+ }
+ static long getLong_17() {
+ return UNSAFE.getLong(memory + 17);
+ }
+
+ static void putInt_0(int i) {
+ UNSAFE.putInt(memory + 0, i);
+ }
+ static void putInt_1(int i) {
+ UNSAFE.putInt(memory + 1, i);
+ }
+ static void putInt_4(int i) {
+ UNSAFE.putInt(memory + 4, i);
+ }
+ static void putInt_17(int i) {
+ UNSAFE.putInt(memory + 17, i);
+ }
+
+ static void putLong_0(long l) {
+ UNSAFE.putLong(memory + 0, l);
+ }
+ static void putLong_1(long l) {
+ UNSAFE.putLong(memory + 1, l);
+ }
+ static void putLong_4(long l) {
+ UNSAFE.putLong(memory + 4, l);
+ }
+ static void putLong_8(long l) {
+ UNSAFE.putLong(memory + 8, l);
+ }
+ static void putLong_17(long l) {
+ UNSAFE.putLong(memory + 17, l);
+ }
+
+ public static void main(String[] args) throws Exception {
+
+ if (!UNSAFE.unalignedAccess()) {
+ System.out.println("Platform is not supporting unaligned access - nothing to test.");
+ return;
+ }
+
+ memory = UNSAFE.allocateMemory(SIZE);
+
+ UNSAFE.putInt(memory + 0, 0x00112233);
+ UNSAFE.putInt(memory + 4, 0x44556677);
+ UNSAFE.putInt(memory + 8, 0x8899aabb);
+ UNSAFE.putInt(memory + 12, 0xccddeeff);
+ UNSAFE.putInt(memory + 16, 0x01234567);
+ UNSAFE.putInt(memory + 20, 0x89abcdef);
+ UNSAFE.putInt(memory + 24, 0x01234567);
+
+ // Unsafe.getInt()
+ int res;
+ for (int i = 0; i < ITERS; i++) {
+ res = getInt_0();
+ if (res != 0x00112233) {
+ throw new Exception(res + " != 0x00112233");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ res = getInt_1();
+ if (res != (BIG_ENDIAN ? 0x11223344 : 0x77001122)) {
+ throw new Exception(res + " != " + (BIG_ENDIAN ? 0x11223344 : 0x77001122));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ res = getInt_4();
+ if (res != 0x44556677) {
+ throw new Exception(res + " != 0x44556677");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ res = getInt_17();
+ if (res != (BIG_ENDIAN ? 0x23456789 : 0xef012345)) {
+ throw new Exception(res + " != " + (BIG_ENDIAN ? 0x23456789 : 0xef012345));
+ }
+ }
+
+ // (long)Unsafe.getInt()
+ long lres;
+ for (int i = 0; i < ITERS; i++) {
+ lres = getIntAsLong_0();
+ if (lres != (long)0x00112233) {
+ throw new Exception(lres + " != 0x00112233");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getIntAsLong_1();
+ if (lres != (BIG_ENDIAN ? (long)0x11223344 : (long)0x77001122)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? (long)0x11223344 : (long)0x77001122));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getIntAsLong_4();
+ if (lres != (long)0x44556677) {
+ throw new Exception(lres + " != 0x44556677");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getIntAsLong_17();
+ if (lres != (BIG_ENDIAN ? (long)0x23456789 : (long)0xef012345)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? (long)0x23456789 : (long)0xef012345));
+ }
+ }
+
+ // Unsafe.getLong()
+ for (int i = 0; i < ITERS; i++) {
+ lres = getLong_0();
+ if (lres != (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getLong_1();
+ if (lres != (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getLong_4();
+ if (lres != (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getLong_8();
+ if (lres != (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ lres = getLong_17();
+ if (lres != (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L));
+ }
+ }
+
+ // Unsafe.putInt()
+ for (int i = 0; i < ITERS; i++) {
+ putInt_0(0x00112233);
+ res = getInt_0();
+ if (res != 0x00112233) {
+ throw new Exception(res + " != 0x00112233");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putInt_1(BIG_ENDIAN ? 0x11223344 : 0x77001122);
+ res = getInt_1();
+ if (res != (BIG_ENDIAN ? 0x11223344 : 0x77001122)) {
+ throw new Exception(res + " != " + (BIG_ENDIAN ? 0x11223344 : 0x77001122));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putInt_4(0x44556677);
+ res = getInt_4();
+ if (res != 0x44556677) {
+ throw new Exception(res + " != 0x44556677");
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putInt_17(BIG_ENDIAN ? 0x23456789 : 0xef012345);
+ res = getInt_17();
+ if (res != (BIG_ENDIAN ? 0x23456789 : 0xef012345)) {
+ throw new Exception(res + " != " + (BIG_ENDIAN ? 0x23456789 : 0xef012345));
+ }
+ }
+
+
+ // Unsafe.putLong()
+ for (int i = 0; i < ITERS; i++) {
+ putLong_0(BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L);
+ lres = getLong_0();
+ if (lres != (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putLong_1(BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L);
+ lres = getLong_1();
+ if (lres != (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putLong_4(BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L);
+ lres = getLong_4();
+ if (lres != (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putLong_8(BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL);
+ lres = getLong_8();
+ if (lres != (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL));
+ }
+ }
+
+ for (int i = 0; i < ITERS; i++) {
+ putLong_17(BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L);
+ lres = getLong_17();
+ if (lres != (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L)) {
+ throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L));
+ }
+ }
+ }
+
+}
Reference in New Issue View Git Blame Copy Permalink