src/cpu/sparc/vm/relocInfo_sparc.cpp

*** 82,92 ****
      int simm13 = Assembler::low10((intptr_t)x) + o;
      guarantee(Assembler::is_simm13(simm13), "offset can't overflow simm13");
      inst &= ~Assembler::simm(    -1, 13);
      inst |=  Assembler::simm(simm13, 13);
      if (verify_only) {
!       assert(ip->long_at(0) == inst, "instructions must match");
      } else {
        ip->set_long_at(0, inst);
      }
      }
      break;
--- 82,92 ----
      int simm13 = Assembler::low10((intptr_t)x) + o;
      guarantee(Assembler::is_simm13(simm13), "offset can't overflow simm13");
      inst &= ~Assembler::simm(    -1, 13);
      inst |=  Assembler::simm(simm13, 13);
      if (verify_only) {
!       guarantee(ip->long_at(0) == inst, "instructions must match");
      } else {
        ip->set_long_at(0, inst);
      }
      }
      break;
*** 100,117 ****
        assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
        jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
        inst &= ~Assembler::hi22(-1);
        inst |=  Assembler::hi22((intptr_t)np);
        if (verify_only) {
!         assert(ip->long_at(0) == inst, "instructions must match");
        } else {
          ip->set_long_at(0, inst);
        }
        inst2 = ip->long_at( NativeInstruction::nop_instruction_size );
        guarantee(Assembler::inv_op(inst2)==Assembler::arith_op, "arith op");
        if (verify_only) {
!         assert(ip->long_at(NativeInstruction::nop_instruction_size) == NativeInstruction::set_data32_simm13( inst2, (intptr_t)np),
                 "instructions must match");
        } else {
          ip->set_long_at(NativeInstruction::nop_instruction_size, NativeInstruction::set_data32_simm13( inst2, (intptr_t)np));
        }
        break;
--- 100,117 ----
        assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
        jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
        inst &= ~Assembler::hi22(-1);
        inst |=  Assembler::hi22((intptr_t)np);
        if (verify_only) {
!         guarantee(ip->long_at(0) == inst, "instructions must match");
        } else {
          ip->set_long_at(0, inst);
        }
        inst2 = ip->long_at( NativeInstruction::nop_instruction_size );
        guarantee(Assembler::inv_op(inst2)==Assembler::arith_op, "arith op");
        if (verify_only) {
!         guarantee(ip->long_at(NativeInstruction::nop_instruction_size) == NativeInstruction::set_data32_simm13( inst2, (intptr_t)np),
                    "instructions must match");
        } else {
          ip->set_long_at(NativeInstruction::nop_instruction_size, NativeInstruction::set_data32_simm13( inst2, (intptr_t)np));
        }
        break;
*** 125,135 ****
      guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
      inst &= ~Assembler::hi22(     -1);
      inst |=  Assembler::hi22((intptr_t)x);
      // (ignore offset; it doesn't play into the sethi)
      if (verify_only) {
!       assert(ip->long_at(0) == inst, "instructions must match");
      } else {
        ip->set_long_at(0, inst);
      }
  #endif
      }
--- 125,135 ----
      guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
      inst &= ~Assembler::hi22(     -1);
      inst |=  Assembler::hi22((intptr_t)x);
      // (ignore offset; it doesn't play into the sethi)
      if (verify_only) {
!       guarantee(ip->long_at(0) == inst, "instructions must match");
      } else {
        ip->set_long_at(0, inst);
      }
  #endif
      }