Mercurial > hg > truffle

comparison src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp @ 6739:8a02ca5e5576

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7195816: NPG: Crash in c1_ValueType - ShouldNotReachHere Summary: C1 needs knowledge of T_METADATA at the LIR level. Reviewed-by: kvn, coleenp
author roland
date Tue, 11 Sep 2012 16:20:57 +0200
parents da91efe96a93
children 7eca5de9e0b6
comparison
equal deleted inserted replaced
6738:ec98e58952b2 6739:8a02ca5e5576
882 CodeEmitInfo* info = state_for(x, x->state()); 882 CodeEmitInfo* info = state_for(x, x->state());
883 LIR_Opr tmp1 = FrameMap::G1_oop_opr; 883 LIR_Opr tmp1 = FrameMap::G1_oop_opr;
884 LIR_Opr tmp2 = FrameMap::G3_oop_opr; 884 LIR_Opr tmp2 = FrameMap::G3_oop_opr;
885 LIR_Opr tmp3 = FrameMap::G4_oop_opr; 885 LIR_Opr tmp3 = FrameMap::G4_oop_opr;
886 LIR_Opr tmp4 = FrameMap::O1_oop_opr; 886 LIR_Opr tmp4 = FrameMap::O1_oop_opr;
887 LIR_Opr klass_reg = FrameMap::G5_oop_opr; 887 LIR_Opr klass_reg = FrameMap::G5_metadata_opr;
888 new_instance(reg, x->klass(), tmp1, tmp2, tmp3, tmp4, klass_reg, info); 888 new_instance(reg, x->klass(), tmp1, tmp2, tmp3, tmp4, klass_reg, info);
889 LIR_Opr result = rlock_result(x); 889 LIR_Opr result = rlock_result(x);
890 __ move(reg, result); 890 __ move(reg, result);
891 } 891 }
892 892
901 LIR_Opr reg = result_register_for(x->type()); 901 LIR_Opr reg = result_register_for(x->type());
902 LIR_Opr tmp1 = FrameMap::G1_oop_opr; 902 LIR_Opr tmp1 = FrameMap::G1_oop_opr;
903 LIR_Opr tmp2 = FrameMap::G3_oop_opr; 903 LIR_Opr tmp2 = FrameMap::G3_oop_opr;
904 LIR_Opr tmp3 = FrameMap::G4_oop_opr; 904 LIR_Opr tmp3 = FrameMap::G4_oop_opr;
905 LIR_Opr tmp4 = FrameMap::O1_oop_opr; 905 LIR_Opr tmp4 = FrameMap::O1_oop_opr;
906 LIR_Opr klass_reg = FrameMap::G5_oop_opr; 906 LIR_Opr klass_reg = FrameMap::G5_metadata_opr;
907 LIR_Opr len = length.result(); 907 LIR_Opr len = length.result();
908 BasicType elem_type = x->elt_type(); 908 BasicType elem_type = x->elt_type();
909 909
910 __ oop2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg); 910 __ metadata2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
911 911
912 CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info); 912 CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
913 __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path); 913 __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
914 914
915 LIR_Opr result = rlock_result(x); 915 LIR_Opr result = rlock_result(x);
933 const LIR_Opr reg = result_register_for(x->type()); 933 const LIR_Opr reg = result_register_for(x->type());
934 LIR_Opr tmp1 = FrameMap::G1_oop_opr; 934 LIR_Opr tmp1 = FrameMap::G1_oop_opr;
935 LIR_Opr tmp2 = FrameMap::G3_oop_opr; 935 LIR_Opr tmp2 = FrameMap::G3_oop_opr;
936 LIR_Opr tmp3 = FrameMap::G4_oop_opr; 936 LIR_Opr tmp3 = FrameMap::G4_oop_opr;
937 LIR_Opr tmp4 = FrameMap::O1_oop_opr; 937 LIR_Opr tmp4 = FrameMap::O1_oop_opr;
938 LIR_Opr klass_reg = FrameMap::G5_oop_opr; 938 LIR_Opr klass_reg = FrameMap::G5_metadata_opr;
939 LIR_Opr len = length.result(); 939 LIR_Opr len = length.result();
940 940
941 CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info); 941 CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info);
942 ciMetadata* obj = ciObjArrayKlass::make(x->klass()); 942 ciMetadata* obj = ciObjArrayKlass::make(x->klass());
943 if (obj == ciEnv::unloaded_ciobjarrayklass()) { 943 if (obj == ciEnv::unloaded_ciobjarrayklass()) {
983 i * sizeof(jint))); 983 i * sizeof(jint)));
984 } 984 }
985 985
986 // This instruction can be deoptimized in the slow path : use 986 // This instruction can be deoptimized in the slow path : use
987 // O0 as result register. 987 // O0 as result register.
988 const LIR_Opr reg = result_register_for(x->type()); 988 const LIR_Opr klass_reg = FrameMap::O0_metadata_opr;
989 klass2reg_with_patching(reg, x->klass(), patching_info); 989 klass2reg_with_patching(klass_reg, x->klass(), patching_info);
990 LIR_Opr rank = FrameMap::O1_opr; 990 LIR_Opr rank = FrameMap::O1_opr;
991 __ move(LIR_OprFact::intConst(x->rank()), rank); 991 __ move(LIR_OprFact::intConst(x->rank()), rank);
992 LIR_Opr varargs = FrameMap::as_pointer_opr(O2); 992 LIR_Opr varargs = FrameMap::as_pointer_opr(O2);
993 int offset_from_sp = (frame::memory_parameter_word_sp_offset * wordSize) + STACK_BIAS; 993 int offset_from_sp = (frame::memory_parameter_word_sp_offset * wordSize) + STACK_BIAS;
994 __ add(FrameMap::SP_opr, 994 __ add(FrameMap::SP_opr,
995 LIR_OprFact::intptrConst(offset_from_sp), 995 LIR_OprFact::intptrConst(offset_from_sp),
996 varargs); 996 varargs);
997 LIR_OprList* args = new LIR_OprList(3); 997 LIR_OprList* args = new LIR_OprList(3);
998 args->append(reg); 998 args->append(klass_reg);
999 args->append(rank); 999 args->append(rank);
1000 args->append(varargs); 1000 args->append(varargs);
1001 const LIR_Opr reg = result_register_for(x->type());
1001 __ call_runtime(Runtime1::entry_for(Runtime1::new_multi_array_id), 1002 __ call_runtime(Runtime1::entry_for(Runtime1::new_multi_array_id),
1002 LIR_OprFact::illegalOpr, 1003 LIR_OprFact::illegalOpr,
1003 reg, args, info); 1004 reg, args, info);
1004 1005
1005 LIR_Opr result = rlock_result(x); 1006 LIR_Opr result = rlock_result(x);