1.1 --- a/src/share/vm/c1/c1_LIR.hpp Sat Jan 06 20:01:31 2018 +0800
1.2 +++ b/src/share/vm/c1/c1_LIR.hpp Thu May 24 19:21:48 2018 +0800
1.3 @@ -1852,7 +1852,7 @@
1.4 _tmp4(LIR_OprFact::illegalOpr),
1.5 _tmp5(LIR_OprFact::illegalOpr) {
1.6 }
1.7 -
1.8 +
1.9 LIR_Op2(LIR_Code code, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result = LIR_OprFact::illegalOpr,
1.10 CodeEmitInfo* info = NULL, BasicType type = T_ILLEGAL)
1.11 : LIR_Op(code, result, info),
1.12 @@ -1866,8 +1866,8 @@
1.13
1.14 assert(is_in_range(code, begin_op2, end_op2), "code check");
1.15 }
1.16 -
1.17 -
1.18 +
1.19 +
1.20 LIR_Op2(LIR_Code code, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, LIR_Opr tmp1, LIR_Opr tmp2 = LIR_OprFact::illegalOpr, LIR_Opr tmp3 = LIR_OprFact::illegalOpr, LIR_Opr tmp4 = LIR_OprFact::illegalOpr, LIR_Opr tmp5 = LIR_OprFact::illegalOpr)
1.21 : LIR_Op(code, result, NULL),
1.22 _opr1(opr1), _opr2(opr2),
1.23 @@ -1879,7 +1879,7 @@
1.24 _tmp5(tmp5) {
1.25 assert(is_in_range(code, begin_op2, end_op2), "code check");
1.26 }
1.27 -
1.28 +
1.29 LIR_Opr in_opr1() const { return _opr1; }
1.30 LIR_Opr in_opr2() const { return _opr2; }
1.31 BasicType type() const { return _type; }
1.32 @@ -1889,23 +1889,23 @@
1.33 LIR_Opr tmp4_opr() const { return _tmp4; }
1.34 LIR_Opr tmp5_opr() const { return _tmp5; }
1.35
1.36 -
1.37 +
1.38 void set_in_opr1(LIR_Opr opr) { _opr1 = opr; }
1.39 void set_in_opr2(LIR_Opr opr) { _opr2 = opr; }
1.40 // where is the defination of LIR_AbstractAssembler?, 12/21,2006, jerome
1.41 //virtual void emit_code(LIR_AbstractAssembler* masm);
1.42 virtual void emit_code(LIR_Assembler* masm);
1.43 virtual LIR_Op2* as_Op2() { return this; }
1.44 -
1.45 +
1.46 // virtual void print_instr() const PRODUCT_RETURN;
1.47 virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
1.48 };
1.49 -
1.50 -
1.51 +
1.52 +
1.53 class LIR_OpBranch: public LIR_Op2 {
1.54 friend class LIR_OpVisitState;
1.55 public:
1.56 -
1.57 +
1.58 private:
1.59 LIR_Condition _cond;
1.60 BasicType _type;
1.61 @@ -1913,24 +1913,24 @@
1.62 BlockBegin* _block; // if this is a branch to a block, this is the block
1.63 BlockBegin* _ublock; // if this is a float branch , this is the unorder block
1.64 CodeStub* _stub; // if this is a branch to a stub, this is the stub
1.65 -
1.66 +
1.67 public:
1.68 - // these are temporary constructors until we start using the conditional register
1.69 + // these are temporary constructors until we start using the conditional register
1.70 LIR_OpBranch(LIR_Condition cond, LIR_Opr left, LIR_Opr right, Label* lbl)
1.71 : LIR_Op2(lir_branch, left, right, LIR_OprFact::illegalOpr, (CodeEmitInfo*)(NULL)),
1.72 _cond(cond), _label(lbl), _block(NULL), _ublock(NULL),_stub(NULL)
1.73 {
1.74 }
1.75 -
1.76 +
1.77 LIR_OpBranch(LIR_Condition cond, LIR_Opr left, LIR_Opr right, BasicType type, BlockBegin* block);
1.78 -
1.79 +
1.80 LIR_OpBranch(LIR_Condition cond, LIR_Opr left, LIR_Opr right, BasicType type, CodeStub* stub);
1.81 -
1.82 +
1.83 //LIR_OpBranch(LIR_Condition cond, BasicType type, CodeStub* stub);
1.84
1.85 LIR_OpBranch(LIR_Condition cond, LIR_Opr left, LIR_Opr right, BasicType type,
1.86 BlockBegin *block,BlockBegin *ublock);
1.87 -
1.88 +
1.89 LIR_Condition cond() const { return _cond; }
1.90 BasicType type() const { return _type; }
1.91 LIR_Opr left() const { return in_opr1(); }
1.92 @@ -1939,14 +1939,14 @@
1.93 BlockBegin* block() const { return _block; }
1.94 BlockBegin* ublock() const { return _ublock; }
1.95 CodeStub* stub() const { return _stub; }
1.96 -
1.97 -
1.98 +
1.99 +
1.100 void change_block(BlockBegin* b);
1.101 void change_ublock(BlockBegin* b);
1.102 void negate_cond();
1.103
1.104
1.105 - // 12/21,06,jerome
1.106 + // 12/21,06,jerome
1.107 //virtual void emit_code(LIR_AbstractAssembler* masm);
1.108 virtual void emit_code(LIR_Assembler* masm);
1.109 virtual LIR_OpBranch* as_OpBranch() { return this; }
