archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8146613: PPC64: C2 does no longer respect int to long conversion for stub calls

Browse source 
Reviewed-by: kvn, goetz
This commit is contained in:
Martin Doerr 2016-01-08 10:14:02 +01:00
parent 6a52e93df7
commit f642bbcecd
3 changed files with 65 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2015 SAP AG. All rights reserved. * Copyright 2012, 2016 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3656,9 +3656,9 @@ int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register t
assert_different_registers(table, tc0, tc1, tc2); assert_different_registers(table, tc0, tc1, tc2);
assert(table == tc3, "must be!"); assert(table == tc3, "must be!");
if (ix0 != 0) addi(tc0, table, ix0); addi(tc0, table, ix0);
if (ix1 != 0) addi(tc1, table, ix1); addi(tc1, table, ix1);
if (ix2 != 0) addi(tc2, table, ix2); addi(tc2, table, ix2);
if (ix3 != 0) addi(tc3, table, ix3); if (ix3 != 0) addi(tc3, table, ix3);
return ix3; return ix3;
@ -3724,14 +3724,14 @@ void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register
const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ? InputForNewCode : 32) : 4; const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ? InputForNewCode : 32) : 4;
// Process all bytes in a single-byte loop. // Process all bytes in a single-byte loop.
cmpdi(CCR0, len, 0); // Anything to do? clrldi_(len, len, 32); // Enforce 32 bit. Anything to do?
mtctr(len);
beq(CCR0, L_done); beq(CCR0, L_done);
if (invertCRC) { if (invertCRC) {
nand(crc, crc, crc); // ~c nand(crc, crc, crc); // ~c
} }
mtctr(len);
align(mainLoop_alignment); align(mainLoop_alignment);
BIND(L_mainLoop); BIND(L_mainLoop);
lbz(data, 0, buf); // Byte from buffer, zero-extended. lbz(data, 0, buf); // Byte from buffer, zero-extended.
@ -3947,7 +3947,7 @@ void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len
#else #else
Register crc_rv = tmp; // Load_reverse needs separate registers to work on. Register crc_rv = tmp; // Load_reverse needs separate registers to work on.
// Occupies tmp, but frees up crc. // Occupies tmp, but frees up crc.
load_reverse_32(crc_rv, crc); // evert byte order because we are dealing with big-endian data. load_reverse_32(crc_rv, crc); // Revert byte order because we are dealing with big-endian data.
tmp = crc; tmp = crc;
#endif #endif

8
hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2015 SAP AG. All rights reserved. * Copyright 2012, 2016 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3437,9 +3437,9 @@ static void reverse_words(unsigned long *s, unsigned long *d, int len) {
void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints, void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints,
jint len, jlong inv, jint len, jlong inv,
jint *m_ints) { jint *m_ints) {
len = len & 0x7fffFFFF; // C2 does not respect int to long conversion for stub calls.
assert(len % 2 == 0, "array length in montgomery_multiply must be even"); assert(len % 2 == 0, "array length in montgomery_multiply must be even");
int longwords = len/2; int longwords = len/2;
assert(longwords > 0, "unsupported");
// Make very sure we don't use so much space that the stack might // Make very sure we don't use so much space that the stack might
// overflow. 512 jints corresponds to an 16384-bit integer and // overflow. 512 jints corresponds to an 16384-bit integer and
@ -3467,9 +3467,9 @@ void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints
void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints, void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints,
jint len, jlong inv, jint len, jlong inv,
jint *m_ints) { jint *m_ints) {
len = len & 0x7fffFFFF; // C2 does not respect int to long conversion for stub calls.
assert(len % 2 == 0, "array length in montgomery_square must be even"); assert(len % 2 == 0, "array length in montgomery_square must be even");
int longwords = len/2; int longwords = len/2;
assert(longwords > 0, "unsupported");
// Make very sure we don't use so much space that the stack might // Make very sure we don't use so much space that the stack might
// overflow. 512 jints corresponds to an 16384-bit integer and // overflow. 512 jints corresponds to an 16384-bit integer and

71
hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2015 SAP AG. All rights reserved. * Copyright 2012, 2016 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1077,6 +1077,12 @@ class StubGenerator: public StubCodeGenerator {
return start; return start;
} }
inline void assert_positive_int(Register count) {
#ifdef ASSERT
__ srdi_(R0, count, 31);
__ asm_assert_eq("missing zero extend", 0xAFFE);
#endif
}
// Generate overlap test for array copy stubs. // Generate overlap test for array copy stubs.
// //
@ -1089,10 +1095,7 @@ class StubGenerator: public StubCodeGenerator {
Register tmp1 = R6_ARG4; Register tmp1 = R6_ARG4;
Register tmp2 = R7_ARG5; Register tmp2 = R7_ARG5;
#ifdef ASSERT assert_positive_int(R5_ARG3);
__ srdi_(tmp2, R5_ARG3, 31);
__ asm_assert_eq("missing zero extend", 0xAFFE);
#endif
__ subf(tmp1, R3_ARG1, R4_ARG2); // distance in bytes __ subf(tmp1, R3_ARG1, R4_ARG2); // distance in bytes
__ sldi(tmp2, R5_ARG3, log2_elem_size); // size in bytes __ sldi(tmp2, R5_ARG3, log2_elem_size); // size in bytes
@ -1132,14 +1135,15 @@ class StubGenerator: public StubCodeGenerator {
address generate_disjoint_byte_copy(bool aligned, const char * name) { address generate_disjoint_byte_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
Register tmp1 = R6_ARG4; Register tmp1 = R6_ARG4;
Register tmp2 = R7_ARG5; Register tmp2 = R7_ARG5;
Register tmp3 = R8_ARG6; Register tmp3 = R8_ARG6;
Register tmp4 = R9_ARG7; Register tmp4 = R9_ARG7;
Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9; Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9;
// Don't try anything fancy if arrays don't have many elements. // Don't try anything fancy if arrays don't have many elements.
__ li(tmp3, 0); __ li(tmp3, 0);
__ cmpwi(CCR0, R5_ARG3, 17); __ cmpwi(CCR0, R5_ARG3, 17);
@ -1264,6 +1268,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_conjoint_byte_copy(bool aligned, const char * name) { address generate_conjoint_byte_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
Register tmp1 = R6_ARG4; Register tmp1 = R6_ARG4;
Register tmp2 = R7_ARG5; Register tmp2 = R7_ARG5;
@ -1356,8 +1361,10 @@ class StubGenerator: public StubCodeGenerator {
Register tmp4 = R9_ARG7; Register tmp4 = R9_ARG7;
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8; Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8;
// don't try anything fancy if arrays don't have many elements // don't try anything fancy if arrays don't have many elements
__ li(tmp3, 0); __ li(tmp3, 0);
__ cmpwi(CCR0, R5_ARG3, 9); __ cmpwi(CCR0, R5_ARG3, 9);
@ -1486,6 +1493,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_conjoint_short_copy(bool aligned, const char * name) { address generate_conjoint_short_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
Register tmp1 = R6_ARG4; Register tmp1 = R6_ARG4;
Register tmp2 = R7_ARG5; Register tmp2 = R7_ARG5;
@ -1528,6 +1536,7 @@ class StubGenerator: public StubCodeGenerator {
Register tmp4 = R0; Register tmp4 = R0;
Label l_1, l_2, l_3, l_4, l_5, l_6; Label l_1, l_2, l_3, l_4, l_5, l_6;
// for short arrays, just do single element copy // for short arrays, just do single element copy
__ li(tmp3, 0); __ li(tmp3, 0);
__ cmpwi(CCR0, R5_ARG3, 5); __ cmpwi(CCR0, R5_ARG3, 5);
@ -1610,6 +1619,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_disjoint_int_copy(bool aligned, const char * name) { address generate_disjoint_int_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
generate_disjoint_int_copy_core(aligned); generate_disjoint_int_copy_core(aligned);
__ li(R3_RET, 0); // return 0 __ li(R3_RET, 0); // return 0
__ blr(); __ blr();
@ -1695,7 +1705,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_conjoint_int_copy(bool aligned, const char * name) { address generate_conjoint_int_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
address nooverlap_target = aligned ? address nooverlap_target = aligned ?
STUB_ENTRY(arrayof_jint_disjoint_arraycopy) : STUB_ENTRY(arrayof_jint_disjoint_arraycopy) :
STUB_ENTRY(jint_disjoint_arraycopy); STUB_ENTRY(jint_disjoint_arraycopy);
@ -1782,6 +1792,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_disjoint_long_copy(bool aligned, const char * name) { address generate_disjoint_long_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
generate_disjoint_long_copy_core(aligned); generate_disjoint_long_copy_core(aligned);
__ li(R3_RET, 0); // return 0 __ li(R3_RET, 0); // return 0
__ blr(); __ blr();
@ -1865,7 +1876,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_conjoint_long_copy(bool aligned, const char * name) { address generate_conjoint_long_copy(bool aligned, const char * name) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
address nooverlap_target = aligned ? address nooverlap_target = aligned ?
STUB_ENTRY(arrayof_jlong_disjoint_arraycopy) : STUB_ENTRY(arrayof_jlong_disjoint_arraycopy) :
STUB_ENTRY(jlong_disjoint_arraycopy); STUB_ENTRY(jlong_disjoint_arraycopy);
@ -1892,7 +1903,7 @@ class StubGenerator: public StubCodeGenerator {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
address nooverlap_target = aligned ? address nooverlap_target = aligned ?
STUB_ENTRY(arrayof_oop_disjoint_arraycopy) : STUB_ENTRY(arrayof_oop_disjoint_arraycopy) :
STUB_ENTRY(oop_disjoint_arraycopy); STUB_ENTRY(oop_disjoint_arraycopy);
@ -1929,7 +1940,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_disjoint_oop_copy(bool aligned, const char * name, bool dest_uninitialized) { address generate_disjoint_oop_copy(bool aligned, const char * name, bool dest_uninitialized) {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
assert_positive_int(R5_ARG3);
gen_write_ref_array_pre_barrier(R3_ARG1, R4_ARG2, R5_ARG3, dest_uninitialized, R9_ARG7); gen_write_ref_array_pre_barrier(R3_ARG1, R4_ARG2, R5_ARG3, dest_uninitialized, R9_ARG7);
// save some arguments, disjoint_long_copy_core destroys them. // save some arguments, disjoint_long_copy_core destroys them.
@ -2003,7 +2014,24 @@ class StubGenerator: public StubCodeGenerator {
StubCodeMark mark(this, "StubRoutines", name); StubCodeMark mark(this, "StubRoutines", name);
address start = __ function_entry(); address start = __ function_entry();
// TODO: Assert that int is 64 bit sign extended and arrays are not conjoint. // Assert that int is 64 bit sign extended and arrays are not conjoint.
#ifdef ASSERT
{
assert_positive_int(R5_ARG3);
const Register tmp1 = R11_scratch1, tmp2 = R12_scratch2;
Label no_overlap;
__ subf(tmp1, R3_ARG1, R4_ARG2); // distance in bytes
__ sldi(tmp2, R5_ARG3, LogBytesPerHeapOop); // size in bytes
__ cmpld(CCR0, R3_ARG1, R4_ARG2); // Use unsigned comparison!
__ cmpld(CCR1, tmp1, tmp2);
__ crnand(CCR0, Assembler::less, CCR1, Assembler::less);
// Overlaps if Src before dst and distance smaller than size.
// Branch to forward copy routine otherwise.
__ blt(CCR0, no_overlap);
__ stop("overlap in checkcast_copy", 0x9543);
__ bind(no_overlap);
}
#endif
gen_write_ref_array_pre_barrier(R3_from, R4_to, R5_count, dest_uninitialized, R12_tmp, /* preserve: */ R6_ckoff, R7_ckval); gen_write_ref_array_pre_barrier(R3_from, R4_to, R5_count, dest_uninitialized, R12_tmp, /* preserve: */ R6_ckoff, R7_ckval);
@ -2452,12 +2480,14 @@ class StubGenerator: public StubCodeGenerator {
STUB_ENTRY(checkcast_arraycopy)); STUB_ENTRY(checkcast_arraycopy));
// fill routines // fill routines
StubRoutines::_jbyte_fill = generate_fill(T_BYTE, false, "jbyte_fill"); if (OptimizeFill) {
StubRoutines::_jshort_fill = generate_fill(T_SHORT, false, "jshort_fill"); StubRoutines::_jbyte_fill = generate_fill(T_BYTE, false, "jbyte_fill");
StubRoutines::_jint_fill = generate_fill(T_INT, false, "jint_fill"); StubRoutines::_jshort_fill = generate_fill(T_SHORT, false, "jshort_fill");
StubRoutines::_arrayof_jbyte_fill = generate_fill(T_BYTE, true, "arrayof_jbyte_fill"); StubRoutines::_jint_fill = generate_fill(T_INT, false, "jint_fill");
StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill"); StubRoutines::_arrayof_jbyte_fill = generate_fill(T_BYTE, true, "arrayof_jbyte_fill");
StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill"); StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill");
StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
}
} }
// Safefetch stubs. // Safefetch stubs.
@ -2542,6 +2572,11 @@ class StubGenerator: public StubCodeGenerator {
BLOCK_COMMENT("Entry:"); BLOCK_COMMENT("Entry:");
// C2 does not respect int to long conversion for stub calls.
__ clrldi(xlen, xlen, 32);
__ clrldi(ylen, ylen, 32);
__ clrldi(zlen, zlen, 32);
// Save non-volatile regs (frameless). // Save non-volatile regs (frameless).
int current_offs = 8; int current_offs = 8;
__ std(R24, -current_offs, R1_SP); current_offs += 8; __ std(R24, -current_offs, R1_SP); current_offs += 8;