src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp

rev 50535 : [mq]: rename_IN_ROOT
rev 50536 : [mq]: rename_on_root
rev 50537 : [mq]: rename_on_heap

*** 29,47 ****
  
  #define __ masm->
  
  void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    Register dst, Address src, Register tmp1, Register tmp_thread) {
!   bool on_heap = (decorators & IN_HEAP) != 0;
!   bool on_root = (decorators & IN_ROOT) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
    case T_ARRAY: {
!     if (on_heap) {
  #ifdef _LP64
        if (UseCompressedOops) {
          __ movl(dst, src);
          if (oop_not_null) {
            __ decode_heap_oop_not_null(dst);
--- 29,47 ----
  
  #define __ masm->
  
  void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                    Register dst, Address src, Register tmp1, Register tmp_thread) {
!   bool in_heap = (decorators & IN_HEAP) != 0;
!   bool in_native = (decorators & IN_NATIVE) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
    case T_ARRAY: {
!     if (in_heap) {
  #ifdef _LP64
        if (UseCompressedOops) {
          __ movl(dst, src);
          if (oop_not_null) {
            __ decode_heap_oop_not_null(dst);
*** 52,62 ****
  #endif
        {
          __ movptr(dst, src);
        }
      } else {
!       assert(on_root, "why else?");
        __ movptr(dst, src);
      }
      break;
    }
    case T_BOOLEAN: __ load_unsigned_byte(dst, src);  break;
--- 52,62 ----
  #endif
        {
          __ movptr(dst, src);
        }
      } else {
!       assert(in_native, "why else?");
        __ movptr(dst, src);
      }
      break;
    }
    case T_BOOLEAN: __ load_unsigned_byte(dst, src);  break;
*** 94,112 ****
    }
  }
  
  void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                     Address dst, Register val, Register tmp1, Register tmp2) {
!   bool on_heap = (decorators & IN_HEAP) != 0;
!   bool on_root = (decorators & IN_ROOT) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
    case T_ARRAY: {
!     if (on_heap) {
        if (val == noreg) {
          assert(!oop_not_null, "inconsistent access");
  #ifdef _LP64
          if (UseCompressedOops) {
            __ movl(dst, (int32_t)NULL_WORD);
--- 94,112 ----
    }
  }
  
  void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                     Address dst, Register val, Register tmp1, Register tmp2) {
!   bool in_heap = (decorators & IN_HEAP) != 0;
!   bool in_native = (decorators & IN_NATIVE) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
    case T_ARRAY: {
!     if (in_heap) {
        if (val == noreg) {
          assert(!oop_not_null, "inconsistent access");
  #ifdef _LP64
          if (UseCompressedOops) {
            __ movl(dst, (int32_t)NULL_WORD);
*** 131,141 ****
          {
            __ movptr(dst, val);
          }
        }
      } else {
!       assert(on_root, "why else?");
        assert(val != noreg, "not supported");
        __ movptr(dst, val);
      }
      break;
    }
--- 131,141 ----
          {
            __ movptr(dst, val);
          }
        }
      } else {
!       assert(in_native, "why else?");
        assert(val != noreg, "not supported");
        __ movptr(dst, val);
      }
      break;
    }