--- old/src/share/vm/opto/mulnode.hpp	2016-07-11 22:46:44.401384781 +0900
+++ new/src/share/vm/opto/mulnode.hpp	2016-07-11 22:46:44.267385250 +0900
@@ -70,10 +70,10 @@
   virtual const Type *add_id() const = 0;
 
   // Supplied function to return the additive opcode
-  virtual int add_opcode() const = 0;
+  virtual Opcodes add_opcode() const = 0;
 
   // Supplied function to return the multiplicative opcode
-  virtual int mul_opcode() const = 0;
+  virtual Opcodes mul_opcode() const = 0;
 
 };
 
@@ -82,15 +82,15 @@
 class MulINode : public MulNode {
 public:
   MulINode( Node *in1, Node *in2 ) : MulNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeInt::ONE; }
   const Type *add_id() const { return TypeInt::ZERO; }
-  int add_opcode() const { return Op_AddI; }
-  int mul_opcode() const { return Op_MulI; }
+  Opcodes add_opcode() const { return Opcodes::Op_AddI; }
+  Opcodes mul_opcode() const { return Opcodes::Op_MulI; }
   const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------MulLNode---------------------------------------
@@ -98,15 +98,15 @@
 class MulLNode : public MulNode {
 public:
   MulLNode( Node *in1, Node *in2 ) : MulNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeLong::ONE; }
   const Type *add_id() const { return TypeLong::ZERO; }
-  int add_opcode() const { return Op_AddL; }
-  int mul_opcode() const { return Op_MulL; }
+  Opcodes add_opcode() const { return Opcodes::Op_AddL; }
+  Opcodes mul_opcode() const { return Opcodes::Op_MulL; }
   const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 
@@ -115,14 +115,14 @@
 class MulFNode : public MulNode {
 public:
   MulFNode( Node *in1, Node *in2 ) : MulNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeF::ONE; }
   const Type *add_id() const { return TypeF::ZERO; }
-  int add_opcode() const { return Op_AddF; }
-  int mul_opcode() const { return Op_MulF; }
+  Opcodes add_opcode() const { return Opcodes::Op_AddF; }
+  Opcodes mul_opcode() const { return Opcodes::Op_MulF; }
   const Type *bottom_type() const { return Type::FLOAT; }
-  virtual uint ideal_reg() const { return Op_RegF; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegF; }
 };
 
 //------------------------------MulDNode---------------------------------------
@@ -130,14 +130,14 @@
 class MulDNode : public MulNode {
 public:
   MulDNode( Node *in1, Node *in2 ) : MulNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeD::ONE; }
   const Type *add_id() const { return TypeD::ZERO; }
-  int add_opcode() const { return Op_AddD; }
-  int mul_opcode() const { return Op_MulD; }
+  Opcodes add_opcode() const { return Opcodes::Op_AddD; }
+  Opcodes mul_opcode() const { return Opcodes::Op_MulD; }
   const Type *bottom_type() const { return Type::DOUBLE; }
-  virtual uint ideal_reg() const { return Op_RegD; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegD; }
 };
 
 //-------------------------------MulHiLNode------------------------------------
@@ -145,10 +145,10 @@
 class MulHiLNode : public Node {
 public:
   MulHiLNode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------AndINode---------------------------------------
@@ -157,15 +157,15 @@
 class AndINode : public MulINode {
 public:
   AndINode( Node *in1, Node *in2 ) : MulINode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeInt::MINUS_1; }
   const Type *add_id() const { return TypeInt::ZERO; }
-  int add_opcode() const { return Op_OrI; }
-  int mul_opcode() const { return Op_AndI; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  Opcodes add_opcode() const { return Opcodes::Op_OrI; }
+  Opcodes mul_opcode() const { return Opcodes::Op_AndI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------AndINode---------------------------------------
@@ -174,15 +174,15 @@
 class AndLNode : public MulLNode {
 public:
   AndLNode( Node *in1, Node *in2 ) : MulLNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type *mul_ring( const Type *, const Type * ) const;
   const Type *mul_id() const { return TypeLong::MINUS_1; }
   const Type *add_id() const { return TypeLong::ZERO; }
-  int add_opcode() const { return Op_OrL; }
-  int mul_opcode() const { return Op_AndL; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  Opcodes add_opcode() const { return Opcodes::Op_OrL; }
+  Opcodes mul_opcode() const { return Opcodes::Op_AndL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------LShiftINode------------------------------------
@@ -190,12 +190,12 @@
 class LShiftINode : public Node {
 public:
   LShiftINode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------LShiftLNode------------------------------------
@@ -203,12 +203,12 @@
 class LShiftLNode : public Node {
 public:
   LShiftLNode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------RShiftINode------------------------------------
@@ -216,12 +216,12 @@
 class RShiftINode : public Node {
 public:
   RShiftINode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------RShiftLNode------------------------------------
@@ -229,11 +229,11 @@
 class RShiftLNode : public Node {
 public:
   RShiftLNode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 
@@ -242,12 +242,12 @@
 class URShiftINode : public Node {
 public:
   URShiftINode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------URShiftLNode-----------------------------------
@@ -255,12 +255,12 @@
 class URShiftLNode : public Node {
 public:
   URShiftLNode( Node *in1, Node *in2 ) : Node(0,in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 #endif // SHARE_VM_OPTO_MULNODE_HPP