src/share/vm/adlc/output_h.cpp

*** 1117,1127 ****
  
    fprintf(fp_hpp, "  enum {\n");
    fprintf(fp_hpp, "    _nop_count = %d\n",
      _pipeline->_nopcnt);
    fprintf(fp_hpp, "  };\n\n");
!   fprintf(fp_hpp, "  static void initialize_nops(MachNode *nop_list[%d], Compile* C);\n\n",
      _pipeline->_nopcnt);
    fprintf(fp_hpp, "#ifndef PRODUCT\n");
    fprintf(fp_hpp, "  void dump(outputStream *st = tty) const;\n");
    fprintf(fp_hpp, "#endif\n");
    fprintf(fp_hpp, "};\n\n");
--- 1117,1127 ----
  
    fprintf(fp_hpp, "  enum {\n");
    fprintf(fp_hpp, "    _nop_count = %d\n",
      _pipeline->_nopcnt);
    fprintf(fp_hpp, "  };\n\n");
!   fprintf(fp_hpp, "  static void initialize_nops(MachNode *nop_list[%d]);\n\n",
      _pipeline->_nopcnt);
    fprintf(fp_hpp, "#ifndef PRODUCT\n");
    fprintf(fp_hpp, "  void dump(outputStream *st = tty) const;\n");
    fprintf(fp_hpp, "#endif\n");
    fprintf(fp_hpp, "};\n\n");
*** 1238,1248 ****
      defineConstructor(fp, oper->_ident, oper->num_consts(_globalNames),
                        oper->_components, oper->is_ideal_bool(),
                        constant_type, _globalNames);
  
      // Clone function
!     fprintf(fp,"  virtual MachOper      *clone(Compile* C) const;\n");
  
      // Support setting a spill offset into a constant operand.
      // We only support setting an 'int' offset, while in the
      // LP64 build spill offsets are added with an AddP which
      // requires a long constant.  Thus we don't support spilling
--- 1238,1248 ----
      defineConstructor(fp, oper->_ident, oper->num_consts(_globalNames),
                        oper->_components, oper->is_ideal_bool(),
                        constant_type, _globalNames);
  
      // Clone function
!     fprintf(fp,"  virtual MachOper      *clone() const;\n");
  
      // Support setting a spill offset into a constant operand.
      // We only support setting an 'int' offset, while in the
      // LP64 build spill offsets are added with an AddP which
      // requires a long constant.  Thus we don't support spilling
*** 1716,1726 ****
      //   MachNode *cisc_version( int offset /* ,... */ );
      instr->declare_cisc_version(*this, fp);
  
      // If there is an explicit peephole rule, build it
      if ( instr->peepholes() != NULL ) {
!       fprintf(fp,"  virtual MachNode      *peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile *C);\n");
      }
  
      // Output the declaration for number of relocation entries
      if ( instr->reloc(_globalNames) != 0 ) {
        fprintf(fp,"  virtual int            reloc() const;\n");
--- 1716,1726 ----
      //   MachNode *cisc_version( int offset /* ,... */ );
      instr->declare_cisc_version(*this, fp);
  
      // If there is an explicit peephole rule, build it
      if ( instr->peepholes() != NULL ) {
!       fprintf(fp,"  virtual MachNode      *peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted);\n");
      }
  
      // Output the declaration for number of relocation entries
      if ( instr->reloc(_globalNames) != 0 ) {
        fprintf(fp,"  virtual int            reloc() const;\n");
*** 1861,1871 ****
      if (instr->is_projection(_globalNames)) {
        fprintf(fp,"  virtual const Node *is_block_proj() const { return this; }\n");
      }
      if ( instr->num_post_match_opnds() != 0
           || instr->is_chain_of_constant(_globalNames) ) {
!       fprintf(fp,"  friend MachNode *State::MachNodeGenerator(int opcode, Compile* C);\n");
      }
      if ( instr->rematerialize(_globalNames, get_registers()) ) {
        fprintf(fp,"  // Rematerialize %s\n", instr->_ident);
      }
  
--- 1861,1871 ----
      if (instr->is_projection(_globalNames)) {
        fprintf(fp,"  virtual const Node *is_block_proj() const { return this; }\n");
      }
      if ( instr->num_post_match_opnds() != 0
           || instr->is_chain_of_constant(_globalNames) ) {
!       fprintf(fp,"  friend MachNode *State::MachNodeGenerator(int opcode);\n");
      }
      if ( instr->rematerialize(_globalNames, get_registers()) ) {
        fprintf(fp,"  // Rematerialize %s\n", instr->_ident);
      }
  
*** 2069,2080 ****
    fprintf(fp,"\n");
    fprintf(fp,"  State(void);                      // Constructor\n");
    fprintf(fp,"  DEBUG_ONLY( ~State(void); )       // Destructor\n");
    fprintf(fp,"\n");
    fprintf(fp,"  // Methods created by ADLC and invoked by Reduce\n");
!   fprintf(fp,"  MachOper *MachOperGenerator( int opcode, Compile* C );\n");
!   fprintf(fp,"  MachNode *MachNodeGenerator( int opcode, Compile* C );\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");
--- 2069,2080 ----
    fprintf(fp,"\n");
    fprintf(fp,"  State(void);                      // Constructor\n");
    fprintf(fp,"  DEBUG_ONLY( ~State(void); )       // Destructor\n");
    fprintf(fp,"\n");
    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");