--- a/src/hotspot/cpu/x86/templateTable_x86.cpp Fri Jun 22 16:06:43 2018 -0400
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp Fri Jun 22 17:46:58 2018 -0400
@@ -770,7 +770,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_INT, IN_HEAP | IN_HEAP_ARRAY, rax,
+ __ access_load_at(T_INT, IN_HEAP | IS_ARRAY, rax,
Address(rdx, rax, Address::times_4,
arrayOopDesc::base_offset_in_bytes(T_INT)),
noreg, noreg);
@@ -783,7 +783,7 @@
index_check(rdx, rax); // kills rbx
NOT_LP64(__ mov(rbx, rax));
// rbx,: index
- __ access_load_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY, noreg /* ltos */,
+ __ access_load_at(T_LONG, IN_HEAP | IS_ARRAY, noreg /* ltos */,
Address(rdx, rbx, Address::times_8,
arrayOopDesc::base_offset_in_bytes(T_LONG)),
noreg, noreg);
@@ -796,7 +796,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY, noreg /* ftos */,
+ __ access_load_at(T_FLOAT, IN_HEAP | IS_ARRAY, noreg /* ftos */,
Address(rdx, rax,
Address::times_4,
arrayOopDesc::base_offset_in_bytes(T_FLOAT)),
@@ -808,7 +808,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY, noreg /* dtos */,
+ __ access_load_at(T_DOUBLE, IN_HEAP | IS_ARRAY, noreg /* dtos */,
Address(rdx, rax,
Address::times_8,
arrayOopDesc::base_offset_in_bytes(T_DOUBLE)),
@@ -825,7 +825,7 @@
UseCompressedOops ? Address::times_4 : Address::times_ptr,
arrayOopDesc::base_offset_in_bytes(T_OBJECT)),
rax,
- IN_HEAP_ARRAY);
+ IS_ARRAY);
}
void TemplateTable::baload() {
@@ -833,7 +833,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY, rax,
+ __ access_load_at(T_BYTE, IN_HEAP | IS_ARRAY, rax,
Address(rdx, rax, Address::times_1, arrayOopDesc::base_offset_in_bytes(T_BYTE)),
noreg, noreg);
}
@@ -843,7 +843,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, rax,
+ __ access_load_at(T_CHAR, IN_HEAP | IS_ARRAY, rax,
Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_CHAR)),
noreg, noreg);
}
@@ -858,7 +858,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY, rax,
+ __ access_load_at(T_CHAR, IN_HEAP | IS_ARRAY, rax,
Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_CHAR)),
noreg, noreg);
}
@@ -869,7 +869,7 @@
// rax: index
// rdx: array
index_check(rdx, rax); // kills rbx
- __ access_load_at(T_SHORT, IN_HEAP | IN_HEAP_ARRAY, rax,
+ __ access_load_at(T_SHORT, IN_HEAP | IS_ARRAY, rax,
Address(rdx, rax, Address::times_2, arrayOopDesc::base_offset_in_bytes(T_SHORT)),
noreg, noreg);
}
@@ -1063,7 +1063,7 @@
// rbx: index
// rdx: array
index_check(rdx, rbx); // prefer index in rbx
- __ access_store_at(T_INT, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_INT, IN_HEAP | IS_ARRAY,
Address(rdx, rbx, Address::times_4,
arrayOopDesc::base_offset_in_bytes(T_INT)),
rax, noreg, noreg);
@@ -1077,7 +1077,7 @@
// rdx: high(value)
index_check(rcx, rbx); // prefer index in rbx,
// rbx,: index
- __ access_store_at(T_LONG, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_LONG, IN_HEAP | IS_ARRAY,
Address(rcx, rbx, Address::times_8,
arrayOopDesc::base_offset_in_bytes(T_LONG)),
noreg /* ltos */, noreg, noreg);
@@ -1091,7 +1091,7 @@
// rbx: index
// rdx: array
index_check(rdx, rbx); // prefer index in rbx
- __ access_store_at(T_FLOAT, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_FLOAT, IN_HEAP | IS_ARRAY,
Address(rdx, rbx, Address::times_4,
arrayOopDesc::base_offset_in_bytes(T_FLOAT)),
noreg /* ftos */, noreg, noreg);
@@ -1104,7 +1104,7 @@
// rbx: index
// rdx: array
index_check(rdx, rbx); // prefer index in rbx
- __ access_store_at(T_DOUBLE, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_DOUBLE, IN_HEAP | IS_ARRAY,
Address(rdx, rbx, Address::times_8,
arrayOopDesc::base_offset_in_bytes(T_DOUBLE)),
noreg /* dtos */, noreg, noreg);
@@ -1148,7 +1148,7 @@
__ movptr(rax, at_tos());
__ movl(rcx, at_tos_p1()); // index
// Now store using the appropriate barrier
- do_oop_store(_masm, element_address, rax, IN_HEAP_ARRAY);
+ do_oop_store(_masm, element_address, rax, IS_ARRAY);
__ jmp(done);
// Have a NULL in rax, rdx=array, ecx=index. Store NULL at ary[idx]
@@ -1156,7 +1156,7 @@
__ profile_null_seen(rbx);
// Store a NULL
- do_oop_store(_masm, element_address, noreg, IN_HEAP_ARRAY);
+ do_oop_store(_masm, element_address, noreg, IS_ARRAY);
// Pop stack arguments
__ bind(done);
@@ -1180,7 +1180,7 @@
__ jccb(Assembler::zero, L_skip);
__ andl(rax, 1); // if it is a T_BOOLEAN array, mask the stored value to 0/1
__ bind(L_skip);
- __ access_store_at(T_BYTE, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_BYTE, IN_HEAP | IS_ARRAY,
Address(rdx, rbx,Address::times_1,
arrayOopDesc::base_offset_in_bytes(T_BYTE)),
rax, noreg, noreg);
@@ -1193,7 +1193,7 @@
// rbx: index
// rdx: array
index_check(rdx, rbx); // prefer index in rbx
- __ access_store_at(T_CHAR, IN_HEAP | IN_HEAP_ARRAY,
+ __ access_store_at(T_CHAR, IN_HEAP | IS_ARRAY,
Address(rdx, rbx, Address::times_2,
arrayOopDesc::base_offset_in_bytes(T_CHAR)),
rax, noreg, noreg);