stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224671: AArch64: mauve System.arraycopy test failure

Browse Source 
Reviewed-by: adinn
This commit is contained in:
Andrew Haley 2019-05-23 07:57:50 -04:00
parent 12b2a50bb2
commit 671d15c078
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hotspot/cpu/aarch64/assembler_aarch64.hpp
View File

@ -1491,6 +1491,25 @@ public:
INSN(eorw, 0, 0b10, 0);
INSN(andsw, 0, 0b11, 0);
#undef INSN
#define INSN(NAME, size, op, N) \
void NAME(Register Rd, Register Rn, Register Rm, \
enum shift_kind kind = LSL, unsigned shift = 0) { \
starti; \
f(N, 21); \
zrf(Rm, 16), zrf(Rn, 5), zrf(Rd, 0); \
op_shifted_reg(0b01010, kind, shift, size, op); \
} \
\
/* These instructions have no immediate form. Provide an overload so \
that if anyone does try to use an immediate operand -- this has \
happened! -- we'll get a compile-time error. */ \
void NAME(Register Rd, Register Rn, unsigned imm, \
enum shift_kind kind = LSL, unsigned shift = 0) { \
assert(false, " can't be used with immediate operand"); \
}
INSN(bic, 1, 0b00, 1);
INSN(orn, 1, 0b01, 1);
INSN(eon, 1, 0b10, 1);

2
src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
View File

@ -2268,7 +2268,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
__ ldr(src, Address(sp, 4*BytesPerWord));
// r0 is -1^K where K == partial copied count
__ eonw(rscratch1, r0, 0);
__ eonw(rscratch1, r0, zr);
// adjust length down and src/end pos up by partial copied count
__ subw(length, length, rscratch1);
__ addw(src_pos, src_pos, rscratch1);