Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/machnode.hpp	Wed Jul 27 15:06:35 2011 -0700
     1.2 +++ b/src/share/vm/opto/machnode.hpp	Wed Jul 27 17:28:36 2011 -0700
     1.3 @@ -275,9 +275,6 @@
     1.4    // Apply peephole rule(s) to this instruction
     1.5    virtual MachNode *peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C );
     1.6  
     1.7 -  // Check for PC-Relative addressing
     1.8 -  bool is_pc_relative() const { return (flags() & Flag_is_pc_relative) != 0; }
     1.9 -
    1.10    // Top-level ideal Opcode matched
    1.11    virtual int ideal_Opcode()     const { return Op_Node; }
    1.12  
    1.13 @@ -525,7 +522,7 @@
    1.14    const uint _vidx;             // Index of memop being tested
    1.15    MachNullCheckNode( Node *ctrl, Node *memop, uint vidx ) : MachIdealNode(), _vidx(vidx) {
    1.16      init_class_id(Class_MachNullCheck);
    1.17 -    init_flags(Flag_is_Branch | Flag_is_pc_relative);
    1.18 +    init_flags(Flag_is_Branch);
    1.19      add_req(ctrl);
    1.20      add_req(memop);
    1.21    }
    1.22 @@ -554,7 +551,9 @@
    1.23  // occasional callbacks to the machine model for important info.
    1.24  class MachProjNode : public ProjNode {
    1.25  public:
    1.26 -  MachProjNode( Node *multi, uint con, const RegMask &out, uint ideal_reg ) : ProjNode(multi,con), _rout(out), _ideal_reg(ideal_reg) {}
    1.27 +  MachProjNode( Node *multi, uint con, const RegMask &out, uint ideal_reg ) : ProjNode(multi,con), _rout(out), _ideal_reg(ideal_reg) {
    1.28 +    init_class_id(Class_MachProj);
    1.29 +  }
    1.30    RegMask _rout;
    1.31    const uint  _ideal_reg;
    1.32    enum projType {
    1.33 @@ -589,6 +588,15 @@
    1.34  #endif
    1.35  };
    1.36  
    1.37 +//------------------------------MachGotoNode-----------------------------------
    1.38 +// Machine-specific versions of GotoNodes
    1.39 +class MachGotoNode : public MachNode {
    1.40 +public:
    1.41 +  MachGotoNode() : MachNode() {
    1.42 +    init_class_id(Class_MachGoto);
    1.43 +  }
    1.44 +};
    1.45 +
    1.46  //------------------------------MachFastLockNode-------------------------------------
    1.47  // Machine-specific versions of FastLockNodes
    1.48  class MachFastLockNode : public MachNode {
    1.49 @@ -631,14 +639,12 @@
    1.50  
    1.51    MachSafePointNode() : MachReturnNode(), _oop_map(NULL), _jvms(NULL), _jvmadj(0) {
    1.52      init_class_id(Class_MachSafePoint);
    1.53 -    init_flags(Flag_is_safepoint_node);
    1.54    }
    1.55  
    1.56    virtual JVMState* jvms() const { return _jvms; }
    1.57    void set_jvms(JVMState* s) {
    1.58      _jvms = s;
    1.59    }
    1.60 -  bool is_safepoint_node() const { return (flags() & Flag_is_safepoint_node) != 0; }
    1.61    virtual const Type    *bottom_type() const;
    1.62  
    1.63    virtual const RegMask &in_RegMask(uint) const;
    1.64 @@ -702,7 +708,6 @@
    1.65  
    1.66    MachCallNode() : MachSafePointNode() {
    1.67      init_class_id(Class_MachCall);
    1.68 -    init_flags(Flag_is_Call);
    1.69    }
    1.70  
    1.71    virtual const Type *bottom_type() const;