*** old/src/share/vm/c1/c1_Runtime1.cpp	Tue Apr 29 16:51:55 2014
--- new/src/share/vm/c1/c1_Runtime1.cpp	Tue Apr 29 16:51:55 2014

*** 530,541 ****
--- 530,541 ----
      // debugging support
      // tracing
      if (TraceExceptions) {
        ttyLocker ttyl;
        ResourceMark rm;
!       tty->print_cr("Exception <%s> (0x%x) thrown in compiled method <%s> at PC " PTR_FORMAT " for thread 0x%x",
!                     exception->print_value_string(), (address)exception(), nm->method()->print_value_string(), pc, thread);
!       tty->print_cr("Exception <%s> (0x%" PRIxPTR ") thrown in compiled method <%s> at PC " PTR_FORMAT " for thread 0x%" PRIxPTR "",
!                     exception->print_value_string(), p2i((address)exception()), nm->method()->print_value_string(), p2i(pc), p2i(thread));
      }
      // for AbortVMOnException flag
      NOT_PRODUCT(Exceptions::debug_check_abort(exception));
  
      // Clear out the exception oop and pc since looking up an

*** 561,571 ****
--- 561,571 ----
  
    if (TraceExceptions) {
      ttyLocker ttyl;
      ResourceMark rm;
      tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT,
!                   thread, continuation, pc);
!                   p2i(thread), p2i(continuation), p2i(pc));
    }
  
    return continuation;
  JRT_END
  

*** 986,997 ****
--- 986,997 ----
          unsigned char* byte_skip = (unsigned char*) (stub_location - 2);
          unsigned char* being_initialized_entry_offset = (unsigned char*) (stub_location - 3);
          address copy_buff = stub_location - *byte_skip - *byte_count;
          address being_initialized_entry = stub_location - *being_initialized_entry_offset;
          if (TracePatching) {
!           tty->print_cr(" Patching %s at bci %d at address 0x%" PRIxPTR "  (%s)", Bytecodes::name(code), bci,
!                         p2i(instr_pc), (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
            nmethod* caller_code = CodeCache::find_nmethod(caller_frame.pc());
            assert(caller_code != NULL, "nmethod not found");
  
            // NOTE we use pc() not original_pc() because we already know they are
            // identical otherwise we'd have never entered this block of code

*** 1446,1456 ****
--- 1446,1456 ----
      stringStream ss1, ss2;
      vframeStream vfst(thread);
      methodHandle inlinee = methodHandle(vfst.method());
      inlinee->print_short_name(&ss1);
      m->print_short_name(&ss2);
!     tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc %x", ss1.as_string(), vfst.bci(), ss2.as_string(), caller_frame.pc());
!     tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc " PTR_FORMAT, ss1.as_string(), vfst.bci(), ss2.as_string(), p2i(caller_frame.pc()));
    }
  
  
    Deoptimization::deoptimize_frame(thread, caller_frame.id());