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

*** 1561,1579 ****
--- 1561,1579 ----
    } else if (is_double_stack()) {
      out->print("dbl_stack:%d",double_stack_ix());
    } else if (is_virtual()) {
      out->print("R%d", vreg_number());
    } else if (is_single_cpu()) {
!     out->print_raw(as_register()->name());
    } else if (is_double_cpu()) {
!     out->print_raw(as_register_hi()->name());
!     out->print(as_register_lo()->name());
!     out->print_raw(as_register_lo()->name());
  #if defined(X86)
    } else if (is_single_xmm()) {
!     out->print_raw(as_xmm_float_reg()->name());
    } else if (is_double_xmm()) {
!     out->print_raw(as_xmm_double_reg()->name());
    } else if (is_single_fpu()) {
      out->print("fpu%d", fpu_regnr());
    } else if (is_double_fpu()) {
      out->print("fpu%d", fpu_regnrLo());
  #elif defined(ARM)

*** 1581,1593 ****
--- 1581,1593 ----
      out->print("s%d", fpu_regnr());
    } else if (is_double_fpu()) {
      out->print("d%d", fpu_regnrLo() >> 1);
  #else
    } else if (is_single_fpu()) {
!     out->print_raw(as_float_reg()->name());
    } else if (is_double_fpu()) {
!     out->print_raw(as_double_reg()->name());
  #endif
  
    } else if (is_illegal()) {
      out->print("-");
    } else {

*** 1609,1621 ****
--- 1609,1621 ----
      case T_ADDRESS:out->print("address:%d",as_jint());          break;
      case T_INT:    out->print("int:%d",   as_jint());           break;
      case T_LONG:   out->print("lng:" JLONG_FORMAT, as_jlong()); break;
      case T_FLOAT:  out->print("flt:%f",   as_jfloat());         break;
      case T_DOUBLE: out->print("dbl:%f",   as_jdouble());        break;
!     case T_OBJECT: out->print("obj:0x%x", as_jobject());        break;
!     case T_METADATA: out->print("metadata:0x%x", as_metadata());break;
!     default:       out->print("%3d:0x%x",type(), as_jdouble()); break;
!     case T_OBJECT: out->print("obj:" PTR_FORMAT, p2i(as_jobject()));        break;
!     case T_METADATA: out->print("metadata:" PTR_FORMAT, p2i(as_metadata()));break;
!     default:       out->print("%3d:0x" UINT64_FORMAT_X, type(), (uint64_t)as_jlong()); break;
    }
  }
  
  // LIR_Address
  void LIR_Address::print_value_on(outputStream* out) const {

*** 1627,1637 ****
--- 1627,1637 ----
      case times_2: out->print(" * 2"); break;
      case times_4: out->print(" * 4"); break;
      case times_8: out->print(" * 8"); break;
      }
    }
!   out->print(" Disp: %d", _disp);
!   out->print(" Disp: " INTX_FORMAT, _disp);
  }
  
  // debug output of block header without InstructionPrinter
  //       (because phi functions are not necessary for LIR)
  static void print_block(BlockBegin* x) {

*** 1701,1711 ****
--- 1701,1711 ----
    if (id() != -1 || PrintCFGToFile) {
      out->print("%4d ", id());
    } else {
      out->print("     ");
    }
!   out->print(name()); out->print(" ");
!   out->print("%s ", name());
    print_instr(out);
    if (info() != NULL) out->print(" [bci:%d]", info()->stack()->bci());
  #ifdef ASSERT
    if (Verbose && _file != NULL) {
      out->print(" (%s:%d)", _file, _line);

*** 1831,1852 ****
--- 1831,1852 ----
  }
  
  // LIR_OpJavaCall
  void LIR_OpJavaCall::print_instr(outputStream* out) const {
    out->print("call: ");
!   out->print("[addr: 0x%x]", address());
!   out->print("[addr: 0x%" PRIxPTR "]", p2i(address()));
    if (receiver()->is_valid()) {
      out->print(" [recv: ");   receiver()->print(out);   out->print("]");
    }
    if (result_opr()->is_valid()) {
      out->print(" [result: "); result_opr()->print(out); out->print("]");
    }
  }
  
  // LIR_OpLabel
  void LIR_OpLabel::print_instr(outputStream* out) const {
!   out->print("[label:0x%x]", _label);
!   out->print("[label:0x%" PRIxPTR "]", p2i(_label));
  }
  
  // LIR_OpArrayCopy
  void LIR_OpArrayCopy::print_instr(outputStream* out) const {
    src()->print(out);     out->print(" ");

*** 1909,1919 ****
--- 1909,1919 ----
  
  
  // LIR_Op1
  void LIR_OpRTCall::print_instr(outputStream* out) const {
    intx a = (intx)addr();
!   out->print_raw(Runtime1::name_for_address(addr()));
    out->print(" ");
    tmp()->print(out);
  }
  
  void LIR_Op1::print_patch_code(outputStream* out, LIR_PatchCode code) {

*** 1932,1945 ****
--- 1932,1945 ----
    if (block() != NULL) {
      out->print("[B%d] ", block()->block_id());
    } else if (stub() != NULL) {
      out->print("[");
      stub()->print_name(out);
!     out->print(": 0x%x]", stub());
!     out->print(": 0x%" PRIxPTR "]", p2i(stub()));
      if (stub()->info() != NULL) out->print(" [bci:%d]", stub()->info()->stack()->bci());
    } else {
!     out->print("[label:0x%x] ", label());
!     out->print("[label:0x%" PRIxPTR "] ", p2i(label()));
    }
    if (ublock() != NULL) {
      out->print("unordered: [B%d] ", ublock()->block_id());
    }
  }

*** 2002,2012 ****
--- 2002,2012 ----
    tmp2()->print(out);                       out->print(" ");
    tmp3()->print(out);                       out->print(" ");
    tmp4()->print(out);                       out->print(" ");
    out->print("[hdr:%d]", header_size()); out->print(" ");
    out->print("[obj:%d]", object_size()); out->print(" ");
!   out->print("[lbl:0x%x]", stub()->entry());
!   out->print("[lbl:0x%" PRIxPTR "]", p2i(stub()->entry()));
  }
  
  void LIR_OpRoundFP::print_instr(outputStream* out) const {
    _opr->print(out);         out->print(" ");
    tmp()->print(out);        out->print(" ");

*** 2035,2045 ****
--- 2035,2045 ----
    tmp1()->print(out);                    out->print(" ");
    tmp2()->print(out);                    out->print(" ");
    tmp3()->print(out);                    out->print(" ");
    tmp4()->print(out);                    out->print(" ");
    out->print("[type:0x%x]", type());     out->print(" ");
!   out->print("[label:0x%x]", stub()->entry());
!   out->print("[label:0x%" PRIxPTR "]", p2i(stub()->entry()));
  }
  
  
  void LIR_OpTypeCheck::print_instr(outputStream* out) const {
    object()->print(out);                  out->print(" ");

*** 2072,2090 ****
--- 2072,2090 ----
    obj_opr()->print(out);   out->print(" ");
    lock_opr()->print(out);  out->print(" ");
    if (_scratch->is_valid()) {
      _scratch->print(out);  out->print(" ");
    }
!   out->print("[lbl:0x%x]", stub()->entry());
!   out->print("[lbl:0x%" PRIxPTR "]", p2i(stub()->entry()));
  }
  
  #ifdef ASSERT
  void LIR_OpAssert::print_instr(outputStream* out) const {
    print_condition(out, condition()); out->print(" ");
    in_opr1()->print(out);             out->print(" ");
    in_opr2()->print(out);             out->print(", \"");
!   out->print(msg());                 out->print("\"");
!   out->print_raw(msg());          out->print("\"");
  }
  #endif
  
  
  void LIR_OpDelay::print_instr(outputStream* out) const {