src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp

rev 13551 : imported patch gcinterface-aarch64-5.patch

*** 23,32 ****
--- 23,33 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
+ #include "gc/shared/barrierSetCodeGen.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "interpreter/templateInterpreterGenerator.hpp"
*** 873,883 ****
  //
  //
  
  // Method entry for java.lang.ref.Reference.get.
  address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
- #if INCLUDE_ALL_GCS
    // Code: _aload_0, _getfield, _areturn
    // parameter size = 1
    //
    // The code that gets generated by this routine is split into 2 parts:
    //    1. The "intrinsified" code for G1 (or any SATB based GC),
--- 874,883 ----
*** 907,953 ****
    address entry = __ pc();
  
    const int referent_offset = java_lang_ref_Reference::referent_offset;
    guarantee(referent_offset > 0, "referent offset not initialized");
  
-   if (UseG1GC) {
      Label slow_path;
      const Register local_0 = c_rarg0;
      // Check if local 0 != NULL
      // If the receiver is null then it is OK to jump to the slow path.
      __ ldr(local_0, Address(esp, 0));
      __ cbz(local_0, slow_path);
  
      // Load the value of the referent field.
      const Address field_address(local_0, referent_offset);
!     __ load_heap_oop(local_0, field_address);
  
-     __ mov(r19, r13);   // Move senderSP to a callee-saved register
-     // Generate the G1 pre-barrier code to log the value of
-     // the referent field in an SATB buffer.
-     __ enter(); // g1_write may call runtime
-     __ g1_write_barrier_pre(noreg /* obj */,
-                             local_0 /* pre_val */,
-                             rthread /* thread */,
-                             rscratch2 /* tmp */,
-                             true /* tosca_live */,
-                             true /* expand_call */);
-     __ leave();
      // areturn
      __ andr(sp, r19, -16);  // done with stack
      __ ret(lr);
  
      // generate a vanilla interpreter entry as the slow path
      __ bind(slow_path);
      __ jump_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals));
      return entry;
-   }
- #endif // INCLUDE_ALL_GCS
  
-   // If G1 is not enabled then attempt to go through the accessor entry point
-   // Reference.get is an accessor
-   return NULL;
  }
  
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.update(int crc, int b)
--- 907,939 ----
    address entry = __ pc();
  
    const int referent_offset = java_lang_ref_Reference::referent_offset;
    guarantee(referent_offset > 0, "referent offset not initialized");
  
    Label slow_path;
    const Register local_0 = c_rarg0;
    // Check if local 0 != NULL
    // If the receiver is null then it is OK to jump to the slow path.
    __ ldr(local_0, Address(esp, 0));
    __ cbz(local_0, slow_path);
  
+   __ mov(r19, r13);   // Move senderSP to a callee-saved register
+ 
    // Load the value of the referent field.
    const Address field_address(local_0, referent_offset);
!   BarrierSetCodeGen *code_gen = Universe::heap()->barrier_set()->code_gen();
!   code_gen->load_at(_masm, ACCESS_IN_HEAP | ACCESS_ON_WEAK_OOP_REF, T_OBJECT, local_0, field_address, /*tmp1*/ rscratch2, /*tmp2*/ rscratch1);
  
    // areturn
    __ andr(sp, r19, -16);  // done with stack
    __ ret(lr);
  
    // generate a vanilla interpreter entry as the slow path
    __ bind(slow_path);
    __ jump_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals));
    return entry;
  
  }
  
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.update(int crc, int b)
*** 1399,1430 ****
      __ adr(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
      __ cmp(t, result_handler);
      __ br(Assembler::NE, no_oop);
      // Unbox oop result, e.g. JNIHandles::resolve result.
      __ pop(ltos);
!     __ cbz(r0, store_result);   // Use NULL as-is.
!     STATIC_ASSERT(JNIHandles::weak_tag_mask == 1u);
!     __ tbz(r0, 0, not_weak);    // Test for jweak tag.
!     // Resolve jweak.
!     __ ldr(r0, Address(r0, -JNIHandles::weak_tag_value));
! #if INCLUDE_ALL_GCS
!     if (UseG1GC) {
!       __ enter();                   // Barrier may call runtime.
!       __ g1_write_barrier_pre(noreg /* obj */,
!                               r0 /* pre_val */,
!                               rthread /* thread */,
!                               t /* tmp */,
!                               true /* tosca_live */,
!                               true /* expand_call */);
!       __ leave();
!     }
! #endif // INCLUDE_ALL_GCS
!     __ b(store_result);
!     __ bind(not_weak);
!     // Resolve (untagged) jobject.
!     __ ldr(r0, Address(r0, 0));
!     __ bind(store_result);
      __ str(r0, Address(rfp, frame::interpreter_frame_oop_temp_offset*wordSize));
      // keep stack depth as expected by pushing oop which will eventually be discarded
      __ push(ltos);
      __ bind(no_oop);
    }
--- 1385,1395 ----
      __ adr(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
      __ cmp(t, result_handler);
      __ br(Assembler::NE, no_oop);
      // Unbox oop result, e.g. JNIHandles::resolve result.
      __ pop(ltos);
!     __ resolve_jobject(r0, rthread, t);
      __ str(r0, Address(rfp, frame::interpreter_frame_oop_temp_offset*wordSize));
      // keep stack depth as expected by pushing oop which will eventually be discarded
      __ push(ltos);
      __ bind(no_oop);
    }