Mercurial > hg > truffle

comparison src/share/vm/c1/c1_LIRAssembler.cpp @ 6275:957c266d8bc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
717 case lir_shr: 717 case lir_shr:
718 case lir_ushr: 718 case lir_ushr:
719 if (op->in_opr2()->is_constant()) { 719 if (op->in_opr2()->is_constant()) {
720 shift_op(op->code(), op->in_opr1(), op->in_opr2()->as_constant_ptr()->as_jint(), op->result_opr()); 720 shift_op(op->code(), op->in_opr1(), op->in_opr2()->as_constant_ptr()->as_jint(), op->result_opr());
721 } else { 721 } else {
722 shift_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->tmp_opr()); 722 shift_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->tmp1_opr());
723 } 723 }
724 break; 724 break;
725 725
726 case lir_add: 726 case lir_add:
727 case lir_sub: 727 case lir_sub:
745 case lir_sin: 745 case lir_sin:
746 case lir_tan: 746 case lir_tan:
747 case lir_cos: 747 case lir_cos:
748 case lir_log: 748 case lir_log:
749 case lir_log10: 749 case lir_log10:
750 case lir_exp:
751 case lir_pow:
750 intrinsic_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op); 752 intrinsic_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op);
751 break; 753 break;
752 754
753 case lir_logic_and: 755 case lir_logic_and:
754 case lir_logic_or: 756 case lir_logic_or: