*** old/src/share/vm/adlc/archDesc.hpp	Fri Nov 12 05:56:27 2010
--- new/src/share/vm/adlc/archDesc.hpp	Fri Nov 12 05:56:27 2010

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 121,131 ****
--- 121,130 ----
    // Methods for outputting the DFA
    void gen_match(FILE *fp, MatchList &mlist, ProductionState &status, Dict &operands_chained_from);
    void chain_rule(FILE *fp, const char *indent, const char *ideal,
                    const Expr *icost, const char *irule,
                    Dict &operands_chained_from, ProductionState &status);
    void chain_rule_c(FILE *fp, char *indent, char *ideal, char *irule);  // %%%%% TODO: remove this
    void expand_opclass(FILE *fp, const char *indent, const Expr *cost,
                        const char *result_type, ProductionState &status);
    Expr *calc_cost(FILE *fp, const char *spaces, MatchList &mList, ProductionState &status);
    void prune_matchlist(Dict &minimize, MatchList &mlist);
  

*** 291,307 ****
--- 290,311 ----
    void buildMachOperGenerator(FILE *fp_cpp);
    // Generator for MachNode objects given integer type
    void buildMachNodeGenerator(FILE *fp_cpp);
  
    // Generator for Expand methods for instructions with expand rules
!   void defineExpand      (FILE *fp, InstructForm *node);
    // Generator for Peephole methods for instructions with peephole rules
!   void definePeephole    (FILE *fp, InstructForm *node);
    // Generator for Size methods for instructions
!   void defineSize        (FILE *fp, InstructForm &node);
+ 
+ public:
+   // Generator for EvalConstantValue methods for instructions
+   void defineEvalConstant(FILE *fp, InstructForm &node);
    // Generator for Emit methods for instructions
!   void defineEmit        (FILE *fp, InstructForm &node);
+ 
    // Define a MachOper encode method
    void define_oper_interface(FILE *fp, OperandForm &oper, FormDict &globals,
                               const char *name, const char *encoding);
  
    // Methods to construct the MachNode class hierarchy