@@ -178,7 +178,6 @@ void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register bc_reg,
178178 __ la (temp_reg, Address (temp_reg, in_bytes (ResolvedFieldEntry::put_code_offset ())));
179179 }
180180 // Load-acquire the bytecode to match store-release in ResolvedFieldEntry::fill_in()
181- __ membar (MacroAssembler::AnyAny);
182181 __ lbu (temp_reg, Address (temp_reg, 0 ));
183182 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
184183 __ mv (bc_reg, bc);
@@ -320,7 +319,6 @@ void TemplateTable::ldc(LdcType type) {
320319 // get type
321320 __ addi (x13, x11, tags_offset);
322321 __ add (x13, x10, x13);
323- __ membar (MacroAssembler::AnyAny);
324322 __ lbu (x13, Address (x13, 0 ));
325323 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
326324
@@ -2189,7 +2187,6 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
21892187 break ;
21902188 }
21912189 // Load-acquire the bytecode to match store-release in InterpreterRuntime
2192- __ membar (MacroAssembler::AnyAny);
21932190 __ lbu (temp, Address (temp, 0 ));
21942191 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
21952192
@@ -2241,7 +2238,6 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
22412238 __ la (temp, Address (Rcache, in_bytes (ResolvedFieldEntry::put_code_offset ())));
22422239 }
22432240 // Load-acquire the bytecode to match store-release in ResolvedFieldEntry::fill_in()
2244- __ membar (MacroAssembler::AnyAny);
22452241 __ lbu (temp, Address (temp, 0 ));
22462242 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
22472243 __ mv (t0, (int ) code); // have we resolved this bytecode?
@@ -2403,7 +2399,6 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
24032399 Label resolved;
24042400
24052401 __ load_resolved_indy_entry (cache, index);
2406- __ membar (MacroAssembler::AnyAny);
24072402 __ ld (method, Address (cache, in_bytes (ResolvedIndyEntry::method_offset ())));
24082403 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
24092404
@@ -2418,7 +2413,6 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
24182413 __ call_VM (noreg, entry, method);
24192414 // Update registers with resolved info
24202415 __ load_resolved_indy_entry (cache, index);
2421- __ membar (MacroAssembler::AnyAny);
24222416 __ ld (method, Address (cache, in_bytes (ResolvedIndyEntry::method_offset ())));
24232417 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
24242418
@@ -3533,7 +3527,6 @@ void TemplateTable::_new() {
35333527 const int tags_offset = Array<u1>::base_offset_in_bytes ();
35343528 __ add (t0, x10, x13);
35353529 __ la (t0, Address (t0, tags_offset));
3536- __ membar (MacroAssembler::AnyAny);
35373530 __ lbu (t0, t0);
35383531 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
35393532 __ sub (t1, t0, (u1)JVM_CONSTANT_Class);
@@ -3651,7 +3644,6 @@ void TemplateTable::checkcast() {
36513644 // See if bytecode has already been quicked
36523645 __ add (t0, x13, Array<u1>::base_offset_in_bytes ());
36533646 __ add (x11, t0, x9);
3654- __ membar (MacroAssembler::AnyAny);
36553647 __ lbu (x11, x11);
36563648 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
36573649 __ sub (t0, x11, (u1)JVM_CONSTANT_Class);
@@ -3707,7 +3699,6 @@ void TemplateTable::instanceof() {
37073699 // See if bytecode has already been quicked
37083700 __ add (t0, x13, Array<u1>::base_offset_in_bytes ());
37093701 __ add (x11, t0, x9);
3710- __ membar (MacroAssembler::AnyAny);
37113702 __ lbu (x11, x11);
37123703 __ membar (MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
37133704 __ sub (t0, x11, (u1)JVM_CONSTANT_Class);
0 commit comments