Mercurial > hg > truffle
diff src/share/vm/c1/c1_LIRAssembler.cpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 21 Aug 2012 10:39:19 +0200 |
parents | 33df1aeaebbf 6759698e3140 |
children | c38f13903fdf |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRAssembler.cpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/c1/c1_LIRAssembler.cpp Tue Aug 21 10:39:19 2012 +0200 @@ -719,7 +719,7 @@ if (op->in_opr2()->is_constant()) { shift_op(op->code(), op->in_opr1(), op->in_opr2()->as_constant_ptr()->as_jint(), op->result_opr()); } else { - shift_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->tmp_opr()); + shift_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->tmp1_opr()); } break; @@ -747,6 +747,8 @@ case lir_cos: case lir_log: case lir_log10: + case lir_exp: + case lir_pow: intrinsic_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op); break;