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

rev 50536 : [mq]: rename_on_root

*** 30,40 ****
  #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_NATIVE) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
--- 30,40 ----
  #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 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:
*** 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;
*** 95,105 ****
  }
  
  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_NATIVE) != 0;
    bool oop_not_null = (decorators & OOP_NOT_NULL) != 0;
    bool atomic = (decorators & MO_RELAXED) != 0;
  
    switch (type) {
    case T_OBJECT:
--- 95,105 ----
  }
  
  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 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:
*** 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;
    }