48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User aph
|
||
|
|
# Date 1461121375 -3600
|
||
|
|
# Wed Apr 20 04:02:55 2016 +0100
|
||
|
|
# Node ID 5605c859f0ec47d6f507cc83e783554a4210ccf6
|
||
|
|
# Parent 7458e5178c8646a9b4f76ac3d13b222abed3f16f
|
||
|
|
8154210: Zero: Better byte behaviour
|
||
|
|
Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
|
||
|
|
Reviewed-by: andrew, chrisphi
|
||
|
|
|
||
|
|
diff -r 7458e5178c86 -r 5605c859f0ec src/cpu/zero/vm/cppInterpreter_zero.cpp
|
||
|
|
--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue May 17 03:03:36 2016 +0100
|
||
|
|
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Apr 20 04:02:55 2016 +0100
|
||
|
|
@@ -220,9 +220,16 @@
|
||
|
|
// Push our result
|
||
|
|
for (int i = 0; i < result_slots; i++) {
|
||
|
|
// Adjust result to smaller
|
||
|
|
- intptr_t res = result[-i];
|
||
|
|
+ union {
|
||
|
|
+ intptr_t res;
|
||
|
|
+ jint res_jint;
|
||
|
|
+ };
|
||
|
|
+ res = result[-i];
|
||
|
|
if (result_slots == 1) {
|
||
|
|
- res = narrow(method->result_type(), res);
|
||
|
|
+ BasicType t = method->result_type();
|
||
|
|
+ if (is_subword_type(t)) {
|
||
|
|
+ res_jint = (jint)narrow(t, res_jint);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
stack->push(res);
|
||
|
|
}
|
||
|
|
diff -r 7458e5178c86 -r 5605c859f0ec src/share/vm/interpreter/bytecodeInterpreter.cpp
|
||
|
|
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue May 17 03:03:36 2016 +0100
|
||
|
|
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Apr 20 04:02:55 2016 +0100
|
||
|
|
@@ -593,8 +593,9 @@
|
||
|
|
/* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||
|
|
|
||
|
|
/* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||
|
|
-/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
|
||
|
|
-/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
|
||
|
|
+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
|
||
|
|
+/* 0xE8 */ &&opc_return_register_finalizer,
|
||
|
|
+ &&opc_invokehandle, &&opc_default, &&opc_default,
|
||
|
|
/* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||
|
|
|
||
|
|
/* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|