*** old/src/share/vm/adlc/formssel.cpp	Tue Apr 29 16:51:46 2014
--- new/src/share/vm/adlc/formssel.cpp	Tue Apr 29 16:51:46 2014

*** 1320,1330 ****
--- 1320,1330 ----
      // This component isn't in the input array.  Print out the static
      // name of the register.
      OperandForm* oper = form->is_operand();
      if (oper != NULL && oper->is_bound_register()) {
        const RegDef* first = oper->get_RegClass()->find_first_elem();
!       fprintf(fp, "    st->print_raw(\"%s\");\n", first->_regname);
      } else {
        globalAD->syntax_err(_linenum, "In %s can't find format for %s %s", _ident, opc->_ident, rep_var);
      }
    } else {
      // Output the format call for this operand

*** 2528,2538 ****
--- 2528,2538 ----
    switch(const_type) {
    case Form::idealI: fprintf(fp,"  st->print(\"#%%d\", _c%d);\n", const_index); break;
    case Form::idealP: fprintf(fp,"  if (_c%d) _c%d->dump_on(st);\n", const_index, const_index); break;
    case Form::idealNKlass:
    case Form::idealN: fprintf(fp,"  if (_c%d) _c%d->dump_on(st);\n", const_index, const_index); break;
!   case Form::idealL: fprintf(fp,"  st->print(\"#%%lld\", _c%d);\n", const_index); break;
!   case Form::idealL: fprintf(fp,"  st->print(\"#\" INT64_FORMAT, (int64_t)_c%d);\n", const_index); break;
    case Form::idealF: fprintf(fp,"  st->print(\"#%%f\", _c%d);\n", const_index); break;
    case Form::idealD: fprintf(fp,"  st->print(\"#%%f\", _c%d);\n", const_index); break;
    default:
      assert( false, "ShouldNotReachHere()");
    }