src/share/vm/adlc/output_h.cpp

*** 1656,1666 ****
      // Return the top-level ideal opcode.
      // Use MachNode::ideal_Opcode() for nodes based on MachNode class
      // if the ideal_Opcode == Op_Node.
      if ( strcmp("Node", instr->ideal_Opcode(_globalNames)) != 0 ||
           strcmp("MachNode", instr->mach_base_class(_globalNames)) != 0 ) {
!       fprintf(fp,"  virtual int            ideal_Opcode() const { return Op_%s; }\n",
              instr->ideal_Opcode(_globalNames) );
      }
  
      if (instr->needs_constant_base() &&
          !instr->is_mach_constant()) {  // These inherit the funcion from MachConstantNode.
--- 1656,1666 ----
      // Return the top-level ideal opcode.
      // Use MachNode::ideal_Opcode() for nodes based on MachNode class
      // if the ideal_Opcode == Op_Node.
      if ( strcmp("Node", instr->ideal_Opcode(_globalNames)) != 0 ||
           strcmp("MachNode", instr->mach_base_class(_globalNames)) != 0 ) {
!       fprintf(fp,"  virtual Opcodes        ideal_Opcode() const { return Opcodes::Op_%s; }\n",
              instr->ideal_Opcode(_globalNames) );
      }
  
      if (instr->needs_constant_base() &&
          !instr->is_mach_constant()) {  // These inherit the funcion from MachConstantNode.
*** 2073,2083 ****
    fprintf(fp,"  // Methods created by ADLC and invoked by Reduce\n");
    fprintf(fp,"  MachOper *MachOperGenerator(int opcode);\n");
    fprintf(fp,"  MachNode *MachNodeGenerator(int opcode);\n");
    fprintf(fp,"\n");
    fprintf(fp,"  // Assign a state to a node, definition of method produced by ADLC\n");
!   fprintf(fp,"  bool DFA( int opcode, const Node *ideal );\n");
    fprintf(fp,"\n");
    fprintf(fp,"  // Access function for _valid bit vector\n");
    fprintf(fp,"  bool valid(uint index) {\n");
    fprintf(fp,"    return( STATE__VALID(index) != 0 );\n");
    fprintf(fp,"  }\n");
--- 2073,2083 ----
    fprintf(fp,"  // Methods created by ADLC and invoked by Reduce\n");
    fprintf(fp,"  MachOper *MachOperGenerator(int opcode);\n");
    fprintf(fp,"  MachNode *MachNodeGenerator(int opcode);\n");
    fprintf(fp,"\n");
    fprintf(fp,"  // Assign a state to a node, definition of method produced by ADLC\n");
!   fprintf(fp,"  bool DFA( Opcodes opcode, const Node *ideal );\n");
    fprintf(fp,"\n");
    fprintf(fp,"  // Access function for _valid bit vector\n");
    fprintf(fp,"  bool valid(uint index) {\n");
    fprintf(fp,"    return( STATE__VALID(index) != 0 );\n");
    fprintf(fp,"  }\n");
*** 2091,2101 ****
    fprintf(fp,"  void dump();                // Debugging prints\n");
    fprintf(fp,"  void dump(int depth);\n");
    fprintf(fp,"#endif\n");
    if (_dfa_small) {
      // Generate the routine name we'll need
!     for (int i = 1; i < _last_opcode; i++) {
        if (_mlistab[i] == NULL) continue;
        fprintf(fp, "  void  _sub_Op_%s(const Node *n);\n", NodeClassNames[i]);
      }
    }
    fprintf(fp,"};\n");
--- 2091,2101 ----
    fprintf(fp,"  void dump();                // Debugging prints\n");
    fprintf(fp,"  void dump(int depth);\n");
    fprintf(fp,"#endif\n");
    if (_dfa_small) {
      // Generate the routine name we'll need
!     for (uint i = 1; i < static_cast<uint>(Opcodes::_last_opcode); i++) {
        if (_mlistab[i] == NULL) continue;
        fprintf(fp, "  void  _sub_Op_%s(const Node *n);\n", NodeClassNames[i]);
      }
    }
    fprintf(fp,"};\n");