src/cpu/ppc/vm/templateInterpreter_ppc.cpp

rev 8109 : 8077838: Recent developments for ppc.
Reviewed-by: kvn

*** 1,8 ****
  /*
!  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright 2013, 2014 SAP AG. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,8 ----
  /*
!  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright 2013, 2015 SAP AG. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 262,289 ****
        // If no method data exists, go to profile_continue.
        __ ld(Rmdo, in_bytes(Method::method_data_offset()), R19_method);
        __ cmpdi(CCR0, Rmdo, 0);
        __ beq(CCR0, no_mdo);
  
!       // Increment invocation counter in the MDO.
!       const int mdo_ic_offs = in_bytes(MethodData::invocation_counter_offset()) + in_bytes(InvocationCounter::counter_offset());
!       __ lwz(Rscratch2, mdo_ic_offs, Rmdo);
        __ addi(Rscratch2, Rscratch2, increment);
!       __ stw(Rscratch2, mdo_ic_offs, Rmdo);
        __ load_const_optimized(Rscratch1, mask, R0);
        __ and_(Rscratch1, Rscratch2, Rscratch1);
        __ bne(CCR0, done);
        __ b(*overflow);
      }
  
      // Increment counter in MethodCounters*.
!     const int mo_ic_offs = in_bytes(MethodCounters::invocation_counter_offset()) + in_bytes(InvocationCounter::counter_offset());
      __ bind(no_mdo);
      __ get_method_counters(R19_method, R3_counters, done);
!     __ lwz(Rscratch2, mo_ic_offs, R3_counters);
      __ addi(Rscratch2, Rscratch2, increment);
!     __ stw(Rscratch2, mo_ic_offs, R3_counters);
      __ load_const_optimized(Rscratch1, mask, R0);
      __ and_(Rscratch1, Rscratch2, Rscratch1);
      __ beq(CCR0, *overflow);
  
      __ bind(done);
--- 262,289 ----
        // If no method data exists, go to profile_continue.
        __ ld(Rmdo, in_bytes(Method::method_data_offset()), R19_method);
        __ cmpdi(CCR0, Rmdo, 0);
        __ beq(CCR0, no_mdo);
  
!       // Increment backedge counter in the MDO.
!       const int mdo_bc_offs = in_bytes(MethodData::backedge_counter_offset()) + in_bytes(InvocationCounter::counter_offset());
!       __ lwz(Rscratch2, mdo_bc_offs, Rmdo);
        __ addi(Rscratch2, Rscratch2, increment);
!       __ stw(Rscratch2, mdo_bc_offs, Rmdo);
        __ load_const_optimized(Rscratch1, mask, R0);
        __ and_(Rscratch1, Rscratch2, Rscratch1);
        __ bne(CCR0, done);
        __ b(*overflow);
      }
  
      // Increment counter in MethodCounters*.
!     const int mo_bc_offs = in_bytes(MethodCounters::backedge_counter_offset()) + in_bytes(InvocationCounter::counter_offset());
      __ bind(no_mdo);
      __ get_method_counters(R19_method, R3_counters, done);
!     __ lwz(Rscratch2, mo_bc_offs, R3_counters);
      __ addi(Rscratch2, Rscratch2, increment);
!     __ stw(Rscratch2, mo_bc_offs, R3_counters);
      __ load_const_optimized(Rscratch1, mask, R0);
      __ and_(Rscratch1, Rscratch2, Rscratch1);
      __ beq(CCR0, *overflow);
  
      __ bind(done);
*** 609,624 ****
  
  // Support abs and sqrt like in compiler.
  // For others we can use a normal (native) entry.
  
  inline bool math_entry_available(AbstractInterpreter::MethodKind kind) {
!   // Provide math entry with debugging on demand.
!   // Note: Debugging changes which code will get executed:
!   // Debugging or disabled InlineIntrinsics: java method will get interpreted and performs a native call.
!   // Not debugging and enabled InlineIntrinics: processor instruction will get used.
!   // Result might differ slightly due to rounding etc.
!   if (!InlineIntrinsics && (!FLAG_IS_ERGO(InlineIntrinsics))) return false; // Generate a vanilla entry.
  
    return ((kind==Interpreter::java_lang_math_sqrt && VM_Version::has_fsqrt()) ||
            (kind==Interpreter::java_lang_math_abs));
  }
  
--- 609,619 ----
  
  // Support abs and sqrt like in compiler.
  // For others we can use a normal (native) entry.
  
  inline bool math_entry_available(AbstractInterpreter::MethodKind kind) {
!   if (!InlineIntrinsics) return false;
  
    return ((kind==Interpreter::java_lang_math_sqrt && VM_Version::has_fsqrt()) ||
            (kind==Interpreter::java_lang_math_abs));
  }
  
*** 626,644 ****
    if (!math_entry_available(kind)) {
      NOT_PRODUCT(__ should_not_reach_here();)
      return Interpreter::entry_for_kind(Interpreter::zerolocals);
    }
  
-   Label Lslow_path;
-   const Register Rjvmti_mode = R11_scratch1;
    address entry = __ pc();
  
-   // Provide math entry with debugging on demand.
-   __ lwz(Rjvmti_mode, thread_(interp_only_mode));
-   __ cmpwi(CCR0, Rjvmti_mode, 0);
-   __ bne(CCR0, Lslow_path); // jvmti_mode!=0
- 
    __ lfd(F1_RET, Interpreter::stackElementSize, R15_esp);
  
    // Pop c2i arguments (if any) off when we return.
  #ifdef ASSERT
    __ ld(R9_ARG7, 0, R1_SP);
--- 621,632 ----
*** 657,669 ****
    }
  
    // And we're done.
    __ blr();
  
-   // Provide slow path for JVMTI case.
-   __ bind(Lslow_path);
-   __ branch_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals), R12_scratch2);
    __ flush();
  
    return entry;
  }
  
--- 645,654 ----