hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp

rev 6900 : 8048169: Change 8037816 breaks HS build on PPC64 and CPP-Interpreter platforms
Summary: Fix the matching of format string parameter types to the actual argument types for the PPC64 and CPP-Interpreter files in the same way as 8037816 already did it for all the other files
Reviewed-by: stefank, coleenp, dholmes

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. 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,7 ----
  /*
!  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. 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.
*** 2811,2825 ****
        MORE_STACK(1);
        pc = METHOD->code_base() + continuation_bci;
        if (TraceExceptions) {
          ttyLocker ttyl;
          ResourceMark rm;
!         tty->print_cr("Exception <%s> (" INTPTR_FORMAT ")", except_oop->print_value_string(), (void*)except_oop());
          tty->print_cr(" thrown in interpreter method <%s>", METHOD->print_value_string());
          tty->print_cr(" at bci %d, continuing at %d for thread " INTPTR_FORMAT,
!                       istate->bcp() - (intptr_t)METHOD->code_base(),
!                       continuation_bci, THREAD);
        }
        // for AbortVMOnException flag
        NOT_PRODUCT(Exceptions::debug_check_abort(except_oop));
  
        // Update profiling data.
--- 2811,2825 ----
        MORE_STACK(1);
        pc = METHOD->code_base() + continuation_bci;
        if (TraceExceptions) {
          ttyLocker ttyl;
          ResourceMark rm;
!         tty->print_cr("Exception <%s> (" INTPTR_FORMAT ")", except_oop->print_value_string(), p2i(except_oop()));
          tty->print_cr(" thrown in interpreter method <%s>", METHOD->print_value_string());
          tty->print_cr(" at bci %d, continuing at %d for thread " INTPTR_FORMAT,
!                       (int)(istate->bcp() - METHOD->code_base()),
!                       (int)continuation_bci, p2i(THREAD));
        }
        // for AbortVMOnException flag
        NOT_PRODUCT(Exceptions::debug_check_abort(except_oop));
  
        // Update profiling data.
*** 2827,2841 ****
        goto run;
      }
      if (TraceExceptions) {
        ttyLocker ttyl;
        ResourceMark rm;
!       tty->print_cr("Exception <%s> (" INTPTR_FORMAT ")", except_oop->print_value_string(), (void*)except_oop());
        tty->print_cr(" thrown in interpreter method <%s>", METHOD->print_value_string());
        tty->print_cr(" at bci %d, unwinding for thread " INTPTR_FORMAT,
!                     istate->bcp() - (intptr_t)METHOD->code_base(),
!                     THREAD);
      }
      // for AbortVMOnException flag
      NOT_PRODUCT(Exceptions::debug_check_abort(except_oop));
      // No handler in this activation, unwind and try again
      THREAD->set_pending_exception(except_oop(), NULL, 0);
--- 2827,2841 ----
        goto run;
      }
      if (TraceExceptions) {
        ttyLocker ttyl;
        ResourceMark rm;
!       tty->print_cr("Exception <%s> (" INTPTR_FORMAT ")", except_oop->print_value_string(), p2i(except_oop()));
        tty->print_cr(" thrown in interpreter method <%s>", METHOD->print_value_string());
        tty->print_cr(" at bci %d, unwinding for thread " INTPTR_FORMAT,
!                     (int)(istate->bcp() - METHOD->code_base()),
!                     p2i(THREAD));
      }
      // for AbortVMOnException flag
      NOT_PRODUCT(Exceptions::debug_check_abort(except_oop));
      // No handler in this activation, unwind and try again
      THREAD->set_pending_exception(except_oop(), NULL, 0);
*** 3430,3440 ****
    tty->print_cr("result_to_call._callee_entry_point: " INTPTR_FORMAT, (uintptr_t) this->_result._to_call._callee_entry_point);
    tty->print_cr("result_to_call._bcp_advance: %d ", this->_result._to_call._bcp_advance);
    tty->print_cr("osr._osr_buf: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_buf);
    tty->print_cr("osr._osr_entry: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_entry);
    tty->print_cr("prev_link: " INTPTR_FORMAT, (uintptr_t) this->_prev_link);
!   tty->print_cr("native_mirror: " INTPTR_FORMAT, (void*) this->_oop_temp);
    tty->print_cr("stack_base: " INTPTR_FORMAT, (uintptr_t) this->_stack_base);
    tty->print_cr("stack_limit: " INTPTR_FORMAT, (uintptr_t) this->_stack_limit);
    tty->print_cr("monitor_base: " INTPTR_FORMAT, (uintptr_t) this->_monitor_base);
  #ifdef SPARC
    tty->print_cr("last_Java_pc: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_pc);
--- 3430,3440 ----
    tty->print_cr("result_to_call._callee_entry_point: " INTPTR_FORMAT, (uintptr_t) this->_result._to_call._callee_entry_point);
    tty->print_cr("result_to_call._bcp_advance: %d ", this->_result._to_call._bcp_advance);
    tty->print_cr("osr._osr_buf: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_buf);
    tty->print_cr("osr._osr_entry: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_entry);
    tty->print_cr("prev_link: " INTPTR_FORMAT, (uintptr_t) this->_prev_link);
!   tty->print_cr("native_mirror: " INTPTR_FORMAT, (uintptr_t) this->_oop_temp);
    tty->print_cr("stack_base: " INTPTR_FORMAT, (uintptr_t) this->_stack_base);
    tty->print_cr("stack_limit: " INTPTR_FORMAT, (uintptr_t) this->_stack_limit);
    tty->print_cr("monitor_base: " INTPTR_FORMAT, (uintptr_t) this->_monitor_base);
  #ifdef SPARC
    tty->print_cr("last_Java_pc: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_pc);