1.1 --- a/src/share/vm/adlc/formssel.hpp Tue May 18 13:45:03 2010 -0700 1.2 +++ b/src/share/vm/adlc/formssel.hpp Tue May 18 23:58:32 2010 -0700 1.3 @@ -188,7 +188,7 @@ 1.4 1.5 // This instruction captures the machine-independent bottom_type 1.6 // Expected use is for pointer vs oop determination for LoadP 1.7 - virtual bool captures_bottom_type() const; 1.8 + virtual bool captures_bottom_type(FormDict& globals) const; 1.9 1.10 virtual const char *cost(); // Access ins_cost attribute 1.11 virtual uint num_opnds(); // Count of num_opnds for MachNode class 1.12 @@ -229,7 +229,7 @@ 1.13 const char *reduce_left(FormDict &globals) const; 1.14 1.15 // Base class for this instruction, MachNode except for calls 1.16 - virtual const char *mach_base_class() const; 1.17 + virtual const char *mach_base_class(FormDict &globals) const; 1.18 1.19 // Check if this instruction can cisc-spill to 'alternate' 1.20 bool cisc_spills_to(ArchDesc &AD, InstructForm *alternate); 1.21 @@ -252,7 +252,7 @@ 1.22 bool has_short_branch_form() { return _short_branch_form != NULL; } 1.23 // Output short branch prototypes and method bodies 1.24 void declare_short_branch_methods(FILE *fp_cpp); 1.25 - bool define_short_branch_methods(FILE *fp_cpp); 1.26 + bool define_short_branch_methods(ArchDesc &AD, FILE *fp_cpp); 1.27 1.28 uint alignment() { return _alignment; } 1.29 void set_alignment(uint val) { _alignment = val; }