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

     1.1 --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Tue Sep 15 11:09:34 2009 -0700
     1.2 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Tue Sep 15 21:53:47 2009 -0700
     1.3 @@ -2171,7 +2171,7 @@
     1.4      // subtype which we can't check or src is the same array as dst
     1.5      // but not necessarily exactly of type default_type.
     1.6      Label known_ok, halt;
     1.7 -    jobject2reg(op->expected_type()->encoding(), tmp);
     1.8 +    jobject2reg(op->expected_type()->constant_encoding(), tmp);
     1.9      __ ld_ptr(dst, oopDesc::klass_offset_in_bytes(), tmp2);
    1.10      if (basic_type != T_OBJECT) {
    1.11        __ cmp(tmp, tmp2);
    1.12 @@ -2429,7 +2429,7 @@
    1.13        assert(data->is_BitData(), "need BitData for checkcast");
    1.14        Register mdo      = k_RInfo;
    1.15        Register data_val = Rtmp1;
    1.16 -      jobject2reg(md->encoding(), mdo);
    1.17 +      jobject2reg(md->constant_encoding(), mdo);
    1.18  
    1.19        int mdo_offset_bias = 0;
    1.20        if (!Assembler::is_simm13(md->byte_offset_of_slot(data, DataLayout::header_offset()) + data->size_in_bytes())) {
    1.21 @@ -2452,7 +2452,7 @@
    1.22      // patching may screw with our temporaries on sparc,
    1.23      // so let's do it before loading the class
    1.24      if (k->is_loaded()) {
    1.25 -      jobject2reg(k->encoding(), k_RInfo);
    1.26 +      jobject2reg(k->constant_encoding(), k_RInfo);
    1.27      } else {
    1.28        jobject2reg_with_patching(k_RInfo, op->info_for_patch());
    1.29      }
    1.30 @@ -2513,7 +2513,7 @@
    1.31      // patching may screw with our temporaries on sparc,
    1.32      // so let's do it before loading the class
    1.33      if (k->is_loaded()) {
    1.34 -      jobject2reg(k->encoding(), k_RInfo);
    1.35 +      jobject2reg(k->constant_encoding(), k_RInfo);
    1.36      } else {
    1.37        jobject2reg_with_patching(k_RInfo, op->info_for_patch());
    1.38      }
    1.39 @@ -2717,7 +2717,7 @@
    1.40    assert(op->tmp1()->is_single_cpu(), "tmp1 must be allocated");
    1.41    Register mdo  = op->mdo()->as_register();
    1.42    Register tmp1 = op->tmp1()->as_register();
    1.43 -  jobject2reg(md->encoding(), mdo);
    1.44 +  jobject2reg(md->constant_encoding(), mdo);
    1.45    int mdo_offset_bias = 0;
    1.46    if (!Assembler::is_simm13(md->byte_offset_of_slot(data, CounterData::count_offset()) +
    1.47                              data->size_in_bytes())) {
    1.48 @@ -2774,7 +2774,7 @@
    1.49          if (receiver == NULL) {
    1.50            Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)) -
    1.51                              mdo_offset_bias);
    1.52 -          jobject2reg(known_klass->encoding(), tmp1);
    1.53 +          jobject2reg(known_klass->constant_encoding(), tmp1);
    1.54            __ st_ptr(tmp1, recv_addr);
    1.55            Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)) -
    1.56                              mdo_offset_bias);