src/hotspot/cpu/x86/macroAssembler_x86.hpp

rev 58099 : 8239492: [x86] Turn MacroAssembler::verify_oop into macro recording file and line

*** 598,614 ****
  
    // Debugging
  
    // only if +VerifyOops
    // TODO: Make these macros with file and line like sparc version!
!   void verify_oop(Register reg, const char* s = "broken oop");
!   void verify_oop_addr(Address addr, const char * s = "broken oop addr");
  
    // TODO: verify method and klass metadata (compare against vptr?)
    void _verify_method_ptr(Register reg, const char * msg, const char * file, int line) {}
    void _verify_klass_ptr(Register reg, const char * msg, const char * file, int line){}
  
  #define verify_method_ptr(reg) _verify_method_ptr(reg, "broken method " #reg, __FILE__, __LINE__)
  #define verify_klass_ptr(reg) _verify_klass_ptr(reg, "broken klass " #reg, __FILE__, __LINE__)
  
    // Verify or restore cpu control state after JNI call
    void restore_cpu_control_state_after_jni();
--- 598,617 ----
  
    // Debugging
  
    // only if +VerifyOops
    // TODO: Make these macros with file and line like sparc version!
! 
!   void _verify_oop(Register reg, const char* s, const char * file, int line);
!   void _verify_oop_addr(Address addr, const char* s, const char * file, int line);
  
    // TODO: verify method and klass metadata (compare against vptr?)
    void _verify_method_ptr(Register reg, const char * msg, const char * file, int line) {}
    void _verify_klass_ptr(Register reg, const char * msg, const char * file, int line){}
  
+ #define verify_oop(reg) _verify_oop(reg, "broken oop ", __FILE__, __LINE__)
+ #define verify_oop_addr(addr) _verify_oop_addr(addr, "broken oop addr ", __FILE__, __LINE__)
  #define verify_method_ptr(reg) _verify_method_ptr(reg, "broken method " #reg, __FILE__, __LINE__)
  #define verify_klass_ptr(reg) _verify_klass_ptr(reg, "broken klass " #reg, __FILE__, __LINE__)
  
    // Verify or restore cpu control state after JNI call
    void restore_cpu_control_state_after_jni();