jdk-sandbox: comparison hotspot/src/share/vm/adlc/formssel.hpp

equal deleted inserted replaced

-:11a9630698a6
+:3c568f3dacca
 //------------------------------InstructForm-----------------------------------
 class InstructForm : public Form {
 private:
 bool           _ideal_only;       // Not a user-defined instruction
 // Members used for tracking CISC-spilling
-uint           _cisc_spill_operand;// Which operand may cisc-spill
+int            _cisc_spill_operand;// Which operand may cisc-spill
 void           set_cisc_spill_operand(uint op_index) { _cisc_spill_operand = op_index; }
 bool           _is_cisc_alternate;
 InstructForm  *_cisc_spill_alternate;// cisc possible replacement
 const char    *_cisc_reg_mask_name;
 InstructForm  *_short_branch_form;
 FormDict       _effects;         // Dictionary of effect rules
 ExpandRule    *_exprule;         // Expand rule for this instruction
 RewriteRule   *_rewrule;         // Rewrite rule for this instruction
 FormatRule    *_format;          // Format for assembly generation
 Peephole      *_peephole;        // List of peephole rules for instruction
-const char    *_ins_pipe;        // Instruction Scheduline description class
+const char    *_ins_pipe;        // Instruction Scheduling description class
 uint          *_uniq_idx;        // Indexes of unique operands
 int            _uniq_idx_length; // Length of _uniq_idx array
 uint           _num_uniq;        // Number  of unique operands
 ComponentList  _components;      // List of Components matches MachNode's
 // Expected use is for pointer vs oop determination for LoadP
 virtual bool        captures_bottom_type(FormDict& globals) const;
 virtual const char *cost();      // Access ins_cost attribute
 virtual uint        num_opnds(); // Count of num_opnds for MachNode class
+// Counts USE_DEF opnds twice.  See also num_unique_opnds().
 virtual uint        num_post_match_opnds();
 virtual uint        num_consts(FormDict &globals) const;// Constants in match rule
 // Constants in match rule with specified type
 virtual uint        num_consts(FormDict &globals, Form::DataType type) const;
 virtual int         label_position();
 virtual int         method_position();
 // Return number of relocation entries needed for this instruction.
 virtual uint        reloc(FormDict &globals);
+const char         *opnd_ident(int idx);  // Name of operand #idx.
 const char         *reduce_result();
 // Return the name of the operand on the right hand side of the binary match
 // Return NULL if there is no right hand side
 const char         *reduce_right(FormDict &globals)  const;
 const char         *reduce_left(FormDict &globals)   const;
 virtual const char *mach_base_class(FormDict &globals)  const;
 // Check if this instruction can cisc-spill to 'alternate'
 bool                cisc_spills_to(ArchDesc &AD, InstructForm *alternate);
 InstructForm       *cisc_spill_alternate() { return _cisc_spill_alternate; }
-uint                cisc_spill_operand() const { return _cisc_spill_operand; }
+int                 cisc_spill_operand() const { return _cisc_spill_operand; }
 bool                is_cisc_alternate() const { return _is_cisc_alternate; }
 void                set_cisc_alternate(bool val) { _is_cisc_alternate = val; }
 const char         *cisc_reg_mask_name() const { return _cisc_reg_mask_name; }
 void                set_cisc_reg_mask_name(const char *rm_name) { _cisc_reg_mask_name = rm_name; }
 // Output cisc-method prototypes and method bodies
 return _uniq_idx[idx];
 } else {
 return idx;
 }
 }
+const char         *unique_opnd_ident(int idx);  // Name of operand at unique idx.
 // Operands which are only KILLs aren't part of the input array and
 // require special handling in some cases.  Their position in this
 // operand list is higher than the number of unique operands.
 bool is_noninput_operand(uint idx) {
 const char *base_type(FormDict &globals);
 // Form::DataType is_base_constant(FormDict &globals);
 void dump();                     // Debug printer
 void output(FILE *fp);           // Write to output files
+const char* getUsedefName();
 public:
 // Implementation depends upon working bit intersection and union.
 enum use_def_enum {
 INVALID = 0x0,
 virtual bool equivalent(FormDict& globals, MatchNode* mRule2);
 void       matchrule_swap_commutative_op(const char* instr_ident, int count, int& match_rules_cnt);
 void dump();
+void output_short(FILE *fp);
 void output(FILE *fp);
 };
 //------------------------------Attribute--------------------------------------
 class Attribute : public Form {

changeset 13971	3c568f3dacca
parent 13104	657b387034fb
child 17871	6669c8d6f6b3