1.1 --- a/src/share/vm/opto/machnode.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/opto/machnode.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -104,7 +104,7 @@
1.4 #endif
1.5
1.6 virtual intptr_t constant() const;
1.7 - virtual bool constant_is_oop() const;
1.8 + virtual relocInfo::relocType constant_reloc() const;
1.9 virtual jdouble constantD() const;
1.10 virtual jfloat constantF() const;
1.11 virtual jlong constantL() const;
1.12 @@ -118,7 +118,7 @@
1.13 // Parameters needed to support MEMORY_INTERFACE access to stackSlot
1.14 virtual int disp (PhaseRegAlloc *ra_, const Node *node, int idx) const;
1.15 // Check for PC-Relative displacement
1.16 - virtual bool disp_is_oop() const;
1.17 + virtual relocInfo::relocType disp_reloc() const;
1.18 virtual int constant_disp() const; // usu. 0, may return Type::OffsetBot
1.19 virtual int base_position() const; // base edge position, or -1
1.20 virtual int index_position() const; // index edge position, or -1
1.21 @@ -247,7 +247,7 @@
1.22
1.23 // Bottom_type call; value comes from operand0
1.24 virtual const class Type *bottom_type() const { return _opnds[0]->type(); }
1.25 - virtual uint ideal_reg() const { const Type *t = _opnds[0]->type(); return t == TypeInt::CC ? Op_RegFlags : Matcher::base2reg[t->base()]; }
1.26 + virtual uint ideal_reg() const { const Type *t = _opnds[0]->type(); return t == TypeInt::CC ? Op_RegFlags : t->ideal_reg(); }
1.27
1.28 // If this is a memory op, return the base pointer and fixed offset.
1.29 // If there are no such, return NULL. If there are multiple addresses
1.30 @@ -498,7 +498,7 @@
1.31 virtual const RegMask &out_RegMask() const { return *_out; }
1.32 virtual const RegMask &in_RegMask(uint) const { return *_in; }
1.33 virtual const class Type *bottom_type() const { return _type; }
1.34 - virtual uint ideal_reg() const { return Matcher::base2reg[_type->base()]; }
1.35 + virtual uint ideal_reg() const { return _type->ideal_reg(); }
1.36 virtual uint oper_input_base() const { return 1; }
1.37 uint implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const;
1.38
